#81873# move MediaTypeDetectionHelper to temp. fwl-dll

4 files changed, 141 insertions, 22 deletions

diff --git a/framework/source/register/makefile.mk b/framework/source/register/makefile.mk
index 8105ba96643a..42faa6a2e1d4 100644
--- a/framework/source/register/makefile.mk
+++ b/framework/source/register/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.2 $
+#   $Revision: 1.3 $
 #
-#   last change: $Author: as $ $Date: 2000-11-23 14:52:09 $
+#   last change: $Author: as $ $Date: 2000-12-13 09:23:06 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -78,7 +78,8 @@ LIBTARGET=			NO
 # --- Generate -----------------------------------------------------
 
 SLOFILES=			\
-                    $(SLO)$/registerservices.obj
+                    $(SLO)$/registerservices.obj		\
+                    $(SLO)$/registertemp.obj
 
 # --- Targets ------------------------------------------------------
 
diff --git a/framework/source/register/registerservices.cxx b/framework/source/register/registerservices.cxx
index 30776b384773..a8213cebef3e 100644
--- a/framework/source/register/registerservices.cxx
+++ b/framework/source/register/registerservices.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: registerservices.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: as $ $Date: 2000-11-28 14:45:29 $
+ *  last change: $Author: as $ $Date: 2000-12-13 09:23:06 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -103,10 +103,6 @@
 #include <baeh_services/desktop.hxx>
 #endif
 
-#ifndef __FRAMEWORK_BAEHSERVICES_MEDIATYPEDETECTIONHELPER_HXX_
-#include <baeh_services/mediatypedetectionhelper.hxx>
-#endif
-
 #ifndef __FRAMEWORK_SERVICES_TASK_HXX_
 #include <services/task.hxx>
 #endif
