ab76: merge with DEV300_m71

31 files changed, 180 insertions, 106 deletions

diff --git a/framework/inc/classes/fwktabwindow.hxx b/framework/inc/classes/fwktabwindow.hxx
index 80e4b8144bb0..ecd9acecd7b9 100644
--- a/framework/inc/classes/fwktabwindow.hxx
+++ b/framework/inc/classes/fwktabwindow.hxx
@@ -125,6 +125,7 @@ public:
     ~FwkTabWindow();
 
     void            AddEventListener( const Link& rEventListener );
+    void            RemoveEventListener( const Link& rEventListener );
     FwkTabPage*     AddTabPage( sal_Int32 nIndex, const css::uno::Sequence< css::beans::NamedValue >& rProperties );
     void            ActivatePage( sal_Int32 nIndex );
     void            RemovePage( sal_Int32 nIndex );
diff --git a/framework/inc/classes/protocolhandlercache.hxx b/framework/inc/classes/protocolhandlercache.hxx
index 4dbafe373117..595b358a789a 100644
--- a/framework/inc/classes/protocolhandlercache.hxx
+++ b/framework/inc/classes/protocolhandlercache.hxx
@@ -194,6 +194,7 @@ class HandlerCFGAccess : public ::utl::ConfigItem
 
         void setCache(HandlerCache* pCache) {m_pCache = pCache;};
         virtual void Notify(const css::uno::Sequence< rtl::OUString >& lPropertyNames);
+        virtual void Commit();
 };
 
 } // namespace framework
diff --git a/framework/inc/dispatch/basedispatcher.hxx b/framework/inc/dispatch/basedispatcher.hxx
index 595f45bfc79a..a62ec3e47890 100644
--- a/framework/inc/dispatch/basedispatcher.hxx
+++ b/framework/inc/dispatch/basedispatcher.hxx
@@ -70,7 +70,7 @@
 #include <cppuhelper/weakref.hxx>
 #include <cppuhelper/interfacecontainer.h>
 /*DRAFT
-#include <svtools/historyoptions.hxx>
+#include <unotools/historyoptions.hxx>
 */
 
 //_________________________________________________________________________________________________________________
diff --git a/framework/inc/framework.hrc b/framework/inc/framework.hrc
index 6f35d20c2d22..57fb2e94b07a 100644
--- a/framework/inc/framework.hrc
+++ b/framework/inc/framework.hrc
@@ -31,7 +31,7 @@
 #ifndef _FRAMEWORK_HRC
 #define _FRAMEWORK_HRC
 
-#include "svtools/solar.hrc"
+#include "svl/solar.hrc"
 
 #define RID_FWK_START               260
 
diff --git a/framework/inc/helper/mischelper.hxx b/framework/inc/helper/mischelper.hxx
index 435b87a4f248..1bd908b266c6 100644
--- a/framework/inc/helper/mischelper.hxx
+++ b/framework/inc/helper/mischelper.hxx
@@ -36,7 +36,7 @@
 #include <com/sun/star/frame/XFrame.hpp>

 

 #include <i18npool/lang.h>

-#include <svtools/languageoptions.hxx>

