diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2014-08-20 21:40:54 +0200 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2014-08-21 09:03:22 +0200 |
commit | 150df3c020613bd956c4ad38ab4b5e247801296b (patch) | |
tree | 5467494d02955eb9e8de4ef4b31a6af8aec67719 /forms | |
parent | starawt -> css::awt (diff) | |
download | core-150df3c020613bd956c4ad38ab4b5e247801296b.tar.gz core-150df3c020613bd956c4ad38ab4b5e247801296b.zip |
star* -> css::*
Change-Id: I156d40badb1a11727d1320600a9d3af2b8b24e4a
Diffstat (limited to 'forms')
-rw-r--r-- | forms/source/component/Button.cxx | 2 | ||||
-rw-r--r-- | forms/source/component/GroupBox.cxx | 4 | ||||
-rw-r--r-- | forms/source/component/RadioButton.cxx | 2 | ||||
-rw-r--r-- | forms/source/component/RadioButton.hxx | 2 | ||||
-rw-r--r-- | forms/source/inc/FormComponent.hxx | 10 | ||||
-rw-r--r-- | forms/source/inc/property.hxx | 6 |
6 files changed, 13 insertions, 13 deletions
diff --git a/forms/source/component/Button.cxx b/forms/source/component/Button.cxx index 262bd89fadef..8d45fae2b3aa 100644 --- a/forms/source/component/Button.cxx +++ b/forms/source/component/Button.cxx @@ -425,7 +425,7 @@ void SAL_CALL OButtonControl::disposing( const EventObject& _rSource ) throw( Ru void OButtonControl::actionPerformed(const ActionEvent& /*rEvent*/) throw ( ::com::sun::star::uno::RuntimeException, std::exception) { - // Asynchronous for starutil::URL-Button + // Asynchronous for css::util::URL-Button ImplSVEvent * n = Application::PostUserEvent( LINK(this, OButtonControl,OnClick) ); { ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/forms/source/component/GroupBox.cxx b/forms/source/component/GroupBox.cxx index c66b9c2c4201..9e9b5961b691 100644 --- a/forms/source/component/GroupBox.cxx +++ b/forms/source/component/GroupBox.cxx @@ -44,7 +44,7 @@ using namespace ::com::sun::star::util; -InterfaceRef SAL_CALL OGroupBoxModel_CreateInstance(const Reference<starlang::XMultiServiceFactory>& _rxFactory) +InterfaceRef SAL_CALL OGroupBoxModel_CreateInstance(const Reference<css::lang::XMultiServiceFactory>& _rxFactory) { return *(new OGroupBoxModel( comphelper::getComponentContext(_rxFactory) )); } @@ -132,7 +132,7 @@ void SAL_CALL OGroupBoxModel::read(const Reference< XObjectInputStream>& _rxInSt -InterfaceRef SAL_CALL OGroupBoxControl_CreateInstance(const Reference<starlang::XMultiServiceFactory>& _rxFactory) +InterfaceRef SAL_CALL OGroupBoxControl_CreateInstance(const Reference<css::lang::XMultiServiceFactory>& _rxFactory) { return *(new OGroupBoxControl( comphelper::getComponentContext(_rxFactory) )); } diff --git a/forms/source/component/RadioButton.cxx b/forms/source/component/RadioButton.cxx index 2dcec5b1f374..dd8c54f45089 100644 --- a/forms/source/component/RadioButton.cxx +++ b/forms/source/component/RadioButton.cxx @@ -70,7 +70,7 @@ ORadioButtonControl::ORadioButtonControl(const Reference<XComponentContext>& _rx } -void SAL_CALL ORadioButtonControl::createPeer(const Reference<starawt::XToolkit>& _rxToolkit, const Reference<starawt::XWindowPeer>& _rxParent) throw (RuntimeException, std::exception) +void SAL_CALL ORadioButtonControl::createPeer(const Reference<css::awt::XToolkit>& _rxToolkit, const Reference<css::awt::XWindowPeer>& _rxParent) throw (RuntimeException, std::exception) { OBoundControl::createPeer(_rxToolkit, _rxParent); diff --git a/forms/source/component/RadioButton.hxx b/forms/source/component/RadioButton.hxx index fbdacad7f35e..62e8246e7f3e 100644 --- a/forms/source/component/RadioButton.hxx +++ b/forms/source/component/RadioButton.hxx @@ -88,7 +88,7 @@ public: protected: // XControl - virtual void SAL_CALL createPeer(const ::com::sun::star::uno::Reference<starawt::XToolkit>& Toolkit, const ::com::sun::star::uno::Reference<starawt::XWindowPeer>& Parent) 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; }; diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx index 374d4ad77d78..db8e51e90deb 100644 --- a/forms/source/inc/FormComponent.hxx +++ b/forms/source/inc/FormComponent.hxx @@ -253,11 +253,11 @@ protected: // XControl virtual void SAL_CALL setContext(const InterfaceRef& Context) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual InterfaceRef SAL_CALL getContext() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL createPeer(const ::com::sun::star::uno::Reference<starawt::XToolkit>& Toolkit, const ::com::sun::star::uno::Reference<starawt::XWindowPeer>& Parent) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference<starawt::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<starawt::XControlModel>& Model) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference<starawt::XControlModel> SAL_CALL getModel() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference<starawt::XView> SAL_CALL getView() 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; diff --git a/forms/source/inc/property.hxx b/forms/source/inc/property.hxx index 0bcb840defdf..c55af0bbedf9 100644 --- a/forms/source/inc/property.hxx +++ b/forms/source/inc/property.hxx @@ -162,7 +162,7 @@ public: #define DECL_IFACE_PROP1(varname, type, attrib1) \ - DECL_IFACE_PROP_IMPL(varname, type) starbeans::PropertyAttribute::attrib1) + DECL_IFACE_PROP_IMPL(varname, type) css::beans::PropertyAttribute::attrib1) #define DECL_IFACE_PROP2(varname, type, attrib1, attrib2) \ @@ -170,11 +170,11 @@ public: #define DECL_IFACE_PROP3(varname, type, attrib1, attrib2, attrib3) \ - DECL_IFACE_PROP_IMPL(varname, type) starbeans::PropertyAttribute::attrib1 | starbeans::PropertyAttribute::attrib2 | starbeans::PropertyAttribute::attrib3) + DECL_IFACE_PROP_IMPL(varname, type) css::beans::PropertyAttribute::attrib1 | css::beans::PropertyAttribute::attrib2 | css::beans::PropertyAttribute::attrib3) #define DECL_IFACE_PROP4(varname, type, attrib1, attrib2, attrib3, attrib4) \ - DECL_IFACE_PROP_IMPL(varname, type) starbeans::PropertyAttribute::attrib1 | starbeans::PropertyAttribute::attrib2 | starbeans::PropertyAttribute::attrib3 | PropertyAttribute::attrib4) + DECL_IFACE_PROP_IMPL(varname, type) css::beans::PropertyAttribute::attrib1 | css::beans::PropertyAttribute::attrib2 | css::beans::PropertyAttribute::attrib3 | PropertyAttribute::attrib4) // === or Boolean properties |