sb132: merged in DEV300_m89

11 files changed, 311 insertions, 224 deletions

diff --git a/framework/inc/macros/debug/registration.hxx b/framework/inc/macros/debug/registration.hxx
index e8ea5a0bafe6..afb359348349 100644
--- a/framework/inc/macros/debug/registration.hxx
+++ b/framework/inc/macros/debug/registration.hxx
@@ -53,26 +53,6 @@
                     "registration.log"
     #endif
 
-    /*_____________________________________________________________________________________________________________
-        LOG_REGISTRATION_WRITEINFO( SINFOTEXT )
-
-        Write informations for component_writeInfo() in log file.
-    _____________________________________________________________________________________________________________*/
-
-    #define LOG_REGISTRATION_WRITEINFO( SINFOTEXT )                                                             \
-                {                                                                                               \
-                    ::rtl::OStringBuffer sOut( 1024 );                                                          \
-                    sOut.append( "component_writeInfo():" );                                                    \
-                    sOut.append( SINFOTEXT                );                                                    \
-                    WRITE_LOGFILE( LOGFILE_REGISTRATION, sOut.makeStringAndClear() )                            \
-                }
-
-    /*_____________________________________________________________________________________________________________
-        LOG_REGISTRATION_WRITEINFO( SINFOTEXT )
-
-        Write informations for component_getFactory() in log file.
-    _____________________________________________________________________________________________________________*/
-
     #define LOG_REGISTRATION_GETFACTORY( SINFOTEXT )                                                            \
                 {                                                                                               \
                     ::rtl::OStringBuffer sOut( 1024 );                                                          \
@@ -88,7 +68,6 @@
     _____________________________________________________________________________________________________________*/
 
     #undef  LOGFILE_REGISTRATION
-    #define LOG_REGISTRATION_WRITEINFO( SINFOTEXT )
     #define LOG_REGISTRATION_GETFACTORY( SINFOTEXT )
 
 #endif  // #ifdef ENABLE_REGISTRATIONDEBUG
diff --git a/framework/inc/macros/registration.hxx b/framework/inc/macros/registration.hxx
index 3db6761abc15..11f7c297c645 100644
--- a/framework/inc/macros/registration.hxx
+++ b/framework/inc/macros/registration.hxx
@@ -37,10 +37,8 @@
 //_________________________________________________________________________________________________________________
 //  interface includes
 //_________________________________________________________________________________________________________________
-#include <com/sun/star/registry/XRegistryKey.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/registry/InvalidRegistryException.hpp>
 
 //_________________________________________________________________________________________________________________
 //  other includes
@@ -57,67 +55,14 @@
     macros for registration of services
     Please use follow public macros only!
 
-    1)  COMPONENTINFO( CLASS )                      => use it as parameter for COMPONENT_WRITEINFO( INFOS )
-    2)  IFFACTORY( CLASS )                          => use it as parameter for COMPONENT_GETFACTORY( IFFACTORIES )
-    3)  COMPONENTGETIMPLEMENTATIONENVIRONMENT       => use it to define exported function component_getImplementationEnvironment()
-    4)  COMPONENTWRITEINFO( INFOS )                 => use it to define exported function component_writeInfo()
-    5)  COMPONENTGETFACTORY( IFFACTORIES )          => use it to define exported function component_getFactory()
+    IFFACTORY( CLASS )                          => use it as parameter for COMPONENT_GETFACTORY( IFFACTORIES )
+    COMPONENTGETIMPLEMENTATIONENVIRONMENT       => use it to define exported function component_getImplementationEnvironment()
+    COMPONENTGETFACTORY( IFFACTORIES )          => use it to define exported function component_getFactory()
 
 _________________________________________________________________________________________________________________*/
 
 //*****************************************************************************************************************
 //  public
