From 150df3c020613bd956c4ad38ab4b5e247801296b Mon Sep 17 00:00:00 2001 From: Thomas Arnhold Date: Wed, 20 Aug 2014 21:40:54 +0200 Subject: [PATCH] star* -> css::* Change-Id: I156d40badb1a11727d1320600a9d3af2b8b24e4a --- forms/source/component/Button.cxx | 2 +- forms/source/component/GroupBox.cxx | 4 ++-- forms/source/component/RadioButton.cxx | 2 +- forms/source/component/RadioButton.hxx | 2 +- forms/source/inc/FormComponent.hxx | 10 +++++----- forms/source/inc/property.hxx | 6 +++--- svtools/source/uno/genericunodialog.cxx | 2 +- unotools/source/misc/datetime.cxx | 24 ++++++++++++------------ 8 files changed, 26 insertions(+), 26 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& _rxFactory) +InterfaceRef SAL_CALL OGroupBoxModel_CreateInstance(const Reference& _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& _rxFactory) +InterfaceRef SAL_CALL OGroupBoxControl_CreateInstance(const Reference& _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& _rx } -void SAL_CALL ORadioButtonControl::createPeer(const Reference& _rxToolkit, const Reference& _rxParent) throw (RuntimeException, std::exception) +void SAL_CALL ORadioButtonControl::createPeer(const Reference& _rxToolkit, const Reference& _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& Toolkit, const ::com::sun::star::uno::Reference& Parent) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL createPeer(const ::com::sun::star::uno::Reference& Toolkit, const ::com::sun::star::uno::Reference& 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& Toolkit, const ::com::sun::star::uno::Reference& Parent) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference 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& Model) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference SAL_CALL getModel() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference SAL_CALL getView() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL createPeer(const ::com::sun::star::uno::Reference& Toolkit, const ::com::sun::star::uno::Reference& Parent) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference 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& Model) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference SAL_CALL getModel() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference 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 diff --git a/svtools/source/uno/genericunodialog.cxx b/svtools/source/uno/genericunodialog.cxx index f02d99c19138..0ce8959edbac 100644 --- a/svtools/source/uno/genericunodialog.cxx +++ b/svtools/source/uno/genericunodialog.cxx @@ -126,7 +126,7 @@ sal_Bool OGenericUnoDialog::convertFastPropertyValue( Any& rConvertedValue, Any& { case UNODIALOG_PROPERTY_ID_PARENT: { - Reference xNew(rValue, css::uno::UNO_QUERY); + Reference xNew(rValue, css::uno::UNO_QUERY); if (xNew != m_xParent) { rConvertedValue <<= xNew; diff --git a/unotools/source/misc/datetime.cxx b/unotools/source/misc/datetime.cxx index 8709aac23077..a8065287d90c 100644 --- a/unotools/source/misc/datetime.cxx +++ b/unotools/source/misc/datetime.cxx @@ -179,19 +179,19 @@ namespace namespace utl { -void typeConvert(const Date& _rDate, starutil::Date& _rOut) +void typeConvert(const Date& _rDate, css::util::Date& _rOut) { _rOut.Day = _rDate.GetDay(); _rOut.Month = _rDate.GetMonth(); _rOut.Year = _rDate.GetYear(); } -void typeConvert(const starutil::Date& _rDate, Date& _rOut) +void typeConvert(const css::util::Date& _rDate, Date& _rOut) { _rOut = Date(_rDate.Day, _rDate.Month, _rDate.Year); } -void typeConvert(const DateTime& _rDateTime, starutil::DateTime& _rOut) +void typeConvert(const DateTime& _rDateTime, css::util::DateTime& _rOut) { _rOut.Year = _rDateTime.GetYear(); _rOut.Month = _rDateTime.GetMonth(); @@ -202,21 +202,21 @@ void typeConvert(const DateTime& _rDateTime, starutil::DateTime& _rOut) _rOut.NanoSeconds = _rDateTime.GetNanoSec(); } -void typeConvert(const starutil::DateTime& _rDateTime, DateTime& _rOut) +void typeConvert(const css::util::DateTime& _rDateTime, DateTime& _rOut) { Date aDate(_rDateTime.Day, _rDateTime.Month, _rDateTime.Year); Time aTime(_rDateTime.Hours, _rDateTime.Minutes, _rDateTime.Seconds, _rDateTime.NanoSeconds); _rOut = DateTime(aDate, aTime); } -void extractDate(const starutil::DateTime& _rDateTime, starutil::Date& _rOut) +void extractDate(const css::util::DateTime& _rDateTime, css::util::Date& _rOut) { _rOut.Day = _rDateTime.Day; _rOut.Month = _rDateTime.Month; _rOut.Year = _rDateTime.Year; } -OUString toISO8601(const starutil::DateTime& rDateTime) +OUString toISO8601(const css::util::DateTime& rDateTime) { OUStringBuffer rBuffer; rBuffer.append((sal_Int32) rDateTime.Year); @@ -261,13 +261,13 @@ OUString toISO8601(const starutil::DateTime& rDateTime) } /** convert ISO8601 DateTime String to util::DateTime */ -bool ISO8601parseDateTime(const OUString &rString, starutil::DateTime& rDateTime) +bool ISO8601parseDateTime(const OUString &rString, css::util::DateTime& rDateTime) { bool bSuccess = true; rtl::OUString aDateStr, aTimeStr; - starutil::Date aDate; - starutil::Time aTime; + css::util::Date aDate; + css::util::Time aTime; sal_Int32 nPos = rString.indexOf( 'T' ); if ( nPos >= 0 ) { @@ -286,7 +286,7 @@ bool ISO8601parseDateTime(const OUString &rString, starutil::DateTime& rDateTime if (bSuccess) { - rDateTime = starutil::DateTime(aTime.NanoSeconds, aTime.Seconds, aTime.Minutes, aTime.Hours, + rDateTime = css::util::DateTime(aTime.NanoSeconds, aTime.Seconds, aTime.Minutes, aTime.Hours, aDate.Day, aDate.Month, aDate.Year, false); } @@ -297,7 +297,7 @@ bool ISO8601parseDateTime(const OUString &rString, starutil::DateTime& rDateTime // TODO: supports only calendar dates YYYY-MM-DD // MISSING: calendar dates YYYYMMDD YYYY-MM // year, week date, ordinal date -bool ISO8601parseDate(const OUString &aDateStr, starutil::Date& rDate) +bool ISO8601parseDate(const OUString &aDateStr, css::util::Date& rDate) { bool bSuccess = true; @@ -339,7 +339,7 @@ bool ISO8601parseDate(const OUString &aDateStr, starutil::Date& rDate) } /** convert ISO8601 Time String to util::Time */ -bool ISO8601parseTime(const OUString &aTimeStr, starutil::Time& rTime) +bool ISO8601parseTime(const OUString &aTimeStr, css::util::Time& rTime) { bool bSuccess = true;