summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--framework/inc/services.h8
-rw-r--r--framework/source/register/registerservices.cxx12
-rw-r--r--framework/source/services/makefile.mk7
-rw-r--r--framework/test/typecfg/makefile.mk35
-rw-r--r--framework/util/makefile.mk9
5 files changed, 25 insertions, 46 deletions
diff --git a/framework/inc/services.h b/framework/inc/services.h
index f464e8bd8c57..280da2eea154 100644
--- a/framework/inc/services.h
+++ b/framework/inc/services.h
@@ -2,9 +2,9 @@
*
* $RCSfile: services.h,v $
*
- * $Revision: 1.8 $
+ * $Revision: 1.9 $
*
- * last change: $Author: cd $ $Date: 2001-11-13 13:33:40 $
+ * last change: $Author: as $ $Date: 2001-12-05 13:27:37 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -98,7 +98,7 @@ namespace framework{
#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_CFGMANAGEMENT DECLARE_ASCII("com.sun.star.configuration.ConfigurationRegistry" ) // describe simple registry service for read access to configuration
+#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
#define SERVICENAME_CFGUPDATEACCESS DECLARE_ASCII("com.sun.star.configuration.ConfigurationUpdateAccess")
@@ -108,6 +108,7 @@ namespace framework{
#define SERVICENAME_UCBCONTENTBROKER DECLARE_ASCII("com.sun.star.ucb.UniversalContentBroker" )
#define SERVICENAME_STATUSINDICATOR DECLARE_ASCII("com.sun.star.task.XStatusIndicator" )
#define SERVICENAME_UIINTERACTIONHANDLER DECLARE_ASCII("com.sun.star.task.InteractionHandler" )
+#define SERVICENAME_JOBEXECUTOR DECLARE_ASCII("com.sun.star.task.JobExecutor" )
//_________________________________________________________________________________________________________________
// used implementationnames by framework
@@ -129,6 +130,7 @@ namespace framework{
#define IMPLEMENTATIONNAME_CONTENTHANDLERFACTORY DECLARE_ASCII("com.sun.star.comp.framework.ContentHandlerFactory" )
#define IMPLEMENTATIONNAME_PIPETERMINATOR DECLARE_ASCII("com.sun.star.comp.OfficeIPCThreadController" )
#define IMPLEMENTATIONNAME_QUICKLAUNCHER DECLARE_ASCII("com.sun.star.comp.desktop.QuickstartWrapper" )
+#define IMPLEMENTATIONNAME_JOBEXECUTOR DECLARE_ASCII("com.sun.star.comp.framework.JobExecutor" )
} // namespace framework
diff --git a/framework/source/register/registerservices.cxx b/framework/source/register/registerservices.cxx
index 01c309b69dad..0ad8c663e81c 100644
--- a/framework/source/register/registerservices.cxx
+++ b/framework/source/register/registerservices.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: registerservices.cxx,v $
*
- * $Revision: 1.11 $
+ * $Revision: 1.12 $
*
- * last change: $Author: as $ $Date: 2001-07-02 13:40:08 $
+ * last change: $Author: as $ $Date: 2001-12-05 13:27:37 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -118,6 +118,10 @@
#include <services/frame.hxx>
#endif
+#ifndef __FRAMEWORK_SERVICES_JOBEXECUTOR_HXX_
+#include <services/jobexecutor.hxx>
+#endif
+
#ifndef __FRAMEWORK_DISPATCH_SOUNDHANDLER_HXX_
#include <dispatch/soundhandler.hxx>
#endif
@@ -131,6 +135,7 @@ COMPONENTWRITEINFO ( COMPONENTINFO( ::framework::URLTransformer
COMPONENTINFO( ::framework::Frame )
COMPONENTINFO( ::framework::DocumentProperties )
COMPONENTINFO( ::framework::SoundHandler )
+ COMPONENTINFO( ::framework::JobExecutor )
)
COMPONENTGETFACTORY ( IFFACTORY( ::framework::URLTransformer ) else
@@ -139,5 +144,6 @@ COMPONENTGETFACTORY ( IFFACTORY( ::framework::URLTransformer
IFFACTORY( ::framework::Task ) else
IFFACTORY( ::framework::Frame ) else
IFFACTORY( ::framework::DocumentProperties ) else
- IFFACTORY( ::framework::SoundHandler )
+ IFFACTORY( ::framework::SoundHandler ) else
+ IFFACTORY( ::framework::JobExecutor )
)
diff --git a/framework/source/services/makefile.mk b/framework/source/services/makefile.mk
index 27d7d862ad30..bb1bcb249795 100644
--- a/framework/source/services/makefile.mk
+++ b/framework/source/services/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.9 $
+# $Revision: 1.10 $
#
-# last change: $Author: mba $ $Date: 2001-10-02 07:39:41 $
+# last change: $Author: as $ $Date: 2001-12-05 13:27:37 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -92,7 +92,8 @@ SLOFILES= \
$(SLO)$/menudocumenthandler.obj \
$(SLO)$/attributelist.obj \
$(SLO)$/saxnamespacefilter.obj \
- $(SLO)$/contenthandlerfactory.obj
+ $(SLO)$/contenthandlerfactory.obj \
+ $(SLO)$/jobexecutor.obj
SRCFILES= logindialog.src \
documentlist.src
diff --git a/framework/test/typecfg/makefile.mk b/framework/test/typecfg/makefile.mk
index d8b31e2b8f61..ff438a890364 100644
--- a/framework/test/typecfg/makefile.mk
+++ b/framework/test/typecfg/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.5 $
+# $Revision: 1.6 $
#
-# last change: $Author: as $ $Date: 2001-06-15 12:37:29 $
+# last change: $Author: as $ $Date: 2001-12-05 13:27:37 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -80,37 +80,6 @@ LINKFLAGS+=/SEGMENTS:1024 /PACKD:32768
# --- applikation: "xml2xcd" --------------------------------------------------
-APP1TARGET= xml2xcd
-
-APP1OBJS= $(SLO)$/xml2xcd.obj \
- $(SLO)$/servicemanager.obj \
- $(SLO)$/filtercachedata.obj \
- $(SLO)$/filtercache.obj \
- $(SLO)$/wildcard.obj \
- $(SLO)$/lockhelper.obj
-
-APP1STDLIBS= $(CPPULIB) \
- $(CPPUHELPERLIB) \
- $(OSLLIB) \
- $(SALLIB) \
- $(VOSLIB) \
- $(TOOLSLIB) \
- $(SVTOOLLIB) \
- $(TKLIB) \
- $(COMPHELPERLIB) \
- $(UNOTOOLSLIB) \
- $(SVLIB)
-
-APP1DEPN= $(SLO)$/servicemanager.obj \
- $(SLO)$/filtercachedata.obj \
- $(SLO)$/filtercache.obj \
- $(SLO)$/wildcard.obj \
- $(SLO)$/lockhelper.obj
-
-.IF "$(GUI)"=="WIN" || "$(GUI)"=="OS2"
-APP1DEF= $(MISC)$/xml2xcd.def
-.ENDIF
-
# --- applikation: "cfgview" --------------------------------------------------
APP2TARGET= cfgview
diff --git a/framework/util/makefile.mk b/framework/util/makefile.mk
index 5307f213b7c8..65a6cb646726 100644
--- a/framework/util/makefile.mk
+++ b/framework/util/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.57 $
+# $Revision: 1.58 $
#
-# last change: $Author: cd $ $Date: 2001-12-04 07:49:07 $
+# last change: $Author: as $ $Date: 2001-12-05 13:27:37 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -236,8 +236,9 @@ SHL4OBJS= $(SLO)$/argumentanalyzer.obj \
$(SLO)$/taskcreator.obj \
$(SLO)$/timerhelper.obj \
$(SLO)$/urltransformer.obj \
- $(SLO)$/documentlist.obj \
- $(SLO)$/xmldocproperties.obj
+ $(SLO)$/documentlist.obj \
+ $(SLO)$/xmldocproperties.obj \
+ $(SLO)$/jobexecutor.obj
SHL4STDLIBS= $(CPPULIB) \
$(CPPUHELPERLIB) \
generated by cgit (git 2.34.1) at 2024-08-21 07:27:31 +0000