-//  use it as parameter for COMPONENT_WRITEINFO( INFOS )
-//*****************************************************************************************************************
-
-#define COMPONENTINFO( CLASS )                                                                                                          \
-    try                                                                                                                                 \
-    {                                                                                                                                   \
-        /* Set default result of follow operations !!! */                                                                               \
-        bReturn = sal_False;                                                                                                            \
-        /* Do the follow only, if given key is valid ! */                                                                               \
-        if ( xKey.is() == sal_True )                                                                                                    \
-        {                                                                                                                               \
-            LOG_REGISTRATION_WRITEINFO( "\t\t\txKey is valid ...\n" )                                                                   \
-            /* Build new keyname    */                                                                                                  \
-            sKeyName     =  DECLARE_ASCII( "/" );                                                                                       \
-            sKeyName    +=  CLASS::impl_getStaticImplementationName();                                                                  \
-            sKeyName    +=  DECLARE_ASCII( "/UNO/SERVICES" );                                                                           \
-            LOG_REGISTRATION_WRITEINFO( "\t\t\tcreate key \"" )                                                                         \
-            LOG_REGISTRATION_WRITEINFO( U2B( sKeyName ) )                                                                               \
-            LOG_REGISTRATION_WRITEINFO( "\" ...\n" )                                                                                    \
-            /* Create new key with new name. */                                                                                         \
-             xNewKey = xKey->createKey( sKeyName );                                                                                     \
-            /* If this new key valid ... */                                                                                             \
-            if ( xNewKey.is() == sal_True )                                                                                             \
-            {                                                                                                                           \
-                LOG_REGISTRATION_WRITEINFO( "\t\t\t\ttsuccessful ...\n" )                                                               \
-                /* Get information about supported services. */                                                                         \
-                seqServiceNames =   CLASS::impl_getStaticSupportedServiceNames()    ;                                                   \
-                pArray          =   seqServiceNames.getArray()                      ;                                                   \
-                nLength         =   seqServiceNames.getLength()                     ;                                                   \
-                nCounter        =   0                                               ;                                                   \
-                /* Then set this information on this key. */                                                                            \
-                for ( nCounter = 0; nCounter < nLength; ++nCounter )                                                                    \
-                {                                                                                                                       \
-                    LOG_REGISTRATION_WRITEINFO( "\t\t\t\twrite key \"" )                                                                \
-                    LOG_REGISTRATION_WRITEINFO( U2B( pArray[nCounter] ) )                                                               \
-                    LOG_REGISTRATION_WRITEINFO( "\" to registry ...\n" )                                                                \
-                    xNewKey->createKey( pArray[nCounter] );                                                                             \
-                }                                                                                                                       \
-                /* Result of this operations = OK. */                                                                                   \
-                bReturn = sal_True ;                                                                                                    \
-            }                                                                                                                           \
-        }                                                                                                                               \
-    }                                                                                                                                   \
-    catch( ::com::sun::star::registry::InvalidRegistryException& )                                                                      \
-    {                                                                                                                                   \
-        LOG_REGISTRATION_WRITEINFO( "\n\nERROR:\nInvalidRegistryException detected\n\n" )                                               \
-        bReturn = sal_False ;                                                                                                           \
-    }
-
-//*****************************************************************************************************************
-//  public
 //  use it as parameter for COMPONENT_GETFACTORY( IFFACTORIES )
 //*****************************************************************************************************************
 #define IFFACTORY( CLASS )                                                                                                              \
@@ -144,41 +89,6 @@ ________________________________________________________________________________
 
 //*****************************************************************************************************************
 //  public
