star* -> css::*
Change-Id: I156d40badb1a11727d1320600a9d3af2b8b24e4a
This commit is contained in:
parent
123c64ab00
commit
150df3c020
8 changed files with 26 additions and 26 deletions
|
@ -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 );
|
||||
|
|
|
@ -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) ));
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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;
|
||||
};
|
||||
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -126,7 +126,7 @@ sal_Bool OGenericUnoDialog::convertFastPropertyValue( Any& rConvertedValue, Any&
|
|||
{
|
||||
case UNODIALOG_PROPERTY_ID_PARENT:
|
||||
{
|
||||
Reference<starawt::XWindow> xNew(rValue, css::uno::UNO_QUERY);
|
||||
Reference<css::awt::XWindow> xNew(rValue, css::uno::UNO_QUERY);
|
||||
if (xNew != m_xParent)
|
||||
{
|
||||
rConvertedValue <<= xNew;
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
Loading…
Reference in a new issue