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 | |
| parent | db494c6b34fa14d5f444f39b52a7cdad90e7f21a (diff) | |
com::sun::star->css in forms/
Change-Id: I1c09e88f839bdf11c6ff809ec95769e8f729c7cd
Diffstat (limited to 'forms')
129 files changed, 2191 insertions, 2235 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; diff --git a/forms/source/helper/urltransformer.cxx b/forms/source/helper/urltransformer.cxx index 149d6fb721e4..58f4db8703f1 100644 --- a/forms/source/helper/urltransformer.cxx +++ b/forms/source/helper/urltransformer.cxx @@ -72,7 +72,7 @@ namespace frm } - void UrlTransformer::parseSmartWithAsciiProtocol( ::com::sun::star::util::URL& _rURL, const sal_Char* _pAsciiURL ) const + void UrlTransformer::parseSmartWithAsciiProtocol( css::util::URL& _rURL, const sal_Char* _pAsciiURL ) const { if ( implEnsureTransformer() ) m_xTransformer->parseSmart( _rURL, OUString::createFromAscii( _pAsciiURL ) ); diff --git a/forms/source/helper/windowstateguard.cxx b/forms/source/helper/windowstateguard.cxx index 5ecce323b01d..b27e90b17203 100644 --- a/forms/source/helper/windowstateguard.cxx +++ b/forms/source/helper/windowstateguard.cxx @@ -63,17 +63,17 @@ namespace frm protected: // XWindowListener2 - virtual void SAL_CALL windowEnabled( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL windowDisabled( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL windowEnabled( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL windowDisabled( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XWindowListener - virtual void SAL_CALL windowResized( const ::com::sun::star::awt::WindowEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL windowMoved( const ::com::sun::star::awt::WindowEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL windowShown( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL windowHidden( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL windowResized( const css::awt::WindowEvent& e ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL windowMoved( const css::awt::WindowEvent& e ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL windowShown( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL windowHidden( const css::lang::EventObject& e ) 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; private: /** ensures that the window's Enabled state matches what is described at the model diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx index 041a34535bff..b2420a957253 100644 --- a/forms/source/inc/FormComponent.hxx +++ b/forms/source/inc/FormComponent.hxx @@ -82,9 +82,9 @@ namespace frm // macros for quickly declaring/implementing XServiceInfo #define DECLARE_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; class OControlModel; @@ -124,19 +124,19 @@ namespace frm */ void addPropertyNotification( const sal_Int32 _nHandle, - const ::com::sun::star::uno::Any& _rOldValue, - const ::com::sun::star::uno::Any& _rNewValue + const css::uno::Any& _rOldValue, + const css::uno::Any& _rNewValue ); private: void impl_notifyAll_nothrow(); private: - OControlModel& m_rModel; - bool m_bLocked; - ::com::sun::star::uno::Sequence< sal_Int32 > m_aHandles; - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > m_aOldValues; - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > m_aNewValues; + OControlModel& m_rModel; + bool m_bLocked; + css::uno::Sequence< sal_Int32 > m_aHandles; + css::uno::Sequence< css::uno::Any > m_aOldValues; + css::uno::Sequence< css::uno::Any > m_aNewValues; private: ControlModelLock( const ControlModelLock& ) SAL_DELETED_FUNCTION; @@ -147,9 +147,9 @@ namespace frm //= OControl //= base class for form layer controls -typedef ::cppu::ImplHelper3 < ::com::sun::star::awt::XControl - , ::com::sun::star::lang::XEventListener - , ::com::sun::star::lang::XServiceInfo +typedef ::cppu::ImplHelper3 < css::awt::XControl + , css::lang::XEventListener + , css::lang::XServiceInfo > OControl_BASE; class OControl :public ::cppu::OComponentHelper @@ -157,12 +157,11 @@ class OControl :public ::cppu::OComponentHelper { protected: ::osl::Mutex m_aMutex; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > - m_xControl; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation> + css::uno::Reference< css::awt::XControl > m_xControl; + css::uno::Reference< css::uno::XAggregation> m_xAggregate; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > + css::uno::Reference< css::uno::XComponentContext > m_xContext; WindowStateGuard m_aWindowStateGuard; @@ -180,19 +179,19 @@ public: This is helpful, if your derived class wants to cache an interface of the aggregate. In this case, the aggregate needs to be queried for this interface <b>before</b> the - <member scope="com::sun::star::uno">XAggregation::setDelegator</member> call. + <member scope="css::uno">XAggregation::setDelegator</member> call. In such a case, pass <FALSE/> to this parameter. Then, cache the aggregate's interface(s) as needed. Afterwards, call <member>doSetDelegator</member>. In your destructor, you need to call <member>doResetDelegator</member> before resetting the cached interfaces. This will reset the aggregates delegator to <NULL/>, - which will ensure that the <member scope="com::sun::star::uno">XInterface::release</member> + which will ensure that the <member scope="css::uno">XInterface::release</member> calls on the cached interfaces are really applied to the aggregate, instead of the <type>OControl</type> itself. */ OControl( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rFactory, + const css::uno::Reference< css::uno::XComponentContext >& _rFactory, const OUString& _rAggregateService, const bool _bSetDelegator = true ); @@ -211,73 +210,73 @@ protected: // UNO DECLARE_UNO3_AGG_DEFAULTS(OControl, OComponentHelper) - 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<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; // XComponent (as base of XControl) - virtual void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL dispose( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE { OComponentHelper::dispose(); } - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE { OComponentHelper::addEventListener(_rxListener); } - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE { OComponentHelper::removeEventListener(_rxListener); } // 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; // XServiceInfo - 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(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; + 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; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; // XServiceInfo - static version - static css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames_Static() throw(::com::sun::star::uno::RuntimeException); + static css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames_Static() throw(css::uno::RuntimeException); // XControl - virtual void SAL_CALL setContext(const css::uno::Reference<css::uno::XInterface>& Context) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getContext() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - 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 ::com::sun::star::uno::Reference<css::awt::XWindowPeer> SAL_CALL getPeer() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL setModel(const ::com::sun::star::uno::Reference<css::awt::XControlModel>& Model) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference<css::awt::XControlModel> SAL_CALL getModel() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference<css::awt::XView> SAL_CALL getView() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setDesignMode(sal_Bool bOn) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isDesignMode() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isTransparent() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setContext(const css::uno::Reference<css::uno::XInterface>& Context) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getContext() throw (css::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; + virtual css::uno::Reference<css::awt::XWindowPeer> SAL_CALL getPeer() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL setModel(const css::uno::Reference<css::awt::XControlModel>& Model) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference<css::awt::XControlModel> SAL_CALL getModel() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference<css::awt::XView> SAL_CALL getView() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDesignMode(sal_Bool bOn) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isDesignMode() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isTransparent() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes(); + virtual css::uno::Sequence< css::uno::Type> _getTypes(); // overwrite this and call the base class if you have additional types - ::com::sun::star::uno::Sequence< OUString > getAggregateServiceNames(); + css::uno::Sequence< OUString > getAggregateServiceNames(); private: void impl_resetStateGuard_nothrow(); }; // a form control implementing the XBoundControl interface -typedef ::cppu::ImplHelper1 < ::com::sun::star::form::XBoundControl +typedef ::cppu::ImplHelper1 < css::form::XBoundControl > OBoundControl_BASE; class OBoundControl :public OControl ,public OBoundControl_BASE { protected: - bool m_bLocked : 1; + bool m_bLocked : 1; - OUString m_sOriginalHelpText; // as long as the text/value is invalid, we change the help text of our peer - ::com::sun::star::awt::FontDescriptor + OUString m_sOriginalHelpText; // as long as the text/value is invalid, we change the help text of our peer + css::awt::FontDescriptor m_aOriginalFont; // as long as the text/value is invalid, we also change the font sal_Int32 m_nOriginalTextLineColor; // (we add red underlining) public: OBoundControl( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, + const css::uno::Reference< css::uno::XComponentContext >& _rxContext, const OUString& _rAggregateService, const bool _bSetDelegator = true ); @@ -285,24 +284,24 @@ public: virtual ~OBoundControl(); DECLARE_UNO3_AGG_DEFAULTS(OBoundControl, 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; // XBoundControl - virtual sal_Bool SAL_CALL getLock() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setLock(sal_Bool _bLock) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL getLock() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setLock(sal_Bool _bLock) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // default implementation just disables the controls, overwrite _setLock to change this behaviour // XControl - virtual sal_Bool SAL_CALL setModel(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& Model) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL setModel(const css::uno::Reference< css::awt::XControlModel >& Model) 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; 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; // implement the lock setting void _setLock(bool _bLock); }; @@ -314,13 +313,13 @@ protected: //added for exporting OCX control #define INVALID_OBJ_ID_IN_MSO 0xFFFF -typedef ::cppu::ImplHelper7 < ::com::sun::star::form::XFormComponent - , ::com::sun::star::io::XPersistObject - , ::com::sun::star::container::XNamed - , ::com::sun::star::lang::XServiceInfo - , ::com::sun::star::util::XCloneable - , ::com::sun::star::beans::XPropertyContainer - , ::com::sun::star::beans::XPropertyAccess +typedef ::cppu::ImplHelper7 < css::form::XFormComponent + , css::io::XPersistObject + , css::container::XNamed + , css::lang::XServiceInfo + , css::util::XCloneable + , css::beans::XPropertyContainer + , css::beans::XPropertyAccess > OControlModel_BASE; class OControlModel :public ::cppu::OComponentHelper @@ -357,14 +356,14 @@ protected: protected: OControlModel( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rFactory, // factory to create the aggregate with + const css::uno::Reference< css::uno::XComponentContext>& _rFactory, // factory to create the aggregate with const OUString& _rUnoControlModelTypeName, // service name of te model to aggregate const OUString& rDefault = OUString(), // service name of the default control const bool _bSetDelegator = true // set to sal_False if you want to call setDelegator later (after returning from this ctor) ); OControlModel( const OControlModel* _pOriginal, // the original object to clone - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rFactory, // factory to create the aggregate with + const css::uno::Reference< css::uno::XComponentContext>& _rFactory, // factory to create the aggregate with const bool _bCloneAggregate = true, // should the aggregate of the original be cloned, too? const bool _bSetDelegator = true // set to sal_False if you want to call setDelegator later (after returning from this ctor) ); @@ -380,89 +379,89 @@ protected: using OComponentHelper::rBHelper; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes(); + virtual css::uno::Sequence< css::uno::Type> _getTypes(); - void readHelpTextCompatibly(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream >& _rxInStream); - void writeHelpTextCompatibly(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream >& _rxOutStream); + void readHelpTextCompatibly(const css::uno::Reference< css::io::XObjectInputStream >& _rxInStream); + void writeHelpTextCompatibly(const css::uno::Reference< css::io::XObjectOutputStream >& _rxOutStream); void doSetDelegator(); void doResetDelegator(); - ::com::sun::star::uno::Sequence< OUString > getAggregateServiceNames(); + css::uno::Sequence< OUString > getAggregateServiceNames(); public: DECLARE_UNO3_AGG_DEFAULTS(OControl, OComponentHelper) - 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<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; // 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; + 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; // XServiceInfo - 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(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; + 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; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; // XSericeInfo - static version(s) - static css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames_Static() throw(::com::sun::star::uno::RuntimeException); + static css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames_Static() throw(css::uno::RuntimeException); // XPersistObject - virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; + virtual OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; 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; // XChild (base of XFormComponent) - 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; + 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; // 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; // 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; 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::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; -// ::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; // 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 = 0; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; // 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; protected: using OPropertySetAggregationHelper::setPropertyValues; using OPropertySetAggregationHelper::getPropertyValues; protected: - virtual void writeAggregate( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream >& _rxOutStream ) const; - virtual void readAggregate( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream >& _rxInStream ); + virtual void writeAggregate( const css::uno::Reference< css::io::XObjectOutputStream >& _rxOutStream ) const; + virtual void readAggregate( const css::uno::Reference< css::io::XObjectInputStream >& _rxInStream ); protected: // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw( css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // OPropertySetHelper virtual cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; @@ -472,16 +471,16 @@ protected: Derived classes usually call the base class first, and then append own properties. */ virtual void describeFixedProperties( - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rProps + css::uno::Sequence< css::beans::Property >& /* [out] */ _rProps ) const; // 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; /** describes the properties of our aggregate @@ -492,7 +491,7 @@ protected: aggregate properties. */ virtual void describeAggregateProperties( - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rAggregateProps + css::uno::Sequence< css::beans::Property >& /* [out] */ _rAggregateProps ) const; public: @@ -502,9 +501,9 @@ public: oslInterlockedCount unlockInstance( LockAccess ); void firePropertyChanges( - const ::com::sun::star::uno::Sequence< sal_Int32 >& _rHandles, - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& _rOldValues, - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& _rNewValues, + const css::uno::Sequence< sal_Int32 >& _rHandles, + const css::uno::Sequence< css::uno::Any >& _rOldValues, + const css::uno::Sequence< css::uno::Any >& _rNewValues, LockAccess ); @@ -516,23 +515,23 @@ public: #define DECLARE_DEFAULT_CLONE_CTOR( classname ) \ classname( \ const classname* _pOriginal, \ - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxFactory \ + const css::uno::Reference< css::uno::XComponentContext>& _rxFactory \ ); \ // all xtors for a leaf class of the object hierarchy #define DECLARE_DEFAULT_LEAF_XTOR( classname ) \ classname( \ - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxFactory \ + const css::uno::Reference< css::uno::XComponentContext>& _rxFactory \ ); \ classname( \ const classname* _pOriginal, \ - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxFactory \ + const css::uno::Reference< css::uno::XComponentContext>& _rxFactory \ ); \ virtual ~classname() \ #define IMPLEMENT_DEFAULT_CLONING( classname ) \ - ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL classname::createClone( ) throw (::com::sun::star::uno::RuntimeException, std::exception) \ + css::uno::Reference< css::util::XCloneable > SAL_CALL classname::createClone( ) throw (css::uno::RuntimeException, std::exception) \ { \ classname* pClone = new classname( this, getContext() ); \ pClone->clonedFrom( this ); \ @@ -543,25 +542,25 @@ public: //= OBoundControlModel //= model of a form layer control which is bound to a data source field -typedef ::cppu::ImplHelper4 < ::com::sun::star::form::XLoadListener - , ::com::sun::star::form::XReset - , ::com::sun::star::beans::XPropertyChangeListener - , ::com::sun::star::sdb::XRowSetChangeListener +typedef ::cppu::ImplHelper4 < css::form::XLoadListener + , css::form::XReset + , css::beans::XPropertyChangeListener + , css::sdb::XRowSetChangeListener > OBoundControlModel_BASE1; // separated into an own base class since derivees can disable the support for this // interface, thus we want to easily exclude it in the queryInterface and getTypes -typedef ::cppu::ImplHelper1 < ::com::sun::star::form::XBoundComponent +typedef ::cppu::ImplHelper1 < css::form::XBoundComponent > OBoundControlModel_COMMITTING; // dito -typedef ::cppu::ImplHelper2 < ::com::sun::star::form::binding::XBindableValue - , ::com::sun::star::util::XModifyListener +typedef ::cppu::ImplHelper2 < css::form::binding::XBindableValue + , css::util::XModifyListener > OBoundControlModel_BINDING; // dito -typedef ::cppu::ImplHelper2 < ::com::sun::star::form::validation::XValidityConstraintListener - , ::com::sun::star::form::validation::XValidatableFormComponent +typedef ::cppu::ImplHelper2 < css::form::validation::XValidityConstraintListener + , css::form::validation::XValidatableFormComponent > OBoundControlModel_VALIDATION; class OBoundControlModel :public OControlModel @@ -580,33 +579,33 @@ protected: }; private: - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > + css::uno::Reference< css::beans::XPropertySet > m_xField; // the form which controls supplies the field we bind to. - ::com::sun::star::uno::Reference< ::com::sun::star::form::XLoadable > + css::uno::Reference< css::form::XLoadable > m_xAmbientForm; - OUString m_sValuePropertyName; + OUString m_sValuePropertyName; sal_Int32 m_nValuePropertyAggregateHandle; sal_Int32 m_nFieldType; - ::com::sun::star::uno::Type m_aValuePropertyType; + css::uno::Type m_aValuePropertyType; bool m_bValuePropertyMayBeVoid; ResetHelper m_aResetHelper; ::cppu::OInterfaceContainerHelper m_aUpdateListeners; ::cppu::OInterfaceContainerHelper m_aFormComponentListeners; - ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XValueBinding > + css::uno::Reference< css::form::binding::XValueBinding > m_xExternalBinding; - ::com::sun::star::uno::Reference< ::com::sun::star::form::validation::XValidator > + css::uno::Reference< css::form::validation::XValidator > m_xValidator; - ::com::sun::star::uno::Type m_aExternalValueType; + css::uno::Type m_aExternalValueType; // <properties> - OUString m_aControlSource; // Datenquelle, Name des Feldes - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > + OUString m_aControlSource; // Datenquelle, Name des Feldes + css::uno::Reference< css::beans::XPropertySet > m_xLabelControl; // reference to a sibling control (model) which is our label - bool m_bInputRequired; + bool m_bInputRequired; // </properties> ::comphelper::OPropertyChangeMultiplexer* @@ -634,11 +633,11 @@ protected: // Any other arguments will throw an IllegalArgumentException. // The default value is FM_COMPONENT_FIXEDTEXT. - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet > + css::uno::Reference< css::sdbc::XRowSet > m_xCursor; - ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumnUpdate > + css::uno::Reference< css::sdb::XColumnUpdate > m_xColumnUpdate; - ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn > + css::uno::Reference< css::sdb::XColumn > m_xColumn; protected: @@ -650,7 +649,7 @@ protected: protected: OBoundControlModel( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext, + const css::uno::Reference< css::uno::XComponentContext>& _rxContext, // factory to create the aggregate with const OUString& _rUnoControlModelTypeName, // service name of te model to aggregate const OUString& _rDefault, // service name of the default control @@ -660,7 +659,7 @@ protected: ); OBoundControlModel( const OBoundControlModel* _pOriginal, // the original object to clone - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext + const css::uno::Reference< css::uno::XComponentContext>& _rxContext // factory to create the aggregate with ); virtual ~OBoundControlModel(); @@ -766,7 +765,7 @@ protected: @see resetNoBroadcast */ - virtual ::com::sun::star::uno::Any + virtual css::uno::Any getDefaultForReset() const; /** translates a db column value into a control value. @@ -778,7 +777,7 @@ protected: @see setControlValue @pure */ - virtual ::com::sun::star::uno::Any + virtual css::uno::Any translateDbColumnToControlValue( ) = 0; /** returns the data types which the control could use to exchange data with @@ -793,7 +792,7 @@ protected: The default implementation returns the type of our value property. */ - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > + virtual css::uno::Sequence< css::uno::Type > getSupportedBindingTypes(); /** translates the given value, which was obtained from the current external value binding, @@ -806,8 +805,8 @@ protected: @see hasExternalValueBinding @see getExternalValueType */ - virtual ::com::sun::star::uno::Any - translateExternalValueToControlValue( const ::com::sun::star::uno::Any& _rExternalValue ) const; + virtual css::uno::Any + translateExternalValueToControlValue( const css::uno::Any& _rExternalValue ) const; /** commits the current control value to our external value binding @@ -816,7 +815,7 @@ protected: @see hasExternalValueBinding @see initValueProperty */ - virtual ::com::sun::star::uno::Any + virtual css::uno::Any translateControlValueToExternalValue( ) const; /** commits the current control value to the database column we're bound to @@ -846,7 +845,7 @@ protected: the instigator of the value change */ void setControlValue( - const ::com::sun::star::uno::Any& _rValue, + const css::uno::Any& _rValue, ValueChangeInstigator _eInstigator ); /** @@ -861,7 +860,7 @@ protected: <member>translateExternalValueToControlValue</member> */ virtual void doSetControlValue( - const ::com::sun::star::uno::Any& _rValue + const css::uno::Any& _rValue ); /** retrieves the current value of the control @@ -872,12 +871,12 @@ protected: @precond Our own mutex is locked. */ - virtual ::com::sun::star::uno::Any + virtual css::uno::Any getControlValue( ) const; /** called whenever a connection to a database column has been established */ - virtual void onConnectedDbColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxForm ); + virtual void onConnectedDbColumn( const css::uno::Reference< css::uno::XInterface >& _rxForm ); /** called whenever a connection to a database column has been suspended */ virtual void onDisconnectedDbColumn(); @@ -909,7 +908,7 @@ protected: @precond Our own mutex is locked. */ - virtual ::com::sun::star::uno::Any + virtual css::uno::Any translateControlValueToValidatableValue( ) const; /** retrieves the current value of the form component @@ -920,15 +919,15 @@ protected: @precond our mutex is locked when this method is called */ - virtual ::com::sun::star::uno::Any + virtual css::uno::Any getCurrentFormComponentValue() const; /** We can't write (new) common properties in this base class, as the file format doesn't allow this (unfortunately). So derived classes may use the following two methods. They secure the written data with marks, so any new common properties in newer versions will be skipped by older ones. */ - void writeCommonProperties(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream); - void readCommonProperties(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream); + void writeCommonProperties(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream); + void readCommonProperties(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream); // the next method may be used in derived classes's read when an unknown version is encountered void defaultCommonProperties(); @@ -945,11 +944,11 @@ protected: */ virtual void resetNoBroadcast(); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes() SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Type> _getTypes() SAL_OVERRIDE; /// sets m_xField to the given new value, without notifying our listeners void impl_setField_noNotify( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxField + const css::uno::Reference< css::beans::XPropertySet>& _rxField ); inline bool hasField() const { @@ -962,11 +961,11 @@ protected: // 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; public: - inline const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& getField() const + inline const css::uno::Reference< css::beans::XPropertySet>& getField() const { return m_xField; } @@ -974,89 +973,89 @@ public: public: // UNO link DECLARE_UNO3_AGG_DEFAULTS(OBoundControlModel, 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; // OComponentHelper virtual void SAL_CALL disposing() 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; // XServiceInfo - 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; // XServiceInfo - static version - static css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames_Static() throw(::com::sun::star::uno::RuntimeException); + static css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames_Static() throw(css::uno::RuntimeException); // XChild - virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw(::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) 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; // XPersistObject - virtual void SAL_CALL write( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream >& OutStream ) 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 >& InStream ) 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 >& OutStream ) throw(css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL read( const css::uno::Reference< css::io::XObjectInputStream >& InStream ) throw(css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XBoundComponent - virtual sal_Bool SAL_CALL commit() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL commit() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XUpdateBroadcaster (base of XBoundComponent) - virtual void SAL_CALL addUpdateListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XUpdateListener >& aListener ) 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 >& aListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addUpdateListener( const css::uno::Reference< css::form::XUpdateListener >& aListener ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeUpdateListener( const css::uno::Reference< css::form::XUpdateListener >& aListener ) 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 void SAL_CALL getFastPropertyValue(css::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::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; -// ::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; // 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; // 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; // XRowSetChangeListener - virtual void SAL_CALL onRowSetChanged( const ::com::sun::star::lang::EventObject& i_Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL onRowSetChanged( const css::lang::EventObject& i_Event ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // 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; + 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; protected: // XBindableValue - virtual void SAL_CALL setValueBinding( const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XValueBinding >& _rxBinding ) throw (::com::sun::star::form::binding::IncompatibleTypesException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XValueBinding > SAL_CALL getValueBinding( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setValueBinding( const css::uno::Reference< css::form::binding::XValueBinding >& _rxBinding ) throw (css::form::binding::IncompatibleTypesException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::form::binding::XValueBinding > SAL_CALL getValueBinding( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XModifyListener - virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& _rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL modified( const css::lang::EventObject& _rEvent ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XValidatable - virtual void SAL_CALL setValidator( const ::com::sun::star::uno::Reference< ::com::sun::star::form::validation::XValidator >& Validator ) throw (::com::sun::star::util::VetoException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::form::validation::XValidator > SAL_CALL getValidator( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setValidator( const css::uno::Reference< css::form::validation::XValidator >& Validator ) throw (css::util::VetoException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::form::validation::XValidator > SAL_CALL getValidator( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XValidityConstraintListener - virtual void SAL_CALL validityConstraintChanged( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL validityConstraintChanged( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XValidatableFormComponent - virtual sal_Bool SAL_CALL isValid( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL getCurrentValue( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addFormComponentValidityListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::validation::XFormComponentValidityListener >& Listener ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeFormComponentValidityListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::validation::XFormComponentValidityListener >& Listener ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isValid( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getCurrentValue( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addFormComponentValidityListener( const css::uno::Reference< css::form::validation::XFormComponentValidityListener >& Listener ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeFormComponentValidityListener( const css::uno::Reference< css::form::validation::XFormComponentValidityListener >& Listener ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: // OPropertyChangeListener virtual void - _propertyChanged( const ::com::sun::star::beans::PropertyChangeEvent& _rEvt ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + _propertyChanged( const css::beans::PropertyChangeEvent& _rEvt ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /// checks whether we currently have an external value binding in place inline bool hasExternalValueBinding() const { return m_xExternalBinding.is(); } @@ -1098,7 +1097,7 @@ protected: @see initValueProperty */ - const ::com::sun::star::uno::Type& + const css::uno::Type& getExternalValueType() const { return m_aExternalValueType; } /** initializes the control from m_xField @@ -1109,10 +1108,10 @@ protected: @precond m_xField is not <NULL/> */ - void initFromField( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet>& _rxForm ); + void initFromField( const css::uno::Reference< css::sdbc::XRowSet>& _rxForm ); private: - bool connectToField( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet>& _rxForm ); + bool connectToField( const css::uno::Reference< css::sdbc::XRowSet>& _rxForm ); void resetField(); /** does a new validation of the control value @@ -1187,7 +1186,7 @@ private: there currently is no external binding in place */ void connectExternalValueBinding( - const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XValueBinding >& _rxBinding, + const css::uno::Reference< css::form::binding::XValueBinding >& _rxBinding, ControlModelLock& _rInstanceLock ); @@ -1206,7 +1205,7 @@ private: our mutex is currently locked exactly once */ void connectValidator( - const ::com::sun::star::uno::Reference< ::com::sun::star::form::validation::XValidator >& _rxValidator + const css::uno::Reference< css::form::validation::XValidator >& _rxValidator ); /** disconnects the component from its current an external validator @@ -1218,7 +1217,7 @@ private: */ void disconnectValidator( ); - /** called from within <member scope="com::sun::star:::form::binding">XBindableValue::setValueBinding</member> + /** called from within <member scope="css:::form::binding">XBindableValue::setValueBinding</member> to approve the new binding The default implementation approves the binding if and only if it is not <NULL/>, and supports @@ -1233,7 +1232,7 @@ private: @seealso getExternalValueType */ bool impl_approveValueBinding_nolock( - const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XValueBinding >& _rxBinding + const css::uno::Reference< css::form::binding::XValueBinding >& _rxBinding ); }; diff --git a/forms/source/inc/InterfaceContainer.hxx b/forms/source/inc/InterfaceContainer.hxx index 56542d201e81..131d0ba9877d 100644 --- a/forms/source/inc/InterfaceContainer.hxx +++ b/forms/source/inc/InterfaceContainer.hxx @@ -62,10 +62,10 @@ namespace frm struct ElementDescription { public: - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xInterface; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xPropertySet; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XChild > xChild; - ::com::sun::star::uno::Any aElementTypeInterface; + css::uno::Reference< css::uno::XInterface > xInterface; + css::uno::Reference< css::beans::XPropertySet > xPropertySet; + css::uno::Reference< css::container::XChild > xChild; + css::uno::Any aElementTypeInterface; public: ElementDescription( ); @@ -83,14 +83,14 @@ typedef std::unordered_multimap< OUString, css::uno::Reference<css::uno::XInterf // OInterfaceContainer // implements a container for form components -typedef ::cppu::ImplHelper8 < ::com::sun::star::container::XNameContainer - , ::com::sun::star::container::XIndexContainer - , ::com::sun::star::container::XContainer - , ::com::sun::star::container::XEnumerationAccess - , ::com::sun::star::script::XEventAttacherManager - , ::com::sun::star::beans::XPropertyChangeListener - , ::com::sun::star::io::XPersistObject - , ::com::sun::star::util::XCloneable +typedef ::cppu::ImplHelper8 < css::container::XNameContainer + , css::container::XIndexContainer + , css::container::XContainer + , css::container::XEnumerationAccess + , css::script::XEventAttacherManager + , css::beans::XPropertyChangeListener + , css::io::XPersistObject + , css::util::XCloneable > OInterfaceContainer_BASE; class OInterfaceContainer : public OInterfaceContainer_BASE @@ -102,19 +102,19 @@ protected: OInterfaceMap m_aMap; ::cppu::OInterfaceContainerHelper m_aContainerListeners; - const ::com::sun::star::uno::Type m_aElementType; + const css::uno::Type m_aElementType; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> m_xContext; + css::uno::Reference< css::uno::XComponentContext> m_xContext; // EventManager - ::com::sun::star::uno::Reference< ::com::sun::star::script::XEventAttacherManager> m_xEventAttacher; + css::uno::Reference< css::script::XEventAttacherManager> m_xEventAttacher; public: OInterfaceContainer( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxFactory, + const css::uno::Reference< css::uno::XComponentContext>& _rxFactory, ::osl::Mutex& _rMutex, - const ::com::sun::star::uno::Type& _rElementType); + const css::uno::Type& _rElementType); OInterfaceContainer( ::osl::Mutex& _rMutex, const OInterfaceContainer& _cloneSource ); @@ -125,63 +125,63 @@ protected: virtual ~OInterfaceContainer(); public: -// ::com::sun::star::io::XPersistObject - virtual OUString SAL_CALL getServiceName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; - virtual void SAL_CALL write( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream >& OutStream ) 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 >& InStream ) throw(::com::sun::star::io::IOException, ::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::beans::XPropertyChangeListener - virtual void SAL_CALL propertyChange(const ::com::sun::star::beans::PropertyChangeEvent& evt) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - -// ::com::sun::star::container::XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - -// ::com::sun::star::container::XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration> SAL_CALL createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - -// ::com::sun::star::container::XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> SAL_CALL getElementNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - -// ::com::sun::star::container::XNameReplace - virtual void SAL_CALL replaceByName(const OUString& Name, const ::com::sun::star::uno::Any& _rElement) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - -// ::com::sun::star::container::XNameContainer - virtual void SAL_CALL insertByName(const OUString& Name, const ::com::sun::star::uno::Any& _rElement) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeByName(const OUString& Name) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - -// ::com::sun::star::container::XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 _nIndex) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - -// ::com::sun::star::container::XIndexReplace - virtual void SAL_CALL replaceByIndex(sal_Int32 _nIndex, const ::com::sun::star::uno::Any& _rElement) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - -// ::com::sun::star::container::XIndexContainer - virtual void SAL_CALL insertByIndex(sal_Int32 _nIndex, const ::com::sun::star::uno::Any& Element) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeByIndex(sal_Int32 _nIndex) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - -// ::com::sun::star::container::XContainer - virtual void SAL_CALL addContainerListener(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeContainerListener(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - -// ::com::sun::star::script::XEventAttacherManager - virtual void SAL_CALL registerScriptEvent( sal_Int32 nIndex, const ::com::sun::star::script::ScriptEventDescriptor& aScriptEvent ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL registerScriptEvents( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor >& aScriptEvents ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL revokeScriptEvent( sal_Int32 nIndex, const OUString& aListenerType, const OUString& aEventMethod, const OUString& aRemoveListenerParam ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL revokeScriptEvents( sal_Int32 nIndex ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL insertEntry( sal_Int32 nIndex ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeEntry( sal_Int32 nIndex ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor > SAL_CALL getScriptEvents( sal_Int32 Index ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL attach( sal_Int32 nIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xObject, const ::com::sun::star::uno::Any& aHelper ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::ServiceNotRegisteredException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL detach( sal_Int32 nIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xObject ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addScriptListener( const ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptListener >& xListener ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeScriptListener( const ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptListener >& Listener ) throw(::com::sun::star::lang::IllegalArgumentException, ::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 = 0; + virtual void SAL_CALL write( const css::uno::Reference< css::io::XObjectOutputStream >& OutStream ) throw(css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL read( const css::uno::Reference< css::io::XObjectInputStream >& InStream ) throw(css::io::IOException, 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::beans::XPropertyChangeListener + virtual void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + +// css::container::XElementAccess + virtual css::uno::Type SAL_CALL getElementType() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + +// css::container::XEnumerationAccess + virtual css::uno::Reference< css::container::XEnumeration> SAL_CALL createEnumeration() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + +// css::container::XNameAccess + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getElementNames( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + +// css::container::XNameReplace + virtual void SAL_CALL replaceByName(const OUString& Name, const css::uno::Any& _rElement) throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + +// css::container::XNameContainer + virtual void SAL_CALL insertByName(const OUString& Name, const css::uno::Any& _rElement) throw(css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeByName(const OUString& Name) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + +// css::container::XIndexAccess + virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 _nIndex) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + +// css::container::XIndexReplace + virtual void SAL_CALL replaceByIndex(sal_Int32 _nIndex, const css::uno::Any& _rElement) throw(css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + +// css::container::XIndexContainer + virtual void SAL_CALL insertByIndex(sal_Int32 _nIndex, const css::uno::Any& Element) throw(css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeByIndex(sal_Int32 _nIndex) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + +// css::container::XContainer + virtual void SAL_CALL addContainerListener(const css::uno::Reference< css::container::XContainerListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeContainerListener(const css::uno::Reference< css::container::XContainerListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + +// css::script::XEventAttacherManager + virtual void SAL_CALL registerScriptEvent( sal_Int32 nIndex, const css::script::ScriptEventDescriptor& aScriptEvent ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL registerScriptEvents( sal_Int32 nIndex, const css::uno::Sequence< css::script::ScriptEventDescriptor >& aScriptEvents ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL revokeScriptEvent( sal_Int32 nIndex, const OUString& aListenerType, const OUString& aEventMethod, const OUString& aRemoveListenerParam ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL revokeScriptEvents( sal_Int32 nIndex ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL insertEntry( sal_Int32 nIndex ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeEntry( sal_Int32 nIndex ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::script::ScriptEventDescriptor > SAL_CALL getScriptEvents( sal_Int32 Index ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL attach( sal_Int32 nIndex, const css::uno::Reference< css::uno::XInterface >& xObject, const css::uno::Any& aHelper ) throw(css::lang::IllegalArgumentException, css::lang::ServiceNotRegisteredException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL detach( sal_Int32 nIndex, const css::uno::Reference< css::uno::XInterface >& xObject ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addScriptListener( const css::uno::Reference< css::script::XScriptListener >& xListener ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeScriptListener( const css::uno::Reference< css::script::XScriptListener >& Listener ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: // helper @@ -194,7 +194,7 @@ protected: later on to implInserted/implReplaced.</p> */ 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 ); @@ -214,11 +214,11 @@ protected: */ void implInsert( sal_Int32 _nIndex, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObject, + const css::uno::Reference< css::beans::XPropertySet >& _rxObject, bool _bEvents /* = sal_True */, ElementDescription* _pApprovalResult /* = NULL */ , bool _bFire /* = sal_True */ - ) throw(::com::sun::star::lang::IllegalArgumentException); + ) throw(css::lang::IllegalArgumentException); // called after the object is inserted, but before the "real listeners" are notified virtual void implInserted( const ElementDescription* _pElement ); @@ -229,12 +229,12 @@ protected: the instance lock. */ virtual void impl_replacedElement( - const ::com::sun::star::container::ContainerEvent& _rEvent, + const css::container::ContainerEvent& _rEvent, ::osl::ClearableMutexGuard& _rInstanceLock ); - void SAL_CALL writeEvents(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream); - void SAL_CALL readEvents(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream); + void SAL_CALL writeEvents(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream); + void SAL_CALL readEvents(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream); /** replace an element, specified by position @@ -244,7 +244,7 @@ protected: */ void implReplaceByIndex( const sal_Int32 _nIndex, - const ::com::sun::star::uno::Any& _rNewElement, + const css::uno::Any& _rNewElement, ::osl::ClearableMutexGuard& _rClearBeforeNotify ); @@ -260,7 +260,7 @@ protected: ); /** validates the given index - @throws ::com::sun::star::lang::IndexOutOfBoundsException + @throws css::lang::IndexOutOfBoundsException if the given index does not denote a valid position in our children array */ void implCheckIndex( const sal_Int32 _nIndex ); @@ -280,7 +280,7 @@ private: void impl_createEventAttacher_nothrow(); }; -typedef ::cppu::ImplHelper1< ::com::sun::star::form::XFormComponent> OFormComponents_BASE; +typedef ::cppu::ImplHelper1< css::form::XFormComponent> OFormComponents_BASE; typedef ::cppu::OComponentHelper FormComponentsBase; // else MSVC kills itself on some statements class OFormComponents :public FormComponentsBase @@ -288,25 +288,25 @@ class OFormComponents :public FormComponentsBase ,public OFormComponents_BASE { protected: - ::osl::Mutex m_aMutex; + ::osl::Mutex m_aMutex; css::uno::Reference<css::uno::XInterface> m_xParent; public: - OFormComponents(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxFactory); + OFormComponents(const css::uno::Reference< css::uno::XComponentContext>& _rxFactory); OFormComponents( const OFormComponents& _cloneSource ); virtual ~OFormComponents(); DECLARE_UNO3_AGG_DEFAULTS(OFormComponents, FormComponentsBase) - 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 ::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::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) 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; -// ::com::sun::star::form::XFormComponent - 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::form::XFormComponent + 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; // XEventListener using OInterfaceContainer::disposing; diff --git a/forms/source/inc/cloneable.hxx b/forms/source/inc/cloneable.hxx index 50c3dca17daf..e920650a516c 100644 --- a/forms/source/inc/cloneable.hxx +++ b/forms/source/inc/cloneable.hxx @@ -29,10 +29,10 @@ namespace frm class OCloneableAggregation { protected: - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation> m_xAggregate; + css::uno::Reference< css::uno::XAggregation> m_xAggregate; protected: - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation > createAggregateClone( const OCloneableAggregation* _pOriginal ); + static css::uno::Reference< css::uno::XAggregation > createAggregateClone( const OCloneableAggregation* _pOriginal ); }; diff --git a/forms/source/inc/commanddescriptionprovider.hxx b/forms/source/inc/commanddescriptionprovider.hxx index 75a695b8e65b..a43a41f80419 100644 --- a/forms/source/inc/commanddescriptionprovider.hxx +++ b/forms/source/inc/commanddescriptionprovider.hxx @@ -48,8 +48,8 @@ namespace frm PCommandDescriptionProvider createDocumentCommandDescriptionProvider( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& _rxDocument + const css::uno::Reference< css::uno::XComponentContext >& _rxContext, + const css::uno::Reference< css::frame::XModel >& _rxDocument ); diff --git a/forms/source/inc/commandimageprovider.hxx b/forms/source/inc/commandimageprovider.hxx index 21cc14a5af7e..af0aefcc9f0e 100644 --- a/forms/source/inc/commandimageprovider.hxx +++ b/forms/source/inc/commandimageprovider.hxx @@ -36,8 +36,8 @@ namespace frm //= ICommandImageProvider typedef OUString CommandURL; - typedef ::com::sun::star::uno::Sequence< CommandURL > CommandURLs; - typedef ::std::vector< Image > CommandImages; + typedef css::uno::Sequence< CommandURL > CommandURLs; + typedef ::std::vector< Image > CommandImages; class SAL_NO_VTABLE ICommandImageProvider { @@ -58,7 +58,7 @@ namespace frm PCommandImageProvider createDocumentCommandImageProvider( const css::uno::Reference<css::uno::XComponentContext>& _rContext, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& _rxDocument + const css::uno::Reference< css::frame::XModel >& _rxDocument ); diff --git a/forms/source/inc/componenttools.hxx b/forms/source/inc/componenttools.hxx index 969a442a3126..4a41e88d9938 100644 --- a/forms/source/inc/componenttools.hxx +++ b/forms/source/inc/componenttools.hxx @@ -32,10 +32,10 @@ namespace frm { - struct TypeCompareLess : public ::std::binary_function< ::com::sun::star::uno::Type, ::com::sun::star::uno::Type, bool > + struct TypeCompareLess : public ::std::binary_function< css::uno::Type, css::uno::Type, bool > { private: - typedef ::com::sun::star::uno::Type Type; + typedef css::uno::Type Type; public: bool operator()( const Type& _rLHS, const Type& _rRHS ) const @@ -44,14 +44,14 @@ namespace frm } }; - /** a helper class which merges sequences of <type scope="com::sun::star::uno">Type</type>s, + /** a helper class which merges sequences of <type scope="css::uno">Type</type>s, so that the resulting sequence contains every type at most once */ class TypeBag { public: - typedef ::com::sun::star::uno::Type Type; - typedef ::com::sun::star::uno::Sequence< Type > TypeSequence; + typedef css::uno::Type Type; + typedef css::uno::Sequence< Type > TypeSequence; typedef ::std::set< Type, TypeCompareLess > TypeSet; private: @@ -81,8 +81,8 @@ namespace frm TypeSequence getTypes() const; }; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > getXModel( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxComponent ); + css::uno::Reference< css::frame::XModel > getXModel( + const css::uno::Reference< css::uno::XInterface >& _rxComponent ); } // namespace frm diff --git a/forms/source/inc/controlfeatureinterception.hxx b/forms/source/inc/controlfeatureinterception.hxx index 54c0a2c46298..0ef9e90fc620 100644 --- a/forms/source/inc/controlfeatureinterception.hxx +++ b/forms/source/inc/controlfeatureinterception.hxx @@ -39,7 +39,7 @@ namespace frm by external instances For using this class, instantiate it as member, derive yourself from - <type scope="com::sun::star::frame">XDispatchProviderInterception</type>, and forward all + <type scope="css::frame">XDispatchProviderInterception</type>, and forward all respective methods to this member. Additionally, don't forget to call <member>dispose</member> when your class is disposed itself. @@ -47,8 +47,8 @@ namespace frm class ControlFeatureInterception { private: - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterceptor > - m_xFirstDispatchInterceptor; + css::uno::Reference< css::frame::XDispatchProviderInterceptor > + m_xFirstDispatchInterceptor; ::std::unique_ptr< UrlTransformer > m_pUrlTransformer; public: @@ -57,29 +57,29 @@ namespace frm const UrlTransformer& getTransformer() const { return *m_pUrlTransformer; } public: - ControlFeatureInterception( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB ); + ControlFeatureInterception( const css::uno::Reference< css::uno::XComponentContext >& _rxORB ); // XDispatchProviderInterception - void SAL_CALL registerDispatchProviderInterceptor( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterceptor >& Interceptor ) throw (::com::sun::star::uno::RuntimeException ); - void SAL_CALL releaseDispatchProviderInterceptor( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterceptor >& Interceptor ) throw (::com::sun::star::uno::RuntimeException ); + void SAL_CALL registerDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& Interceptor ) throw (css::uno::RuntimeException ); + void SAL_CALL releaseDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& Interceptor ) throw (css::uno::RuntimeException ); // XComponent void SAL_CALL dispose(); /** queries the interceptor chain for the given dispatch */ - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > - queryDispatch( const ::com::sun::star::util::URL& _rURL, const OUString& _rTargetFrameName, ::sal_Int32 _nSearchFlags ); + css::uno::Reference< css::frame::XDispatch > + queryDispatch( const css::util::URL& _rURL, const OUString& _rTargetFrameName, ::sal_Int32 _nSearchFlags ); /** queries the interceptor chain for the given dispatch, with a blank target frame and no frame search flags */ - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > - queryDispatch( const ::com::sun::star::util::URL& _rURL ); + css::uno::Reference< css::frame::XDispatch > + queryDispatch( const css::util::URL& _rURL ); /** queries the interceptor chain for the URL given as ASCII string, with a blank target frame and no frame search flags */ - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > + css::uno::Reference< css::frame::XDispatch > queryDispatch( const sal_Char* _pAsciiURL ); }; diff --git a/forms/source/inc/featuredispatcher.hxx b/forms/source/inc/featuredispatcher.hxx index f24172de6ba6..63e94399e12d 100644 --- a/forms/source/inc/featuredispatcher.hxx +++ b/forms/source/inc/featuredispatcher.hxx @@ -50,7 +50,7 @@ namespace frm virtual void dispatchWithArgument( sal_Int16 _nFeatureId, const sal_Char* _pParamName, - const ::com::sun::star::uno::Any& _rParamValue + const css::uno::Any& _rParamValue ) const = 0; /** checks whether a given feature is enabled diff --git a/forms/source/inc/formcontrolfont.hxx b/forms/source/inc/formcontrolfont.hxx index 89a2e886fb75..b0f544ad4a8b 100644 --- a/forms/source/inc/formcontrolfont.hxx +++ b/forms/source/inc/formcontrolfont.hxx @@ -37,18 +37,18 @@ namespace frm { private: // <properties> - ::com::sun::star::awt::FontDescriptor m_aFont; + css::awt::FontDescriptor m_aFont; sal_Int16 m_nFontRelief; sal_Int16 m_nFontEmphasis; - ::com::sun::star::uno::Any m_aTextLineColor; - ::com::sun::star::uno::Any m_aTextColor; + css::uno::Any m_aTextLineColor; + css::uno::Any m_aTextColor; // </properties> bool m_bToolkitCompatibleDefaults; protected: - const ::com::sun::star::awt::FontDescriptor& getFont() const { return m_aFont; } - void setFont( const ::com::sun::star::awt::FontDescriptor& _rFont ) { m_aFont = _rFont; } + const css::awt::FontDescriptor& getFont() const { return m_aFont; } + void setFont( const css::awt::FontDescriptor& _rFont ) { m_aFont = _rFont; } void setTextColor( sal_Int32 _nColor ) { m_aTextColor <<= _nColor; } void clearTextColor( ) { m_aTextColor.clear(); } @@ -70,17 +70,16 @@ namespace frm /// appends (!) the description of all font related properties to the given sequence static void describeFontRelatedProperties( - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rProps ); + css::uno::Sequence< css::beans::Property >& /* [out] */ _rProps ); - void getFastPropertyValue ( ::com::sun::star::uno::Any& _rValue, sal_Int32 _nHandle ) const; - bool 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 ); + void getFastPropertyValue ( css::uno::Any& _rValue, sal_Int32 _nHandle ) const; + bool convertFastPropertyValue ( css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue ) throw( css::lang::IllegalArgumentException ); void setFastPropertyValue_NoBroadcast_impl( - ::cppu::OPropertySetHelper & rBase, - void (::cppu::OPropertySetHelper::*pSet)( - sal_Int32, css::uno::Any const&), - sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue) - throw ( ::com::sun::star::uno::Exception ); - ::com::sun::star::uno::Any + ::cppu::OPropertySetHelper & rBase, + void (::cppu::OPropertySetHelper::*pSet)( sal_Int32, css::uno::Any const&), + sal_Int32 nHandle, const css::uno::Any& rValue) + throw ( css::uno::Exception ); + css::uno::Any getPropertyDefaultByHandle ( sal_Int32 _nHandle ) const; private: diff --git a/forms/source/inc/formnavigation.hxx b/forms/source/inc/formnavigation.hxx index 4a4a59e7ab78..0e6db22e34d3 100644 --- a/forms/source/inc/formnavigation.hxx +++ b/forms/source/inc/formnavigation.hxx @@ -43,8 +43,8 @@ namespace frm //= OFormNavigationHelper - typedef ::cppu::ImplHelper2 < ::com::sun::star::frame::XDispatchProviderInterception - , ::com::sun::star::frame::XStatusListener + typedef ::cppu::ImplHelper2 < css::frame::XDispatchProviderInterception + , css::frame::XStatusListener > OFormNavigationHelper_Base; class OFormNavigationHelper @@ -54,17 +54,17 @@ namespace frm private: struct FeatureInfo { - ::com::sun::star::util::URL aURL; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDispatcher; - bool bCachedState; - ::com::sun::star::uno::Any aCachedAdditionalState; + css::util::URL aURL; + css::uno::Reference< css::frame::XDispatch > xDispatcher; + bool bCachedState; + css::uno::Any aCachedAdditionalState; FeatureInfo() : bCachedState( false ) { } }; typedef ::std::map< sal_Int16, FeatureInfo > FeatureMap; private: - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > + css::uno::Reference< css::uno::XComponentContext > m_xORB; ::std::unique_ptr< ControlFeatureInterception > m_pFeatureInterception; @@ -75,25 +75,25 @@ namespace frm sal_Int32 m_nConnectedFeatures; protected: - OFormNavigationHelper( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB ); + OFormNavigationHelper( const css::uno::Reference< css::uno::XComponentContext >& _rxORB ); virtual ~OFormNavigationHelper(); // XComponent - void SAL_CALL dispose( ) throw( ::com::sun::star::uno::RuntimeException ); + void SAL_CALL dispose( ) throw( css::uno::RuntimeException ); // 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; // XStatusListener - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& State ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& State ) 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; // IFeatureDispatcher virtual void dispatch( sal_Int16 _nFeatureId ) const SAL_OVERRIDE; - virtual void dispatchWithArgument( sal_Int16 _nFeatureId, const sal_Char* _pParamName, const ::com::sun::star::uno::Any& _rParamValue ) const SAL_OVERRIDE; + virtual void dispatchWithArgument( sal_Int16 _nFeatureId, const sal_Char* _pParamName, const css::uno::Any& _rParamValue ) const SAL_OVERRIDE; virtual bool isEnabled( sal_Int16 _nFeatureId ) const SAL_OVERRIDE; virtual bool getBooleanState( sal_Int16 _nFeatureId ) const SAL_OVERRIDE; virtual OUString getStringState( sal_Int16 _nFeatureId ) const SAL_OVERRIDE; @@ -152,8 +152,8 @@ namespace frm /** queries the interceptor chain for a dispatcher for the given URL */ - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > - queryDispatch( const ::com::sun::star::util::URL& _rURL ); + css::uno::Reference< css::frame::XDispatch > + queryDispatch( const css::util::URL& _rURL ); /** invalidates the set of supported features @@ -179,7 +179,7 @@ namespace frm public: OFormNavigationMapper( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB + const css::uno::Reference< css::uno::XComponentContext >& _rxORB ); ~OFormNavigationMapper( ); @@ -197,7 +197,7 @@ namespace frm <TRUE/> if and only if the given id is a known feature id (which is a valid usage) */ - bool getFeatureURL( sal_Int16 _nFeatureId, ::com::sun::star::util::URL& /* [out] */ _rURL ); + bool getFeatureURL( sal_Int16 _nFeatureId, css::util::URL& /* [out] */ _rURL ); /** retrieves the feature id belonging to an feature URL diff --git a/forms/source/inc/limitedformats.hxx b/forms/source/inc/limitedformats.hxx index 0328e1fa9a4f..1d8cc6ba37ee 100644 --- a/forms/source/inc/limitedformats.hxx +++ b/forms/source/inc/limitedformats.hxx @@ -42,13 +42,13 @@ namespace frm private: static sal_Int32 s_nInstanceCount; static ::osl::Mutex s_aMutex; - static ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > + static css::uno::Reference< css::util::XNumberFormatsSupplier > s_xStandardFormats; protected: sal_Int32 m_nFormatEnumPropertyHandle; const sal_Int16 m_nTableId; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XFastPropertySet > + css::uno::Reference< css::beans::XFastPropertySet > m_xAggregate; protected: @@ -57,32 +57,32 @@ namespace frm pass the same value here share one table.</p> */ OLimitedFormats( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, + const css::uno::Reference< css::uno::XComponentContext >& _rxContext, const sal_Int16 _nClassId ); ~OLimitedFormats(); protected: void setAggregateSet( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XFastPropertySet >& _rxAggregate, + const css::uno::Reference< css::beans::XFastPropertySet >& _rxAggregate, sal_Int32 _nOriginalPropertyHandle ); protected: - void getFormatKeyPropertyValue( ::com::sun::star::uno::Any& _rValue ) const; + void getFormatKeyPropertyValue( css::uno::Any& _rValue ) const; bool convertFormatKeyPropertyValue( - ::com::sun::star::uno::Any& _rConvertedValue, - ::com::sun::star::uno::Any& _rOldValue, - const ::com::sun::star::uno::Any& _rNewValue + css::uno::Any& _rConvertedValue, + css::uno::Any& _rOldValue, + const css::uno::Any& _rNewValue ); - void setFormatKeyPropertyValue( const ::com::sun::star::uno::Any& _rNewValue ); + void setFormatKeyPropertyValue( const css::uno::Any& _rNewValue ); // setFormatKeyPropertyValue should only be called with a value got from convertFormatKeyPropertyValue! - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > + css::uno::Reference< css::util::XNumberFormatsSupplier > getFormatsSupplier() const { return s_xStandardFormats; } private: - void acquireSupplier(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext); + void acquireSupplier(const css::uno::Reference< css::uno::XComponentContext >& _rxContext); void releaseSupplier(); static void ensureTableInitialized(const sal_Int16 _nTableId); diff --git a/forms/source/inc/listenercontainers.hxx b/forms/source/inc/listenercontainers.hxx index 4e19758936fe..386e75937f6d 100644 --- a/forms/source/inc/listenercontainers.hxx +++ b/forms/source/inc/listenercontainers.hxx @@ -29,11 +29,11 @@ namespace frm { template < class LISTENER > - class EventListeners : public ::comphelper::OListenerContainerBase< LISTENER, ::com::sun::star::lang::EventObject > + class EventListeners : public ::comphelper::OListenerContainerBase< LISTENER, css::lang::EventObject > { public: typedef LISTENER ListenerClass; - typedef ::com::sun::star::lang::EventObject EventClass; + typedef css::lang::EventObject EventClass; typedef ::comphelper::OListenerContainerBase< ListenerClass, EventClass > EventListeners_Base; @@ -50,13 +50,13 @@ namespace frm public: inline bool notify() { - ::com::sun::star::lang::EventObject aEvent( m_rInstigator ); + css::lang::EventObject aEvent( m_rInstigator ); return EventListeners_Base::notify( aEvent ); } inline void disposing() { - ::com::sun::star::lang::EventObject aEvent( m_rInstigator ); + css::lang::EventObject aEvent( m_rInstigator ); EventListeners_Base::disposing( aEvent ); } protected: @@ -64,7 +64,7 @@ namespace frm using EventListeners_Base::disposing; }; - typedef EventListeners < ::com::sun::star::form::XResetListener + typedef EventListeners < css::form::XResetListener > ResetListeners_Base; class ResetListeners : public ResetListeners_Base { @@ -101,8 +101,8 @@ namespace frm protected: virtual bool implTypedNotify( - const ::com::sun::star::uno::Reference< ::com::sun::star::form::XResetListener >& _rxListener, - const ::com::sun::star::lang::EventObject& _rEvent + const css::uno::Reference< css::form::XResetListener >& _rxListener, + const css::lang::EventObject& _rEvent ) SAL_OVERRIDE; }; diff --git a/forms/source/inc/property.hrc b/forms/source/inc/property.hrc index c924aab7102c..2844eb07561c 100644 --- a/forms/source/inc/property.hrc +++ b/forms/source/inc/property.hrc @@ -204,10 +204,10 @@ namespace frm #define PROPERTY_ID_PRIVILEGES (PROPERTY_ID_START +179) // INT32 #define PROPERTY_ID_DETAILFIELDS (PROPERTY_ID_START +180) // Sequence< ::rtl::OUString > #define PROPERTY_ID_COMMAND (PROPERTY_ID_START +181) // String -#define PROPERTY_ID_COMMANDTYPE (PROPERTY_ID_START +182) // INT32 (com::sun::star::sdb::CommandType) -#define PROPERTY_ID_RESULTSET_CONCURRENCY (PROPERTY_ID_START +183)// INT32 (com::sun::star::sdbc::ResultSetConcurrency) +#define PROPERTY_ID_COMMANDTYPE (PROPERTY_ID_START +182) // INT32 (css::sdb::CommandType) +#define PROPERTY_ID_RESULTSET_CONCURRENCY (PROPERTY_ID_START +183)// INT32 (css::sdbc::ResultSetConcurrency) #define PROPERTY_ID_INSERTONLY (PROPERTY_ID_START +184) // BOOL -#define PROPERTY_ID_RESULTSET_TYPE (PROPERTY_ID_START +185) // INT32 (com::sun::star::sdbc::ResultSetType) +#define PROPERTY_ID_RESULTSET_TYPE (PROPERTY_ID_START +185) // INT32 (css::sdbc::ResultSetType) #define PROPERTY_ID_ESCAPE_PROCESSING (PROPERTY_ID_START +186) // BOOL #define PROPERTY_ID_APPLYFILTER (PROPERTY_ID_START +187) // BOOL @@ -216,7 +216,7 @@ namespace frm #define PROPERTY_ID_ISCURRENCY (PROPERTY_ID_START +190) // BOOL #define PROPERTY_ID_URL (PROPERTY_ID_START +192) // String #define PROPERTY_ID_TITLE (PROPERTY_ID_START +193) // String -#define PROPERTY_ID_ACTIVE_CONNECTION (PROPERTY_ID_START +194) // com::sun::star::sdbc::XConnection +#define PROPERTY_ID_ACTIVE_CONNECTION (PROPERTY_ID_START +194) // css::sdbc::XConnection #define PROPERTY_ID_SCALE (PROPERTY_ID_START +195) // INT32 #define PROPERTY_ID_SORT (PROPERTY_ID_START +196) // String diff --git a/forms/source/inc/property.hxx b/forms/source/inc/property.hxx index bfbc55f6b558..7737652f0d31 100644 --- a/forms/source/inc/property.hxx +++ b/forms/source/inc/property.hxx @@ -101,32 +101,32 @@ public: #define DECL_PROP_IMPL(varname, type) \ - *pProperties++ = com::sun::star::beans::Property(PROPERTY_##varname, PROPERTY_ID_##varname, cppu::UnoType<type>::get(), + *pProperties++ = css::beans::Property(PROPERTY_##varname, PROPERTY_ID_##varname, cppu::UnoType<type>::get(), #define DECL_BOOL_PROP_IMPL(varname) \ - *pProperties++ = com::sun::star::beans::Property(PROPERTY_##varname, PROPERTY_ID_##varname, cppu::UnoType<bool>::get(), + *pProperties++ = css::beans::Property(PROPERTY_##varname, PROPERTY_ID_##varname, cppu::UnoType<bool>::get(), #define DECL_IFACE_PROP_IMPL(varname, type) \ - *pProperties++ = com::sun::star::beans::Property(PROPERTY_##varname, PROPERTY_ID_##varname, cppu::UnoType<type>::get(), + *pProperties++ = css::beans::Property(PROPERTY_##varname, PROPERTY_ID_##varname, cppu::UnoType<type>::get(), #define BEGIN_DESCRIBE_PROPERTIES( count, baseclass ) \ baseclass::describeFixedProperties( _rProps ); \ sal_Int32 nOldCount = _rProps.getLength(); \ _rProps.realloc( nOldCount + ( count ) ); \ - ::com::sun::star::beans::Property* pProperties = _rProps.getArray() + nOldCount; \ + css::beans::Property* pProperties = _rProps.getArray() + nOldCount; \ #define BEGIN_DESCRIBE_BASE_PROPERTIES( count ) \ _rProps.realloc( count ); \ - ::com::sun::star::beans::Property* pProperties = _rProps.getArray(); \ + css::beans::Property* pProperties = _rProps.getArray(); \ #define BEGIN_DESCRIBE_AGGREGATION_PROPERTIES( count, aggregate ) \ _rProps.realloc( count ); \ - ::com::sun::star::beans::Property* pProperties = _rProps.getArray(); \ + css::beans::Property* pProperties = _rProps.getArray(); \ \ if (aggregate.is()) \ _rAggregateProps = aggregate->getPropertySetInfo()->getProperties(); \ @@ -138,25 +138,25 @@ public: #define DECL_PROP1(varname, type, attrib1) \ - DECL_PROP_IMPL(varname, type) com::sun::star::beans::PropertyAttribute::attrib1) + DECL_PROP_IMPL(varname, type) css::beans::PropertyAttribute::attrib1) #define DECL_PROP2(varname, type, attrib1, attrib2) \ - DECL_PROP_IMPL(varname, type) com::sun::star::beans::PropertyAttribute::attrib1 | com::sun::star::beans::PropertyAttribute::attrib2) + DECL_PROP_IMPL(varname, type) css::beans::PropertyAttribute::attrib1 | css::beans::PropertyAttribute::attrib2) #define DECL_PROP3(varname, type, attrib1, attrib2, attrib3) \ - DECL_PROP_IMPL(varname, type) com::sun::star::beans::PropertyAttribute::attrib1 | com::sun::star::beans::PropertyAttribute::attrib2 | com::sun::star::beans::PropertyAttribute::attrib3) + DECL_PROP_IMPL(varname, type) css::beans::PropertyAttribute::attrib1 | css::beans::PropertyAttribute::attrib2 | css::beans::PropertyAttribute::attrib3) #define DECL_PROP4(varname, type, attrib1, attrib2, attrib3, attrib4) \ - DECL_PROP_IMPL(varname, type) com::sun::star::beans::PropertyAttribute::attrib1 | com::sun::star::beans::PropertyAttribute::attrib2 | com::sun::star::beans::PropertyAttribute::attrib3 | com::sun::star::beans::PropertyAttribute::attrib4) + DECL_PROP_IMPL(varname, type) css::beans::PropertyAttribute::attrib1 | css::beans::PropertyAttribute::attrib2 | css::beans::PropertyAttribute::attrib3 | css::beans::PropertyAttribute::attrib4) // === some property types require special handling // === such as interfaces #define DECL_IFACE_PROP2(varname, type, attrib1, attrib2) \ - DECL_IFACE_PROP_IMPL(varname, type) com::sun::star::beans::PropertyAttribute::attrib1 | com::sun::star::beans::PropertyAttribute::attrib2) + DECL_IFACE_PROP_IMPL(varname, type) css::beans::PropertyAttribute::attrib1 | css::beans::PropertyAttribute::attrib2) #define DECL_IFACE_PROP3(varname, type, attrib1, attrib2, attrib3) \ @@ -169,15 +169,15 @@ public: // === or Boolean properties #define DECL_BOOL_PROP1(varname, attrib1) \ - DECL_BOOL_PROP_IMPL(varname) com::sun::star::beans::PropertyAttribute::attrib1) + DECL_BOOL_PROP_IMPL(varname) css::beans::PropertyAttribute::attrib1) #define DECL_BOOL_PROP2(varname, attrib1, attrib2) \ - DECL_BOOL_PROP_IMPL(varname) com::sun::star::beans::PropertyAttribute::attrib1 | com::sun::star::beans::PropertyAttribute::attrib2) + DECL_BOOL_PROP_IMPL(varname) css::beans::PropertyAttribute::attrib1 | css::beans::PropertyAttribute::attrib2) #define DECL_BOOL_PROP3( varname, attrib1, attrib2, attrib3 ) \ - DECL_BOOL_PROP_IMPL(varname) com::sun::star::beans::PropertyAttribute::attrib1 | com::sun::star::beans::PropertyAttribute::attrib2 | com::sun::star::beans::PropertyAttribute::attrib3 ) + DECL_BOOL_PROP_IMPL(varname) css::beans::PropertyAttribute::attrib1 | css::beans::PropertyAttribute::attrib2 | css::beans::PropertyAttribute::attrib3 ) diff --git a/forms/source/inc/propertybaghelper.hxx b/forms/source/inc/propertybaghelper.hxx index be3951dd7494..9fe7c6b4aec4 100644 --- a/forms/source/inc/propertybaghelper.hxx +++ b/forms/source/inc/propertybaghelper.hxx @@ -41,11 +41,11 @@ namespace frm virtual ::osl::Mutex& getMutex() = 0; 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 = 0; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XMultiPropertySet > + virtual css::uno::Reference< css::beans::XMultiPropertySet > getPropertiesInterface() = 0; protected: @@ -71,18 +71,18 @@ namespace frm inline ::comphelper::OPropertyArrayAggregationHelper& getInfoHelper() const; // XPropertyContainer equivalent - void addProperty( const OUString& _rName, ::sal_Int16 _nAttributes, const ::com::sun::star::uno::Any& _rInitialValue ); + void addProperty( const OUString& _rName, ::sal_Int16 _nAttributes, const css::uno::Any& _rInitialValue ); void removeProperty( const OUString& _rName ); // XPropertyAccess equivalent - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPropertyValues(); - void setPropertyValues( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rProps ); + css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPropertyValues(); + void setPropertyValues( const css::uno::Sequence< css::beans::PropertyValue >& _rProps ); // forwards to m_aDynamicProperties - inline void getDynamicFastPropertyValue( sal_Int32 _nHandle, ::com::sun::star::uno::Any& _out_rValue ) const; - inline bool convertDynamicFastPropertyValue( sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rNewValue, ::com::sun::star::uno::Any& _out_rConvertedValue, ::com::sun::star::uno::Any& _out_rCurrentValue ) const; - inline void setDynamicFastPropertyValue( sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rValue ); - inline void getDynamicPropertyDefaultByHandle( sal_Int32 _nHandle, ::com::sun::star::uno::Any& _out_rValue ) const; + inline void getDynamicFastPropertyValue( sal_Int32 _nHandle, css::uno::Any& _out_rValue ) const; + inline bool convertDynamicFastPropertyValue( sal_Int32 _nHandle, const css::uno::Any& _rNewValue, css::uno::Any& _out_rConvertedValue, css::uno::Any& _out_rCurrentValue ) const; + inline void setDynamicFastPropertyValue( sal_Int32 _nHandle, const css::uno::Any& _rValue ); + inline void getDynamicPropertyDefaultByHandle( sal_Int32 _nHandle, css::uno::Any& _out_rValue ) const; inline bool hasDynamicPropertyByHandle( sal_Int32 _nHandle ) const; private: @@ -112,25 +112,25 @@ namespace frm } - inline void PropertyBagHelper::getDynamicFastPropertyValue( sal_Int32 _nHandle, ::com::sun::star::uno::Any& _out_rValue ) const + inline void PropertyBagHelper::getDynamicFastPropertyValue( sal_Int32 _nHandle, css::uno::Any& _out_rValue ) const { m_aDynamicProperties.getFastPropertyValue( _nHandle, _out_rValue ); } - inline bool PropertyBagHelper::convertDynamicFastPropertyValue( sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rNewValue, ::com::sun::star::uno::Any& _out_rConvertedValue, ::com::sun::star::uno::Any& _out_rCurrentValue ) const + inline bool PropertyBagHelper::convertDynamicFastPropertyValue( sal_Int32 _nHandle, const css::uno::Any& _rNewValue, css::uno::Any& _out_rConvertedValue, css::uno::Any& _out_rCurrentValue ) const { return m_aDynamicProperties.convertFastPropertyValue( _nHandle, _rNewValue, _out_rConvertedValue, _out_rCurrentValue ); } - inline void PropertyBagHelper::setDynamicFastPropertyValue( sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rValue ) + inline void PropertyBagHelper::setDynamicFastPropertyValue( sal_Int32 _nHandle, const css::uno::Any& _rValue ) { m_aDynamicProperties.setFastPropertyValue( _nHandle, _rValue ); } - inline void PropertyBagHelper::getDynamicPropertyDefaultByHandle( sal_Int32 _nHandle, ::com::sun::star::uno::Any& _out_rValue ) const + inline void PropertyBagHelper::getDynamicPropertyDefaultByHandle( sal_Int32 _nHandle, css::uno::Any& _out_rValue ) const { m_aDynamicProperties.getPropertyDefaultByHandle( _nHandle, _out_rValue ); } diff --git a/forms/source/inc/resettable.hxx b/forms/source/inc/resettable.hxx index 4dccf4c662a5..2a5cb308ad1c 100644 --- a/forms/source/inc/resettable.hxx +++ b/forms/source/inc/resettable.hxx @@ -43,8 +43,8 @@ namespace frm } // XReset equivalents - void addResetListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XResetListener >& _listener ); - void removeResetListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XResetListener >& _listener ); + void addResetListener( const css::uno::Reference< css::form::XResetListener >& _listener ); + void removeResetListener( const css::uno::Reference< css::form::XResetListener >& _listener ); // calling listeners bool approveReset(); diff --git a/forms/source/inc/urltransformer.hxx b/forms/source/inc/urltransformer.hxx index 527f30b1ce77..3ee248f8e1a1 100644 --- a/forms/source/inc/urltransformer.hxx +++ b/forms/source/inc/urltransformer.hxx @@ -32,29 +32,29 @@ namespace frm class UrlTransformer { private: - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > + css::uno::Reference< css::uno::XComponentContext > m_xORB; - mutable ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > + mutable css::uno::Reference< css::util::XURLTransformer > m_xTransformer; mutable bool m_bTriedToCreateTransformer; public: - UrlTransformer( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB ); + UrlTransformer( const css::uno::Reference< css::uno::XComponentContext >& _rxORB ); /** returns an URL object for the given URL string */ - ::com::sun::star::util::URL + css::util::URL getStrictURL( const OUString& _rURL ) const; /** returns an URL object for the given URL ASCII string */ - ::com::sun::star::util::URL + css::util::URL getStrictURLFromAscii( const sal_Char* _pAsciiURL ) const; /** parses a given URL smartly, with a protocol given by ASCII string */ void - parseSmartWithAsciiProtocol( ::com::sun::star::util::URL& _rURL, const sal_Char* _pAsciiURL ) const; + parseSmartWithAsciiProtocol( css::util::URL& _rURL, const sal_Char* _pAsciiURL ) const; private: /** ensures that we have an URLTransformer instance in <member>m_xTransformer</member> diff --git a/forms/source/inc/windowstateguard.hxx b/forms/source/inc/windowstateguard.hxx index 587c2f6265f0..828a5ae6a51f 100644 --- a/forms/source/inc/windowstateguard.hxx +++ b/forms/source/inc/windowstateguard.hxx @@ -60,8 +60,8 @@ namespace frm ~WindowStateGuard(); void attach( - const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow2 >& _rxWindow, - const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& _rxModel + const css::uno::Reference< css::awt::XWindow2 >& _rxWindow, + const css::uno::Reference< css::awt::XControlModel >& _rxModel ); }; diff --git a/forms/source/misc/InterfaceContainer.cxx b/forms/source/misc/InterfaceContainer.cxx index 3fd364fdf512..f4f72cc38c06 100644 --- a/forms/source/misc/InterfaceContainer.cxx +++ b/forms/source/misc/InterfaceContainer.cxx @@ -675,7 +675,7 @@ void SAL_CALL OInterfaceContainer::disposing(const css::lang::EventObject& _rSou // XPropertyChangeListener void OInterfaceContainer::propertyChange(const PropertyChangeEvent& evt) -throw (::com::sun::star::uno::RuntimeException, std::exception) { +throw (css::uno::RuntimeException, std::exception) { if (evt.PropertyName == PROPERTY_NAME) { ::osl::MutexGuard aGuard( m_rMutex ); diff --git a/forms/source/richtext/attributedispatcher.hxx b/forms/source/richtext/attributedispatcher.hxx index a0aad0fbb83a..b4e971f9cbb2 100644 --- a/forms/source/richtext/attributedispatcher.hxx +++ b/forms/source/richtext/attributedispatcher.hxx @@ -50,7 +50,7 @@ namespace frm OAttributeDispatcher( EditView& _rView, AttributeId _nAttributeId, - const ::com::sun::star::util::URL& _rURL, + const css::util::URL& _rURL, IMultiAttributeDispatcher* _pMasterDispatcher ); @@ -58,7 +58,7 @@ namespace frm virtual ~OAttributeDispatcher( ); // XDispatch - virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& URL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL dispatch( const css::util::URL& URL, const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ITextAttributeListener virtual void onAttributeStateChanged( AttributeId _nAttributeId, const AttributeState& _rState ) SAL_OVERRIDE; @@ -67,10 +67,10 @@ namespace frm virtual void disposing( ::osl::ClearableMutexGuard& _rClearBeforeNotify ) SAL_OVERRIDE; // ORichTextFeatureDispatcher - virtual ::com::sun::star::frame::FeatureStateEvent buildStatusEvent() const SAL_OVERRIDE; + virtual css::frame::FeatureStateEvent buildStatusEvent() const SAL_OVERRIDE; // own overridables - virtual void fillFeatureEventFromAttributeState( ::com::sun::star::frame::FeatureStateEvent& _rEvent, const AttributeState& _rState ) const; + virtual void fillFeatureEventFromAttributeState( css::frame::FeatureStateEvent& _rEvent, const AttributeState& _rState ) const; }; diff --git a/forms/source/richtext/clipboarddispatcher.hxx b/forms/source/richtext/clipboarddispatcher.hxx index 11706ebf5de2..6bf95259a4b9 100644 --- a/forms/source/richtext/clipboarddispatcher.hxx +++ b/forms/source/richtext/clipboarddispatcher.hxx @@ -48,11 +48,11 @@ namespace frm protected: // XDispatch - virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& URL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL dispatch( const css::util::URL& URL, const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ORichTextFeatureDispatcher virtual void invalidateFeatureState_Broadcast() SAL_OVERRIDE; - virtual ::com::sun::star::frame::FeatureStateEvent + virtual css::frame::FeatureStateEvent buildStatusEvent() const SAL_OVERRIDE; protected: diff --git a/forms/source/richtext/featuredispatcher.hxx b/forms/source/richtext/featuredispatcher.hxx index 03a7891e4f7f..23c94ddfc52c 100644 --- a/forms/source/richtext/featuredispatcher.hxx +++ b/forms/source/richtext/featuredispatcher.hxx @@ -31,14 +31,14 @@ class EditView; namespace frm { - typedef ::cppu::WeakImplHelper < ::com::sun::star::frame::XDispatch + typedef ::cppu::WeakImplHelper < css::frame::XDispatch > ORichTextFeatureDispatcher_Base; class ORichTextFeatureDispatcher :public ::comphelper::OBaseMutex ,public ORichTextFeatureDispatcher_Base { private: - ::com::sun::star::util::URL m_aFeatureURL; + css::util::URL m_aFeatureURL; ::cppu::OInterfaceContainerHelper m_aStatusListeners; EditView* m_pEditView; bool m_bDisposed; @@ -48,13 +48,13 @@ namespace frm const EditView* getEditView() const { return m_pEditView; } protected: - inline const ::com::sun::star::util::URL& getFeatureURL() const { return m_aFeatureURL; } + inline const css::util::URL& getFeatureURL() const { return m_aFeatureURL; } inline ::cppu::OInterfaceContainerHelper& getStatusListeners() { return m_aStatusListeners; } inline bool isDisposed() const { return m_bDisposed; } - inline void checkDisposed() const { if ( isDisposed() ) throw ::com::sun::star::lang::DisposedException(); } + inline void checkDisposed() const { if ( isDisposed() ) throw css::lang::DisposedException(); } protected: - ORichTextFeatureDispatcher( EditView& _rView, const ::com::sun::star::util::URL& _rURL ); + ORichTextFeatureDispatcher( EditView& _rView, const css::util::URL& _rURL ); virtual ~ORichTextFeatureDispatcher( ); public: @@ -65,24 +65,24 @@ namespace frm void invalidate(); protected: - void newStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& _rxListener ); + void newStatusListener( const css::uno::Reference< css::frame::XStatusListener >& _rxListener ); // overridables virtual void disposing( ::osl::ClearableMutexGuard& _rClearBeforeNotify ); virtual void invalidateFeatureState_Broadcast(); // to be overridden, and filled with the info special do your derived class - virtual ::com::sun::star::frame::FeatureStateEvent + virtual css::frame::FeatureStateEvent buildStatusEvent() const; static void doNotify( - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& _rxListener, - const ::com::sun::star::frame::FeatureStateEvent& _rEvent + const css::uno::Reference< css::frame::XStatusListener >& _rxListener, + const css::frame::FeatureStateEvent& _rEvent ); protected: // XDispatch - virtual void SAL_CALL addStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& _rxControl, const ::com::sun::star::util::URL& _rURL ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& _rxControl, const ::com::sun::star::util::URL& _rURL ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& _rxControl, const css::util::URL& _rURL ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& _rxControl, const css::util::URL& _rURL ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/forms/source/richtext/parametrizedattributedispatcher.hxx b/forms/source/richtext/parametrizedattributedispatcher.hxx index 1724e1b85060..fbb26d415e8d 100644 --- a/forms/source/richtext/parametrizedattributedispatcher.hxx +++ b/forms/source/richtext/parametrizedattributedispatcher.hxx @@ -33,7 +33,7 @@ namespace frm OParametrizedAttributeDispatcher( EditView& _rView, AttributeId _nAttributeId, - const ::com::sun::star::util::URL& _rURL, + const css::util::URL& _rURL, IMultiAttributeDispatcher* _pMasterDispatcher ); @@ -41,10 +41,10 @@ namespace frm virtual ~OParametrizedAttributeDispatcher(); // XDispatch - virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& URL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL dispatch( const css::util::URL& URL, const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // OAttributeDispatcher - virtual void fillFeatureEventFromAttributeState( ::com::sun::star::frame::FeatureStateEvent& _rEvent, const AttributeState& _rState ) const SAL_OVERRIDE; + virtual void fillFeatureEventFromAttributeState( css::frame::FeatureStateEvent& _rEvent, const AttributeState& _rState ) const SAL_OVERRIDE; protected: // own overridables @@ -52,7 +52,7 @@ namespace frm be used with a IMultiAttributeDispatcher::executeAttribute */ virtual const SfxPoolItem* convertDispatchArgsToItem( - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rArguments ); + const css::uno::Sequence< css::beans::PropertyValue >& _rArguments ); }; diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx index 58c4209cc650..de244900e5e6 100644 --- a/forms/source/richtext/richtextcontrol.cxx +++ b/forms/source/richtext/richtextcontrol.cxx @@ -241,7 +241,7 @@ namespace frm return aServices; } - Reference< XDispatch > SAL_CALL ORichTextControl::queryDispatch( const ::com::sun::star::util::URL& _rURL, const OUString& _rTargetFrameName, sal_Int32 _nSearchFlags ) throw (RuntimeException, std::exception) + Reference< XDispatch > SAL_CALL ORichTextControl::queryDispatch( const css::util::URL& _rURL, const OUString& _rTargetFrameName, sal_Int32 _nSearchFlags ) throw (RuntimeException, std::exception) { Reference< XDispatch > aReturn; Reference< XDispatchProvider > xTypedPeer( getPeer(), UNO_QUERY ); @@ -330,7 +330,7 @@ namespace frm } - void SAL_CALL ORichTextPeer::draw( sal_Int32 _nX, sal_Int32 _nY ) throw(::com::sun::star::uno::RuntimeException, std::exception) + void SAL_CALL ORichTextPeer::draw( sal_Int32 _nX, sal_Int32 _nY ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -463,7 +463,7 @@ namespace frm } - ORichTextPeer::SingleAttributeDispatcher ORichTextPeer::implCreateDispatcher( SfxSlotId _nSlotId, const ::com::sun::star::util::URL& _rURL ) + ORichTextPeer::SingleAttributeDispatcher ORichTextPeer::implCreateDispatcher( SfxSlotId _nSlotId, const css::util::URL& _rURL ) { VclPtr< RichTextControl > pRichTextControl = GetAs< RichTextControl >(); OSL_PRECOND( pRichTextControl, "ORichTextPeer::implCreateDispatcher: invalid window!" ); @@ -625,7 +625,7 @@ namespace frm } - Reference< XDispatch > SAL_CALL ORichTextPeer::queryDispatch( const ::com::sun::star::util::URL& _rURL, const OUString& /*_rTargetFrameName*/, sal_Int32 /*_nSearchFlags*/ ) throw (RuntimeException, std::exception) + Reference< XDispatch > SAL_CALL ORichTextPeer::queryDispatch( const css::util::URL& _rURL, const OUString& /*_rTargetFrameName*/, sal_Int32 /*_nSearchFlags*/ ) throw (RuntimeException, std::exception) { Reference< XDispatch > xReturn; if ( !GetWindow() ) @@ -691,9 +691,9 @@ namespace frm } // namespace frm -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_comp_form_ORichTextControl_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_comp_form_ORichTextControl_get_implementation(css::uno::XComponentContext*, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new frm::ORichTextControl()); } diff --git a/forms/source/richtext/richtextcontrol.hxx b/forms/source/richtext/richtextcontrol.hxx index cd1a48e75ff3..67514179c9a8 100644 --- a/forms/source/richtext/richtextcontrol.hxx +++ b/forms/source/richtext/richtextcontrol.hxx @@ -40,7 +40,7 @@ namespace frm class ORichTextFeatureDispatcher; - typedef ::cppu::ImplHelper1 < ::com::sun::star::frame::XDispatchProvider + typedef ::cppu::ImplHelper1 < css::frame::XDispatchProvider > ORichTextControl_Base; class ORichTextControl :public UnoEditControl ,public ORichTextControl_Base @@ -54,32 +54,32 @@ namespace frm public: // 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( ORichTextControl, UnoEditControl ) - 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; // XControl - virtual void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& _rToolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& _rParent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& _rToolkit, const css::uno::Reference< css::awt::XWindowPeer >& _rParent ) 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() // XDispatchProvider - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& _rURL, const OUString& _rTargetFrameName, sal_Int32 _rSearchFlags ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches( const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor >& Requests ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL& _rURL, const OUString& _rTargetFrameName, sal_Int32 _rSearchFlags ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& Requests ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // UnoControl virtual bool requiresNewPeer( const OUString& _rPropertyName ) const SAL_OVERRIDE; }; - typedef ::cppu::ImplHelper1 < ::com::sun::star::frame::XDispatchProvider + typedef ::cppu::ImplHelper1 < css::frame::XDispatchProvider > ORichTextPeer_Base; class ORichTextPeer :public VCLXWindow ,public ORichTextPeer_Base @@ -96,7 +96,7 @@ namespace frm a new ORichTextPeer instance, which has been acquired once! */ static ORichTextPeer* Create( - const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& _rxModel, + const css::uno::Reference< css::awt::XControlModel >& _rxModel, vcl::Window* _pParentWindow, WinBits _nStyle ); @@ -109,28 +109,28 @@ namespace frm virtual ~ORichTextPeer(); // XView - void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XVclWindowPeer - virtual void SAL_CALL setProperty( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) - throw (::com::sun::star::uno::RuntimeException, + virtual void SAL_CALL setProperty( const OUString& _rPropertyName, const css::uno::Any& _rValue ) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTypeProvider DECLARE_XTYPEPROVIDER( ) // XComponent - virtual void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL dispose( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDispatchProvider - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& _rURL, const OUString& _rTargetFrameName, sal_Int32 _rSearchFlags ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches( const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor >& Requests ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL& _rURL, const OUString& _rTargetFrameName, sal_Int32 _rSearchFlags ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& Requests ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ITextSelectionListener virtual void onSelectionChanged( const ESelection& _rSelection ) SAL_OVERRIDE; private: - SingleAttributeDispatcher implCreateDispatcher( SfxSlotId _nSlotId, const ::com::sun::star::util::URL& _rURL ); + SingleAttributeDispatcher implCreateDispatcher( SfxSlotId _nSlotId, const css::util::URL& _rURL ); }; diff --git a/forms/source/richtext/richtextmodel.hxx b/forms/source/richtext/richtextmodel.hxx index ff0caf5ec23f..7964acaa17f7 100644 --- a/forms/source/richtext/richtextmodel.hxx +++ b/forms/source/richtext/richtextmodel.hxx @@ -41,9 +41,9 @@ namespace frm //= ORichTextModel - typedef ::cppu::ImplHelper3 < ::com::sun::star::awt::XControlModel - , ::com::sun::star::lang::XUnoTunnel - , ::com::sun::star::util::XModifyBroadcaster + typedef ::cppu::ImplHelper3 < css::awt::XControlModel + , css::lang::XUnoTunnel + , css::util::XModifyBroadcaster > ORichTextModel_BASE; class ORichTextModel @@ -58,12 +58,12 @@ namespace frm private: // <properties> - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > + css::uno::Reference< css::awt::XDevice > m_xReferenceDevice; - ::com::sun::star::uno::Any m_aTabStop; - ::com::sun::star::uno::Any m_aBackgroundColor; - ::com::sun::star::uno::Any m_aBorderColor; - ::com::sun::star::uno::Any m_aVerticalAlignment; + css::uno::Any m_aTabStop; + css::uno::Any m_aBackgroundColor; + css::uno::Any m_aBorderColor; + css::uno::Any m_aVerticalAlignment; OUString m_sDefaultControl; OUString m_sHelpText; OUString m_sHelpURL; @@ -85,7 +85,7 @@ namespace frm // </properties> // <properties_for_awt_edit_compatibility> - ::com::sun::star::uno::Any m_aAlign; + css::uno::Any m_aAlign; sal_Int16 m_nEchoChar; sal_Int16 m_nMaxTextLength; bool m_bMultiLine; @@ -99,13 +99,13 @@ namespace frm m_aModifyListeners; public: - static RichTextEngine* getEditEngine( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& _rxModel ); + static RichTextEngine* getEditEngine( const css::uno::Reference< css::awt::XControlModel >& _rxModel ); private: // UNO DECLARE_UNO3_AGG_DEFAULTS( ORichTextModel, 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 (::css::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -121,26 +121,26 @@ namespace frm virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) 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; // XPropertySet and friends - 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 ::com::sun::star::uno::Any getPropertyDefaultByHandle( sal_Int32 nHandle ) const 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; + 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; 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; // prevent method hiding @@ -170,7 +170,7 @@ namespace frm DECL_LINK_TYPED( OnEngineContentModified, LinkParamNone*, void ); - static ::com::sun::star::uno::Sequence< sal_Int8 > getEditEngineTunnelId(); + static css::uno::Sequence< sal_Int8 > getEditEngineTunnelId(); private: ORichTextModel( const ORichTextModel& ) SAL_DELETED_FUNCTION; diff --git a/forms/source/richtext/richtextvclcontrol.cxx b/forms/source/richtext/richtextvclcontrol.cxx index 1beabd0b0e8c..7d0219e2c3a3 100644 --- a/forms/source/richtext/richtextvclcontrol.cxx +++ b/forms/source/richtext/richtextvclcontrol.cxx @@ -235,7 +235,7 @@ namespace frm { "Text (*.txt)", "*.txt", EE_FORMAT_TEXT } }; - ::sfx2::FileDialogHelper aFP( bLoad ? com::sun::star::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE : com::sun::star::ui::dialogs::TemplateDescription::FILESAVE_AUTOEXTENSION, 0, this ); + ::sfx2::FileDialogHelper aFP( bLoad ? css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE : css::ui::dialogs::TemplateDescription::FILESAVE_AUTOEXTENSION, 0, this ); for ( size_t i = 0; i < SAL_N_ELEMENTS( aExportFormats ); ++i ) { diff --git a/forms/source/richtext/specialdispatchers.hxx b/forms/source/richtext/specialdispatchers.hxx index d3c02cc92abf..199a74e24983 100644 --- a/forms/source/richtext/specialdispatchers.hxx +++ b/forms/source/richtext/specialdispatchers.hxx @@ -29,18 +29,18 @@ namespace frm class OSelectAllDispatcher : public ORichTextFeatureDispatcher { public: - OSelectAllDispatcher( EditView& _rView, const ::com::sun::star::util::URL& _rURL ); + OSelectAllDispatcher( EditView& _rView, const css::util::URL& _rURL ); protected: virtual ~OSelectAllDispatcher(); // XDispatch - virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& URL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) - throw (::com::sun::star::uno::RuntimeException, + virtual void SAL_CALL dispatch( const css::util::URL& URL, const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ORichTextFeatureDispatcher - virtual ::com::sun::star::frame::FeatureStateEvent buildStatusEvent() const SAL_OVERRIDE; + virtual css::frame::FeatureStateEvent buildStatusEvent() const SAL_OVERRIDE; }; class OParagraphDirectionDispatcher : public OAttributeDispatcher @@ -49,26 +49,26 @@ namespace frm OParagraphDirectionDispatcher( EditView& _rView, AttributeId _nAttributeId, - const ::com::sun::star::util::URL& _rURL, + const css::util::URL& _rURL, IMultiAttributeDispatcher* _pMasterDispatcher ); protected: // ORichTextFeatureDispatcher - virtual ::com::sun::star::frame::FeatureStateEvent buildStatusEvent() const SAL_OVERRIDE; + virtual css::frame::FeatureStateEvent buildStatusEvent() const SAL_OVERRIDE; }; class OTextDirectionDispatcher : public ORichTextFeatureDispatcher { public: - OTextDirectionDispatcher( EditView& _rView, const ::com::sun::star::util::URL& _rURL ); + OTextDirectionDispatcher( EditView& _rView, const css::util::URL& _rURL ); protected: // XDispatch - virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& URL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL dispatch( const css::util::URL& URL, const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ORichTextFeatureDispatcher - virtual ::com::sun::star::frame::FeatureStateEvent buildStatusEvent() const SAL_OVERRIDE; + virtual css::frame::FeatureStateEvent buildStatusEvent() const SAL_OVERRIDE; }; class OAsianFontLayoutDispatcher : public OParametrizedAttributeDispatcher @@ -77,14 +77,14 @@ namespace frm OAsianFontLayoutDispatcher( EditView& _rView, AttributeId _nAttributeId, - const ::com::sun::star::util::URL& _rURL, + const css::util::URL& _rURL, IMultiAttributeDispatcher* _pMasterDispatcher ); protected: // OParametrizedAttributeDispatcher virtual const SfxPoolItem* convertDispatchArgsToItem( - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rArguments ) SAL_OVERRIDE; + const css::uno::Sequence< css::beans::PropertyValue >& _rArguments ) SAL_OVERRIDE; }; diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx index aac04be88707..776b1a9f189e 100644 --- a/forms/source/runtime/formoperations.cxx +++ b/forms/source/runtime/formoperations.cxx @@ -1689,12 +1689,12 @@ namespace frm Reference< XExecutableDialog> xDialog; if ( _bFilter ) { - xDialog = com::sun::star::sdb::FilterDialog::createWithQuery(m_xContext, m_xParser, m_xCursor, - Reference<com::sun::star::awt::XWindow>()); + xDialog = css::sdb::FilterDialog::createWithQuery(m_xContext, m_xParser, m_xCursor, + Reference<css::awt::XWindow>()); } else { - xDialog = com::sun::star::sdb::OrderDialog::createWithQuery(m_xContext, m_xParser, m_xCursorProperties); + xDialog = css::sdb::OrderDialog::createWithQuery(m_xContext, m_xParser, m_xCursorProperties); } diff --git a/forms/source/runtime/formoperations.hxx b/forms/source/runtime/formoperations.hxx index 8b1779a8f8b5..7ec21d0ede32 100644 --- a/forms/source/runtime/formoperations.hxx +++ b/forms/source/runtime/formoperations.hxx @@ -44,12 +44,12 @@ namespace frm //= FormOperations - typedef ::cppu::WeakComponentImplHelper < ::com::sun::star::form::runtime::XFormOperations - , ::com::sun::star::lang::XInitialization - , ::com::sun::star::lang::XServiceInfo - , ::com::sun::star::beans::XPropertyChangeListener - , ::com::sun::star::util::XModifyListener - , ::com::sun::star::sdbc::XRowSetListener + typedef ::cppu::WeakComponentImplHelper < css::form::runtime::XFormOperations + , css::lang::XInitialization + , css::lang::XServiceInfo + , css::beans::XPropertyChangeListener + , css::util::XModifyListener + , css::sdbc::XRowSetListener > FormOperations_Base; class FormOperations :public ::cppu::BaseMutex @@ -59,16 +59,14 @@ namespace frm class MethodGuard; private: - css::uno::Reference<css::uno::XComponentContext> m_xContext; - ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > m_xController; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet > m_xCursor; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetUpdate > m_xUpdateCursor; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xCursorProperties; - ::com::sun::star::uno::Reference< ::com::sun::star::form::XLoadable > m_xLoadableForm; - ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFeatureInvalidation > - m_xFeatureInvalidation; - mutable ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer > - m_xParser; + css::uno::Reference<css::uno::XComponentContext> m_xContext; + css::uno::Reference< css::form::runtime::XFormController > m_xController; + css::uno::Reference< css::sdbc::XRowSet > m_xCursor; + css::uno::Reference< css::sdbc::XResultSetUpdate > m_xUpdateCursor; + css::uno::Reference< css::beans::XPropertySet > m_xCursorProperties; + css::uno::Reference< css::form::XLoadable > m_xLoadableForm; + css::uno::Reference< css::form::runtime::XFeatureInvalidation > m_xFeatureInvalidation; + mutable css::uno::Reference< css::sdb::XSingleSelectQueryComposer > m_xParser; bool m_bInitializedParser; bool m_bActiveControlModified; @@ -79,11 +77,11 @@ namespace frm #endif public: - FormOperations( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext ); + FormOperations( const css::uno::Reference< css::uno::XComponentContext >& _rxContext ); // XServiceInfo - static versions - static OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException); + static OUString getImplementationName_Static( ) throw(css::uno::RuntimeException); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static( ) throw(css::uno::RuntimeException); struct MethodAccess { friend class MethodGuard; private: MethodAccess() { } }; @@ -108,49 +106,49 @@ namespace frm virtual ~FormOperations(); // 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 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; // XFormOperations - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet > SAL_CALL getCursor() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetUpdate > SAL_CALL getUpdateCursor() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > SAL_CALL getController() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFeatureInvalidation > SAL_CALL getFeatureInvalidation() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setFeatureInvalidation(const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFeatureInvalidation > & the_value) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::form::runtime::FeatureState SAL_CALL getState(::sal_Int16 Feature) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isEnabled(::sal_Int16 Feature) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL execute(::sal_Int16 Feature) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::sdbc::SQLException, ::com::sun::star::lang::WrappedTargetException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL executeWithArguments(::sal_Int16 Feature, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& Arguments) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::sdbc::SQLException, ::com::sun::star::lang::WrappedTargetException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL commitCurrentRecord(sal_Bool & RecordInserted) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::sdbc::SQLException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL commitCurrentControl() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::sdbc::SQLException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isInsertionRow() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::WrappedTargetException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isModifiedRow() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::WrappedTargetException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::sdbc::XRowSet > SAL_CALL getCursor() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::sdbc::XResultSetUpdate > SAL_CALL getUpdateCursor() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::form::runtime::XFormController > SAL_CALL getController() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::form::runtime::XFeatureInvalidation > SAL_CALL getFeatureInvalidation() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setFeatureInvalidation(const css::uno::Reference< css::form::runtime::XFeatureInvalidation > & the_value) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::form::runtime::FeatureState SAL_CALL getState(::sal_Int16 Feature) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isEnabled(::sal_Int16 Feature) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL execute(::sal_Int16 Feature) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::sdbc::SQLException, css::lang::WrappedTargetException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL executeWithArguments(::sal_Int16 Feature, const css::uno::Sequence< css::beans::NamedValue >& Arguments) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::sdbc::SQLException, css::lang::WrappedTargetException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL commitCurrentRecord(sal_Bool & RecordInserted) throw (css::uno::RuntimeException, css::sdbc::SQLException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL commitCurrentControl() throw (css::uno::RuntimeException, css::sdbc::SQLException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isInsertionRow() throw (css::uno::RuntimeException, css::lang::WrappedTargetException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isModifiedRow() throw (css::uno::RuntimeException, css::lang::WrappedTargetException, std::exception) SAL_OVERRIDE; // 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; + 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; // XModifyListener - virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& _rSource ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL modified( const css::lang::EventObject& _rSource ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XPropertyChangeListener - virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // 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; // XComponent/OComponentHelper virtual void SAL_CALL disposing() SAL_OVERRIDE; private: // service constructors - void createWithFormController( const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController >& _rxController ); - void createWithForm( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& _rxForm ); + void createWithFormController( const css::uno::Reference< css::form::runtime::XFormController >& _rxController ); + void createWithForm( const css::uno::Reference< css::form::XForm >& _rxForm ); /** determines whether or not we're already disposed */ @@ -224,7 +222,7 @@ namespace frm @precond m_xController.is() */ - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > + css::uno::Reference< css::beans::XPropertySet > impl_getCurrentBoundField_nothrow( ) const; /** returns the control model of the current control @@ -235,7 +233,7 @@ namespace frm @precond m_xController.is() */ - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > + css::uno::Reference< css::awt::XControlModel > impl_getCurrentControlModel_throw() const; /// determines if we have a valid cursor @@ -246,7 +244,7 @@ namespace frm A grid control can have columns which are currently hidden, so the index of a column in the view is not necessarily the same as its index in the model. */ - static sal_Int16 impl_gridView2ModelPos_nothrow( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& _rxColumns, sal_Int16 _nViewPos ); + static sal_Int16 impl_gridView2ModelPos_nothrow( const css::uno::Reference< css::container::XIndexAccess >& _rxColumns, sal_Int16 _nViewPos ); /** moves our cursor one position to the left, caring for different possible cursor states. @@ -312,7 +310,7 @@ namespace frm { public: impl_appendOrderByColumn_throw(const FormOperations *pFO, - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xField, + css::uno::Reference< css::beans::XPropertySet > xField, bool bUp) : m_pFO(pFO) , m_xField(xField) @@ -322,7 +320,7 @@ namespace frm void operator()() { m_pFO->m_xParser->appendOrderByColumn(m_xField, m_bUp); } private: const FormOperations *m_pFO; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xField; + css::uno::Reference< css::beans::XPropertySet > m_xField; bool m_bUp; }; @@ -331,15 +329,15 @@ namespace frm { public: impl_appendFilterByColumn_throw(const FormOperations *pFO, - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xField) + css::uno::Reference< css::beans::XPropertySet > xField) : m_pFO(pFO) , m_xField(xField) {}; - void operator()() { m_pFO->m_xParser->appendFilterByColumn( m_xField, sal_True, ::com::sun::star::sdb::SQLFilterOperator::EQUAL ); } + void operator()() { m_pFO->m_xParser->appendFilterByColumn( m_xField, sal_True, css::sdb::SQLFilterOperator::EQUAL ); } private: const FormOperations *m_pFO; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xField; + css::uno::Reference< css::beans::XPropertySet > m_xField; }; private: diff --git a/forms/source/solar/component/navbarcontrol.hxx b/forms/source/solar/component/navbarcontrol.hxx index 5f10042bd984..8e776102e033 100644 --- a/forms/source/solar/component/navbarcontrol.hxx +++ b/forms/source/solar/component/navbarcontrol.hxx @@ -35,17 +35,17 @@ namespace frm { - typedef ::cppu::ImplHelper1 < ::com::sun::star::frame::XDispatchProviderInterception + typedef ::cppu::ImplHelper1 < css::frame::XDispatchProviderInterception > ONavigationBarControl_Base; class ONavigationBarControl :public UnoControl ,public ONavigationBarControl_Base { - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; + css::uno::Reference< css::uno::XComponentContext > m_xContext; public: ONavigationBarControl( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB + const css::uno::Reference< css::uno::XComponentContext >& _rxORB ); protected: @@ -54,29 +54,29 @@ namespace frm public: // 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( ONavigationBarControl, UnoControl ) - 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; // XControl - virtual void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& _rToolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& _rParent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& _rToolkit, const css::uno::Reference< css::awt::XWindowPeer >& _rParent ) 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() // XVclWindowPeer - virtual void SAL_CALL setDesignMode( sal_Bool _bOn ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL setDesignMode( sal_Bool _bOn ) 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; }; class ONavigationBarPeer @@ -89,14 +89,14 @@ namespace frm a new ONavigationBarPeer instance, which has been acquired once! */ static ONavigationBarPeer* Create( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB, + const css::uno::Reference< css::uno::XComponentContext >& _rxORB, vcl::Window* _pParentWindow, - const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& _rxModel + const css::uno::Reference< css::awt::XControlModel >& _rxModel ); protected: ONavigationBarPeer( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB + const css::uno::Reference< css::uno::XComponentContext >& _rxORB ); virtual ~ONavigationBarPeer(); @@ -105,7 +105,7 @@ namespace frm DECLARE_XINTERFACE( ) // XVclWindowPeer - virtual void SAL_CALL setDesignMode( sal_Bool _bOn ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL setDesignMode( sal_Bool _bOn ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XWindow2 using VCLXWindow::isEnabled; @@ -115,14 +115,14 @@ namespace frm DECLARE_XTYPEPROVIDER( ) // XComponent - void SAL_CALL dispose( ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + void SAL_CALL dispose( ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XVclWindowPeer - void SAL_CALL setProperty( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& _rPropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setProperty( const OUString& _rPropertyName, const css::uno::Any& _rValue ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + css::uno::Any SAL_CALL getProperty( const OUString& _rPropertyName ) 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; // OFormNavigationHelper overriables virtual void interceptorsChanged( ) SAL_OVERRIDE; diff --git a/forms/source/xforms/NameContainer.hxx b/forms/source/xforms/NameContainer.hxx index e969002f2103..7df50b9e853f 100644 --- a/forms/source/xforms/NameContainer.hxx +++ b/forms/source/xforms/NameContainer.hxx @@ -34,7 +34,7 @@ #include <osl/diagnose.h> typedef cppu::WeakImplHelper< - com::sun::star::container::XNameContainer + css::container::XNameContainer > NameContainer_t; template<class T> @@ -90,14 +90,14 @@ public: // methods for XElementAccess - virtual com::sun::star::uno::Type SAL_CALL getElementType() - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE + virtual css::uno::Type SAL_CALL getElementType() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE { return cppu::UnoType<T>::get(); } virtual sal_Bool SAL_CALL hasElements() - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE { return hasItems(); } @@ -107,23 +107,23 @@ public: // methods for XNameAccess (inherits XElementAccess) - virtual com::sun::star::uno::Any SAL_CALL getByName( + virtual css::uno::Any SAL_CALL getByName( const OUString& rName ) - throw( com::sun::star::container::NoSuchElementException, - com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE + throw( css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE { typename map_t::const_iterator aIter = findItem( rName ); if( aIter == maItems.end() ) - throw com::sun::star::container::NoSuchElementException(); + throw css::container::NoSuchElementException(); else - return com::sun::star::uno::makeAny( aIter->second ); + return css::uno::makeAny( aIter->second ); } - virtual com::sun::star::uno::Sequence<OUString> SAL_CALL getElementNames() - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE + virtual css::uno::Sequence<OUString> SAL_CALL getElementNames() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE { - com::sun::star::uno::Sequence<OUString> aSequence( maItems.size() ); + css::uno::Sequence<OUString> aSequence( maItems.size() ); typename map_t::const_iterator aIter = maItems.begin(); OUString* pStrings = aSequence.getArray(); while( aIter != maItems.end() ) @@ -139,7 +139,7 @@ public: virtual sal_Bool SAL_CALL hasByName( const OUString& rName ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE { return hasItem( rName ); } @@ -151,20 +151,20 @@ public: virtual void SAL_CALL replaceByName( const OUString& rName, - const com::sun::star::uno::Any& aElement ) - throw( com::sun::star::lang::IllegalArgumentException, - com::sun::star::container::NoSuchElementException, - com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + const css::uno::Any& aElement ) + throw( css::lang::IllegalArgumentException, + css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) SAL_OVERRIDE { T aItem; if( aElement >>= aItem ) if( hasByName( rName ) ) replace( rName, aItem ); else - throw com::sun::star::container::NoSuchElementException(); + throw css::container::NoSuchElementException(); else - throw com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); } @@ -174,32 +174,32 @@ public: virtual void SAL_CALL insertByName( const OUString& rName, - const com::sun::star::uno::Any& aElement ) - throw( com::sun::star::lang::IllegalArgumentException, - com::sun::star::container::ElementExistException, - com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE + const css::uno::Any& aElement ) + throw( css::lang::IllegalArgumentException, + css::container::ElementExistException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE { T aItem; if( aElement >>= aItem ) if( ! hasByName( rName ) ) insert( rName, aItem ); else - throw com::sun::star::container::ElementExistException(); + throw css::container::ElementExistException(); else - throw com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); } virtual void SAL_CALL removeByName( const OUString& rName ) - throw( com::sun::star::container::NoSuchElementException, - com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw( css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) SAL_OVERRIDE { if( hasByName( rName ) ) remove( rName ); else - throw com::sun::star::container::NoSuchElementException(); + throw css::container::NoSuchElementException(); } }; diff --git a/forms/source/xforms/binding.cxx b/forms/source/xforms/binding.cxx index e1454483e550..4a7359064f89 100644 --- a/forms/source/xforms/binding.cxx +++ b/forms/source/xforms/binding.cxx @@ -727,7 +727,7 @@ void Binding::valueModified() void Binding::distributeMIP( const css::uno::Reference<css::xml::dom::XNode> & rxNode ) { - typedef com::sun::star::xforms::XFormsEventConcrete XFormsEvent_t; + typedef css::xforms::XFormsEventConcrete XFormsEvent_t; OUString sEventName("xforms-generic"); XFormsEvent_t *pEvent = new XFormsEvent_t; pEvent->initXFormsEvent(sEventName, sal_True, sal_False); diff --git a/forms/source/xforms/computedexpression.hxx b/forms/source/xforms/computedexpression.hxx index f9dcc0227758..46a9eecf330d 100644 --- a/forms/source/xforms/computedexpression.hxx +++ b/forms/source/xforms/computedexpression.hxx @@ -59,7 +59,7 @@ protected: bool mbIsSimple; /// the result from the last bind - com::sun::star::uno::Reference<com::sun::star::xml::xpath::XXPathObject> mxResult; + css::uno::Reference<css::xml::xpath::XXPathObject> mxResult; /// implementation of isSimpleExpression @@ -70,7 +70,7 @@ protected: const OUString _getExpressionForEvaluation() const { return msExpression; } /// obtain a (suitable) XPathAPI implementation - static com::sun::star::uno::Reference<com::sun::star::xml::xpath::XXPathAPI> _getXPathAPI(const xforms::EvaluationContext& aContext); + static css::uno::Reference<css::xml::xpath::XXPathAPI> _getXPathAPI(const xforms::EvaluationContext& aContext); /// evaluate the expression relative to the content node. bool _evaluate( const xforms::EvaluationContext& rContext, @@ -112,7 +112,7 @@ public: // get the result of this expression as string/bool/... // (Results will be based on the last call of evaluate(..). The caller // must call evaluate to ensure current results.) - com::sun::star::uno::Reference<com::sun::star::xml::xpath::XXPathObject> getXPath() const { return mxResult;} + css::uno::Reference<css::xml::xpath::XXPathObject> getXPath() const { return mxResult;} bool getBool( bool bDefault = false ) const; OUString getString( const OUString& rDefault = OUString() ) const; diff --git a/forms/source/xforms/convert.hxx b/forms/source/xforms/convert.hxx index 7784fc6d8458..c710d9e3f171 100644 --- a/forms/source/xforms/convert.hxx +++ b/forms/source/xforms/convert.hxx @@ -34,16 +34,16 @@ namespace xforms struct TypeLess { - bool operator()( const com::sun::star::uno::Type& rType1, - const com::sun::star::uno::Type& rType2 ) const + bool operator()( const css::uno::Type& rType1, + const css::uno::Type& rType2 ) const { return rType1.getTypeName() < rType2.getTypeName(); } }; class Convert { - typedef com::sun::star::uno::Type Type_t; - typedef com::sun::star::uno::Sequence<com::sun::star::uno::Type> Types_t; - typedef com::sun::star::uno::Any Any_t; + typedef css::uno::Type Type_t; + typedef css::uno::Sequence<css::uno::Type> Types_t; + typedef css::uno::Any Any_t; // hold conversion objects typedef OUString (*fn_toXSD)( const Any_t& ); diff --git a/forms/source/xforms/datatyperepository.cxx b/forms/source/xforms/datatyperepository.cxx index f2f4ed4c7317..0ea1e9c95a3d 100644 --- a/forms/source/xforms/datatyperepository.cxx +++ b/forms/source/xforms/datatyperepository.cxx @@ -53,22 +53,22 @@ namespace xforms // insert some basic types OUString sName( FRM_RES_STRING( RID_STR_DATATYPE_STRING ) ); - m_aRepository[ sName ] = new OStringType( sName, ::com::sun::star::xsd::DataTypeClass::STRING ); + m_aRepository[ sName ] = new OStringType( sName, css::xsd::DataTypeClass::STRING ); sName = FRM_RES_STRING( RID_STR_DATATYPE_URL ); - m_aRepository[ sName ] = new OStringType( sName, ::com::sun::star::xsd::DataTypeClass::anyURI ); + m_aRepository[ sName ] = new OStringType( sName, css::xsd::DataTypeClass::anyURI ); sName = FRM_RES_STRING( RID_STR_DATATYPE_BOOLEAN ); m_aRepository[ sName ] = new OBooleanType( sName ); sName = FRM_RES_STRING( RID_STR_DATATYPE_DECIMAL ); - m_aRepository[ sName ] = new ODecimalType( sName, ::com::sun::star::xsd::DataTypeClass::DECIMAL ); + m_aRepository[ sName ] = new ODecimalType( sName, css::xsd::DataTypeClass::DECIMAL ); sName = FRM_RES_STRING( RID_STR_DATATYPE_FLOAT ); - m_aRepository[ sName ] = new ODecimalType( sName, ::com::sun::star::xsd::DataTypeClass::FLOAT ); + m_aRepository[ sName ] = new ODecimalType( sName, css::xsd::DataTypeClass::FLOAT ); sName = FRM_RES_STRING( RID_STR_DATATYPE_DOUBLE ); - m_aRepository[ sName ] = new ODecimalType( sName, ::com::sun::star::xsd::DataTypeClass::DOUBLE ); + m_aRepository[ sName ] = new ODecimalType( sName, css::xsd::DataTypeClass::DOUBLE ); sName = FRM_RES_STRING( RID_STR_DATATYPE_DATE ); m_aRepository[ sName ] = new ODateType( sName ); @@ -80,13 +80,13 @@ namespace xforms m_aRepository[ sName ] = new ODateTimeType( sName ); sName = FRM_RES_STRING( RID_STR_DATATYPE_YEAR ); - m_aRepository[ sName ] = new OShortIntegerType( sName, ::com::sun::star::xsd::DataTypeClass::gYear ); + m_aRepository[ sName ] = new OShortIntegerType( sName, css::xsd::DataTypeClass::gYear ); sName = FRM_RES_STRING( RID_STR_DATATYPE_MONTH ); - m_aRepository[ sName ] = new OShortIntegerType( sName, ::com::sun::star::xsd::DataTypeClass::gMonth ); + m_aRepository[ sName ] = new OShortIntegerType( sName, css::xsd::DataTypeClass::gMonth ); sName = FRM_RES_STRING( RID_STR_DATATYPE_DAY ); - m_aRepository[ sName ] = new OShortIntegerType( sName, ::com::sun::star::xsd::DataTypeClass::gDay ); + m_aRepository[ sName ] = new OShortIntegerType( sName, css::xsd::DataTypeClass::gDay ); } @@ -212,7 +212,7 @@ namespace xforms // template instantiations template<> - void OValueLimitedType<com::sun::star::util::Date>::registerProperties() + void OValueLimitedType<css::util::Date>::registerProperties() { OValueLimitedType_Base::registerProperties(); @@ -223,7 +223,7 @@ namespace xforms } template<> - void OValueLimitedType<com::sun::star::util::Time>::registerProperties() + void OValueLimitedType<css::util::Time>::registerProperties() { OValueLimitedType_Base::registerProperties(); @@ -234,7 +234,7 @@ namespace xforms } template<> - void OValueLimitedType<com::sun::star::util::DateTime>::registerProperties() + void OValueLimitedType<css::util::DateTime>::registerProperties() { OValueLimitedType_Base::registerProperties(); diff --git a/forms/source/xforms/datatyperepository.hxx b/forms/source/xforms/datatyperepository.hxx index d677993f2f86..cffdb01ce846 100644 --- a/forms/source/xforms/datatyperepository.hxx +++ b/forms/source/xforms/datatyperepository.hxx @@ -32,13 +32,13 @@ namespace xforms class OXSDDataType; - typedef ::cppu::WeakImplHelper < ::com::sun::star::xforms::XDataTypeRepository + typedef ::cppu::WeakImplHelper < css::xforms::XDataTypeRepository > ODataTypeRepository_Base; class ODataTypeRepository : public ODataTypeRepository_Base { private: typedef ::rtl::Reference< OXSDDataType > DataType; - typedef ::std::map< OUString, DataType > Repository; + typedef ::std::map< OUString, DataType > Repository; ::osl::Mutex m_aMutex; Repository m_aRepository; @@ -50,22 +50,22 @@ namespace xforms virtual ~ODataTypeRepository( ); // XDataTypeRepository - virtual ::com::sun::star::uno::Reference< ::com::sun::star::xsd::XDataType > SAL_CALL getBasicDataType( sal_Int16 dataTypeClass ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::xsd::XDataType > SAL_CALL cloneDataType( const OUString& sourceName, const OUString& newName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL revokeDataType( const OUString& typeName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::util::VetoException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::xsd::XDataType > SAL_CALL getDataType( const OUString& typeName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::xsd::XDataType > SAL_CALL getBasicDataType( sal_Int16 dataTypeClass ) throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::xsd::XDataType > SAL_CALL cloneDataType( const OUString& sourceName, const OUString& newName ) throw (css::container::NoSuchElementException, css::container::ElementExistException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL revokeDataType( const OUString& typeName ) throw (css::container::NoSuchElementException, css::util::VetoException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::xsd::XDataType > SAL_CALL getDataType( const OUString& typeName ) throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEnumerationAccess (base of XDataTypeRepository) - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XNameAccess (base of XDataTypeRepository) - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XElementAccess (base of XEnumerationAccess and XNameAccess) - virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Type SAL_CALL getElementType( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasElements( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: ODataTypeRepository( const ODataTypeRepository& ) SAL_DELETED_FUNCTION; diff --git a/forms/source/xforms/datatypes.cxx b/forms/source/xforms/datatypes.cxx index 089536f455b8..48e5a813031c 100644 --- a/forms/source/xforms/datatypes.cxx +++ b/forms/source/xforms/datatypes.cxx @@ -268,7 +268,7 @@ namespace xforms } - bool OXSDDataType::checkPropertySanity( sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rNewValue, OUString& _rErrorMessage ) + bool OXSDDataType::checkPropertySanity( sal_Int32 _nHandle, const css::uno::Any& _rNewValue, OUString& _rErrorMessage ) { if ( _nHandle == PROPERTY_ID_XSD_PATTERN ) { @@ -354,7 +354,7 @@ namespace xforms void SAL_CALL OValueLimitedType_Base::setFastPropertyValue_NoBroadcast( - sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::uno::Exception, std::exception) + sal_Int32 _nHandle, const css::uno::Any& _rValue ) throw (css::uno::Exception, std::exception) { OXSDDataType::setFastPropertyValue_NoBroadcast( _nHandle, _rValue ); diff --git a/forms/source/xforms/datatypes.hxx b/forms/source/xforms/datatypes.hxx index 7e4c175c98ea..407a2e27ea65 100644 --- a/forms/source/xforms/datatypes.hxx +++ b/forms/source/xforms/datatypes.hxx @@ -44,7 +44,7 @@ namespace xforms //= OXSDDataType - typedef ::cppu::WeakImplHelper < ::com::sun::star::xsd::XDataType + typedef ::cppu::WeakImplHelper < css::xsd::XDataType > OXSDDataType_Base; typedef ::comphelper::OMutexAndBroadcastHelper OXSDDataType_BBase; typedef ::comphelper::OPropertyContainer OXSDDataType_PBase; @@ -82,37 +82,37 @@ namespace xforms DECLARE_XINTERFACE() DECLARE_XTYPEPROVIDER() - 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, ::com::sun::star::util::VetoException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getPattern() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setPattern( const OUString& _pattern ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int16 SAL_CALL getWhiteSpaceTreatment() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setWhiteSpaceTreatment( sal_Int16 _whitespacetreatment ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getIsBasic() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int16 SAL_CALL getTypeClass() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + 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, css::util::VetoException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getPattern() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPattern( const OUString& _pattern ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int16 SAL_CALL getWhiteSpaceTreatment() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setWhiteSpaceTreatment( sal_Int16 _whitespacetreatment ) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL getIsBasic() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int16 SAL_CALL getTypeClass() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL validate( const OUString& value ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL explainInvalid( const OUString& value ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL validate( const OUString& value ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL explainInvalid( const OUString& value ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet - is a base of XDataType and needs to be disambiguated - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; public: OXSDDataType* clone( const OUString& _rNewName ) const; protected: // XPropertySet and friends - 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 void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, - const ::com::sun::star::uno::Any& rValue + const css::uno::Any& rValue ) - throw (::com::sun::star::uno::Exception, std::exception) SAL_OVERRIDE; + throw (css::uno::Exception, std::exception) SAL_OVERRIDE; // --- own overridables --- // helper for implementing cloning of data types @@ -124,7 +124,7 @@ namespace xforms virtual OUString _explainInvalid( sal_uInt16 nReason ); // helper method for checking properties values which are to be set - virtual bool checkPropertySanity( sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rNewValue, OUString& _rErrorMessage ); + virtual bool checkPropertySanity( sal_Int32 _nHandle, const css::uno::Any& _rNewValue, OUString& _rErrorMessage ); // register properties implemented by this instance - call the base class when overriding virtual void registerProperties(); @@ -149,16 +149,16 @@ namespace xforms } #define REGISTER_VOID_PROP( prop, memberAny, type ) \ - registerMayBeVoidProperty( PROPERTY_##prop, PROPERTY_ID_##prop, ::com::sun::star::beans::PropertyAttribute::BOUND | ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, \ + registerMayBeVoidProperty( PROPERTY_##prop, PROPERTY_ID_##prop, css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::MAYBEVOID, \ &memberAny, cppu::UnoType<type>::get() ); class OValueLimitedType_Base : public OXSDDataType { protected: - ::com::sun::star::uno::Any m_aMaxInclusive; - ::com::sun::star::uno::Any m_aMaxExclusive; - ::com::sun::star::uno::Any m_aMinInclusive; - ::com::sun::star::uno::Any m_aMinExclusive; + css::uno::Any m_aMaxInclusive; + css::uno::Any m_aMaxExclusive; + css::uno::Any m_aMinInclusive; + css::uno::Any m_aMinExclusive; double m_fCachedMaxInclusive; double m_fCachedMaxExclusive; @@ -174,9 +174,9 @@ namespace xforms // XPropertySet and friends virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, - const ::com::sun::star::uno::Any& rValue + const css::uno::Any& rValue ) - throw (::com::sun::star::uno::Exception, std::exception) SAL_OVERRIDE; + throw (css::uno::Exception, std::exception) SAL_OVERRIDE; // OXSDDataType overridables virtual bool _getValue( const OUString& value, double& fValue ); @@ -188,7 +188,7 @@ namespace xforms The value is guaranteed to be not <NULL/>, and is of type <member>ValueType</member> */ - virtual OUString typedValueAsHumanReadableString( const ::com::sun::star::uno::Any& _rValue ) const = 0; + virtual OUString typedValueAsHumanReadableString( const css::uno::Any& _rValue ) const = 0; /** translates a <member>ValueType</member> value into a double value @@ -202,7 +202,7 @@ namespace xforms @param _rDoubleValue output parameter to hold the resulting double value */ - virtual void normalizeValue( const ::com::sun::star::uno::Any& _rValue, double& _rDoubleValue ) const = 0; + virtual void normalizeValue( const css::uno::Any& _rValue, double& _rDoubleValue ) const = 0; }; template < typename VALUE_TYPE > @@ -210,7 +210,7 @@ namespace xforms { protected: typedef VALUE_TYPE ValueType; - inline const ::com::sun::star::uno::Type& + inline const css::uno::Type& getCppuType() const { return cppu::UnoType<ValueType>::get(); } protected: @@ -237,7 +237,7 @@ namespace xforms virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; // XPropertySet - virtual com::sun::star::uno::Reference<com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(com::sun::star::uno::RuntimeException); + virtual css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException); virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); }; @@ -262,13 +262,13 @@ namespace xforms { protected: // <properties> - ::com::sun::star::uno::Any m_aLength; - ::com::sun::star::uno::Any m_aMinLength; - ::com::sun::star::uno::Any m_aMaxLength; + css::uno::Any m_aLength; + css::uno::Any m_aMinLength; + css::uno::Any m_aMaxLength; // </properties> public: - OStringType( const OUString& _rName, sal_Int16 _nTypeClass /* = ::com::sun::star::xsd::DataTypeClass::STRING */ ); + OStringType( const OUString& _rName, sal_Int16 _nTypeClass /* = css::xsd::DataTypeClass::STRING */ ); protected: DECLARE_DEFAULT_CLONING( OStringType ) @@ -277,7 +277,7 @@ namespace xforms // OXSDDataType overridables virtual sal_uInt16 _validate( const OUString& value ) SAL_OVERRIDE; virtual OUString _explainInvalid( sal_uInt16 nReason ) SAL_OVERRIDE; - virtual bool checkPropertySanity( sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rNewValue, OUString& _rErrorMessage ) SAL_OVERRIDE; + virtual bool checkPropertySanity( sal_Int32 _nHandle, const css::uno::Any& _rNewValue, OUString& _rErrorMessage ) SAL_OVERRIDE; virtual void registerProperties() SAL_OVERRIDE; }; @@ -286,11 +286,11 @@ namespace xforms class ODecimalType : public ODecimalType_Base { protected: - ::com::sun::star::uno::Any m_aTotalDigits; - ::com::sun::star::uno::Any m_aFractionDigits; + css::uno::Any m_aTotalDigits; + css::uno::Any m_aFractionDigits; public: - ODecimalType( const OUString& _rName, sal_Int16 _nTypeClass /* = ::com::sun::star::xsd::DataTypeClass::DECIMAL */ ); + ODecimalType( const OUString& _rName, sal_Int16 _nTypeClass /* = css::xsd::DataTypeClass::DECIMAL */ ); protected: DECLARE_DEFAULT_CLONING( ODecimalType ) @@ -302,8 +302,8 @@ namespace xforms virtual void registerProperties() SAL_OVERRIDE; // OValueLimitedType overridables - virtual OUString typedValueAsHumanReadableString( const ::com::sun::star::uno::Any& _rValue ) const SAL_OVERRIDE; - virtual void normalizeValue( const ::com::sun::star::uno::Any& _rValue, double& _rDoubleValue ) const SAL_OVERRIDE; + virtual OUString typedValueAsHumanReadableString( const css::uno::Any& _rValue ) const SAL_OVERRIDE; + virtual void normalizeValue( const css::uno::Any& _rValue, double& _rDoubleValue ) const SAL_OVERRIDE; private: using ODecimalType_Base::initializeTypedClone; @@ -328,8 +328,8 @@ namespace xforms virtual bool _getValue( const OUString& value, double& fValue ) SAL_OVERRIDE; \ \ /* OValueLimitedType overridables */ \ - virtual OUString typedValueAsHumanReadableString( const ::com::sun::star::uno::Any& _rValue ) const SAL_OVERRIDE; \ - virtual void normalizeValue( const ::com::sun::star::uno::Any& _rValue, double& _rDoubleValue ) const SAL_OVERRIDE; \ + virtual OUString typedValueAsHumanReadableString( const css::uno::Any& _rValue ) const SAL_OVERRIDE; \ + virtual void normalizeValue( const css::uno::Any& _rValue, double& _rDoubleValue ) const SAL_OVERRIDE; \ \ private: \ using classname##_Base::initializeTypedClone; \ @@ -338,17 +338,17 @@ namespace xforms //= ODateType - DEFAULT_DECLARE_SUBTYPE( ODateType, ::com::sun::star::util::Date ) + DEFAULT_DECLARE_SUBTYPE( ODateType, css::util::Date ) //= OTimeType - DEFAULT_DECLARE_SUBTYPE( OTimeType, ::com::sun::star::util::Time ) + DEFAULT_DECLARE_SUBTYPE( OTimeType, css::util::Time ) //= ODateTimeType - DEFAULT_DECLARE_SUBTYPE( ODateTimeType, ::com::sun::star::util::DateTime ) + DEFAULT_DECLARE_SUBTYPE( ODateTimeType, css::util::DateTime ) class OShortIntegerType; typedef ODerivedDataType< OShortIntegerType, OValueLimitedType< sal_Int16 > > OShortIntegerType_Base; @@ -364,8 +364,8 @@ namespace xforms virtual bool _getValue( const OUString& value, double& fValue ) SAL_OVERRIDE; // OValueLimitedType overridables - virtual OUString typedValueAsHumanReadableString( const ::com::sun::star::uno::Any& _rValue ) const SAL_OVERRIDE; - virtual void normalizeValue( const ::com::sun::star::uno::Any& _rValue, double& _rDoubleValue ) const SAL_OVERRIDE; + virtual OUString typedValueAsHumanReadableString( const css::uno::Any& _rValue ) const SAL_OVERRIDE; + virtual void normalizeValue( const css::uno::Any& _rValue, double& _rDoubleValue ) const SAL_OVERRIDE; private: using OShortIntegerType_Base::initializeTypedClone; diff --git a/forms/source/xforms/datatypes_impl.hxx b/forms/source/xforms/datatypes_impl.hxx index 4bd194c0a7d5..6a22925e4922 100644 --- a/forms/source/xforms/datatypes_impl.hxx +++ b/forms/source/xforms/datatypes_impl.hxx @@ -33,14 +33,14 @@ ODerivedDataType< CONCRETE_DATA_TYPE_IMPL, SUPERCLASS >::ODerivedDataType( const template< typename CONCRETE_DATA_TYPE_IMPL, typename SUPERCLASS > ::cppu::IPropertyArrayHelper* ODerivedDataType< CONCRETE_DATA_TYPE_IMPL, SUPERCLASS >::createArrayHelper( ) const { - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > aProps; + css::uno::Sequence< css::beans::Property > aProps; ODerivedDataType< CONCRETE_DATA_TYPE_IMPL, SUPERCLASS >::describeProperties( aProps ); return new ::cppu::OPropertyArrayHelper( aProps ); } template< typename CONCRETE_DATA_TYPE_IMPL, typename SUPERCLASS > -::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL ODerivedDataType< CONCRETE_DATA_TYPE_IMPL, SUPERCLASS >::getPropertySetInfo() throw( ::com::sun::star::uno::RuntimeException ) +css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL ODerivedDataType< CONCRETE_DATA_TYPE_IMPL, SUPERCLASS >::getPropertySetInfo() throw( css::uno::RuntimeException ) { return ::cppu::OPropertySetHelper::createPropertySetInfo( getInfoHelper() ); } diff --git a/forms/source/xforms/enumeration.hxx b/forms/source/xforms/enumeration.hxx index 0c1836b0a9e0..59eec1c01406 100644 --- a/forms/source/xforms/enumeration.hxx +++ b/forms/source/xforms/enumeration.hxx @@ -35,21 +35,21 @@ namespace com { namespace sun { namespace star { /** implement XEnumeration based on container::XIndexAccess */ class Enumeration - : public cppu::WeakImplHelper<com::sun::star::container::XEnumeration> + : public cppu::WeakImplHelper<css::container::XEnumeration> { - com::sun::star::uno::Reference<com::sun::star::container::XIndexAccess> mxContainer; + css::uno::Reference<css::container::XIndexAccess> mxContainer; sal_Int32 mnIndex; public: - Enumeration( com::sun::star::container::XIndexAccess* ); + Enumeration( css::container::XIndexAccess* ); virtual sal_Bool SAL_CALL hasMoreElements() - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual com::sun::star::uno::Any SAL_CALL nextElement() - throw( com::sun::star::container::NoSuchElementException, - com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL nextElement() + throw( css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; #endif diff --git a/forms/source/xforms/evaluationcontext.hxx b/forms/source/xforms/evaluationcontext.hxx index 16dc0b1b9fd2..59799f0b6515 100644 --- a/forms/source/xforms/evaluationcontext.hxx +++ b/forms/source/xforms/evaluationcontext.hxx @@ -41,9 +41,9 @@ public: { } EvaluationContext( - const com::sun::star::uno::Reference<com::sun::star::xml::dom::XNode>& xContextNode, - const com::sun::star::uno::Reference<com::sun::star::xforms::XModel>& xModel, - const com::sun::star::uno::Reference<com::sun::star::container::XNameContainer>& xNamespaces, + const css::uno::Reference<css::xml::dom::XNode>& xContextNode, + const css::uno::Reference<css::xforms::XModel>& xModel, + const css::uno::Reference<css::container::XNameContainer>& xNamespaces, sal_Int32 nPosition, sal_Int32 nSize ) : mxContextNode( xContextNode ), @@ -53,9 +53,9 @@ public: mnContextSize( nSize ) { } - com::sun::star::uno::Reference<com::sun::star::xml::dom::XNode> mxContextNode; - com::sun::star::uno::Reference<com::sun::star::xforms::XModel> mxModel; - com::sun::star::uno::Reference<com::sun::star::container::XNameContainer> mxNamespaces; + css::uno::Reference<css::xml::dom::XNode> mxContextNode; + css::uno::Reference<css::xforms::XModel> mxModel; + css::uno::Reference<css::container::XNameContainer> mxNamespaces; sal_Int32 mnContextPosition; sal_Int32 mnContextSize; diff --git a/forms/source/xforms/model.cxx b/forms/source/xforms/model.cxx index 0700592a18dc..3da165ef4837 100644 --- a/forms/source/xforms/model.cxx +++ b/forms/source/xforms/model.cxx @@ -699,9 +699,9 @@ css::uno::Sequence<OUString> Model::getSupportedServiceNames() return css::uno::Sequence<OUString>{"com.sun.star.xforms.Model"}; } -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_form_Model_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_Model_get_implementation(css::uno::XComponentContext*, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new xforms::Model()); } diff --git a/forms/source/xforms/model_helper.hxx b/forms/source/xforms/model_helper.hxx index d3254f7127f0..9191c0ddf49a 100644 --- a/forms/source/xforms/model_helper.hxx +++ b/forms/source/xforms/model_helper.hxx @@ -47,7 +47,7 @@ namespace xforms namespace xforms { -class BindingCollection : public NamedCollection<com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> > +class BindingCollection : public NamedCollection<css::uno::Reference<css::beans::XPropertySet> > { Model* mpModel; @@ -74,7 +74,7 @@ protected: } }; -class SubmissionCollection : public NamedCollection<com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> > +class SubmissionCollection : public NamedCollection<css::uno::Reference<css::beans::XPropertySet> > { Model* mpModel; @@ -92,22 +92,22 @@ protected: virtual void _insert( const T& t ) SAL_OVERRIDE { OSL_ENSURE( Submission::getSubmission( t ) != NULL, "invalid item?" ); - Submission::getSubmission( t )->setModel( com::sun::star::uno::Reference<com::sun::star::xforms::XModel>( mpModel ) ); + Submission::getSubmission( t )->setModel( css::uno::Reference<css::xforms::XModel>( mpModel ) ); } virtual void _remove( const T& t ) SAL_OVERRIDE { OSL_ENSURE( Submission::getSubmission( t ) != NULL, "invalid item?" ); - Submission::getSubmission( t )->setModel( com::sun::star::uno::Reference<com::sun::star::xforms::XModel>( ) ); + Submission::getSubmission( t )->setModel( css::uno::Reference<css::xforms::XModel>( ) ); } }; -class InstanceCollection : public Collection<com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> > +class InstanceCollection : public Collection<css::uno::Sequence<css::beans::PropertyValue> > { public: virtual bool isValid( const T& t ) const SAL_OVERRIDE { - const com::sun::star::beans::PropertyValue* pValues = t.getConstArray(); + const css::beans::PropertyValue* pValues = t.getConstArray(); OUString sInstance( "Instance" ); bool bFound = false; for( sal_Int32 i = 0; ( ! bFound ) && ( i < t.getLength() ); i++ ) @@ -129,17 +129,17 @@ sal_Int32 lcl_findInstance( const InstanceCollection*, // get values from Sequence<PropertyValue> describing an Instance void getInstanceData( - const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>&, + const css::uno::Sequence<css::beans::PropertyValue>&, OUString* pID, - com::sun::star::uno::Reference<com::sun::star::xml::dom::XDocument>*, + css::uno::Reference<css::xml::dom::XDocument>*, OUString* pURL, bool* pURLOnce ); // set values on Sequence<PropertyValue> for an Instance void setInstanceData( - com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>&, + css::uno::Sequence<css::beans::PropertyValue>&, const OUString* pID, - const com::sun::star::uno::Reference<com::sun::star::xml::dom::XDocument>*, + const css::uno::Reference<css::xml::dom::XDocument>*, const OUString* pURL, const bool* pURLOnce ); diff --git a/forms/source/xforms/model_ui.cxx b/forms/source/xforms/model_ui.cxx index 52843153d103..730a0f69b405 100644 --- a/forms/source/xforms/model_ui.cxx +++ b/forms/source/xforms/model_ui.cxx @@ -89,30 +89,30 @@ OUString Model::getDefaultServiceNameForNode( const XNode_t& xNode ) switch( mxDataTypes->getDataType( sTypeName )->getTypeClass() ) { - case com::sun::star::xsd::DataTypeClass::BOOLEAN: + case css::xsd::DataTypeClass::BOOLEAN: sService = "com.sun.star.form.component.CheckBox"; break; - case com::sun::star::xsd::DataTypeClass::DOUBLE: - case com::sun::star::xsd::DataTypeClass::DECIMAL: - case com::sun::star::xsd::DataTypeClass::FLOAT: + case css::xsd::DataTypeClass::DOUBLE: + case css::xsd::DataTypeClass::DECIMAL: + case css::xsd::DataTypeClass::FLOAT: sService = "com.sun.star.form.component.NumericField"; break; - case com::sun::star::xsd::DataTypeClass::STRING: - case com::sun::star::xsd::DataTypeClass::DURATION: - case com::sun::star::xsd::DataTypeClass::DATETIME: - case com::sun::star::xsd::DataTypeClass::TIME: - case com::sun::star::xsd::DataTypeClass::DATE: - case com::sun::star::xsd::DataTypeClass::gYearMonth: - case com::sun::star::xsd::DataTypeClass::gYear: - case com::sun::star::xsd::DataTypeClass::gMonthDay: - case com::sun::star::xsd::DataTypeClass::gDay: - case com::sun::star::xsd::DataTypeClass::gMonth: - case com::sun::star::xsd::DataTypeClass::hexBinary: - case com::sun::star::xsd::DataTypeClass::base64Binary: - case com::sun::star::xsd::DataTypeClass::anyURI: - case com::sun::star::xsd::DataTypeClass::QName: - case com::sun::star::xsd::DataTypeClass::NOTATION: + case css::xsd::DataTypeClass::STRING: + case css::xsd::DataTypeClass::DURATION: + case css::xsd::DataTypeClass::DATETIME: + case css::xsd::DataTypeClass::TIME: + case css::xsd::DataTypeClass::DATE: + case css::xsd::DataTypeClass::gYearMonth: + case css::xsd::DataTypeClass::gYear: + case css::xsd::DataTypeClass::gMonthDay: + case css::xsd::DataTypeClass::gDay: + case css::xsd::DataTypeClass::gMonth: + case css::xsd::DataTypeClass::hexBinary: + case css::xsd::DataTypeClass::base64Binary: + case css::xsd::DataTypeClass::anyURI: + case css::xsd::DataTypeClass::QName: + case css::xsd::DataTypeClass::NOTATION: default: // keep default break; @@ -506,7 +506,7 @@ void Model::removeInstance( const OUString& sName ) } static Reference<XNameContainer> lcl_getModels( - const Reference<com::sun::star::frame::XModel>& xComponent ) + const Reference<css::frame::XModel>& xComponent ) { Reference<XNameContainer> xRet; Reference<XFormsSupplier> xSupplier( xComponent, UNO_QUERY ); @@ -517,7 +517,7 @@ static Reference<XNameContainer> lcl_getModels( return xRet; } -css::uno::Reference<css::xforms::XModel> Model::newModel( const Reference<com::sun::star::frame::XModel>& xCmp, +css::uno::Reference<css::xforms::XModel> Model::newModel( const Reference<css::frame::XModel>& xCmp, const OUString& sName ) throw( RuntimeException, std::exception ) { @@ -538,7 +538,7 @@ css::uno::Reference<css::xforms::XModel> Model::newModel( const Reference<com::s return xModel; } -void Model::renameModel( const Reference<com::sun::star::frame::XModel>& xCmp, +void Model::renameModel( const Reference<css::frame::XModel>& xCmp, const OUString& sFrom, const OUString& sTo ) throw( RuntimeException, std::exception ) @@ -555,7 +555,7 @@ void Model::renameModel( const Reference<com::sun::star::frame::XModel>& xCmp, } } -void Model::removeModel( const Reference<com::sun::star::frame::XModel>& xCmp, +void Model::removeModel( const Reference<css::frame::XModel>& xCmp, const OUString& sName ) throw( RuntimeException, std::exception ) { diff --git a/forms/source/xforms/namedcollection.hxx b/forms/source/xforms/namedcollection.hxx index 5166dfe8f1ee..690b71e6afe0 100644 --- a/forms/source/xforms/namedcollection.hxx +++ b/forms/source/xforms/namedcollection.hxx @@ -29,7 +29,7 @@ template<class T> class NamedCollection : public cppu::ImplInheritanceHelper< Collection<T>, - com::sun::star::container::XNameAccess> + css::container::XNameAccess> { using Collection<T>::maItems; using Collection<T>::getItem; @@ -50,7 +50,7 @@ public: return findItem( rName ) != maItems.end(); } - typedef com::sun::star::uno::Sequence<OUString> Names_t; + typedef css::uno::Sequence<OUString> Names_t; Names_t getNames() const { // iterate over members, and collect all those that have names @@ -59,8 +59,8 @@ public: aIter != maItems.end(); ++aIter ) { - com::sun::star::uno::Reference<com::sun::star::container::XNamed> - xNamed( *aIter, com::sun::star::uno::UNO_QUERY ); + css::uno::Reference<css::container::XNamed> + xNamed( *aIter, css::uno::UNO_QUERY ); if( xNamed.is() ) aNames.push_back( xNamed->getName() ); } @@ -80,8 +80,8 @@ protected: aIter != maItems.end(); ++aIter ) { - com::sun::star::uno::Reference<com::sun::star::container::XNamed> - xNamed( *aIter, com::sun::star::uno::UNO_QUERY ); + css::uno::Reference<css::container::XNamed> + xNamed( *aIter, css::uno::UNO_QUERY ); if( xNamed.is() && xNamed->getName() == rName ) return aIter; } @@ -111,7 +111,7 @@ public: css::uno::RuntimeException ) SAL_OVERRIDE { if( hasItem( aName ) ) - return com::sun::star::uno::makeAny( getItem( aName ) ); + return css::uno::makeAny( getItem( aName ) ); else throw css::container::NoSuchElementException(); diff --git a/forms/source/xforms/pathexpression.hxx b/forms/source/xforms/pathexpression.hxx index a01aec66a29d..38410f24f0d8 100644 --- a/forms/source/xforms/pathexpression.hxx +++ b/forms/source/xforms/pathexpression.hxx @@ -43,7 +43,7 @@ namespace xforms class PathExpression : public ComputedExpression { public: - typedef std::vector<com::sun::star::uno::Reference<com::sun::star::xml::dom::XNode> > NodeVector_t; + typedef std::vector<css::uno::Reference<css::xml::dom::XNode> > NodeVector_t; private: /// the node-list result from the last bind (cached from mxResult) @@ -69,9 +69,9 @@ public: // get the result of this expression as node/node list/... - com::sun::star::uno::Reference<com::sun::star::xml::dom::XNode> getNode() const; + css::uno::Reference<css::xml::dom::XNode> getNode() const; const NodeVector_t getNodeList() const { return maNodes;} - com::sun::star::uno::Reference<com::sun::star::xml::dom::XNodeList> getXNodeList() const; + css::uno::Reference<css::xml::dom::XNodeList> getXNodeList() const; }; diff --git a/forms/source/xforms/propertysetbase.cxx b/forms/source/xforms/propertysetbase.cxx index 04cd4ac290df..815f04c9d748 100644 --- a/forms/source/xforms/propertysetbase.cxx +++ b/forms/source/xforms/propertysetbase.cxx @@ -76,7 +76,7 @@ void PropertySetBase::registerProperty( const Property& rProperty, m_aAccessors.insert( PropertyAccessors::value_type( rProperty.Handle, rAccessor ) ); OSL_ENSURE( rAccessor->isWriteable() - == ( ( rProperty.Attributes & com::sun::star::beans::PropertyAttribute::READONLY ) == 0 ), + == ( ( rProperty.Attributes & css::beans::PropertyAttribute::READONLY ) == 0 ), "PropertySetBase::registerProperty: inconsistence!" ); m_aProperties.push_back( rProperty ); diff --git a/forms/source/xforms/propertysetbase.hxx b/forms/source/xforms/propertysetbase.hxx index 7fdb2124b3c2..5636c577b15f 100644 --- a/forms/source/xforms/propertysetbase.hxx +++ b/forms/source/xforms/propertysetbase.hxx @@ -49,9 +49,9 @@ protected: public: - virtual bool approveValue( const com::sun::star::uno::Any& rValue ) const = 0; - virtual void setValue( const com::sun::star::uno::Any& rValue ) = 0; - virtual void getValue( com::sun::star::uno::Any& rValue ) const = 0; + virtual bool approveValue( const css::uno::Any& rValue ) const = 0; + virtual void setValue( const css::uno::Any& rValue ) = 0; + virtual void getValue( css::uno::Any& rValue ) const = 0; virtual bool isWriteable() const = 0; }; @@ -78,22 +78,22 @@ public: { } - virtual bool approveValue( const com::sun::star::uno::Any& rValue ) const SAL_OVERRIDE + virtual bool approveValue( const css::uno::Any& rValue ) const SAL_OVERRIDE { VALUE aVal; return ( rValue >>= aVal ); } - virtual void setValue( const com::sun::star::uno::Any& rValue ) SAL_OVERRIDE + virtual void setValue( const css::uno::Any& rValue ) SAL_OVERRIDE { VALUE aTypedVal = VALUE(); OSL_VERIFY( rValue >>= aTypedVal ); (m_pInstance->*m_pWriter)( aTypedVal ); } - virtual void getValue( com::sun::star::uno::Any& rValue ) const SAL_OVERRIDE + virtual void getValue( css::uno::Any& rValue ) const SAL_OVERRIDE { - rValue = com::sun::star::uno::makeAny( (m_pInstance->*m_pReader)() ); + rValue = css::uno::makeAny( (m_pInstance->*m_pReader)() ); } virtual bool isWriteable() const SAL_OVERRIDE @@ -177,11 +177,9 @@ public: class PropertySetBase : public ::comphelper::OStatefulPropertySet { private: - typedef com::sun::star::uno::Any Any_t; - typedef ::std::map< const sal_Int32, ::rtl::Reference< PropertyAccessorBase > > PropertyAccessors; - typedef ::std::vector< ::com::sun::star::beans::Property > PropertyArray; - typedef ::std::map< const sal_Int32, Any_t > PropertyValueCache; + typedef ::std::vector< css::beans::Property > PropertyArray; + typedef ::std::map< const sal_Int32, css::uno::Any > PropertyValueCache; PropertyArray m_aProperties; cppu::IPropertyArrayHelper* m_pProperties; @@ -204,7 +202,7 @@ protected: calls in the constructor of your class. */ void registerProperty( - const com::sun::star::beans::Property& rProperty, + const css::beans::Property& rProperty, const ::rtl::Reference< PropertyAccessorBase >& rAccessor ); @@ -255,14 +253,14 @@ protected: void initializePropertyValueCache( sal_Int32 nHandle ); /// OPropertysetHelper methods - virtual sal_Bool SAL_CALL convertFastPropertyValue( Any_t& rConvertedValue, Any_t& rOldValue, sal_Int32 nHandle, const Any_t& rValue ) - throw (::com::sun::star::lang::IllegalArgumentException) SAL_OVERRIDE; - virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any_t& rValue ) - throw (::com::sun::star::uno::Exception, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL getFastPropertyValue( Any_t& 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; + virtual void SAL_CALL getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nHandle ) const SAL_OVERRIDE; virtual cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; - 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; public: /// helper struct for granting selective access to some notification-related methods @@ -273,14 +271,14 @@ public: one previously registered via <member>registerProperty</member>. @see registerProperty */ - inline void getCurrentPropertyValueByHandle( sal_Int32 nHandle, Any_t& /* [out] */ rValue, const NotifierAccess& ) const + inline void getCurrentPropertyValueByHandle( sal_Int32 nHandle, css::uno::Any& /* [out] */ rValue, const NotifierAccess& ) const { getFastPropertyValue( rValue, nHandle ); } /** notifies a change in a given property to all interested listeners */ - inline void notifyPropertyChange( sal_Int32 nHandle, const Any_t& rOldValue, const Any_t& rNewValue, const NotifierAccess& ) const + inline void notifyPropertyChange( sal_Int32 nHandle, const css::uno::Any& rOldValue, const css::uno::Any& rNewValue, const NotifierAccess& ) const { const_cast< PropertySetBase* >( this )->firePropertyChange( nHandle, rNewValue, rOldValue ); } @@ -317,7 +315,7 @@ struct PropertyChangeNotifier private: const PropertySetBase& m_rPropertySet; sal_Int32 m_nHandle; - com::sun::star::uno::Any m_aOldValue; + css::uno::Any m_aOldValue; public: /** constructs a PropertyChangeNotifier @@ -337,7 +335,7 @@ public: } inline ~PropertyChangeNotifier() { - com::sun::star::uno::Any aNewValue; + css::uno::Any aNewValue; m_rPropertySet.getCurrentPropertyValueByHandle( m_nHandle, aNewValue, PropertySetBase::NotifierAccess() ); if ( aNewValue != m_aOldValue ) { @@ -347,11 +345,11 @@ public: }; -#define PROPERTY_FLAGS( NAME, TYPE, FLAG ) com::sun::star::beans::Property( \ +#define PROPERTY_FLAGS( NAME, TYPE, FLAG ) css::beans::Property( \ OUString( #NAME, sizeof( #NAME ) - 1, RTL_TEXTENCODING_ASCII_US ), \ HANDLE_##NAME, cppu::UnoType<TYPE>::get(), FLAG ) -#define PROPERTY( NAME, TYPE ) PROPERTY_FLAGS( NAME, TYPE, com::sun::star::beans::PropertyAttribute::BOUND ) -#define PROPERTY_RO( NAME, TYPE ) PROPERTY_FLAGS( NAME, TYPE, com::sun::star::beans::PropertyAttribute::BOUND | com::sun::star::beans::PropertyAttribute::READONLY ) +#define PROPERTY( NAME, TYPE ) PROPERTY_FLAGS( NAME, TYPE, css::beans::PropertyAttribute::BOUND ) +#define PROPERTY_RO( NAME, TYPE ) PROPERTY_FLAGS( NAME, TYPE, css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::READONLY ) #endif diff --git a/forms/source/xforms/submission.cxx b/forms/source/xforms/submission.cxx index 476fc8cc9410..fbbd6a77b51a 100644 --- a/forms/source/xforms/submission.cxx +++ b/forms/source/xforms/submission.cxx @@ -562,7 +562,7 @@ static void _cloneNodes(Model& aModel, const Reference< XNode >& dstParent, cons } Reference< XDocument > Submission::getInstanceDocument(const Reference< XXPathObject >& aObj) { - using namespace com::sun::star::xml::xpath; + using namespace css::xml::xpath; // result Reference< XDocument > aDocument; @@ -577,7 +577,7 @@ Reference< XDocument > Submission::getInstanceDocument(const Reference< XXPathOb Reference< XDocumentFragment > Submission::createSubmissionDocument(const Reference< XXPathObject >& aObj, bool bRemoveWSNodes) { - using namespace com::sun::star::xml::xpath; + using namespace css::xml::xpath; Reference< XDocumentBuilder > aDocBuilder = DocumentBuilder::create(comphelper::getProcessComponentContext()); Reference< XDocument > aDocument = aDocBuilder->newDocument(); Reference< XDocumentFragment > aFragment = aDocument->createDocumentFragment(); @@ -602,7 +602,7 @@ Reference< XDocumentFragment > Submission::createSubmissionDocument(const Refere // some forwarding: XPropertySet is implemented in our base class, // but also available as base of XSubmission -Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL Submission::getPropertySetInfo( ) throw(RuntimeException, std::exception) +Reference< css::beans::XPropertySetInfo > SAL_CALL Submission::getPropertySetInfo( ) throw(RuntimeException, std::exception) { return PropertySetBase::getPropertySetInfo(); } @@ -614,19 +614,19 @@ Any SAL_CALL Submission::getPropertyValue( const OUString& PropertyName ) throw( { return PropertySetBase::getPropertyValue( PropertyName ); } -void SAL_CALL Submission::addPropertyChangeListener( const OUString& aPropertyName, const Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL Submission::addPropertyChangeListener( const OUString& aPropertyName, const Reference< css::beans::XPropertyChangeListener >& xListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { PropertySetBase::addPropertyChangeListener( aPropertyName, xListener ); } -void SAL_CALL Submission::removePropertyChangeListener( const OUString& aPropertyName, const Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL Submission::removePropertyChangeListener( const OUString& aPropertyName, const Reference< css::beans::XPropertyChangeListener >& aListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { PropertySetBase::removePropertyChangeListener( aPropertyName, aListener ); } -void SAL_CALL Submission::addVetoableChangeListener( const OUString& PropertyName, const Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL Submission::addVetoableChangeListener( const OUString& PropertyName, const Reference< css::beans::XVetoableChangeListener >& aListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { PropertySetBase::addVetoableChangeListener( PropertyName, aListener ); } -void SAL_CALL Submission::removeVetoableChangeListener( const OUString& PropertyName, const Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL Submission::removeVetoableChangeListener( const OUString& PropertyName, const Reference< css::beans::XVetoableChangeListener >& aListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { PropertySetBase::removeVetoableChangeListener( PropertyName, aListener ); } diff --git a/forms/source/xforms/submission.hxx b/forms/source/xforms/submission.hxx index 90da4f7b8c2e..2e6023e58937 100644 --- a/forms/source/xforms/submission.hxx +++ b/forms/source/xforms/submission.hxx @@ -57,8 +57,8 @@ namespace xforms */ typedef cppu::ImplInheritanceHelper< PropertySetBase, - com::sun::star::lang::XUnoTunnel, - com::sun::star::xforms::XSubmission + css::lang::XUnoTunnel, + css::xforms::XSubmission > Submission_t; class Submission : public Submission_t @@ -78,19 +78,19 @@ class Submission : public Submission_t OUString msCDataSectionElement; OUString msReplace; OUString msSeparator; - com::sun::star::uno::Sequence< OUString > msIncludeNamespacePrefixes; + css::uno::Sequence< OUString > msIncludeNamespacePrefixes; private: /// the Model to which this Submission belongs; may be NULL - com::sun::star::uno::Reference<com::sun::star::xforms::XModel> mxModel; + css::uno::Reference<css::xforms::XModel> mxModel; // this will extract the document from the model that will be submitted - com::sun::star::uno::Reference< com::sun::star::xml::dom::XDocumentFragment > - createSubmissionDocument(const com::sun::star::uno::Reference< com::sun::star::xml::xpath::XXPathObject >& aObject, + css::uno::Reference< css::xml::dom::XDocumentFragment > + createSubmissionDocument(const css::uno::Reference< css::xml::xpath::XXPathObject >& aObject, bool bRemoveWSNodes = false); - static com::sun::star::uno::Reference< com::sun::star::xml::dom::XDocument > - getInstanceDocument(const com::sun::star::uno::Reference< com::sun::star::xml::xpath::XXPathObject >& aObject); + static css::uno::Reference< css::xml::dom::XDocument > + getInstanceDocument(const css::uno::Reference< css::xml::xpath::XXPathObject >& aObject); public: Submission(); @@ -101,12 +101,12 @@ public: /// get XForms model - com::sun::star::uno::Reference<com::sun::star::xforms::XModel> + css::uno::Reference<css::xforms::XModel> getModel() const { return mxModel;} /// set XForms model void setModel( - const com::sun::star::uno::Reference<com::sun::star::xforms::XModel>& ); + const css::uno::Reference<css::xforms::XModel>& ); OUString getID() const { return msID;} /// get ID for this submission void setID( const OUString& ); /// set ID for this submission @@ -150,23 +150,23 @@ public: OUString getSeparator() const { return msSeparator;} void setSeparator( const OUString& ); - com::sun::star::uno::Sequence< OUString > getIncludeNamespacePrefixes() const { return msIncludeNamespacePrefixes;} - void setIncludeNamespacePrefixes( const com::sun::star::uno::Sequence< OUString >& ); + css::uno::Sequence< OUString > getIncludeNamespacePrefixes() const { return msIncludeNamespacePrefixes;} + void setIncludeNamespacePrefixes( const css::uno::Sequence< OUString >& ); /** perform the submission * @returns if submission was successful */ - bool doSubmit( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& aHandler ); + bool doSubmit( const css::uno::Reference< css::task::XInteractionHandler >& aHandler ); // helpers for UNO tunnel - static com::sun::star::uno::Sequence<sal_Int8> getUnoTunnelID(); - static Submission* getSubmission( const com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>& ); + static css::uno::Sequence<sal_Int8> getUnoTunnelID(); + static Submission* getSubmission( const css::uno::Reference<css::beans::XPropertySet>& ); private: /// check whether object is live, and throw suitable exception if not /// (to be used be API methods before acting on the object) void liveCheck() - throw( com::sun::star::uno::RuntimeException ); + throw( css::uno::RuntimeException ); /// get the model implementation xforms::Model* getModelImpl() const; @@ -179,11 +179,11 @@ protected: virtual sal_Bool SAL_CALL convertFastPropertyValue( - com::sun::star::uno::Any& rConvertedValue, - com::sun::star::uno::Any& rOldValue, + css::uno::Any& rConvertedValue, + css::uno::Any& rOldValue, sal_Int32 nHandle, - const com::sun::star::uno::Any& rValue ) - throw ( com::sun::star::lang::IllegalArgumentException ) SAL_OVERRIDE; + const css::uno::Any& rValue ) + throw ( css::lang::IllegalArgumentException ) SAL_OVERRIDE; private: void initializePropertySet(); @@ -197,10 +197,10 @@ public: virtual OUString SAL_CALL getName() - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setName( const OUString& ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -209,8 +209,8 @@ public: virtual sal_Int64 SAL_CALL getSomething( - const com::sun::star::uno::Sequence<sal_Int8>& ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + const css::uno::Sequence<sal_Int8>& ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -218,32 +218,32 @@ public: 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; + throw ( css::util::VetoException, + css::lang::WrappedTargetException, + css::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; + 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 ::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; + 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 ::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; + const css::uno::Reference< css::form::submission::XSubmissionVetoListener >& listener ) + throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet // (need to disambiguate this) - 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 void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/forms/source/xforms/submission/submission.hxx b/forms/source/xforms/submission/submission.hxx index f98b0dc502f8..68efec80d75f 100644 --- a/forms/source/xforms/submission/submission.hxx +++ b/forms/source/xforms/submission/submission.hxx @@ -85,16 +85,16 @@ public: CProgressHandlerHelper() : m_count(0) {} - virtual void SAL_CALL push( const com::sun::star::uno::Any& /*aStatus*/) throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL push( const css::uno::Any& /*aStatus*/) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE { m_mLock.acquire(); m_count++; m_mLock.release(); } - virtual void SAL_CALL update(const com::sun::star::uno::Any& /*aStatus*/) throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL update(const css::uno::Any& /*aStatus*/) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE { } - virtual void SAL_CALL pop() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL pop() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE { m_mLock.acquire(); m_count--; @@ -115,8 +115,8 @@ protected: css::uno::Reference< css::uno::XComponentContext > m_xContext; OUString m_aEncoding; - ::std::unique_ptr< CSerialization > createSerialization(const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& aHandler - ,com::sun::star::uno::Reference<com::sun::star::ucb::XCommandEnvironment>& _rOutEnv); + ::std::unique_ptr< CSerialization > createSerialization(const css::uno::Reference< css::task::XInteractionHandler >& aHandler + ,css::uno::Reference<css::ucb::XCommandEnvironment>& _rOutEnv); public: enum SubmissionResult { diff --git a/forms/source/xforms/unohelper.hxx b/forms/source/xforms/unohelper.hxx index 045c63672976..88f7c0a8757f 100644 --- a/forms/source/xforms/unohelper.hxx +++ b/forms/source/xforms/unohelper.hxx @@ -35,7 +35,7 @@ namespace xforms { /** copy the properties from one PropertySet into the next */ -void copy( const com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>& , com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>& ); +void copy( const css::uno::Reference<css::beans::XPropertySet>& , css::uno::Reference<css::beans::XPropertySet>& ); } diff --git a/forms/source/xforms/xformsevent.hxx b/forms/source/xforms/xformsevent.hxx index a72f4252cb40..ec2e0e67edf8 100644 --- a/forms/source/xforms/xformsevent.hxx +++ b/forms/source/xforms/xformsevent.hxx @@ -36,7 +36,7 @@ class XFormsEventConcrete : public cppu::WeakImplHelper< XFormsEvent > { XFormsEventConcrete() : m_canceled(false) - , m_phase(com::sun::star::xml::dom::events::PhaseType_CAPTURING_PHASE) + , m_phase(css::xml::dom::events::PhaseType_CAPTURING_PHASE) , m_bubbles(false) , m_cancelable(false) { diff --git a/forms/source/xforms/xmlhelper.hxx b/forms/source/xforms/xmlhelper.hxx index b3d853303d0b..69ec629c0179 100644 --- a/forms/source/xforms/xmlhelper.hxx +++ b/forms/source/xforms/xmlhelper.hxx @@ -31,12 +31,12 @@ namespace com { namespace sun { namespace star { bool isValidQName( const OUString& sName, - const com::sun::star::uno::Reference<com::sun::star::container::XNameContainer>& xNamespaces ); + const css::uno::Reference<css::container::XNameContainer>& xNamespaces ); bool isValidPrefixName( const OUString& sName, - const com::sun::star::uno::Reference<com::sun::star::container::XNameContainer>& xNamespaces ); + const css::uno::Reference<css::container::XNameContainer>& xNamespaces ); -com::sun::star::uno::Reference<com::sun::star::xml::dom::XDocumentBuilder> getDocumentBuilder(); +css::uno::Reference<css::xml::dom::XDocumentBuilder> getDocumentBuilder(); #endif diff --git a/forms/source/xforms/xpathlib/extension.cxx b/forms/source/xforms/xpathlib/extension.cxx index b2bb2371a04d..fe548e758322 100644 --- a/forms/source/xforms/xpathlib/extension.cxx +++ b/forms/source/xforms/xpathlib/extension.cxx @@ -63,9 +63,9 @@ void SAL_CALL CLibxml2XFormsExtension::initialize(const Sequence< Any >& aSequen } -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_comp_xml_xpath_XFormsExtension_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_comp_xml_xpath_XFormsExtension_get_implementation(css::uno::XComponentContext*, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new CLibxml2XFormsExtension()); } diff --git a/forms/source/xforms/xpathlib/extension.hxx b/forms/source/xforms/xpathlib/extension.hxx index 84bdd5d41f91..37f5ca33307b 100644 --- a/forms/source/xforms/xpathlib/extension.hxx +++ b/forms/source/xforms/xpathlib/extension.hxx @@ -39,20 +39,20 @@ class CLibxml2XFormsExtension : public cppu::WeakImplHelper< - com::sun::star::xml::xpath::XXPathExtension, com::sun::star::lang::XInitialization> + css::xml::xpath::XXPathExtension, css::lang::XInitialization> { private: - com::sun::star::uno::Reference <com::sun::star::xforms::XModel> m_aModel; - com::sun::star::uno::Reference <com::sun::star::xml::dom::XNode> m_aContextNode; + css::uno::Reference <css::xforms::XModel> m_aModel; + css::uno::Reference <css::xml::dom::XNode> m_aContextNode; public: CLibxml2XFormsExtension() {} - com::sun::star::uno::Reference< com::sun::star::xforms::XModel > getModel() { return m_aModel;} - com::sun::star::uno::Reference< com::sun::star::xml::dom::XNode > getContextNode() { return m_aContextNode;} + css::uno::Reference< css::xforms::XModel > getModel() { return m_aModel;} + css::uno::Reference< css::xml::dom::XNode > getContextNode() { return m_aContextNode;} - virtual com::sun::star::xml::xpath::Libxml2ExtensionHandle SAL_CALL getLibxml2ExtensionHandle() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL initialize(const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aSequence) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::xml::xpath::Libxml2ExtensionHandle SAL_CALL getLibxml2ExtensionHandle() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any >& aSequence) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; |