-//  define registration of service
-//*****************************************************************************************************************
-#define COMPONENTWRITEINFO( INFOS )                                                                                                     \
-    extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(  void* /*pServiceManager*/   ,                                                       \
-                                                        void*   pRegistryKey    )                                                       \
-    {                                                                                                                                   \
-        LOG_REGISTRATION_WRITEINFO( "\t[start]\n" )                                                                                     \
-        /* Set default return value for this operation - if it failed. */                                                               \
-        sal_Bool bReturn = sal_False ;                                                                                                  \
-        if ( pRegistryKey != NULL )                                                                                                     \
-        {                                                                                                                               \
-            LOG_REGISTRATION_WRITEINFO( "\t\tpRegistryKey is valid ...\n" )                                                             \
-            /* Define variables for following helper macros! */                                                                         \
-            /* bReturn will set automaticly.                 */                                                                         \
-            ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey >    xKey            ;                           \
-            ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey >    xNewKey         ;                           \
-            ::com::sun::star::uno::Sequence<  ::rtl::OUString >                             seqServiceNames ;                           \
-            const ::rtl::OUString*                                                          pArray          ;                           \
-            sal_Int32                                                                       nLength         ;                           \
-            sal_Int32                                                                       nCounter        ;                           \
-            ::rtl::OUString                                                                 sKeyName        ;                           \
-            xKey = reinterpret_cast< ::com::sun::star::registry::XRegistryKey* >( pRegistryKey );                                       \
-            /* This parameter will expand to */                                                                                         \
-            /*   "COMPONENT_INFO(a)          */                                                                                         \
-            /*    ...                        */                                                                                         \
-            /*    COMPONENT_INFO(z)"         */                                                                                         \
-            INFOS                                                                                                                       \
-        }                                                                                                                               \
-        LOG_REGISTRATION_WRITEINFO( "\t[end]\n" )                                                                                       \
-        /* Return with result of this operation. */                                                                                     \
-        return bReturn ;                                                                                                                \
-    }
-
-//*****************************************************************************************************************
-//  public
 //  define method to instanciate new services
 //*****************************************************************************************************************
 #define COMPONENTGETFACTORY( IFFACTORIES )                                                                                              \
diff --git a/framework/prj/d.lst b/framework/prj/d.lst
index fe6077f57bc8..d3a3d6dd153c 100644
--- a/framework/prj/d.lst
+++ b/framework/prj/d.lst
@@ -50,3 +50,6 @@ mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\statusbar
 
 ..\source\unotypes\fw?.xml %_DEST%\xml%_EXT%\*.xml
 
+..\%__SRC%\misc\fwk.component %_DEST%\xml%_EXT%\fwk.component
+..\%__SRC%\misc\fwl.component %_DEST%\xml%_EXT%\fwl.component
+..\%__SRC%\misc\fwm.component %_DEST%\xml%_EXT%\fwm.component
diff --git a/framework/source/register/register3rdcomponents.cxx b/framework/source/register/register3rdcomponents.cxx
index 0d93c775ff7e..86ef8c16d1ea 100644
--- a/framework/source/register/register3rdcomponents.cxx
+++ b/framework/source/register/register3rdcomponents.cxx
@@ -47,10 +47,6 @@
 
         COMPONENTGETIMPLEMENTATIONENVIRONMENT
 
