diff options
| author | Noel Grandin <noel@peralex.com> | 2012-10-25 17:18:13 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-10-29 17:32:57 +0100 |
| commit | 8fff6bf6bdab6b7addcbbf472a226706edda1edb (patch) | |
| tree | a27347a5b8e0bef5c00757a56a0e9a217fcb2f59 /svl/inc | |
| parent | fdo#46808: Fix previous commit (diff) | |
| download | core-8fff6bf6bdab6b7addcbbf472a226706edda1edb.tar.gz core-8fff6bf6bdab6b7addcbbf472a226706edda1edb.zip | |
fdo#46808, Adapt i18n::LocaleCalendar UNO service to new style
Did not need to create a new interface, because XCalendar3
already covers the whole service interface.
Change-Id: Iaf094014c16e872d2003ca6e8e7588abd081d882
Diffstat (limited to 'svl/inc')
| -rw-r--r-- | svl/inc/svl/ondemand.hxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/svl/inc/svl/ondemand.hxx b/svl/inc/svl/ondemand.hxx index d90314db286f..47488504b073 100644 --- a/svl/inc/svl/ondemand.hxx +++ b/svl/inc/svl/ondemand.hxx @@ -165,7 +165,7 @@ public: */ class OnDemandCalendarWrapper { - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xSMgr; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; ::com::sun::star::lang::Locale aLocale; mutable CalendarWrapper* pPtr; mutable bool bValid; @@ -178,13 +178,13 @@ public: , bInitialized(false) {} OnDemandCalendarWrapper( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxSMgr, + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, ::com::sun::star::lang::Locale& rLocale ) : bValid(false) , bInitialized(false) { - init( rxSMgr, rLocale ); + init( rxContext, rLocale ); } ~OnDemandCalendarWrapper() { @@ -196,11 +196,11 @@ public: bool is() const { return pPtr != NULL; } void init( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxSMgr, + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, ::com::sun::star::lang::Locale& rLocale ) { - xSMgr = rxSMgr; + m_xContext = rxContext; changeLocale( rLocale ); if ( pPtr ) { @@ -221,7 +221,7 @@ public: if ( !bValid ) { if ( !pPtr ) - pPtr = new CalendarWrapper( xSMgr ); + pPtr = new CalendarWrapper( m_xContext ); pPtr->loadDefaultCalendar( aLocale ); bValid = true; } |