INTEGRATION: CWS docking1 (1.1.2); FILE ADDED

2004/05/12 08:31:31 cd 1.1.2.1: #i26252# Added toolbar controller factory

1 files changed, 613 insertions, 0 deletions

diff --git a/framework/source/uifactory/toolbarcontrollerfactory.cxx b/framework/source/uifactory/toolbarcontrollerfactory.cxx
new file mode 100644
index 000000000000..5df64331ff34
--- /dev/null
+++ b/framework/source/uifactory/toolbarcontrollerfactory.cxx
@@ -0,0 +1,613 @@
+/*************************************************************************
+ *
+ *  $RCSfile: toolbarcontrollerfactory.cxx,v $
+ *
+ *  $Revision: 1.2 $
+ *
+ *  last change: $Author: obo $ $Date: 2004-07-06 17:03:08 $
+ *
+ *  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): _______________________________________
+ *
+ *
+ ************************************************************************/
+
+//_________________________________________________________________________________________________________________
+//  my own includes
+//_________________________________________________________________________________________________________________
+
+#ifndef __FRAMEWORK_UIFACTORY_TOOLBARCONTROLLERFACTORY_HXX_
+#include "uifactory/toolbarcontrollerfactory.hxx"
+#endif
+
+#ifndef __FRAMEWORK_THREADHELP_RESETABLEGUARD_HXX_
+#include <threadhelp/resetableguard.hxx>
+#endif
+
+#ifndef __FRAMEWORK_SERVICES_H_
+#include "services.h"
+#endif
+
+//_________________________________________________________________________________________________________________
+//  interface includes
+//_________________________________________________________________________________________________________________
+
+#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_
+#include <com/sun/star/beans/PropertyValue.hpp>
+#endif
+
+#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_
+#include <com/sun/star/beans/XPropertySet.hpp>
+#endif
+
+#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_
+#include <com/sun/star/container/XNameAccess.hpp>
+#endif
+
+#ifndef _COM_SUN_STAR_CONTAINER_XNAMECONTAINER_HPP_
+#include <com/sun/star/container/XNameContainer.hpp>
+#endif
+
+#ifndef _COM_SUN_STAR_CONTAINER_XCONTAINER_HPP_
+#include <com/sun/star/container/XContainer.hpp>
+#endif
+
+//_________________________________________________________________________________________________________________
+//  includes of other projects
+//_________________________________________________________________________________________________________________
+
+#ifndef _RTL_USTRBUF_HXX_
+#include <rtl/ustrbuf.hxx>
+#endif
+
+#ifndef _CPPUHELPER_WEAK_HXX_
+#include <cppuhelper/weak.hxx>
+#endif
+
+//_________________________________________________________________________________________________________________
+//  Defines
+//_________________________________________________________________________________________________________________
+//
+
+using namespace com::sun::star::uno;
+using namespace com::sun::star::lang;
+using namespace com::sun::star::beans;
+using namespace com::sun::star::container;
+using namespace drafts::com::sun::star::frame;
+
+//_________________________________________________________________________________________________________________
+//  Namespace
+//_________________________________________________________________________________________________________________
+//
+
+namespace framework
+{
+
+// global function needed by both implementations
+static rtl::OUString getHashKeyFromStrings( const rtl::OUString& aCommandURL, const rtl::OUString& aModuleName )
+{
+    rtl::OUStringBuffer aKey( aCommandURL );
+    aKey.appendAscii( "-" );
+    aKey.append( aModuleName );
+    return aKey.makeStringAndClear();
+}
+
+
+//*****************************************************************************************************************
+//  Configuration access class for ToolbarControllerFactory implementation
+//*****************************************************************************************************************
+
+class ConfigurationAccess_ToolbarControllerFactory : // interfaces
+                                                       public  XTypeProvider                            ,
+                                                       public  XContainerListener                       ,
+                                                       // baseclasses
+                                                       // Order is neccessary for right initialization!
+                                                       private ThreadHelpBase                           ,
+                                                       public  ::cppu::OWeakObject
+{
+    public:
+        DECLARE_XINTERFACE
+        DECLARE_XTYPEPROVIDER
+
+                      ConfigurationAccess_ToolbarControllerFactory( Reference< XMultiServiceFactory >& rServiceManager );
+        virtual       ~ConfigurationAccess_ToolbarControllerFactory();
+
+        void          readConfigurationData();
+
+        rtl::OUString getServiceFromCommandModule( const rtl::OUString& rCommandURL, const rtl::OUString& rModule ) const;
+        void          addServiceToCommandModule( const rtl::OUString& rCommandURL, const rtl::OUString& rModule, const rtl::OUString& rServiceSpecifier );
+        void          removeServiceFromCommandModule( const rtl::OUString& rCommandURL, const rtl::OUString& rModule );
+
+        // container.XContainerListener
+        virtual void SAL_CALL elementInserted( const ContainerEvent& aEvent ) throw(RuntimeException);
+        virtual void SAL_CALL elementRemoved ( const ContainerEvent& aEvent ) throw(RuntimeException);
+        virtual void SAL_CALL elementReplaced( const ContainerEvent& aEvent ) throw(RuntimeException);
+
+        // lang.XEventListener
+        virtual void SAL_CALL disposing( const EventObject& aEvent ) throw(RuntimeException);
+
+    private:
+        class ToolbarControllerMap : public std::hash_map< rtl::OUString,
+                                                             rtl::OUString,
+                                                             OUStringHashCode,
+                                                             ::std::equal_to< ::rtl::OUString > >
+        {
+            inline void free()
+            {
+                ToolbarControllerMap().swap( *this );
+            }
+        };
+
+        sal_Bool impl_getElementProps( const Any& aElement, rtl::OUString& aCommand, rtl::OUString aModule, rtl::OUString& aServiceSpecifier ) const;
+
+        rtl::OUString                     m_aPropCommand;
+        rtl::OUString                     m_aPropModule;
+        rtl::OUString                     m_aPropController;
+        ToolbarControllerMap              m_aToolbarControllerMap;
+        Reference< XMultiServiceFactory > m_xServiceManager;
+        Reference< XMultiServiceFactory > m_xConfigProvider;
+        Reference< XNameAccess >          m_xConfigAccess;
+        sal_Bool                          m_bConfigAccessInitialized;
+};
+
+//*****************************************************************************************************************
+//  XInterface, XTypeProvider
+//*****************************************************************************************************************
+DEFINE_XINTERFACE_3     (   ConfigurationAccess_ToolbarControllerFactory                      ,
+                            OWeakObject                                                         ,
+                            DIRECT_INTERFACE ( XTypeProvider                                    ),
+                            DIRECT_INTERFACE ( XContainerListener                               ),
+                            DERIVED_INTERFACE( css::lang::XEventListener, XContainerListener    )
+                        )
+
+DEFINE_XTYPEPROVIDER_3  (   ConfigurationAccess_ToolbarControllerFactory  ,
+                            XTypeProvider                                   ,
+                            XContainerListener                              ,
+                            css::lang::XEventListener
+                        )
+
+ConfigurationAccess_ToolbarControllerFactory::ConfigurationAccess_ToolbarControllerFactory( Reference< XMultiServiceFactory >& rServiceManager ) :
+    ThreadHelpBase(),
+    m_xServiceManager( rServiceManager ),
+    m_aPropCommand( RTL_CONSTASCII_USTRINGPARAM( "Command" )),
+    m_aPropModule( RTL_CONSTASCII_USTRINGPARAM( "Module" )),
+    m_aPropController( RTL_CONSTASCII_USTRINGPARAM( "Controller" )),
+    m_bConfigAccessInitialized( sal_False )
+{
+    m_xConfigProvider = Reference< XMultiServiceFactory >( rServiceManager->createInstance(
+                                                                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
+                                                                    "com.sun.star.configuration.ConfigurationProvider" ))),
+                                                           UNO_QUERY );
+}
+
+ConfigurationAccess_ToolbarControllerFactory::~ConfigurationAccess_ToolbarControllerFactory()
+{
+    // SAFE
+    ResetableGuard aLock( m_aLock );
+
+    Reference< XContainer > xContainer( m_xConfigAccess, UNO_QUERY );
+    if ( xContainer.is() )
+        xContainer->removeContainerListener( this );
+}
+
+rtl::OUString ConfigurationAccess_ToolbarControllerFactory::getServiceFromCommandModule( const rtl::OUString& rCommandURL, const rtl::OUString& rModule ) const
+{
+    // SAFE
+    ResetableGuard aLock( m_aLock );
+
+    ToolbarControllerMap::const_iterator pIter =
+        m_aToolbarControllerMap.find( getHashKeyFromStrings( rCommandURL, rModule ));
+
+    if ( pIter != m_aToolbarControllerMap.end() )
+        return pIter->second;
+    else
+    {
+        // Try to detect if we have a generic popup menu controller
+        pIter = m_aToolbarControllerMap.find( getHashKeyFromStrings( rCommandURL, rtl::OUString() ));
+
+        if ( pIter != m_aToolbarControllerMap.end() )
+            return pIter->second;
+    }
+
+    return rtl::OUString();
+}
+
+void ConfigurationAccess_ToolbarControllerFactory::addServiceToCommandModule(
+    const rtl::OUString& rCommandURL,
+    const rtl::OUString& rModule,
+    const rtl::OUString& rServiceSpecifier )
+{
+    // SAFE
+    ResetableGuard aLock( m_aLock );
+
+    rtl::OUString aHashKey = getHashKeyFromStrings( rCommandURL, rModule );
+    m_aToolbarControllerMap.insert( ToolbarControllerMap::value_type( aHashKey, rServiceSpecifier ));
+}
+
+void ConfigurationAccess_ToolbarControllerFactory::removeServiceFromCommandModule(
+    const rtl::OUString& rCommandURL,
+    const rtl::OUString& rModule )
+{
+    // SAFE
+    ResetableGuard aLock( m_aLock );
+
+    rtl::OUString aHashKey = getHashKeyFromStrings( rCommandURL, rModule );
+    m_aToolbarControllerMap.erase( aHashKey );
+}
+
+// container.XContainerListener
+void SAL_CALL ConfigurationAccess_ToolbarControllerFactory::elementInserted( const ContainerEvent& aEvent ) throw(RuntimeException)
+{
+    rtl::OUString   aCommand;
+    rtl::OUString   aModule;
+    rtl::OUString   aService;
+
+    // SAFE
+    ResetableGuard aLock( m_aLock );
+
+    if ( impl_getElementProps( aEvent.Element, aCommand, aModule, aService ))
+    {
+        // Create hash key from command and module as they are together a primary key to
+        // the UNO service that implements the popup menu controller.
+        rtl::OUString aHashKey( getHashKeyFromStrings( aCommand, aModule ));
+        m_aToolbarControllerMap.insert( ToolbarControllerMap::value_type( aHashKey, aService ));
+    }
+}
+
+void SAL_CALL ConfigurationAccess_ToolbarControllerFactory::elementRemoved ( const ContainerEvent& aEvent ) throw(RuntimeException)
+{
+    rtl::OUString   aCommand;
+    rtl::OUString   aModule;
+    rtl::OUString   aService;
+
+    // SAFE
+    ResetableGuard aLock( m_aLock );
+
+    if ( impl_getElementProps( aEvent.Element, aCommand, aModule, aService ))
+    {
+        // Create hash key from command and module as they are together a primary key to
+        // the UNO service that implements the popup menu controller.
+        rtl::OUString aHashKey( getHashKeyFromStrings( aCommand, aModule ));
+        m_aToolbarControllerMap.erase( aHashKey );
+    }
+}
+
+void SAL_CALL ConfigurationAccess_ToolbarControllerFactory::elementReplaced( const ContainerEvent& aEvent ) throw(RuntimeException)
+{
+    rtl::OUString   aCommand;
+    rtl::OUString   aModule;
+    rtl::OUString   aService;
+
+    // SAFE
+    ResetableGuard aLock( m_aLock );
+
+    if ( impl_getElementProps( aEvent.Element, aCommand, aModule, aService ))
+    {
+        // Create hash key from command and module as they are together a primary key to
+        // the UNO service that implements the popup menu controller.
+        rtl::OUString aHashKey( getHashKeyFromStrings( aCommand, aModule ));
+        m_aToolbarControllerMap.erase( aHashKey );
+        m_aToolbarControllerMap.insert( ToolbarControllerMap::value_type( aHashKey, aService ));
+    }
+}
+
+// lang.XEventListener
+void SAL_CALL ConfigurationAccess_ToolbarControllerFactory::disposing( const EventObject& aEvent ) throw(RuntimeException)
+{
+    // SAFE
+    // remove our reference to the config access
+    ResetableGuard aLock( m_aLock );
+    m_xConfigAccess.clear();
+}
+
+void ConfigurationAccess_ToolbarControllerFactory::readConfigurationData()
+{
+    // SAFE
+    ResetableGuard aLock( m_aLock );
+
+    if ( !m_bConfigAccessInitialized )
+    {
+        Sequence< Any > aArgs( 1 );
+        PropertyValue   aPropValue;
+
+        aPropValue.Name  = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" ));
+        aPropValue.Value <<= rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.UI.Controller/Registered/ToolBar" ));
+        aArgs[0] <<= aPropValue;
+
+        try
+        {
+            m_xConfigAccess = Reference< XNameAccess >( m_xConfigProvider->createInstanceWithArguments(
+                                                                                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
+                                                                                    "com.sun.star.configuration.ConfigurationAccess" )),
+                                                                                aArgs ),
+                                                                            UNO_QUERY );
+        }
+        catch ( WrappedTargetException& )
+        {
+        }
+
+        m_bConfigAccessInitialized = sal_True;
+    }
+
+    if ( m_xConfigAccess.is() )
+    {
+        Sequence< rtl::OUString >   aToolbarControllers = m_xConfigAccess->getElementNames();
+
+        Any a;
+        rtl::OUString             aCommand;
+        rtl::OUString             aModule;
+        rtl::OUString             aService;
+        rtl::OUString             aHashKey;
+        Reference< XPropertySet > xPropertySet;
+        for ( sal_Int32 i = 0; i < aToolbarControllers.getLength(); i++ )
+        {
+            if ( impl_getElementProps( m_xConfigAccess->getByName( aToolbarControllers[i] ), aCommand, aModule, aService ))
+            {
+                // Create hash key from command and module as they are together a primary key to
+                // the UNO service that implements the popup menu controller.
+                aHashKey = getHashKeyFromStrings( aCommand, aModule );
+                m_aToolbarControllerMap.insert( ToolbarControllerMap::value_type( aHashKey, aService ));
+            }
+        }
+
+        // UNSAFE
+        aLock.unlock();
+
+        Reference< XContainer > xContainer( m_xConfigAccess, UNO_QUERY );
+        if ( xContainer.is() )
+            xContainer->addContainerListener( this );
+    }
+}
+
+sal_Bool ConfigurationAccess_ToolbarControllerFactory::impl_getElementProps( const Any& aElement, rtl::OUString& aCommand, rtl::OUString aModule, rtl::OUString& aServiceSpecifier ) const
+{
+    Reference< XPropertySet > xPropertySet;
+    aElement >>= xPropertySet;
+
+    if ( xPropertySet.is() )
+    {
+        try
+        {
+            xPropertySet->getPropertyValue( m_aPropCommand ) >>= aCommand;
+            xPropertySet->getPropertyValue( m_aPropModule ) >>= aModule;
+            xPropertySet->getPropertyValue( m_aPropController ) >>= aServiceSpecifier;
+        }
+        catch ( com::sun::star::beans::UnknownPropertyException& )
+        {
+            return sal_False;
+        }
+        catch ( com::sun::star::lang::WrappedTargetException& )
+        {
+            return sal_False;
+        }
+    }
+
+    return sal_True;
+}
+
+//*****************************************************************************************************************
+//  XInterface, XTypeProvider, XServiceInfo
+//*****************************************************************************************************************
+DEFINE_XINTERFACE_4                    (    ToolbarControllerFactory                                                      ,
+                                            OWeakObject                                                                     ,
+                                            DIRECT_INTERFACE( css::lang::XTypeProvider                                      ),
+                                            DIRECT_INTERFACE( css::lang::XServiceInfo                                       ),
+                                            DIRECT_INTERFACE( css::lang::XMultiComponentFactory                             ),
+                                            DIRECT_INTERFACE( drafts::com::sun::star::frame::XUIControllerRegistration    )
+                                        )
+
+DEFINE_XTYPEPROVIDER_4                  (   ToolbarControllerFactory            ,
+                                            css::lang::XTypeProvider            ,
+                                            css::lang::XServiceInfo             ,
+                                            css::lang::XMultiComponentFactory   ,
+                                            drafts::com::sun::star::frame::XUIControllerRegistration
+                                        )
+
+DEFINE_XSERVICEINFO_ONEINSTANCESERVICE  (   ToolbarControllerFactory                        ,
+                                            ::cppu::OWeakObject                             ,
+                                            SERVICENAME_TOOLBARCONTROLLERFACTORY            ,
+                                            IMPLEMENTATIONNAME_TOOLBARCONTROLLERFACTORY
+                                        )
+
+DEFINE_INIT_SERVICE                     (   ToolbarControllerFactory, {} )
+
+ToolbarControllerFactory::ToolbarControllerFactory( const Reference< XMultiServiceFactory >& xServiceManager ) :
+    ThreadHelpBase(),
+    m_xServiceManager( xServiceManager ),
+    m_bConfigRead( sal_False )
+{
+    m_pConfigAccess = new ConfigurationAccess_ToolbarControllerFactory( m_xServiceManager );
+    m_pConfigAccess->acquire();
+}
+
+ToolbarControllerFactory::~ToolbarControllerFactory()
+{
+    ResetableGuard aLock( m_aLock );
+
+    // reduce reference count
+    m_pConfigAccess->release();
+}
+
+// XMultiComponentFactory
+Reference< XInterface > SAL_CALL ToolbarControllerFactory::createInstanceWithContext(
+    const ::rtl::OUString& aServiceSpecifier,
+    const Reference< XComponentContext >& Context )
+throw (Exception, RuntimeException)
+{
+    // SAFE
+    ResetableGuard aLock( m_aLock );
+
+    if ( !m_bConfigRead )
+    {
+        m_bConfigRead = sal_True;
+        m_pConfigAccess->readConfigurationData();
+    }
+
+    rtl::OUString aServiceName = m_pConfigAccess->getServiceFromCommandModule( aServiceSpecifier, rtl::OUString() );
+    if ( aServiceName.getLength() > 0 )
+        return m_xServiceManager->createInstance( aServiceName );
+    else
+        return Reference< XInterface >();
+    // SAFE
+}
+
+Reference< XInterface > SAL_CALL ToolbarControllerFactory::createInstanceWithArgumentsAndContext(
+    const ::rtl::OUString&                  ServiceSpecifier,
+    const Sequence< Any >&                  Arguments,
+    const Reference< XComponentContext >&   Context )
+throw (Exception, RuntimeException)
+{
+    const rtl::OUString aPropModuleName( RTL_CONSTASCII_USTRINGPARAM( "ModuleName" ));
+
+    rtl::OUString   aPropName;
+    PropertyValue   aPropValue;
+
+    // Retrieve the optional module name form the Arguments sequence. It is used as a part of
+    // the hash map key to support different controller implementation for the same URL but different
+    // module!!
+    for ( int i = 0; i < Arguments.getLength(); i++ )
+    {
+        if (( Arguments[i] >>= aPropValue ) && ( aPropValue.Name.equals( aPropModuleName )))
+        {
+            aPropValue.Value >>= aPropName;
+            break;
+        }
+    }
+
+    // Append the command URL to the Arguments sequence so that one controller can be
+    // used for more than one command URL.
+    Sequence< Any > aNewArgs( Arguments );
+
+    sal_Int32 nAppendIndex = aNewArgs.getLength();
+    aNewArgs.realloc( aNewArgs.getLength()+1 );
+    aPropValue.Name     = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CommandURL" ));
+    aPropValue.Value  <<= ServiceSpecifier;
+    aNewArgs[nAppendIndex] <<= aPropValue;
+
+    // SAFE
+    {
+        ResetableGuard aLock( m_aLock );
+
+        if ( !m_bConfigRead )
+        {
+            m_bConfigRead = sal_True;
+            m_pConfigAccess->readConfigurationData();
+        }
+
+        rtl::OUString aServiceName = m_pConfigAccess->getServiceFromCommandModule( ServiceSpecifier, aPropName );
+        if ( aServiceName.getLength() > 0 )
+            return m_xServiceManager->createInstanceWithArguments( aServiceName, aNewArgs );
+        else
+            return Reference< XInterface >();
+    }
+    // SAFE
+}
+
+Sequence< ::rtl::OUString > SAL_CALL ToolbarControllerFactory::getAvailableServiceNames()
+throw (RuntimeException)
+{
+    return Sequence< ::rtl::OUString >();
+}
+
+// XUIControllerRegistration
+sal_Bool SAL_CALL ToolbarControllerFactory::hasController(
+    const ::rtl::OUString& aCommandURL,
+    const rtl::OUString& aModuleName )
+throw (::com::sun::star::uno::RuntimeException)
+{
+    ResetableGuard aLock( m_aLock );
+
+    if ( !m_bConfigRead )
+    {
+        m_bConfigRead = sal_True;
+        m_pConfigAccess->readConfigurationData();
+    }
+
+    return ( m_pConfigAccess->getServiceFromCommandModule( aCommandURL, aModuleName ).getLength() > 0 );
+}
+
+void SAL_CALL ToolbarControllerFactory::registerController(
+    const ::rtl::OUString& aCommandURL,
+    const ::rtl::OUString& aModuleName,
+    const ::rtl::OUString& aControllerImplementationName )
+throw (RuntimeException)
+{
+    // SAFE
+    ResetableGuard aLock( m_aLock );
+
+    if ( !m_bConfigRead )
+    {
+        m_bConfigRead = sal_True;
+        m_pConfigAccess->readConfigurationData();
+    }
+
+    m_pConfigAccess->addServiceToCommandModule( aCommandURL, aModuleName, aControllerImplementationName );
+    // SAFE
+}
+
+void SAL_CALL ToolbarControllerFactory::deregisterController(
+    const ::rtl::OUString& aCommandURL,
+    const rtl::OUString& aModuleName )
+throw (RuntimeException)
+{
+    // SAFE
+    ResetableGuard aLock( m_aLock );
+
+    if ( !m_bConfigRead )
+    {
+        m_bConfigRead = sal_True;
+        m_pConfigAccess->readConfigurationData();
+    }
+
+    m_pConfigAccess->removeServiceFromCommandModule( aCommandURL, aModuleName );
+    // SAFE
+}
+
+} // namespace framework