move light services to another registration file (for shared filtercache!)

2 files changed, 27 insertions, 37 deletions

diff --git a/framework/source/register/registerservices.cxx b/framework/source/register/registerservices.cxx
index fc545d33cb03..74cd669ca4d3 100644
--- a/framework/source/register/registerservices.cxx
+++ b/framework/source/register/registerservices.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: registerservices.cxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: rt $ $Date: 2001-02-01 16:17:58 $
+ *  last change: $Author: as $ $Date: 2001-02-16 12:20:19 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -118,40 +118,8 @@
 #include <services/frame.hxx>
 #endif
 
-
-#ifdef TF_FILTER//MUSTFILTER
-    #ifndef __FRAMEWORK_SERVICES_FILTERFACTORY_HXX_
-    #include <services/filterfactory.hxx>
-    #endif
-
-    #ifndef __FRAMEWORK_SERVICES_TYPEDETECTION_HXX_
-    #include <services/typedetection.hxx>
-    #endif
-#endif//MUSTFILTER
-
 COMPONENTGETIMPLEMENTATIONENVIRONMENT
 
-#ifdef TF_FILTER//MUSTFILTER
-COMPONENTWRITEINFO  (   COMPONENTINFO( ::framework::URLTransformer              )
-                        COMPONENTINFO( ::framework::PlugInFrame                 )
-                        COMPONENTINFO( ::framework::Desktop                     )
-                        COMPONENTINFO( ::framework::Task                        )
-                        COMPONENTINFO( ::framework::Frame                       )
-                        COMPONENTINFO( ::framework::FilterFactory               )
-                        COMPONENTINFO( ::framework::TypeDetection               )
-                        COMPONENTINFO( ::framework::DocumentProperties          )
-                    )
-
-COMPONENTGETFACTORY (   IFFACTORY( ::framework::URLTransformer                  )   else
-                        IFFACTORY( ::framework::PlugInFrame                     )   else
-                        IFFACTORY( ::framework::Desktop                         )   else
-                        IFFACTORY( ::framework::Task                            )   else
-                        IFFACTORY( ::framework::Frame                           )   else
-                        IFFACTORY( ::framework::FilterFactory                   )   else
-                        IFFACTORY( ::framework::TypeDetection                   )   else
-                        IFFACTORY( ::framework::DocumentProperties              )
-                    )
-#else//MUSTFILTER
 COMPONENTWRITEINFO  (   COMPONENTINFO( ::framework::URLTransformer              )
                         COMPONENTINFO( ::framework::PlugInFrame                 )
                         COMPONENTINFO( ::framework::Desktop                     )
@@ -167,4 +135,3 @@ COMPONENTGETFACTORY (   IFFACTORY( ::framework::URLTransformer
                         IFFACTORY( ::framework::Frame                           )   else
                         IFFACTORY( ::framework::DocumentProperties              )
                     )
-#endif//MUSTFILTER
diff --git a/framework/source/register/registertemp.cxx b/framework/source/register/registertemp.cxx
index 707f63f71818..c335359ad7ae 100644
--- a/framework/source/register/registertemp.cxx
+++ b/framework/source/register/registertemp.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: registertemp.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: as $ $Date: 2001-01-26 08:39:47 $
+ *  last change: $Author: as $ $Date: 2001-02-16 12:20:19 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -99,9 +99,31 @@
 #include <services/frameloaderfactory.hxx>
 #endif
 
+#ifdef TF_FILTER
+#ifndef __FRAMEWORK_SERVICES_FILTERFACTORY_HXX_
+#include <services/filterfactory.hxx>
+#endif
+
+#ifndef __FRAMEWORK_SERVICES_TYPEDETECTION_HXX_
+#include <services/typedetection.hxx>
+#endif
+#endif // TF_FILTER
+
 COMPONENTGETIMPLEMENTATIONENVIRONMENT
 
+#ifdef TF_FILTER
+COMPONENTWRITEINFO  (   COMPONENTINFO( ::framework::MediaTypeDetectionHelper    )
+                        COMPONENTINFO( ::framework::FrameLoaderFactory          )
+                        COMPONENTINFO( ::framework::FilterFactory               )
+                        COMPONENTINFO( ::framework::TypeDetection               )
+                    )
 
+COMPONENTGETFACTORY (   IFFACTORY( ::framework::MediaTypeDetectionHelper        )   else
+                        IFFACTORY( ::framework::FrameLoaderFactory              )   else
+                        IFFACTORY( ::framework::FilterFactory                   )   else
+                        IFFACTORY( ::framework::TypeDetection                   )
+                    )
+#else // TF_FILTER
 COMPONENTWRITEINFO  (   COMPONENTINFO( ::framework::MediaTypeDetectionHelper    )
                         COMPONENTINFO( ::framework::FrameLoaderFactory          )
                     )
@@ -109,3 +131,4 @@ COMPONENTWRITEINFO  (   COMPONENTINFO( ::framework::MediaTypeDetectionHelper
 COMPONENTGETFACTORY (   IFFACTORY( ::framework::MediaTypeDetectionHelper        )   else
                         IFFACTORY( ::framework::FrameLoaderFactory              )
                     )
+#endif // TF_FILTER