+#include <svl/languageoptions.hxx>

 

 namespace framework

 {

diff --git a/framework/inc/helper/persistentwindowstate.hxx b/framework/inc/helper/persistentwindowstate.hxx
index 22ef1a481ab7..55d356c80806 100644
--- a/framework/inc/helper/persistentwindowstate.hxx
+++ b/framework/inc/helper/persistentwindowstate.hxx
@@ -53,7 +53,7 @@
 //_________________________________________________________________________________________________________________
 //  other includes
 //_________________________________________________________________________________________________________________
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 #include <cppuhelper/weak.hxx>
 
 //_________________________________________________________________________________________________________________
diff --git a/framework/inc/helper/titlebarupdate.hxx b/framework/inc/helper/titlebarupdate.hxx
index aa893cd40a57..255229d8e2eb 100644
--- a/framework/inc/helper/titlebarupdate.hxx
+++ b/framework/inc/helper/titlebarupdate.hxx
@@ -93,7 +93,7 @@
 //_________________________________________________________________________________________________________________
 
 #ifndef INCLUDED_SVTOOLS_MODULEOPTIONS_HXX
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 #endif
 
 #ifndef _CPPUHELPER_WEAK_HXX_
diff --git a/framework/inc/helpid.hrc b/framework/inc/helpid.hrc
index 49921efcee37..6195a6372452 100644
--- a/framework/inc/helpid.hrc
+++ b/framework/inc/helpid.hrc
@@ -32,7 +32,7 @@
 
 // include ------------------------------------------------------------------
 
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 
 // Help-Ids -----------------------------------------------------------------
 
diff --git a/framework/inc/macros/registration.hxx b/framework/inc/macros/registration.hxx
index 7a48fad1f84c..d026c1b0f04c 100644
--- a/framework/inc/macros/registration.hxx
+++ b/framework/inc/macros/registration.hxx
@@ -139,7 +139,7 @@ ________________________________________________________________________________
 //  define helper to get information about service environment
 //*****************************************************************************************************************
 #define COMPONENTGETIMPLEMENTATIONENVIRONMENT                                                                                           \
-    extern "C" void SAL_CALL component_getImplementationEnvironment( const  sal_Char**          ppEnvironmentTypeName   ,               \
+    extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char**          ppEnvironmentTypeName   ,               \
                                                                              uno_Environment**                          )               \
     {                                                                                                                                   \
         *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ;                                                                   \
@@ -150,7 +150,7 @@ ________________________________________________________________________________
 //  define registration of service
 //*****************************************************************************************************************
 #define COMPONENTWRITEINFO( INFOS )                                                                                                     \
-    extern "C" sal_Bool SAL_CALL component_writeInfo(   void* /*pServiceManager*/   ,                                                       \
+    extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(  void* /*pServiceManager*/   ,                                                       \
                                                         void*   pRegistryKey    )                                                       \
     {                                                                                                                                   \
         LOG_REGISTRATION_WRITEINFO( "\t[start]\n" )                                                                                     \
@@ -185,7 +185,7 @@ ________________________________________________________________________________
 //  define method to instanciate new services
 //*****************************************************************************************************************
 #define COMPONENTGETFACTORY( IFFACTORIES )                                                                                              \
-    extern "C" void* SAL_CALL component_getFactory( const   sal_Char*   pImplementationName ,                                           \
+    extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(    const   sal_Char*   pImplementationName ,                                           \
                                                             void*       pServiceManager     ,                                           \
                                                             void*     /*pRegistryKey*/      )                                           \
     {                                                                                                                                   \
diff --git a/framework/inc/pch/precompiled_framework.hxx b/framework/inc/pch/precompiled_framework.hxx
index eaffedbc0e5c..fd211dd81ee9 100644
--- a/framework/inc/pch/precompiled_framework.hxx
+++ b/framework/inc/pch/precompiled_framework.hxx
@@ -380,32 +380,32 @@
 #include "sot/storage.hxx"
 
 #include "svtools/acceleratorexecute.hxx"
-#include "svtools/cmdoptions.hxx"
+#include "unotools/cmdoptions.hxx"
 #include "svtools/colorcfg.hxx"
 #include "svtools/ctrltool.hxx"
-#include "svtools/dynamicmenuoptions.hxx"
+#include "unotools/dynamicmenuoptions.hxx"
 #include "svtools/filter.hxx"
 #include "svtools/framestatuslistener.hxx"
 #include "svtools/helpopt.hxx"
-#include "svtools/historyoptions.hxx"
-#include "svtools/imageitm.hxx"
+#include "unotools/historyoptions.hxx"
+#include "svl/imageitm.hxx"
 #include "svtools/imgdef.hxx"
-#include "svtools/inettype.hxx"
-#include "svtools/internaloptions.hxx"
-#include "svtools/lstner.hxx"
+#include "svl/inettype.hxx"
+#include "unotools/internaloptions.hxx"
+#include "svl/lstner.hxx"
 #include "svtools/menuoptions.hxx"
 #include "svtools/miscopt.hxx"
-#include "svtools/moduleoptions.hxx"
-#include "svtools/pathoptions.hxx"
+#include "unotools/moduleoptions.hxx"
+#include "unotools/pathoptions.hxx"
 #include "svtools/sfxecode.hxx"
-#include "svtools/smplhint.hxx"
-#include "svtools/solar.hrc"
+#include "svl/smplhint.hxx"
+#include "svl/solar.hrc"
 #include "svtools/statusbarcontroller.hxx"
-#include "svtools/svarray.hxx"
+#include "svl/svarray.hxx"
 #include "svtools/svmedit.hxx"
 #include "svtools/toolboxcontroller.hxx"
 #include "svtools/transfer.hxx"
-#include "svtools/urihelper.hxx"
+#include "svl/urihelper.hxx"
 #include "svtools/xtextedt.hxx"
 
 #include "toolkit/awt/vclxmenu.hxx"
diff --git a/framework/inc/properties.h b/framework/inc/properties.h
index d09fde5a5fc4..d2619cd9ee87 100644
--- a/framework/inc/properties.h
+++ b/framework/inc/properties.h
@@ -193,25 +193,26 @@ namespace framework{
 //_______________________________________________
 /** properties for "LayoutManager" class */
 
-#define LAYOUTMANAGER_PROPNAME_ASCII_MENUBARCLOSER      "MenuBarCloser"
-#define LAYOUTMANAGER_PROPNAME_ASCII_AUTOMATICTOOLBARS  "AutomaticToolbars"
-#define LAYOUTMANAGER_PROPNAME_ASCII_REFRESHVISIBILITY  "RefreshContextToolbarVisibility"
-#define LAYOUTMANAGER_PROPNAME_ASCII_HIDECURRENTUI      "HideCurrentUI"
-#define LAYOUTMANAGER_PROPNAME_ASCII_LOCKCOUNT          "LockCount"
+#define LAYOUTMANAGER_PROPNAME_ASCII_MENUBARCLOSER          "MenuBarCloser"
+#define LAYOUTMANAGER_PROPNAME_ASCII_AUTOMATICTOOLBARS      "AutomaticToolbars"
+#define LAYOUTMANAGER_PROPNAME_ASCII_REFRESHVISIBILITY      "RefreshContextToolbarVisibility"
+#define LAYOUTMANAGER_PROPNAME_ASCII_HIDECURRENTUI          "HideCurrentUI"
+#define LAYOUTMANAGER_PROPNAME_ASCII_LOCKCOUNT              "LockCount"
+#define LAYOUTMANAGER_PROPNAME_ASCII_PRESERVE_CONTENT_SIZE  "PreserveContentSize"
 
 #define LAYOUTMANAGER_PROPNAME_MENUBARCLOSER            ::rtl::OUString::createFromAscii( LAYOUTMANAGER_PROPNAME_ASCII_MENUBARCLOSER )
 #define LAYOUTMANAGER_PROPNAME_AUTOMATICTOOLBARS        ::rtl::OUString::createFromAscii( LAYOUTMANAGER_PROPNAME_ASCII_AUTOMATICTOOLBARS )
 #define LAYOUTMANAGER_PROPNAME_REFRESHVISIBILITY        ::rtl::OUString::createFromAscii( LAYOUTMANAGER_PROPNAME_ASCII_REFRESHVISIBILITY )
 #define LAYOUTMANAGER_PROPNAME_HIDECURRENTUI            ::rtl::OUString::createFromAscii( LAYOUTMANAGER_PROPNAME_ASCII_HIDECURRENTUI )
 #define LAYOUTMANAGER_PROPNAME_LOCKCOUNT                ::rtl::OUString::createFromAscii( LAYOUTMANAGER_PROPNAME_ASCII_LOCKCOUNT )
+#define LAYOUTMANAGER_PROPNAME_PRESERVE_CONTENT_SIZE    ::rtl::OUString::createFromAscii( LAYOUTMANAGER_PROPNAME_ASCII_PRESERVE_CONTENT_SIZE )
 
 #define LAYOUTMANAGER_PROPHANDLE_MENUBARCLOSER          0
 #define LAYOUTMANAGER_PROPHANDLE_AUTOMATICTOOLBARS      1
 #define LAYOUTMANAGER_PROPHANDLE_REFRESHVISIBILITY      2
 #define LAYOUTMANAGER_PROPHANDLE_HIDECURRENTUI          3
 #define LAYOUTMANAGER_PROPHANDLE_LOCKCOUNT              4
-
-#define LAYOUTMANAGER_PROPCOUNT                         5
+#define LAYOUTMANAGER_PROPHANDLE_PRESERVE_CONTENT_SIZE  5
 
 //_______________________________________________
 /** properties for "UICommandDescription" class */
@@ -271,7 +272,7 @@ namespace framework{
 #define TABWINDOWSERVICE_PROPNAME_WINDOW                ::rtl::OUString::createFromAscii( TABWINDOWSERVICE_PROPNAME_ASCII_WINDOW )
 
 #define TABWINDOWSERVICE_PROPHANDLE_WINDOW              0
-#define TABWINDOWSERVICE_PROPCOUNT                      1

+#define TABWINDOWSERVICE_PROPCOUNT                      1
 
 //_______________________________________________
 /** properties of tabreg service */
diff --git a/framework/inc/services.h b/framework/inc/services.h
index e9f3e1bfe3ce..70f4f8fde9a2 100644
--- a/framework/inc/services.h
+++ b/framework/inc/services.h
@@ -127,6 +127,7 @@ namespace framework{
 #define SERVICENAME_IMAGEMANAGER                                DECLARE_ASCII("com.sun.star.ui.ImageManager"                        )
 #define SERVICENAME_TABWINDOWSERVICE                            DECLARE_ASCII("com.sun.star.ui.dialogs.TabContainerWindow"          )
 #define SERVICENAME_WINDOWCONTENTFACTORYMANAGER                 DECLARE_ASCII("com.sun.star.ui.WindowContentFactoryManager"         )
+#define SERVICENAME_DISPLAYACCESS                               DECLARE_ASCII("com.sun.star.awt.DisplayAccess"                      )
 
 //_________________________________________________________________________________________________________________
 //  used implementationnames by framework
diff --git a/framework/inc/services/autorecovery.hxx b/framework/inc/services/autorecovery.hxx
index 8f6c62a2f39e..ed3630ed1583 100644
--- a/framework/inc/services/autorecovery.hxx
+++ b/framework/inc/services/autorecovery.hxx
@@ -239,7 +239,8 @@ class AutoRecovery  : public  css::lang::XTypeProvider
             E_SESSION_SAVE              =  64,
             E_SESSION_RESTORE           = 128,
             E_DISABLE_AUTORECOVERY      = 256,
-            E_SET_AUTOSAVE_STATE        = 512
+            E_SET_AUTOSAVE_STATE        = 512,
+            E_SESSION_QUIET_QUIT        = 1024
         };
 
         //---------------------------------------
@@ -884,6 +885,10 @@ class AutoRecovery  : public  css::lang::XTypeProvider
 
         //---------------------------------------
         // TODO document me
+        void implts_doSessionQuietQuit(const DispatchParams& aParams);
+
+        //---------------------------------------
+        // TODO document me
         void implts_doSessionRestore(const DispatchParams& aParams);
 
         //---------------------------------------
diff --git a/framework/inc/services/desktop.hxx b/framework/inc/services/desktop.hxx
index 92c575c7b5b5..c1e1e59dc02f 100644
--- a/framework/inc/services/desktop.hxx
+++ b/framework/inc/services/desktop.hxx
@@ -80,7 +80,7 @@
 //_________________________________________________________________________________________________________________
 //  other includes
 //_________________________________________________________________________________________________________________
-#include <svtools/cmdoptions.hxx>
+#include <unotools/cmdoptions.hxx>
 #include <cppuhelper/propshlp.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
 #include <cppuhelper/weak.hxx>
diff --git a/framework/inc/services/frame.hxx b/framework/inc/services/frame.hxx
index 32e83aed1974..022bda1786bc 100644
--- a/framework/inc/services/frame.hxx
+++ b/framework/inc/services/frame.hxx
@@ -87,7 +87,7 @@
 //_________________________________________________________________________________________________________________
 //  other includes
 //_________________________________________________________________________________________________________________
-#include <svtools/cmdoptions.hxx>
+#include <unotools/cmdoptions.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
 #include <cppuhelper/weak.hxx>
 #include <rtl/string.hxx>
diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx
index 86dec1a938bf..8c412e5d6237 100644
--- a/framework/inc/services/layoutmanager.hxx
+++ b/framework/inc/services/layoutmanager.hxx
@@ -69,6 +69,7 @@
 #include <com/sun/star/ui/XUIElementFactory.hpp>
 #include <com/sun/star/frame/XInplaceLayout.hpp>
 #include <com/sun/star/ui/DockingArea.hpp>
+#include <com/sun/star/awt/XTopWindow2.hpp>
 #include <com/sun/star/awt/XDockableWindow.hpp>
 #include <com/sun/star/awt/XDockableWindowListener.hpp>
 #include <com/sun/star/frame/XMenuBarMergingAcceptor.hpp>
@@ -78,8 +79,9 @@
 //  other includes
 //_________________________________________________________________________________________________________________
 #include <cppuhelper/propshlp.hxx>
+#include <cppuhelper/implbase9.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
-#include <cppuhelper/weak.hxx>
+#include <comphelper/propertycontainer.hxx>
 #include <vcl/wintypes.hxx>
 #include <svtools/miscopt.hxx>
 #include <vcl/toolbox.hxx>
@@ -89,22 +91,23 @@ class MenuBar;
 namespace framework
 {
     class GlobalSettings;
-    class LayoutManager : public  css::lang::XTypeProvider                        ,
-                          public  css::lang::XServiceInfo                         ,
-                          public  ::com::sun::star::frame::XLayoutManager         ,
-                          public  css::awt::XWindowListener                       ,
-                          public  css::frame::XFrameActionListener                ,
-                          public  ::com::sun::star::ui::XUIConfigurationListener  ,
-                          public  ::com::sun::star::frame::XInplaceLayout         ,
-                          public  css::awt::XDockableWindowListener               ,
-                          public  ::com::sun::star::frame::XMenuBarMergingAcceptor,
-                          public  css::frame::XLayoutManagerEventBroadcaster      ,
+    typedef ::cppu::WeakImplHelper9 <   ::com::sun::star::lang::XServiceInfo
+                                    ,   ::com::sun::star::frame::XLayoutManager
+                                    ,   ::com::sun::star::awt::XWindowListener
+                                    ,   ::com::sun::star::frame::XFrameActionListener
+                                    ,   ::com::sun::star::ui::XUIConfigurationListener
+                                    ,   ::com::sun::star::frame::XInplaceLayout
+                                    ,   ::com::sun::star::awt::XDockableWindowListener
+                                    ,   ::com::sun::star::frame::XMenuBarMergingAcceptor
+                                    ,   ::com::sun::star::frame::XLayoutManagerEventBroadcaster
+                                    >   LayoutManager_Base;
+    typedef ::comphelper::OPropertyContainer    LayoutManager_PBase;
+    class LayoutManager : public  LayoutManager_Base                    ,
                           // base classes
                           // Order is neccessary for right initialization!
                           private ThreadHelpBase                        ,   // Struct for right initalization of mutex member! Must be first of baseclasses.
                           public  ::cppu::OBroadcastHelper              ,
-                          public  ::cppu::OPropertySetHelper            ,   // => XPropertySet / XFastPropertySet / XMultiPropertySet
-                          public  ::cppu::OWeakObject                       // => XWeak, XInterface
+                          public  LayoutManager_PBase
     {
         public:
             enum { DOCKINGAREAS_COUNT = 4 };
@@ -388,6 +391,7 @@ namespace framework
 
             // layouting methods
             sal_Bool implts_compareRectangles( const ::com::sun::star::awt::Rectangle& rRect1, const ::com::sun::star::awt::Rectangle& rRect2 );
+            sal_Bool implts_resizeContainerWindow( const ::com::sun::star::awt::Size& rContainerSize, const ::com::sun::star::awt::Point& rComponentPos );
             ::Size  implts_getTopBottomDockingAreaSizes();
             ::Size  implts_getContainerWindowOutputSize();
             ::com::sun::star::awt::Rectangle implts_getDockingAreaWindowSizes();
@@ -399,7 +403,8 @@ namespace framework
             void    implts_findNextDockingPos( ::com::sun::star::ui::DockingArea DockingArea, const ::Size& aUIElementSize, ::Point& rVirtualPos, ::Point& rPixelPos );
             ::com::sun::star::awt::Rectangle implts_calcDockingAreaSizes();
             void    implts_setDockingAreaWindowSizes( const com::sun::star::awt::Rectangle& rBorderSpace );
-            sal_Bool implts_doLayout( sal_Bool bForceRequestBorderSpace );
+            sal_Bool implts_doLayout( sal_Bool bForceRequestBorderSpace, sal_Bool bOuterResize );
+            void    implts_doLayout_notify( sal_Bool bOuterResize );
 
             // internal methods to control status/progress bar
             ::Size      implts_getStatusBarSize();
@@ -449,15 +454,15 @@ namespace framework
             virtual ::cppu::IPropertyArrayHelper&                       SAL_CALL getInfoHelper();
             virtual ::com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException);
 
-            static const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > impl_getStaticPropertyDescriptor();
-
             css::uno::Reference< css::lang::XMultiServiceFactory >                      m_xSMGR; /** reference to factory, which has created this instance. */
             css::uno::Reference< css::util::XURLTransformer >                           m_xURLTransformer;
+            css::uno::Reference< css::container::XIndexAccess >                         m_xDisplayAccess;
             css::uno::Reference< css::frame::XFrame >                                   m_xFrame;
             css::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager >        m_xModuleCfgMgr;
             css::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager >        m_xDocCfgMgr;
             css::uno::WeakReference< css::frame::XModel >                               m_xModel;
             css::uno::Reference< css::awt::XWindow >                                    m_xContainerWindow;
+            css::uno::Reference< css::awt::XTopWindow2 >                                m_xContainerTopWindow;
             css::uno::Reference< css::awt::XWindow >                                    m_xDockAreaWindows[DOCKINGAREAS_COUNT];
             sal_Int32                                                                   m_nLockCount;
             UIElementVector                                                             m_aUIElements;
@@ -474,6 +479,7 @@ namespace framework
             bool                                                                        m_bStoreWindowState;
             bool                                                                        m_bHideCurrentUI;
             bool                                                                        m_bGlobalSettings;
+            bool                                                                        m_bPreserveContentSize;
             DockingOperation                                                            m_eDockOperation;
             UIElement                                                                   m_aDockUIElement;
             css::awt::Rectangle                                                         m_aDockingArea;
diff --git a/framework/inc/services/licensedlg.hxx b/framework/inc/services/licensedlg.hxx
index 86e3f6c7fc57..4f5b9f0c65fa 100644
--- a/framework/inc/services/licensedlg.hxx
+++ b/framework/inc/services/licensedlg.hxx
@@ -42,7 +42,7 @@
 #include <vcl/dialog.hxx>
 #include <vcl/scrbar.hxx>
 #include <svtools/svmedit.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 
 namespace framework {
 
diff --git a/framework/inc/services/pluginframe.hxx b/framework/inc/services/pluginframe.hxx
index 46a90015a56e..af81b51d04ac 100644
--- a/framework/inc/services/pluginframe.hxx
+++ b/framework/inc/services/pluginframe.hxx
@@ -57,7 +57,7 @@
 #ifndef _VCL_ATOM_HXX
 #include <vcl/threadex.hxx>
 #endif
-#include <svtools/cmdoptions.hxx>
+#include <unotools/cmdoptions.hxx>
 
 
 //_________________________________________________________________________________________________________________
diff --git a/framework/inc/services/sessionlistener.hxx b/framework/inc/services/sessionlistener.hxx
index cbb22a322d48..c8e54d4bcbaa 100644
--- a/framework/inc/services/sessionlistener.hxx
+++ b/framework/inc/services/sessionlistener.hxx
@@ -49,7 +49,7 @@
 #include <com/sun/star/lang/XInitialization.hpp>
 
 
-#include <com/sun/star/frame/XSessionManagerListener.hpp>
+#include <com/sun/star/frame/XSessionManagerListener2.hpp>
 #include <com/sun/star/frame/XSessionManagerClient.hpp>
 #include <com/sun/star/frame/XStatusListener.hpp>
 #include <com/sun/star/frame/FeatureStateEvent.hpp>
@@ -98,7 +98,7 @@ namespace framework{
 class SessionListener :   // interfaces
                         public css::lang::XTypeProvider,
                         public css::lang::XInitialization,
-                        public css::frame::XSessionManagerListener,
+                        public css::frame::XSessionManagerListener2,
                         public css::frame::XStatusListener,
                         public css::lang::XServiceInfo,
                         // baseclasses (order important for initialization!)
@@ -120,6 +120,18 @@ class SessionListener :   // interfaces
         // restore handling
         sal_Bool m_bRestored;
 
+        sal_Bool m_bSessionStoreRequested;
+
+        sal_Bool m_bAllowUserInteractionOnQuit;
+        sal_Bool m_bTerminated;
+
+
+        // in case of synchronous call the caller should do saveDone() call himself!
+        void StoreSession( sal_Bool bAsync );
+
+        // let session quietly close the documents, remove lock files, store configuration and etc.
+        void QuitSessionQuietly();
+
     public:
 
         //---------------------------------------
@@ -163,6 +175,10 @@ class SessionListener :   // interfaces
        virtual sal_Bool SAL_CALL doRestore()
             throw (css::uno::RuntimeException);
 
+        // XSessionManagerListener2
+        virtual void SAL_CALL doQuit()
+            throw (::com::sun::star::uno::RuntimeException);
+
        // XStatusListener
        virtual void SAL_CALL statusChanged(const com::sun::star::frame::FeatureStateEvent& event)
            throw (css::uno::RuntimeException);
diff --git a/framework/inc/services/substitutepathvars.hxx b/framework/inc/services/substitutepathvars.hxx
index a95e913695b0..215def2ea08c 100644
--- a/framework/inc/services/substitutepathvars.hxx
+++ b/framework/inc/services/substitutepathvars.hxx
@@ -139,6 +139,7 @@ class SubstitutePathVariables_Impl : public utl::ConfigItem
         /** is called from the ConfigManager before application ends or from the
             PropertyChangeListener if the sub tree broadcasts changes. */
         virtual void    Notify( const com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
+        virtual void    Commit();
 
     private:
         // Wrapper methods for low-level functions
diff --git a/framework/inc/services/tabwindowservice.hxx b/framework/inc/services/tabwindowservice.hxx
index 8423a01f1793..f6b930906ca3 100644
--- a/framework/inc/services/tabwindowservice.hxx
+++ b/framework/inc/services/tabwindowservice.hxx
@@ -48,13 +48,13 @@
 #include <macros/xinterface.hxx>
 #include <macros/xtypeprovider.hxx>
 #include <macros/xserviceinfo.hxx>
-#include <general.h>

+#include <general.h>
 #include <stdtypes.h>
-

+
 //_________________________________________________________________________________________________________________
 //  interface includes
 //_________________________________________________________________________________________________________________
-

+
 #include <com/sun/star/awt/XSimpleTabController.hpp>
 #include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -62,7 +62,7 @@
 //_________________________________________________________________________________________________________________
 //  other includes
 //_________________________________________________________________________________________________________________
-

+
 #include <cppuhelper/weak.hxx>
 #include <vcl/window.hxx>
 
@@ -81,31 +81,31 @@ namespace framework{
 //_________________________________________________________________________________________________________________
 
 struct TTabPageInfo
-{

-    public:

-
-        TTabPageInfo()

-            : m_nIndex      ( -1      )

-            , m_bCreated    (sal_False)

-            , m_pPage       ( NULL    )

-            , m_lProperties (         )

-        {}

-    

-        TTabPageInfo(::sal_Int32 nID)

-            : m_nIndex      ( nID     )

-            , m_bCreated    (sal_False)

-            , m_pPage       ( NULL    )

-            , m_lProperties (         )

-        {}

-    

-    public:

-
-        ::sal_Int32                                   m_nIndex;

+{
+    public:
+
+        TTabPageInfo()
+            : m_nIndex      ( -1      )
+            , m_bCreated    (sal_False)
+            , m_pPage       ( NULL    )
+            , m_lProperties (         )
+        {}
+
+        TTabPageInfo(::sal_Int32 nID)
+            : m_nIndex      ( nID     )
+            , m_bCreated    (sal_False)
+            , m_pPage       ( NULL    )
+            , m_lProperties (         )
+        {}
+
+    public:
+
+        ::sal_Int32                                   m_nIndex;
         ::sal_Bool                                    m_bCreated;
         FwkTabPage*                                   m_pPage;
         css::uno::Sequence< css::beans::NamedValue >  m_lProperties;
-};

-

+};
+
 typedef ::std::hash_map< ::sal_Int32                    ,
                          TTabPageInfo                   ,
                          Int32HashCode                  ,
@@ -118,10 +118,11 @@ typedef ::std::hash_map< ::sal_Int32                    ,
 class TabWindowService :  public css::lang::XTypeProvider
                          ,  public css::lang::XServiceInfo
                          ,  public css::awt::XSimpleTabController
+                         ,  public css::lang::XComponent
                          ,  public ThreadHelpBase
                          ,  public TransactionBase
-                         ,  public PropertySetHelper

-                         ,  public ::cppu::OWeakObject

+                         ,  public PropertySetHelper
+                         ,  public ::cppu::OWeakObject
 {
     //-------------------------------------------------------------------------------------------------------------
     //  public methods
@@ -132,7 +133,7 @@ class TabWindowService :  public css::lang::XTypeProvider
         //---------------------------------------------------------------------------------------------------------
         //  constructor / destructor
         //---------------------------------------------------------------------------------------------------------
-

+
         TabWindowService( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory );
         virtual ~TabWindowService();
 
@@ -186,8 +187,8 @@ class TabWindowService :  public css::lang::XTypeProvider
 
         DECL_DLLPRIVATE_LINK( EventListener, VclSimpleEvent * );
 
-        void impl_checkTabIndex (::sal_Int32 nID) throw (css::lang::IndexOutOfBoundsException);

-        TTabPageInfoHash::iterator impl_getTabPageInfo(::sal_Int32 nID) throw (css::lang::IndexOutOfBoundsException);

+        void impl_checkTabIndex (::sal_Int32 nID) throw (css::lang::IndexOutOfBoundsException);
+        TTabPageInfoHash::iterator impl_getTabPageInfo(::sal_Int32 nID) throw (css::lang::IndexOutOfBoundsException);
         FwkTabWindow* mem_TabWin ();
 /*
         ::cppu::IPropertyArrayHelper& SAL_CALL              getInfoHelper();
@@ -203,26 +204,26 @@ class TabWindowService :  public css::lang::XTypeProvider
     private:
 
         /// reference to factory, which has created this instance
-        css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory;

-    

+        css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory;
+
         /// the tab window as XWindow ( to hold window* alive !)
-        css::uno::Reference< css::awt::XWindow > m_xTabWin;

-    

-        /// the VCL tab window

-        FwkTabWindow* m_pTabWin;

-    

-        /// container of inserted tab pages

-        TTabPageInfoHash m_lTabPageInfos;

-    

+        css::uno::Reference< css::awt::XWindow > m_xTabWin;
+
+        /// the VCL tab window
+        FwkTabWindow* m_pTabWin;
+
+        /// container of inserted tab pages
+        TTabPageInfoHash m_lTabPageInfos;
+
         /// container of the added TabListener
         ::cppu::OMultiTypeInterfaceContainerHelper m_lListener;
-    

+
         /// counter of the tabpage indexes
-        ::sal_Int32 m_nPageIndexCounter;

-    

+        ::sal_Int32 m_nPageIndexCounter;
+
         /// index of the current active page
         ::sal_Int32 m_nCurrentPageIndex;
-    

+
         /// title of the tabcontrolled window
         ::rtl::OUString m_sTitle;
 
diff --git a/framework/inc/uielement/generictoolbarcontroller.hxx b/framework/inc/uielement/generictoolbarcontroller.hxx
index f1f014fb7707..109e4f9bf69b 100644
--- a/framework/inc/uielement/generictoolbarcontroller.hxx
+++ b/framework/inc/uielement/generictoolbarcontroller.hxx
@@ -37,6 +37,9 @@
 
 #include <svtools/toolboxcontroller.hxx>
 #include <vcl/toolbox.hxx>
+#include <memory>
+
+class PopupMenu;
 
 namespace framework
 {
@@ -64,7 +67,7 @@ class GenericToolbarController : public svt::ToolboxController
 
          DECL_STATIC_LINK( GenericToolbarController, ExecuteHdl_Impl, ExecuteInfo* );
 
-    private:
+    protected:
         ToolBox*        m_pToolbar;
         sal_uInt16      m_nID;
         sal_Bool        m_bEnumCommand : 1,
@@ -72,6 +75,28 @@ class GenericToolbarController : public svt::ToolboxController
         rtl::OUString   m_aEnumCommand;
 };
 
+class MenuToolbarController : public GenericToolbarController
+{
+    com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > m_xMenuDesc;
+    PopupMenu* pMenu;
+    com::sun::star::uno::Reference< com::sun::star::lang::XComponent > m_xMenuManager;
+    rtl::OUString m_aModuleIdentifier;
+    public:
+        MenuToolbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager,
+                                  const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame,
+                                  ToolBox* pToolBar,
+                                  USHORT   nID,
+                                  const rtl::OUString& aCommand,
+                                  const rtl::OUString& aModuleIdentifier,
+                                  const com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >& xMenuDesc );
+
+    ~MenuToolbarController();
+    // XToolbarController
+    virtual void SAL_CALL click() throw ( ::com::sun::star::uno::RuntimeException );
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createPopupWindow() throw (::com::sun::star::uno::RuntimeException);
+
+};
+
 }
 
 #endif // __FRAMEWORK_UIELEMENT_GENERICTOOLBARCONTROLLER_HXX_
diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx
index 553da978b8ce..5a835c1f1cf5 100644
--- a/framework/inc/uielement/toolbarmanager.hxx
+++ b/framework/inc/uielement/toolbarmanager.hxx
@@ -50,10 +50,12 @@
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
+#include <com/sun/star/container/XIndexContainer.hpp>
 #include <com/sun/star/frame/XModuleManager.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/frame/XUIControllerRegistration.hpp>
 #include <com/sun/star/ui/XImageManager.hpp>
+#include <com/sun/star/ui/XUIConfigurationManager.hpp>
 #include <com/sun/star/frame/XStatusListener.hpp>
 #include <com/sun/star/frame/XSubToolbarController.hpp>
 #include <com/sun/star/frame/XToolbarController.hpp>
@@ -200,6 +202,7 @@ class ToolBarManager : public ::com::sun::star::frame::XFrameActionListener
         typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XSubToolbarController > > SubToolBarControllerVector;
         typedef BaseHash< SubToolBarControllerVector >                                                              SubToolBarToSubToolBarControllerMap;
 
+        typedef ::std::hash_map< sal_uInt16, ::com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > > MenuDescriptionMap;
         sal_Bool                                                                               m_bDisposed : 1,
                                                                                                m_bIsHiContrast : 1,
                                                                                                m_bSmallSymbols : 1,
@@ -225,10 +228,14 @@ class ToolBarManager : public ::com::sun::star::frame::XFrameActionListener
         ::com::sun::star::uno::Reference< ::com::sun::star::ui::XImageManager >                m_xModuleImageManager;
         ::com::sun::star::uno::Reference< ::com::sun::star::ui::XImageManager >                m_xDocImageManager;
         ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >                 m_xImageOrientationListener;
+        ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager >                m_xUICfgMgr;
+        ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager >                m_xDocUICfgMgr;
+
         CommandToInfoMap                                                                       m_aCommandMap;
         SubToolBarToSubToolBarControllerMap                                                    m_aSubToolBarControllerMap;
         Timer                                                                                  m_aAsyncUpdateControllersTimer;
         sal_Int16                                                                              m_nSymbolsStyle;
+        MenuDescriptionMap m_aMenuMap;
 };
 
 }
diff --git a/framework/inc/xml/eventsconfiguration.hxx b/framework/inc/xml/eventsconfiguration.hxx
index ca446a7e1386..69e6f85c6f90 100644
--- a/framework/inc/xml/eventsconfiguration.hxx
+++ b/framework/inc/xml/eventsconfiguration.hxx
@@ -31,7 +31,7 @@
 #ifndef __FRAMEWORK_XML_EVENTSCONFIGURATION_HXX_
 #define __FRAMEWORK_XML_EVENTSCONFIGURATION_HXX_
 
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <tools/string.hxx>
 #include <tools/stream.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
diff --git a/framework/inc/xml/imagesconfiguration.hxx b/framework/inc/xml/imagesconfiguration.hxx
index 452d2c045da4..d0961892b96b 100644
--- a/framework/inc/xml/imagesconfiguration.hxx
+++ b/framework/inc/xml/imagesconfiguration.hxx
@@ -31,7 +31,7 @@
 #ifndef __FRAMEWORK_XML_IMAGESCONFIGURATION_HXX_
 #define __FRAMEWORK_XML_IMAGESCONFIGURATION_HXX_
 
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <tools/string.hxx>
 #include <tools/stream.hxx>
 #include <tools/color.hxx>
diff --git a/framework/inc/xml/menuconfiguration.hxx b/framework/inc/xml/menuconfiguration.hxx
index 954fc2ae5e3e..1ce511618112 100644
--- a/framework/inc/xml/menuconfiguration.hxx
+++ b/framework/inc/xml/menuconfiguration.hxx
@@ -85,6 +85,7 @@ class MenuConfiguration
             ::rtl::OUString aTargetFrame;
             ::rtl::OUString aImageId;
             ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XDispatchProvider > xDispatchProvider;
+                        sal_Int16 nStyle;
         };
 
         MenuConfiguration(
diff --git a/framework/inc/xml/menudocumenthandler.hxx b/framework/inc/xml/menudocumenthandler.hxx
index a85a4c200086..cd73d4b8df66 100644
--- a/framework/inc/xml/menudocumenthandler.hxx
+++ b/framework/inc/xml/menudocumenthandler.hxx
@@ -109,13 +109,14 @@ class ReadMenuDocumentHandlerBase : public ThreadHelpBase,  // Struct for right
         ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler> m_xReader;
         void initPropertyCommon( com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > &rProps,
                                  const rtl::OUString &rCommandURL, const rtl::OUString &rHelpId,
-                                 const rtl::OUString &rLabel);
+                                 const rtl::OUString &rLabel, sal_Int16 nItemStyleBits );
     private:
         rtl::OUString m_aType;
         rtl::OUString m_aLabel;
         rtl::OUString m_aContainer;
         rtl::OUString m_aHelpURL;
         rtl::OUString m_aCommandURL;
+        rtl::OUString m_aStyle;
         ::com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > m_aItemProp;
 };
 
@@ -306,7 +307,7 @@ class OWriteMenuDocumentHandler
         virtual void WriteMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rSubMenuContainer ) throw
             ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException );
 
-        virtual void WriteMenuItem( const rtl::OUString& aCommandURL, const rtl::OUString& aLabel, const rtl::OUString& aHelpURL );
+        virtual void WriteMenuItem( const rtl::OUString& aCommandURL, const rtl::OUString& aLabel, const rtl::OUString& aHelpURL, sal_Int16 nStyle = 0 );
         virtual void WriteMenuSeparator();
 
         com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > m_xMenuBarContainer;
diff --git a/framework/inc/xml/statusbarconfiguration.hxx b/framework/inc/xml/statusbarconfiguration.hxx
index 9bcfa9564a33..8619ae423622 100644
--- a/framework/inc/xml/statusbarconfiguration.hxx
+++ b/framework/inc/xml/statusbarconfiguration.hxx
@@ -1,7 +1,7 @@
 #ifndef __FRAMEWORK_CLASSES_STATUSBARCONFIGURATION_HXX_
 #define __FRAMEWORK_CLASSES_STATUSBARCONFIGURATION_HXX_
 
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <tools/string.hxx>
 #include <tools/stream.hxx>
 #include <vcl/status.hxx>
diff --git a/framework/inc/xml/toolboxconfiguration.hxx b/framework/inc/xml/toolboxconfiguration.hxx
index c3f827bc95a1..924c601ac689 100644
--- a/framework/inc/xml/toolboxconfiguration.hxx
+++ b/framework/inc/xml/toolboxconfiguration.hxx
@@ -1,7 +1,7 @@
 #ifndef __FRAMEWORK_XML_TOOLBOXCONFIGURATION_HXX_
 #define __FRAMEWORK_XML_TOOLBOXCONFIGURATION_HXX_
 
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <vcl/bitmap.hxx>
 #include <tools/string.hxx>
 #include <com/sun/star/io/XInputStream.hpp>
diff --git a/framework/inc/xml/toolboxconfigurationdefines.hxx b/framework/inc/xml/toolboxconfigurationdefines.hxx
index be8292ada8de..c3cd030f6213 100644
--- a/framework/inc/xml/toolboxconfigurationdefines.hxx
+++ b/framework/inc/xml/toolboxconfigurationdefines.hxx
@@ -29,6 +29,7 @@
 #define ATTRIBUTE_WIDTH             "width"
 #define ATTRIBUTE_USER              "userdefined"
 #define ATTRIBUTE_HELPID            "helpid"
+#define ATTRIBUTE_TOOLTIP           "tooltip"
 #define ATTRIBUTE_ITEMSTYLE         "style"
 
 #define ATTRIBUTE_ID                "id"
@@ -78,6 +79,8 @@
 #define ATTRIBUTE_ITEMSTYLE_AUTOSIZE        "autosize"
 #define ATTRIBUTE_ITEMSTYLE_DROPDOWN        "dropdown"
 #define ATTRIBUTE_ITEMSTYLE_REPEAT          "repeat"
+#define ATTRIBUTE_ITEMSTYLE_TEXT    "text"
 #define ATTRIBUTE_ITEMSTYLE_DROPDOWNONLY    "dropdownonly"
+#define ATTRIBUTE_ITEMSTYLE_IMAGE    "image"
 
 #endif // __FRAMEWORK_XML_TOOLBOXCONFIGURATIONDEFINES_HXX_
diff --git a/framework/inc/xml/toolboxdocumenthandler.hxx b/framework/inc/xml/toolboxdocumenthandler.hxx
index ccf64e6d0033..ae5231ed8b24 100644
--- a/framework/inc/xml/toolboxdocumenthandler.hxx
+++ b/framework/inc/xml/toolboxdocumenthandler.hxx
@@ -77,6 +77,7 @@ class OReadToolBoxDocumentHandler : private ThreadHelpBase, // Struct for right
             TB_ATTRIBUTE_HELPID,
             TB_ATTRIBUTE_STYLE,
             TB_ATTRIBUTE_UINAME,
+            TB_ATTRIBUTE_TOOLTIP,
             TB_XML_ENTRY_COUNT
         };
 
@@ -159,10 +160,13 @@ class OReadToolBoxDocumentHandler : private ThreadHelpBase, // Struct for right
         sal_Int32                                                                       m_nHashCode_Style_DropDown;
         sal_Int32                                                                       m_nHashCode_Style_Repeat;
         sal_Int32                                                                       m_nHashCode_Style_DropDownOnly;
+        sal_Int32                                                                       m_nHashCode_Style_Text;
+        sal_Int32                                                                       m_nHashCode_Style_Image;
         rtl::OUString                                                                   m_aType;
         rtl::OUString                                                                   m_aLabel;
         rtl::OUString                                                                   m_aStyle;
         rtl::OUString                                                                   m_aHelpURL;
+        rtl::OUString                                                                   m_aTooltip;
         rtl::OUString                                                                   m_aIsVisible;
         rtl::OUString                                                                   m_aCommandURL;
 };
@@ -181,7 +185,7 @@ class OWriteToolBoxDocumentHandler : private ThreadHelpBase // Struct for right
               ::com::sun::star::uno::RuntimeException );
 
     protected:
-        virtual void WriteToolBoxItem( const rtl::OUString& aCommandURL, const rtl::OUString& aLabel, const rtl::OUString& aHelpURL,
+        virtual void WriteToolBoxItem( const rtl::OUString& aCommandURL, const rtl::OUString& aLabel, const rtl::OUString& aHelpURL, const rtl::OUString& aTooltip, sal_Int16 nStyle,
                                        sal_Int16 nWidth, sal_Bool bVisible ) throw
             ( ::com::sun::star::xml::sax::SAXException,
               ::com::sun::star::uno::RuntimeException );