-        COMPONENTWRITEINFO  (   COMPONENTINFO( Service1 )
-                                 COMPONENTINFO( Service2 )
-                            )
-
         COMPONENTGETFACTORY (   IFFACTORIE( Service1 )
                                  else
                                 IFFACTORIE( Service2 )
@@ -63,12 +59,6 @@
 
 COMPONENTGETIMPLEMENTATIONENVIRONMENT
 
-COMPONENTWRITEINFO  (   COMPONENTINFO( ::framework::HelpOnStartup   )
-                        COMPONENTINFO( ::framework::TabWinFactory   )
-                        COMPONENTINFO( ::framework::SystemExec      )
-                        COMPONENTINFO( ::framework::ShellJob        )
-                    )
-
 COMPONENTGETFACTORY (   IFFACTORY( ::framework::HelpOnStartup       ) else
                         IFFACTORY( ::framework::TabWinFactory       ) else
                         IFFACTORY( ::framework::SystemExec          ) else
diff --git a/framework/source/register/registerlogindialog.cxx b/framework/source/register/registerlogindialog.cxx
index 55e13252570f..0a7e08c8c93a 100644
--- a/framework/source/register/registerlogindialog.cxx
+++ b/framework/source/register/registerlogindialog.cxx
@@ -48,10 +48,6 @@
 
         COMPONENTGETIMPLEMENTATIONENVIRONMENT
 
-        COMPONENTWRITEINFO  (   COMPONENTINFO( Service1 )
-                                 COMPONENTINFO( Service2 )
-                            )
-
         COMPONENTGETFACTORY (   IFFACTORIE( Service1 )
                                  else
                                 IFFACTORIE( Service2 )
@@ -64,8 +60,5 @@
 
 COMPONENTGETIMPLEMENTATIONENVIRONMENT
 
-COMPONENTWRITEINFO  (   COMPONENTINFO( ::framework::LoginDialog )
-                    )
-
 COMPONENTGETFACTORY (   IFFACTORY( ::framework::LoginDialog     )
                     )
diff --git a/framework/source/register/registerservices.cxx b/framework/source/register/registerservices.cxx
index 6e3fa878bbb1..4f078d9ab50d 100644
--- a/framework/source/register/registerservices.cxx
+++ b/framework/source/register/registerservices.cxx
@@ -47,10 +47,6 @@
 
         COMPONENTGETIMPLEMENTATIONENVIRONMENT
 
-        COMPONENTWRITEINFO  (   COMPONENTINFO( Service1 )
-                                 COMPONENTINFO( Service2 )
-                            )
-
         COMPONENTGETFACTORY (   IFFACTORIE( Service1 )
                                  else
                                 IFFACTORIE( Service2 )
@@ -117,66 +113,6 @@
 
 COMPONENTGETIMPLEMENTATIONENVIRONMENT
 
-COMPONENTWRITEINFO  (   COMPONENTINFO( ::framework::URLTransformer                          )
-                        COMPONENTINFO( ::framework::Desktop                                 )
-                        COMPONENTINFO( ::framework::Frame                                   )
-                        //COMPONENTINFO( ::framework::Oxt_Handler                             )
-                        COMPONENTINFO( ::framework::JobExecutor                             )
-                        //COMPONENTINFO( ::framework::DispatchRecorderSupplier                )
-                        //COMPONENTINFO( ::framework::DispatchRecorder                        )
-                        //COMPONENTINFO( ::framework::MailToDispatcher                        )
-                        //COMPONENTINFO( ::framework::ServiceHandler                          )
-                        COMPONENTINFO( ::framework::JobDispatch                             )
-                        COMPONENTINFO( ::framework::BackingComp                             )
-                        //COMPONENTINFO( ::framework::DispatchHelper                          )
-                        COMPONENTINFO( ::framework::LayoutManager                           )
-                        //COMPONENTINFO( ::framework::License                                 )
-                        COMPONENTINFO( ::framework::UIElementFactoryManager                 )
-                        COMPONENTINFO( ::framework::PopupMenuControllerFactory              )
-                        //COMPONENTINFO( ::framework::FontMenuController                      )
-                        //COMPONENTINFO( ::framework::FontSizeMenuController                  )
-                        COMPONENTINFO( ::framework::ObjectMenuController                    )
-                        //COMPONENTINFO( ::framework::HeaderMenuController                    )
-                        //COMPONENTINFO( ::framework::FooterMenuController                    )
-                        COMPONENTINFO( ::framework::ControlMenuController                   )
-                        //COMPONENTINFO( ::framework::MacrosMenuController                    )
-                        COMPONENTINFO( ::framework::UICommandDescription                    )
-                        COMPONENTINFO( ::framework::ModuleManager                           )
-                        COMPONENTINFO( ::framework::UIConfigurationManager                  )
-                        COMPONENTINFO( ::framework::ModuleUIConfigurationManagerSupplier    )
-                        COMPONENTINFO( ::framework::ModuleUIConfigurationManager            )
-                        COMPONENTINFO( ::framework::MenuBarFactory                          )
-                        COMPONENTINFO( ::framework::GlobalAcceleratorConfiguration          )
-                        COMPONENTINFO( ::framework::ModuleAcceleratorConfiguration          )
-                        COMPONENTINFO( ::framework::DocumentAcceleratorConfiguration        )
-                        COMPONENTINFO( ::framework::ToolBoxFactory                          )
-                        COMPONENTINFO( ::framework::AddonsToolBoxFactory                    )
-                        COMPONENTINFO( ::framework::WindowStateConfiguration                )
-                        COMPONENTINFO( ::framework::ToolbarControllerFactory                )
-                        //COMPONENTINFO( ::framework::ToolbarsMenuController                  )
-                        COMPONENTINFO( ::framework::AutoRecovery                            )
-                        COMPONENTINFO( ::framework::StatusIndicatorFactory                  )
-                        COMPONENTINFO( ::framework::RecentFilesMenuController               )
-                        COMPONENTINFO( ::framework::StatusBarFactory                        )
-                        COMPONENTINFO( ::framework::UICategoryDescription                   )
-                        COMPONENTINFO( ::framework::StatusbarControllerFactory              )
-                        COMPONENTINFO( ::framework::SessionListener                         )
-                        //COMPONENTINFO( ::framework::LogoImageStatusbarController            )
-                        //COMPONENTINFO( ::framework::LogoTextStatusbarController             )
-                        //COMPONENTINFO( ::framework::NewMenuController                       )
-                        COMPONENTINFO( ::framework::TaskCreatorService                      )
-                        //COMPONENTINFO( ::framework::SimpleTextStatusbarController           )
-                        //COMPONENTINFO( ::framework::UriAbbreviation                         )
-                        //COMPONENTINFO( ::framework::PopupMenuDispatcher                     )
-                        COMPONENTINFO( ::framework::ImageManager                            )
-                        COMPONENTINFO( ::framework::LangSelectionStatusbarController        )
-                        //COMPONENTINFO( ::framework::LanguageSelectionMenuController         )
-                        //COMPONENTINFO( ::framework::TabWindowService                        )
-                        COMPONENTINFO( ::framework::WindowContentFactoryManager             )
-                        COMPONENTINFO( ::framework::SubstitutePathVariables     )
-                        COMPONENTINFO( ::framework::PathSettings                )
-                    )
-
 COMPONENTGETFACTORY (   IFFACTORY( ::framework::URLTransformer                          )   else
                         IFFACTORY( ::framework::Desktop                                 )   else
                         IFFACTORY( ::framework::Frame                                   )   else
diff --git a/framework/source/register/registertemp.cxx b/framework/source/register/registertemp.cxx
index 7382380ef525..111b3550559d 100644
--- a/framework/source/register/registertemp.cxx
+++ b/framework/source/register/registertemp.cxx
@@ -47,10 +47,6 @@
 
         COMPONENTGETIMPLEMENTATIONENVIRONMENT
 
-        COMPONENTWRITEINFO  (   COMPONENTINFO( Service1 )
-                                 COMPONENTINFO( Service2 )
-                            )
-
         COMPONENTGETFACTORY (   IFFACTORIE( Service1 )
                                  else
                                 IFFACTORIE( Service2 )
@@ -82,31 +78,6 @@
 
 COMPONENTGETIMPLEMENTATIONENVIRONMENT
 
-COMPONENTWRITEINFO  (   COMPONENTINFO( ::framework::MediaTypeDetectionHelper    )
-                        COMPONENTINFO( ::framework::MailToDispatcher                        )
-                        COMPONENTINFO( ::framework::NewMenuController                       )
-                        COMPONENTINFO( ::framework::ToolbarsMenuController                  )
-                        COMPONENTINFO( ::framework::MacrosMenuController                    )
-                        COMPONENTINFO( ::framework::FontSizeMenuController                  )
-                        COMPONENTINFO( ::framework::HeaderMenuController                    )
-                        COMPONENTINFO( ::framework::FooterMenuController                    )
-                        COMPONENTINFO( ::framework::FontMenuController                      )
-                        COMPONENTINFO( ::framework::ServiceHandler                          )
-                        COMPONENTINFO( ::framework::LogoImageStatusbarController            )
-                        COMPONENTINFO( ::framework::LogoTextStatusbarController             )
-                        COMPONENTINFO( ::framework::SimpleTextStatusbarController           )
-                        COMPONENTINFO( ::framework::UriAbbreviation                         )
-                        COMPONENTINFO( ::framework::LanguageSelectionMenuController         )
-                        COMPONENTINFO( ::framework::PopupMenuDispatcher                     )
-                        COMPONENTINFO( ::framework::DispatchHelper                          )
-                        COMPONENTINFO( ::framework::TabWindowService                        )
-                        COMPONENTINFO( ::framework::DispatchRecorder                        )
-                        COMPONENTINFO( ::framework::DispatchRecorderSupplier                )
-                        COMPONENTINFO( ::framework::Oxt_Handler                             )
-                        COMPONENTINFO( ::framework::License                                 )
-                        COMPONENTINFO( ::framework::PopupMenuController                     )
-                    )
-
 COMPONENTGETFACTORY (   IFFACTORY( ::framework::MediaTypeDetectionHelper        )
                         IFFACTORY( ::framework::MailToDispatcher                        ) else
                         IFFACTORY( ::framework::ServiceHandler                          )   else
diff --git a/framework/util/fwk.component b/framework/util/fwk.component
new file mode 100644
index 000000000000..e6ceb91e8090
--- /dev/null
+++ b/framework/util/fwk.component
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org 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 version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.frame.SessionListener">
+    <service name="com.sun.star.frame.SessionListener"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.AddonsToolBarFactory">
+    <service name="com.sun.star.ui.ToolBarFactory"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.AutoRecovery">
+    <service name="com.sun.star.frame.AutoRecovery"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.BackingComp">
+    <service name="com.sun.star.frame.StartModule"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.ControlMenuController">
+    <service name="com.sun.star.frame.PopupMenuController"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.Desktop">
+    <service name="com.sun.star.frame.Desktop"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.DocumentAcceleratorConfiguration">
+    <service name="com.sun.star.ui.DocumentAcceleratorConfiguration"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.Frame">
+    <service name="com.sun.star.frame.Frame"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.GlobalAcceleratorConfiguration">
+    <service name="com.sun.star.ui.GlobalAcceleratorConfiguration"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.ImageManager">
+    <service name="com.sun.star.ui.ImageManager"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.JobExecutor">
+    <service name="com.sun.star.task.JobExecutor"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.LangSelectionStatusbarController">
+    <service name="com.sun.star.frame.StatusbarController"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.LayoutManager">
+    <service name="com.sun.star.frame.LayoutManager"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.MenuBarFactory">
+    <service name="com.sun.star.ui.UIElementFactory"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.ModuleAcceleratorConfiguration">
+    <service name="com.sun.star.ui.ModuleAcceleratorConfiguration"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.ModuleManager">
+    <service name="com.sun.star.frame.ModuleManager"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.ModuleUIConfigurationManager">
+    <service name="com.sun.star.ui.ModuleUIConfigurationManager"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.ModuleUIConfigurationManagerSupplier">
+    <service name="com.sun.star.ui.ModuleUIConfigurationManagerSupplier"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.ObjectMenuController">
+    <service name="com.sun.star.frame.PopupMenuController"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.PathSettings">
+    <service name="com.sun.star.util.PathSettings"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.PathSubstitution">
+    <service name="com.sun.star.util.PathSubstitution"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.PopupMenuControllerFactory">
+    <service name="com.sun.star.frame.PopupMenuControllerFactory"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.RecentFilesMenuController">
+    <service name="com.sun.star.frame.PopupMenuController"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.StatusBarControllerFactory">
+    <service name="com.sun.star.frame.StatusbarControllerFactory"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.StatusBarFactory">
+    <service name="com.sun.star.ui.StatusBarFactory"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.StatusIndicatorFactory">
+    <service name="com.sun.star.task.StatusIndicatorFactory"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.TaskCreator">
+    <service name="com.sun.star.frame.TaskCreator"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.ToolBarControllerFactory">
+    <service name="com.sun.star.frame.ToolBarControllerFactory"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.ToolBarFactory">
+    <service name="com.sun.star.ui.ToolBarFactory"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.UICategoryDescription">
+    <service name="com.sun.star.ui.UICategoryDescription"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.UICommandDescription">
+    <service name="com.sun.star.frame.UICommandDescription"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.UIConfigurationManager">
+    <service name="com.sun.star.ui.UIConfigurationManager"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.UIElementFactoryManager">
+    <service name="com.sun.star.ui.UIElementFactoryManager"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.URLTransformer">
+    <service name="com.sun.star.util.URLTransformer"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.WindowContentFactoryManager">
+    <service name="com.sun.star.ui.WindowContentFactoryManager"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.WindowStateConfiguration">
+    <service name="com.sun.star.ui.WindowStateConfiguration"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.jobs.JobDispatch">
+    <service name="com.sun.star.frame.ProtocolHandler"/>
+  </implementation>
+</component>
diff --git a/framework/util/fwl.component b/framework/util/fwl.component
new file mode 100644
index 000000000000..aa124d1cdc4b
--- /dev/null
+++ b/framework/util/fwl.component
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org 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 version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sum.star.comp.framework.LanguageSelectionMenuController">
+    <service name="com.sun.star.frame.PopupMenuController"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.DispatchRecorder">
+    <service name="com.sun.star.frame.DispatchRecorder"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.DispatchRecorderSupplier">
+    <service name="com.sun.star.frame.DispatchRecorderSupplier"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.FontMenuController">
+    <service name="com.sun.star.frame.PopupMenuController"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.FontSizeMenuController">
+    <service name="com.sun.star.frame.PopupMenuController"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.FooterMenuController">
+    <service name="com.sun.star.frame.PopupMenuController"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.HeaderMenuController">
+    <service name="com.sun.star.frame.PopupMenuController"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.License">
+    <service name="com.sun.star.task.Job"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.LogoImageStatusbarController">
+    <service name="com.sun.star.frame.StatusbarController"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.LogoTextStatusbarController">
+    <service name="com.sun.star.frame.StatusbarController"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.MacrosMenuController">
+    <service name="com.sun.star.frame.PopupMenuController"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.MailToDispatcher">
+    <service name="com.sun.star.frame.ProtocolHandler"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.MediaTypeDetectionHelper">
+    <service name="com.sun.star.frame.MediaTypeDetectionHelper"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.NewMenuController">
+    <service name="com.sun.star.frame.PopupMenuController"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.OXTFileHandler">
+    <service name="com.sun.star.frame.ContentHandler"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.PopupMenuController">
+    <service name="com.sun.star.frame.ToolbarController"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.PopupMenuControllerDispatcher">
+    <service name="com.sun.star.frame.ProtocolHandler"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.ServiceHandler">
+    <service name="com.sun.star.frame.ProtocolHandler"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.SimpleTextStatusbarController">
+    <service name="com.sun.star.frame.StatusbarController"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.TabWindowService">
+    <service name="com.sun.star.ui.dialogs.TabContainerWindow"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.ToolBarsMenuController">
+    <service name="com.sun.star.frame.PopupMenuController"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.UriAbbreviation">
+    <service name="com.sun.star.util.UriAbbreviation"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.services.DispatchHelper">
+    <service name="com.sun.star.frame.DispatchHelper"/>
+  </implementation>
+</component>
diff --git a/framework/util/fwm.component b/framework/util/fwm.component
new file mode 100644
index 000000000000..624249ff4382
--- /dev/null
+++ b/framework/util/fwm.component
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org 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 version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.framework.HelpOnStartup">
+    <service name="com.sun.star.task.Job"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.ShellJob">
+    <service name="com.sun.star.task.Job"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.SystemExecute">
+    <service name="com.sun.star.frame.ProtocolHandler"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.TabWindowFactory">
+    <service name="com.sun.star.frame.TabWindowFactory"/>
+  </implementation>
+</component>
diff --git a/framework/util/makefile.mk b/framework/util/makefile.mk
index edc5f67ce60a..a3f14341d3f3 100644
--- a/framework/util/makefile.mk
+++ b/framework/util/makefile.mk
@@ -423,3 +423,23 @@ $(MISC)$/$(SHL2TARGET).flt: makefile.mk
     @echo _TI2>>$@
     @echo LIBMAIN>>$@
     @echo LibMain>>$@
+
+ALLTAR : $(MISC)/fwk.component $(MISC)/fwl.component $(MISC)/fwm.component
+
+$(MISC)/fwk.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        fwk.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL4TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt fwk.component
+
+$(MISC)/fwl.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        fwl.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL3TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt fwl.component
+
+$(MISC)/fwm.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        fwm.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL5TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt fwm.component