CWS-TOOLING: integrate CWS fwk122

2009-10-06 09:16:04 +0200 mav  r276693 : #i10000# let be compiled on all platforms
2009-10-05 17:02:17 +0200 cd  r276688 : #i105343# Fix build problems under Linux/Mac
2009-10-05 16:23:29 +0200 cd  r276687 : #i105489# Remove uiconfigurationmanagerimpl.obj from makefile.mk
2009-10-05 15:17:05 +0200 cd  r276680 : #i105326# Fix crash when opening file with notes
2009-10-05 11:02:22 +0200 mav  r276665 : #i105343# allow the view shell to disconnect from listener
2009-10-02 11:33:45 +0200 cd  r276619 : #i105489# Revert changes done to aggregate sources due to too much regressions

1 files changed, 78 insertions, 3 deletions

diff --git a/framework/inc/uiconfiguration/uiconfigurationmanager.hxx b/framework/inc/uiconfiguration/uiconfigurationmanager.hxx
index 39f1d9503513..e7ecec183570 100644
--- a/framework/inc/uiconfiguration/uiconfigurationmanager.hxx
+++ b/framework/inc/uiconfiguration/uiconfigurationmanager.hxx
@@ -38,7 +38,6 @@
 #include <vector>
 #include <list>
 #include <hash_map>
-#include <memory>
 
 //_________________________________________________________________________________________________________________
 //  my own includes
@@ -78,7 +77,6 @@
 
 namespace framework
 {
-    class UIConfigurationManagerImpl;
     class UIConfigurationManager :   public com::sun::star::lang::XTypeProvider ,
                                      public com::sun::star::lang::XServiceInfo  ,
                                      public com::sun::star::lang::XComponent    ,
@@ -86,6 +84,7 @@ namespace framework
                                      public ::com::sun::star::ui::XUIConfigurationManager      ,
                                      public ::com::sun::star::ui::XUIConfigurationPersistence  ,
                                      public ::com::sun::star::ui::XUIConfigurationStorage      ,
+                                     private ThreadHelpBase                     ,   // Struct for right initalization of mutex member! Must be first of baseclasses.
                                      public ::cppu::OWeakObject
     {
         public:
@@ -131,7 +130,83 @@ namespace framework
             virtual sal_Bool SAL_CALL hasStorage() throw (::com::sun::star::uno::RuntimeException);
 
         private:
-            ::std::auto_ptr<UIConfigurationManagerImpl> m_pImpl;
+            // private data types
+            enum NotifyOp
+            {
+                NotifyOp_Remove,
+                NotifyOp_Insert,
+                NotifyOp_Replace
+            };
+
+            struct UIElementInfo
+            {
+                UIElementInfo( const rtl::OUString& rResourceURL, const rtl::OUString& rUIName ) :
+                    aResourceURL( rResourceURL), aUIName( rUIName ) {}
+                rtl::OUString   aResourceURL;
+                rtl::OUString   aUIName;
+            };
+
+            struct UIElementData
+            {
+                UIElementData() : bModified( false ), bDefault( true ) {};
+
+                rtl::OUString aResourceURL;
+                rtl::OUString aName;
+                bool          bModified;        // has been changed since last storing
+                bool          bDefault;         // default settings
+                com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > xSettings;
+            };
+
+            struct UIElementType;
+            friend struct UIElementType;
+            typedef ::std::hash_map< rtl::OUString, UIElementData, OUStringHashCode, ::std::equal_to< rtl::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 ::std::hash_map< rtl::OUString, UIElementInfo, OUStringHashCode, ::std::equal_to< rtl::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( sal_Int16 nElementType );
+            UIElementData*  impl_findUIElementData( const rtl::OUString& aResourceURL, sal_Int16 nElementType, bool bLoad = true );
+            void            impl_requestUIElementData( sal_Int16 nElementType, 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& rDocElementType, ConfigEventNotifyContainer& rRemoveNotifyContainer );
+            void            impl_reloadElementTypeData( UIElementType& rDocElementType, ConfigEventNotifyContainer& rRemoveNotifyContainer, ConfigEventNotifyContainer& rReplaceNotifyContainer );
+
+            UIElementTypesVector                                                            m_aUIElements;
+            com::sun::star::uno::Reference< com::sun::star::embed::XStorage >               m_xDocConfigStorage;
+            bool                                                                            m_bReadOnly;
+            bool                                                                            m_bInitialized;
+            bool                                                                            m_bModified;
+            bool                                                                            m_bConfigRead;
+            bool                                                                            m_bDisposed;
+            rtl::OUString                                                                   m_aXMLPostfix;
+            rtl::OUString                                                                   m_aPropUIName;
+            rtl::OUString                                                                   m_aPropResourceURL;
+            rtl::OUString                                                                   m_aModuleIdentifier;
+            com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >    m_xServiceManager;
+            ::cppu::OMultiTypeInterfaceContainerHelper                                      m_aListenerContainer;   /// container for ALL Listener
+            com::sun::star::uno::Reference< com::sun::star::lang::XComponent >              m_xImageManager;
+            com::sun::star::uno::Reference< com::sun::star::uno::XInterface >               m_xAccConfig;
    };
 }