fwk: Use constructor feature for ModuleUIConfigurationManager.
And avoid css::uno::XInitialization protocol.
This commit is contained in:
Matúš Kukan
@@ -1,203 +0,0 @@
|
||||
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
||||
/*
|
||||
* This file is part of the LibreOffice project.
|
||||
*
|
||||
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
*
|
||||
* This file incorporates work covered by the following license notice:
|
||||
*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
* contributor license agreements. See the NOTICE file distributed
|
||||
* with this work for additional information regarding copyright
|
||||
* ownership. The ASF licenses this file to you under the Apache
|
||||
* License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 .
|
||||
*/
|
||||
|
||||
#ifndef INCLUDED_FRAMEWORK_INC_UICONFIGURATION_MODULEUICONFIGURATIONMANAGER_HXX
|
||||
#define INCLUDED_FRAMEWORK_INC_UICONFIGURATION_MODULEUICONFIGURATIONMANAGER_HXX
|
||||
|
||||
|
||||
/** Attention: stl headers must(!) be included at first. Otherwise it can make trouble
|
||||
with solaris headers ...
|
||||
*/
|
||||
#include <vector>
|
||||
#include <list>
|
||||
#include <boost/unordered_map.hpp>
|
||||
|
||||
#include <accelerators/presethandler.hxx>
|
||||
#include <threadhelp/threadhelpbase.hxx>
|
||||
#include <macros/generic.hxx>
|
||||
#include <macros/xinterface.hxx>
|
||||
#include <macros/xtypeprovider.hxx>
|
||||
#include <macros/xserviceinfo.hxx>
|
||||
#include <stdtypes.h>
|
||||
#include <uiconfiguration/moduleimagemanager.hxx>
|
||||
|
||||
#include <com/sun/star/lang/XServiceInfo.hpp>
|
||||
#include <com/sun/star/lang/XTypeProvider.hpp>
|
||||
#include <com/sun/star/lang/XComponent.hpp>
|
||||
#include <com/sun/star/ui/XUIConfigurationPersistence.hpp>
|
||||
#include <com/sun/star/ui/XModuleUIConfigurationManager2.hpp>
|
||||
#include <com/sun/star/ui/UIElementType.hpp>
|
||||
#include <com/sun/star/lang/XInitialization.hpp>
|
||||
#include <com/sun/star/ui/ConfigurationEvent.hpp>
|
||||
#include <com/sun/star/embed/XTransactedObject.hpp>
|
||||
#include <com/sun/star/container/XIndexContainer.hpp>
|
||||
|
||||
#include <cppuhelper/implbase4.hxx>
|
||||
#include <cppuhelper/interfacecontainer.hxx>
|
||||
#include <rtl/ustring.hxx>
|
||||
|
||||
|
||||
namespace framework
|
||||
{
|
||||
class ModuleUIConfigurationManager : private ThreadHelpBase, // Struct for right initalization of mutex member! Must be first of baseclasses.
|
||||
cppu::WeakImplHelper4<
|
||||
com::sun::star::lang::XServiceInfo,
|
||||
com::sun::star::lang::XComponent,
|
||||
com::sun::star::lang::XInitialization,
|
||||
com::sun::star::ui::XModuleUIConfigurationManager2 >
|
||||
{
|
||||
public:
|
||||
// XInterface, XTypeProvider, XServiceInfo
|
||||
DECLARE_XSERVICEINFO
|
||||
|
||||
ModuleUIConfigurationManager( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& xServiceManager );
|
||||
virtual ~ModuleUIConfigurationManager();
|
||||
|
||||
// XComponent
|
||||
virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException);
|
||||
virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
|
||||
virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException);
|
||||
|
||||
// XInitialization
|
||||
virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
|
||||
|
||||
// XUIConfiguration
|
||||
virtual void SAL_CALL addConfigurationListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >& Listener ) throw (::com::sun::star::uno::RuntimeException);
|
||||
virtual void SAL_CALL removeConfigurationListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >& Listener ) throw (::com::sun::star::uno::RuntimeException);
|
||||
|
||||
// XUIConfigurationManager
|
||||
virtual void SAL_CALL reset() throw (::com::sun::star::uno::RuntimeException);
|
||||
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > > SAL_CALL getUIElementsInfo( sal_Int16 ElementType ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
|
||||
virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > SAL_CALL createSettings( ) throw (::com::sun::star::uno::RuntimeException);
|
||||
virtual sal_Bool SAL_CALL hasSettings( const OUString& ResourceURL ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
|
||||
virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL getSettings( const OUString& ResourceURL, sal_Bool bWriteable ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
|
||||
virtual void SAL_CALL replaceSettings( const OUString& ResourceURL, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& aNewData ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException);
|
||||
virtual void SAL_CALL removeSettings( const OUString& ResourceURL ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException);
|
||||
virtual void SAL_CALL insertSettings( const OUString& NewResourceURL, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& aNewData ) throw (::com::sun::star::container::ElementExistException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException);
|
||||
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getImageManager() throw (::com::sun::star::uno::RuntimeException);
|
||||
virtual ::com::sun::star::uno::Reference< ::com::sun::star::ui::XAcceleratorConfiguration > SAL_CALL getShortCutManager() throw (::com::sun::star::uno::RuntimeException);
|
||||
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getEventsManager() throw (::com::sun::star::uno::RuntimeException);
|
||||
|
||||
// XModuleUIConfigurationManager
|
||||
virtual sal_Bool SAL_CALL isDefaultSettings( const OUString& ResourceURL ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
|
||||
virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL getDefaultSettings( const OUString& ResourceURL ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
|
||||
|
||||
// XUIConfigurationPersistence
|
||||
virtual void SAL_CALL reload() throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
|
||||
virtual void SAL_CALL store() throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
|
||||
virtual void SAL_CALL storeToStorage( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& Storage ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
|
||||
virtual sal_Bool SAL_CALL isModified() throw (::com::sun::star::uno::RuntimeException);
|
||||
virtual sal_Bool SAL_CALL isReadOnly() throw (::com::sun::star::uno::RuntimeException);
|
||||
|
||||
private:
|
||||
// private data types
|
||||
enum Layer
|
||||
{
|
||||
LAYER_DEFAULT,
|
||||
LAYER_USERDEFINED,
|
||||
LAYER_COUNT
|
||||
};
|
||||
|
||||
enum NotifyOp
|
||||
{
|
||||
NotifyOp_Remove,
|
||||
NotifyOp_Insert,
|
||||
NotifyOp_Replace
|
||||
};
|
||||
|
||||
struct UIElementInfo
|
||||
{
|
||||
UIElementInfo( const OUString& rResourceURL, const OUString& rUIName ) :
|
||||
aResourceURL( rResourceURL), aUIName( rUIName ) {}
|
||||
OUString aResourceURL;
|
||||
OUString aUIName;
|
||||
};
|
||||
|
||||
struct UIElementData
|
||||
{
|
||||
UIElementData() : bModified( false ), bDefault( true ), bDefaultNode( true ) {};
|
||||
|
||||
OUString aResourceURL;
|
||||
OUString aName;
|
||||
bool bModified; // has been changed since last storing
|
||||
bool bDefault; // default settings
|
||||
bool bDefaultNode; // this is a default layer element data
|
||||
com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > xSettings;
|
||||
};
|
||||
|
||||
struct UIElementType;
|
||||
friend struct UIElementType;
|
||||
typedef ::boost::unordered_map< OUString, UIElementData, OUStringHash, ::std::equal_to< OUString > > UIElementDataHashMap;
|
||||
|
||||
struct UIElementType
|
||||
{
|
||||
UIElementType() : bModified( false ),
|
||||
bLoaded( false ),
|
||||
bDefaultLayer( false ),
|
||||
nElementType( ::com::sun::star::ui::UIElementType::UNKNOWN ) {}
|
||||
|
||||
|
||||
bool bModified;
|
||||
bool bLoaded;
|
||||
bool bDefaultLayer;
|
||||
sal_Int16 nElementType;
|
||||
UIElementDataHashMap aElementsHashMap;
|
||||
com::sun::star::uno::Reference< com::sun::star::embed::XStorage > xStorage;
|
||||
};
|
||||
|
||||
typedef ::std::vector< UIElementType > UIElementTypesVector;
|
||||
typedef ::std::vector< ::com::sun::star::ui::ConfigurationEvent > ConfigEventNotifyContainer;
|
||||
typedef ::boost::unordered_map< OUString, UIElementInfo, OUStringHash, ::std::equal_to< OUString > > UIElementInfoHashMap;
|
||||
|
||||
// private methods
|
||||
void impl_Initialize();
|
||||
void implts_notifyContainerListener( const ::com::sun::star::ui::ConfigurationEvent& aEvent, NotifyOp eOp );
|
||||
void impl_fillSequenceWithElementTypeInfo( UIElementInfoHashMap& aUIElementInfoCollection, sal_Int16 nElementType );
|
||||
void impl_preloadUIElementTypeList( Layer eLayer, sal_Int16 nElementType );
|
||||
UIElementData* impl_findUIElementData( const OUString& aResourceURL, sal_Int16 nElementType, bool bLoad = true );
|
||||
void impl_requestUIElementData( sal_Int16 nElementType, Layer eLayer, UIElementData& aUIElementData );
|
||||
void impl_storeElementTypeData( com::sun::star::uno::Reference< com::sun::star::embed::XStorage > xStorage, UIElementType& rElementType, bool bResetModifyState = true );
|
||||
void impl_resetElementTypeData( UIElementType& rUserElementType, UIElementType& rDefaultElementType, ConfigEventNotifyContainer& rRemoveNotifyContainer, ConfigEventNotifyContainer& rReplaceNotifyContainer );
|
||||
void impl_reloadElementTypeData( UIElementType& rUserElementType, UIElementType& rDefaultElementType, ConfigEventNotifyContainer& rRemoveNotifyContainer, ConfigEventNotifyContainer& rReplaceNotifyContainer );
|
||||
|
||||
UIElementTypesVector m_aUIElements[LAYER_COUNT];
|
||||
PresetHandler* m_pStorageHandler[::com::sun::star::ui::UIElementType::COUNT];
|
||||
com::sun::star::uno::Reference< com::sun::star::embed::XStorage > m_xDefaultConfigStorage;
|
||||
com::sun::star::uno::Reference< com::sun::star::embed::XStorage > m_xUserConfigStorage;
|
||||
bool m_bReadOnly;
|
||||
bool m_bInitialized;
|
||||
bool m_bModified;
|
||||
bool m_bConfigRead;
|
||||
bool m_bDisposed;
|
||||
OUString m_aXMLPostfix;
|
||||
OUString m_aPropUIName;
|
||||
OUString m_aPropResourceURL;
|
||||
OUString m_aModuleIdentifier;
|
||||
OUString m_aModuleShortName;
|
||||
com::sun::star::uno::Reference< com::sun::star::embed::XTransactedObject > m_xUserRootCommit;
|
||||
com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > m_xContext;
|
||||
::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; /// container for ALL Listener
|
||||
com::sun::star::uno::Reference< com::sun::star::lang::XComponent > m_xModuleImageManager;
|
||||
com::sun::star::uno::Reference< com::sun::star::ui::XAcceleratorConfiguration > m_xModuleAcceleratorManager;
|
||||
};
|
||||
}
|
||||
|
||||
#endif // INCLUDED_FRAMEWORK_INC_UICONFIGURATION_MODULEUICONFIGURATIONMANAGER_HXX
|
||||
|
||||
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
||||
@@ -39,7 +39,6 @@
|
||||
#include <uifactory/uicontrollerfactory.hxx>
|
||||
#include <uielement/uicommanddescription.hxx>
|
||||
#include <uiconfiguration/moduleuicfgsupplier.hxx>
|
||||
#include <uiconfiguration/moduleuiconfigurationmanager.hxx>
|
||||
#include <uifactory/menubarfactory.hxx>
|
||||
#include <accelerators/moduleacceleratorconfiguration.hxx>
|
||||
#include <accelerators/documentacceleratorconfiguration.hxx>
|
||||
@@ -63,7 +62,6 @@ COMPONENTGETFACTORY ( fwk,
|
||||
IFFACTORY( ::framework::PopupMenuControllerFactory ) else
|
||||
IFFACTORY( ::framework::UICommandDescription ) else
|
||||
IFFACTORY( ::framework::ModuleUIConfigurationManagerSupplier ) else
|
||||
IFFACTORY( ::framework::ModuleUIConfigurationManager ) else
|
||||
IFFACTORY( ::framework::MenuBarFactory ) else
|
||||
IFFACTORY( ::framework::ModuleAcceleratorConfiguration ) else
|
||||
IFFACTORY( ::framework::DocumentAcceleratorConfiguration ) else
|
||||
|
||||
@@ -17,9 +17,11 @@
|
||||
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
||||
*/
|
||||
|
||||
#include <uiconfiguration/moduleuiconfigurationmanager.hxx>
|
||||
#include <accelerators/presethandler.hxx>
|
||||
#include <uiconfiguration/moduleimagemanager.hxx>
|
||||
#include <threadhelp/threadhelpbase.hxx>
|
||||
#include <threadhelp/resetableguard.hxx>
|
||||
#include <services.h>
|
||||
#include <stdtypes.h>
|
||||
#include <uielement/constitemcontainer.hxx>
|
||||
#include <uielement/rootitemcontainer.hxx>
|
||||
#include <uielement/uielementtypenames.hxx>
|
||||
@@ -31,20 +33,26 @@
|
||||
#include <com/sun/star/ui/UIElementType.hpp>
|
||||
#include <com/sun/star/ui/ConfigurationEvent.hpp>
|
||||
#include <com/sun/star/ui/ModuleAcceleratorConfiguration.hpp>
|
||||
#include <com/sun/star/ui/XUIConfigurationPersistence.hpp>
|
||||
#include <com/sun/star/ui/XModuleUIConfigurationManager2.hpp>
|
||||
#include <com/sun/star/lang/DisposedException.hpp>
|
||||
#include <com/sun/star/beans/XPropertySet.hpp>
|
||||
#include <com/sun/star/embed/ElementModes.hpp>
|
||||
#include <com/sun/star/embed/XTransactedObject.hpp>
|
||||
#include <com/sun/star/container/XNameAccess.hpp>
|
||||
#include <com/sun/star/container/XIndexContainer.hpp>
|
||||
#include <com/sun/star/io/XStream.hpp>
|
||||
#include <com/sun/star/lang/XServiceInfo.hpp>
|
||||
#include <com/sun/star/lang/XComponent.hpp>
|
||||
|
||||
#include <cppuhelper/implbase3.hxx>
|
||||
#include <cppuhelper/interfacecontainer.hxx>
|
||||
#include <cppuhelper/supportsservice.hxx>
|
||||
#include <vcl/svapp.hxx>
|
||||
#include <rtl/ref.hxx>
|
||||
#include <rtl/ustrbuf.hxx>
|
||||
#include <comphelper/sequenceashashmap.hxx>
|
||||
|
||||
//_________________________________________________________________________________________________________________
|
||||
// namespaces
|
||||
//_________________________________________________________________________________________________________________
|
||||
|
||||
using namespace com::sun::star::uno;
|
||||
using namespace com::sun::star::io;
|
||||
using namespace com::sun::star::embed;
|
||||
@@ -52,22 +60,166 @@ using namespace com::sun::star::lang;
|
||||
using namespace com::sun::star::container;
|
||||
using namespace com::sun::star::beans;
|
||||
using namespace ::com::sun::star::ui;
|
||||
using namespace framework;
|
||||
|
||||
namespace framework
|
||||
namespace {
|
||||
|
||||
class ModuleUIConfigurationManager : private ThreadHelpBase, // Struct for right initalization of mutex member! Must be first of baseclasses.
|
||||
public cppu::WeakImplHelper3<
|
||||
css::lang::XServiceInfo,
|
||||
css::lang::XComponent,
|
||||
css::ui::XModuleUIConfigurationManager2 >
|
||||
{
|
||||
public:
|
||||
ModuleUIConfigurationManager(
|
||||
const css::uno::Reference< css::uno::XComponentContext >& xServiceManager,
|
||||
const css::uno::Sequence< css::uno::Any >& aArguments );
|
||||
|
||||
//*****************************************************************************************************************
|
||||
// XInterface, XTypeProvider, XServiceInfo
|
||||
//*****************************************************************************************************************
|
||||
virtual ~ModuleUIConfigurationManager();
|
||||
|
||||
DEFINE_XSERVICEINFO_MULTISERVICE_2 ( ModuleUIConfigurationManager ,
|
||||
::cppu::OWeakObject ,
|
||||
"com.sun.star.ui.ModuleUIConfigurationManager" ,
|
||||
OUString("com.sun.star.comp.framework.ModuleUIConfigurationManager")
|
||||
)
|
||||
virtual OUString SAL_CALL getImplementationName()
|
||||
throw (css::uno::RuntimeException)
|
||||
{
|
||||
return OUString("com.sun.star.comp.framework.ModuleUIConfigurationManager");
|
||||
}
|
||||
|
||||
DEFINE_INIT_SERVICE ( ModuleUIConfigurationManager, {} )
|
||||
virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
|
||||
throw (css::uno::RuntimeException)
|
||||
{
|
||||
return cppu::supportsService(this, ServiceName);
|
||||
}
|
||||
|
||||
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
|
||||
throw (css::uno::RuntimeException)
|
||||
{
|
||||
css::uno::Sequence< OUString > aSeq(1);
|
||||
aSeq[0] = OUString("com.sun.star.ui.ModuleUIConfigurationManager");
|
||||
return aSeq;
|
||||
}
|
||||
|
||||
// XComponent
|
||||
virtual void SAL_CALL dispose() throw (css::uno::RuntimeException);
|
||||
virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException);
|
||||
virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException);
|
||||
|
||||
// XUIConfiguration
|
||||
virtual void SAL_CALL addConfigurationListener( const css::uno::Reference< css::ui::XUIConfigurationListener >& Listener ) throw (css::uno::RuntimeException);
|
||||
virtual void SAL_CALL removeConfigurationListener( const css::uno::Reference< css::ui::XUIConfigurationListener >& Listener ) throw (css::uno::RuntimeException);
|
||||
|
||||
// XUIConfigurationManager
|
||||
virtual void SAL_CALL reset() throw (css::uno::RuntimeException);
|
||||
virtual css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > SAL_CALL getUIElementsInfo( sal_Int16 ElementType ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
|
||||
virtual css::uno::Reference< css::container::XIndexContainer > SAL_CALL createSettings( ) throw (css::uno::RuntimeException);
|
||||
virtual sal_Bool SAL_CALL hasSettings( const OUString& ResourceURL ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
|
||||
virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getSettings( const OUString& ResourceURL, sal_Bool bWriteable ) throw (css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::uno::RuntimeException);
|
||||
virtual void SAL_CALL replaceSettings( const OUString& ResourceURL, const css::uno::Reference< css::container::XIndexAccess >& aNewData ) throw (css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException);
|
||||
virtual void SAL_CALL removeSettings( const OUString& ResourceURL ) throw (css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException);
|
||||
virtual void SAL_CALL insertSettings( const OUString& NewResourceURL, const css::uno::Reference< css::container::XIndexAccess >& aNewData ) throw (css::container::ElementExistException, css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException);
|
||||
virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getImageManager() throw (css::uno::RuntimeException);
|
||||
virtual css::uno::Reference< css::ui::XAcceleratorConfiguration > SAL_CALL getShortCutManager() throw (css::uno::RuntimeException);
|
||||
virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getEventsManager() throw (css::uno::RuntimeException);
|
||||
|
||||
// XModuleUIConfigurationManager
|
||||
virtual sal_Bool SAL_CALL isDefaultSettings( const OUString& ResourceURL ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
|
||||
virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getDefaultSettings( const OUString& ResourceURL ) throw (css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::uno::RuntimeException);
|
||||
|
||||
// XUIConfigurationPersistence
|
||||
virtual void SAL_CALL reload() throw (css::uno::Exception, css::uno::RuntimeException);
|
||||
virtual void SAL_CALL store() throw (css::uno::Exception, css::uno::RuntimeException);
|
||||
virtual void SAL_CALL storeToStorage( const css::uno::Reference< css::embed::XStorage >& Storage ) throw (css::uno::Exception, css::uno::RuntimeException);
|
||||
virtual sal_Bool SAL_CALL isModified() throw (css::uno::RuntimeException);
|
||||
virtual sal_Bool SAL_CALL isReadOnly() throw (css::uno::RuntimeException);
|
||||
|
||||
private:
|
||||
// private data types
|
||||
enum Layer
|
||||
{
|
||||
LAYER_DEFAULT,
|
||||
LAYER_USERDEFINED,
|
||||
LAYER_COUNT
|
||||
};
|
||||
|
||||
enum NotifyOp
|
||||
{
|
||||
NotifyOp_Remove,
|
||||
NotifyOp_Insert,
|
||||
NotifyOp_Replace
|
||||
};
|
||||
|
||||
struct UIElementInfo
|
||||
{
|
||||
UIElementInfo( const OUString& rResourceURL, const OUString& rUIName ) :
|
||||
aResourceURL( rResourceURL), aUIName( rUIName ) {}
|
||||
OUString aResourceURL;
|
||||
OUString aUIName;
|
||||
};
|
||||
|
||||
struct UIElementData
|
||||
{
|
||||
UIElementData() : bModified( false ), bDefault( true ), bDefaultNode( true ) {};
|
||||
|
||||
OUString aResourceURL;
|
||||
OUString aName;
|
||||
bool bModified; // has been changed since last storing
|
||||
bool bDefault; // default settings
|
||||
bool bDefaultNode; // this is a default layer element data
|
||||
css::uno::Reference< css::container::XIndexAccess > xSettings;
|
||||
};
|
||||
|
||||
struct UIElementType;
|
||||
friend struct UIElementType;
|
||||
typedef ::boost::unordered_map< OUString, UIElementData, OUStringHash, ::std::equal_to< OUString > > UIElementDataHashMap;
|
||||
|
||||
struct UIElementType
|
||||
{
|
||||
UIElementType() : bModified( false ),
|
||||
bLoaded( false ),
|
||||
bDefaultLayer( false ),
|
||||
nElementType( css::ui::UIElementType::UNKNOWN ) {}
|
||||
|
||||
|
||||
bool bModified;
|
||||
bool bLoaded;
|
||||
bool bDefaultLayer;
|
||||
sal_Int16 nElementType;
|
||||
UIElementDataHashMap aElementsHashMap;
|
||||
css::uno::Reference< css::embed::XStorage > xStorage;
|
||||
};
|
||||
|
||||
typedef ::std::vector< UIElementType > UIElementTypesVector;
|
||||
typedef ::std::vector< css::ui::ConfigurationEvent > ConfigEventNotifyContainer;
|
||||
typedef ::boost::unordered_map< OUString, UIElementInfo, OUStringHash, ::std::equal_to< OUString > > UIElementInfoHashMap;
|
||||
|
||||
// private methods
|
||||
void impl_Initialize();
|
||||
void implts_notifyContainerListener( const css::ui::ConfigurationEvent& aEvent, NotifyOp eOp );
|
||||
void impl_fillSequenceWithElementTypeInfo( UIElementInfoHashMap& aUIElementInfoCollection, sal_Int16 nElementType );
|
||||
void impl_preloadUIElementTypeList( Layer eLayer, sal_Int16 nElementType );
|
||||
UIElementData* impl_findUIElementData( const OUString& aResourceURL, sal_Int16 nElementType, bool bLoad = true );
|
||||
void impl_requestUIElementData( sal_Int16 nElementType, Layer eLayer, UIElementData& aUIElementData );
|
||||
void impl_storeElementTypeData( css::uno::Reference< css::embed::XStorage > xStorage, UIElementType& rElementType, bool bResetModifyState = true );
|
||||
void impl_resetElementTypeData( UIElementType& rUserElementType, UIElementType& rDefaultElementType, ConfigEventNotifyContainer& rRemoveNotifyContainer, ConfigEventNotifyContainer& rReplaceNotifyContainer );
|
||||
void impl_reloadElementTypeData( UIElementType& rUserElementType, UIElementType& rDefaultElementType, ConfigEventNotifyContainer& rRemoveNotifyContainer, ConfigEventNotifyContainer& rReplaceNotifyContainer );
|
||||
|
||||
UIElementTypesVector m_aUIElements[LAYER_COUNT];
|
||||
PresetHandler* m_pStorageHandler[css::ui::UIElementType::COUNT];
|
||||
css::uno::Reference< css::embed::XStorage > m_xDefaultConfigStorage;
|
||||
css::uno::Reference< css::embed::XStorage > m_xUserConfigStorage;
|
||||
bool m_bReadOnly;
|
||||
bool m_bModified;
|
||||
bool m_bConfigRead;
|
||||
bool m_bDisposed;
|
||||
OUString m_aXMLPostfix;
|
||||
OUString m_aPropUIName;
|
||||
OUString m_aPropResourceURL;
|
||||
OUString m_aModuleIdentifier;
|
||||
OUString m_aModuleShortName;
|
||||
css::uno::Reference< css::embed::XTransactedObject > m_xUserRootCommit;
|
||||
css::uno::Reference< css::uno::XComponentContext > m_xContext;
|
||||
::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; /// container for ALL Listener
|
||||
css::uno::Reference< css::lang::XComponent > m_xModuleImageManager;
|
||||
css::uno::Reference< css::ui::XAcceleratorConfiguration > m_xModuleAcceleratorManager;
|
||||
};
|
||||
|
||||
// important: The order and position of the elements must match the constant
|
||||
// definition of "::com::sun::star::ui::UIElementType"
|
||||
@@ -694,12 +846,13 @@ void ModuleUIConfigurationManager::impl_Initialize()
|
||||
}
|
||||
}
|
||||
|
||||
ModuleUIConfigurationManager::ModuleUIConfigurationManager( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& xContext ) :
|
||||
ThreadHelpBase( &Application::GetSolarMutex() )
|
||||
ModuleUIConfigurationManager::ModuleUIConfigurationManager(
|
||||
const Reference< XComponentContext >& xContext,
|
||||
const Sequence< Any >& aArguments )
|
||||
: ThreadHelpBase( &Application::GetSolarMutex() )
|
||||
, m_xDefaultConfigStorage( 0 )
|
||||
, m_xUserConfigStorage( 0 )
|
||||
, m_bReadOnly( true )
|
||||
, m_bInitialized( false )
|
||||
, m_bModified( false )
|
||||
, m_bConfigRead( false )
|
||||
, m_bDisposed( false )
|
||||
@@ -716,6 +869,60 @@ ModuleUIConfigurationManager::ModuleUIConfigurationManager( const com::sun::star
|
||||
// The following code depends on this!
|
||||
m_aUIElements[LAYER_DEFAULT].resize( ::com::sun::star::ui::UIElementType::COUNT );
|
||||
m_aUIElements[LAYER_USERDEFINED].resize( ::com::sun::star::ui::UIElementType::COUNT );
|
||||
|
||||
ResetableGuard aLock( m_aLock );
|
||||
|
||||
if( aArguments.getLength() == 2 && (aArguments[0] >>= m_aModuleShortName) && (aArguments[1] >>= m_aModuleIdentifier))
|
||||
{
|
||||
}
|
||||
else
|
||||
{
|
||||
::comphelper::SequenceAsHashMap lArgs(aArguments);
|
||||
m_aModuleShortName = lArgs.getUnpackedValueOrDefault("ModuleShortName", OUString());
|
||||
m_aModuleIdentifier = lArgs.getUnpackedValueOrDefault("ModuleIdentifier", OUString());
|
||||
}
|
||||
|
||||
for ( int i = 1; i < ::com::sun::star::ui::UIElementType::COUNT; i++ )
|
||||
{
|
||||
OUString aResourceType;
|
||||
if ( i == ::com::sun::star::ui::UIElementType::MENUBAR )
|
||||
aResourceType = PresetHandler::RESOURCETYPE_MENUBAR();
|
||||
else if ( i == ::com::sun::star::ui::UIElementType::TOOLBAR )
|
||||
aResourceType = PresetHandler::RESOURCETYPE_TOOLBAR();
|
||||
else if ( i == ::com::sun::star::ui::UIElementType::STATUSBAR )
|
||||
aResourceType = PresetHandler::RESOURCETYPE_STATUSBAR();
|
||||
|
||||
if ( !aResourceType.isEmpty() )
|
||||
{
|
||||
m_pStorageHandler[i] = new PresetHandler( m_xContext );
|
||||
m_pStorageHandler[i]->connectToResource( PresetHandler::E_MODULES,
|
||||
aResourceType, // this path wont be used later ... seee next lines!
|
||||
m_aModuleShortName,
|
||||
css::uno::Reference< css::embed::XStorage >()); // no document root used here!
|
||||
}
|
||||
}
|
||||
|
||||
// initialize root storages for all resource types
|
||||
m_xUserRootCommit = css::uno::Reference< css::embed::XTransactedObject >(
|
||||
m_pStorageHandler[::com::sun::star::ui::UIElementType::MENUBAR]->getOrCreateRootStorageUser(), css::uno::UNO_QUERY); // can be empty
|
||||
m_xDefaultConfigStorage = m_pStorageHandler[::com::sun::star::ui::UIElementType::MENUBAR]->getParentStorageShare(
|
||||
m_pStorageHandler[::com::sun::star::ui::UIElementType::MENUBAR]->getWorkingStorageShare());
|
||||
m_xUserConfigStorage = m_pStorageHandler[::com::sun::star::ui::UIElementType::MENUBAR]->getParentStorageUser(
|
||||
m_pStorageHandler[::com::sun::star::ui::UIElementType::MENUBAR]->getWorkingStorageUser());
|
||||
|
||||
if ( m_xUserConfigStorage.is() )
|
||||
{
|
||||
Reference< XPropertySet > xPropSet( m_xUserConfigStorage, UNO_QUERY );
|
||||
if ( xPropSet.is() )
|
||||
{
|
||||
long nOpenMode = 0;
|
||||
Any a = xPropSet->getPropertyValue("OpenMode");
|
||||
if ( a >>= nOpenMode )
|
||||
m_bReadOnly = !( nOpenMode & ElementModes::WRITE );
|
||||
}
|
||||
}
|
||||
|
||||
impl_Initialize();
|
||||
}
|
||||
|
||||
ModuleUIConfigurationManager::~ModuleUIConfigurationManager()
|
||||
@@ -780,71 +987,6 @@ void SAL_CALL ModuleUIConfigurationManager::removeEventListener( const Reference
|
||||
m_aListenerContainer.removeInterface( ::getCppuType( ( const Reference< XEventListener >* ) NULL ), xListener );
|
||||
}
|
||||
|
||||
// XInitialization
|
||||
void SAL_CALL ModuleUIConfigurationManager::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException )
|
||||
{
|
||||
ResetableGuard aLock( m_aLock );
|
||||
|
||||
if( m_bInitialized )
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
if( aArguments.getLength() == 2 && (aArguments[0] >>= m_aModuleShortName) && (aArguments[1] >>= m_aModuleIdentifier))
|
||||
{
|
||||
}
|
||||
else
|
||||
{
|
||||
::comphelper::SequenceAsHashMap lArgs(aArguments);
|
||||
m_aModuleShortName = lArgs.getUnpackedValueOrDefault("ModuleShortName", OUString());
|
||||
m_aModuleIdentifier = lArgs.getUnpackedValueOrDefault("ModuleIdentifier", OUString());
|
||||
}
|
||||
|
||||
for ( int i = 1; i < ::com::sun::star::ui::UIElementType::COUNT; i++ )
|
||||
{
|
||||
OUString aResourceType;
|
||||
if ( i == ::com::sun::star::ui::UIElementType::MENUBAR )
|
||||
aResourceType = PresetHandler::RESOURCETYPE_MENUBAR();
|
||||
else if ( i == ::com::sun::star::ui::UIElementType::TOOLBAR )
|
||||
aResourceType = PresetHandler::RESOURCETYPE_TOOLBAR();
|
||||
else if ( i == ::com::sun::star::ui::UIElementType::STATUSBAR )
|
||||
aResourceType = PresetHandler::RESOURCETYPE_STATUSBAR();
|
||||
|
||||
if ( !aResourceType.isEmpty() )
|
||||
{
|
||||
m_pStorageHandler[i] = new PresetHandler( m_xContext );
|
||||
m_pStorageHandler[i]->connectToResource( PresetHandler::E_MODULES,
|
||||
aResourceType, // this path wont be used later ... seee next lines!
|
||||
m_aModuleShortName,
|
||||
css::uno::Reference< css::embed::XStorage >()); // no document root used here!
|
||||
}
|
||||
}
|
||||
|
||||
// initialize root storages for all resource types
|
||||
m_xUserRootCommit = css::uno::Reference< css::embed::XTransactedObject >(
|
||||
m_pStorageHandler[::com::sun::star::ui::UIElementType::MENUBAR]->getOrCreateRootStorageUser(), css::uno::UNO_QUERY); // can be empty
|
||||
m_xDefaultConfigStorage = m_pStorageHandler[::com::sun::star::ui::UIElementType::MENUBAR]->getParentStorageShare(
|
||||
m_pStorageHandler[::com::sun::star::ui::UIElementType::MENUBAR]->getWorkingStorageShare());
|
||||
m_xUserConfigStorage = m_pStorageHandler[::com::sun::star::ui::UIElementType::MENUBAR]->getParentStorageUser(
|
||||
m_pStorageHandler[::com::sun::star::ui::UIElementType::MENUBAR]->getWorkingStorageUser());
|
||||
|
||||
if ( m_xUserConfigStorage.is() )
|
||||
{
|
||||
Reference< XPropertySet > xPropSet( m_xUserConfigStorage, UNO_QUERY );
|
||||
if ( xPropSet.is() )
|
||||
{
|
||||
long nOpenMode = 0;
|
||||
Any a = xPropSet->getPropertyValue("OpenMode");
|
||||
if ( a >>= nOpenMode )
|
||||
m_bReadOnly = !( nOpenMode & ElementModes::WRITE );
|
||||
}
|
||||
}
|
||||
|
||||
impl_Initialize();
|
||||
|
||||
m_bInitialized = true;
|
||||
}
|
||||
|
||||
// XUIConfiguration
|
||||
void SAL_CALL ModuleUIConfigurationManager::addConfigurationListener( const Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) throw (::com::sun::star::uno::RuntimeException)
|
||||
{
|
||||
@@ -1566,6 +1708,16 @@ void ModuleUIConfigurationManager::implts_notifyContainerListener( const Configu
|
||||
}
|
||||
}
|
||||
|
||||
} // namespace framework
|
||||
}
|
||||
|
||||
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
|
||||
com_sun_star_comp_framework_ModuleUIConfigurationManager_get_implementation(
|
||||
css::uno::XComponentContext *context,
|
||||
css::uno::Sequence<css::uno::Any> const &arguments)
|
||||
{
|
||||
rtl::Reference<ModuleUIConfigurationManager> x(new ModuleUIConfigurationManager(context, arguments));
|
||||
x->acquire();
|
||||
return static_cast<cppu::OWeakObject *>(x.get());
|
||||
}
|
||||
|
||||
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
||||
|
||||
@@ -75,7 +75,8 @@
|
||||
constructor="com_sun_star_comp_framework_ModuleManager_get_implementation">
|
||||
<service name="com.sun.star.frame.ModuleManager"/>
|
||||
</implementation>
|
||||
<implementation name="com.sun.star.comp.framework.ModuleUIConfigurationManager">
|
||||
<implementation name="com.sun.star.comp.framework.ModuleUIConfigurationManager"
|
||||
constructor="com_sun_star_comp_framework_ModuleUIConfigurationManager_get_implementation">
|
||||
<service name="com.sun.star.ui.ModuleUIConfigurationManager"/>
|
||||
</implementation>
|
||||
<implementation name="com.sun.star.comp.framework.ModuleUIConfigurationManagerSupplier">
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
"ModuleUIConfigurationManager";"com::sun::star::ui::XModuleUIConfigurationManager";"isDefaultSettings()"
|
||||
"ModuleUIConfigurationManager";"com::sun::star::ui::XModuleUIConfigurationManager";"getDefaultSettings()"
|
||||
"ModuleUIConfigurationManager";"com::sun::star::lang::XInitialization";"initialize()"
|
||||
"ModuleUIConfigurationManager";"com::sun::star::ui::XUIConfiguration";"addConfigurationListener()"
|
||||
"ModuleUIConfigurationManager";"com::sun::star::ui::XUIConfiguration";"removeConfigurationListener()"
|
||||
"ModuleUIConfigurationManager";"com::sun::star::ui::XUIConfigurationManager";"reset()"
|
||||
|
||||
|
Reference in New Issue
Block a user