diff options
Diffstat (limited to 'extensions/source')
32 files changed, 39 insertions, 188 deletions
diff --git a/extensions/source/abpilot/abp.map b/extensions/source/abpilot/abp.map deleted file mode 100644 index 2b4747c38ff9..000000000000 --- a/extensions/source/abpilot/abp.map +++ /dev/null @@ -1,8 +0,0 @@ -EXTABP_1_0 { - global: - component_getImplementationEnvironment; - component_writeInfo; - component_getFactory; - local: - *; -}; diff --git a/extensions/source/abpilot/makefile.mk b/extensions/source/abpilot/makefile.mk index c5b25fc733f7..19477e1b6b2b 100644 --- a/extensions/source/abpilot/makefile.mk +++ b/extensions/source/abpilot/makefile.mk @@ -76,7 +76,7 @@ RESLIB1IMAGES=$(PRJ)$/res RESLIB1SRSFILES= $(SRS)$/abp.srs SHL1TARGET= $(TARGET)$(DLLPOSTFIX) -SHL1VERSIONMAP= $(TARGET).map +SHL1VERSIONMAP=$(SOLARENV)/src/component.map SHL1STDLIBS= \ $(VCLLIB) \ diff --git a/extensions/source/activex/main/makefile.mk b/extensions/source/activex/main/makefile.mk index 53a54473ff49..e4770180886c 100644 --- a/extensions/source/activex/main/makefile.mk +++ b/extensions/source/activex/main/makefile.mk @@ -152,8 +152,4 @@ VERSIONOBJ_X64= $(MISC)$/envsettings.h : makefile.mk -$(RM) $@ # it looks wrong; but rc likes it that way... -.IF "$(USE_SHELL)"!="4nt" echo "#define MISC .\..\$(INPATH)\misc" > $@ -.ELSE # "$(USE_SHELL)"!="4nt" - echo #define MISC .\..\$(INPATH)\misc > $@ -.ENDIF # "$(USE_SHELL)"!="4nt" diff --git a/extensions/source/bibliography/exports.map b/extensions/source/bibliography/exports.map deleted file mode 100644 index ba501f9ae076..000000000000 --- a/extensions/source/bibliography/exports.map +++ /dev/null @@ -1,10 +0,0 @@ -UDK_3_0_0 { - global: - GetVersionInfo; - component_getImplementationEnvironment; - component_getFactory; - component_writeInfo; - - local: - *; -}; diff --git a/extensions/source/bibliography/makefile.mk b/extensions/source/bibliography/makefile.mk index efc1fbe222f3..f25dce11045b 100644 --- a/extensions/source/bibliography/makefile.mk +++ b/extensions/source/bibliography/makefile.mk @@ -82,7 +82,7 @@ SHL1LIBS= $(SLB)$/$(TARGET).lib SHL1IMPLIB= i$(TARGET) SHL1DEPN= $(SHL1LIBS) SHL1DEF= $(MISC)$/$(SHL1TARGET).def -SHL1VERSIONMAP=exports.map +SHL1VERSIONMAP=$(SOLARENV)/src/component.map DEF1NAME= $(SHL1TARGET) # --- Targets ------------------------------------------------------ diff --git a/extensions/source/dbpilots/dbp.map b/extensions/source/dbpilots/dbp.map deleted file mode 100644 index 1fe77064bd27..000000000000 --- a/extensions/source/dbpilots/dbp.map +++ /dev/null @@ -1,8 +0,0 @@ -EXTDBP_1_0 { - global: - component_getImplementationEnvironment; - component_writeInfo; - component_getFactory; - local: - *; -}; diff --git a/extensions/source/dbpilots/makefile.mk b/extensions/source/dbpilots/makefile.mk index 8ef5ebae82e8..b5831e5fda0f 100644 --- a/extensions/source/dbpilots/makefile.mk +++ b/extensions/source/dbpilots/makefile.mk @@ -76,7 +76,7 @@ RESLIB1NAME=dbp RESLIB1SRSFILES= $(SRS)$/dbp.srs SHL1TARGET= $(TARGET)$(DLLPOSTFIX) -SHL1VERSIONMAP= $(TARGET).map +SHL1VERSIONMAP=$(SOLARENV)/src/component.map SHL1STDLIBS= \ $(SVTOOLLIB) \ diff --git a/extensions/source/logging/log.map b/extensions/source/logging/log.map deleted file mode 100644 index 0bb561b5b067..000000000000 --- a/extensions/source/logging/log.map +++ /dev/null @@ -1,8 +0,0 @@ -LOG_1_0 { - global: - component_getImplementationEnvironment; - component_writeInfo; - component_getFactory; - local: - *; -}; diff --git a/extensions/source/logging/makefile.mk b/extensions/source/logging/makefile.mk index f3bfb2a4ea06..4a1fa9813cb0 100644 --- a/extensions/source/logging/makefile.mk +++ b/extensions/source/logging/makefile.mk @@ -68,7 +68,7 @@ SHL1STDLIBS= \ SHL1LIBS=$(LIB1TARGET) SHL1DEF=$(MISC)$/$(SHL1TARGET).def DEF1NAME=$(SHL1TARGET) -SHL1VERSIONMAP=$(TARGET).map +SHL1VERSIONMAP=$(SOLARENV)/src/component.map # --- Targets ---------------------------------- diff --git a/extensions/source/oooimprovecore/makefile.mk b/extensions/source/oooimprovecore/makefile.mk index 977098af8049..97e130c3a644 100644 --- a/extensions/source/oooimprovecore/makefile.mk +++ b/extensions/source/oooimprovecore/makefile.mk @@ -69,7 +69,7 @@ SHL1STDLIBS= \ SHL1LIBS=$(LIB1TARGET) SHL1DEF=$(MISC)$/$(SHL1TARGET).def DEF1NAME=$(SHL1TARGET) -SHL1VERSIONMAP=$(TARGET).map +SHL1VERSIONMAP=$(SOLARENV)/src/component.map # --- Targets ---------------------------------- diff --git a/extensions/source/oooimprovecore/oooimprovecore.map b/extensions/source/oooimprovecore/oooimprovecore.map deleted file mode 100644 index fe782c0d7737..000000000000 --- a/extensions/source/oooimprovecore/oooimprovecore.map +++ /dev/null @@ -1,8 +0,0 @@ -OOOIMPROVECORE_1_0 { - global: - component_getImplementationEnvironment; - component_writeInfo; - component_getFactory; - local: - *; -}; diff --git a/extensions/source/oooimprovement/makefile.mk b/extensions/source/oooimprovement/makefile.mk index ba8ff01a8c0e..6e5d7ab0d6a2 100644 --- a/extensions/source/oooimprovement/makefile.mk +++ b/extensions/source/oooimprovement/makefile.mk @@ -73,7 +73,7 @@ SHL1TARGET= oooimp$(DLLPOSTFIX) SHL1LIBS= $(SLB)$/$(TARGET).lib SHL1DEF= $(MISC)$/$(SHL1TARGET).def DEF1NAME= $(SHL1TARGET) -SHL1VERSIONMAP= oooimprovement.map +SHL1VERSIONMAP=$(SOLARENV)/src/component.map PACKAGEDIR=$(subst,.,$/ $(PACKAGE)) SPOOLDIR=$(MISC)$/registry$/spool diff --git a/extensions/source/oooimprovement/oooimprovement.map b/extensions/source/oooimprovement/oooimprovement.map deleted file mode 100644 index de08e5708ea5..000000000000 --- a/extensions/source/oooimprovement/oooimprovement.map +++ /dev/null @@ -1,11 +0,0 @@ -UDK_3_0_0 { - global: - GetVersionInfo; - component_getImplementationEnvironment; - component_getFactory; - component_writeInfo; - - local: - *; -}; - diff --git a/extensions/source/plugin/util/exports.map b/extensions/source/plugin/util/exports.map deleted file mode 100644 index ba501f9ae076..000000000000 --- a/extensions/source/plugin/util/exports.map +++ /dev/null @@ -1,10 +0,0 @@ -UDK_3_0_0 { - global: - GetVersionInfo; - component_getImplementationEnvironment; - component_getFactory; - component_writeInfo; - - local: - *; -}; diff --git a/extensions/source/plugin/util/makefile.mk b/extensions/source/plugin/util/makefile.mk index 659e8f3acaed..7a8c46c01769 100644 --- a/extensions/source/plugin/util/makefile.mk +++ b/extensions/source/plugin/util/makefile.mk @@ -67,7 +67,7 @@ SHL1OWNLIBS = \ SHL1TARGET= $(TARGET)$(DLLPOSTFIX) SHL1IMPLIB= i$(TARGET) -SHL1VERSIONMAP=exports.map +SHL1VERSIONMAP=$(SOLARENV)/src/component.map SHL1DEF=$(MISC)$/$(SHL1TARGET).def DEF1NAME=$(SHL1TARGET) diff --git a/extensions/source/preload/makefile.mk b/extensions/source/preload/makefile.mk index 4e4bab1bc71a..fb11a2bfd32c 100644 --- a/extensions/source/preload/makefile.mk +++ b/extensions/source/preload/makefile.mk @@ -57,7 +57,7 @@ RESLIB1IMAGES=$(PRJ)$/res RESLIB1SRSFILES= $(SRS)$/preload.srs SHL1TARGET= $(TARGET)$(DLLPOSTFIX) -SHL1VERSIONMAP= $(TARGET).map +SHL1VERSIONMAP=$(SOLARENV)/src/component.map SHL1STDLIBS= \ $(SFXLIB) \ diff --git a/extensions/source/preload/preload.map b/extensions/source/preload/preload.map deleted file mode 100644 index ff4971857d69..000000000000 --- a/extensions/source/preload/preload.map +++ /dev/null @@ -1,8 +0,0 @@ -EXTDBI_1_0 { - global: - component_getImplementationEnvironment; - component_writeInfo; - component_getFactory; - local: - *; -}; diff --git a/extensions/source/propctrlr/makefile.mk b/extensions/source/propctrlr/makefile.mk index 27255c9e5f46..c69f47bcef1a 100644 --- a/extensions/source/propctrlr/makefile.mk +++ b/extensions/source/propctrlr/makefile.mk @@ -113,7 +113,7 @@ RESLIB1IMAGES=$(PRJ)$/res RESLIB1SRSFILES= $(SRS)$/$(TARGET).srs SHL1TARGET= $(TARGET)$(DLLPOSTFIX) -SHL1VERSIONMAP= $(TARGET).map +SHL1VERSIONMAP=$(SOLARENV)/src/component.map SHL1STDLIBS= \ $(EDITENGLIB) \ diff --git a/extensions/source/propctrlr/pcr.map b/extensions/source/propctrlr/pcr.map deleted file mode 100644 index 6794fcdf213e..000000000000 --- a/extensions/source/propctrlr/pcr.map +++ /dev/null @@ -1,8 +0,0 @@ -EXTPCR_1_0 { - global: - component_getImplementationEnvironment; - component_writeInfo; - component_getFactory; - local: - *; -}; diff --git a/extensions/source/resource/exports.map b/extensions/source/resource/exports.map deleted file mode 100644 index 7c56baa9bd73..000000000000 --- a/extensions/source/resource/exports.map +++ /dev/null @@ -1,10 +0,0 @@ -UDK_3_0_0 { - global: - GetVersionInfo; - component_getImplementationEnvironment; - component_getFactory; - component_writeInfo; - - local: - *; -}; diff --git a/extensions/source/resource/makefile.mk b/extensions/source/resource/makefile.mk index 2502d8467f22..a89d690b7393 100644 --- a/extensions/source/resource/makefile.mk +++ b/extensions/source/resource/makefile.mk @@ -63,7 +63,7 @@ SHL1DEF= $(MISC)$/$(SHL1TARGET).def SHL1DEF=$(MISC)$/$(SHL1TARGET).def SHL1IMPLIB=i$(TARGET) SHL1LIBS=$(SLB)$/$(TARGET).lib -SHL1VERSIONMAP=exports.map +SHL1VERSIONMAP=$(SOLARENV)/src/component.map DEF1NAME= $(SHL1TARGET) DEF1EXPORTFILE= exports.dxp diff --git a/extensions/source/scanner/exports.map b/extensions/source/scanner/exports.map deleted file mode 100644 index 7c56baa9bd73..000000000000 --- a/extensions/source/scanner/exports.map +++ /dev/null @@ -1,10 +0,0 @@ -UDK_3_0_0 { - global: - GetVersionInfo; - component_getImplementationEnvironment; - component_getFactory; - component_writeInfo; - - local: - *; -}; diff --git a/extensions/source/scanner/makefile.mk b/extensions/source/scanner/makefile.mk index 347b1e1cfc26..ff42864e0496 100644 --- a/extensions/source/scanner/makefile.mk +++ b/extensions/source/scanner/makefile.mk @@ -88,7 +88,7 @@ SHL1STDLIBS+=$(SVTOOLLIB) -ldl SHL1DEF=$(MISC)$/$(SHL1TARGET).def SHL1IMPLIB=i$(TARGET) SHL1LIBS=$(SLB)$/$(TARGET).lib -SHL1VERSIONMAP=exports.map +SHL1VERSIONMAP=$(SOLARENV)/src/component.map DEF1NAME=$(SHL1TARGET) DEF1EXPORTFILE=exports.dxp diff --git a/extensions/source/svg/exports.map b/extensions/source/svg/exports.map deleted file mode 100644 index ba501f9ae076..000000000000 --- a/extensions/source/svg/exports.map +++ /dev/null @@ -1,10 +0,0 @@ -UDK_3_0_0 { - global: - GetVersionInfo; - component_getImplementationEnvironment; - component_getFactory; - component_writeInfo; - - local: - *; -}; diff --git a/extensions/source/svg/makefile.mk b/extensions/source/svg/makefile.mk index 543fbca73982..c46aede54920 100644 --- a/extensions/source/svg/makefile.mk +++ b/extensions/source/svg/makefile.mk @@ -47,7 +47,7 @@ SLOFILES= $(SLO)$/svgprinter.obj \ SHL1TARGET=$(TARGET)$(DLLPOSTFIX) SHL1IMPLIB=i$(SHL1TARGET) -SHL1VERSIONMAP=exports.map +SHL1VERSIONMAP=$(SOLARENV)/src/component.map SHL1DEF=$(MISC)$/$(SHL1TARGET).def DEF1NAME=$(SHL1TARGET) diff --git a/extensions/source/update/check/makefile.mk b/extensions/source/update/check/makefile.mk index b87eb0377803..9f5f544102dd 100644 --- a/extensions/source/update/check/makefile.mk +++ b/extensions/source/update/check/makefile.mk @@ -82,7 +82,7 @@ SHL1STDLIBS= \ $(SHELL32LIB) \ $(OLE32LIB) -SHL1VERSIONMAP=..$/exports.map +SHL1VERSIONMAP=$(SOLARENV)/src/component.map SHL1DEF=$(MISC)$/$(SHL1TARGET).def DEF1NAME=$(SHL1TARGET) diff --git a/extensions/source/update/check/updatecheckjob.cxx b/extensions/source/update/check/updatecheckjob.cxx index 3be38dd9888a..2444637515d4 100644 --- a/extensions/source/update/check/updatecheckjob.cxx +++ b/extensions/source/update/check/updatecheckjob.cxx @@ -28,6 +28,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_extensions.hxx" +#include <memory> + #include "updatecheck.hxx" #include "updatecheckconfig.hxx" #include "updatehdl.hxx" @@ -55,16 +57,12 @@ class InitUpdateCheckJobThread : public osl::Thread { public: InitUpdateCheckJobThread( const uno::Reference< uno::XComponentContext > &xContext, - const uno::Sequence< beans::NamedValue > &xParameters ); + const uno::Sequence< beans::NamedValue > &xParameters, + bool bShowDialog ); virtual void SAL_CALL run(); - virtual void SAL_CALL onTerminated(); - - void showDialog(); - void setTerminating() { m_bTerminating = true; } -protected: - ~InitUpdateCheckJobThread(); + void setTerminating(); private: osl::Condition m_aCondition; @@ -115,7 +113,7 @@ public: private: uno::Reference<uno::XComponentContext> m_xContext; uno::Reference< frame::XDesktop > m_xDesktop; - InitUpdateCheckJobThread *m_pInitThread; + std::auto_ptr< InitUpdateCheckJobThread > m_pInitThread; void handleExtensionUpdates( const uno::Sequence< beans::NamedValue > &rListProp ); }; @@ -125,29 +123,25 @@ private: //------------------------------------------------------------------------------ InitUpdateCheckJobThread::InitUpdateCheckJobThread( const uno::Reference< uno::XComponentContext > &xContext, - const uno::Sequence< beans::NamedValue > &xParameters ) : + const uno::Sequence< beans::NamedValue > &xParameters, + bool bShowDialog ) : m_xContext( xContext ), m_xParameters( xParameters ), - m_bShowDialog( false ), + m_bShowDialog( bShowDialog ), m_bTerminating( false ) { create(); } //------------------------------------------------------------------------------ -InitUpdateCheckJobThread::~InitUpdateCheckJobThread() -{ -} - -//------------------------------------------------------------------------------ void SAL_CALL InitUpdateCheckJobThread::run() { - TimeValue tv = { 25, 0 }; - - m_aCondition.wait( &tv ); - - if ( m_bTerminating ) - return; + if (!m_bShowDialog) { + TimeValue tv = { 25, 0 }; + m_aCondition.wait( &tv ); + if ( m_bTerminating ) + return; + } rtl::Reference< UpdateCheck > aController( UpdateCheck::get() ); aController->initialize( m_xParameters, m_xContext ); @@ -156,16 +150,8 @@ void SAL_CALL InitUpdateCheckJobThread::run() aController->showDialog( true ); } -//------------------------------------------------------------------------------ -void SAL_CALL InitUpdateCheckJobThread::onTerminated() -{ - delete this; -} - -//------------------------------------------------------------------------------ -void InitUpdateCheckJobThread::showDialog() -{ - m_bShowDialog = true; +void InitUpdateCheckJobThread::setTerminating() { + m_bTerminating = true; m_aCondition.set(); } @@ -174,8 +160,7 @@ void InitUpdateCheckJobThread::showDialog() //------------------------------------------------------------------------------ UpdateCheckJob::UpdateCheckJob( const uno::Reference<uno::XComponentContext>& xContext ) : - m_xContext(xContext), - m_pInitThread( NULL ) + m_xContext(xContext) { m_xDesktop.set( xContext->getServiceManager()->createInstanceWithContext( UNISTRING("com.sun.star.frame.Desktop"), xContext ), uno::UNO_QUERY ); if ( m_xDesktop.is() ) @@ -234,7 +219,6 @@ UpdateCheckJob::execute(const uno::Sequence<beans::NamedValue>& namedValues) uno::Sequence<beans::NamedValue> aConfig = getValue< uno::Sequence<beans::NamedValue> > (namedValues, "JobConfig"); - m_pInitThread = new InitUpdateCheckJobThread( m_xContext, aConfig ); /* Determine the way we got invoked here - * see Developers Guide Chapter "4.7.2 Jobs" to understand the magic @@ -245,10 +229,10 @@ UpdateCheckJob::execute(const uno::Sequence<beans::NamedValue>& namedValues) rtl::OUString aEventName = getValue< rtl::OUString > (aEnvironment, "EventName"); - if( ! aEventName.equalsAscii("onFirstVisibleTask") ) - { - m_pInitThread->showDialog(); - } + m_pInitThread.reset( + new InitUpdateCheckJobThread( + m_xContext, aConfig, + !aEventName.equalsAscii("onFirstVisibleTask"))); return uno::Any(); } @@ -346,7 +330,7 @@ void SAL_CALL UpdateCheckJob::queryTermination( lang::EventObject const & ) void SAL_CALL UpdateCheckJob::notifyTermination( lang::EventObject const & rEvt ) throw ( uno::RuntimeException ) { - if ( m_pInitThread ) + if ( m_pInitThread.get() != 0 ) m_pInitThread->setTerminating(); disposing( rEvt ); diff --git a/extensions/source/update/exports.map b/extensions/source/update/exports.map deleted file mode 100644 index ba501f9ae076..000000000000 --- a/extensions/source/update/exports.map +++ /dev/null @@ -1,10 +0,0 @@ -UDK_3_0_0 { - global: - GetVersionInfo; - component_getImplementationEnvironment; - component_getFactory; - component_writeInfo; - - local: - *; -}; diff --git a/extensions/source/update/feed/makefile.mk b/extensions/source/update/feed/makefile.mk index c7d15a2beb74..7e12970ddef1 100644 --- a/extensions/source/update/feed/makefile.mk +++ b/extensions/source/update/feed/makefile.mk @@ -54,7 +54,7 @@ SHL1STDLIBS= \ $(CPPULIB) \ $(SALLIB) -SHL1VERSIONMAP=..$/exports.map +SHL1VERSIONMAP=$(SOLARENV)/src/component.map SHL1DEF=$(MISC)$/$(SHL1TARGET).def DEF1NAME=$(SHL1TARGET) diff --git a/extensions/source/update/ui/makefile.mk b/extensions/source/update/ui/makefile.mk index 1cf95a52108d..c4826efba9ca 100644 --- a/extensions/source/update/ui/makefile.mk +++ b/extensions/source/update/ui/makefile.mk @@ -64,7 +64,7 @@ SHL1STDLIBS= \ $(VCLLIB) \ $(TOOLSLIB) -SHL1VERSIONMAP=..$/exports.map +SHL1VERSIONMAP=$(SOLARENV)/src/component.map SHL1DEF=$(MISC)$/$(SHL1TARGET).def DEF1NAME=$(SHL1TARGET) diff --git a/extensions/source/xmlextract/exports.map b/extensions/source/xmlextract/exports.map deleted file mode 100644 index ba501f9ae076..000000000000 --- a/extensions/source/xmlextract/exports.map +++ /dev/null @@ -1,10 +0,0 @@ -UDK_3_0_0 { - global: - GetVersionInfo; - component_getImplementationEnvironment; - component_getFactory; - component_writeInfo; - - local: - *; -}; diff --git a/extensions/source/xmlextract/makefile.mk b/extensions/source/xmlextract/makefile.mk index 8a24ac5313c1..0a021027f4b4 100644 --- a/extensions/source/xmlextract/makefile.mk +++ b/extensions/source/xmlextract/makefile.mk @@ -46,7 +46,7 @@ SLOFILES= $(SLO)$/xmxuno.obj \ SHL1TARGET=$(TARGET)$(DLLPOSTFIX) SHL1IMPLIB= i$(SHL1TARGET) -SHL1VERSIONMAP=exports.map +SHL1VERSIONMAP=$(SOLARENV)/src/component.map SHL1DEF=$(MISC)$/$(SHL1TARGET).def DEF1NAME=$(SHL1TARGET) |