@@ -135,7 +131,6 @@ COMPONENTGETIMPLEMENTATIONENVIRONMENT
 COMPONENTWRITEINFO  (   COMPONENTINFO( ::framework::URLTransformer              )
                         COMPONENTINFO( ::framework::PlugInFrame                 )
                         COMPONENTINFO( ::framework::Desktop                     )
-                        COMPONENTINFO( ::framework::MediaTypeDetectionHelper    )
                         COMPONENTINFO( ::framework::Task                        )
                         COMPONENTINFO( ::framework::Frame                       )
                         COMPONENTINFO( ::framework::FrameLoaderFactory          )
@@ -146,7 +141,6 @@ COMPONENTWRITEINFO  (   COMPONENTINFO( ::framework::URLTransformer
 COMPONENTGETFACTORY (   IFFACTORY( ::framework::URLTransformer                  )   else
                         IFFACTORY( ::framework::PlugInFrame                     )   else
                         IFFACTORY( ::framework::Desktop                         )   else
-                        IFFACTORY( ::framework::MediaTypeDetectionHelper        )   else
                         IFFACTORY( ::framework::Task                            )   else
                         IFFACTORY( ::framework::Frame                           )   else
                         IFFACTORY( ::framework::FrameLoaderFactory              )   else
@@ -157,7 +151,6 @@ COMPONENTGETFACTORY (   IFFACTORY( ::framework::URLTransformer
 COMPONENTWRITEINFO  (   COMPONENTINFO( ::framework::URLTransformer              )
                         COMPONENTINFO( ::framework::PlugInFrame                 )
                         COMPONENTINFO( ::framework::Desktop                     )
-                        COMPONENTINFO( ::framework::MediaTypeDetectionHelper    )
                         COMPONENTINFO( ::framework::Task                        )
                         COMPONENTINFO( ::framework::Frame                       )
                         COMPONENTINFO( ::framework::FrameLoaderFactory          )
@@ -166,7 +159,6 @@ COMPONENTWRITEINFO  (   COMPONENTINFO( ::framework::URLTransformer
 COMPONENTGETFACTORY (   IFFACTORY( ::framework::URLTransformer                  )   else
                         IFFACTORY( ::framework::PlugInFrame                     )   else
                         IFFACTORY( ::framework::Desktop                         )   else
-                        IFFACTORY( ::framework::MediaTypeDetectionHelper        )   else
                         IFFACTORY( ::framework::Task                            )   else
                         IFFACTORY( ::framework::Frame                           )   else
                         IFFACTORY( ::framework::FrameLoaderFactory              )
diff --git a/framework/source/register/registertemp.cxx b/framework/source/register/registertemp.cxx
new file mode 100644
index 000000000000..eb6463763ee6
--- /dev/null
+++ b/framework/source/register/registertemp.cxx
@@ -0,0 +1,105 @@
+/*************************************************************************
+ *
+ *  $RCSfile: registertemp.cxx,v $
+ *
+ *  $Revision: 1.1 $
+ *
+ *  last change: $Author: as $ $Date: 2000-12-13 09:23:06 $
+ *
+ *  The Contents of this file are made available subject to the terms of
+ *  either of the following licenses
+ *
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
+ *
+ *  Sun Microsystems Inc., October, 2000
+ *
+ *  GNU Lesser General Public License Version 2.1
+ *  =============================================
+ *  Copyright 2000 by Sun Microsystems, Inc.
+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
+ *
+ *
+ *  Sun Industry Standards Source License Version 1.1
+ *  =================================================
+ *  The contents of this file are subject to the Sun Industry Standards
+ *  Source License Version 1.1 (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.openoffice.org/license.html.
+ *
+ *  Software provided under this License is provided on an "AS IS" basis,
+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ *  See the License for the specific provisions governing your rights and
+ *  obligations concerning the Software.
+ *
+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ *  Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *  All Rights Reserved.
+ *
+ *  Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+//_________________________________________________________________________________________________________________
+//  includes of my own project
+//_________________________________________________________________________________________________________________
+
+#ifndef __FRAMEWORK_MACROS_REGISTRATION_HXX_
+#include <macros/registration.hxx>
+#endif
+
+/*=================================================================================================================
+    Add new include and new register info to for new services.
+
+    Example:
+
+        #ifndef __YOUR_SERVICE_1_HXX_
+        #include <service1.hxx>
+        #endif
+
+        #ifndef __YOUR_SERVICE_2_HXX_
+        #include <service2.hxx>
+        #endif
+
+        COMPONENTGETIMPLEMENTATIONENVIRONMENT
+
+        COMPONENTWRITEINFO  (   COMPONENTINFO( Service1 )
+                                 COMPONENTINFO( Service2 )
+                            )
+
+        COMPONENTGETFACTORY (   IFFACTORIE( Service1 )
+                                 else
+                                IFFACTORIE( Service2 )
+                             )
+=================================================================================================================*/
+
+#ifndef __FRAMEWORK_BAEHSERVICES_MEDIATYPEDETECTIONHELPER_HXX_
+#include <baeh_services/mediatypedetectionhelper.hxx>
+#endif
+
+COMPONENTGETIMPLEMENTATIONENVIRONMENT
+
+
+COMPONENTWRITEINFO  (   COMPONENTINFO( ::framework::MediaTypeDetectionHelper    )
+                    )
+
+COMPONENTGETFACTORY (   IFFACTORY( ::framework::MediaTypeDetectionHelper    )
+                    )
diff --git a/framework/util/makefile.mk b/framework/util/makefile.mk
index 4b6be750c552..534171b6b76e 100644
--- a/framework/util/makefile.mk
+++ b/framework/util/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.5 $
+#   $Revision: 1.6 $
 #
-#   last change: $Author: as $ $Date: 2000-12-12 10:23:11 $
+#   last change: $Author: as $ $Date: 2000-12-13 09:19:47 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -78,19 +78,19 @@ NO_BSYMBOLIC=		TRUE
 LINKFLAGS+=/SEGMENTS:1024 /PACKD:32768
 .ENDIF
 
+# --- DLL Services ----------------------------------------------------
 
-# --- DLL BaehServices ----------------------------------------------------
+SHL1TARGET=		$(FRAMEWORK_TARGET)$(UPD)$(DLLPOSTFIX)
+SHL1IMPLIB=		i$(TARGET)$(UPD)$(DLLPOSTFIX)
 
-SHL2TARGET=		$(FRAMEWORK_TARGET)$(UPD)$(DLLPOSTFIX)
-SHL2IMPLIB=		i$(TARGET)$(UPD)$(DLLPOSTFIX)
+SHL1OBJS=		$(SLO)$/registerservices.obj
 
-SHL2OBJS=		$(SLO)$/registerservices.obj
-
-SHL2LIBS=		$(SLB)$/fwk_services.lib			\
+SHL1LIBS=		$(SLB)$/fwk_baehservices.lib		\
+                $(SLB)$/fwk_services.lib			\
                 $(SLB)$/fwk_helper.lib				\
                 $(SLB)$/fwk_classes.lib
 
-SHL2STDLIBS=	$(CPPULIB)							\
+SHL1STDLIBS=	$(CPPULIB)							\
                 $(CPPUHELPERLIB)					\
                 $(VOSLIB)							\
                 $(SALLIB)							\
@@ -102,6 +102,27 @@ SHL2STDLIBS=	$(CPPULIB)							\
                 $(SVLLIB)							\
                 $(SOTLIB)
 
+SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
+
+DEF1NAME=		$(SHL1TARGET)
+
+DEF1EXPORTFILE=	exports.dxp
+
+# --- DLL temp. light Services ----------------------------------------------------
+
+SHL2TARGET=		fwl$(UPD)$(DLLPOSTFIX)
+SHL2IMPLIB=		ifwl$(UPD)$(DLLPOSTFIX)
+
+SHL2OBJS=		$(SLO)$/registertemp.obj
+
+SHL2LIBS=		$(SLB)$/fwk_baehservices.lib
+
+SHL2STDLIBS=	$(CPPULIB)							\
+                $(CPPUHELPERLIB)					\
+                $(TOOLSLIB) 						\
+                $(SVLLIB)							\
+                $(SALLIB)
+
 SHL2DEF=		$(MISC)$/$(SHL2TARGET).def
 
 DEF2NAME=		$(SHL2TARGET)