[Libreoffice-commits] .: 14 commits - basic/source config_host.mk.in configure.ac desktop/source framework/inc framework/source offapi/com offapi/type_reference offapi/UnoApi_offapi.mk sc/source sd/source sfx2/inc sfx2/source solenv/gbuild svl/inc svl/source svtools/source svx/source sw/inc unotools/inc unotools/source vcl/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Oct 29 09:33:37 PDT 2012
basic/source/runtime/methods1.cxx | 10 --
config_host.mk.in | 2
configure.ac | 10 --
desktop/source/app/app.cxx | 15 +---
framework/inc/services.h | 6 -
framework/source/jobs/jobexecutor.cxx | 2
framework/source/recording/dispatchrecordersupplier.cxx | 2
framework/source/services/autorecovery.cxx | 2
framework/source/services/mediatypedetectionhelper.cxx | 2
framework/source/services/sessionlistener.cxx | 11 +--
offapi/UnoApi_offapi.mk | 3
offapi/com/sun/star/frame/AutoRecovery.idl | 37 ++++++++++
offapi/com/sun/star/i18n/LocaleCalendar.idl | 10 --
offapi/type_reference/types.rdb |binary
sc/source/core/data/global.cxx | 2
sc/source/ui/docshell/impex.cxx | 5 -
sd/source/ui/slideshow/slideshowimpl.cxx | 8 --
sfx2/inc/sfx2/sfxuno.hxx | 57 ++++++++++++++++
sfx2/source/inc/eventsupplier.hxx | 9 --
sfx2/source/notify/eventsupplier.cxx | 23 +-----
sfx2/source/view/viewfrm.cxx | 7 +
solenv/gbuild/Jar.mk | 1
solenv/gbuild/JunitTest.mk | 2
svl/inc/svl/ondemand.hxx | 12 +--
svl/source/numbers/zforfind.cxx | 9 +-
svl/source/numbers/zforlist.cxx | 2
svtools/source/control/calendar.cxx | 3
svx/source/dialog/docrecovery.cxx | 31 ++++----
svx/source/inc/docrecovery.hxx | 9 +-
svx/source/unodraw/recoveryui.cxx | 4 -
sw/inc/swcalwrp.hxx | 4 -
unotools/inc/unotools/calendarwrapper.hxx | 7 -
unotools/source/i18n/calendarwrapper.cxx | 9 --
vcl/source/control/field2.cxx | 5 +
34 files changed, 185 insertions(+), 136 deletions(-)
New commits:
commit 8fff6bf6bdab6b7addcbbf472a226706edda1edb
Author: Noel Grandin <noel at peralex.com>
Date: Thu Oct 25 17:18:13 2012 +0200
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
diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx
index 7072c09..6dae3f4 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -48,7 +48,7 @@
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/i18n/XCalendar3.hpp>
+#include <com/sun/star/i18n/LocaleCalendar.hpp>
#include <com/sun/star/sheet/XFunctionAccess.hpp>
using namespace comphelper;
@@ -64,12 +64,8 @@ static Reference< XCalendar3 > getLocaleCalendar( void )
static Reference< XCalendar3 > xCalendar;
if( !xCalendar.is() )
{
- Reference< XMultiServiceFactory > xSMgr = getProcessServiceFactory();
- if( xSMgr.is() )
- {
- xCalendar = Reference< XCalendar3 >( xSMgr->createInstance
- ( ::rtl::OUString("com.sun.star.i18n.LocaleCalendar" ) ), UNO_QUERY );
- }
+ Reference< XComponentContext > xContext = getProcessComponentContext();
+ xCalendar = LocaleCalendar::create(xContext);
}
static com::sun::star::lang::Locale aLastLocale;
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 7de5d77..b1b5e2d 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -153,6 +153,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/inspection
))
$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/i18n,\
BreakIterator \
+ LocaleCalendar \
LocaleData \
))
$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/linguistic2,\
@@ -861,7 +862,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/i18n,\
Collator \
IndexEntrySupplier \
InputSequenceChecker \
- LocaleCalendar \
NativeNumberSupplier \
NumberFormatMapper \
OrdinalSuffix \
diff --git a/offapi/com/sun/star/i18n/LocaleCalendar.idl b/offapi/com/sun/star/i18n/LocaleCalendar.idl
index 8ab37fc..db4c354 100644
--- a/offapi/com/sun/star/i18n/LocaleCalendar.idl
+++ b/offapi/com/sun/star/i18n/LocaleCalendar.idl
@@ -20,8 +20,6 @@
#ifndef __com_sun_star_i18n_LocaleCalendar_idl__
#define __com_sun_star_i18n_LocaleCalendar_idl__
-#include <com/sun/star/i18n/XCalendar.idl>
-#include <com/sun/star/i18n/XExtendedCalendar.idl>
#include <com/sun/star/i18n/XCalendar3.idl>
@@ -29,13 +27,7 @@ module com { module sun { module star { module i18n {
/// Access a locale specific calendar.
-published service LocaleCalendar
-{
- interface com::sun::star::i18n::XCalendar;
-
- [optional] interface com::sun::star::i18n::XExtendedCalendar;
- [optional] interface com::sun::star::i18n::XCalendar3;
-};
+published service LocaleCalendar : XCalendar3;
}; }; }; };
diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb
index da0750a..8a3c658 100644
Binary files a/offapi/type_reference/types.rdb and b/offapi/type_reference/types.rdb differ
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index 2cefa94..4b9eaa6 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -1137,7 +1137,7 @@ CalendarWrapper* ScGlobal::GetCalendar()
{
if ( !pCalendar )
{
- pCalendar = new CalendarWrapper( ::comphelper::getProcessServiceFactory() );
+ pCalendar = new CalendarWrapper( ::comphelper::getProcessComponentContext() );
pCalendar->loadDefaultCalendar( *GetLocale() );
}
return pCalendar;
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index 05521e2..f966630 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -28,6 +28,7 @@
#include "sc.hrc"
+#include <comphelper/processfactory.hxx>
#include <i18npool/mslangid.hxx>
#include <sot/formats.hxx>
#include <sfx2/mieclip.hxx>
@@ -1296,7 +1297,7 @@ bool ScImportExport::ExtText2Doc( SvStream& rStrm )
::utl::TransliterationWrapper aTransliteration(
pDoc->GetServiceManager(), SC_TRANSLITERATION_IGNORECASE );
aTransliteration.loadModuleIfNeeded( eDocLang );
- CalendarWrapper aCalendar( pDoc->GetServiceManager() );
+ CalendarWrapper aCalendar( comphelper::getComponentContext(pDoc->GetServiceManager()) );
aCalendar.loadDefaultCalendar(
MsLangId::convertLanguageToLocale( eDocLang ) );
::utl::TransliterationWrapper* pEnglishTransliteration = NULL;
@@ -1306,7 +1307,7 @@ bool ScImportExport::ExtText2Doc( SvStream& rStrm )
pEnglishTransliteration = new ::utl::TransliterationWrapper (
pDoc->GetServiceManager(), SC_TRANSLITERATION_IGNORECASE );
aTransliteration.loadModuleIfNeeded( LANGUAGE_ENGLISH_US );
- pEnglishCalendar = new CalendarWrapper ( pDoc->GetServiceManager() );
+ pEnglishCalendar = new CalendarWrapper ( comphelper::getComponentContext(pDoc->GetServiceManager()) );
pEnglishCalendar->loadDefaultCalendar(
MsLangId::convertLanguageToLocale( LANGUAGE_ENGLISH_US ) );
}
diff --git a/svl/inc/svl/ondemand.hxx b/svl/inc/svl/ondemand.hxx
index d90314d..4748850 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;
}
diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index da2a66f..55d7fd7 100644
--- a/svl/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.cxx
@@ -30,6 +30,7 @@
#include <unotools/calendarwrapper.hxx>
#include <unotools/localedatawrapper.hxx>
#include <com/sun/star/i18n/CalendarFieldIndex.hpp>
+#include <com/sun/star/i18n/LocaleCalendar.hpp>
#include <unotools/digitgroupingiterator.hxx>
#include <svl/zforlist.hxx> // NUMBERFORMAT_XXX
@@ -1766,11 +1767,9 @@ input for the following reasons:
sal_Int16 nDaySet, nMonthSet, nYearSet, nHourSet, nMinuteSet, nSecondSet;
sal_Int16 nZO, nDST1, nDST2, nDST, nZOmillis, nDST1millis, nDST2millis, nDSTmillis;
sal_Int32 nZoneInMillis, nDST1InMillis, nDST2InMillis;
- uno::Reference< lang::XMultiServiceFactory > xSMgr =
- ::comphelper::getProcessServiceFactory();
- uno::Reference< ::com::sun::star::i18n::XCalendar3 > xCal(
- xSMgr->createInstance( "com.sun.star.i18n.LocaleCalendar" ),
- uno::UNO_QUERY );
+ uno::Reference< uno::XComponentContext > xContext =
+ ::comphelper::getProcessComponentContext();
+ uno::Reference< i18n::XCalendar3 > xCal = i18n::LocaleCalendar::create(xContext);
for ( const entry* p = cals; p->lan; ++p )
{
aLocale.Language = ::rtl::OUString::createFromAscii( p->lan );
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 9bc4f5d..9919cf9 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -236,7 +236,7 @@ void SvNumberFormatter::ImpConstruct( LanguageType eLang )
aLocale = MsLangId::convertLanguageToLocale( eLang );
pCharClass = new CharClass( xServiceManager, aLocale );
xLocaleData.init( xServiceManager, aLocale, eLang );
- xCalendar.init( xServiceManager, aLocale );
+ xCalendar.init( comphelper::getComponentContext(xServiceManager), aLocale );
xTransliteration.init( xServiceManager, eLang,
::com::sun::star::i18n::TransliterationModules_IGNORE_CASE );
xNatNum.init( xServiceManager );
diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx
index c5a7514..4cda4db 100644
--- a/svtools/source/control/calendar.cxx
+++ b/svtools/source/control/calendar.cxx
@@ -35,6 +35,7 @@
#include <vcl/floatwin.hxx>
#include <vcl/button.hxx>
#include <vcl/fixed.hxx>
+#include <comphelper/processfactory.hxx>
#include <unotools/calendarwrapper.hxx>
#include <unotools/localedatawrapper.hxx>
#include <com/sun/star/i18n/Weekdays.hpp>
@@ -256,7 +257,7 @@ void Calendar::ImplInitSettings()
Calendar::Calendar( Window* pParent, WinBits nWinStyle ) :
Control( pParent, nWinStyle & (WB_TABSTOP | WB_GROUP | WB_BORDER | WB_3DLOOK | WB_RANGESELECT | WB_MULTISELECT) ),
- maCalendarWrapper( Application::GetAppLocaleDataWrapper().getServiceFactory() ),
+ maCalendarWrapper( comphelper::getComponentContext(Application::GetAppLocaleDataWrapper().getServiceFactory()) ),
maOldFormatFirstDate( 0, 0, 1900 ),
maOldFormatLastDate( 0, 0, 1900 ),
maFirstDate( 0, 0, 1900 ),
diff --git a/sw/inc/swcalwrp.hxx b/sw/inc/swcalwrp.hxx
index 3157942..0d150bc 100644
--- a/sw/inc/swcalwrp.hxx
+++ b/sw/inc/swcalwrp.hxx
@@ -32,8 +32,8 @@ class SwCalendarWrapper : public CalendarWrapper
public:
SwCalendarWrapper( const ::com::sun::star::uno::Reference<
- ::com::sun::star::lang::XMultiServiceFactory > & xMSF = ::comphelper::getProcessServiceFactory() )
- : CalendarWrapper( xMSF ), nLang( LANGUAGE_SYSTEM )
+ ::com::sun::star::uno::XComponentContext > & rxContext = ::comphelper::getProcessComponentContext() )
+ : CalendarWrapper( rxContext ), nLang( LANGUAGE_SYSTEM )
{}
void LoadDefaultCalendar( sal_uInt16 nLang );
diff --git a/unotools/inc/unotools/calendarwrapper.hxx b/unotools/inc/unotools/calendarwrapper.hxx
index 96de48d..d7e66de 100644
--- a/unotools/inc/unotools/calendarwrapper.hxx
+++ b/unotools/inc/unotools/calendarwrapper.hxx
@@ -29,8 +29,8 @@
#include "unotools/unotoolsdllapi.h"
namespace com { namespace sun { namespace star {
- namespace lang {
- class XMultiServiceFactory;
+ namespace uno {
+ class XComponentContext;
}
}}}
@@ -43,14 +43,13 @@ namespace com { namespace sun { namespace star {
class UNOTOOLS_DLLPUBLIC CalendarWrapper
{
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xSMgr;
::com::sun::star::uno::Reference< ::com::sun::star::i18n::XCalendar3 > xC;
DateTime aEpochStart; // 1Jan1970
public:
CalendarWrapper(
- const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & xSF
+ const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & rxContext
);
~CalendarWrapper();
diff --git a/unotools/source/i18n/calendarwrapper.cxx b/unotools/source/i18n/calendarwrapper.cxx
index bc16c11..8570652 100644
--- a/unotools/source/i18n/calendarwrapper.cxx
+++ b/unotools/source/i18n/calendarwrapper.cxx
@@ -24,9 +24,7 @@
#include <unotools/calendarwrapper.hxx>
#include <instance.hxx>
#include <com/sun/star/i18n/CalendarFieldIndex.hpp>
-#include <com/sun/star/i18n/XCalendar3.hpp>
-
-#define CALENDAR_SERVICENAME "com.sun.star.i18n.LocaleCalendar"
+#include <com/sun/star/i18n/LocaleCalendar.hpp>
using namespace ::com::sun::star;
using namespace ::com::sun::star::i18n;
@@ -37,13 +35,12 @@ const double MILLISECONDS_PER_DAY = 1000.0 * 60.0 * 60.0 * 24.0;
CalendarWrapper::CalendarWrapper(
- const Reference< lang::XMultiServiceFactory > & xSF
+ const Reference< uno::XComponentContext > & rxContext
)
:
- xSMgr( xSF ),
aEpochStart( Date( 1, 1, 1970 ) )
{
- xC = Reference< XCalendar3 >( intl_createInstance( xSMgr, CALENDAR_SERVICENAME, "CalendarWrapper" ), uno::UNO_QUERY );
+ xC = LocaleCalendar::create(rxContext);
}
CalendarWrapper::~CalendarWrapper()
diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx
index 379aa5c..be162a4 100644
--- a/vcl/source/control/field2.cxx
+++ b/vcl/source/control/field2.cxx
@@ -26,6 +26,9 @@
*
************************************************************************/
+#include "sal/config.h"
+
+#include <comphelper/processfactory.hxx>
#include <comphelper/string.hxx>
#include <tools/rc.h>
#include <vcl/svapp.hxx>
@@ -1577,7 +1580,7 @@ CalendarWrapper& DateFormatter::GetCalendarWrapper() const
{
if ( !mpCalendarWrapper )
{
- ((DateFormatter*)this)->mpCalendarWrapper = new CalendarWrapper( vcl::unohelper::GetMultiServiceFactory() );
+ ((DateFormatter*)this)->mpCalendarWrapper = new CalendarWrapper( comphelper::getComponentContext( vcl::unohelper::GetMultiServiceFactory() ) );
mpCalendarWrapper->loadDefaultCalendar( GetLocale() );
}
commit d29818290376f10f318ba805a79643384b34986e
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Oct 29 16:22:02 2012 +0100
fdo#46808: Fix previous commit
Removing the xJobExecutor.is() check from
SfxGlobalEvents_Impl::implts_notifyJobExecution was wrong, as
m_xJobExecutorListener was a WeakReference. However, it appears there is no
good reason for the latter, so the situation can be corrected by turning it into
a plain Reference.
Change-Id: I5690d226b3e8fdd97f75a37502e600b460ec674c
diff --git a/sfx2/source/inc/eventsupplier.hxx b/sfx2/source/inc/eventsupplier.hxx
index b00a2a0..737e372 100644
--- a/sfx2/source/inc/eventsupplier.hxx
+++ b/sfx2/source/inc/eventsupplier.hxx
@@ -34,7 +34,6 @@
#include <com/sun/star/uno/Type.hxx>
#include <sal/types.h>
#include <osl/mutex.hxx>
-#include <cppuhelper/weak.hxx>
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/implbase2.hxx>
#include <cppuhelper/implbase3.hxx>
@@ -177,7 +176,7 @@ class SfxGlobalEvents_Impl : public ModelCollectionMutexBase
>
{
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > m_xEvents;
- ::com::sun::star::uno::WeakReference< ::com::sun::star::document::XEventListener > m_xJobExecutorListener;
+ ::com::sun::star::uno::Reference< ::com::sun::star::document::XEventListener > m_xJobExecutorListener;
OINTERFACECONTAINERHELPER m_aLegacyListeners;
OINTERFACECONTAINERHELPER m_aDocumentListeners;
TModelList m_lModels;
diff --git a/sfx2/source/notify/eventsupplier.cxx b/sfx2/source/notify/eventsupplier.cxx
index 625fedb..21b578b 100644
--- a/sfx2/source/notify/eventsupplier.cxx
+++ b/sfx2/source/notify/eventsupplier.cxx
@@ -551,6 +551,7 @@ SFX_IMPL_ONEINSTANCEFACTORY( SfxGlobalEvents_Impl );
//-----------------------------------------------------------------------------
SfxGlobalEvents_Impl::SfxGlobalEvents_Impl( const css::uno::Reference < css::uno::XComponentContext >& rxContext)
: ModelCollectionMutexBase( )
+ , m_xJobExecutorListener( css::task::JobExecutor::create( rxContext ), css::uno::UNO_QUERY_THROW )
, m_aLegacyListeners (m_aLock)
, m_aDocumentListeners (m_aLock)
, pImp (0 )
@@ -559,7 +560,6 @@ SfxGlobalEvents_Impl::SfxGlobalEvents_Impl( const css::uno::Reference < css::uno
SFX_APP();
pImp = new GlobalEventConfig();
m_xEvents = pImp;
- m_xJobExecutorListener = css::uno::Reference< css::document::XEventListener >( css::task::JobExecutor::create( rxContext ), css::uno::UNO_QUERY_THROW );
m_refCount--;
}
@@ -784,12 +784,7 @@ void SfxGlobalEvents_Impl::implts_notifyJobExecution(const css::document::EventO
{
try
{
- // SAFE ->
- ::osl::ResettableMutexGuard aLock(m_aLock);
- css::uno::Reference< css::document::XEventListener > xJobExecutor(m_xJobExecutorListener);
- aLock.clear();
- // <- SAFE
- xJobExecutor->notifyEvent(aEvent);
+ m_xJobExecutorListener->notifyEvent(aEvent);
}
catch(const css::uno::RuntimeException&)
{ throw; }
commit eebcaa02585bda0656ca1032082c4dd676de732d
Author: Noel Grandin <noel at peralex.com>
Date: Thu Oct 18 11:37:13 2012 +0200
fdo#46808, use service constructor for task::JobExecutor
Also remove some unnecessary fields.
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index ae9b357..400da64 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -66,7 +66,7 @@
#include <com/sun/star/configuration/InstallationIncompleteException.hpp>
#include <com/sun/star/configuration/backend/BackendSetupException.hpp>
#include <com/sun/star/configuration/backend/BackendAccessException.hpp>
-#include <com/sun/star/task/XJobExecutor.hpp>
+#include <com/sun/star/task/JobExecutor.hpp>
#include <com/sun/star/task/XRestartManager.hpp>
#include <com/sun/star/document/XEventListener.hpp>
#include <com/sun/star/frame/UICommandDescription.hpp>
@@ -2893,9 +2893,8 @@ void Desktop::DoFirstRunInitializations()
{
try
{
- Reference< XJobExecutor > xExecutor( ::comphelper::getProcessServiceFactory()->createInstance( ::rtl::OUString("com.sun.star.task.JobExecutor") ), UNO_QUERY );
- if( xExecutor.is() )
- xExecutor->trigger( ::rtl::OUString("onFirstRunInitialization") );
+ Reference< XJobExecutor > xExecutor = JobExecutor::create( ::comphelper::getProcessComponentContext() );
+ xExecutor->trigger( ::rtl::OUString("onFirstRunInitialization") );
}
catch(const ::com::sun::star::uno::Exception&)
{
diff --git a/sfx2/inc/sfx2/sfxuno.hxx b/sfx2/inc/sfx2/sfxuno.hxx
index 9e68dc4..1038064 100644
--- a/sfx2/inc/sfx2/sfxuno.hxx
+++ b/sfx2/inc/sfx2/sfxuno.hxx
@@ -564,6 +564,63 @@ bool GetEncryptionData_Impl( const SfxItemSet* pSet, ::com::sun::star::uno::Sequ
}
//************************************************************************************************************************
+// implementation of XServiceInfo::getImplementationName()
+// XServiceInfo::supportsService()
+// XServiceInfo::getSupportedServiceNames()
+// static xxx::impl_getStaticSupportedServiceNames()
+// static xxx::impl_getStaticImplementationName()
+// static xxx::impl_createInstance()
+//************************************************************************************************************************
+#define SFX_IMPL_XSERVICEINFO_CTX( IMPLCLASS, IMPLSERVICENAME, IMPLNAME ) \
+ \
+ /* XServiceInfo */ \
+ rtl::OUString SAL_CALL IMPLCLASS::getImplementationName() throw( UNORUNTIMEEXCEPTION ) \
+ { \
+ return impl_getStaticImplementationName(); \
+ } \
+ \
+ /* XServiceInfo */ \
+ sal_Bool SAL_CALL IMPLCLASS::supportsService( const rtl::OUString& sServiceName ) throw( UNORUNTIMEEXCEPTION ) \
+ { \
+ UNOSEQUENCE< rtl::OUString > seqServiceNames = getSupportedServiceNames(); \
+ const rtl::OUString* pArray = seqServiceNames.getConstArray(); \
+ for ( sal_Int32 nCounter=0; nCounter<seqServiceNames.getLength(); nCounter++ ) \
+ { \
+ if ( pArray[nCounter] == sServiceName ) \
+ { \
+ return sal_True ; \
+ } \
+ } \
+ return sal_False ; \
+ } \
+ \
+ /* XServiceInfo */ \
+ UNOSEQUENCE< rtl::OUString > SAL_CALL IMPLCLASS::getSupportedServiceNames() throw( UNORUNTIMEEXCEPTION ) \
+ { \
+ return impl_getStaticSupportedServiceNames(); \
+ } \
+ \
+ /* Helper for XServiceInfo */ \
+ UNOSEQUENCE< rtl::OUString > IMPLCLASS::impl_getStaticSupportedServiceNames() \
+ { \
+ UNOSEQUENCE< rtl::OUString > seqServiceNames( 1 ); \
+ seqServiceNames.getArray() [0] = rtl::OUString::createFromAscii( IMPLSERVICENAME ); \
+ return seqServiceNames ; \
+ } \
+ \
+ /* Helper for XServiceInfo */ \
+ rtl::OUString IMPLCLASS::impl_getStaticImplementationName() \
+ { \
+ return rtl::OUString::createFromAscii( IMPLNAME ); \
+ } \
+ \
+ /* Helper for registry */ \
+ UNOREFERENCE< UNOXINTERFACE > SAL_CALL IMPLCLASS::impl_createInstance( const UNOREFERENCE< UNOXMULTISERVICEFACTORY >& xServiceManager ) throw( UNOEXCEPTION ) \
+ { \
+ return UNOREFERENCE< UNOXINTERFACE >( *new IMPLCLASS( comphelper::getComponentContext(xServiceManager) ) ); \
+ }
+
+//************************************************************************************************************************
// definition of createFactory() for MultiServices
//************************************************************************************************************************
#define SFX_IMPL_SINGLEFACTORY( IMPLCLASS ) \
diff --git a/sfx2/source/inc/eventsupplier.hxx b/sfx2/source/inc/eventsupplier.hxx
index 2a8aea4..b00a2a0 100644
--- a/sfx2/source/inc/eventsupplier.hxx
+++ b/sfx2/source/inc/eventsupplier.hxx
@@ -142,7 +142,6 @@ class ModelCollectionEnumeration : public ModelCollectionMutexBase
// member
//-------------------------------------------------------------------------
private:
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xSMGR;
TModelList m_lModels;
TModelList::iterator m_pEnumerationIt;
@@ -150,7 +149,7 @@ class ModelCollectionEnumeration : public ModelCollectionMutexBase
// native interface
//-------------------------------------------------------------------------
public:
- ModelCollectionEnumeration(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xSMGR);
+ ModelCollectionEnumeration();
virtual ~ModelCollectionEnumeration();
void setModelList(const TModelList& rList);
@@ -177,7 +176,6 @@ class SfxGlobalEvents_Impl : public ModelCollectionMutexBase
, ::com::sun::star::document::XEventListener
>
{
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xSMGR;
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > m_xEvents;
::com::sun::star::uno::WeakReference< ::com::sun::star::document::XEventListener > m_xJobExecutorListener;
OINTERFACECONTAINERHELPER m_aLegacyListeners;
@@ -186,7 +184,7 @@ class SfxGlobalEvents_Impl : public ModelCollectionMutexBase
GlobalEventConfig* pImp;
public:
- SfxGlobalEvents_Impl(const com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory >& xSMGR);
+ SfxGlobalEvents_Impl(const com::sun::star::uno::Reference < ::com::sun::star::uno::XComponentContext >& rxContext);
virtual ~SfxGlobalEvents_Impl();
SFX_DECL_XSERVICEINFO
diff --git a/sfx2/source/notify/eventsupplier.cxx b/sfx2/source/notify/eventsupplier.cxx
index 2b4508e..625fedb 100644
--- a/sfx2/source/notify/eventsupplier.cxx
+++ b/sfx2/source/notify/eventsupplier.cxx
@@ -21,6 +21,7 @@
#include <com/sun/star/util/URL.hpp>
+#include <com/sun/star/task/JobExecutor.hpp>
#include <com/sun/star/util/URLTransformer.hpp>
#include <com/sun/star/util/XURLTransformer.hpp>
#include <tools/urlobj.hxx>
@@ -496,9 +497,8 @@ void SfxEvents_Impl::NormalizeMacro( const ::comphelper::NamedValueCollection& i
}
}
-ModelCollectionEnumeration::ModelCollectionEnumeration(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR)
+ModelCollectionEnumeration::ModelCollectionEnumeration()
: ModelCollectionMutexBase( )
- , m_xSMGR (xSMGR )
, m_pEnumerationIt (m_lModels.begin())
{
}
@@ -545,13 +545,12 @@ css::uno::Any SAL_CALL ModelCollectionEnumeration::nextElement()
return css::uno::makeAny(xModel);
}
-SFX_IMPL_XSERVICEINFO( SfxGlobalEvents_Impl, "com.sun.star.frame.GlobalEventBroadcaster", "com.sun.star.comp.sfx2.GlobalEventBroadcaster" )
+SFX_IMPL_XSERVICEINFO_CTX( SfxGlobalEvents_Impl, "com.sun.star.frame.GlobalEventBroadcaster", "com.sun.star.comp.sfx2.GlobalEventBroadcaster" )
SFX_IMPL_ONEINSTANCEFACTORY( SfxGlobalEvents_Impl );
//-----------------------------------------------------------------------------
-SfxGlobalEvents_Impl::SfxGlobalEvents_Impl( const com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory >& xSMGR)
+SfxGlobalEvents_Impl::SfxGlobalEvents_Impl( const css::uno::Reference < css::uno::XComponentContext >& rxContext)
: ModelCollectionMutexBase( )
- , m_xSMGR (xSMGR )
, m_aLegacyListeners (m_aLock)
, m_aDocumentListeners (m_aLock)
, pImp (0 )
@@ -560,9 +559,7 @@ SfxGlobalEvents_Impl::SfxGlobalEvents_Impl( const com::sun::star::uno::Reference
SFX_APP();
pImp = new GlobalEventConfig();
m_xEvents = pImp;
- m_xJobExecutorListener = css::uno::Reference< css::document::XEventListener >(
- xSMGR->createInstance(::rtl::OUString("com.sun.star.task.JobExecutor")),
- UNO_QUERY);
+ m_xJobExecutorListener = css::uno::Reference< css::document::XEventListener >( css::task::JobExecutor::create( rxContext ), css::uno::UNO_QUERY_THROW );
m_refCount--;
}
@@ -754,7 +751,7 @@ css::uno::Reference< css::container::XEnumeration > SAL_CALL SfxGlobalEvents_Imp
{
// SAFE ->
::osl::ResettableMutexGuard aLock(m_aLock);
- ModelCollectionEnumeration* pEnum = new ModelCollectionEnumeration(m_xSMGR);
+ ModelCollectionEnumeration* pEnum = new ModelCollectionEnumeration();
pEnum->setModelList(m_lModels);
css::uno::Reference< css::container::XEnumeration > xEnum(
static_cast< css::container::XEnumeration* >(pEnum),
@@ -792,8 +789,7 @@ void SfxGlobalEvents_Impl::implts_notifyJobExecution(const css::document::EventO
css::uno::Reference< css::document::XEventListener > xJobExecutor(m_xJobExecutorListener);
aLock.clear();
// <- SAFE
- if (xJobExecutor.is())
- xJobExecutor->notifyEvent(aEvent);
+ xJobExecutor->notifyEvent(aEvent);
}
catch(const css::uno::RuntimeException&)
{ throw; }
commit 96b60cf69bf973136c5755fe741a6c210b4915f7
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Oct 29 15:28:09 2012 +0100
Improve previous commit slightly
Change-Id: I01e007a9e1dee12a8081e8b165fa7e090d594612
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index 893c935..2e3b264 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -427,7 +427,7 @@ DEFINE_XTYPEPROVIDER_6(AutoRecovery ,
//-----------------------------------------------
DEFINE_XSERVICEINFO_ONEINSTANCESERVICE(AutoRecovery ,
::cppu::OWeakObject ,
- DECLARE_ASCII("com.sun.star.frame.AutoRecovery"),
+ "com.sun.star.frame.AutoRecovery",
IMPLEMENTATIONNAME_AUTORECOVERY)
//-----------------------------------------------
commit 39c556da3180bc507d9fae5e26bcdf81ea193938
Author: Noel Grandin <noel at peralex.com>
Date: Thu Oct 18 10:58:02 2012 +0200
fdo#46808, Create new-style frame::AutoRecovery service
The service already existed, it just did not have an IDL file.
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index cff9f8e..ae9b357 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -43,6 +43,7 @@
#include "migration.hxx"
#include <svtools/javacontext.hxx>
+#include <com/sun/star/frame/AutoRecovery.hpp>
#include <com/sun/star/frame/GlobalEventBroadcaster.hpp>
#include <com/sun/star/frame/XSessionManagerListener.hpp>
#include <com/sun/star/frame/XSynchronousDispatch.hpp>
@@ -2357,11 +2358,8 @@ void Desktop::OpenClients()
{
try
{
- Reference< XDispatch > xRecovery(
- ::comphelper::getProcessServiceFactory()->createInstance( OUString("com.sun.star.frame.AutoRecovery") ),
- ::com::sun::star::uno::UNO_QUERY_THROW );
-
- Reference< css::util::XURLTransformer > xParser( css::util::URLTransformer::create(::comphelper::getProcessComponentContext()) );
+ Reference< XDispatch > xRecovery = css::frame::AutoRecovery::create( ::comphelper::getProcessComponentContext() );
+ Reference< css::util::XURLTransformer > xParser = css::util::URLTransformer::create( ::comphelper::getProcessComponentContext() );
css::util::URL aCmd;
aCmd.Complete = ::rtl::OUString("vnd.sun.star.autorecovery:/disableRecovery");
diff --git a/framework/inc/services.h b/framework/inc/services.h
index da5ade3..ccb8bfb 100644
--- a/framework/inc/services.h
+++ b/framework/inc/services.h
@@ -75,7 +75,6 @@ namespace framework{
#define SERVICENAME_TOOLBARFACTORY DECLARE_ASCII("com.sun.star.ui.ToolBarFactory" )
#define SERVICENAME_TOOLBARCONTROLLERFACTORY DECLARE_ASCII("com.sun.star.frame.ToolBarControllerFactory" )
#define SERVICENAME_LICENSE SERVICENAME_JOB
-#define SERVICENAME_AUTORECOVERY DECLARE_ASCII("com.sun.star.frame.AutoRecovery" )
#define SERVICENAME_STATUSBARFACTORY DECLARE_ASCII("com.sun.star.ui.StatusBarFactory" )
#define SERVICENAME_UICATEGORYDESCRIPTION DECLARE_ASCII("com.sun.star.ui.UICategoryDescription" )
#define SERVICENAME_STATUSBARCONTROLLERFACTORY DECLARE_ASCII("com.sun.star.frame.StatusbarControllerFactory" )
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index d6928eb..893c935 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -427,7 +427,7 @@ DEFINE_XTYPEPROVIDER_6(AutoRecovery ,
//-----------------------------------------------
DEFINE_XSERVICEINFO_ONEINSTANCESERVICE(AutoRecovery ,
::cppu::OWeakObject ,
- SERVICENAME_AUTORECOVERY ,
+ DECLARE_ASCII("com.sun.star.frame.AutoRecovery"),
IMPLEMENTATIONNAME_AUTORECOVERY)
//-----------------------------------------------
diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx
index abe3761..5b573c6 100644
--- a/framework/source/services/sessionlistener.cxx
+++ b/framework/source/services/sessionlistener.cxx
@@ -45,6 +45,7 @@
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/beans/PropertyState.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/frame/AutoRecovery.hpp>
#include <com/sun/star/frame/XFramesSupplier.hpp>
#include <com/sun/star/frame/XStorable.hpp>
#include <com/sun/star/frame/XComponentLoader.hpp>
@@ -144,8 +145,8 @@ void SessionListener::StoreSession( sal_Bool bAsync )
// on stop event m_rSessionManager->saveDone(this); in case of asynchronous call
// in case of synchronous call the caller should do saveDone() call himself!
- css::uno::Reference< XDispatch > xDispatch(m_xSMGR->createInstance(SERVICENAME_AUTORECOVERY), UNO_QUERY_THROW);
- css::uno::Reference< XURLTransformer > xURLTransformer(URLTransformer::create(::comphelper::getComponentContext(m_xSMGR)));
+ css::uno::Reference< XDispatch > xDispatch = css::frame::AutoRecovery::create( ::comphelper::getComponentContext(m_xSMGR) );
+ css::uno::Reference< XURLTransformer > xURLTransformer = URLTransformer::create( ::comphelper::getComponentContext(m_xSMGR) );
URL aURL;
aURL.Complete = OUString("vnd.sun.star.autorecovery:/doSessionSave");
xURLTransformer->parseStrict(aURL);
@@ -177,8 +178,8 @@ void SessionListener::QuitSessionQuietly()
// xd->dispatch("vnd.sun.star.autorecovery:/doSessionQuietQuit, async=false
// it is done synchronously to avoid conflict with normal quit process
- css::uno::Reference< XDispatch > xDispatch(m_xSMGR->createInstance(SERVICENAME_AUTORECOVERY), UNO_QUERY_THROW);
- css::uno::Reference< XURLTransformer > xURLTransformer(URLTransformer::create(::comphelper::getComponentContext(m_xSMGR)));
+ css::uno::Reference< XDispatch > xDispatch = css::frame::AutoRecovery::create( ::comphelper::getComponentContext(m_xSMGR) );
+ css::uno::Reference< XURLTransformer > xURLTransformer = URLTransformer::create( ::comphelper::getComponentContext(m_xSMGR) );
URL aURL;
aURL.Complete = OUString("vnd.sun.star.autorecovery:/doSessionQuietQuit");
xURLTransformer->parseStrict(aURL);
@@ -257,7 +258,7 @@ sal_Bool SAL_CALL SessionListener::doRestore()
ResetableGuard aGuard(m_aLock);
m_bRestored = sal_False;
try {
- css::uno::Reference< XDispatch > xDispatch(m_xSMGR->createInstance(SERVICENAME_AUTORECOVERY), UNO_QUERY_THROW);
+ css::uno::Reference< XDispatch > xDispatch = css::frame::AutoRecovery::create( ::comphelper::getComponentContext(m_xSMGR) );
URL aURL;
aURL.Complete = OUString("vnd.sun.star.autorecovery:/doSessionRestore");
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index e8ca1fd..7de5d77 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -131,6 +131,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/form/runti
FormOperations \
))
$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/frame,\
+ AutoRecovery \
DispatchHelper \
DispatchRecorderSupplier \
DocumentTemplates \
diff --git a/offapi/com/sun/star/frame/AutoRecovery.idl b/offapi/com/sun/star/frame/AutoRecovery.idl
new file mode 100644
index 0000000..c7cd71b
--- /dev/null
+++ b/offapi/com/sun/star/frame/AutoRecovery.idl
@@ -0,0 +1,37 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#ifndef __com_sun_star_frame_AutoRecovery_idl__
+#define __com_sun_star_frame_AutoRecovery_idl__
+
+#include <com/sun/star/frame/XDispatch.idl>
+
+module com { module sun { module star { module frame {
+
+/**
+
+ @since LibreOffice 3.7
+ */
+service AutoRecovery : XDispatch;
+
+
+}; }; }; };
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 2cc9d30..e0d3c9a 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -26,7 +26,8 @@
*
************************************************************************/
-#include "com/sun/star/frame/XComponentLoader.hpp"
+#include <com/sun/star/frame/AutoRecovery.hpp>
+#include <com/sun/star/frame/XComponentLoader.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/document/XEventsSupplier.hpp>
#include <com/sun/star/drawing/XMasterPageTarget.hpp>
@@ -2852,7 +2853,6 @@ void SlideshowImpl::setAutoSaveState( bool bOn)
{
try
{
- uno::Reference<lang::XMultiServiceFactory> xFac( ::comphelper::getProcessServiceFactory() );
uno::Reference<uno::XComponentContext> xContext( ::comphelper::getProcessComponentContext() );
uno::Reference< util::XURLTransformer > xParser(util::URLTransformer::create(xContext));
@@ -2864,9 +2864,7 @@ void SlideshowImpl::setAutoSaveState( bool bOn)
aArgs[0].Name = "AutoSaveState";
aArgs[0].Value <<= bOn ? sal_True : sal_False;
- uno::Reference< frame::XDispatch > xAutoSave(
- xFac->createInstance( "com.sun.star.frame.AutoRecovery" ),
- uno::UNO_QUERY_THROW);
+ uno::Reference< frame::XDispatch > xAutoSave = frame::AutoRecovery::create(xContext);
xAutoSave->dispatch(aURL, aArgs);
}
catch( Exception& )
diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx
index 553a4af..ba62dd1 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -53,6 +53,7 @@
#include <com/sun/star/beans/NamedValue.hpp>
#include <com/sun/star/util/URL.hpp>
#include <com/sun/star/util/XURLTransformer.hpp>
+#include <com/sun/star/frame/AutoRecovery.hpp>
#include <com/sun/star/frame/XDispatch.hpp>
#include <com/sun/star/awt/XWindow.hpp>
#include <com/sun/star/ui/dialogs/FolderPicker.hpp>
@@ -134,9 +135,9 @@ short TabDialog4Recovery::Execute()
}
//===============================================
-RecoveryCore::RecoveryCore(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR ,
- sal_Bool bUsedForSaving)
- : m_xSMGR ( xSMGR )
+RecoveryCore::RecoveryCore(const css::uno::Reference< css::uno::XComponentContext >& rxContext,
+ sal_Bool bUsedForSaving)
+ : m_xContext ( rxContext )
, m_pListener ( 0 )
, m_bListenForSaving(bUsedForSaving)
{
@@ -150,9 +151,9 @@ RecoveryCore::~RecoveryCore()
}
//===============================================
-css::uno::Reference< css::lang::XMultiServiceFactory > RecoveryCore::getSMGR()
+css::uno::Reference< css::uno::XComponentContext > RecoveryCore::getComponentContext()
{
- return m_xSMGR;
+ return m_xContext;
}
//===============================================
@@ -576,14 +577,14 @@ void RecoveryCore::impl_startListening()
// listening already initialized ?
if (m_xRealCore.is())
return;
- m_xRealCore = css::uno::Reference< css::frame::XDispatch >(m_xSMGR->createInstance(SERVICENAME_RECOVERYCORE), css::uno::UNO_QUERY_THROW);
+ m_xRealCore = css::frame::AutoRecovery::create(m_xContext);
css::util::URL aURL;
if (m_bListenForSaving)
aURL.Complete = RECOVERY_CMD_DO_EMERGENCY_SAVE;
else
aURL.Complete = RECOVERY_CMD_DO_RECOVERY;
- css::uno::Reference< css::util::XURLTransformer > xParser(css::util::URLTransformer::create(::comphelper::getComponentContext(m_xSMGR)));
+ css::uno::Reference< css::util::XURLTransformer > xParser(css::util::URLTransformer::create(m_xContext));
xParser->parseStrict(aURL);
/* Note: addStatusListener() call us synchronous back ... so we
@@ -603,7 +604,7 @@ void RecoveryCore::impl_stopListening()
aURL.Complete = RECOVERY_CMD_DO_EMERGENCY_SAVE;
else
aURL.Complete = RECOVERY_CMD_DO_RECOVERY;
- css::uno::Reference< css::util::XURLTransformer > xParser(css::util::URLTransformer::create(::comphelper::getComponentContext(m_xSMGR)));
+ css::uno::Reference< css::util::XURLTransformer > xParser(css::util::URLTransformer::create(m_xContext));
xParser->parseStrict(aURL);
m_xRealCore->removeStatusListener(static_cast< css::frame::XStatusListener* >(this), aURL);
@@ -616,7 +617,7 @@ css::util::URL RecoveryCore::impl_getParsedURL(const ::rtl::OUString& sURL)
css::util::URL aURL;
aURL.Complete = sURL;
- css::uno::Reference< css::util::XURLTransformer > xParser(css::util::URLTransformer::create(::comphelper::getComponentContext(m_xSMGR)));
+ css::uno::Reference< css::util::XURLTransformer > xParser(css::util::URLTransformer::create(m_xContext));
xParser->parseStrict(aURL);
return aURL;
@@ -833,8 +834,8 @@ SaveProgressDialog::SaveProgressDialog(Window* pParent,
, m_pCore ( pCore )
{
FreeResource();
- PluginProgress* pProgress = new PluginProgress( &m_aProgrParent, pCore->getSMGR() );
- m_xProgress = css::uno::Reference< css::task::XStatusIndicator >(static_cast< css::task::XStatusIndicator* >(pProgress), css::uno::UNO_QUERY_THROW);
+ PluginProgress* pProgress = new PluginProgress( &m_aProgrParent, css::uno::Reference<css::lang::XMultiServiceFactory>(pCore->getComponentContext()->getServiceManager(), css::uno::UNO_QUERY_THROW) );
+ m_xProgress = css::uno::Reference< css::task::XStatusIndicator >(static_cast< css::task::XStatusIndicator* >(pProgress), css::uno::UNO_QUERY_THROW);
}
//===============================================
@@ -1036,7 +1037,7 @@ RecoveryDialog::RecoveryDialog(Window* pParent,
sal_Bool bCrashRepEnabled( sal_False );
css::uno::Any aVal = ::comphelper::ConfigurationHelper::readDirectKey(
- comphelper::getComponentContext(pCore->getSMGR()),
+ pCore->getComponentContext(),
CFG_PACKAGE_RECOVERY,
CFG_PATH_CRASHREPORTER,
CFG_ENTRY_ENABLED,
@@ -1044,8 +1045,8 @@ RecoveryDialog::RecoveryDialog(Window* pParent,
aVal >>= bCrashRepEnabled;
m_bRecoveryOnly = !bCrashRepEnabled;
- PluginProgress* pProgress = new PluginProgress( &m_aProgrParent, pCore->getSMGR() );
- m_xProgress = css::uno::Reference< css::task::XStatusIndicator >(static_cast< css::task::XStatusIndicator* >(pProgress), css::uno::UNO_QUERY_THROW);
+ PluginProgress* pProgress = new PluginProgress( &m_aProgrParent, css::uno::Reference<css::lang::XMultiServiceFactory>(pCore->getComponentContext()->getServiceManager(), css::uno::UNO_QUERY_THROW) );
+ m_xProgress = css::uno::Reference< css::task::XStatusIndicator >(static_cast< css::task::XStatusIndicator* >(pProgress), css::uno::UNO_QUERY_THROW);
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
Wallpaper aBackground( rStyleSettings.GetWindowColor() );
@@ -1549,7 +1550,7 @@ IMPL_LINK_NOARG(BrokenRecoveryDialog, SaveButtonHdl)
void BrokenRecoveryDialog::impl_askForSavePath()
{
css::uno::Reference< css::ui::dialogs::XFolderPicker2 > xFolderPicker =
- css::ui::dialogs::FolderPicker::create(::comphelper::getComponentContext(m_pCore->getSMGR()));
+ css::ui::dialogs::FolderPicker::create( m_pCore->getComponentContext() );
INetURLObject aURL(m_sSavePath, INET_PROT_FILE);
xFolderPicker->setDisplayDirectory(aURL.GetMainURL(INetURLObject::NO_DECODE));
diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx
index 5c3b2f0..2131960 100644
--- a/svx/source/inc/docrecovery.hxx
+++ b/svx/source/inc/docrecovery.hxx
@@ -60,7 +60,6 @@
#define RECOVERY_CMD_DO_ENTRY_CLEANUP rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.autorecovery:/doEntryCleanUp" ))
#define SERVICENAME_PROGRESSFACTORY rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.task.StatusIndicatorFactory"))
-#define SERVICENAME_RECOVERYCORE rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.AutoRecovery" ))
#define SERVICENAME_DESKTOP rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" ))
#define PROP_PARENTWINDOW rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Window" ))
@@ -213,7 +212,7 @@ class RecoveryCore : public ::cppu::WeakImplHelper1< css::frame::XStatusListener
private:
/// TODO
- css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMGR;
+ css::uno::Reference< css::uno::XComponentContext > m_xContext;
/// TODO
css::uno::Reference< css::frame::XDispatch > m_xRealCore;
@@ -242,8 +241,8 @@ class RecoveryCore : public ::cppu::WeakImplHelper1< css::frame::XStatusListener
//---------------------------------------
/** @short TODO */
- RecoveryCore(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR ,
- sal_Bool bUsedForSaving);
+ RecoveryCore(const css::uno::Reference< css::uno::XComponentContext >& rxContext,
+ sal_Bool bUsedForSaving);
//---------------------------------------
/** @short TODO */
@@ -251,7 +250,7 @@ class RecoveryCore : public ::cppu::WeakImplHelper1< css::frame::XStatusListener
//---------------------------------------
/** @short TODO */
- virtual css::uno::Reference< css::lang::XMultiServiceFactory > getSMGR();
+ virtual css::uno::Reference< css::uno::XComponentContext > getComponentContext();
//---------------------------------------
/** @short TODO */
diff --git a/svx/source/unodraw/recoveryui.cxx b/svx/source/unodraw/recoveryui.cxx
index 6d72a8d..5da4fbd 100644
--- a/svx/source/unodraw/recoveryui.cxx
+++ b/svx/source/unodraw/recoveryui.cxx
@@ -262,7 +262,7 @@ RecoveryUI::EJob RecoveryUI::impl_classifyJob(const css::util::URL& aURL)
sal_Bool RecoveryUI::impl_doEmergencySave()
{
// create core service, which implements the real "emergency save" algorithm.
- svxdr::RecoveryCore* pCore = new svxdr::RecoveryCore(m_xSMGR, sal_True);
+ svxdr::RecoveryCore* pCore = new svxdr::RecoveryCore(comphelper::getComponentContext(m_xSMGR), sal_True);
css::uno::Reference< css::frame::XStatusListener > xCore(pCore);
// create all needed dialogs for this operation
@@ -300,7 +300,7 @@ void RecoveryUI::impl_doRecovery()
bRecoveryOnly = !bCrashRepEnabled;
// create core service, which implements the real "emergency save" algorithm.
- svxdr::RecoveryCore* pCore = new svxdr::RecoveryCore(m_xSMGR, sal_False);
+ svxdr::RecoveryCore* pCore = new svxdr::RecoveryCore(comphelper::getComponentContext(m_xSMGR), sal_False);
css::uno::Reference< css::frame::XStatusListener > xCore(pCore);
// create all needed dialogs for this operation
commit 7f4e5c8c6f293782fa772c7cf6ad7f8e5992db8b
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Oct 29 14:11:31 2012 +0100
Improve previous commit slightly
Change-Id: I198f25f556efd4ec3f6582cf8bfb40675c6e3570
diff --git a/framework/source/recording/dispatchrecordersupplier.cxx b/framework/source/recording/dispatchrecordersupplier.cxx
index 22ad838..1fd5ded 100644
--- a/framework/source/recording/dispatchrecordersupplier.cxx
+++ b/framework/source/recording/dispatchrecordersupplier.cxx
@@ -47,7 +47,7 @@ DEFINE_XTYPEPROVIDER_3(
DEFINE_XSERVICEINFO_MULTISERVICE(
DispatchRecorderSupplier,
::cppu::OWeakObject,
- DECLARE_ASCII("com.sun.star.frame.DispatchRecorderSupplier"),
+ "com.sun.star.frame.DispatchRecorderSupplier",
IMPLEMENTATIONNAME_DISPATCHRECORDERSUPPLIER)
DEFINE_INIT_SERVICE(
commit 9b63e4e6e46ee7560d99c3d4cff5e085efc14949
Author: Noel Grandin <noel at peralex.com>
Date: Wed Oct 17 15:51:00 2012 +0200
fdo#46808, use service constructor for frame::DispatchRecorderSupplier
diff --git a/framework/inc/services.h b/framework/inc/services.h
index a58c516..da5ade3 100644
--- a/framework/inc/services.h
+++ b/framework/inc/services.h
@@ -49,7 +49,6 @@ namespace framework{
#define SERVICENAME_CONTENTHANDLERFACTORY DECLARE_ASCII("com.sun.star.frame.ContentHandlerFactory" )
#define SERVICENAME_STATUSINDICATORFACTORY DECLARE_ASCII("com.sun.star.task.StatusIndicatorFactory" )
#define SERVICENAME_JOB DECLARE_ASCII("com.sun.star.task.Job" )
-#define SERVICENAME_DISPATCHRECORDERSUPPLIER DECLARE_ASCII("com.sun.star.frame.DispatchRecorderSupplier" )
#define SERVICENAME_DISPATCHRECORDER DECLARE_ASCII("com.sun.star.frame.DispatchRecorder" )
#define SERVICENAME_PROTOCOLHANDLER DECLARE_ASCII("com.sun.star.frame.ProtocolHandler" )
#define SERVICENAME_PATHSETTINGS DECLARE_ASCII("com.sun.star.util.PathSettings" )
diff --git a/framework/source/recording/dispatchrecordersupplier.cxx b/framework/source/recording/dispatchrecordersupplier.cxx
index 164b637..22ad838 100644
--- a/framework/source/recording/dispatchrecordersupplier.cxx
+++ b/framework/source/recording/dispatchrecordersupplier.cxx
@@ -47,7 +47,7 @@ DEFINE_XTYPEPROVIDER_3(
DEFINE_XSERVICEINFO_MULTISERVICE(
DispatchRecorderSupplier,
::cppu::OWeakObject,
- SERVICENAME_DISPATCHRECORDERSUPPLIER,
+ DECLARE_ASCII("com.sun.star.frame.DispatchRecorderSupplier"),
IMPLEMENTATIONNAME_DISPATCHRECORDERSUPPLIER)
DEFINE_INIT_SERVICE(
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index c963fe6..f039d3e 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -23,6 +23,7 @@
#include <sfx2/infobar.hxx>
#include <sfx2/viewfrm.hxx>
#include <com/sun/star/document/MacroExecMode.hpp>
+#include <com/sun/star/frame/DispatchRecorderSupplier.hpp>
#include <com/sun/star/frame/XLoadable.hpp>
#include <com/sun/star/frame/XLayoutManager.hpp>
#include <com/sun/star/frame/XComponentLoader.hpp>
@@ -2833,14 +2834,14 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq )
com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > xFactory(
::comphelper::getProcessServiceFactory(),
com::sun::star::uno::UNO_QUERY);
+ com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > xContext(
+ ::comphelper::getProcessComponentContext());
xRecorder = com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder >(
xFactory->createInstance(rtl::OUString("com.sun.star.frame.DispatchRecorder")),
com::sun::star::uno::UNO_QUERY);
- xSupplier = com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorderSupplier >(
- xFactory->createInstance(rtl::OUString("com.sun.star.frame.DispatchRecorderSupplier")),
- com::sun::star::uno::UNO_QUERY);
+ xSupplier = com::sun::star::frame::DispatchRecorderSupplier::create( xContext );
xSupplier->setDispatchRecorder(xRecorder);
xRecorder->startRecording(xFrame);
commit ec4a5ba7f2f205ace9a8e64fb59eb6d43ee5f2ab
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Oct 29 13:38:51 2012 +0100
Improve previous commit slightly
Change-Id: I25595ea67eb521e118f4b00337ef2a55dc52256a
diff --git a/framework/source/jobs/jobexecutor.cxx b/framework/source/jobs/jobexecutor.cxx
index a3c8805..5df3239 100644
--- a/framework/source/jobs/jobexecutor.cxx
+++ b/framework/source/jobs/jobexecutor.cxx
@@ -73,7 +73,7 @@ DEFINE_XTYPEPROVIDER_6( JobExecutor ,
DEFINE_XSERVICEINFO_ONEINSTANCESERVICE( JobExecutor ,
::cppu::OWeakObject ,
- DECLARE_ASCII("com.sun.star.task.JobExecutor"),
+ "com.sun.star.task.JobExecutor",
IMPLEMENTATIONNAME_JOBEXECUTOR
)
commit 3f8f2f4a520b022f43427f98e59f039bdd5fc431
Author: Noel Grandin <noel at peralex.com>
Date: Wed Oct 17 15:34:40 2012 +0200
inline #define that is only used in one place
diff --git a/framework/inc/services.h b/framework/inc/services.h
index 62856ec..a58c516 100644
--- a/framework/inc/services.h
+++ b/framework/inc/services.h
@@ -48,7 +48,6 @@ namespace framework{
#define SERVICENAME_CONTENTHANDLER DECLARE_ASCII("com.sun.star.frame.ContentHandler" )
#define SERVICENAME_CONTENTHANDLERFACTORY DECLARE_ASCII("com.sun.star.frame.ContentHandlerFactory" )
#define SERVICENAME_STATUSINDICATORFACTORY DECLARE_ASCII("com.sun.star.task.StatusIndicatorFactory" )
-#define SERVICENAME_JOBEXECUTOR DECLARE_ASCII("com.sun.star.task.JobExecutor" )
#define SERVICENAME_JOB DECLARE_ASCII("com.sun.star.task.Job" )
#define SERVICENAME_DISPATCHRECORDERSUPPLIER DECLARE_ASCII("com.sun.star.frame.DispatchRecorderSupplier" )
#define SERVICENAME_DISPATCHRECORDER DECLARE_ASCII("com.sun.star.frame.DispatchRecorder" )
diff --git a/framework/source/jobs/jobexecutor.cxx b/framework/source/jobs/jobexecutor.cxx
index 84fbb27..a3c8805 100644
--- a/framework/source/jobs/jobexecutor.cxx
+++ b/framework/source/jobs/jobexecutor.cxx
@@ -73,7 +73,7 @@ DEFINE_XTYPEPROVIDER_6( JobExecutor ,
DEFINE_XSERVICEINFO_ONEINSTANCESERVICE( JobExecutor ,
::cppu::OWeakObject ,
- SERVICENAME_JOBEXECUTOR ,
+ DECLARE_ASCII("com.sun.star.task.JobExecutor"),
IMPLEMENTATIONNAME_JOBEXECUTOR
)
commit c326564fa80d812b7f95330e6d79a57fa19ca281
Author: Noel Grandin <noel at peralex.com>
Date: Wed Oct 17 15:30:35 2012 +0200
remove unused #define
diff --git a/framework/inc/services.h b/framework/inc/services.h
index f585799..62856ec 100644
--- a/framework/inc/services.h
+++ b/framework/inc/services.h
@@ -40,7 +40,6 @@ namespace framework{
#define SERVICENAME_NESTEDREGISTRY DECLARE_ASCII("com.sun.star.registry.NestedRegistry" )
#define SERVICENAME_GENERICFRAMELOADER DECLARE_ASCII("com.sun.star.comp.office.FilterDetect" )
#define SERVICENAME_TYPEDETECTION DECLARE_ASCII("com.sun.star.document.TypeDetection" )
-#define SERVICENAME_DOCUMENTPROPERTIES DECLARE_ASCII("com.sun.star.document.DocumentProperties" )
#define SERVICENAME_CFGREGISTRY DECLARE_ASCII("com.sun.star.configuration.ConfigurationRegistry" ) // describe simple registry service for read access to configuration
#define SERVICENAME_CFGPROVIDER DECLARE_ASCII("com.sun.star.configuration.ConfigurationProvider" ) // describe cfg-provider service for fatoffice, network installation
#define SERVICENAME_ADMINPROVIDER DECLARE_ASCII("com.sun.star.configuration.AdministrationProvider" ) // describe cfg-provider service for sun webtop
commit 5b5f2b3edce117501820242130c092370a3edb3d
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Oct 29 13:34:45 2012 +0100
Improve previous commit slightly
Change-Id: If39ae761165bc4debd3c7d994be0446149f2c4ac
diff --git a/framework/source/services/mediatypedetectionhelper.cxx b/framework/source/services/mediatypedetectionhelper.cxx
index 30606e9..4ab1942 100644
--- a/framework/source/services/mediatypedetectionhelper.cxx
+++ b/framework/source/services/mediatypedetectionhelper.cxx
@@ -55,7 +55,7 @@ MediaTypeDetectionHelper::~MediaTypeDetectionHelper()
DEFINE_XSERVICEINFO_ONEINSTANCESERVICE ( MediaTypeDetectionHelper
, ::cppu::OWeakObject
- , DECLARE_ASCII("com.sun.star.frame.MediaTypeDetectionHelper")
+ , "com.sun.star.frame.MediaTypeDetectionHelper"
, IMPLEMENTATIONNAME_MEDIATYPEDETECTIONHELPER
)
commit fecbe0ec96c1a172d381cc65020c0629a2e8e457
Author: Noel Grandin <noel at peralex.com>
Date: Wed Oct 17 15:28:11 2012 +0200
inline #define that is only used in one place
diff --git a/framework/inc/services.h b/framework/inc/services.h
index 37f5f3d..f585799 100644
--- a/framework/inc/services.h
+++ b/framework/inc/services.h
@@ -34,7 +34,6 @@ namespace framework{
#define SERVICENAME_FRAMELOADERFACTORY DECLARE_ASCII("com.sun.star.frame.FrameLoaderFactory" )
#define SERVICENAME_FILTERFACTORY DECLARE_ASCII("com.sun.star.document.FilterFactory" )
#define SERVICENAME_PLUGINFRAME DECLARE_ASCII("com.sun.star.mozilla.Plugin" )
-#define SERVICENAME_MEDIATYPEDETECTIONHELPER DECLARE_ASCII("com.sun.star.frame.MediaTypeDetectionHelper" )
#define SERVICENAME_LOGINDIALOG DECLARE_ASCII("com.sun.star.framework.LoginDialog" )
#define SERVICENAME_CONFIGURATION DECLARE_ASCII("com.sun.star.configuration.ConfigurationRegistry" )
#define SERVICENAME_SIMPLEREGISTRY DECLARE_ASCII("com.sun.star.registry.SimpleRegistry" )
diff --git a/framework/source/services/mediatypedetectionhelper.cxx b/framework/source/services/mediatypedetectionhelper.cxx
index efe7097..30606e9 100644
--- a/framework/source/services/mediatypedetectionhelper.cxx
+++ b/framework/source/services/mediatypedetectionhelper.cxx
@@ -55,7 +55,7 @@ MediaTypeDetectionHelper::~MediaTypeDetectionHelper()
DEFINE_XSERVICEINFO_ONEINSTANCESERVICE ( MediaTypeDetectionHelper
, ::cppu::OWeakObject
- , SERVICENAME_MEDIATYPEDETECTIONHELPER
+ , DECLARE_ASCII("com.sun.star.frame.MediaTypeDetectionHelper")
, IMPLEMENTATIONNAME_MEDIATYPEDETECTIONHELPER
)
commit 47943bec0b8f7945b9647bf6c0a43dc6535b4637
Author: Noel Grandin <noel at peralex.com>
Date: Wed Oct 17 15:24:47 2012 +0200
remove unused #define
diff --git a/framework/inc/services.h b/framework/inc/services.h
index cfbee13..37f5f3d 100644
--- a/framework/inc/services.h
+++ b/framework/inc/services.h
@@ -34,7 +34,6 @@ namespace framework{
#define SERVICENAME_FRAMELOADERFACTORY DECLARE_ASCII("com.sun.star.frame.FrameLoaderFactory" )
#define SERVICENAME_FILTERFACTORY DECLARE_ASCII("com.sun.star.document.FilterFactory" )
#define SERVICENAME_PLUGINFRAME DECLARE_ASCII("com.sun.star.mozilla.Plugin" )
-#define SERVICENAME_BRIDGEFACTORY DECLARE_ASCII("com.sun.star.bridge.BridgeFactory" )
#define SERVICENAME_MEDIATYPEDETECTIONHELPER DECLARE_ASCII("com.sun.star.frame.MediaTypeDetectionHelper" )
#define SERVICENAME_LOGINDIALOG DECLARE_ASCII("com.sun.star.framework.LoginDialog" )
#define SERVICENAME_CONFIGURATION DECLARE_ASCII("com.sun.star.configuration.ConfigurationRegistry" )
commit 14d45795b2a555ef8121d3f1c406fe0d59cfdba5
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Oct 29 13:29:47 2012 +0100
Setting CLASSPATH/XCLASSPATH appears to be a leftover
...from the old dmake and/or Hamburg-specific set up.
Change-Id: I441ce66dd91d353196cd9d1a9853720195a6fcdc
diff --git a/config_host.mk.in b/config_host.mk.in
index be1fd1b..f8566af 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -58,7 +58,6 @@ export CFLAGS=@CFLAGS@
endif
export CHECK_PARALLELISM=@CHECK_PARALLELISM@
export CLANGPLUGIN_CPPFLAGS=@CLANGPLUGIN_CPPFLAGS@
-export CLASSPATH=@CLASSPATH@
export CLUCENE_CFLAGS=@CLUCENE_CFLAGS@
export CLUCENE_LIBS=@CLUCENE_LIBS@
export CLUCENE_TARBALL=@CLUCENE_TARBALL@
@@ -693,7 +692,6 @@ export WPG_TARBALL=@WPG_TARBALL@
export WPS_CFLAGS=@WPS_CFLAGS@
export WPS_LIBS=@WPS_LIBS@
export WPS_TARBALL=@WPS_TARBALL@
-export XCLASSPATH=@XCLASSPATH@
export XINERAMA_LINK=@XINERAMA_LINK@
export XMLLINT=@XMLLINT@
export XRANDR_CFLAGS=@XRANDR_CFLAGS@
diff --git a/configure.ac b/configure.ac
index 65e3c22..55bfb90 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6468,20 +6468,11 @@ if test "$SOLAR_JAVA" != ""; then
test -d "$JRE_BASE_DIR/$JAVA_TOOLKIT" && JAVALIB="$JAVALIB -L$JRE_BASE_DIR/$JAVA_TOOLKIT"
test -d "$JRE_BASE_DIR/native_thread" && JAVALIB="$JAVALIB -L$JRE_BASE_DIR/native_thread"
fi
-
- CLASSPATH=
- if test "$JDK"!="gcj"; then
- if test -f "$JAVA_HOME/jre/lib/rt.jar"; then
- CLASSPATH="${JAVA_HOME}/jre/lib/rt.jar${P_SEP}."
- fi
- fi
- XCLASSPATH="$CLASSPATH"
else
x_JAVALIB=[\#]
x_JDKLIB=[\#]
fi
-AC_SUBST(CLASSPATH)
AC_SUBST(JAVALIB)
AC_SUBST(JAVACOMPILER)
AC_SUBST(JAVADOC)
@@ -6492,7 +6483,6 @@ AC_SUBST(JAVA_SOURCE_VER)
AC_SUBST(JAVA_TARGET_VER)
AC_SUBST(JDK)
AC_SUBST(JDKLIB)
-AC_SUBST(XCLASSPATH)
AC_SUBST(x_JAVALIB)
AC_SUBST(x_JDKLIB)
diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk
index 4527fcf..5d53511 100644
--- a/solenv/gbuild/Jar.mk
+++ b/solenv/gbuild/Jar.mk
@@ -96,7 +96,6 @@ $(call gb_Jar_get_target,$(1)) : PACKAGEROOTS :=
$(call gb_Jar_get_target,$(1)) : PACKAGEDIRS :=
$(call gb_Jar_get_target,$(1)) : PACKAGEFILES :=
$(call gb_JavaClassSet_JavaClassSet,$(call gb_Jar_get_classsetname,$(1)))
-$(call gb_JavaClassSet_add_classpath,$(call gb_Jar_get_classsetname,$(1)),$(value XCLASSPATH))
$(eval $(call gb_Module_register_target,$(call gb_Jar_get_outdir_target,$(1)),$(call gb_Jar_get_clean_target,$(1))))
$(call gb_Deliver_add_deliverable,$(call gb_Jar_get_outdir_target,$(1)),$(call gb_Jar_get_target,$(1)),$(1))
$(call gb_Jar_get_outdir_target,$(1)) : $(call gb_Jar_get_target,$(1))
diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
index 8dbc1bf..fbe87fd 100644
--- a/solenv/gbuild/JunitTest.mk
+++ b/solenv/gbuild/JunitTest.mk
@@ -67,7 +67,7 @@ $(call gb_JunitTest_get_target,%) :
$(CLEAN_CMD)
define gb_JunitTest_JunitTest
-$(call gb_JunitTest_get_target,$(1)) : T_CP := $(if $(value XCLASSPATH),$$(value XCLASSPATH)$$(gb_CLASSPATHSEP))$(call gb_JavaClassSet_get_classdir,$(call gb_JunitTest_get_classsetname,$(1)))$$(gb_CLASSPATHSEP)$(OOO_JUNIT_JAR)$$(gb_CLASSPATHSEP)$(OUTDIR)/lib
+$(call gb_JunitTest_get_target,$(1)) : T_CP := $(call gb_JavaClassSet_get_classdir,$(call gb_JunitTest_get_classsetname,$(1)))$$(gb_CLASSPATHSEP)$(OOO_JUNIT_JAR)$$(gb_CLASSPATHSEP)$(OUTDIR)/lib
$(call gb_JunitTest_get_target,$(1)) : CLASSES :=
$(eval $(call gb_JunitTest_JunitTest_platform,$(1)))
More information about the Libreoffice-commits
mailing list