renaissance2: rebase m76

author: Christian Lippka <christian.lippka@sun.com> 2010-04-12 13:03:45 +0200
committer: Christian Lippka <christian.lippka@sun.com> 2010-04-12 13:03:45 +0200
commit: c6963ac502f6b693d6c9bd6d2a3c08a442d3e86d (patch)
tree: dcc0948502746ef5e614cc9cf37fd1f1d97579e5
parent: a001605a190749900d3e09aa864ce56925ff848e (diff)
parent: f6b04c513837462449c4c4308bd76dec41cd5ed4 (diff)
87 files changed, 2227 insertions, 3616 deletions
diff --git a/framework/inc/helper/popupmenucontrollerbase.hxx b/framework/inc/helper/popupmenucontrollerbase.hxx
deleted file mode 100644
index e723b36aec3b..000000000000
--- a/framework/inc/helper/popupmenucontrollerbase.hxx
+++ /dev/null
@@ -1,145 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef __FRAMEWORK_HELPER_POPUPMENUCONTROLLERBASE_HXX_
-#define __FRAMEWORK_HELPER_POPUPMENUCONTROLLERBASE_HXX_
-
-//_________________________________________________________________________________________________________________
-//  my own includes
-//_________________________________________________________________________________________________________________
-
-#include <threadhelp/threadhelpbase.hxx>
-#include <macros/generic.hxx>
-#include <macros/xinterface.hxx>
-#include <macros/xtypeprovider.hxx>
-#include <macros/xserviceinfo.hxx>
-#include <stdtypes.h>
-
-//_________________________________________________________________________________________________________________
-//  interface includes
-//_________________________________________________________________________________________________________________
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XTypeProvider.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
-#include <com/sun/star/frame/XDispatchProvider.hpp>
-#include <com/sun/star/frame/XDispatch.hpp>
-#include <com/sun/star/frame/XStatusListener.hpp>
-#include <com/sun/star/frame/XPopupMenuController.hpp>
-#include <com/sun/star/uri/XUriReferenceFactory.hpp>
-#include <com/sun/star/uri/XUriReference.hpp>
-#include <com/sun/star/util/XURLTransformer.hpp>
-//_________________________________________________________________________________________________________________
-//  includes of other projects
-//_________________________________________________________________________________________________________________
-#include <toolkit/awt/vclxmenu.hxx>
-#include <cppuhelper/weak.hxx>
-#include <rtl/ustring.hxx>
-
-namespace framework
-{
-    class PopupMenuControllerBase :  public com::sun::star::lang::XTypeProvider           ,
-                                     public com::sun::star::lang::XServiceInfo            ,
-                                     public ::com::sun::star::frame::XPopupMenuController ,
-                                     public com::sun::star::lang::XInitialization         ,
-                                     public com::sun::star::frame::XStatusListener        ,
-                                     public com::sun::star::awt::XMenuListener            ,
-                                     public com::sun::star::frame::XDispatchProvider      ,
-                                     public com::sun::star::frame::XDispatch              ,
-                                     public com::sun::star::lang::XComponent              ,
-                                     protected ThreadHelpBase                             , // Struct for right initalization of mutex member! Must be first of baseclasses.
-                                     public ::cppu::OBroadcastHelper                      ,
-                                     public ::cppu::OWeakObject
-    {
-        public:
-            PopupMenuControllerBase( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
-            virtual ~PopupMenuControllerBase();
-
-            //  XInterface, XTypeProvider, XServiceInfo
-            FWK_DECLARE_XINTERFACE
-            FWK_DECLARE_XTYPEPROVIDER
-
-            // XServiceInfo
-            virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException) = 0;
-            virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException) = 0;
-            virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw (::com::sun::star::uno::RuntimeException) = 0;
-
-            // XPopupMenuController
-            virtual void SAL_CALL setPopupMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu >& PopupMenu ) throw (::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL updatePopupMenu() 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);
-
-            // XStatusListener
-            virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ) = 0;
-
-            // XMenuListener
-            virtual void SAL_CALL highlight( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL select( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL activate( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL deactivate( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
-
-            // XDispatchProvider
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& aURL, const ::rtl::OUString& sTarget, sal_Int32 nFlags ) throw( ::com::sun::star::uno::RuntimeException );
-            virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches( const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor >& lDescriptor ) throw( ::com::sun::star::uno::RuntimeException );
-
-            // XDispatch
-            virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& seqProperties ) throw( ::com::sun::star::uno::RuntimeException );
-            virtual void SAL_CALL addStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xControl, const ::com::sun::star::util::URL& aURL ) throw( ::com::sun::star::uno::RuntimeException );
-            virtual void SAL_CALL removeStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xControl, const ::com::sun::star::util::URL& aURL ) throw( ::com::sun::star::uno::RuntimeException );
-
-            // XEventListener
-            virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException );
-
-            // 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);
-
-        protected:
-            virtual void resetPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu );
-            virtual void impl_setPopupMenu();
-            virtual void impl_select(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& _xDispatch,const ::com::sun::star::util::URL& aURL);
-            ::rtl::OUString determineBaseURL( const ::rtl::OUString& aURL );
-
-
-            bool                                                                             m_bInitialized;
-            bool                                                                             m_bDisposed;
-            rtl::OUString                                                                    m_aCommandURL;
-            rtl::OUString                                                                    m_aBaseURL;
-            ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >           m_xDispatch;
-            ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >              m_xFrame;
-            ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager;
-            ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer >      m_xURLTransformer;
-            ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu >            m_xPopupMenu;
-            ::cppu::OMultiTypeInterfaceContainerHelper                                       m_aListenerContainer; // container for ALL Listener
-    };
-}
-
-#endif // __FRAMEWORK_HELPER_POPUPMENUCONTROLLERBASE_HXX_
diff --git a/framework/inc/threadhelp/fairrwlock.hxx b/framework/inc/threadhelp/fairrwlock.hxx
index af9617a9ba47..0f984c8d03f9 100644
--- a/framework/inc/threadhelp/fairrwlock.hxx
+++ b/framework/inc/threadhelp/fairrwlock.hxx
@@ -40,7 +40,6 @@
 //  interface includes
 //_________________________________________________________________________________________________________________
 #include <com/sun/star/uno/XInterface.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
 
 //_________________________________________________________________________________________________________________
 //  other includes
diff --git a/framework/inc/uielement/controlmenucontroller.hxx b/framework/inc/uielement/controlmenucontroller.hxx
index a1be2ee47b3b..6e0c9deb03c0 100644
--- a/framework/inc/uielement/controlmenucontroller.hxx
+++ b/framework/inc/uielement/controlmenucontroller.hxx
@@ -32,7 +32,7 @@
 //  my own includes
 //_________________________________________________________________________________________________________________
 
-#include <helper/popupmenucontrollerbase.hxx>
+#include <macros/xserviceinfo.hxx>
 #include <stdtypes.h>
 
 //_________________________________________________________________________________________________________________
@@ -52,6 +52,7 @@
 //_________________________________________________________________________________________________________________
 //  includes of other projects
 //_________________________________________________________________________________________________________________
+#include <svtools/popupmenucontrollerbase.hxx>
 #include <toolkit/awt/vclxmenu.hxx>
 #include <cppuhelper/weak.hxx>
 #include <rtl/ustring.hxx>
@@ -59,8 +60,10 @@
 class PopupMenu;
 namespace framework
 {
-    class ControlMenuController :  public PopupMenuControllerBase
+    class ControlMenuController :  public svt::PopupMenuControllerBase
     {
+        using svt::PopupMenuControllerBase::disposing;
+
         public:
             ControlMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
             virtual ~ControlMenuController();
diff --git a/framework/inc/uielement/fontmenucontroller.hxx b/framework/inc/uielement/fontmenucontroller.hxx
index f14680a49030..79905658839b 100644
--- a/framework/inc/uielement/fontmenucontroller.hxx
+++ b/framework/inc/uielement/fontmenucontroller.hxx
@@ -32,7 +32,7 @@
 //  my own includes
 //_________________________________________________________________________________________________________________
 
-#include <helper/popupmenucontrollerbase.hxx>
+#include <macros/xserviceinfo.hxx>
 #include <stdtypes.h>
 
 //_________________________________________________________________________________________________________________
@@ -50,14 +50,17 @@
 //_________________________________________________________________________________________________________________
 //  includes of other projects
 //_________________________________________________________________________________________________________________
+#include <svtools/popupmenucontrollerbase.hxx>
 #include <toolkit/awt/vclxmenu.hxx>
 #include <cppuhelper/weak.hxx>
 #include <rtl/ustring.hxx>
 
 namespace framework
 {
-    class FontMenuController :  public PopupMenuControllerBase
+    class FontMenuController :  public svt::PopupMenuControllerBase
     {
+        using svt::PopupMenuControllerBase::disposing;
+
         public:
             FontMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
             virtual ~FontMenuController();
diff --git a/framework/inc/uielement/fontsizemenucontroller.hxx b/framework/inc/uielement/fontsizemenucontroller.hxx
index d0afe40154fe..4e5623084908 100644
--- a/framework/inc/uielement/fontsizemenucontroller.hxx
+++ b/framework/inc/uielement/fontsizemenucontroller.hxx
@@ -32,7 +32,7 @@
 //  my own includes
 //_________________________________________________________________________________________________________________
 
-#include <helper/popupmenucontrollerbase.hxx>
+#include <macros/xserviceinfo.hxx>
 #include <stdtypes.h>
 
 //_________________________________________________________________________________________________________________
@@ -51,14 +51,17 @@
 //_________________________________________________________________________________________________________________
 //  includes of other projects
 //_________________________________________________________________________________________________________________
+#include <svtools/popupmenucontrollerbase.hxx>
 #include <toolkit/awt/vclxmenu.hxx>
 #include <cppuhelper/weak.hxx>
 #include <rtl/ustring.hxx>
 
 namespace framework
 {
-    class FontSizeMenuController :  public PopupMenuControllerBase
+    class FontSizeMenuController :  public svt::PopupMenuControllerBase
     {
+        using svt::PopupMenuControllerBase::disposing;
+
         public:
             FontSizeMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
             virtual ~FontSizeMenuController();
diff --git a/framework/inc/uielement/headermenucontroller.hxx b/framework/inc/uielement/headermenucontroller.hxx
index 8ec012e80319..0deeb878156d 100644
--- a/framework/inc/uielement/headermenucontroller.hxx
+++ b/framework/inc/uielement/headermenucontroller.hxx
@@ -32,7 +32,7 @@
 //  my own includes
 //_________________________________________________________________________________________________________________
 
-#include <helper/popupmenucontrollerbase.hxx>
+#include <macros/xserviceinfo.hxx>
 #include <stdtypes.h>
 
 //_________________________________________________________________________________________________________________
@@ -52,14 +52,17 @@
 //_________________________________________________________________________________________________________________
 //  includes of other projects
 //_________________________________________________________________________________________________________________
+#include <svtools/popupmenucontrollerbase.hxx>
 #include <toolkit/awt/vclxmenu.hxx>
 #include <cppuhelper/weak.hxx>
 #include <rtl/ustring.hxx>
 
 namespace framework
 {
-    class HeaderMenuController :  public PopupMenuControllerBase
+    class HeaderMenuController :  public svt::PopupMenuControllerBase
     {
+        using svt::PopupMenuControllerBase::disposing;
+
         public:
             HeaderMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager,bool _bFooter = sal_False );
             virtual ~HeaderMenuController();
diff --git a/framework/inc/uielement/langselectionmenucontroller.hxx b/framework/inc/uielement/langselectionmenucontroller.hxx
index 36035040bcad..a73a8f13b92e 100644
--- a/framework/inc/uielement/langselectionmenucontroller.hxx
+++ b/framework/inc/uielement/langselectionmenucontroller.hxx
@@ -32,7 +32,7 @@
 //  my own includes
 //_________________________________________________________________________________________________________________
 
-#include <helper/popupmenucontrollerbase.hxx>
+#include <macros/xserviceinfo.hxx>
 #include <stdtypes.h>
 
 //_________________________________________________________________________________________________________________
@@ -51,6 +51,7 @@
 //_________________________________________________________________________________________________________________
 //  includes of other projects
 //_________________________________________________________________________________________________________________
+#include <svtools/popupmenucontrollerbase.hxx>
 #include <toolkit/awt/vclxmenu.hxx>
 #include <cppuhelper/weak.hxx>
 #include <rtl/ustring.hxx>
@@ -59,8 +60,10 @@
 
 namespace framework
 {
-    class LanguageSelectionMenuController :  public PopupMenuControllerBase
+    class LanguageSelectionMenuController :  public svt::PopupMenuControllerBase
     {
+        using svt::PopupMenuControllerBase::disposing;
+
         public:
             LanguageSelectionMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
             virtual ~LanguageSelectionMenuController();
diff --git a/framework/inc/uielement/macrosmenucontroller.hxx b/framework/inc/uielement/macrosmenucontroller.hxx
index 6070a44d3564..1e8b9024eaca 100644
--- a/framework/inc/uielement/macrosmenucontroller.hxx
+++ b/framework/inc/uielement/macrosmenucontroller.hxx
@@ -28,7 +28,7 @@
 #ifndef __FRAMEWORK_UIELEMENT_MACROSMENUCONTROLLER_HXX_
 #define __FRAMEWORK_UIELEMENT_MACROSMENUCONTROLLER_HXX_
 
-#include <helper/popupmenucontrollerbase.hxx>
+#include <macros/xserviceinfo.hxx>
 #include <stdtypes.h>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
@@ -40,6 +40,7 @@
 #include <com/sun/star/frame/XStatusListener.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/frame/XPopupMenuController.hpp>
+#include <svtools/popupmenucontrollerbase.hxx>
 #include <toolkit/awt/vclxmenu.hxx>
 #include <cppuhelper/weak.hxx>
 #include <vcl/menu.hxx>
@@ -47,8 +48,10 @@
 
 namespace framework
 {
-    class MacrosMenuController :  public PopupMenuControllerBase
+    class MacrosMenuController :  public svt::PopupMenuControllerBase
     {
+        using svt::PopupMenuControllerBase::disposing;
+
         struct ExecuteInfo
         {
             ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >     xDispatch;
diff --git a/framework/inc/uielement/newmenucontroller.hxx b/framework/inc/uielement/newmenucontroller.hxx
index e937623b44b9..5e14b70f0044 100644
--- a/framework/inc/uielement/newmenucontroller.hxx
+++ b/framework/inc/uielement/newmenucontroller.hxx
@@ -32,7 +32,7 @@
 //  my own includes
 //_________________________________________________________________________________________________________________
 
-#include <helper/popupmenucontrollerbase.hxx>
+#include <macros/xserviceinfo.hxx>
 #include <stdtypes.h>
 
 //_________________________________________________________________________________________________________________
@@ -53,6 +53,7 @@
 //_________________________________________________________________________________________________________________
 //  includes of other projects
 //_________________________________________________________________________________________________________________
+#include <svtools/popupmenucontrollerbase.hxx>
 #include <toolkit/awt/vclxmenu.hxx>
 #include <cppuhelper/weak.hxx>
 #include <rtl/ustring.hxx>
@@ -71,8 +72,10 @@ namespace framework
         ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >      xDispatch;
     };
 
-    class NewMenuController :  public PopupMenuControllerBase
+    class NewMenuController :  public svt::PopupMenuControllerBase
     {
+        using svt::PopupMenuControllerBase::disposing;
+
         public:
             NewMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
             virtual ~NewMenuController();
diff --git a/framework/inc/uielement/objectmenucontroller.hxx b/framework/inc/uielement/objectmenucontroller.hxx
index 94c1d849e197..7a03dfd1458e 100644
--- a/framework/inc/uielement/objectmenucontroller.hxx
+++ b/framework/inc/uielement/objectmenucontroller.hxx
@@ -32,7 +32,7 @@
 //  my own includes
 //_________________________________________________________________________________________________________________
 
-#include <helper/popupmenucontrollerbase.hxx>
+#include <macros/xserviceinfo.hxx>
 #include <stdtypes.h>
 
 //_________________________________________________________________________________________________________________
@@ -51,14 +51,17 @@
 //_________________________________________________________________________________________________________________
 //  includes of other projects
 //_________________________________________________________________________________________________________________
+#include <svtools/popupmenucontrollerbase.hxx>
 #include <toolkit/awt/vclxmenu.hxx>
 #include <cppuhelper/weak.hxx>
 #include <rtl/ustring.hxx>
 
 namespace framework
 {
-    class ObjectMenuController :  public PopupMenuControllerBase
+    class ObjectMenuController :  public svt::PopupMenuControllerBase
     {
+        using svt::PopupMenuControllerBase::disposing;
+
         public:
             ObjectMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
             virtual ~ObjectMenuController();
diff --git a/framework/inc/uielement/popupmenucontroller.hxx b/framework/inc/uielement/popupmenucontroller.hxx
new file mode 100644
index 000000000000..ef44a4703ca2
--- /dev/null
+++ b/framework/inc/uielement/popupmenucontroller.hxx
@@ -0,0 +1,80 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef __FRAMEWORK_POPUPMENUCONTROLLER_HXX_
+#define __FRAMEWORK_POPUPMENUCONTROLLER_HXX_
+
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/frame/XPopupMenuController.hpp>
+
+#include "svtools/toolboxcontroller.hxx"
+#include "boost/scoped_ptr.hpp"
+
+#include <macros/xserviceinfo.hxx>
+
+class Window;
+
+namespace framework
+{
+class PopupMenuControllerImpl;
+
+class PopupMenuController : public svt::ToolboxController, public ::com::sun::star::lang::XServiceInfo
+{
+public:
+    PopupMenuController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager );
+    ~PopupMenuController();
+
+    // XInterface
+    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL acquire() throw ();
+    virtual void SAL_CALL release() throw ();
+
+    // XServiceInfo
+    DECLARE_XSERVICEINFO
+
+    // XComponent
+    virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException);
+
+    // XStatusListener
+    virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException );
+
+    // XToolbarController
+    virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL click() throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL doubleClick() 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);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createItemWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& Parent ) throw (::com::sun::star::uno::RuntimeException);
+
+    bool CreatePopupMenuController() throw (::com::sun::star::uno::Exception);
+
+    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XPopupMenuController > mxPopupMenuController;
+    ::com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu > mxPopupMenu;
+};
+
+} // namespace framework
+
+#endif // __FRAMEWORK_POPUPMENUCONTROLLER_HXX_
diff --git a/framework/inc/uielement/recentfilesmenucontroller.hxx b/framework/inc/uielement/recentfilesmenucontroller.hxx
index 40c3a55737c1..26a8e38dd49c 100644
--- a/framework/inc/uielement/recentfilesmenucontroller.hxx
+++ b/framework/inc/uielement/recentfilesmenucontroller.hxx
@@ -32,7 +32,7 @@
 //  my own includes
 //_________________________________________________________________________________________________________________
 
-#include <helper/popupmenucontrollerbase.hxx>
+#include <macros/xserviceinfo.hxx>
 #include <stdtypes.h>
 
 //_________________________________________________________________________________________________________________
@@ -52,6 +52,7 @@
 //_________________________________________________________________________________________________________________
 //  includes of other projects
 //_________________________________________________________________________________________________________________
+#include <svtools/popupmenucontrollerbase.hxx>
 #include <toolkit/awt/vclxmenu.hxx>
 #include <cppuhelper/weak.hxx>
 #include <rtl/ustring.hxx>
@@ -65,8 +66,10 @@ namespace framework
         ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >      xDispatch;
     };
 
-    class RecentFilesMenuController :  public PopupMenuControllerBase
+    class RecentFilesMenuController :  public svt::PopupMenuControllerBase
     {
+        using svt::PopupMenuControllerBase::disposing;
+
         public:
             RecentFilesMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
             virtual ~RecentFilesMenuController();
diff --git a/framework/inc/uielement/toolbarsmenucontroller.hxx b/framework/inc/uielement/toolbarsmenucontroller.hxx
index dcb0b57182df..35f517d33e80 100644
--- a/framework/inc/uielement/toolbarsmenucontroller.hxx
+++ b/framework/inc/uielement/toolbarsmenucontroller.hxx
@@ -32,7 +32,7 @@
 //  my own includes
 //_________________________________________________________________________________________________________________
 
-#include <helper/popupmenucontrollerbase.hxx>
+#include <macros/xserviceinfo.hxx>
 #include <stdtypes.h>
 
 //_________________________________________________________________________________________________________________
@@ -54,6 +54,7 @@
 //_________________________________________________________________________________________________________________
 //  includes of other projects
 //_________________________________________________________________________________________________________________
+#include <svtools/popupmenucontrollerbase.hxx>
 #include <toolkit/awt/vclxmenu.hxx>
 #include <cppuhelper/weak.hxx>
 #include <rtl/ustring.hxx>
@@ -63,8 +64,10 @@
 
 namespace framework
 {
-    class ToolbarsMenuController :  public PopupMenuControllerBase
+    class ToolbarsMenuController :  public svt::PopupMenuControllerBase
     {
+        using svt::PopupMenuControllerBase::disposing;
+
         public:
             ToolbarsMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
             virtual ~ToolbarsMenuController();
diff --git a/framework/source/helper/makefile.mk b/framework/source/helper/makefile.mk
index 556a9829d27c..ed54c381160c 100644
--- a/framework/source/helper/makefile.mk
+++ b/framework/source/helper/makefile.mk
@@ -53,7 +53,6 @@ SLOFILES= 			$(SLO)$/ocomponentaccess.obj					\
                     $(SLO)$/networkdomain.obj						\
                     $(SLO)$/acceleratorinfo.obj                     \
                     $(SLO)$/uielementwrapperbase.obj                \
-                    $(SLO)$/popupmenucontrollerbase.obj             \
                     $(SLO)$/dockingareadefaultacceptor.obj          \
                     $(SLO)$/uiconfigelementwrapperbase.obj          \
                     $(SLO)$/shareablemutex.obj                      \
diff --git a/framework/source/helper/popupmenucontrollerbase.cxx b/framework/source/helper/popupmenucontrollerbase.cxx
deleted file mode 100644
index cc5d388de9a8..000000000000
--- a/framework/source/helper/popupmenucontrollerbase.cxx
+++ /dev/null
@@ -1,429 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_framework.hxx"
-#include <helper/popupmenucontrollerbase.hxx>
-
-//_________________________________________________________________________________________________________________
-//  my own includes
-//_________________________________________________________________________________________________________________
-#include <threadhelp/resetableguard.hxx>
-#include "services.h"
-
-//_________________________________________________________________________________________________________________
-//  interface includes
-//_________________________________________________________________________________________________________________
-#include <com/sun/star/awt/XDevice.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/awt/MenuItemStyle.hpp>
-#include <com/sun/star/frame/XDispatchProvider.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
-
-//_________________________________________________________________________________________________________________
-//  includes of other projects
-//_________________________________________________________________________________________________________________
-
-#ifndef _VCL_MENU_HXX_
-#include <vcl/menu.hxx>
-#endif
-#include <vcl/svapp.hxx>
-#include <rtl/ustrbuf.hxx>
-#include <rtl/logfile.hxx>
-//_________________________________________________________________________________________________________________
-//  Defines
-//_________________________________________________________________________________________________________________
-//
-
-using namespace com::sun::star::uno;
-using namespace com::sun::star::lang;
-using namespace com::sun::star::frame;
-using namespace com::sun::star::beans;
-using namespace com::sun::star::util;
-
-namespace framework
-{
-
-//*****************************************************************************************************************
-//  XInterface, XTypeProvider, XServiceInfo
-//*****************************************************************************************************************
-DEFINE_XINTERFACE_11                    (   PopupMenuControllerBase                                                     ,
-                                            OWeakObject                                                                 ,
-                                            DIRECT_INTERFACE( css::lang::XTypeProvider                                  ),
-                                            DIRECT_INTERFACE( css::lang::XServiceInfo                                   ),
-                                            DIRECT_INTERFACE( ::com::sun::star::frame::XPopupMenuController       ),
-                                            DIRECT_INTERFACE( css::lang::XInitialization                                ),
-                                            DIRECT_INTERFACE( css::frame::XStatusListener                               ),
-                                            DIRECT_INTERFACE( css::awt::XMenuListener                                   ),
-                                            DIRECT_INTERFACE( css::frame::XDispatchProvider                             ),
-                                            DIRECT_INTERFACE( css::frame::XDispatch                                     ),
-                                            DIRECT_INTERFACE( css::lang::XComponent                                     ),
-                                            DERIVED_INTERFACE( css::lang::XEventListener, css::frame::XStatusListener   ),
-                                            DERIVED_INTERFACE( css::lang::XEventListener, css::awt::XMenuListener       )
-                                        )
-
-DEFINE_XTYPEPROVIDER_10                 (   PopupMenuControllerBase                             ,
-                                            css::lang::XTypeProvider                            ,
-                                            css::lang::XServiceInfo                             ,
-                                            ::com::sun::star::frame::XPopupMenuController ,
-                                            css::lang::XInitialization                          ,
-                                            css::frame::XStatusListener                         ,
-                                            css::awt::XMenuListener                             ,
-                                            css::lang::XEventListener                           ,
-                                            css::frame::XDispatchProvider                       ,
-                                            css::frame::XDispatch                               ,
-                                            css::lang::XComponent
-                                        )
-
-PopupMenuControllerBase::PopupMenuControllerBase( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ) :
-    ThreadHelpBase(),
-    ::cppu::OBroadcastHelperVar< ::cppu::OMultiTypeInterfaceContainerHelper, ::cppu::OMultiTypeInterfaceContainerHelper::keyType >( m_aLock.getShareableOslMutex() ),
-    m_bInitialized( false ),
-    m_bDisposed( false ),
-    m_xServiceManager( xServiceManager ),
-    m_aListenerContainer( m_aLock.getShareableOslMutex() )
-{
-    if ( m_xServiceManager.is() )
-        m_xURLTransformer.set( m_xServiceManager->createInstance(
-                                                                SERVICENAME_URLTRANSFORMER),
-                                                             UNO_QUERY );
-}
-
-PopupMenuControllerBase::~PopupMenuControllerBase()
-{
-}
-
-// protected function
-void PopupMenuControllerBase::resetPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu )
-{
-    VCLXPopupMenu* pPopupMenu = 0;
-    if ( rPopupMenu.is() && rPopupMenu->getItemCount() > 0 )
-    {
-         pPopupMenu = (VCLXPopupMenu *)VCLXMenu::GetImplementation( rPopupMenu );
-         if ( pPopupMenu )
-         {
-            vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
-
-            PopupMenu* pVCLPopupMenu = (PopupMenu *)pPopupMenu->GetMenu();
-            pVCLPopupMenu->Clear();
-         }
-    }
-}
-
-void SAL_CALL PopupMenuControllerBase::dispose()
-throw (::com::sun::star::uno::RuntimeException)
-{
-    css::uno::Reference< css::lang::XComponent > xThis( static_cast< ::cppu::OWeakObject* >(this), UNO_QUERY );
-
-    // Send message to all listener and forget their references.
-    css::lang::EventObject aEvent( xThis );
-    m_aListenerContainer.disposeAndClear( aEvent );
-
-    // Reset our members and set disposed flag
-    ResetableGuard aLock( m_aLock );
-    m_xFrame.clear();
-    m_xDispatch.clear();
-    m_xPopupMenu.clear();
-    m_xServiceManager.clear();
-    m_bDisposed = true;
-}
-
-void SAL_CALL PopupMenuControllerBase::addEventListener(
-    const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener )
-throw (::com::sun::star::uno::RuntimeException)
-{
-    m_aListenerContainer.addInterface( ::getCppuType( (const css::uno::Reference< css::lang::XEventListener >*)NULL ), xListener );
-}
-
-void SAL_CALL PopupMenuControllerBase::removeEventListener(
-    const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener )
-throw (::com::sun::star::uno::RuntimeException)
-{
-    m_aListenerContainer.removeInterface( ::getCppuType( (const css::uno::Reference< css::lang::XEventListener >*)NULL ), xListener );
-}
-
-// XEventListener
-void SAL_CALL PopupMenuControllerBase::disposing( const EventObject& ) throw ( RuntimeException )
-{
-    ResetableGuard aLock( m_aLock );
-    m_xFrame.clear();
-    m_xDispatch.clear();
-    m_xPopupMenu.clear();
-}
-
-// XMenuListener
-void SAL_CALL PopupMenuControllerBase::highlight( const css::awt::MenuEvent& ) throw (RuntimeException)
-{
-}
-
-void PopupMenuControllerBase::impl_select(const Reference< XDispatch >& _xDispatch,const ::com::sun::star::util::URL& aURL)
-{
-    Sequence<PropertyValue>      aArgs;
-    OSL_ENSURE(_xDispatch.is(),"PopupMenuControllerBase::impl_select: No dispatch");
-    if ( _xDispatch.is() )
-        _xDispatch->dispatch( aURL, aArgs );
-}
-
-void SAL_CALL PopupMenuControllerBase::select( const css::awt::MenuEvent& rEvent ) throw (RuntimeException)
-{
-    Reference< css::awt::XPopupMenu >   xPopupMenu;
-    Reference< XDispatch >              xDispatch;
-    Reference< XMultiServiceFactory >   xServiceManager;
-
-    if ( m_bDisposed )
-        throw DisposedException();
-
-    ResetableGuard aLock( m_aLock );
-    xPopupMenu      = m_xPopupMenu;
-    xDispatch       = m_xDispatch;
-    xServiceManager = m_xServiceManager;
-    aLock.unlock();
-
-    if ( xPopupMenu.is() )
-    {
-        VCLXPopupMenu* pPopupMenu = (VCLXPopupMenu *)VCLXPopupMenu::GetImplementation( xPopupMenu );
-        if ( pPopupMenu )
-        {
-            css::util::URL               aTargetURL;
-            {
-                vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
-                PopupMenu* pVCLPopupMenu = (PopupMenu *)pPopupMenu->GetMenu();
-                aTargetURL.Complete = pVCLPopupMenu->GetItemCommand( rEvent.MenuId );
-            }
-
-            m_xURLTransformer->parseStrict( aTargetURL );
-            impl_select(xDispatch,aTargetURL);
-        }
-    }
-}
-
-void SAL_CALL PopupMenuControllerBase::activate( const css::awt::MenuEvent& ) throw (RuntimeException)
-{
-}
-
-void SAL_CALL PopupMenuControllerBase::deactivate( const css::awt::MenuEvent& ) throw (RuntimeException)
-{
-}
-
-void SAL_CALL PopupMenuControllerBase::updatePopupMenu() throw ( ::com::sun::star::uno::RuntimeException )
-{
-    ResetableGuard aLock( m_aLock );
-
-    if ( m_bDisposed )
-        throw DisposedException();
-
-    Reference< XStatusListener > xStatusListener( static_cast< OWeakObject* >( this ), UNO_QUERY );
-    Reference< XDispatch > xDispatch( m_xDispatch );
-    com::sun::star::util::URL aTargetURL;
-    aTargetURL.Complete = m_aCommandURL;
-    m_xURLTransformer->parseStrict( aTargetURL );
-    aLock.unlock();
-
-    // Add/remove status listener to get a status update once
-    if ( xDispatch.is() )
-    {
-        xDispatch->addStatusListener( xStatusListener, aTargetURL );
-        xDispatch->removeStatusListener( xStatusListener, aTargetURL );
-    }
-}
-
-// XDispatchProvider
-Reference< XDispatch > SAL_CALL
-PopupMenuControllerBase::queryDispatch(
-    const URL& /*aURL*/,
-    const rtl::OUString& /*sTarget*/,
-    sal_Int32 /*nFlags*/ )
-throw( RuntimeException )
-{
-    // must be implemented by subclass
-    ResetableGuard aLock( m_aLock );
-    if ( m_bDisposed )
-        throw DisposedException();
-
-    return Reference< XDispatch >();
-}
-
-Sequence< Reference< XDispatch > > SAL_CALL PopupMenuControllerBase::queryDispatches( const Sequence< DispatchDescriptor >& lDescriptor ) throw( RuntimeException )
-{
-    // Create return list - which must have same size then the given descriptor
-    // It's not allowed to pack it!
-    ResetableGuard aLock( m_aLock );
-    if ( m_bDisposed )
-        throw DisposedException();
-    aLock.unlock();
-
-    sal_Int32                                                          nCount = lDescriptor.getLength();
-    css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > lDispatcher( nCount );
-
-    // Step over all descriptors and try to get any dispatcher for it.
-    for( sal_Int32 i=0; i<nCount; ++i )
-    {
-        lDispatcher[i] = queryDispatch( lDescriptor[i].FeatureURL  ,
-                                        lDescriptor[i].FrameName   ,
-                                        lDescriptor[i].SearchFlags );
-    }
-
-    return lDispatcher;
-}
-
-// XDispatch
-void SAL_CALL
-PopupMenuControllerBase::dispatch(
-    const URL& /*aURL*/,
-    const Sequence< PropertyValue >& /*seqProperties*/ )
-throw( ::com::sun::star::uno::RuntimeException )
-{
-    // must be implemented by subclass
-    ResetableGuard aLock( m_aLock );
-    if ( m_bDisposed )
-        throw DisposedException();
-}
-
-void SAL_CALL
-PopupMenuControllerBase::addStatusListener(
-    const Reference< XStatusListener >& xControl,
-    const URL& aURL )
-throw( ::com::sun::star::uno::RuntimeException )
-{
-    ResetableGuard aLock( m_aLock );
-    if ( m_bDisposed )
-        throw DisposedException();
-    aLock.unlock();
-
-    bool bStatusUpdate( false );
-    m_aListenerContainer.addInterface( ::getCppuType( (const css::uno::Reference< css::frame::XStatusListener >*)NULL ), xControl );
-
-    aLock.lock();
-    if ( aURL.Complete.indexOf( m_aBaseURL ) == 0 )
-        bStatusUpdate = true;
-    aLock.unlock();
-
-    if ( bStatusUpdate )
-    {
-        // Dummy update for popup menu controllers
-        FeatureStateEvent aEvent;
-        aEvent.FeatureURL = aURL;
-        aEvent.IsEnabled  = sal_True;
-        aEvent.Requery    = sal_False;
-        aEvent.State      = Any();
-        xControl->statusChanged( aEvent );
-    }
-}
-
-void SAL_CALL PopupMenuControllerBase::removeStatusListener(
-    const Reference< XStatusListener >& xControl,
-    const URL& /*aURL*/ )
-throw( ::com::sun::star::uno::RuntimeException )
-{
-    m_aListenerContainer.removeInterface( ::getCppuType( (const css::uno::Reference< css::frame::XStatusListener >*)NULL ), xControl );
-}
-
-::rtl::OUString PopupMenuControllerBase::determineBaseURL( const ::rtl::OUString& aURL )
-{
-    // Just use the main part of the URL for popup menu controllers
-    sal_Int32     nQueryPart( 0 );
-    sal_Int32     nSchemePart( 0 );
-    rtl::OUString aMainURL( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.popup:" ));
-
-    nSchemePart = aURL.indexOf( ':' );
-    if (( nSchemePart > 0 ) &&
-        ( aURL.getLength() > ( nSchemePart+1 )))
-    {
-        nQueryPart  = aURL.indexOf( '?', nSchemePart );
-        if ( nQueryPart > 0 )
-            aMainURL += aURL.copy( nSchemePart, nQueryPart-nSchemePart );
-        else if ( nQueryPart == -1 )
-            aMainURL += aURL.copy( nSchemePart+1 );
-    }
-
-    return aMainURL;
-}
-
-// XInitialization
-void SAL_CALL PopupMenuControllerBase::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException )
-{
-    ResetableGuard aLock( m_aLock );
-
-    sal_Bool bInitalized( m_bInitialized );
-    if ( !bInitalized )
-    {
-        PropertyValue       aPropValue;
-        rtl::OUString       aCommandURL;
-        Reference< XFrame > xFrame;
-
-        for ( int i = 0; i < aArguments.getLength(); i++ )
-        {
-            if ( aArguments[i] >>= aPropValue )
-            {
-                if ( aPropValue.Name.equalsAscii( "Frame" ))
-                    aPropValue.Value >>= xFrame;
-                else if ( aPropValue.Name.equalsAscii( "CommandURL" ))
-                    aPropValue.Value >>= aCommandURL;
-            }
-        }
-
-        if ( xFrame.is() && aCommandURL.getLength() )
-        {
-            m_xFrame        = xFrame;
-            m_aCommandURL   = aCommandURL;
-            m_aBaseURL      = determineBaseURL( aCommandURL );
-            m_bInitialized  = true;
-        }
-    }
-}
-// XPopupMenuController
-void SAL_CALL PopupMenuControllerBase::setPopupMenu( const Reference< css::awt::XPopupMenu >& xPopupMenu ) throw ( RuntimeException )
-{
-    ResetableGuard aLock( m_aLock );
-
-    if ( m_bDisposed )
-        throw DisposedException();
-
-    if ( m_xFrame.is() && !m_xPopupMenu.is() )
-    {
-        // Create popup menu on demand
-        vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
-
-        m_xPopupMenu = xPopupMenu;
-        m_xPopupMenu->addMenuListener( Reference< css::awt::XMenuListener >( (OWeakObject*)this, UNO_QUERY ));
-
-        Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
-
-        com::sun::star::util::URL aTargetURL;
-        aTargetURL.Complete = m_aCommandURL;
-        m_xURLTransformer->parseStrict( aTargetURL );
-        m_xDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 );
-
-        impl_setPopupMenu();
-
-        updatePopupMenu();
-    }
-}
-void PopupMenuControllerBase::impl_setPopupMenu()
-{
-}
-}
diff --git a/framework/source/helper/uiconfigelementwrapperbase.cxx b/framework/source/helper/uiconfigelementwrapperbase.cxx
index 1ddda0eb0f4d..5660e5a310e3 100644
--- a/framework/source/helper/uiconfigelementwrapperbase.cxx
+++ b/framework/source/helper/uiconfigelementwrapperbase.cxx
@@ -45,7 +45,6 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/ui/XUIConfiguration.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
 
 //_________________________________________________________________________________________________________________
 //  includes of other projects
diff --git a/framework/source/register/registertemp.cxx b/framework/source/register/registertemp.cxx
index dc5682c7d398..7382380ef525 100644
--- a/framework/source/register/registertemp.cxx
+++ b/framework/source/register/registertemp.cxx
@@ -78,6 +78,7 @@
 #include <uielement/macrosmenucontroller.hxx>
 #include <uielement/newmenucontroller.hxx>
 #include <uielement/toolbarsmenucontroller.hxx>
+#include <uielement/popupmenucontroller.hxx>
 
 COMPONENTGETIMPLEMENTATIONENVIRONMENT
 
@@ -103,6 +104,7 @@ COMPONENTWRITEINFO  (   COMPONENTINFO( ::framework::MediaTypeDetectionHelper
                         COMPONENTINFO( ::framework::DispatchRecorderSupplier                )
                         COMPONENTINFO( ::framework::Oxt_Handler                             )
                         COMPONENTINFO( ::framework::License                                 )
+                        COMPONENTINFO( ::framework::PopupMenuController                     )
                     )
 
 COMPONENTGETFACTORY (   IFFACTORY( ::framework::MediaTypeDetectionHelper        )
@@ -126,5 +128,6 @@ COMPONENTGETFACTORY (   IFFACTORY( ::framework::MediaTypeDetectionHelper
                         IFFACTORY( ::framework::FooterMenuController                    )   else
                         IFFACTORY( ::framework::HeaderMenuController                    )   else
                         IFFACTORY( ::framework::LanguageSelectionMenuController         )   else
-                        IFFACTORY( ::framework::Oxt_Handler                             )
+                        IFFACTORY( ::framework::Oxt_Handler                             )   else
+                        IFFACTORY( ::framework::PopupMenuController                     )
                     )
diff --git a/framework/source/uielement/comboboxtoolbarcontroller.cxx b/framework/source/uielement/comboboxtoolbarcontroller.cxx
index 3921625cc76f..058005ffdc40 100644
--- a/framework/source/uielement/comboboxtoolbarcontroller.cxx
+++ b/framework/source/uielement/comboboxtoolbarcontroller.cxx
@@ -46,7 +46,6 @@
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/frame/status/ItemStatus.hpp>
 #include <com/sun/star/frame/status/ItemState.hpp>
 #include <com/sun/star/frame/status/Visibility.hpp>
diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx
index 0672ac69d351..49501194a014 100644
--- a/framework/source/uielement/controlmenucontroller.cxx
+++ b/framework/source/uielement/controlmenucontroller.cxx
@@ -61,6 +61,7 @@
 #include <vcl/image.hxx>
 #include <svtools/menuoptions.hxx>
 #include <dispatch/uieventloghelper.hxx>
+#include <vos/mutex.hxx>
 
 // Copied from svx
 // Function-Id's
@@ -213,7 +214,7 @@ DEFINE_XSERVICEINFO_MULTISERVICE        (   ControlMenuController
 DEFINE_INIT_SERVICE                     (   ControlMenuController, {} )
 
 ControlMenuController::ControlMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ) :
-    PopupMenuControllerBase( xServiceManager ),
+    svt::PopupMenuControllerBase( xServiceManager ),
     m_pResPopupMenu( 0 )
 {
     const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
@@ -272,7 +273,7 @@ void SAL_CALL ControlMenuController::disposing( const EventObject& ) throw ( Run
 {
     Reference< css::awt::XMenuListener > xHolder(( OWeakObject *)this, UNO_QUERY );
 
-    ResetableGuard aLock( m_aLock );
+    osl::ResettableMutexGuard aLock( m_aMutex );
     m_xFrame.clear();
     m_xDispatch.clear();
     m_xServiceManager.clear();
@@ -286,7 +287,7 @@ void SAL_CALL ControlMenuController::disposing( const EventObject& ) throw ( Run
 // XStatusListener
 void SAL_CALL ControlMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException )
 {
-    ResetableGuard aLock( m_aLock );
+    osl::ResettableMutexGuard aLock( m_aMutex );
 
     USHORT nMenuId = 0;
     for (sal_uInt32 i=0; i < sizeof(aCommands)/sizeof(aCommands[0]); ++i)
@@ -351,7 +352,7 @@ void ControlMenuController::impl_select(const Reference< XDispatch >& /*_xDispat
 
 void SAL_CALL ControlMenuController::activate( const css::awt::MenuEvent& ) throw (RuntimeException)
 {
-    ResetableGuard aLock( m_aLock );
+    osl::ResettableMutexGuard aLock( m_aMutex );
 
     if ( m_xPopupMenu.is() )
     {
@@ -404,10 +405,9 @@ void ControlMenuController::impl_setPopupMenu()
 
 void SAL_CALL ControlMenuController::updatePopupMenu() throw (::com::sun::star::uno::RuntimeException)
 {
-    ResetableGuard aLock( m_aLock );
+    osl::ResettableMutexGuard aLock( m_aMutex );
 
-    if ( m_bDisposed )
-        throw DisposedException();
+    throwIfDisposed();
 
     if ( m_xFrame.is() && m_xPopupMenu.is() )
     {
@@ -435,8 +435,8 @@ void SAL_CALL ControlMenuController::updatePopupMenu() throw (::com::sun::star::
 // XInitialization
 void SAL_CALL ControlMenuController::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException )
 {
-    ResetableGuard aLock( m_aLock );
-    PopupMenuControllerBase::initialize(aArguments);
+    osl::ResettableMutexGuard aLock( m_aMutex );
+    svt::PopupMenuControllerBase::initialize(aArguments);
     m_aBaseURL = ::rtl::OUString();
 }
 
diff --git a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
index 43b50eb2a49a..0800103c743e 100644
--- a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
+++ b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
@@ -46,7 +46,6 @@
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/frame/status/ItemStatus.hpp>
 #include <com/sun/star/frame/status/ItemState.hpp>
 #include <com/sun/star/frame/status/Visibility.hpp>
diff --git a/framework/source/uielement/edittoolbarcontroller.cxx b/framework/source/uielement/edittoolbarcontroller.cxx
index 3ad4b11fd1e9..387213d7c3eb 100644
--- a/framework/source/uielement/edittoolbarcontroller.cxx
+++ b/framework/source/uielement/edittoolbarcontroller.cxx
@@ -46,7 +46,6 @@
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/frame/status/ItemStatus.hpp>
 #include <com/sun/star/frame/status/ItemState.hpp>
 #include <com/sun/star/frame/status/Visibility.hpp>
diff --git a/framework/source/uielement/fontmenucontroller.cxx b/framework/source/uielement/fontmenucontroller.cxx
index 7110ea5aa519..c2625a951efb 100644
--- a/framework/source/uielement/fontmenucontroller.cxx
+++ b/framework/source/uielement/fontmenucontroller.cxx
@@ -59,6 +59,7 @@
 #include <vcl/mnemonic.hxx>
 #endif
 #include <dispatch/uieventloghelper.hxx>
+#include <vos/mutex.hxx>
 
 //_________________________________________________________________________________________________________________
 //  Defines
@@ -91,7 +92,7 @@ DEFINE_XSERVICEINFO_MULTISERVICE        (   FontMenuController
 DEFINE_INIT_SERVICE                     (   FontMenuController, {} )
 
 FontMenuController::FontMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ) :
-    PopupMenuControllerBase( xServiceManager )
+    svt::PopupMenuControllerBase( xServiceManager )
 {
 }
 
@@ -145,7 +146,7 @@ void SAL_CALL FontMenuController::disposing( const EventObject& ) throw ( Runtim
 {
     Reference< css::awt::XMenuListener > xHolder(( OWeakObject *)this, UNO_QUERY );
 
-    ResetableGuard aLock( m_aLock );
+    osl::MutexGuard aLock( m_aMutex );
     m_xFrame.clear();
     m_xDispatch.clear();
     m_xFontListDispatch.clear();
@@ -164,12 +165,12 @@ void SAL_CALL FontMenuController::statusChanged( const FeatureStateEvent& Event
 
     if ( Event.State >>= aFontDescriptor )
     {
-        ResetableGuard aLock( m_aLock );
+        osl::MutexGuard aLock( m_aMutex );
         m_aFontFamilyName = aFontDescriptor.Name;
     }
     else if ( Event.State >>= aFontNameSeq )
     {
-        ResetableGuard aLock( m_aLock );
+        osl::MutexGuard aLock( m_aMutex );
         if ( m_xPopupMenu.is() )
             fillPopupMenu( aFontNameSeq, m_xPopupMenu );
     }
@@ -192,7 +193,7 @@ void FontMenuController::impl_select(const Reference< XDispatch >& _xDispatch,co
 
 void SAL_CALL FontMenuController::activate( const css::awt::MenuEvent& ) throw (RuntimeException)
 {
-    ResetableGuard aLock( m_aLock );
+    osl::MutexGuard aLock( m_aMutex );
 
     if ( m_xPopupMenu.is() )
     {
@@ -241,14 +242,14 @@ void FontMenuController::impl_setPopupMenu()
 
 void SAL_CALL FontMenuController::updatePopupMenu() throw ( ::com::sun::star::uno::RuntimeException )
 {
-    PopupMenuControllerBase::updatePopupMenu();
+    svt::PopupMenuControllerBase::updatePopupMenu();
 
-    ResetableGuard aLock( m_aLock );
+    osl::ClearableMutexGuard aLock( m_aMutex );
     Reference< XDispatch > xDispatch( m_xFontListDispatch );
     com::sun::star::util::URL aTargetURL;
     aTargetURL.Complete = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontNameList" ));
     m_xURLTransformer->parseStrict( aTargetURL );
-    aLock.unlock();
+    aLock.clear();
 
     if ( xDispatch.is() )
     {
diff --git a/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx
index 8dbd608a28e0..58cf3a3b02be 100644
--- a/framework/source/uielement/fontsizemenucontroller.cxx
+++ b/framework/source/uielement/fontsizemenucontroller.cxx
@@ -64,6 +64,7 @@
 #include <svtools/ctrltool.hxx>
 #endif
 #include <dispatch/uieventloghelper.hxx>
+#include <vos/mutex.hxx>
 
 //_________________________________________________________________________________________________________________
 //  Defines
@@ -90,7 +91,7 @@ DEFINE_XSERVICEINFO_MULTISERVICE        (   FontSizeMenuController
 DEFINE_INIT_SERVICE                     (   FontSizeMenuController, {} )
 
 FontSizeMenuController::FontSizeMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ) :
-    PopupMenuControllerBase( xServiceManager ),
+    svt::PopupMenuControllerBase( xServiceManager ),
     m_pHeightArray( 0 ),
     m_bRebuildMenu( sal_True )
 {
@@ -280,7 +281,7 @@ void SAL_CALL FontSizeMenuController::disposing( const EventObject& ) throw ( Ru
 {
     Reference< css::awt::XMenuListener > xHolder(( OWeakObject *)this, UNO_QUERY );
 
-    ResetableGuard aLock( m_aLock );
+    osl::MutexGuard aLock( m_aMutex );
     m_xFrame.clear();
     m_xDispatch.clear();
     m_xCurrentFontDispatch.clear();
@@ -297,7 +298,7 @@ void SAL_CALL FontSizeMenuController::statusChanged( const FeatureStateEvent& Ev
 
     if ( Event.State >>= aFontDescriptor )
     {
-        ResetableGuard aLock( m_aLock );
+        osl::MutexGuard aLock( m_aMutex );
         m_aFontDescriptor = aFontDescriptor;
 
         if ( m_xPopupMenu.is() )
@@ -306,7 +307,7 @@ void SAL_CALL FontSizeMenuController::statusChanged( const FeatureStateEvent& Ev
     }
     else if ( Event.State >>= aFontHeight )
     {
-        ResetableGuard aLock( m_aLock );
+        osl::MutexGuard aLock( m_aMutex );
         m_aFontHeight = aFontHeight;
 
         if ( m_xPopupMenu.is() )
@@ -341,16 +342,15 @@ void FontSizeMenuController::impl_setPopupMenu()
 
 void SAL_CALL FontSizeMenuController::updatePopupMenu() throw ( ::com::sun::star::uno::RuntimeException )
 {
-    ResetableGuard aLock( m_aLock );
+    osl::ClearableMutexGuard aLock( m_aMutex );
 
-    if ( m_bDisposed )
-        throw DisposedException();
+    throwIfDisposed();
 
     Reference< XDispatch > xDispatch( m_xCurrentFontDispatch );
     com::sun::star::util::URL aTargetURL;
     aTargetURL.Complete = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CharFontName" ));
     m_xURLTransformer->parseStrict( aTargetURL );
-    aLock.unlock();
+    aLock.clear();
 
     if ( xDispatch.is() )
     {
@@ -358,6 +358,6 @@ void SAL_CALL FontSizeMenuController::updatePopupMenu() throw ( ::com::sun::star
         xDispatch->removeStatusListener( SAL_STATIC_CAST( XStatusListener*, this ), aTargetURL );
     }
 
-    PopupMenuControllerBase::updatePopupMenu();
+    svt::PopupMenuControllerBase::updatePopupMenu();
 }
 }
diff --git a/framework/source/uielement/headermenucontroller.cxx b/framework/source/uielement/headermenucontroller.cxx
index 50b2ed65e2d2..c0d7b48a401b 100644
--- a/framework/source/uielement/headermenucontroller.cxx
+++ b/framework/source/uielement/headermenucontroller.cxx
@@ -50,7 +50,6 @@
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
 
 //_________________________________________________________________________________________________________________
 //  includes of other projects
@@ -65,6 +64,7 @@
 #include <rtl/ustrbuf.hxx>
 //#include <tools/solar.hrc>
 #include <dispatch/uieventloghelper.hxx>
+#include <vos/mutex.hxx>
 
 //_________________________________________________________________________________________________________________
 //  Defines
@@ -97,7 +97,7 @@ DEFINE_XSERVICEINFO_MULTISERVICE        (   HeaderMenuController
 DEFINE_INIT_SERVICE                     (   HeaderMenuController, {} )
 
 HeaderMenuController::HeaderMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager,bool _bFooter ) :
-    PopupMenuControllerBase( xServiceManager )
+    svt::PopupMenuControllerBase( xServiceManager )
     ,m_bFooter(_bFooter)
 {
 }
@@ -221,7 +221,7 @@ void SAL_CALL HeaderMenuController::disposing( const EventObject& ) throw ( Runt
 {
     Reference< css::awt::XMenuListener > xHolder(( OWeakObject *)this, UNO_QUERY );
 
-    ResetableGuard aLock( m_aLock );
+    osl::MutexGuard aLock( m_aMutex );
     m_xFrame.clear();
     m_xDispatch.clear();
     m_xServiceManager.clear();
@@ -238,7 +238,7 @@ void SAL_CALL HeaderMenuController::statusChanged( const FeatureStateEvent& Even
 
     if ( Event.State >>= xModel )
     {
-        ResetableGuard aLock( m_aLock );
+        osl::MutexGuard aLock( m_aMutex );
         m_xModel = xModel;
         if ( m_xPopupMenu.is() )
             fillPopupMenu( xModel, m_xPopupMenu );
@@ -258,18 +258,17 @@ void HeaderMenuController::impl_select(const Reference< XDispatch >& _xDispatch,
 
 void SAL_CALL HeaderMenuController::updatePopupMenu() throw (::com::sun::star::uno::RuntimeException)
 {
-    ResetableGuard aLock( m_aLock );
+    osl::ResettableMutexGuard aLock( m_aMutex );
 
-    if ( m_bDisposed )
-        throw DisposedException();
+    throwIfDisposed();
 
     Reference< com::sun::star::frame::XModel > xModel( m_xModel );
-    aLock.unlock();
+    aLock.clear();
 
     if ( !xModel.is() )
-        PopupMenuControllerBase::updatePopupMenu();
+        svt::PopupMenuControllerBase::updatePopupMenu();
 
-    aLock.lock();
+    aLock.reset();
     if ( m_xPopupMenu.is() && m_xModel.is() )
         fillPopupMenu( m_xModel, m_xPopupMenu );
 }
diff --git a/framework/source/uielement/imagebuttontoolbarcontroller.cxx b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
index d9af2fb4f9f9..5126ffdd253a 100644
--- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx
+++ b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
@@ -46,7 +46,6 @@
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/frame/XControlNotificationListener.hpp>
 #include "com/sun/star/util/XMacroExpander.hpp"
 #include "com/sun/star/uno/XComponentContext.hpp"
diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx
index 9c8e68e24734..f9ead6c585c2 100644
--- a/framework/source/uielement/langselectionmenucontroller.cxx
+++ b/framework/source/uielement/langselectionmenucontroller.cxx
@@ -76,6 +76,7 @@
 #include <dispatch/uieventloghelper.hxx>
 
 #include "helper/mischelper.hxx"
+#include <vos/mutex.hxx>
 
 //_________________________________________________________________________________________________________________
 //  Defines
@@ -101,7 +102,7 @@ DEFINE_XSERVICEINFO_MULTISERVICE        (   LanguageSelectionMenuController
 DEFINE_INIT_SERVICE                     (   LanguageSelectionMenuController, {} )
 
 LanguageSelectionMenuController::LanguageSelectionMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ) :
-    PopupMenuControllerBase( xServiceManager ),
+    svt::PopupMenuControllerBase( xServiceManager ),
     m_bShowMenu( sal_True )
     ,m_aLangGuessHelper(xServiceManager)
 {
@@ -116,7 +117,7 @@ void SAL_CALL LanguageSelectionMenuController::disposing( const EventObject& ) t
 {
     Reference< css::awt::XMenuListener > xHolder(( OWeakObject *)this, UNO_QUERY );
 
-    ResetableGuard aLock( m_aLock );
+    osl::MutexGuard aLock( m_aMutex );
     m_xFrame.clear();
     m_xDispatch.clear();
     m_xLanguageDispatch.clear();
@@ -132,7 +133,7 @@ void SAL_CALL LanguageSelectionMenuController::statusChanged( const FeatureState
 {
     vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
 
-    if ( m_bDisposed )
+    if (rBHelper.bDisposed || rBHelper.bInDispose)
         return;
 
     m_bShowMenu = sal_True;
@@ -380,15 +381,15 @@ void LanguageSelectionMenuController::fillPopupMenu( Reference< css::awt::XPopup
 
 void SAL_CALL LanguageSelectionMenuController::updatePopupMenu() throw ( ::com::sun::star::uno::RuntimeException )
 {
-    PopupMenuControllerBase::updatePopupMenu();
+    svt::PopupMenuControllerBase::updatePopupMenu();
 
     // Force status update to get information about the current languages
-    ResetableGuard aLock( m_aLock );
+    osl::ClearableMutexGuard aLock( m_aMutex );
     Reference< XDispatch > xDispatch( m_xLanguageDispatch );
     com::sun::star::util::URL aTargetURL;
     aTargetURL.Complete = m_aLangStatusCommandURL;
     m_xURLTransformer->parseStrict( aTargetURL );
-    aLock.unlock();
+    aLock.clear();
 
     if ( xDispatch.is() )
     {
@@ -415,12 +416,12 @@ void SAL_CALL LanguageSelectionMenuController::updatePopupMenu() throw ( ::com::
 // XInitialization
 void SAL_CALL LanguageSelectionMenuController::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException )
 {
-    ResetableGuard aLock( m_aLock );
+    osl::MutexGuard aLock( m_aMutex );
 
     sal_Bool bInitalized( m_bInitialized );
     if ( !bInitalized )
     {
-        PopupMenuControllerBase::initialize(aArguments);
+        svt::PopupMenuControllerBase::initialize(aArguments);
 
         if ( m_bInitialized )
         {
diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx
index f0f5d52a47d6..2905d0c0bd05 100644
--- a/framework/source/uielement/macrosmenucontroller.cxx
+++ b/framework/source/uielement/macrosmenucontroller.cxx
@@ -48,6 +48,7 @@
 #include <rtl/ustrbuf.hxx>
 #include <dispatch/uieventloghelper.hxx>
 #include "helper/mischelper.hxx"
+#include <vos/mutex.hxx>
 
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
@@ -70,7 +71,7 @@ DEFINE_XSERVICEINFO_MULTISERVICE        (   MacrosMenuController
 DEFINE_INIT_SERVICE                     (   MacrosMenuController, {} )
 
 MacrosMenuController::MacrosMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ) :
-    PopupMenuControllerBase( xServiceManager ),
+    svt::PopupMenuControllerBase( xServiceManager ),
     m_xServiceManager( xServiceManager)
 {
 }
@@ -109,7 +110,7 @@ void SAL_CALL MacrosMenuController::disposing( const EventObject& ) throw ( Runt
 {
     Reference< css::awt::XMenuListener > xHolder(( OWeakObject *)this, UNO_QUERY );
 
-    ResetableGuard aLock( m_aLock );
+    osl::MutexGuard aLock( m_aMutex );
     OSL_TRACE("disposing");
     m_xFrame.clear();
     m_xDispatch.clear();
@@ -126,7 +127,7 @@ void SAL_CALL MacrosMenuController::disposing( const EventObject& ) throw ( Runt
 // XStatusListener
 void SAL_CALL MacrosMenuController::statusChanged( const FeatureStateEvent& ) throw ( RuntimeException )
 {
-    ResetableGuard aLock( m_aLock );
+    osl::MutexGuard aLock( m_aMutex );
     if ( m_xPopupMenu.is() )
     {
         fillPopupMenu( m_xPopupMenu );
diff --git a/framework/source/uielement/makefile.mk b/framework/source/uielement/makefile.mk
index da4ab3d34c74..b74adb1e176f 100644
--- a/framework/source/uielement/makefile.mk
+++ b/framework/source/uielement/makefile.mk
@@ -79,6 +79,7 @@ SLOFILES=           \
                     $(SLO)$/toolbarmerger.obj                   \
                     $(SLO)$/toolbarsmenucontroller.obj          \
                     $(SLO)$/toolbarwrapper.obj                  \
+                    $(SLO)$/popupmenucontroller.obj				\
                     $(SLO)$/uicommanddescription.obj            \
 
 # --- Targets ------------------------------------------------------
diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx
index 3ac78726d799..786795ff1d14 100644
--- a/framework/source/uielement/newmenucontroller.cxx
+++ b/framework/source/uielement/newmenucontroller.cxx
@@ -67,6 +67,7 @@
 #include <svtools/acceleratorexecute.hxx>
 #include <unotools/moduleoptions.hxx>
 #include <dispatch/uieventloghelper.hxx>
+#include <vos/mutex.hxx>
 
 //_________________________________________________________________________________________________________________
 //  Defines
@@ -326,7 +327,7 @@ void NewMenuController::retrieveShortcutsFromConfiguration(
 }
 
 NewMenuController::NewMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ) :
-    PopupMenuControllerBase( xServiceManager ),
+    svt::PopupMenuControllerBase( xServiceManager ),
     m_bShowImages( sal_True ),
     m_bHiContrast( sal_False ),
     m_bNewMenu( sal_False ),
@@ -399,7 +400,7 @@ void SAL_CALL NewMenuController::disposing( const EventObject& ) throw ( Runtime
 {
     Reference< css::awt::XMenuListener > xHolder(( OWeakObject *)this, UNO_QUERY );
 
-    ResetableGuard aLock( m_aLock );
+    osl::MutexGuard aLock( m_aMutex );
     m_xFrame.clear();
     m_xDispatch.clear();
     m_xServiceManager.clear();
@@ -423,12 +424,12 @@ void SAL_CALL NewMenuController::select( const css::awt::MenuEvent& rEvent ) thr
     Reference< XMultiServiceFactory > xServiceManager;
     Reference< XURLTransformer >      xURLTransformer;
 
-    ResetableGuard aLock( m_aLock );
+    osl::ClearableMutexGuard aLock( m_aMutex );
     xPopupMenu          = m_xPopupMenu;
     xDispatchProvider   = Reference< XDispatchProvider >( m_xFrame, UNO_QUERY );
     xServiceManager     = m_xServiceManager;
     xURLTransformer     = m_xURLTransformer;
-    aLock.unlock();
+    aLock.clear();
 
     css::util::URL aTargetURL;
     Sequence< PropertyValue > aArgsList( 1 );
@@ -548,12 +549,12 @@ void NewMenuController::impl_setPopupMenu()
 // XInitialization
 void SAL_CALL NewMenuController::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException )
 {
-    ResetableGuard aLock( m_aLock );
+    osl::MutexGuard aLock( m_aMutex );
 
     sal_Bool bInitalized( m_bInitialized );
     if ( !bInitalized )
     {
-        PopupMenuControllerBase::initialize( aArguments );
+        svt::PopupMenuControllerBase::initialize( aArguments );
 
         if ( m_bInitialized )
         {
diff --git a/framework/source/uielement/objectmenucontroller.cxx b/framework/source/uielement/objectmenucontroller.cxx
index f4d6aea0d82b..80dccb76db05 100644
--- a/framework/source/uielement/objectmenucontroller.cxx
+++ b/framework/source/uielement/objectmenucontroller.cxx
@@ -59,6 +59,7 @@
 #include <tools/urlobj.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <dispatch/uieventloghelper.hxx>
+#include <vos/mutex.hxx>
 
 //_________________________________________________________________________________________________________________
 //  Defines
@@ -83,7 +84,7 @@ DEFINE_XSERVICEINFO_MULTISERVICE        (   ObjectMenuController
 DEFINE_INIT_SERVICE                     (   ObjectMenuController, {} )
 
 ObjectMenuController::ObjectMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ) :
-    PopupMenuControllerBase( xServiceManager )
+    svt::PopupMenuControllerBase( xServiceManager )
 {
 }
 
@@ -128,7 +129,7 @@ void SAL_CALL ObjectMenuController::disposing( const EventObject& ) throw ( Runt
 {
     Reference< css::awt::XMenuListener > xHolder(( OWeakObject *)this, UNO_QUERY );
 
-    ResetableGuard aLock( m_aLock );
+    osl::MutexGuard aLock( m_aMutex );
     m_xFrame.clear();
     m_xDispatch.clear();
     m_xObjectUpdateDispatch.clear();
@@ -145,7 +146,7 @@ void SAL_CALL ObjectMenuController::statusChanged( const FeatureStateEvent& Even
     Sequence < com::sun::star::embed::VerbDescriptor > aVerbCommandSeq;
     if ( Event.State >>= aVerbCommandSeq )
     {
-        ResetableGuard aLock( m_aLock );
+        osl::MutexGuard aLock( m_aMutex );
         if ( m_xPopupMenu.is() )
             fillPopupMenu( aVerbCommandSeq, m_xPopupMenu );
     }
diff --git a/framework/source/uielement/popupmenucontroller.cxx b/framework/source/uielement/popupmenucontroller.cxx
new file mode 100644
index 000000000000..328777db2b79
--- /dev/null
+++ b/framework/source/uielement/popupmenucontroller.cxx
@@ -0,0 +1,248 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_framework.hxx"
+
+#include <com/sun/star/awt/XPopupMenu.hpp>
+#include <com/sun/star/frame/XPopupMenuController.hpp>
+
+#include <toolkit/helper/vclunohelper.hxx>
+//#include <toolkit/unohlp.hxx>
+
+#include <rtl/ref.hxx>
+
+#include <vcl/toolbox.hxx>
+#include <vcl/menu.hxx>
+#include <vcl/svapp.hxx>
+#include <vos/mutex.hxx>
+
+#include "uielement/popupmenucontroller.hxx"
+#include "services.h"
+
+using rtl::OUString;
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::frame;
+using namespace ::com::sun::star::beans;
+
+// --------------------------------------------------------------------
+
+
+namespace framework
+{
+
+DEFINE_XSERVICEINFO_MULTISERVICE        (   PopupMenuController                         ,
+                                            OWeakObject                      ,
+                                            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ToolbarController" ) )            ,
+                                            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.framework.PopupMenuController" ) )
+                                        )
+
+DEFINE_INIT_SERVICE                     (   PopupMenuController, {} )
+
+class PopupMenuControllerImpl
+{
+};
+
+//========================================================================
+// class PopupMenuController
+//========================================================================
+
+PopupMenuController::PopupMenuController( const Reference< lang::XMultiServiceFactory >& rServiceManager )
+: svt::ToolboxController( rServiceManager, Reference< frame::XFrame >(), OUString() )
+{
+}
+
+// --------------------------------------------------------------------
+
+PopupMenuController::~PopupMenuController()
+{
+}
+
+// --------------------------------------------------------------------
+// XInterface
+// --------------------------------------------------------------------
+
+Any SAL_CALL PopupMenuController::queryInterface( const Type& aType )  throw (RuntimeException)
+{
+    Any a( ToolboxController::queryInterface( aType ) );
+    if ( a.hasValue() )
+        return a;
+
+    return ::cppu::queryInterface( aType, static_cast< lang::XServiceInfo* >( this ));
+}
+
+// --------------------------------------------------------------------
+
+void SAL_CALL PopupMenuController::acquire() throw ()
+{
+    ToolboxController::acquire();
+}
+
+// --------------------------------------------------------------------
+
+void SAL_CALL PopupMenuController::release() throw ()
+{
+    ToolboxController::release();
+}
+
+// --------------------------------------------------------------------
+// XComponent
+// --------------------------------------------------------------------
+
+void SAL_CALL PopupMenuController::dispose() throw (RuntimeException)
+{
+    if( mxPopupMenuController.is() )
+    {
+        Reference< XComponent > xComponent( mxPopupMenuController, UNO_QUERY );
+        if( xComponent.is() )
+            xComponent->dispose();
+        mxPopupMenuController.clear();
+    }
+
+    mxPopupMenu.clear();
+
+    svt::ToolboxController::dispose();
+}
+
+// --------------------------------------------------------------------
+// XStatusListener
+// --------------------------------------------------------------------
+
+void SAL_CALL PopupMenuController::statusChanged( const frame::FeatureStateEvent& rEvent ) throw ( RuntimeException )
+{
+    svt::ToolboxController::statusChanged(rEvent);
+    enable( rEvent.IsEnabled );
+}
+
+// --------------------------------------------------------------------
+// XToolbarController
+// --------------------------------------------------------------------
+
+void SAL_CALL PopupMenuController::execute( sal_Int16 KeyModifier ) throw (RuntimeException)
+{
+    svt::ToolboxController::execute( KeyModifier );
+}
+
+// --------------------------------------------------------------------
+
+void SAL_CALL PopupMenuController::click() throw (RuntimeException)
+{
+    svt::ToolboxController::click();
+}
+
+// --------------------------------------------------------------------
+
+void SAL_CALL PopupMenuController::doubleClick() throw (RuntimeException)
+{
+    svt::ToolboxController::doubleClick();
+}
+
+// --------------------------------------------------------------------
+
+bool PopupMenuController::CreatePopupMenuController() throw (Exception)
+{
+    Reference< XMultiComponentFactory > xPopupMenuControllerRegistration( getServiceManager()->createInstance( SERVICENAME_POPUPMENUCONTROLLERFACTORY ), UNO_QUERY_THROW );
+
+    Sequence< Any > aSeq( 2 );
+    PropertyValue aPropValue;
+
+    aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ModuleName" ));
+    aPropValue.Value <<= getModuleName();
+    aSeq[0] <<= aPropValue;
+    aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Frame" ));
+    aPropValue.Value <<= m_xFrame;
+    aSeq[1] <<= aPropValue;
+
+    Reference< XPropertySet >      xProps( getServiceManager(), UNO_QUERY_THROW );
+    Reference< XComponentContext > xComponentContext( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), UNO_QUERY_THROW );
+
+    Reference< XPopupMenuController > xPopupMenuController( xPopupMenuControllerRegistration->createInstanceWithArgumentsAndContext( getCommandURL(), aSeq, xComponentContext ), UNO_QUERY );
+    if ( xPopupMenuController.is() )
+    {
+        mxPopupMenuController = xPopupMenuController;
+        return true;
+    }
+    return false;
+}
+
+Reference< awt::XWindow > SAL_CALL PopupMenuController::createPopupWindow() throw (RuntimeException)
+{
+    ::vos::OGuard aSolarLock(Application::GetSolarMutex());
+
+    Reference< awt::XWindow > xRet;
+
+    try
+    {
+        ToolBox* pToolBox = dynamic_cast< ToolBox* >( VCLUnoHelper::GetWindow( getParent() ) );
+        if( !pToolBox )
+            return xRet;
+
+        // get selected button
+        USHORT nItemId = pToolBox->GetDownItemId();
+        if( !nItemId )
+            return xRet;
+
+        ::Rectangle aRect( pToolBox->GetItemRect( nItemId ) );
+
+        if( !mxPopupMenuController.is() && !CreatePopupMenuController() )
+            return xRet;
+
+        if( !mxPopupMenu.is() )
+        {
+            mxPopupMenu = Reference< awt::XPopupMenu >( getServiceManager()->createInstance( DECLARE_ASCII( "stardiv.Toolkit.VCLXPopupMenu" ) ), UNO_QUERY_THROW );
+            mxPopupMenuController->setPopupMenu( mxPopupMenu );
+        }
+        else
+        {
+            mxPopupMenuController->updatePopupMenu();
+
+        }
+        pToolBox->SetItemDown( nItemId, TRUE );
+        Reference< awt::XWindowPeer > xPeer( getParent(), UNO_QUERY_THROW );
+        mxPopupMenu->execute( xPeer, VCLUnoHelper::ConvertToAWTRect( aRect ), 0 );
+        pToolBox->SetItemDown( nItemId, FALSE );
+    }
+    catch( Exception& )
+    {
+    }
+
+    return xRet;
+}
+
+// --------------------------------------------------------------------
+
+Reference< awt::XWindow > SAL_CALL PopupMenuController::createItemWindow( const Reference< awt::XWindow >& /*Parent*/ )  throw (RuntimeException)
+{
+    return Reference< awt::XWindow >();
+}
+
+// --------------------------------------------------------------------
+
+}
+
diff --git a/framework/source/uielement/progressbarwrapper.cxx b/framework/source/uielement/progressbarwrapper.cxx
index 2cd0ed891db6..a20f107ea22e 100644
--- a/framework/source/uielement/progressbarwrapper.cxx
+++ b/framework/source/uielement/progressbarwrapper.cxx
@@ -43,6 +43,7 @@
 //  interface includes
 //_________________________________________________________________________________________________________________
 #include <com/sun/star/ui/UIElementType.hpp>
+#include <com/sun/star/lang/DisposedException.hpp>
 
 //_________________________________________________________________________________________________________________
 //  includes of other projects
diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx
index cec95485dacd..64f05ed642cb 100644
--- a/framework/source/uielement/recentfilesmenucontroller.cxx
+++ b/framework/source/uielement/recentfilesmenucontroller.cxx
@@ -47,7 +47,6 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/awt/MenuItemStyle.hpp>
 #include <com/sun/star/util/XStringWidth.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
 //_________________________________________________________________________________________________________________
 //  includes of other projects
 //_________________________________________________________________________________________________________________
@@ -64,6 +63,7 @@
 #include <osl/file.hxx>
 //#include <tools/solar.hrc>
 #include <dispatch/uieventloghelper.hxx>
+#include <vos/mutex.hxx>
 
 //_________________________________________________________________________________________________________________
 //  Defines
@@ -105,7 +105,7 @@ DEFINE_XSERVICEINFO_MULTISERVICE        (   RecentFilesMenuController
 DEFINE_INIT_SERVICE                     (   RecentFilesMenuController, {} )
 
 RecentFilesMenuController::RecentFilesMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ) :
-    PopupMenuControllerBase( xServiceManager ),
+    svt::PopupMenuControllerBase( xServiceManager ),
     m_bDisabled( sal_False )
 {
 }
@@ -245,11 +245,11 @@ void RecentFilesMenuController::executeEntry( sal_Int32 nIndex )
     Reference< XDispatchProvider >    xDispatchProvider;
     Reference< XMultiServiceFactory > xServiceManager;
 
-    ResetableGuard aLock( m_aLock );
+    osl::ClearableMutexGuard aLock( m_aMutex );
     xPopupMenu          = m_xPopupMenu;
     xDispatchProvider   = Reference< XDispatchProvider >( m_xFrame, UNO_QUERY );
     xServiceManager     = m_xServiceManager;
-    aLock.unlock();
+    aLock.clear();
 
     css::util::URL            aTargetURL;
     Sequence< PropertyValue > aArgsList;
@@ -312,7 +312,7 @@ void SAL_CALL RecentFilesMenuController::disposing( const EventObject& ) throw (
 {
     Reference< css::awt::XMenuListener > xHolder(( OWeakObject *)this, UNO_QUERY );
 
-    ResetableGuard aLock( m_aLock );
+    osl::MutexGuard aLock( m_aMutex );
     m_xFrame.clear();
     m_xDispatch.clear();
     m_xServiceManager.clear();
@@ -325,7 +325,7 @@ void SAL_CALL RecentFilesMenuController::disposing( const EventObject& ) throw (
 // XStatusListener
 void SAL_CALL RecentFilesMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException )
 {
-    ResetableGuard aLock( m_aLock );
+    osl::MutexGuard aLock( m_aMutex );
     m_bDisabled = !Event.IsEnabled;
 }
 
@@ -336,11 +336,11 @@ void SAL_CALL RecentFilesMenuController::select( const css::awt::MenuEvent& rEve
     Reference< XDispatchProvider >    xDispatchProvider;
     Reference< XMultiServiceFactory > xServiceManager;
 
-    ResetableGuard aLock( m_aLock );
+    osl::ClearableMutexGuard aLock( m_aMutex );
     xPopupMenu          = m_xPopupMenu;
     xDispatchProvider   = Reference< XDispatchProvider >( m_xFrame, UNO_QUERY );
     xServiceManager     = m_xServiceManager;
-    aLock.unlock();
+    aLock.clear();
 
     css::util::URL aTargetURL;
     Sequence< PropertyValue > aArgsList;
@@ -355,7 +355,7 @@ void SAL_CALL RecentFilesMenuController::select( const css::awt::MenuEvent& rEve
 
 void SAL_CALL RecentFilesMenuController::activate( const css::awt::MenuEvent& ) throw (RuntimeException)
 {
-    ResetableGuard aLock( m_aLock );
+    osl::MutexGuard aLock( m_aMutex );
     impl_setPopupMenu();
 }
 
@@ -368,17 +368,16 @@ void RecentFilesMenuController::impl_setPopupMenu()
 
 void SAL_CALL RecentFilesMenuController::updatePopupMenu() throw (RuntimeException)
 {
-    ResetableGuard aLock( m_aLock );
+    osl::ClearableMutexGuard aLock( m_aMutex );
 
-    if ( m_bDisposed )
-        throw DisposedException();
+    throwIfDisposed();
 
     Reference< XStatusListener > xStatusListener( static_cast< OWeakObject* >( this ), UNO_QUERY );
     Reference< XDispatch > xDispatch( m_xDispatch );
     com::sun::star::util::URL aTargetURL;
     aTargetURL.Complete = m_aCommandURL;
     m_xURLTransformer->parseStrict( aTargetURL );
-    aLock.unlock();
+    aLock.clear();
 
     // Add/remove status listener to get a status update once
     if ( xDispatch.is() )
@@ -395,10 +394,9 @@ Reference< XDispatch > SAL_CALL RecentFilesMenuController::queryDispatch(
     sal_Int32 /*nFlags*/ )
 throw( RuntimeException )
 {
-    ResetableGuard aLock( m_aLock );
+    osl::MutexGuard aLock( m_aMutex );
 
-    if ( m_bDisposed )
-        throw DisposedException();
+    throwIfDisposed();
 
     if ( aURL.Complete.indexOf( m_aBaseURL ) == 0 )
         return Reference< XDispatch >( static_cast< OWeakObject* >( this ), UNO_QUERY );
@@ -412,10 +410,9 @@ void SAL_CALL RecentFilesMenuController::dispatch(
     const Sequence< PropertyValue >& /*seqProperties*/ )
 throw( RuntimeException )
 {
-    ResetableGuard aLock( m_aLock );
+    osl::MutexGuard aLock( m_aMutex );
 
-    if ( m_bDisposed )
-        throw DisposedException();
+    throwIfDisposed();
 
     if ( aURL.Complete.indexOf( m_aBaseURL ) == 0 )
     {
@@ -448,12 +445,11 @@ void SAL_CALL RecentFilesMenuController::addStatusListener(
     const URL& aURL )
 throw( RuntimeException )
 {
-    ResetableGuard aLock( m_aLock );
+    osl::MutexGuard aLock( m_aMutex );
 
-    if ( m_bDisposed )
-        throw DisposedException();
+    throwIfDisposed();
 
-    PopupMenuControllerBase::addStatusListener( xControl, aURL );
+    svt::PopupMenuControllerBase::addStatusListener( xControl, aURL );
 }
 
 void SAL_CALL RecentFilesMenuController::removeStatusListener(
@@ -461,7 +457,7 @@ void SAL_CALL RecentFilesMenuController::removeStatusListener(
     const URL& aURL )
 throw( RuntimeException )
 {
-    PopupMenuControllerBase::removeStatusListener( xControl, aURL );
+    svt::PopupMenuControllerBase::removeStatusListener( xControl, aURL );
 }
 
 IMPL_STATIC_LINK_NOINSTANCE( RecentFilesMenuController, ExecuteHdl_Impl, LoadRecentFile*, pLoadRecentFile )
diff --git a/framework/source/uielement/spinfieldtoolbarcontroller.cxx b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
index 43ad09ffc1ee..dad2775dc453 100644
--- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx
+++ b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
@@ -49,7 +49,6 @@
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/frame/status/ItemStatus.hpp>
 #include <com/sun/star/frame/status/ItemState.hpp>
 #include <com/sun/star/frame/status/Visibility.hpp>
diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx
index cb9cbb2896f7..0bbdbc339a34 100644
--- a/framework/source/uielement/statusbarmanager.cxx
+++ b/framework/source/uielement/statusbarmanager.cxx
@@ -56,6 +56,7 @@
 #include <com/sun/star/lang/XMultiComponentFactory.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/awt/Command.hpp>
+#include <com/sun/star/lang/DisposedException.hpp>
 
 //_________________________________________________________________________________________________________________
 //  other includes
diff --git a/framework/source/uielement/togglebuttontoolbarcontroller.cxx b/framework/source/uielement/togglebuttontoolbarcontroller.cxx
index a5e4263385fa..cf39edec2a7c 100644
--- a/framework/source/uielement/togglebuttontoolbarcontroller.cxx
+++ b/framework/source/uielement/togglebuttontoolbarcontroller.cxx
@@ -46,7 +46,6 @@
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/frame/XControlNotificationListener.hpp>
 #include "com/sun/star/util/XMacroExpander.hpp"
 #include "com/sun/star/uno/XComponentContext.hpp"
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index d89b81c0f9b6..5da7db82c363 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -75,6 +75,7 @@
 #include <com/sun/star/ui/UIElementType.hpp>
 #include <comphelper/sequence.hxx>
 #include <com/sun/star/frame/status/Visibility.hpp>
+#include <com/sun/star/lang/DisposedException.hpp>
 
 //_________________________________________________________________________________________________________________
 //  other includes
@@ -1028,6 +1029,10 @@ void ToolBarManager::CreateControllers()
                 aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ParentWindow" ));
                 aPropValue.Value <<= xToolbarWindow;
                 aPropertyVector.push_back( makeAny( aPropValue ));
+                aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ModuleName" ));
+                aPropValue.Value <<= m_aModuleIdentifier;
+                aPropertyVector.push_back( makeAny( aPropValue ));
+
                 if ( nWidth > 0 )
                 {
                     aPropValue.Name     = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Width" ));
diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx
index 02402205bd1c..d0ddeccfab20 100644
--- a/framework/source/uielement/toolbarsmenucontroller.cxx
+++ b/framework/source/uielement/toolbarsmenucontroller.cxx
@@ -58,7 +58,6 @@
 #include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp>
 #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
 #include <com/sun/star/ui/UIElementType.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
 
 //_________________________________________________________________________________________________________________
 //  includes of other projects
@@ -167,7 +166,7 @@ DEFINE_XSERVICEINFO_MULTISERVICE        (   ToolbarsMenuController
 DEFINE_INIT_SERVICE                     (   ToolbarsMenuController, {} )
 
 ToolbarsMenuController::ToolbarsMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ) :
-    PopupMenuControllerBase( xServiceManager ),
+    svt::PopupMenuControllerBase( xServiceManager ),
     m_aPropUIName( RTL_CONSTASCII_USTRINGPARAM( "UIName" )),
     m_aPropResourceURL( RTL_CONSTASCII_USTRINGPARAM( "ResourceURL" )),
     m_bModuleIdentified( sal_False ),
@@ -563,7 +562,7 @@ void SAL_CALL ToolbarsMenuController::disposing( const EventObject& ) throw ( Ru
 {
     Reference< css::awt::XMenuListener > xHolder(( OWeakObject *)this, UNO_QUERY );
 
-    ResetableGuard aLock( m_aLock );
+    osl::MutexGuard aLock( m_aMutex );
     m_xFrame.clear();
     m_xDispatch.clear();
     m_xDocCfgMgr.clear();
@@ -584,9 +583,9 @@ void SAL_CALL ToolbarsMenuController::statusChanged( const FeatureStateEvent& Ev
     sal_Bool bSetCheckmark      = sal_False;
     sal_Bool bCheckmark         = sal_False;
 
-    ResetableGuard aLock( m_aLock );
+    osl::ClearableMutexGuard aLock( m_aMutex );
     Reference< css::awt::XPopupMenu > xPopupMenu( m_xPopupMenu );
-    aLock.unlock();
+    aLock.clear();
 
     if ( xPopupMenu.is() )
     {
@@ -633,13 +632,13 @@ void SAL_CALL ToolbarsMenuController::select( const css::awt::MenuEvent& rEvent
     Reference< XFrame >                 xFrame;
     Reference< XNameAccess >            xPersistentWindowState;
 
-    ResetableGuard aLock( m_aLock );
+    osl::ClearableMutexGuard aLock( m_aMutex );
     xPopupMenu             = m_xPopupMenu;
     xServiceManager        = m_xServiceManager;
     xURLTransformer        = m_xURLTransformer;
     xFrame                 = m_xFrame;
     xPersistentWindowState = m_xPersistentWindowState;
-    aLock.unlock();
+    aLock.clear();
 
     if ( xPopupMenu.is() )
     {
@@ -792,7 +791,7 @@ void SAL_CALL ToolbarsMenuController::activate( const css::awt::MenuEvent& ) thr
     Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
     Reference< XURLTransformer >   xURLTransformer( m_xURLTransformer );
     {
-        ResetableGuard aLock( m_aLock );
+        osl::MutexGuard aLock( m_aMutex );
         fillPopupMenu( m_xPopupMenu );
         aCmdVector = m_aCommandVector;
     }
@@ -829,10 +828,9 @@ void SAL_CALL ToolbarsMenuController::activate( const css::awt::MenuEvent& ) thr
 // XPopupMenuController
 void SAL_CALL ToolbarsMenuController::setPopupMenu( const Reference< css::awt::XPopupMenu >& xPopupMenu ) throw ( RuntimeException )
 {
-    ResetableGuard aLock( m_aLock );
+    osl::MutexGuard aLock( m_aMutex );
 
-    if ( m_bDisposed )
-        throw DisposedException();
+    throwIfDisposed();
 
     if ( m_xFrame.is() && !m_xPopupMenu.is() )
     {
@@ -848,11 +846,11 @@ void SAL_CALL ToolbarsMenuController::setPopupMenu( const Reference< css::awt::X
 // XInitialization
 void SAL_CALL ToolbarsMenuController::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException )
 {
-    ResetableGuard aLock( m_aLock );
+    osl::MutexGuard aLock( m_aMutex );
     sal_Bool bInitalized( m_bInitialized );
     if ( !bInitalized )
     {
-        PopupMenuControllerBase::initialize(aArguments);
+        svt::PopupMenuControllerBase::initialize(aArguments);
 
         if ( m_bInitialized )
         {
diff --git a/framework/source/uielement/toolbarwrapper.cxx b/framework/source/uielement/toolbarwrapper.cxx
index 0e73b5616aa7..5a4fb7cddde4 100644
--- a/framework/source/uielement/toolbarwrapper.cxx
+++ b/framework/source/uielement/toolbarwrapper.cxx
@@ -53,6 +53,7 @@
 #include <com/sun/star/container/XIndexContainer.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/ui/UIElementType.hpp>
+#include <com/sun/star/lang/DisposedException.hpp>
 
 //_________________________________________________________________________________________________________________
 //  other includes
diff --git a/framework/util/makefile.mk b/framework/util/makefile.mk
index 3e390826bc53..5f4d4f4f7e82 100644
--- a/framework/util/makefile.mk
+++ b/framework/util/makefile.mk
@@ -56,7 +56,6 @@ LIB1OBJFILES=   \
                 $(SLO)$/rootitemcontainer.obj                   \
                 $(SLO)$/constitemcontainer.obj                  \
                 $(SLO)$/jobconst.obj                            \
-                $(SLO)$/popupmenucontrollerbase.obj             \
                 $(SLO)$/mischelper.obj                          \
                 $(SLO)$/propertysethelper.obj
 
@@ -196,7 +195,8 @@ SHL3OBJS=       $(SLO)$/mediatypedetectionhelper.obj\
                 $(SLO)$/dispatchrecorder.obj        \
                 $(SLO)$/dispatchrecordersupplier.obj\
                 $(SLO)$/dispatchhelper.obj          \
-                $(SLO)$/popupmenudispatcher.obj           \
+                $(SLO)$/popupmenudispatcher.obj     \
+                $(SLO)$/popupmenucontroller.obj
 
 SHL3STDLIBS=    \
                 $(FWILIB)                           \
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
index 553d94fc2fdb..113d8afb2fb5 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
@@ -218,6 +218,94 @@
           <value>com.sun.star.svx.FontHeightToolBoxController</value>
         </prop>
       </node>
+      <node oor:name="AssignLayout" oor:op="replace">
+     <prop oor:name="Command">
+          <value>.uno:AssignLayout</value>
+        </prop>
+        <prop oor:name="Module">
+          <value>com.sun.star.presentation.PresentationDocument</value>
+        </prop>
+        <prop oor:name="Controller">
+          <value>com.sun.star.comp.sd.SlideLayoutController</value>
+        </prop>
+      </node>
+      <node oor:name="InsertPage" oor:op="replace">
+        <prop oor:name="Command">
+          <value>.uno:InsertPage</value>
+        </prop>
+        <prop oor:name="Module">
+          <value>com.sun.star.presentation.PresentationDocument</value>
+        </prop>
+        <prop oor:name="Controller">
+          <value>com.sun.star.comp.sd.InsertSlideController</value>
+        </prop>
+      </node>
+    <node oor:name="ExtrusionDirectionFloater" oor:op="replace">
+        <prop oor:name="Command">
+          <value>.uno:ExtrusionDirectionFloater</value>
+        </prop>
+        <prop oor:name="Module">
+          <value/>
+        </prop>
+        <prop oor:name="Controller">
+          <value>com.sun.star.comp.svx.ExtrusionDirectionController</value>
+        </prop>
+      </node>
+      <node oor:name="ExtrusionDepthController" oor:op="replace">
+        <prop oor:name="Command">
+          <value>.uno:ExtrusionDepthFloater</value>
+        </prop>
+        <prop oor:name="Module">
+          <value/>
+        </prop>
+        <prop oor:name="Controller">
+          <value>com.sun.star.comp.svx.ExtrusionDepthController</value>
+        </prop>
+      </node>
+      <node oor:name="ExtrusionLightingFloater" oor:op="replace">
+        <prop oor:name="Command">
+          <value>.uno:ExtrusionLightingFloater</value>
+        </prop>
+        <prop oor:name="Module">
+          <value/>
+        </prop>
+        <prop oor:name="Controller">
+          <value>com.sun.star.comp.svx.ExtrusionLightingController</value>
+        </prop>
+      </node>
+      <node oor:name="ExtrusionSurfaceFloater" oor:op="replace">
+        <prop oor:name="Command">
+          <value>.uno:ExtrusionSurfaceFloater</value>
+        </prop>
+        <prop oor:name="Module">
+          <value/>
+        </prop>
+        <prop oor:name="Controller">
+          <value>com.sun.star.comp.svx.ExtrusionSurfaceController</value>
+        </prop>
+      </node>
+      <node oor:name="FontworkAlignmentFloater" oor:op="replace">
+        <prop oor:name="Command">
+          <value>.uno:FontworkAlignmentFloater</value>
+        </prop>
+        <prop oor:name="Module">
+          <value/>
+        </prop>
+        <prop oor:name="Controller">
+          <value>com.sun.star.comp.svx.FontworkAlignmentController</value>
+        </prop>
+      </node>
+      <node oor:name="FontworkCharacterSpacingFloater" oor:op="replace">
+        <prop oor:name="Command">
+          <value>.uno:FontworkCharacterSpacingFloater</value>
+        </prop>
+        <prop oor:name="Module">
+          <value/>
+        </prop>
+        <prop oor:name="Controller">
+          <value>com.sun.star.comp.svx.FontworkCharacterSpacingController</value>
+        </prop>
+      </node>
       <node oor:name="c3" oor:op="replace">
         <prop oor:name="Command">
           <value>.uno:ChartElementSelector</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
index 2925c2a97802..aedc3f40f725 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
@@ -966,7 +966,16 @@
                     <value>1</value>
                 </prop>
             </node>
-            <node oor:name=".uno:NotesMode" oor:op="replace">
+      <node oor:name=".uno:AssignLayout" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+
+          <value xml:lang="en-US">Slide Layout</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:NotesMode" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
 
                     <value xml:lang="en-US">Notes ~Page</value>
diff --git a/sfx2/inc/sfx2/tbxctrl.hxx b/sfx2/inc/sfx2/tbxctrl.hxx
index d618051e4063..76b38122bad7 100644
--- a/sfx2/inc/sfx2/tbxctrl.hxx
+++ b/sfx2/inc/sfx2/tbxctrl.hxx
@@ -118,6 +118,7 @@ class SfxFrameStatusListener : public svt::FrameStatusListener
 class SFX2_DLLPUBLIC SfxPopupWindow: public FloatingWindow, public SfxStatusListenerInterface
 {
 friend class SfxToolBox_Impl;
+friend struct SfxToolBoxControl_Impl;
     BOOL                                                                             m_bFloating;
     ULONG                                                                            m_nEventId;
     BOOL                                                                             m_bCascading;
@@ -237,6 +238,11 @@ protected:
     // Must be called by subclass to set a new popup window instance
     void                       SetPopupWindow( SfxPopupWindow* pWindow );
 
+    /** Uses the given Window as Popup Window and starts Popup using the new DockingManager.
+      * Should be called by subclasses instead of SetPopupWindow
+      */
+    void StartPopupMode( Window* pWindow );
+
     // XInterface
     virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
     virtual void               SAL_CALL acquire() throw();
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index f5b38d5a8a18..60f2b02282ed 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -212,34 +212,121 @@ struct SfxToolBoxControl_Impl
     SfxTbxCtrlFactory*      pFact;
     USHORT                  nTbxId;
     USHORT                  nSlotId;
-    SfxPopupWindow*         mpFloatingWindow;
-    SfxPopupWindow*         mpPopupWindow;
+    Window*                 mpFloatingWindow;
+    Window*                 mpPopupWindow;
     Reference< XUIElement > mxUIElement;
+    ULONG                   mnAsyncEndPopupModeEvent;
+    ULONG                   mnAsyncDeleteWindowEvent;
+    EndPopupModeData        maEndPopupModeData;
+    Link                    maPopupModeEndHdl;
 
     DECL_LINK( WindowEventListener, VclSimpleEvent* );
+    DECL_LINK( AsyncEndPopupModeHdl, void* );
+    DECL_STATIC_LINK( SfxToolBoxControl_Impl, AsyncDeleteWindowHdl, Window* );
+
+    ~SfxToolBoxControl_Impl();
 };
 
+SfxToolBoxControl_Impl::~SfxToolBoxControl_Impl()
+{
+    if( mnAsyncEndPopupModeEvent )
+    {
+        Application::RemoveUserEvent( mnAsyncEndPopupModeEvent );
+    }
+}
+
 IMPL_LINK( SfxToolBoxControl_Impl, WindowEventListener, VclSimpleEvent*, pEvent )
 {
-    if ( pEvent &&
-         pEvent->ISA( VclWindowEvent ) &&
-         (( pEvent->GetId() == VCLEVENT_WINDOW_MOVE ) ||
-          ( pEvent->GetId() == VCLEVENT_WINDOW_ACTIVATE )))
+    VclWindowEvent* pWindowEvent = dynamic_cast< VclWindowEvent* >( pEvent );
+    if( pWindowEvent )
     {
-        Window* pWindow( ((VclWindowEvent*)pEvent)->GetWindow() );
-        if (( pWindow == mpFloatingWindow ) &&
-            ( mpPopupWindow != 0 ))
+        Window* pWindow( pWindowEvent->GetWindow() );
+        if( pWindow )
         {
-            delete mpPopupWindow;
-            mpPopupWindow = 0;
+            switch( pWindowEvent->GetId() )
+            {
+            case VCLEVENT_WINDOW_MOVE:
+            case VCLEVENT_WINDOW_ACTIVATE:
+                if( (pWindow == mpFloatingWindow) && (mpPopupWindow != 0) )
+                {
+                    delete mpPopupWindow;
+                    mpPopupWindow = 0;
+                }
+                break;
+            case VCLEVENT_WINDOW_CLOSE:
+                if( pWindow == mpFloatingWindow )
+                {
+                    void* pTemp = (void*)mpFloatingWindow;
+                    mpFloatingWindow = 0;
+                    Application::PostUserEvent( STATIC_LINK( this, SfxToolBoxControl_Impl, AsyncDeleteWindowHdl ), pTemp );
+                }
+                break;
+            case VCLEVENT_WINDOW_ENDPOPUPMODE:
+                if( pWindow == mpPopupWindow )
+                {
+                    pWindow->RemoveEventListener( LINK( this, SfxToolBoxControl_Impl, WindowEventListener ) );
+
+                    if( mnAsyncEndPopupModeEvent )
+                        Application::RemoveUserEvent( mnAsyncEndPopupModeEvent );
+                    EndPopupModeData *pData = static_cast<EndPopupModeData*>(pWindowEvent->GetData());
+                    if( pData )
+                        maEndPopupModeData = *pData;
+                    mnAsyncEndPopupModeEvent = Application::PostUserEvent( LINK( this, SfxToolBoxControl_Impl, AsyncEndPopupModeHdl ) );
+                    break;
+                }
+            }
         }
     }
-
     return 1;
 }
 
 //--------------------------------------------------------------------
 
+IMPL_LINK( SfxToolBoxControl_Impl, AsyncEndPopupModeHdl, void*, EMPTYARG )
+{
+    mnAsyncEndPopupModeEvent = 0;
+
+    if( mpPopupWindow )
+    {
+        if( maEndPopupModeData.mbTearoff )
+        {
+            //mpPopupWindow->SetParent( SFX_APP()->GetTopWindow() );
+            Window::GetDockingManager()->SetFloatingMode(mpPopupWindow, TRUE );
+            mpPopupWindow->SetPosPixel( Point( maEndPopupModeData.maFloatingPos.X(), maEndPopupModeData.maFloatingPos.Y() ) );
+            mpPopupWindow->Show();
+        }
+        FloatingWindow* pFloat = dynamic_cast< FloatingWindow* >( mpPopupWindow );
+        if( pFloat )
+            pFloat->PopupModeEnd();
+        else
+        {
+            Window *pTemp = mpPopupWindow;
+            maPopupModeEndHdl.Call(0);
+
+            if( !maEndPopupModeData.mbTearoff )
+            {
+                SystemWindow* pSystemWindow = dynamic_cast< SystemWindow* >( pTemp );
+
+                if( pSystemWindow )
+                    pSystemWindow->Close();
+
+                mpPopupWindow = 0;
+                Application::PostUserEvent( STATIC_LINK( this, SfxToolBoxControl_Impl, AsyncDeleteWindowHdl ), (void*)pTemp );
+            }
+        }
+    }
+    return 0;
+}
+
+IMPL_STATIC_LINK( SfxToolBoxControl_Impl, AsyncDeleteWindowHdl, Window*, pWindow )
+{
+    (void)*pThis;
+    delete pWindow;
+    return 0;
+}
+
+//--------------------------------------------------------------------
+
 SfxToolBoxControl::SfxToolBoxControl(
     USHORT          nSlotID,
     USHORT          nID,
@@ -257,6 +344,7 @@ SfxToolBoxControl::SfxToolBoxControl(
     pImpl->nSlotId = nSlotID;
     pImpl->mpFloatingWindow = 0;
     pImpl->mpPopupWindow = 0;
+    pImpl->mnAsyncEndPopupModeEvent = 0;
 }
 
 //--------------------------------------------------------------------
@@ -779,18 +867,17 @@ throw (::com::sun::star::uno::RuntimeException)
             Reference< ::com::sun::star::beans::XPropertySet > xProp( xUIElement, UNO_QUERY );
             if ( xSubToolBar.is() && xProp.is() )
             {
-                rtl::OUString aPersistentString( RTL_CONSTASCII_USTRINGPARAM( "Persistent" ));
                 try
                 {
                     Window*  pTbxWindow = VCLUnoHelper::GetWindow( xSubToolBar );
                     ToolBox* pToolBar( 0 );
                     if ( pTbxWindow && pTbxWindow->GetType() == WINDOW_TOOLBOX )
                     {
+                        const rtl::OUString aPersistentString( RTL_CONSTASCII_USTRINGPARAM( "Persistent" ));
                         pToolBar = (ToolBox *)pTbxWindow;
 
-                        Any a;
-                        a = xProp->getPropertyValue( aPersistentString );
-                        xProp->setPropertyValue( aPersistentString, makeAny( sal_False ));
+                        Any a( xProp->getPropertyValue( aPersistentString ) );
+                        xProp->setPropertyValue( aPersistentString, Any( sal_False ));
 
                         xLayoutManager->hideElement( aSubToolBarResName );
                         xLayoutManager->floatWindow( aSubToolBarResName );
@@ -798,7 +885,7 @@ throw (::com::sun::star::uno::RuntimeException)
                         xLayoutManager->setElementPos( aSubToolBarResName, aEvent.FloatingPosition );
                         xLayoutManager->showElement( aSubToolBarResName );
 
-                        xProp->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Persistent" )), a );
+                        xProp->setPropertyValue( aPersistentString, a );
                     }
                 }
                 catch ( ::com::sun::star::uno::RuntimeException& )
@@ -870,7 +957,7 @@ void SfxToolBoxControl::createAndPositionSubToolBar( const ::rtl::OUString& rSub
 
         if ( xUIElement.is() )
         {
-            Reference< ::com::sun::star::awt::XWindow > xParent = getFrameInterface()->getContainerWindow();
+//            Reference< ::com::sun::star::awt::XWindow > xParent = getFrameInterface()->getContainerWindow();
 
             Reference< ::com::sun::star::awt::XWindow > xSubToolBar( xUIElement->getRealInterface(), UNO_QUERY );
             if ( xSubToolBar.is() )
@@ -890,6 +977,7 @@ void SfxToolBoxControl::createAndPositionSubToolBar( const ::rtl::OUString& rSub
 
                 Window*  pParentTbxWindow( pImpl->pBox );
                 Window*  pTbxWindow = VCLUnoHelper::GetWindow( xSubToolBar );
+
                 ToolBox* pToolBar( 0 );
                 if ( pTbxWindow && pTbxWindow->GetType() == WINDOW_TOOLBOX )
                     pToolBar = (ToolBox *)pTbxWindow;
@@ -904,10 +992,10 @@ void SfxToolBoxControl::createAndPositionSubToolBar( const ::rtl::OUString& rSub
                         aSize = pToolBar->CalcPopupWindowSizePixel();
                     }
                     pToolBar->SetSizePixel( aSize );
-
-                    // open subtoolbox in popup mode
-                    Window::GetDockingManager()->StartPopupMode( pImpl->pBox, pToolBar );
                 }
+
+                // open subtoolbox in popup mode
+                Window::GetDockingManager()->StartPopupMode( pImpl->pBox, pTbxWindow );
             }
         }
     }
@@ -918,15 +1006,37 @@ void SfxToolBoxControl::createAndPositionSubToolBar( const ::rtl::OUString& rSub
 void SfxToolBoxControl::SetPopupWindow( SfxPopupWindow* pWindow )
 {
     pImpl->mpPopupWindow = pWindow;
-    pImpl->mpPopupWindow->SetPopupModeEndHdl( LINK( this, SfxToolBoxControl, PopupModeEndHdl ));
-    pImpl->mpPopupWindow->SetDeleteLink_Impl( LINK( this, SfxToolBoxControl, ClosePopupWindow ));
+    pWindow->SetPopupModeEndHdl( LINK( this, SfxToolBoxControl, PopupModeEndHdl ));
+    pWindow->SetDeleteLink_Impl( LINK( this, SfxToolBoxControl, ClosePopupWindow ));
+}
+
+//--------------------------------------------------------------------
+
+void SfxToolBoxControl::StartPopupMode( Window* pWindow )
+{
+    if( pWindow )
+    {
+        pWindow->EnableDocking(true);
+        ToolBox& rTbx = GetToolBox();
+        Window::GetDockingManager()->StartPopupMode( &rTbx, pWindow );
+        pWindow->AddEventListener( LINK( pImpl, SfxToolBoxControl_Impl, WindowEventListener ) );
+
+        SfxPopupWindow* pPopupWindow = dynamic_cast< SfxPopupWindow* >( pWindow );
+        if( pPopupWindow )
+            SetPopupWindow( pPopupWindow );
+        else
+        {
+            pImpl->mpPopupWindow = pWindow;
+            pImpl->maPopupModeEndHdl = LINK( this, SfxToolBoxControl, PopupModeEndHdl );
+        }
+    }
 }
 
 //--------------------------------------------------------------------
 
 IMPL_LINK( SfxToolBoxControl, PopupModeEndHdl, void *, EMPTYARG )
 {
-    if ( pImpl->mpPopupWindow->IsVisible() )
+    if ( pImpl->mpPopupWindow && pImpl->mpPopupWindow->IsVisible() )
     {
         // Replace floating window with popup window and destroy
         // floating window instance.
diff --git a/svx/inc/extrusioncontrols.hxx b/svx/inc/extrusioncontrols.hxx
deleted file mode 100644
index 4560c7463bc9..000000000000
--- a/svx/inc/extrusioncontrols.hxx
+++ /dev/null
@@ -1,390 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _SVX_EXTRUSION_CONTROLS_HXX
-#define _SVX_EXTRUSION_CONTROLS_HXX
-
-#include <svtools/valueset.hxx>
-#include <svl/lstner.hxx>
-#include <sfx2/tbxctrl.hxx>
-#include <svtools/svtreebx.hxx>
-#ifndef _SV_BUTTON_HXX
-#include <vcl/button.hxx>
-#endif
-#include <vcl/dialog.hxx>
-#include <vcl/field.hxx>
-#include <com/sun/star/frame/XFrame.hpp>
-#include "svx/svxdllapi.h"
-
-class SfxBindings;
-class ToolbarMenu;
-class SfxStatusForwarder;
-
-//========================================================================
-
-namespace svx
-{
-class ToolboxButtonColorUpdater;
-
-class ExtrusionDirectionWindow : public SfxPopupWindow
-{
-    using FloatingWindow::StateChanged;
-
-private:
-    ToolbarMenu*        mpMenu;
-    ValueSet*           mpDirectionSet;
-    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > mxFrame;
-
-    SfxStatusForwarder* mpDirectionForewarder;
-    SfxStatusForwarder* mpProjectionForewarder;
-
-    Image       maImgDirection[9];
-    Image       maImgDirectionH[9];
-
-    Image       maImgPerspective;
-    Image       maImgPerspectiveH;
-    Image       maImgParallel;
-    Image       maImgParallelH;
-
-    bool        mbPopupMode;
-
-    DECL_LINK( SelectHdl, void * );
-    void            FillValueSet();
-
-    void implSetDirection( sal_Int32 nSkew, bool bEnabled = true );
-    void implSetProjection( sal_Int32 nProjection, bool bEnabled = true );
-    void implInit();
-
-protected:
-    virtual BOOL    Close();
-    virtual void    PopupModeEnd();
-
-    /** This function is called when the window gets the focus.  It grabs
-        the focus to the line ends value set so that it can be controlled with
-        the keyboard.
-    */
-    virtual void GetFocus (void);
-
-public:
-    ExtrusionDirectionWindow( USHORT nId,
-                              const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
-    ExtrusionDirectionWindow( USHORT nId,
-                              const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
-                              Window* pParentWindow );
-    ~ExtrusionDirectionWindow();
-
-    void            StartSelection();
-
-    virtual SfxPopupWindow* Clone() const;
-
-    virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
-    virtual void DataChanged( const DataChangedEvent& rDCEvt );
-};
-
-//========================================================================
-
-class SVX_DLLPUBLIC ExtrusionDirectionControl : public SfxToolBoxControl
-{
-public:
-    SFX_DECL_TOOLBOX_CONTROL();
-    ExtrusionDirectionControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
-    ~ExtrusionDirectionControl();
-
-    virtual void                StateChanged( USHORT nSID, SfxItemState eState,
-                                              const SfxPoolItem* pState );
-    virtual SfxPopupWindowType  GetPopupWindowType() const;
-    virtual SfxPopupWindow*     CreatePopupWindow();
-};
-
-//========================================================================
-
-class ExtrusionDepthWindow : public SfxPopupWindow
-{
-    using FloatingWindow::StateChanged;
-
-private:
-    ToolbarMenu* mpMenu;
-
-    Image maImgDepth0;
-    Image maImgDepth1;
-    Image maImgDepth2;
-    Image maImgDepth3;
-    Image maImgDepth4;
-    Image maImgDepthInfinity;
-
-    Image maImgDepth0h;
-    Image maImgDepth1h;
-    Image maImgDepth2h;
-    Image maImgDepth3h;
-    Image maImgDepth4h;
-    Image maImgDepthInfinityh;
-
-    SfxStatusForwarder* mpDepthForewarder;
-    SfxStatusForwarder* mpMetricForewarder;
-    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > mxFrame;
-
-    bool        mbPopupMode;
-    FieldUnit   meUnit;
-    double      mfDepth;
-    bool        mbEnabled;
-
-    DECL_LINK( SelectHdl, void * );
-
-    void    implFillStrings( FieldUnit eUnit );
-    void    implSetDepth( double fDepth, bool bEnabled );
-    void    implInit();
-
-protected:
-    virtual BOOL    Close();
-    virtual void    PopupModeEnd();
-
-    /** This function is called when the window gets the focus.  It grabs
-        the focus to the line ends value set so that it can be controlled with
-        the keyboard.
-    */
-    virtual void GetFocus (void);
-
-public:
-    ExtrusionDepthWindow( USHORT nId,
-                          const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
-    ExtrusionDepthWindow( USHORT nId,
-                          const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
-                          Window* pParentWindow );
-    ~ExtrusionDepthWindow();
-
-    void            StartSelection();
-
-    virtual SfxPopupWindow* Clone() const;
-
-    virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
-    virtual void DataChanged( const DataChangedEvent& rDCEvt );
-};
-
-//========================================================================
-
-class SVX_DLLPUBLIC ExtrusionDepthControl : public SfxToolBoxControl
-{
-public:
-    SFX_DECL_TOOLBOX_CONTROL();
-    ExtrusionDepthControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
-    ~ExtrusionDepthControl();
-
-    virtual void                StateChanged( USHORT nSID, SfxItemState eState,
-                                              const SfxPoolItem* pState );
-    virtual SfxPopupWindowType  GetPopupWindowType() const;
-    virtual SfxPopupWindow*     CreatePopupWindow();
-};
-
-//========================================================================
-
-class ExtrusionLightingWindow : public SfxPopupWindow
-{
-    using FloatingWindow::StateChanged;
-
-private:
-    ToolbarMenu* mpMenu;
-    ValueSet*    mpLightingSet;
-
-    Image maImgLightingOff[9];
-    Image maImgLightingOn[9];
-    Image maImgLightingPreview[9];
-
-    Image maImgLightingOffh[9];
-    Image maImgLightingOnh[9];
-    Image maImgLightingPreviewh[9];
-
-    Image maImgBright;
-    Image maImgNormal;
-    Image maImgDim;
-    Image maImgBrighth;
-    Image maImgNormalh;
-    Image maImgDimh;
-
-    SfxStatusForwarder* mpLightingDirectionForewarder;
-    SfxStatusForwarder* mpLightingIntensityForewarder;
-    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > mxFrame;
-
-    bool    mbPopupMode;
-    int     mnLevel;
-    bool    mbLevelEnabled;
-    int     mnDirection;
-    bool    mbDirectionEnabled;
-
-    void    implSetIntensity( int nLevel, bool bEnabled );
-    void    implSetDirection( int nDirection, bool bEnabled );
-    void    implInit();
-
-    DECL_LINK( SelectHdl, void * );
-
-protected:
-    virtual BOOL    Close();
-    virtual void    PopupModeEnd();
-
-    /** This function is called when the window gets the focus.  It grabs
-        the focus to the line ends value set so that it can be controlled with
-        the keyboard.
-    */
-    virtual void GetFocus (void);
-
-public:
-    ExtrusionLightingWindow( USHORT nId,
-                             const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
-    ExtrusionLightingWindow( USHORT nId,
-                             const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
-                             Window* pParentWindow );
-    ~ExtrusionLightingWindow();
-
-    void            StartSelection();
-
-    virtual SfxPopupWindow* Clone() const;
-
-    virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
-    virtual void DataChanged( const DataChangedEvent& rDCEvt );
-};
-
-//========================================================================
-
-class SVX_DLLPUBLIC ExtrusionLightingControl : public SfxToolBoxControl
-{
-public:
-    SFX_DECL_TOOLBOX_CONTROL();
-    ExtrusionLightingControl( USHORT nSlotid, USHORT nId, ToolBox& rTbx );
-    ~ExtrusionLightingControl();
-
-    virtual void                StateChanged( USHORT nSID, SfxItemState eState,
-                                              const SfxPoolItem* pState );
-    virtual SfxPopupWindowType  GetPopupWindowType() const;
-    virtual SfxPopupWindow*     CreatePopupWindow();
-};
-
-//========================================================================
-
-class ExtrusionSurfaceWindow : public SfxPopupWindow
-{
-    using FloatingWindow::StateChanged;
-private:
-    ToolbarMenu* mpMenu;
-
-    Image maImgSurface1;
-    Image maImgSurface2;
-    Image maImgSurface3;
-    Image maImgSurface4;
-    Image maImgSurface1h;
-    Image maImgSurface2h;
-    Image maImgSurface3h;
-    Image maImgSurface4h;
-
-    SfxStatusForwarder* mpSurfaceForewarder;
-    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > mxFrame;
-
-    bool        mbPopupMode;
-
-    DECL_LINK( SelectHdl, void * );
-
-    void    implSetSurface( int nSurface, bool bEnabled );
-    void    implInit();
-
-protected:
-    virtual BOOL    Close();
-    virtual void    PopupModeEnd();
-
-    /** This function is called when the window gets the focus.  It grabs
-        the focus to the line ends value set so that it can be controlled with
-        the keyboard.
-    */
-    virtual void GetFocus (void);
-
-public:
-    ExtrusionSurfaceWindow( USHORT nId,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
-    ExtrusionSurfaceWindow( USHORT nId,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
-                            Window* pParentWindow );
-    ~ExtrusionSurfaceWindow();
-
-    void            StartSelection();
-
-    virtual SfxPopupWindow* Clone() const;
-
-    virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
-    virtual void DataChanged( const DataChangedEvent& rDCEvt );
-};
-
-//========================================================================
-
-class SVX_DLLPUBLIC ExtrusionSurfaceControl : public SfxToolBoxControl
-{
-public:
-    SFX_DECL_TOOLBOX_CONTROL();
-    ExtrusionSurfaceControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
-    ~ExtrusionSurfaceControl();
-
-    virtual void                StateChanged( USHORT nSID, SfxItemState eState,
-                                              const SfxPoolItem* pState );
-    virtual SfxPopupWindowType  GetPopupWindowType() const;
-    virtual SfxPopupWindow*     CreatePopupWindow();
-};
-
-//========================================================================
-
-class SVX_DLLPUBLIC ExtrusionColorControl : public SfxToolBoxControl
-{
-private:
-    ToolboxButtonColorUpdater*  mpBtnUpdater;
-
-public:
-    SFX_DECL_TOOLBOX_CONTROL();
-    ExtrusionColorControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
-    ~ExtrusionColorControl();
-
-    virtual void                StateChanged( USHORT nSID, SfxItemState eState,
-                                              const SfxPoolItem* pState );
-    virtual SfxPopupWindowType  GetPopupWindowType() const;
-    virtual SfxPopupWindow*     CreatePopupWindow();
-};
-
-//========================================================================
-
-class ExtrusionDepthDialog : public ModalDialog
-{
-    FixedText           maFLDepth;
-    MetricField         maMtrDepth;
-    OKButton            maOKButton;
-    CancelButton        maCancelButton;
-    HelpButton          maHelpButton;
-
-    FieldUnit           meDefaultUnit;
-
-public:
-    ExtrusionDepthDialog( Window* pParent, double fDepth, FieldUnit eDefaultUnit );
-    ~ExtrusionDepthDialog();
-
-    double getDepth() const;
-};
-
-}
-#endif
-
diff --git a/svx/inc/extrusiondepthdialog.hxx b/svx/inc/extrusiondepthdialog.hxx
new file mode 100644
index 000000000000..600e646e8cb6
--- /dev/null
+++ b/svx/inc/extrusiondepthdialog.hxx
@@ -0,0 +1,60 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _SVX_EXTRUSIONDEPTHDIALOG_HXX
+#define _SVX_EXTRUSIONDEPTHDIALOG_HXX
+
+#include "svx/svxdllapi.h"
+
+#include <vcl/fixed.hxx>
+#include <vcl/dialog.hxx>
+#include <vcl/button.hxx>
+#include <vcl/field.hxx>
+
+namespace svx {
+
+class ExtrusionDepthDialog : public ModalDialog
+{
+    FixedText           maFLDepth;
+    MetricField         maMtrDepth;
+    OKButton            maOKButton;
+    CancelButton        maCancelButton;
+    HelpButton          maHelpButton;
+
+    FieldUnit           meDefaultUnit;
+
+public:
+    ExtrusionDepthDialog( Window* pParent, double fDepth, FieldUnit eDefaultUnit );
+    ~ExtrusionDepthDialog();
+
+    double getDepth() const;
+};
+
+}
+
+#endif      // _SVX_EXTRUSIONDEPTHDIALOG_HXX
+
diff --git a/svx/inc/fontworkgallery.hxx b/svx/inc/fontworkgallery.hxx
index 9f6b1f9f4b2f..40ac3cef966a 100644
--- a/svx/inc/fontworkgallery.hxx
+++ b/svx/inc/fontworkgallery.hxx
@@ -29,16 +29,16 @@
 #ifndef _SVX_FONTWORK_GALLERY_DIALOG_HXX
 #define _SVX_FONTWORK_GALLERY_DIALOG_HXX
 
-#ifndef _FIXED_HXX //autogen
+#include "svx/svxdllapi.h"
+
 #include <vcl/fixed.hxx>
-#endif
-#include <svtools/valueset.hxx>
-#ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
 #include <vcl/dialog.hxx>
+#include <vcl/field.hxx>
+
+#include <svtools/valueset.hxx>
+
 #include <sfx2/tbxctrl.hxx>
-#include "svx/svxdllapi.h"
 
 #include <vector>
 
@@ -50,7 +50,6 @@ class SdrObject;
 class SdrModel;
 
 class SfxBindings;
-class ToolbarMenu;
 class SfxStatusForwarder;
 
 //------------------------------------------------------------------------
@@ -58,130 +57,6 @@ class SfxStatusForwarder;
 namespace svx
 {
 
-class FontWorkAlignmentWindow : public SfxPopupWindow
-{
-    using FloatingWindow::StateChanged;
-private:
-    ToolbarMenu* mpMenu;
-
-    Image maImgAlgin1;
-    Image maImgAlgin2;
-    Image maImgAlgin3;
-    Image maImgAlgin4;
-    Image maImgAlgin5;
-    Image maImgAlgin1h;
-    Image maImgAlgin2h;
-    Image maImgAlgin3h;
-    Image maImgAlgin4h;
-    Image maImgAlgin5h;
-
-    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > mxFrame;
-
-    bool        mbPopupMode;
-
-    DECL_LINK( SelectHdl, void * );
-
-    void    implSetAlignment( int nAlignmentMode, bool bEnabled );
-    void    implInit();
-
-protected:
-    virtual BOOL    Close();
-    virtual void    PopupModeEnd();
-
-    /** This function is called when the window gets the focus.  It grabs
-        the focus to the line ends value set so that it can be controlled with
-        the keyboard.
-    */
-    virtual void GetFocus (void);
-
-public:
-    FontWorkAlignmentWindow( USHORT nId,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
-    FontWorkAlignmentWindow( USHORT nId,
-                             const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
-                             Window* pParentWindow );
-    ~FontWorkAlignmentWindow();
-
-    void            StartSelection();
-
-    virtual SfxPopupWindow* Clone() const;
-
-    virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
-    virtual void DataChanged( const DataChangedEvent& rDCEvt );
-};
-
-class SVX_DLLPUBLIC FontWorkAlignmentControl : public SfxToolBoxControl
-{
-public:
-    SFX_DECL_TOOLBOX_CONTROL();
-    FontWorkAlignmentControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
-    ~FontWorkAlignmentControl();
-
-    virtual void                StateChanged( USHORT nSID, SfxItemState eState,
-                                              const SfxPoolItem* pState );
-    virtual SfxPopupWindowType  GetPopupWindowType() const;
-    virtual SfxPopupWindow*     CreatePopupWindow();
-};
-
-//------------------------------------------------------------------------
-
-class FontWorkCharacterSpacingWindow : public SfxPopupWindow
-{
-    using FloatingWindow::StateChanged;
-private:
-    ToolbarMenu* mpMenu;
-
-    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > mxFrame;
-
-    bool        mbPopupMode;
-
-    DECL_LINK( SelectHdl, void * );
-
-    void    implSetCharacterSpacing( sal_Int32 nCharacterSpacing, bool bEnabled );
-    void    implSetKernCharacterPairs( sal_Bool bKernOnOff, bool bEnabled );
-    void    implInit();
-
-protected:
-    virtual BOOL    Close();
-    virtual void    PopupModeEnd();
-
-    /** This function is called when the window gets the focus.  It grabs
-        the focus to the line ends value set so that it can be controlled with
-        the keyboard.
-    */
-    virtual void GetFocus (void);
-
-public:
-    FontWorkCharacterSpacingWindow( USHORT nId,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
-    FontWorkCharacterSpacingWindow( USHORT nId,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
-                            Window* pParentWindow );
-    ~FontWorkCharacterSpacingWindow();
-
-    void            StartSelection();
-
-    virtual SfxPopupWindow* Clone() const;
-
-    virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
-    virtual void DataChanged( const DataChangedEvent& rDCEvt );
-};
-
-class SVX_DLLPUBLIC FontWorkCharacterSpacingControl : public SfxToolBoxControl
-{
-public:
-    SFX_DECL_TOOLBOX_CONTROL();
-    FontWorkCharacterSpacingControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
-    ~FontWorkCharacterSpacingControl();
-
-    virtual void                StateChanged( USHORT nSID, SfxItemState eState,
-                                              const SfxPoolItem* pState );
-    virtual SfxPopupWindowType  GetPopupWindowType() const;
-    virtual SfxPopupWindow*     CreatePopupWindow();
-};
-
-//------------------------------------------------------------------------
-
 class SVX_DLLPUBLIC FontWorkShapeTypeControl : public SfxToolBoxControl
 {
     using SfxToolBoxControl::Select;
@@ -192,8 +67,6 @@ public:
     ~FontWorkShapeTypeControl();
 
     virtual void                Select( BOOL bMod1 = FALSE );
-    virtual void                StateChanged( USHORT nSID, SfxItemState eState,
-                                              const SfxPoolItem* pState );
     virtual SfxPopupWindowType  GetPopupWindowType() const;
     virtual SfxPopupWindow*     CreatePopupWindow();
 };
diff --git a/svx/inc/svx/extrusioncolorcontrol.hxx b/svx/inc/svx/extrusioncolorcontrol.hxx
new file mode 100644
index 000000000000..ff4a53e65a41
--- /dev/null
+++ b/svx/inc/svx/extrusioncolorcontrol.hxx
@@ -0,0 +1,56 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _SVX_EXTRUSIONCOLORCONTROL_HXX
+#define _SVX_EXTRUSIONCOLORCONTROL_HXX
+
+#include <sfx2/tbxctrl.hxx>
+#include "svx/svxdllapi.h"
+#include "svx/tbxcolorupdate.hxx"
+
+namespace svx {
+
+class SVX_DLLPUBLIC ExtrusionColorControl : public SfxToolBoxControl
+{
+private:
+    ToolboxButtonColorUpdater*  mpBtnUpdater;
+
+public:
+    SFX_DECL_TOOLBOX_CONTROL();
+    ExtrusionColorControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    ~ExtrusionColorControl();
+
+    virtual void                StateChanged( USHORT nSID, SfxItemState eState,
+                                              const SfxPoolItem* pState );
+    virtual SfxPopupWindowType  GetPopupWindowType() const;
+    virtual SfxPopupWindow*     CreatePopupWindow();
+};
+
+}
+
+#endif      // _SVX_EXTRUSIONCOLORCONTROL_HXX
+
diff --git a/svx/inc/svx/sdr/overlay/overlaybitmapex.hxx b/svx/inc/svx/sdr/overlay/overlaybitmapex.hxx
index aa52efd03c41..1fbf0b6add3d 100644
--- a/svx/inc/svx/sdr/overlay/overlaybitmapex.hxx
+++ b/svx/inc/svx/sdr/overlay/overlaybitmapex.hxx
@@ -47,13 +47,16 @@ namespace sdr
             sal_uInt16                              mnCenterX;
             sal_uInt16                              mnCenterY;
 
+            // optional transparency
+            double mfAlpha;
+
             virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence();
 
         public:
             OverlayBitmapEx(
                 const basegfx::B2DPoint& rBasePos,
                 const BitmapEx& rBitmapEx,
-                sal_uInt16 nCenX = 0, sal_uInt16 nCenY = 0);
+                sal_uInt16 nCenX = 0, sal_uInt16 nCenY = 0, double fAlpha = 0.0 );
             virtual ~OverlayBitmapEx();
 
             const BitmapEx& getBitmapEx() const { return maBitmapEx; }
diff --git a/svx/inc/svx/svdhdl.hxx b/svx/inc/svx/svdhdl.hxx
index d4b4d5d3369e..7255f933fd65 100644
--- a/svx/inc/svx/svdhdl.hxx
+++ b/svx/inc/svx/svdhdl.hxx
@@ -184,6 +184,9 @@ protected:
     // cleanup marker if one exists
     void GetRidOfIAObject();
 
+private:
+    bool                        mbMouseOver;    // is true if the mouse is over this handle
+
 protected:
     ::sdr::overlay::OverlayObject* CreateOverlayObject(
         const basegfx::B2DPoint& rPos,
@@ -241,6 +244,16 @@ public:
     virtual BOOL IsFocusHdl() const;
 
     void SetMoveOutside( bool bMoveOutside );
+
+    /** is called when the mouse enters the area of this handle. If the handle changes his
+        visualisation during mouse over it must override this method and call Touch(). */
+    virtual void onMouseEnter();
+
+    /** is called when the mouse leaves the area of this handle. If the handle changes his
+        visualisation during mouse over it must override this method and call Touch(). */
+    virtual void onMouseLeave();
+
+    bool isMouseOver() const;
 };
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/svx/inc/svx/svdmrkv.hxx b/svx/inc/svx/svdmrkv.hxx
index eecbc1f2c4f3..fc136b8e5a3c 100644
--- a/svx/inc/svx/svdmrkv.hxx
+++ b/svx/inc/svx/svdmrkv.hxx
@@ -169,6 +169,7 @@ protected:
     virtual void SetMarkRects();                                             // Rects an den PageViews
     virtual void CheckMarked();                                              // MarkList nach Del und Lock Layer durchsuchen...
     virtual void AddDragModeHdl(SdrDragMode eMode);
+    virtual BOOL MouseMove(const MouseEvent& rMEvt, Window* pWin);
 
     // add custom handles (used by other apps, e.g. AnchorPos)
     virtual void AddCustomHdl();
diff --git a/svx/inc/svx/svdobj.hxx b/svx/inc/svx/svdobj.hxx
index 7acc69ab5b9f..cf7ca2eda5ee 100644
--- a/svx/inc/svx/svdobj.hxx
+++ b/svx/inc/svx/svdobj.hxx
@@ -810,6 +810,14 @@ public:
     virtual void SetLogicRect(const Rectangle& rRect);
     virtual void NbcSetLogicRect(const Rectangle& rRect);
 
+    /** the defaul is to set the logic rect to the given rectangle rMaxRect. If the shape
+        has an intrinsic aspect ratio it may set the logic rect so the aspect
+        ratio is kept but still inside the rectangle rMaxRect.
+
+        If bShrinkOnly is set to true, the size of the current logic rect will not
+        be changed if it is smaller than the given rectangle rMaxRect. */
+    virtual void AdjustToMaxRect( const Rectangle& rMaxRect, bool bShrinkOnly = false );
+
     // Drehwinkel und Shear
     virtual long GetRotateAngle() const;
     virtual long GetShearAngle(FASTBOOL bVertical=FALSE) const;
diff --git a/svx/inc/svx/svdograf.hxx b/svx/inc/svx/svdograf.hxx
index 89e2d35c9220..23d9204ca891 100644
--- a/svx/inc/svx/svdograf.hxx
+++ b/svx/inc/svx/svdograf.hxx
@@ -202,7 +202,7 @@ public:
 
     virtual SdrObject*      DoConvertToPolyObj(BOOL bBezier) const;
 
-    void                    AdjustToMaxRect( const Rectangle& rMaxRect, BOOL bShrinkOnly );
+    virtual void            AdjustToMaxRect( const Rectangle& rMaxRect, bool bShrinkOnly = false );
 
     virtual void            Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
 
diff --git a/svx/inc/svx/svdomedia.hxx b/svx/inc/svx/svdomedia.hxx
index b572bb989451..5b0980d8bb30 100644
--- a/svx/inc/svx/svdomedia.hxx
+++ b/svx/inc/svx/svdomedia.hxx
@@ -63,6 +63,8 @@ public:
 
         virtual void                operator=(const SdrObject& rObj);
 
+        virtual void                AdjustToMaxRect( const Rectangle& rMaxRect, bool bShrinkOnly = false );
+
 public:
 
         void                        setURL( const ::rtl::OUString& rURL );
diff --git a/svx/inc/svx/svdotable.hxx b/svx/inc/svx/svdotable.hxx
index a40b33c3ad18..02044f0dbc25 100644
--- a/svx/inc/svx/svdotable.hxx
+++ b/svx/inc/svx/svdotable.hxx
@@ -234,6 +234,7 @@ public:
 
     virtual const Rectangle& GetLogicRect() const;
     virtual void NbcSetLogicRect(const Rectangle& rRect);
+    virtual void AdjustToMaxRect( const Rectangle& rMaxRect, bool bShrinkOnly = false );
 
     virtual sal_uInt32 GetSnapPointCount() const;
     virtual Point GetSnapPoint(sal_uInt32 i) const;
diff --git a/svx/prj/build.lst b/svx/prj/build.lst
index 5b99711edaa2..dd56a2c59e83 100644
--- a/svx/prj/build.lst
+++ b/svx/prj/build.lst
@@ -30,8 +30,9 @@ sx	svx\source\unodraw						nmake	-	all	sx_undrw sx_inc NULL
 sx	svx\source\unogallery					nmake	-	all	sx_ungal sx_inc NULL
 sx	svx\source\gallery2						nmake	-	all	sx_gall sx_inc NULL
 sx	svx\source\xml							nmake	-	all	sx_xml sx_inc NULL
+sx	svx\source\core							nmake	-	all	sx_core sx_inc NULL
 sx	svx\source\accessibility				nmake	-	all	sx_accessibility sx_inc NULL
 sx	svx\source\customshapes					nmake	-	all sx_customshapes sx_inc NULL
 sx	svx\source\toolbars						nmake	-	all sx_toolbars sx_inc NULL
-sx      svx\util                                                                nmake   -       all     sx_util sx_3deng sx_dlg sx_draw sx_attribute sx_properties sx_contact sx_event sx_animation sx_primitive2d sx_primitive3d sx_overlay sx_fmcmp sx_form sx_gall sx_items sx_mnuc sx_sdi sx_stbc sx_tbxc sx_undrw sx_ungal sx_xml sx_xout sx_accessibility sx_intro sx_customshapes sx_toolbars sx_table sx_smarttags NULL
+sx      svx\util                                                                nmake   -       all     sx_util sx_3deng sx_dlg sx_draw sx_attribute sx_properties sx_contact sx_event sx_animation sx_primitive2d sx_primitive3d sx_overlay sx_fmcmp sx_form sx_gall sx_items sx_mnuc sx_sdi sx_stbc sx_tbxc sx_undrw sx_ungal sx_xml sx_core sx_xout sx_accessibility sx_intro sx_customshapes sx_toolbars sx_table sx_smarttags NULL
 sx	svx\source\gengal						nmake	-	all	sx_gengal sx_util NULL
diff --git a/svx/prj/d.lst b/svx/prj/d.lst
index 7d2f508d9d21..d4201f0caf34 100644
--- a/svx/prj/d.lst
+++ b/svx/prj/d.lst
@@ -69,7 +69,6 @@ mkdir: %_DEST%\inc%_EXT%\svx
 ..\inc\editstat.hxx %_DEST%\inc%_EXT%\svx\editstat.hxx
 ..\inc\editund2.hxx %_DEST%\inc%_EXT%\svx\editund2.hxx
 ..\inc\eerdll.hxx %_DEST%\inc%_EXT%\svx\editdll.hxx
-..\inc\extrusioncontrols.hxx %_DEST%\inc%_EXT%\svx\extrusioncontrols.hxx
 ..\inc\flstitem.hxx %_DEST%\inc%_EXT%\svx\flstitem.hxx
 ..\inc\fmgridif.hxx %_DEST%\inc%_EXT%\svx\fmgridif.hxx
 ..\inc\fmobjfac.hxx %_DEST%\inc%_EXT%\svx\fmobjfac.hxx
@@ -484,7 +483,7 @@ mkdir: %_DEST%\inc%_EXT%\svx
 ..\inc\svx\viewlayoutitem.hxx %_DEST%\inc%_EXT%\svx\viewlayoutitem.hxx
 ..\inc\svx\zoomslideritem.hxx %_DEST%\inc%_EXT%\svx\zoomslideritem.hxx
 ..\inc\svx\zoomsliderctrl.hxx %_DEST%\inc%_EXT%\svx\zoomsliderctrl.hxx
-
+..\inc\svx\extrusioncolorcontrol.hxx %_DEST%\inc%_EXT%\svx\extrusioncolorcontrol.hxx
 
 ..\inc\svx\itemtype.hxx %_DEST%\inc%_EXT%\svx\itemtype.hxx
 ..\inc\svx\outliner.hxx %_DEST%\inc%_EXT%\svx\outliner.hxx
diff --git a/svx/source/core/coreservices.cxx b/svx/source/core/coreservices.cxx
new file mode 100644
index 000000000000..1f1d69781756
--- /dev/null
+++ b/svx/source/core/coreservices.cxx
@@ -0,0 +1,183 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+/** this file contains the uno service registrations for all services in the svxcore lib */
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_svx.hxx"
+
+#include "sal/types.h"
+#include "osl/diagnose.h"
+#include "cppuhelper/factory.hxx"
+#include "uno/lbnames.h"
+
+using rtl::OUString;
+
+using namespace com::sun::star::uno;
+using namespace com::sun::star::lang;
+using namespace com::sun::star::registry;
+
+namespace svx
+{
+extern OUString SAL_CALL ExtrusionDepthController_getImplementationName();
+extern Reference< XInterface > SAL_CALL ExtrusionDepthController_createInstance(const Reference< XMultiServiceFactory > &)  throw( RuntimeException );
+extern Sequence< OUString > SAL_CALL ExtrusionDepthController_getSupportedServiceNames() throw( RuntimeException );
+
+extern OUString SAL_CALL ExtrusionDirectionControl_getImplementationName();
+extern Reference< XInterface > SAL_CALL ExtrusionDirectionControl_createInstance(const Reference< XMultiServiceFactory > &)  throw( RuntimeException );
+extern Sequence< OUString > SAL_CALL ExtrusionDirectionControl_getSupportedServiceNames() throw( RuntimeException );
+
+extern OUString SAL_CALL ExtrusionLightingControl_getImplementationName();
+extern Reference< XInterface > SAL_CALL ExtrusionLightingControl_createInstance(const Reference< XMultiServiceFactory > &)  throw( RuntimeException );
+extern Sequence< OUString > SAL_CALL ExtrusionLightingControl_getSupportedServiceNames() throw( RuntimeException );
+
+extern OUString SAL_CALL ExtrusionSurfaceControl_getImplementationName();
+extern Reference< XInterface > SAL_CALL ExtrusionSurfaceControl_createInstance(const Reference< XMultiServiceFactory > &)  throw( RuntimeException );
+extern Sequence< OUString > SAL_CALL ExtrusionSurfaceControl_getSupportedServiceNames() throw( RuntimeException );
+
+extern OUString SAL_CALL FontWorkAlignmentControl_getImplementationName();
+extern Reference< XInterface > SAL_CALL FontWorkAlignmentControl_createInstance(const Reference< XMultiServiceFactory > &)  throw( RuntimeException );
+extern Sequence< OUString > SAL_CALL FontWorkAlignmentControl_getSupportedServiceNames() throw( RuntimeException );
+
+extern OUString SAL_CALL FontWorkCharacterSpacingControl_getImplementationName();
+extern Reference< XInterface > SAL_CALL FontWorkCharacterSpacingControl_createInstance(const Reference< XMultiServiceFactory > &)  throw( RuntimeException );
+extern Sequence< OUString > SAL_CALL FontWorkCharacterSpacingControl_getSupportedServiceNames() throw( RuntimeException );
+}
+
+extern "C"
+{
+
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment (
+    const sal_Char ** ppEnvTypeName, uno_Environment ** )
+{
+    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
+}
+
+static void writeInfo (
+    XRegistryKey * pRegistryKey,
+    const OUString& rImplementationName,
+    const Sequence< OUString >& rServices)
+{
+    Reference< XRegistryKey > xNewKey(
+        pRegistryKey->createKey(
+            OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + rImplementationName + OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) ) );
+
+    for( sal_Int32 i = 0; i < rServices.getLength(); i++ )
+        xNewKey->createKey( rServices.getConstArray()[i]);
+}
+
+SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo (
+    void * , void * pRegistryKey)
+{
+    if( pRegistryKey )
+    {
+        try
+        {
+            XRegistryKey *pKey = reinterpret_cast< XRegistryKey * >( pRegistryKey );
+
+            writeInfo( pKey, ::svx::ExtrusionDepthController_getImplementationName(),::svx::ExtrusionDepthController_getSupportedServiceNames() );
+            writeInfo( pKey, ::svx::ExtrusionDirectionControl_getImplementationName(),::svx::ExtrusionDirectionControl_getSupportedServiceNames() );
+            writeInfo( pKey, ::svx::ExtrusionLightingControl_getImplementationName(),::svx::ExtrusionLightingControl_getSupportedServiceNames() );
+            writeInfo( pKey, ::svx::ExtrusionSurfaceControl_getImplementationName(),::svx::ExtrusionSurfaceControl_getSupportedServiceNames() );
+            writeInfo( pKey, ::svx::FontWorkAlignmentControl_getImplementationName(),::svx::FontWorkAlignmentControl_getSupportedServiceNames() );
+            writeInfo( pKey, ::svx::FontWorkCharacterSpacingControl_getImplementationName(),::svx::FontWorkCharacterSpacingControl_getSupportedServiceNames() );
+        }
+        catch (InvalidRegistryException &)
+        {
+            OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
+        }
+    }
+
+    return sal_True;
+}
+
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory (
+    const sal_Char * pImplName, void * pServiceManager, void *  )
+{
+    void * pRet = 0;
+    if( pServiceManager  )
+    {
+        Reference< XSingleServiceFactory > xFactory;
+
+        if( ::svx::ExtrusionDepthController_getImplementationName().equalsAscii( pImplName ) )
+        {
+            xFactory = ::cppu::createSingleFactory(
+                reinterpret_cast< XMultiServiceFactory * >( pServiceManager ),
+                ::svx::ExtrusionDepthController_getImplementationName(),
+                ::svx::ExtrusionDepthController_createInstance,
+                ::svx::ExtrusionDepthController_getSupportedServiceNames() );
+        }
+        else if( ::svx::ExtrusionDirectionControl_getImplementationName().equalsAscii( pImplName ) )
+        {
+            xFactory = ::cppu::createSingleFactory(
+                reinterpret_cast< XMultiServiceFactory * >( pServiceManager ),
+                ::svx::ExtrusionDirectionControl_getImplementationName(),
+                ::svx::ExtrusionDirectionControl_createInstance,
+                ::svx::ExtrusionDirectionControl_getSupportedServiceNames() );
+        }
+        else if( ::svx::ExtrusionLightingControl_getImplementationName().equalsAscii( pImplName ) )
+        {
+            xFactory = ::cppu::createSingleFactory(
+                reinterpret_cast< XMultiServiceFactory * >( pServiceManager ),
+                ::svx::ExtrusionLightingControl_getImplementationName(),
+                ::svx::ExtrusionLightingControl_createInstance,
+                ::svx::ExtrusionLightingControl_getSupportedServiceNames() );
+        }
+        else if( ::svx::ExtrusionSurfaceControl_getImplementationName().equalsAscii( pImplName ) )
+        {
+            xFactory = ::cppu::createSingleFactory(
+                reinterpret_cast< XMultiServiceFactory * >( pServiceManager ),
+                ::svx::ExtrusionSurfaceControl_getImplementationName(),
+                ::svx::ExtrusionSurfaceControl_createInstance,
+                ::svx::ExtrusionSurfaceControl_getSupportedServiceNames() );
+        }
+        else if( ::svx::FontWorkAlignmentControl_getImplementationName().equalsAscii( pImplName ) )
+        {
+            xFactory = ::cppu::createSingleFactory(
+                reinterpret_cast< XMultiServiceFactory * >( pServiceManager ),
+                ::svx::FontWorkAlignmentControl_getImplementationName(),
+                ::svx::FontWorkAlignmentControl_createInstance,
+                ::svx::FontWorkAlignmentControl_getSupportedServiceNames() );
+        }
+        else if( ::svx::FontWorkCharacterSpacingControl_getImplementationName().equalsAscii( pImplName ) )
+        {
+            xFactory = ::cppu::createSingleFactory(
+                reinterpret_cast< XMultiServiceFactory * >( pServiceManager ),
+                ::svx::FontWorkCharacterSpacingControl_getImplementationName(),
+                ::svx::FontWorkCharacterSpacingControl_createInstance,
+                ::svx::FontWorkCharacterSpacingControl_getSupportedServiceNames() );
+        }       if( xFactory.is())
+        {
+            xFactory->acquire();
+            pRet = xFactory.get();
+        }
+    }
+
+    return pRet;
+}
+
+}
diff --git a/svx/source/core/makefile.mk b/svx/source/core/makefile.mk
new file mode 100644
index 000000000000..da874894bae6
--- /dev/null
+++ b/svx/source/core/makefile.mk
@@ -0,0 +1,47 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..
+
+PRJNAME=svx
+TARGET=core
+ENABLE_EXCEPTIONS=TRUE
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :  settings.mk
+.INCLUDE :  $(PRJ)$/util$/makefile.pmk
+
+# --- Files --------------------------------------------------------
+
+SLOFILES = \
+        $(SLO)$/coreservices.obj
+
+# --- Targets -------------------------------------------------------
+
+.INCLUDE :  target.mk
+
diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx
index fd7da1f7eb8f..922d3f05ddff 100644
--- a/svx/source/form/fmview.cxx
+++ b/svx/source/form/fmview.cxx
@@ -339,7 +339,7 @@ void FmFormView::GrabFirstControlFocus( sal_Bool _bForceSync )
 //------------------------------------------------------------------------
 SdrPageView* FmFormView::ShowSdrPage(SdrPage* pPage)
 {
-    OSL_TRACE( "--- FmFormView::ShowSdrPage      : ........, %p, %p", this, pPage );
+//    OSL_TRACE( "--- FmFormView::ShowSdrPage      : ........, %p, %p", this, pPage );
 
     SdrPageView* pPV = E3dView::ShowSdrPage(pPage);
 
@@ -377,7 +377,7 @@ SdrPageView* FmFormView::ShowSdrPage(SdrPage* pPage)
 //------------------------------------------------------------------------
 void FmFormView::HideSdrPage()
 {
-    OSL_TRACE( "--- FmFormView::HideSdrPage      : ........, %p, %p", this, GetCurPage() );
+//    OSL_TRACE( "--- FmFormView::HideSdrPage      : ........, %p, %p", this, GetCurPage() );
 
     // --- 1. deactivate controls
     if ( !IsDesignMode() )
diff --git a/svx/source/sdr/overlay/overlaybitmapex.cxx b/svx/source/sdr/overlay/overlaybitmapex.cxx
index ac1e5aa4ef1c..c0b8975cf1c4 100644
--- a/svx/source/sdr/overlay/overlaybitmapex.cxx
+++ b/svx/source/sdr/overlay/overlaybitmapex.cxx
@@ -27,6 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
+#include <drawinglayer/primitive2d/unifiedalphaprimitive2d.hxx>
 #include <svx/sdr/overlay/overlaybitmapex.hxx>
 #include <vcl/salbtype.hxx>
 #include <vcl/outdev.hxx>
@@ -41,24 +42,32 @@ namespace sdr
     {
         drawinglayer::primitive2d::Primitive2DSequence OverlayBitmapEx::createOverlayObjectPrimitive2DSequence()
         {
-            const drawinglayer::primitive2d::Primitive2DReference aReference(
+            drawinglayer::primitive2d::Primitive2DReference aReference(
                 new drawinglayer::primitive2d::OverlayBitmapExPrimitive(
                     getBitmapEx(),
                     getBasePosition(),
                     getCenterX(),
                     getCenterY()));
 
+            if(basegfx::fTools::more(mfAlpha, 0.0))
+            {
+                const drawinglayer::primitive2d::Primitive2DSequence aNewTransPrimitiveVector(&aReference, 1L);
+                aReference = drawinglayer::primitive2d::Primitive2DReference(
+                                new drawinglayer::primitive2d::UnifiedAlphaPrimitive2D(aNewTransPrimitiveVector, mfAlpha));
+            }
+
             return drawinglayer::primitive2d::Primitive2DSequence(&aReference, 1);
         }
 
         OverlayBitmapEx::OverlayBitmapEx(
             const basegfx::B2DPoint& rBasePos,
             const BitmapEx& rBitmapEx,
-            sal_uInt16 nCenX, sal_uInt16 nCenY)
+            sal_uInt16 nCenX, sal_uInt16 nCenY, double fAlpha)
         :   OverlayObjectWithBasePosition(rBasePos, Color(COL_WHITE)),
             maBitmapEx(rBitmapEx),
             mnCenterX(nCenX),
-            mnCenterY(nCenY)
+            mnCenterY(nCenY),
+            mfAlpha(fAlpha)
         {
         }
 
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 76bcb828bb24..7235310def0b 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -1164,7 +1164,7 @@ BOOL SdrObjEditView::KeyInput(const KeyEvent& rKEvt, Window* pWin)
 #endif
         if (pTextEditOutlinerView->PostKeyEvent(rKEvt))
         {
-            if( pMod && !pMod->IsChanged() )
+            if( pMod /* && !pMod->IsChanged() */ )
             {
                 if( pTextEditOutliner && pTextEditOutliner->IsModified() )
                     pMod->SetChanged( sal_True );
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index 3d90eae6d68c..76b0e44a6b2f 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -306,7 +306,8 @@ SdrHdl::SdrHdl():
     bSelect(FALSE),
     b1PixMore(FALSE),
     bPlusHdl(FALSE),
-    mbMoveOutside(false)
+    mbMoveOutside(false),
+    mbMouseOver(false)
 {
 }
 
@@ -324,7 +325,8 @@ SdrHdl::SdrHdl(const Point& rPnt, SdrHdlKind eNewKind):
     bSelect(FALSE),
     b1PixMore(FALSE),
     bPlusHdl(FALSE),
-    mbMoveOutside(false)
+    mbMoveOutside(false),
+    mbMouseOver(false)
 {
 }
 
@@ -946,6 +948,19 @@ BOOL SdrHdl::IsFocusHdl() const
     }
 }
 
+void SdrHdl::onMouseEnter()
+{
+}
+
+void SdrHdl::onMouseLeave()
+{
+}
+
+bool SdrHdl::isMouseOver() const
+{
+    return mbMouseOver;
+}
+
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // class SdrHdlColor
 
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index b9598cef4ceb..64c996e5843c 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -1060,6 +1060,44 @@ void SdrMarkView::AddDragModeHdl(SdrDragMode eMode)
     }
 }
 
+/** handle mouse over effects for handles */
+BOOL SdrMarkView::MouseMove(const MouseEvent& rMEvt, Window* pWin)
+{
+    const ULONG nHdlCount = aHdl.GetHdlCount();
+    if( nHdlCount )
+    {
+        SdrHdl* pMouseOverHdl = 0;
+        if( !rMEvt.IsLeaveWindow() && pWin )
+        {
+            Point aMDPos( pWin->PixelToLogic( rMEvt.GetPosPixel() ) );
+            pMouseOverHdl = PickHandle(aMDPos);
+        }
+
+        // notify last mouse over handle that he lost the mouse
+        for(ULONG nHdl = 0; nHdl < nHdlCount; nHdl++ )
+        {
+            SdrHdl* pCurrentHdl = GetHdl(nHdl);
+            if( pCurrentHdl->mbMouseOver )
+            {
+                if( pCurrentHdl != pMouseOverHdl )
+                {
+                    pCurrentHdl->mbMouseOver = false;
+                    pCurrentHdl->onMouseLeave();
+                }
+                break;
+            }
+        }
+
+        // notify current mouse over handle
+        if( pMouseOverHdl && !pMouseOverHdl->mbMouseOver )
+        {
+            pMouseOverHdl->mbMouseOver = true;
+            pMouseOverHdl->onMouseEnter();
+        }
+    }
+    return SdrSnapView::MouseMove(rMEvt, pWin);
+}
+
 void SdrMarkView::ForceRefToMarked()
 {
     switch(eDragMode)
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 6eb96fe4f088..062295adb28e 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -1687,6 +1687,11 @@ void SdrObject::NbcSetLogicRect(const Rectangle& rRect)
     NbcSetSnapRect(rRect);
 }
 
+void SdrObject::AdjustToMaxRect( const Rectangle& rMaxRect, bool /* bShrinkOnly = false */ )
+{
+    SetLogicRect( rMaxRect );
+}
+
 void SdrObject::SetSnapRect(const Rectangle& rRect)
 {
     Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 1924235e7003..d1f65c30050d 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -1025,7 +1025,7 @@ void SdrGrafObj::ImpSetGrafInfoToAttr()
 
 // -----------------------------------------------------------------------------
 
-void SdrGrafObj::AdjustToMaxRect( const Rectangle& rMaxRect, BOOL bShrinkOnly )
+void SdrGrafObj::AdjustToMaxRect( const Rectangle& rMaxRect, bool bShrinkOnly )
 {
     Size aSize;
     Size aMaxSize( rMaxRect.GetSize() );
diff --git a/svx/source/svdraw/svdomedia.cxx b/svx/source/svdraw/svdomedia.cxx
index 4008e9494f2e..9dd615490f9e 100644
--- a/svx/source/svdraw/svdomedia.cxx
+++ b/svx/source/svdraw/svdomedia.cxx
@@ -28,6 +28,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
+#include <vcl/svapp.hxx>
+
 #include <svx/svdomedia.hxx>
 #include "svdglob.hxx"
 #include "svdstr.hrc"
@@ -147,6 +149,53 @@ void SdrMediaObj::operator=(const SdrObject& rObj)
 
 // ------------------------------------------------------------------------------
 
+void SdrMediaObj::AdjustToMaxRect( const Rectangle& rMaxRect, bool bShrinkOnly /* = false */ )
+{
+    Size aSize( Application::GetDefaultDevice()->PixelToLogic( getPreferredSize(), MAP_100TH_MM ) );
+    Size aMaxSize( rMaxRect.GetSize() );
+
+    if( aSize.Height() != 0 && aSize.Width() != 0 )
+    {
+        Point aPos( rMaxRect.TopLeft() );
+
+        // Falls Grafik zu gross, wird die Grafik
+        // in die Seite eingepasst
+        if ( (!bShrinkOnly                          ||
+             ( aSize.Height() > aMaxSize.Height() ) ||
+             ( aSize.Width()  > aMaxSize.Width()  ) )&&
+             aSize.Height() && aMaxSize.Height() )
+        {
+            float fGrfWH =  (float)aSize.Width() /
+                            (float)aSize.Height();
+            float fWinWH =  (float)aMaxSize.Width() /
+                            (float)aMaxSize.Height();
+
+            // Grafik an Pagesize anpassen (skaliert)
+            if ( fGrfWH < fWinWH )
+            {
+                aSize.Width() = (long)(aMaxSize.Height() * fGrfWH);
+                aSize.Height()= aMaxSize.Height();
+            }
+            else if ( fGrfWH > 0.F )
+            {
+                aSize.Width() = aMaxSize.Width();
+                aSize.Height()= (long)(aMaxSize.Width() / fGrfWH);
+            }
+
+            aPos = rMaxRect.Center();
+        }
+
+        if( bShrinkOnly )
+            aPos = aRect.TopLeft();
+
+        aPos.X() -= aSize.Width() / 2;
+        aPos.Y() -= aSize.Height() / 2;
+        SetLogicRect( Rectangle( aPos, aSize ) );
+    }
+}
+
+// ------------------------------------------------------------------------------
+
 void SdrMediaObj::setURL( const ::rtl::OUString& rURL )
 {
     ::avmedia::MediaItem aURLItem;
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index 856820b6d864..7a4305b9581f 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -1358,6 +1358,10 @@ SdrViewContext SdrView::GetContext() const
         for( ULONG nMarkNum = 0; nMarkNum < nMarkAnz && ( bGraf || bMedia ); nMarkNum++ )
         {
             const SdrObject* pMarkObj = GetMarkedObjectByIndex( nMarkNum );
+            DBG_ASSERT( pMarkObj, "SdrView::GetContext(), null pointer in mark list!" );
+
+            if( !pMarkObj )
+                continue;
 
             if( !pMarkObj->ISA( SdrGrafObj ) )
                 bGraf = FALSE;
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index d7f16cd15d3c..e928f94d88ec 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -2178,6 +2178,16 @@ void SdrTableObj::NbcSetLogicRect(const Rectangle& rRect)
     SetRectsDirty();
 }
 
+
+// --------------------------------------------------------------------
+
+void SdrTableObj::AdjustToMaxRect( const Rectangle& rMaxRect, bool /* bShrinkOnly = false */ )
+{
+    Rectangle aAdjustRect( rMaxRect );
+    aAdjustRect.setHeight( GetLogicRect().getHeight() );
+    SetLogicRect( aAdjustRect );
+}
+
 // --------------------------------------------------------------------
 
 void SdrTableObj::NbcMove(const Size& rSiz)
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx
index a4cab5f3ef16..f98fd57a0480 100644
--- a/svx/source/tbxctrls/extrusioncontrols.cxx
+++ b/svx/source/tbxctrls/extrusioncontrols.cxx
@@ -32,9 +32,14 @@
 
 #include <string> // HACK: prevent conflict between STLPORT and Workshop headers
 
-#ifndef _TOOLBOX_HXX //autogen
+#include <com/sun/star/util/XURLTransformer.hpp>
+#include <com/sun/star/awt/MenuItemStyle.hpp>
+#include <com/sun/star/awt/XPopupMenuExtended.hpp>
+#include <com/sun/star/graphic/XGraphic.hpp>
+
+#include <vos/mutex.hxx>
+
 #include <vcl/toolbox.hxx>
-#endif
 #include <sfx2/app.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/objsh.hxx>
@@ -42,30 +47,35 @@
 #include <vcl/settings.hxx>
 #include <svl/intitem.hxx>
 #include <editeng/colritem.hxx>
-#include "chrtitem.hxx"
 #include <tools/urlobj.hxx>
 
 #include <svx/dialogs.hrc>
-#include "helpid.hrc"
-
 #include <svx/svdtrans.hxx>
+#include <svx/sdasitm.hxx>
 #include <svx/dialmgr.hxx>
+#include "svx/extrusioncolorcontrol.hxx"
+
+//#include "chrtitem.hxx"
+#include "helpid.hrc"
 #include "extrusioncontrols.hxx"
 #include "extrusioncontrols.hrc"
-#include <svx/sdasitm.hxx>
-#include "toolbarmenu.hxx"
 #include "colorwindow.hxx"
-
-#include <svx/tbxcolorupdate.hxx>
+#include "extrusiondepthdialog.hxx"
 
 ////////////
 
-using namespace svx;
+using ::rtl::OUString;
+using ::svtools::ToolbarMenu;
+
+using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::util;
+using namespace ::com::sun::star::graphic;
 
-SFX_IMPL_TOOLBOX_CONTROL( ExtrusionDirectionControl, SfxBoolItem );
+namespace svx
+{
 
 /*************************************************************************
 |*
@@ -75,43 +85,17 @@ SFX_IMPL_TOOLBOX_CONTROL( ExtrusionDirectionControl, SfxBoolItem );
 
 static sal_Int32 gSkewList[] = { 135, 90, 45, 180, 0, -360, -135, -90, -45 };
 
-ExtrusionDirectionWindow::ExtrusionDirectionWindow(
-    USHORT nId,
-    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame ) :
-    SfxPopupWindow( nId,
-                    rFrame,
-                    SVX_RES( RID_SVXFLOAT_EXTRUSION_DIRECTION )),
-    mxFrame( rFrame ),
-    maImgPerspective( SVX_RES( IMG_PERSPECTIVE ) ),
-    maImgPerspectiveH( SVX_RES( IMG_PERSPECTIVE_H ) ),
-    maImgParallel( SVX_RES( IMG_PARALLEL ) ),
-    maImgParallelH( SVX_RES( IMG_PARALLEL_H ) ),
-    mbPopupMode     ( TRUE )
+ExtrusionDirectionWindow::ExtrusionDirectionWindow( svt::ToolboxController& rController, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, Window* pParentWindow )
+: ToolbarMenu( rFrame, pParentWindow, SVX_RES( RID_SVXFLOAT_EXTRUSION_DIRECTION ))
+, mrController( rController )
+, maImgPerspective( SVX_RES( IMG_PERSPECTIVE ) )
+, maImgPerspectiveH( SVX_RES( IMG_PERSPECTIVE_H ) )
+, maImgParallel( SVX_RES( IMG_PARALLEL ) )
+, maImgParallelH( SVX_RES( IMG_PARALLEL_H ) )
+, msExtrusionDirection( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionDirection" ) )
+, msExtrusionProjection( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionProjection" ) )
 {
-    implInit();
-}
-
-ExtrusionDirectionWindow::ExtrusionDirectionWindow(
-    USHORT nId,
-    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
-    Window* pParentWindow ) :
-    SfxPopupWindow( nId,
-                    rFrame,
-                    pParentWindow,
-                    SVX_RES( RID_SVXFLOAT_EXTRUSION_DIRECTION )),
-    mxFrame( rFrame ),
-    maImgPerspective( SVX_RES( IMG_PERSPECTIVE ) ),
-    maImgPerspectiveH( SVX_RES( IMG_PERSPECTIVE_H ) ),
-    maImgParallel( SVX_RES( IMG_PARALLEL ) ),
-    maImgParallelH( SVX_RES( IMG_PARALLEL_H ) ),
-    mbPopupMode     ( TRUE )
-{
-    implInit();
-}
-
-void ExtrusionDirectionWindow::implInit()
-{
-    SetHelpId( HID_POPUP_EXTRUSION_DIRECTION );
+    SetHelpId( HID_MENU_EXTRUSION_DIRECTION );
 
     USHORT i;
     for( i = DIRECTION_NW; i <= DIRECTION_SE; i++ )
@@ -120,16 +104,10 @@ void ExtrusionDirectionWindow::implInit()
         maImgDirectionH[i] = Image( SVX_RES( IMG_DIRECTION_H + i ) );
     }
 
-//  mpDirectionForewarder = new SfxStatusForwarder( SID_EXTRUSION_DIRECTION, *this );
-//  mpProjectionForewarder = new SfxStatusForwarder( SID_EXTRUSION_PROJECTION, *this );
-
-    mpMenu = new ToolbarMenu( this, WB_CLIPCHILDREN );
-    mpMenu->SetHelpId( HID_MENU_EXTRUSION_DIRECTION );
-    mpMenu->SetSelectHdl( LINK( this, ExtrusionDirectionWindow, SelectHdl ) );
-    mpDirectionSet = new ValueSet( mpMenu, WB_TABSTOP | WB_MENUSTYLEVALUESET | WB_FLATVALUESET | WB_NOBORDER | WB_NO_DIRECTSELECT );
+    SetSelectHdl( LINK( this, ExtrusionDirectionWindow, SelectHdl ) );
+    mpDirectionSet = createEmptyValueSetControl();
     mpDirectionSet->SetHelpId( HID_VALUESET_EXTRUSION_DIRECTION );
 
-    mpDirectionSet->SetHelpId( HID_POPUP_LINEEND_CTRL );
     mpDirectionSet->SetSelectHdl( LINK( this, ExtrusionDirectionWindow, SelectHdl ) );
     mpDirectionSet->SetColCount( 3 );
     mpDirectionSet->EnableFullItemMode( FALSE );
@@ -144,55 +122,39 @@ void ExtrusionDirectionWindow::implInit()
 
     mpDirectionSet->SetOutputSizePixel( Size( 72, 72 ) );
 
-    mpMenu->appendEntry( 2, mpDirectionSet );
-    mpMenu->appendSeparator();
-    mpMenu->appendEntry( 0, String( SVX_RES( STR_PERSPECTIVE ) ), bHighContrast ? maImgPerspectiveH : maImgPerspective );
-    mpMenu->appendEntry( 1, String( SVX_RES( STR_PARALLEL ) ), bHighContrast ? maImgParallelH : maImgParallel );
-
-    SetOutputSizePixel( mpMenu->getMenuSize() );
-    mpMenu->SetOutputSizePixel( GetOutputSizePixel() );
+    appendEntry( 2, mpDirectionSet );
+    appendSeparator();
+    appendEntry( 0, String( SVX_RES( STR_PERSPECTIVE ) ), bHighContrast ? maImgPerspectiveH : maImgPerspective );
+    appendEntry( 1, String( SVX_RES( STR_PARALLEL ) ), bHighContrast ? maImgParallelH : maImgParallel );
 
-    mpMenu->Show();
+    SetOutputSizePixel( getMenuSize() );
 
     FreeResource();
 
-    AddStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionDirection" )));
-    AddStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionProjection" )));
-}
-
-SfxPopupWindow* ExtrusionDirectionWindow::Clone() const
-{
-    return new ExtrusionDirectionWindow( GetId(), mxFrame );
+    AddStatusListener( msExtrusionDirection );
+    AddStatusListener( msExtrusionProjection );
 }
 
 void ExtrusionDirectionWindow::DataChanged( const DataChangedEvent& rDCEvt )
 {
-    SfxPopupWindow::DataChanged( rDCEvt );
+    ToolbarMenu::DataChanged( rDCEvt );
 
     if( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) )
     {
         bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
 
-        USHORT i;
-        for( i = DIRECTION_NW; i <= DIRECTION_SE; i++ )
+        for( USHORT i = DIRECTION_NW; i <= DIRECTION_SE; i++ )
         {
             mpDirectionSet->SetItemImage( i+1, bHighContrast ? maImgDirectionH[ i ] : maImgDirection[ i ] );
         }
 
-        mpMenu->setEntryImage( 0, bHighContrast ? maImgPerspectiveH : maImgPerspective );
-        mpMenu->setEntryImage( 1, bHighContrast ? maImgParallelH : maImgParallel );
+        setEntryImage( 0, bHighContrast ? maImgPerspectiveH : maImgPerspective );
+        setEntryImage( 1, bHighContrast ? maImgParallelH : maImgParallel );
     }
 }
 
 // -----------------------------------------------------------------------
 
-ExtrusionDirectionWindow::~ExtrusionDirectionWindow()
-{
-    delete mpMenu;
-}
-
-// -----------------------------------------------------------------------
-
 void ExtrusionDirectionWindow::implSetDirection( sal_Int32 nSkew, bool bEnabled )
 {
     if( mpDirectionSet )
@@ -213,58 +175,47 @@ void ExtrusionDirectionWindow::implSetDirection( sal_Int32 nSkew, bool bEnabled
             mpDirectionSet->SetNoSelection();
         }
     }
-    if( mpMenu )
-    {
-        mpMenu->enableEntry( 2, bEnabled );
-    }
+    enableEntry( 2, bEnabled );
 }
 
 // -----------------------------------------------------------------------
 
 void ExtrusionDirectionWindow::implSetProjection( sal_Int32 nProjection, bool bEnabled )
 {
-    if( mpMenu )
-    {
-        mpMenu->checkEntry( 0, (nProjection == 0) && bEnabled );
-        mpMenu->checkEntry( 1, (nProjection == 1 ) && bEnabled );
-        mpMenu->enableEntry( 0, bEnabled );
-        mpMenu->enableEntry( 1, bEnabled );
-    }
+    checkEntry( 0, (nProjection == 0) && bEnabled );
+    checkEntry( 1, (nProjection == 1 ) && bEnabled );
+    enableEntry( 0, bEnabled );
+    enableEntry( 1, bEnabled );
 }
 
 // -----------------------------------------------------------------------
 
-void ExtrusionDirectionWindow::StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState )
+void SAL_CALL ExtrusionDirectionWindow::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException )
 {
-    switch( nSID )
+    if( Event.FeatureURL.Main.equals( msExtrusionDirection ) )
     {
-        case SID_EXTRUSION_DIRECTION:
+        if( !Event.IsEnabled )
         {
-            if( eState == SFX_ITEM_DISABLED )
-            {
-                implSetDirection( -1, false );
-            }
-            else
-            {
-                const SfxInt32Item* pStateItem = PTR_CAST( SfxInt32Item, pState );
-                if( pStateItem )
-                    implSetDirection( pStateItem->GetValue(), true );
-            }
-            break;
+            implSetDirection( -1, false );
         }
-        case SID_EXTRUSION_PROJECTION:
+        else
         {
-            if( eState == SFX_ITEM_DISABLED )
-            {
-                implSetProjection( -1, false );
-            }
-            else
-            {
-                const SfxInt32Item* pStateItem = PTR_CAST( SfxInt32Item, pState );
-                if( pStateItem )
-                    implSetProjection( pStateItem->GetValue(), true );
-            }
-            break;
+            sal_Int32 nValue = 0;
+            if( Event.State >>= nValue )
+                implSetDirection( nValue, true );
+        }
+    }
+    else if( Event.FeatureURL.Main.equals( msExtrusionProjection ) )
+    {
+        if( !Event.IsEnabled )
+        {
+            implSetProjection( -1, false );
+        }
+        else
+        {
+            sal_Int32 nValue = 0;
+            if( Event.State >>= nValue )
+                implSetProjection( nValue, true );
         }
     }
 }
@@ -276,48 +227,24 @@ IMPL_LINK( ExtrusionDirectionWindow, SelectHdl, void *, pControl )
     if ( IsInPopupMode() )
         EndPopupMode();
 
-//  SfxDispatcher* pDisp = GetBindings().GetDispatcher();
-
     if( pControl == mpDirectionSet )
     {
-        sal_Int32 nSkew = gSkewList[mpDirectionSet->GetSelectItemId()-1];
-
-        SfxInt32Item    aItem( SID_EXTRUSION_DIRECTION, nSkew );
-        rtl::OUString   aCommand( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionDirection" ));
-
-        Any a;
-        INetURLObject aObj( aCommand );
         Sequence< PropertyValue > aArgs( 1 );
-        aArgs[0].Name = aObj.GetURLPath();
-        aItem.QueryValue( a );
-        aArgs[0].Value = a;
-
-        SfxToolBoxControl::Dispatch( Reference< ::com::sun::star::frame::XDispatchProvider >(
-                                     mxFrame->getController(), UNO_QUERY ),
-                                     aCommand,
-                                     aArgs );
+        aArgs[0].Name = msExtrusionDirection.copy(5);
+        aArgs[0].Value <<= (sal_Int32)gSkewList[mpDirectionSet->GetSelectItemId()-1];
 
-//      pDisp->Execute( SID_EXTRUSION_DIRECTION, SFX_CALLMODE_RECORD, &aItem, 0L , 0L );
+        mrController.dispatchCommand( msExtrusionDirection, aArgs );
     }
     else
     {
-        int nProjection = mpMenu->getSelectedEntryId();
+        int nProjection = getSelectedEntryId();
         if( (nProjection >= 0) && (nProjection < 2 ) )
         {
-            SfxInt32Item    aItem( SID_EXTRUSION_PROJECTION, nProjection );
-            rtl::OUString   aCommand( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionProjection" ));
-
-            Any a;
-            INetURLObject aObj( aCommand );
             Sequence< PropertyValue > aArgs( 1 );
-            aArgs[0].Name = aObj.GetURLPath();
-            aItem.QueryValue( a );
-            aArgs[0].Value = a;
-
-            SfxToolBoxControl::Dispatch( Reference< ::com::sun::star::frame::XDispatchProvider >(
-                                        mxFrame->getController(), UNO_QUERY ),
-                                        aCommand,
-                                        aArgs );
+            aArgs[0].Name = msExtrusionProjection.copy(5);
+            aArgs[0].Value <<= (sal_Int32)nProjection;
+
+            mrController.dispatchCommand( msExtrusionProjection, aArgs );
             implSetProjection( nProjection, true );
         }
     }
@@ -325,94 +252,59 @@ IMPL_LINK( ExtrusionDirectionWindow, SelectHdl, void *, pControl )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+// =======================================================================
+// ExtrusionDirectionControl
+// =======================================================================
 
-void ExtrusionDirectionWindow::FillValueSet()
+ExtrusionDirectionControl::ExtrusionDirectionControl( const Reference< lang::XMultiServiceFactory >& rServiceManager )
+: svt::PopupWindowController( rServiceManager, Reference< frame::XFrame >(), OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionDirectionFloater" ) ) )
 {
 }
 
 // -----------------------------------------------------------------------
 
-void ExtrusionDirectionWindow::StartSelection()
+::Window* ExtrusionDirectionControl::createPopupWindow( ::Window* pParent )
 {
-    mpDirectionSet->StartSelection();
+    return new ExtrusionDirectionWindow( *this, m_xFrame, pParent );
 }
 
 // -----------------------------------------------------------------------
-
-BOOL ExtrusionDirectionWindow::Close()
-{
-    return SfxPopupWindow::Close();
-}
-
-// -----------------------------------------------------------------------
-
-void ExtrusionDirectionWindow::PopupModeEnd()
-{
-    if ( IsVisible() )
-    {
-        mbPopupMode = FALSE;
-    }
-    SfxPopupWindow::PopupModeEnd();
-}
-
+// XServiceInfo
 // -----------------------------------------------------------------------
 
-void ExtrusionDirectionWindow::GetFocus (void)
-{
-    SfxPopupWindow::GetFocus();
-    // Grab the focus to the line ends value set so that it can be controlled
-    // with the keyboard.
-    if( mpDirectionSet )
-        mpDirectionSet->GrabFocus();
-}
-
-/*************************************************************************
-|*
-|* SvxLineEndToolBoxControl
-|*
-\************************************************************************/
-
-ExtrusionDirectionControl::ExtrusionDirectionControl(
-    USHORT nSlotId, USHORT  nId, ToolBox &rTbx )
-: SfxToolBoxControl( nSlotId, nId, rTbx )
+OUString SAL_CALL ExtrusionDirectionControl_getImplementationName()
 {
-    rTbx.SetItemBits( nId, TIB_DROPDOWNONLY | rTbx.GetItemBits( nId ) );
+    return OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svx.ExtrusionDirectionController" ));
 }
 
-// -----------------------------------------------------------------------
+// --------------------------------------------------------------------
 
-ExtrusionDirectionControl::~ExtrusionDirectionControl()
+Sequence< OUString > SAL_CALL ExtrusionDirectionControl_getSupportedServiceNames() throw( RuntimeException )
 {
+    Sequence< OUString > aSNS( 1 );
+    aSNS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ToolbarController" ));
+    return aSNS;
 }
 
-// -----------------------------------------------------------------------
+// --------------------------------------------------------------------
 
-SfxPopupWindowType ExtrusionDirectionControl::GetPopupWindowType() const
+Reference< XInterface > SAL_CALL SAL_CALL ExtrusionDirectionControl_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) throw( RuntimeException )
 {
-    return SFX_POPUPWINDOW_ONCLICK;
+    return *new ExtrusionDirectionControl( rSMgr );
 }
 
-// -----------------------------------------------------------------------
+// --------------------------------------------------------------------
 
-SfxPopupWindow* ExtrusionDirectionControl::CreatePopupWindow()
+OUString SAL_CALL ExtrusionDirectionControl::getImplementationName(  ) throw (RuntimeException)
 {
-    ExtrusionDirectionWindow* pWin = new ExtrusionDirectionWindow( GetId(), m_xFrame, &GetToolBox() );
-    pWin->StartPopupMode( &GetToolBox(), TRUE );
-    pWin->StartSelection();
-    SetPopupWindow( pWin );
-    return pWin;
+    return ExtrusionDirectionControl_getImplementationName();
 }
 
-// -----------------------------------------------------------------------
+// --------------------------------------------------------------------
 
-void ExtrusionDirectionControl::StateChanged( USHORT, SfxItemState eState, const SfxPoolItem* )
+Sequence< OUString > SAL_CALL ExtrusionDirectionControl::getSupportedServiceNames(  ) throw (RuntimeException)
 {
-    USHORT nId = GetId();
-    ToolBox& rTbx = GetToolBox();
-
-    rTbx.EnableItem( nId, SFX_ITEM_DISABLED != eState );
-    rTbx.SetItemState( nId, ( SFX_ITEM_DONTCARE == eState ) ? STATE_DONTKNOW : STATE_NOCHECK );
+    return ExtrusionDirectionControl_getSupportedServiceNames();
 }
 
 // ####################################################################
@@ -444,135 +336,66 @@ double ExtrusionDepthDialog::getDepth() const
 
 // ####################################################################
 
-SFX_IMPL_TOOLBOX_CONTROL( ExtrusionDepthControl, SfxBoolItem );
-
-ExtrusionDepthWindow::ExtrusionDepthWindow(
-    USHORT nId,
-    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame ) :
-    SfxPopupWindow( nId,
-                    rFrame,
-                    SVX_RES( RID_SVXFLOAT_EXTRUSION_DEPTH )),
-    maImgDepth0( SVX_RES( IMG_DEPTH_0 ) ),
-    maImgDepth1( SVX_RES( IMG_DEPTH_1 ) ),
-    maImgDepth2( SVX_RES( IMG_DEPTH_2 ) ),
-    maImgDepth3( SVX_RES( IMG_DEPTH_3 ) ),
-    maImgDepth4( SVX_RES( IMG_DEPTH_4 ) ),
-    maImgDepthInfinity( SVX_RES( IMG_DEPTH_INFINITY ) ),
-    maImgDepth0h( SVX_RES( IMG_DEPTH_0_H ) ),
-    maImgDepth1h( SVX_RES( IMG_DEPTH_1_H ) ),
-    maImgDepth2h( SVX_RES( IMG_DEPTH_2_H ) ),
-    maImgDepth3h( SVX_RES( IMG_DEPTH_3_H ) ),
-    maImgDepth4h( SVX_RES( IMG_DEPTH_4_H ) ),
-    maImgDepthInfinityh( SVX_RES( IMG_DEPTH_INFINITY_H ) ),
-    mxFrame( rFrame ),
-    mbPopupMode     ( true ),
-    mfDepth( -1.0 ),
-    mbEnabled( false )
-{
-    implInit();
-}
-
-ExtrusionDepthWindow::ExtrusionDepthWindow( USHORT nId,
-    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
-    Window* pParentWindow ) :
-    SfxPopupWindow( nId,
-                    rFrame,
-                    pParentWindow,
-                    SVX_RES( RID_SVXFLOAT_EXTRUSION_DEPTH )),
-    maImgDepth0( SVX_RES( IMG_DEPTH_0 ) ),
-    maImgDepth1( SVX_RES( IMG_DEPTH_1 ) ),
-    maImgDepth2( SVX_RES( IMG_DEPTH_2 ) ),
-    maImgDepth3( SVX_RES( IMG_DEPTH_3 ) ),
-    maImgDepth4( SVX_RES( IMG_DEPTH_4 ) ),
-    maImgDepthInfinity( SVX_RES( IMG_DEPTH_INFINITY ) ),
-    maImgDepth0h( SVX_RES( IMG_DEPTH_0_H ) ),
-    maImgDepth1h( SVX_RES( IMG_DEPTH_1_H ) ),
-    maImgDepth2h( SVX_RES( IMG_DEPTH_2_H ) ),
-    maImgDepth3h( SVX_RES( IMG_DEPTH_3_H ) ),
-    maImgDepth4h( SVX_RES( IMG_DEPTH_4_H ) ),
-    maImgDepthInfinityh( SVX_RES( IMG_DEPTH_INFINITY_H ) ),
-    mxFrame( rFrame ),
-    mbPopupMode     ( true ),
-    mfDepth( -1.0 ),
-    mbEnabled( false )
-{
-    implInit();
-}
-
-void ExtrusionDepthWindow::implInit()
-{
-    SetHelpId( HID_POPUP_EXTRUSION_DEPTH );
-
-//  mpDepthForewarder = new SfxStatusForwarder( SID_EXTRUSION_DEPTH, *this );
-//  mpMetricForewarder = new SfxStatusForwarder( SID_ATTR_METRIC, *this );
-
-    mpMenu = new ToolbarMenu( this, WB_CLIPCHILDREN );
-    mpMenu->SetHelpId( HID_MENU_EXTRUSION_DEPTH );
+double aDepthListInch[] = { 0, 1270,2540,5080,10160 };
+double aDepthListMM[] = { 0, 1000, 2500, 5000, 10000 };
 
-    mpMenu->SetSelectHdl( LINK( this, ExtrusionDepthWindow, SelectHdl ) );
+ExtrusionDepthWindow::ExtrusionDepthWindow( svt::ToolboxController& rController, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, Window* pParentWindow )
+: ToolbarMenu( rFrame, pParentWindow, SVX_RES( RID_SVXFLOAT_EXTRUSION_DEPTH ))
+, mrController( rController )
+, maImgDepth0( SVX_RES( IMG_DEPTH_0 ) )
+, maImgDepth1( SVX_RES( IMG_DEPTH_1 ) )
+, maImgDepth2( SVX_RES( IMG_DEPTH_2 ) )
+, maImgDepth3( SVX_RES( IMG_DEPTH_3 ) )
+, maImgDepth4( SVX_RES( IMG_DEPTH_4 ) )
+, maImgDepthInfinity( SVX_RES( IMG_DEPTH_INFINITY ) )
+, maImgDepth0h( SVX_RES( IMG_DEPTH_0_H ) )
+, maImgDepth1h( SVX_RES( IMG_DEPTH_1_H ) )
+, maImgDepth2h( SVX_RES( IMG_DEPTH_2_H ) )
+, maImgDepth3h( SVX_RES( IMG_DEPTH_3_H ) )
+, maImgDepth4h( SVX_RES( IMG_DEPTH_4_H ) )
+, maImgDepthInfinityh( SVX_RES( IMG_DEPTH_INFINITY_H ) )
+, mfDepth( -1.0 )
+, msExtrusionDepth( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionDepth" ) )
+, msMetricUnit( RTL_CONSTASCII_USTRINGPARAM( ".uno:MetricUnit" ) )
+{
+    SetHelpId( HID_MENU_EXTRUSION_DEPTH );
+
+    SetSelectHdl( LINK( this, ExtrusionDepthWindow, SelectHdl ) );
 
     bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
 
     String aEmpty;
-    mpMenu->appendEntry( 0, aEmpty, bHighContrast ? maImgDepth0h : maImgDepth0 );
-    mpMenu->appendEntry( 1, aEmpty, bHighContrast ? maImgDepth1h : maImgDepth1 );
-    mpMenu->appendEntry( 2, aEmpty, bHighContrast ? maImgDepth2h : maImgDepth2 );
-    mpMenu->appendEntry( 3, aEmpty, bHighContrast ? maImgDepth3h : maImgDepth3 );
-    mpMenu->appendEntry( 4, aEmpty, bHighContrast ? maImgDepth4h : maImgDepth4 );
-    mpMenu->appendEntry( 5, String( SVX_RES( STR_INFINITY ) ), bHighContrast ? maImgDepthInfinityh : maImgDepthInfinity );
-    mpMenu->appendEntry( 6, String( SVX_RES( STR_CUSTOM ) ) );
+    appendEntry( 0, aEmpty, bHighContrast ? maImgDepth0h : maImgDepth0 );
+    appendEntry( 1, aEmpty, bHighContrast ? maImgDepth1h : maImgDepth1 );
+    appendEntry( 2, aEmpty, bHighContrast ? maImgDepth2h : maImgDepth2 );
+    appendEntry( 3, aEmpty, bHighContrast ? maImgDepth3h : maImgDepth3 );
+    appendEntry( 4, aEmpty, bHighContrast ? maImgDepth4h : maImgDepth4 );
+    appendEntry( 5, String( SVX_RES( STR_INFINITY ) ), bHighContrast ? maImgDepthInfinityh : maImgDepthInfinity );
+    appendEntry( 6, String( SVX_RES( STR_CUSTOM ) ) );
 
-    SetOutputSizePixel( mpMenu->getMenuSize() );
-    mpMenu->SetOutputSizePixel( GetOutputSizePixel() );
-
-    mpMenu->Show();
+    SetOutputSizePixel( getMenuSize() );
 
     FreeResource();
 
-    AddStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionDepth" )));
-    AddStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:MetricUnit" )));
-//  rBindings.Update( SID_ATTR_METRIC );
-//  rBindings.Update( SID_EXTRUSION_DEPTH );
-}
-
-SfxPopupWindow* ExtrusionDepthWindow::Clone() const
-{
-    return new ExtrusionDepthWindow( GetId(), mxFrame );
+    AddStatusListener( msExtrusionDepth );
+    AddStatusListener( msMetricUnit );
 }
 
 // -----------------------------------------------------------------------
 
-ExtrusionDepthWindow::~ExtrusionDepthWindow()
+void ExtrusionDepthWindow::implSetDepth( double fDepth )
 {
-//  delete mpDepthForewarder;
-//  delete mpMetricForewarder;
-
-    delete mpMenu;
-}
-
-// -----------------------------------------------------------------------
-
-double aDepthListInch[] = { 0, 1270,2540,5080,10160 };
-double aDepthListMM[] = { 0, 1000, 2500, 5000, 10000 };
-
-void ExtrusionDepthWindow::implSetDepth( double fDepth, bool bEnabled )
-{
-    mbEnabled = bEnabled;
     mfDepth = fDepth;
-    if( mpMenu )
+    int i;
+    for( i = 0; i < 7; i++ )
     {
-        int i;
-        for( i = 0; i < 7; i++ )
+        if( i == 5 )
         {
-            if( i == 5 )
-            {
-                mpMenu->checkEntry( i, (fDepth >= 338666) && bEnabled );
-            }
-            else if( i != 6 )
-            {
-                mpMenu->checkEntry( i, (fDepth == (IsMetric( meUnit ) ? aDepthListMM[i] : aDepthListInch[i]) && bEnabled ) );
-            }
-            mpMenu->enableEntry( i, bEnabled );
+            checkEntry( i, fDepth >= 338666 );
+        }
+        else if( i != 6 )
+        {
+            checkEntry( i, (fDepth == (IsMetric( meUnit ) ? aDepthListMM[i] : aDepthListInch[i]) ) );
         }
     }
 }
@@ -587,38 +410,37 @@ void ExtrusionDepthWindow::implFillStrings( FieldUnit eUnit )
     for( int i = 0; i < 5; i++ )
     {
         String aStr( SVX_RES( nResource + i ) );
-        mpMenu->setEntryText( i, aStr );
+        setEntryText( i, aStr );
     };
 }
 
 // -----------------------------------------------------------------------
 
-void ExtrusionDepthWindow::StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState )
+void SAL_CALL ExtrusionDepthWindow::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException )
 {
-    switch( nSID )
+    if( Event.FeatureURL.Main.equals( msExtrusionDepth ) )
     {
-        case SID_EXTRUSION_DEPTH:
+        if( !Event.IsEnabled )
         {
-            if( eState == SFX_ITEM_DISABLED )
-            {
-                implSetDepth( 0, false );
-            }
-            else
-            {
-                const SvxDoubleItem* pStateItem = PTR_CAST( SvxDoubleItem, pState );
-                if( pStateItem )
-                    implSetDepth( pStateItem->GetValue(), true );
-            }
-            break;
+            implSetDepth( 0 );
         }
-        case SID_ATTR_METRIC:
+        else
+        {
+            double fValue = 0.0;
+            if( Event.State >>= fValue )
+                implSetDepth( fValue );
+        }
+    }
+    else if( Event.FeatureURL.Main.equals( msMetricUnit ) )
+    {
+        if( Event.IsEnabled )
         {
-            const SfxUInt16Item* pStateItem = PTR_CAST( SfxUInt16Item, pState );
-            if( pStateItem )
+            sal_Int32 nValue = 0;
+            if( Event.State >>= nValue )
             {
-                implFillStrings( (FieldUnit)pStateItem->GetValue() );
+                implFillStrings( static_cast<FieldUnit>(nValue) );
                 if( mfDepth >= 0.0 )
-                    implSetDepth( mfDepth, mbEnabled );
+                    implSetDepth( mfDepth );
             }
         }
     }
@@ -628,18 +450,18 @@ void ExtrusionDepthWindow::StateChanged( USHORT nSID, SfxItemState eState, const
 
 void ExtrusionDepthWindow::DataChanged( const DataChangedEvent& rDCEvt )
 {
-    SfxPopupWindow::DataChanged( rDCEvt );
+    ToolbarMenu::DataChanged( rDCEvt );
 
     if( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) )
     {
         bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
 
-        mpMenu->setEntryImage( 0, bHighContrast ? maImgDepth0h : maImgDepth0 );
-        mpMenu->setEntryImage( 1, bHighContrast ? maImgDepth1h : maImgDepth1 );
-        mpMenu->setEntryImage( 2, bHighContrast ? maImgDepth2h : maImgDepth2 );
-        mpMenu->setEntryImage( 3, bHighContrast ? maImgDepth3h : maImgDepth3 );
-        mpMenu->setEntryImage( 4, bHighContrast ? maImgDepth4h : maImgDepth4 );
-        mpMenu->setEntryImage( 5, bHighContrast ? maImgDepthInfinityh : maImgDepthInfinity );
+        setEntryImage( 0, bHighContrast ? maImgDepth0h : maImgDepth0 );
+        setEntryImage( 1, bHighContrast ? maImgDepth1h : maImgDepth1 );
+        setEntryImage( 2, bHighContrast ? maImgDepth2h : maImgDepth2 );
+        setEntryImage( 3, bHighContrast ? maImgDepth3h : maImgDepth3 );
+        setEntryImage( 4, bHighContrast ? maImgDepth4h : maImgDepth4 );
+        setEntryImage( 5, bHighContrast ? maImgDepthInfinityh : maImgDepthInfinity );
     }
 }
 
@@ -648,9 +470,7 @@ void ExtrusionDepthWindow::DataChanged( const DataChangedEvent& rDCEvt )
 
 IMPL_LINK( ExtrusionDepthWindow, SelectHdl, void *, EMPTYARG )
 {
-//  SfxDispatcher* pDisp = GetBindings().GetDispatcher();
-
-    int nSelected = mpMenu->getSelectedEntryId();
+    int nSelected = getSelectedEntryId();
     if( nSelected != -1 )
     {
         if( nSelected == 6 )
@@ -658,24 +478,16 @@ IMPL_LINK( ExtrusionDepthWindow, SelectHdl, void *, EMPTYARG )
             if ( IsInPopupMode() )
                 EndPopupMode();
 
-            SvxDoubleItem aDepthItem( mfDepth, SID_EXTRUSION_DEPTH );
-            SfxUInt16Item aMetricItem(
-                SID_ATTR_METRIC, sal::static_int_cast< UINT16 >( meUnit ) );
-            rtl::OUString aCommand( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionDepthDialog" ));
+            const rtl::OUString aCommand( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionDepthDialog" ));
 
             Any a;
             Sequence< PropertyValue > aArgs( 2 );
             aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Depth" ));
-            aDepthItem.QueryValue( a );
-            aArgs[0].Value = a;
+            aArgs[0].Value <<= mfDepth;
             aArgs[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Metric" ));
-            aMetricItem.QueryValue( a );
-            aArgs[1].Value = a;
+            aArgs[1].Value <<= static_cast<sal_Int32>( meUnit );
 
-            SfxToolBoxControl::Dispatch( Reference< ::com::sun::star::frame::XDispatchProvider >(
-                                         mxFrame->getController(), UNO_QUERY ),
-                                         aCommand,
-                                         aArgs );
+            mrController.dispatchCommand( aCommand, aArgs );
         }
         else
         {
@@ -690,21 +502,12 @@ IMPL_LINK( ExtrusionDepthWindow, SelectHdl, void *, EMPTYARG )
                 fDepth = IsMetric( meUnit ) ? aDepthListMM[nSelected] : aDepthListInch[nSelected];
             }
 
-            SvxDoubleItem aItem( fDepth, SID_EXTRUSION_DEPTH );
-            rtl::OUString aCommand( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionDepth" ));
-
-            Any a;
-            INetURLObject aObj( aCommand );
             Sequence< PropertyValue > aArgs( 1 );
-            aArgs[0].Name = aObj.GetURLPath();
-            aItem.QueryValue( a );
-            aArgs[0].Value = a;
+            aArgs[0].Name = msExtrusionDepth.copy(5);
+            aArgs[0].Value <<= fDepth;
 
-            SfxToolBoxControl::Dispatch( Reference< ::com::sun::star::frame::XDispatchProvider >(
-                                         mxFrame->getController(), UNO_QUERY ),
-                                         aCommand,
-                                         aArgs );
-            implSetDepth( fDepth, true );
+            mrController.dispatchCommand( msExtrusionDepth,  aArgs );
+            implSetDepth( fDepth );
 
             if ( IsInPopupMode() )
                 EndPopupMode();
@@ -713,143 +516,83 @@ IMPL_LINK( ExtrusionDepthWindow, SelectHdl, void *, EMPTYARG )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+// =======================================================================
+// ExtrusionDirectionControl
+// =======================================================================
 
-void ExtrusionDepthWindow::StartSelection()
+ExtrusionDepthController::ExtrusionDepthController( const Reference< lang::XMultiServiceFactory >& rServiceManager )
+: svt::PopupWindowController( rServiceManager, Reference< frame::XFrame >(), OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionDepthFloater" ) ) )
 {
 }
 
 // -----------------------------------------------------------------------
 
-BOOL ExtrusionDepthWindow::Close()
+::Window* ExtrusionDepthController::createPopupWindow( ::Window* pParent )
 {
-    return SfxPopupWindow::Close();
+    return new ExtrusionDepthWindow( *this, m_xFrame, pParent );
 }
 
-// -----------------------------------------------------------------------
-
-void ExtrusionDepthWindow::PopupModeEnd()
-{
-    if ( IsVisible() )
-    {
-        mbPopupMode = FALSE;
-    }
-    SfxPopupWindow::PopupModeEnd();
-}
 
 // -----------------------------------------------------------------------
-
-void ExtrusionDepthWindow::GetFocus (void)
-{
-    SfxPopupWindow::GetFocus();
-    // Grab the focus to the line ends value set so that it can be controlled
-    // with the keyboard.
-    if( mpMenu )
-        mpMenu->GrabFocus();
-}
-
-// ========================================================================
-
-ExtrusionDepthControl::ExtrusionDepthControl(
-    USHORT nSlotId, USHORT nId, ToolBox &rTbx )
-: SfxToolBoxControl( nSlotId, nId, rTbx )
-{
-    rTbx.SetItemBits( nId, TIB_DROPDOWNONLY | rTbx.GetItemBits( nId ) );
-}
-
+// XServiceInfo
 // -----------------------------------------------------------------------
 
-ExtrusionDepthControl::~ExtrusionDepthControl()
+OUString SAL_CALL ExtrusionDepthController_getImplementationName()
 {
+    return OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svx.ExtrusionDepthController" ));
 }
 
-// -----------------------------------------------------------------------
+// --------------------------------------------------------------------
 
-SfxPopupWindowType ExtrusionDepthControl::GetPopupWindowType() const
+Sequence< OUString > SAL_CALL ExtrusionDepthController_getSupportedServiceNames() throw( RuntimeException )
 {
-    return SFX_POPUPWINDOW_ONCLICK;
+    Sequence< OUString > aSNS( 1 );
+    aSNS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.PopupMenuController" ));
+    return aSNS;
 }
 
-// -----------------------------------------------------------------------
+// --------------------------------------------------------------------
 
-SfxPopupWindow* ExtrusionDepthControl::CreatePopupWindow()
+Reference< XInterface > SAL_CALL SAL_CALL ExtrusionDepthController_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) throw( RuntimeException )
 {
-    ExtrusionDepthWindow* pWin = new ExtrusionDepthWindow( GetId(), m_xFrame, &GetToolBox() );
-    pWin->StartPopupMode( &GetToolBox(), TRUE );
-    pWin->StartSelection();
-    SetPopupWindow( pWin );
-    return pWin;
+    return *new ExtrusionDepthController( rSMgr );
 }
 
-// -----------------------------------------------------------------------
+// --------------------------------------------------------------------
 
-void ExtrusionDepthControl::StateChanged( USHORT, SfxItemState eState, const SfxPoolItem* )
+OUString SAL_CALL ExtrusionDepthController::getImplementationName(  ) throw (RuntimeException)
 {
-    USHORT nId = GetId();
-    ToolBox& rTbx = GetToolBox();
-
-    rTbx.EnableItem( nId, SFX_ITEM_DISABLED != eState );
-    rTbx.SetItemState( nId, ( SFX_ITEM_DONTCARE == eState ) ? STATE_DONTKNOW : STATE_NOCHECK );
+    return ExtrusionDepthController_getImplementationName();
 }
 
-// ####################################################################
+// --------------------------------------------------------------------
 
-SFX_IMPL_TOOLBOX_CONTROL( ExtrusionLightingControl, SfxBoolItem );
-
-ExtrusionLightingWindow::ExtrusionLightingWindow(
-    USHORT nId,
-    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame ) :
-    SfxPopupWindow( nId,
-                    rFrame,
-                    SVX_RES( RID_SVXFLOAT_EXTRUSION_LIGHTING ) ),
-    maImgBright( SVX_RES( IMG_LIGHTING_BRIGHT ) ),
-    maImgNormal( SVX_RES( IMG_LIGHTING_NORMAL ) ),
-    maImgDim( SVX_RES( IMG_LIGHTING_DIM ) ),
-    maImgBrighth( SVX_RES( IMG_LIGHTING_BRIGHT_H ) ),
-    maImgNormalh( SVX_RES( IMG_LIGHTING_NORMAL_H ) ),
-    maImgDimh( SVX_RES( IMG_LIGHTING_DIM_H ) ),
-    mxFrame( rFrame ),
-    mbPopupMode( true ),
-    mnLevel( 0 ),
-    mbLevelEnabled( false ),
-    mnDirection( FROM_FRONT ),
-    mbDirectionEnabled( false )
+Sequence< OUString > SAL_CALL ExtrusionDepthController::getSupportedServiceNames(  ) throw (RuntimeException)
 {
-    implInit();
+    return ExtrusionDepthController_getSupportedServiceNames();
 }
 
-// -----------------------------------------------------------------------
 
-ExtrusionLightingWindow::ExtrusionLightingWindow(
-    USHORT nId,
-    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
-    Window* pParentWindow ) :
-    SfxPopupWindow( nId,
-                    rFrame,
-                    pParentWindow,
-                    SVX_RES( RID_SVXFLOAT_EXTRUSION_LIGHTING ) ),
-    maImgBright( SVX_RES( IMG_LIGHTING_BRIGHT ) ),
-    maImgNormal( SVX_RES( IMG_LIGHTING_NORMAL ) ),
-    maImgDim( SVX_RES( IMG_LIGHTING_DIM ) ),
-    maImgBrighth( SVX_RES( IMG_LIGHTING_BRIGHT_H ) ),
-    maImgNormalh( SVX_RES( IMG_LIGHTING_NORMAL_H ) ),
-    maImgDimh( SVX_RES( IMG_LIGHTING_DIM_H ) ),
-    mxFrame( rFrame ),
-    mbPopupMode( true ),
-    mnLevel( 0 ),
-    mbLevelEnabled( false ),
-    mnDirection( FROM_FRONT ),
-    mbDirectionEnabled( false )
-{
-    implInit();
-}
-
-// -----------------------------------------------------------------------
+// ####################################################################
 
-void ExtrusionLightingWindow::implInit()
+// -------------------------------------------------------------------------
+
+ExtrusionLightingWindow::ExtrusionLightingWindow( svt::ToolboxController& rController, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, Window* pParentWindow )
+: ToolbarMenu( rFrame, pParentWindow, SVX_RES( RID_SVXFLOAT_EXTRUSION_LIGHTING ))
+, mrController( rController )
+, maImgBright( SVX_RES( IMG_LIGHTING_BRIGHT ) )
+, maImgNormal( SVX_RES( IMG_LIGHTING_NORMAL ) )
+, maImgDim( SVX_RES( IMG_LIGHTING_DIM ) )
+, maImgBrighth( SVX_RES( IMG_LIGHTING_BRIGHT_H ) )
+, maImgNormalh( SVX_RES( IMG_LIGHTING_NORMAL_H ) )
+, maImgDimh( SVX_RES( IMG_LIGHTING_DIM_H ) )
+, mnLevel( 0 )
+, mbLevelEnabled( false )
+, mnDirection( FROM_FRONT )
+, mbDirectionEnabled( false )
+, msExtrusionLightingDirection( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionLightingDirection" ))
+, msExtrusionLightingIntensity( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionLightingIntensity" ))
 {
-    SetHelpId( HID_POPUP_EXTRUSION_LIGHTING );
-
     USHORT i;
     for( i = FROM_TOP_LEFT; i <= FROM_BOTTOM_RIGHT; i++ )
     {
@@ -864,17 +607,12 @@ void ExtrusionLightingWindow::implInit()
         maImgLightingPreviewh[i] = Image( SVX_RES( IMG_LIGHT_PREVIEW_H + i ) );
     }
 
-//  mpLightingDirectionForewarder = new SfxStatusForwarder( SID_EXTRUSION_LIGHTING_DIRECTION, *this );
-//  mpLightingIntensityForewarder = new SfxStatusForwarder( SID_EXTRUSION_LIGHTING_INTENSITY, *this );
-
-    mpMenu = new ToolbarMenu( this, WB_CLIPCHILDREN );
-    mpMenu->SetHelpId( HID_MENU_EXTRUSION_LIGHTING );
-    mpMenu->SetSelectHdl( LINK( this, ExtrusionLightingWindow, SelectHdl ) );
+    SetHelpId( HID_MENU_EXTRUSION_LIGHTING );
+    SetSelectHdl( LINK( this, ExtrusionLightingWindow, SelectHdl ) );
 
-    mpLightingSet = new ValueSet( mpMenu, WB_TABSTOP | WB_MENUSTYLEVALUESET | WB_FLATVALUESET | WB_NOBORDER | WB_NO_DIRECTSELECT );
+    mpLightingSet = createEmptyValueSetControl();
     mpLightingSet->SetHelpId( HID_VALUESET_EXTRUSION_LIGHTING );
 
-    mpLightingSet->SetHelpId( HID_POPUP_LINEEND_CTRL );
     mpLightingSet->SetSelectHdl( LINK( this, ExtrusionLightingWindow, SelectHdl ) );
     mpLightingSet->SetColCount( 3 );
     mpLightingSet->EnableFullItemMode( FALSE );
@@ -894,35 +632,18 @@ void ExtrusionLightingWindow::implInit()
     }
     mpLightingSet->SetOutputSizePixel( Size( 72, 72 ) );
 
-    mpMenu->appendEntry( 3, mpLightingSet );
-    mpMenu->appendSeparator();
-    mpMenu->appendEntry( 0, String( SVX_RES( STR_BRIGHT ) ), bHighContrast ? maImgBrighth : maImgBright );
-    mpMenu->appendEntry( 1, String( SVX_RES( STR_NORMAL ) ), bHighContrast ? maImgNormalh : maImgNormal );
-    mpMenu->appendEntry( 2, String( SVX_RES( STR_DIM ) ), bHighContrast ? maImgDimh : maImgDim );
-
-    SetOutputSizePixel( mpMenu->getMenuSize() );
-    mpMenu->SetOutputSizePixel( GetOutputSizePixel() );
+    appendEntry( 3, mpLightingSet );
+    appendSeparator();
+    appendEntry( 0, String( SVX_RES( STR_BRIGHT ) ), bHighContrast ? maImgBrighth : maImgBright );
+    appendEntry( 1, String( SVX_RES( STR_NORMAL ) ), bHighContrast ? maImgNormalh : maImgNormal );
+    appendEntry( 2, String( SVX_RES( STR_DIM ) ), bHighContrast ? maImgDimh : maImgDim );
 
-    mpMenu->Show();
+    SetOutputSizePixel( getMenuSize() );
 
     FreeResource();
 
-    AddStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionLightingDirection" )));
-    AddStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionLightingIntensity" )));
-}
-
-// -----------------------------------------------------------------------
-
-SfxPopupWindow* ExtrusionLightingWindow::Clone() const
-{
-    return new ExtrusionLightingWindow( GetId(), mxFrame );
-}
-
-// -----------------------------------------------------------------------
-
-ExtrusionLightingWindow::~ExtrusionLightingWindow()
-{
-    delete mpMenu;
+    AddStatusListener( msExtrusionLightingDirection );
+    AddStatusListener( msExtrusionLightingIntensity );
 }
 
 // -----------------------------------------------------------------------
@@ -934,8 +655,8 @@ void ExtrusionLightingWindow::implSetIntensity( int nLevel, bool bEnabled )
     int i = 0;
     for( i = 0; i < 3; i++ )
     {
-        mpMenu->checkEntry( i, (i == nLevel) && bEnabled );
-        mpMenu->enableEntry( i, bEnabled );
+        checkEntry( i, (i == nLevel) && bEnabled );
+        enableEntry( i, bEnabled );
     }
 }
 
@@ -971,42 +692,37 @@ void ExtrusionLightingWindow::implSetDirection( int nDirection, bool bEnabled )
         }
     }
 
-    mpMenu->enableEntry( 3, bEnabled );
+    enableEntry( 3, bEnabled );
 }
 
 // -----------------------------------------------------------------------
 
-void ExtrusionLightingWindow::StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState )
+void SAL_CALL ExtrusionLightingWindow::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException )
 {
-    switch( nSID )
+    if( Event.FeatureURL.Main.equals( msExtrusionLightingIntensity ) )
     {
-        case SID_EXTRUSION_LIGHTING_INTENSITY:
+        if( !Event.IsEnabled )
         {
-            if( eState == SFX_ITEM_DISABLED )
-            {
-                implSetIntensity( 0, false );
-            }
-            else
-            {
-                const SfxInt32Item* pStateItem = PTR_CAST( SfxInt32Item, pState );
-                if( pStateItem )
-                    implSetIntensity( pStateItem->GetValue(), true );
-            }
-            break;
+            implSetIntensity( 0, false );
         }
-        case SID_EXTRUSION_LIGHTING_DIRECTION:
+        else
         {
-            if( eState == SFX_ITEM_DISABLED )
-            {
-                implSetDirection( 0, false );
-            }
-            else
-            {
-                const SfxInt32Item* pStateItem = PTR_CAST( SfxInt32Item, pState );
-                if( pStateItem )
-                    implSetDirection( pStateItem->GetValue(), true );
-            }
-            break;
+            sal_Int32 nValue = 0;
+            if( Event.State >>= nValue )
+                implSetIntensity( nValue, true );
+        }
+    }
+    else if( Event.FeatureURL.Main.equals( msExtrusionLightingDirection ) )
+    {
+        if( !Event.IsEnabled )
+        {
+            implSetDirection( 0, false );
+        }
+        else
+        {
+            sal_Int32 nValue = 0;
+            if( Event.State >>= nValue )
+                implSetDirection( nValue, true );
         }
     }
 }
@@ -1015,16 +731,16 @@ void ExtrusionLightingWindow::StateChanged( USHORT nSID, SfxItemState eState, co
 
 void ExtrusionLightingWindow::DataChanged( const DataChangedEvent& rDCEvt )
 {
-    SfxPopupWindow::DataChanged( rDCEvt );
+    ToolbarMenu::DataChanged( rDCEvt );
 
     if( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) )
     {
         bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
 
         implSetDirection( mnDirection, mbDirectionEnabled );
-        mpMenu->setEntryImage( 0, bHighContrast ? maImgBrighth : maImgBright );
-        mpMenu->setEntryImage( 1, bHighContrast ? maImgNormalh : maImgNormal );
-        mpMenu->setEntryImage( 2, bHighContrast ? maImgDimh : maImgDim );
+        setEntryImage( 0, bHighContrast ? maImgBrighth : maImgBright );
+        setEntryImage( 1, bHighContrast ? maImgNormalh : maImgNormal );
+        setEntryImage( 2, bHighContrast ? maImgDimh : maImgDim );
     }
 }
 
@@ -1035,31 +751,19 @@ IMPL_LINK( ExtrusionLightingWindow, SelectHdl, void *, pControl )
     if ( IsInPopupMode() )
         EndPopupMode();
 
-//  SfxDispatcher* pDisp = GetBindings().GetDispatcher();
-
-    if( pControl == mpMenu )
+    if( pControl == this )
     {
-        int nLevel = mpMenu->getSelectedEntryId();
+        int nLevel = getSelectedEntryId();
         if( nLevel >= 0 )
         {
             if( nLevel != 3 )
             {
-                SfxInt32Item    aItem( SID_EXTRUSION_LIGHTING_INTENSITY, nLevel );
-                rtl::OUString   aCommand( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionLightingIntensity" ));
-
-                Any a;
-                INetURLObject aObj( aCommand );
                 Sequence< PropertyValue > aArgs( 1 );
-                aArgs[0].Name = aObj.GetURLPath();
-                aItem.QueryValue( a );
-                aArgs[0].Value = a;
+                aArgs[0].Name = msExtrusionLightingIntensity.copy(5);
+                aArgs[0].Value <<= (sal_Int32)nLevel;
 
-                SfxToolBoxControl::Dispatch( Reference< ::com::sun::star::frame::XDispatchProvider >(
-                                             mxFrame->getController(), UNO_QUERY ),
-                                             aCommand,
-                                             aArgs );
+                mrController.dispatchCommand( msExtrusionLightingIntensity, aArgs );
 
-//              pDisp->Execute( SID_EXTRUSION_LIGHTING_INTENSITY, SFX_CALLMODE_RECORD, &aItem, 0L , 0L );
                 implSetIntensity( nLevel, true );
             }
         }
@@ -1072,21 +776,11 @@ IMPL_LINK( ExtrusionLightingWindow, SelectHdl, void *, pControl )
         {
             nDirection--;
 
-            SfxInt32Item    aItem( SID_EXTRUSION_LIGHTING_DIRECTION, nDirection );
-            rtl::OUString   aCommand( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionLightingDirection" ));
-
-            Any a;
-            INetURLObject aObj( aCommand );
             Sequence< PropertyValue > aArgs( 1 );
-            aArgs[0].Name = aObj.GetURLPath();
-            aItem.QueryValue( a );
-            aArgs[0].Value = a;
+            aArgs[0].Name = msExtrusionLightingDirection.copy(5);
+            aArgs[0].Value <<= (sal_Int32)nDirection;
 
-            SfxToolBoxControl::Dispatch( Reference< ::com::sun::star::frame::XDispatchProvider >(
-                                         mxFrame->getController(), UNO_QUERY ),
-                                         aCommand,
-                                         aArgs );
-//          pDisp->Execute( SID_EXTRUSION_LIGHTING_DIRECTION, SFX_CALLMODE_RECORD, &aItem, 0L , 0L );
+            mrController.dispatchCommand( msExtrusionLightingDirection, aArgs );
 
             implSetDirection( nDirection, true );
         }
@@ -1096,229 +790,122 @@ IMPL_LINK( ExtrusionLightingWindow, SelectHdl, void *, pControl )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+// ========================================================================
 
-void ExtrusionLightingWindow::StartSelection()
+ExtrusionLightingControl::ExtrusionLightingControl( const Reference< lang::XMultiServiceFactory >& rServiceManager )
+: svt::PopupWindowController( rServiceManager, Reference< frame::XFrame >(), OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionDirectionFloater" ) ) )
 {
 }
 
 // -----------------------------------------------------------------------
 
-BOOL ExtrusionLightingWindow::Close()
+::Window* ExtrusionLightingControl::createPopupWindow( ::Window* pParent )
 {
-    return SfxPopupWindow::Close();
+    return new ExtrusionLightingWindow( *this, m_xFrame, pParent );
 }
 
 // -----------------------------------------------------------------------
-
-void ExtrusionLightingWindow::PopupModeEnd()
-{
-    if ( IsVisible() )
-    {
-        mbPopupMode = FALSE;
-    }
-    SfxPopupWindow::PopupModeEnd();
-}
-
+// XServiceInfo
 // -----------------------------------------------------------------------
 
-void ExtrusionLightingWindow::GetFocus (void)
-{
-    SfxPopupWindow::GetFocus();
-    // Grab the focus to the line ends value set so that it can be controlled
-    // with the keyboard.
-    if( mpMenu )
-        mpMenu->GrabFocus();
-}
-
-// ========================================================================
-
-ExtrusionLightingControl::ExtrusionLightingControl( USHORT nSlotId, USHORT nId, ToolBox &rTbx )
-: SfxToolBoxControl( nSlotId, nId, rTbx )
+OUString SAL_CALL ExtrusionLightingControl_getImplementationName()
 {
-    rTbx.SetItemBits( nId, TIB_DROPDOWNONLY | rTbx.GetItemBits( nId ) );
+    return OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svx.ExtrusionLightingController" ));
 }
 
-// -----------------------------------------------------------------------
+// --------------------------------------------------------------------
 
-ExtrusionLightingControl::~ExtrusionLightingControl()
+Sequence< OUString > SAL_CALL ExtrusionLightingControl_getSupportedServiceNames() throw( RuntimeException )
 {
+    Sequence< OUString > aSNS( 1 );
+    aSNS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ToolbarController" ));
+    return aSNS;
 }
 
-// -----------------------------------------------------------------------
+// --------------------------------------------------------------------
 
-SfxPopupWindowType ExtrusionLightingControl::GetPopupWindowType() const
+Reference< XInterface > SAL_CALL SAL_CALL ExtrusionLightingControl_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) throw( RuntimeException )
 {
-    return SFX_POPUPWINDOW_ONCLICK;
+    return *new ExtrusionLightingControl( rSMgr );
 }
 
-// -----------------------------------------------------------------------
+// --------------------------------------------------------------------
 
-SfxPopupWindow* ExtrusionLightingControl::CreatePopupWindow()
+OUString SAL_CALL ExtrusionLightingControl::getImplementationName(  ) throw (RuntimeException)
 {
-    ExtrusionLightingWindow* pWin = new ExtrusionLightingWindow( GetId(), m_xFrame, &GetToolBox() );
-    pWin->StartPopupMode( &GetToolBox(), TRUE );
-    pWin->StartSelection();
-    SetPopupWindow( pWin );
-    return pWin;
+    return ExtrusionLightingControl_getImplementationName();
 }
 
-// -----------------------------------------------------------------------
+// --------------------------------------------------------------------
 
-void ExtrusionLightingControl::StateChanged( USHORT, SfxItemState eState, const SfxPoolItem* )
+Sequence< OUString > SAL_CALL ExtrusionLightingControl::getSupportedServiceNames(  ) throw (RuntimeException)
 {
-    USHORT nId = GetId();
-    ToolBox& rTbx = GetToolBox();
-
-    rTbx.EnableItem( nId, SFX_ITEM_DISABLED != eState );
-    rTbx.SetItemState( nId, ( SFX_ITEM_DONTCARE == eState ) ? STATE_DONTKNOW : STATE_NOCHECK );
+    return ExtrusionLightingControl_getSupportedServiceNames();
 }
 
 // ####################################################################
 
-SFX_IMPL_TOOLBOX_CONTROL( ExtrusionSurfaceControl, SfxBoolItem );
-
-ExtrusionSurfaceWindow::ExtrusionSurfaceWindow(
-    USHORT nId,
-    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame ) :
-
-    SfxPopupWindow( nId,
-                    rFrame,
-                    SVX_RES( RID_SVXFLOAT_EXTRUSION_SURFACE )),
-    maImgSurface1( SVX_RES( IMG_WIRE_FRAME ) ),
-    maImgSurface2( SVX_RES( IMG_MATTE ) ),
-    maImgSurface3( SVX_RES( IMG_PLASTIC ) ),
-    maImgSurface4( SVX_RES( IMG_METAL ) ),
-    maImgSurface1h( SVX_RES( IMG_WIRE_FRAME_H ) ),
-    maImgSurface2h( SVX_RES( IMG_MATTE_H ) ),
-    maImgSurface3h( SVX_RES( IMG_PLASTIC_H ) ),
-    maImgSurface4h( SVX_RES( IMG_METAL_H ) ),
-    mxFrame( rFrame ),
-    mbPopupMode( true )
+ExtrusionSurfaceWindow::ExtrusionSurfaceWindow( svt::ToolboxController& rController, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, Window* pParentWindow )
+: ToolbarMenu( rFrame, pParentWindow, SVX_RES( RID_SVXFLOAT_EXTRUSION_SURFACE ))
+, mrController( rController )
+, maImgSurface1( SVX_RES( IMG_WIRE_FRAME ) )
+, maImgSurface2( SVX_RES( IMG_MATTE ) )
+, maImgSurface3( SVX_RES( IMG_PLASTIC ) )
+, maImgSurface4( SVX_RES( IMG_METAL ) )
+, maImgSurface1h( SVX_RES( IMG_WIRE_FRAME_H ) )
+, maImgSurface2h( SVX_RES( IMG_MATTE_H ) )
+, maImgSurface3h( SVX_RES( IMG_PLASTIC_H ) )
+, maImgSurface4h( SVX_RES( IMG_METAL_H ) )
+, msExtrusionSurface( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionSurface" ))
 {
-    implInit();
-}
-
-ExtrusionSurfaceWindow::ExtrusionSurfaceWindow(
-    USHORT nId,
-    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
-    Window* pParentWindow ) :
-
-    SfxPopupWindow( nId,
-                    rFrame,
-                    pParentWindow,
-                    SVX_RES( RID_SVXFLOAT_EXTRUSION_SURFACE )),
-    maImgSurface1( SVX_RES( IMG_WIRE_FRAME ) ),
-    maImgSurface2( SVX_RES( IMG_MATTE ) ),
-    maImgSurface3( SVX_RES( IMG_PLASTIC ) ),
-    maImgSurface4( SVX_RES( IMG_METAL ) ),
-    maImgSurface1h( SVX_RES( IMG_WIRE_FRAME_H ) ),
-    maImgSurface2h( SVX_RES( IMG_MATTE_H ) ),
-    maImgSurface3h( SVX_RES( IMG_PLASTIC_H ) ),
-    maImgSurface4h( SVX_RES( IMG_METAL_H ) ),
-    mxFrame( rFrame ),
-    mbPopupMode( true )
-{
-    implInit();
-}
-
-// -----------------------------------------------------------------------
-
-void ExtrusionSurfaceWindow::implInit()
-{
-    SetHelpId( HID_POPUP_EXTRUSION_SURFACE );
-
     bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
 
-//  mpSurfaceForewarder = new SfxStatusForwarder( SID_EXTRUSION_SURFACE, *this );
-
-    mpMenu = new ToolbarMenu( this, WB_CLIPCHILDREN );
-    mpMenu->SetHelpId( HID_MENU_EXTRUSION_SURFACE );
-    mpMenu->SetSelectHdl( LINK( this, ExtrusionSurfaceWindow, SelectHdl ) );
+    SetHelpId( HID_MENU_EXTRUSION_SURFACE );
+    SetSelectHdl( LINK( this, ExtrusionSurfaceWindow, SelectHdl ) );
 
-    mpMenu->appendEntry( 0, String( SVX_RES( STR_WIREFRAME ) ), bHighContrast ? maImgSurface1h : maImgSurface1 );
-    mpMenu->appendEntry( 1, String( SVX_RES( STR_MATTE ) ), bHighContrast ? maImgSurface2h : maImgSurface2 );
-    mpMenu->appendEntry( 2, String( SVX_RES( STR_PLASTIC ) ), bHighContrast ? maImgSurface3h : maImgSurface3 );
-    mpMenu->appendEntry( 3, String( SVX_RES( STR_METAL ) ), bHighContrast ? maImgSurface4h : maImgSurface4 );
+    appendEntry( 0, String( SVX_RES( STR_WIREFRAME ) ), bHighContrast ? maImgSurface1h : maImgSurface1 );
+    appendEntry( 1, String( SVX_RES( STR_MATTE ) ), bHighContrast ? maImgSurface2h : maImgSurface2 );
+    appendEntry( 2, String( SVX_RES( STR_PLASTIC ) ), bHighContrast ? maImgSurface3h : maImgSurface3 );
+    appendEntry( 3, String( SVX_RES( STR_METAL ) ), bHighContrast ? maImgSurface4h : maImgSurface4 );
 
-    SetOutputSizePixel( mpMenu->getMenuSize() );
-    mpMenu->SetOutputSizePixel( GetOutputSizePixel() );
-
-    mpMenu->Show();
+    SetOutputSizePixel( getMenuSize() );
 
     FreeResource();
 
-    AddStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionSurface" )));
-//  rBindings.Update( SID_EXTRUSION_SURFACE );
-}
-
-// -----------------------------------------------------------------------
-
-SfxPopupWindow* ExtrusionSurfaceWindow::Clone() const
-{
-    return new ExtrusionSurfaceWindow( GetId(), mxFrame );
-}
-
-// -----------------------------------------------------------------------
-
-ExtrusionSurfaceWindow::~ExtrusionSurfaceWindow()
-{
-//  delete mpSurfaceForewarder;
-    delete mpMenu;
+    AddStatusListener( msExtrusionSurface );
 }
 
 // -----------------------------------------------------------------------
 
 void ExtrusionSurfaceWindow::implSetSurface( int nSurface, bool bEnabled )
 {
-    if( mpMenu )
+//  if( mpMenu )
     {
         int i;
         for( i = 0; i < 4; i++ )
         {
-            mpMenu->checkEntry( i, (i == nSurface) && bEnabled );
-            mpMenu->enableEntry( i, bEnabled );
+            checkEntry( i, (i == nSurface) && bEnabled );
+            enableEntry( i, bEnabled );
         }
     }
 }
 
 // -----------------------------------------------------------------------
 
-void ExtrusionSurfaceWindow::StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState )
+void SAL_CALL ExtrusionSurfaceWindow::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException )
 {
-    switch( nSID )
+    if( Event.FeatureURL.Main.equals( msExtrusionSurface ) )
     {
-        case SID_EXTRUSION_SURFACE:
+        if( !Event.IsEnabled )
         {
-            if( eState == SFX_ITEM_DISABLED )
-            {
-                implSetSurface( 0, false );
-            }
-            else
-            {
-                const SfxInt32Item* pStateItem = PTR_CAST( SfxInt32Item, pState );
-                if( pStateItem )
-                    implSetSurface( pStateItem->GetValue(), true );
-            }
-            break;
+            implSetSurface( 0, false );
+        }
+        else
+        {
+            sal_Int32 nValue = 0;
+            if( Event.State >>= nValue )
+                implSetSurface( nValue, true );
         }
-    }
-}
-
-// -----------------------------------------------------------------------
-
-void ExtrusionSurfaceWindow::DataChanged( const DataChangedEvent& rDCEvt )
-{
-    SfxPopupWindow::DataChanged( rDCEvt );
-
-    if( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) )
-    {
-        bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
-
-        mpMenu->appendEntry( 0, String( SVX_RES( STR_WIREFRAME ) ), bHighContrast ? maImgSurface1h : maImgSurface1 );
-        mpMenu->appendEntry( 1, String( SVX_RES( STR_MATTE ) ), bHighContrast ? maImgSurface2h : maImgSurface2 );
-        mpMenu->appendEntry( 2, String( SVX_RES( STR_PLASTIC ) ), bHighContrast ? maImgSurface3h : maImgSurface3 );
-        mpMenu->appendEntry( 3, String( SVX_RES( STR_METAL ) ), bHighContrast ? maImgSurface4h : maImgSurface4 );
     }
 }
 
@@ -1329,26 +916,14 @@ IMPL_LINK( ExtrusionSurfaceWindow, SelectHdl, void *, EMPTYARG )
     if ( IsInPopupMode() )
         EndPopupMode();
 
-//  SfxDispatcher* pDisp = GetBindings().GetDispatcher();
-
-    sal_Int32 nSurface = mpMenu->getSelectedEntryId();
+    sal_Int32 nSurface = getSelectedEntryId();
     if( nSurface >= 0 )
     {
-        SfxInt32Item    aItem( SID_EXTRUSION_SURFACE, nSurface );
-        rtl::OUString   aCommand( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionSurface" ));
-
-        Any a;
-        INetURLObject aObj( aCommand );
         Sequence< PropertyValue > aArgs( 1 );
-        aArgs[0].Name = aObj.GetURLPath();
-        aItem.QueryValue( a );
-        aArgs[0].Value = a;
+        aArgs[0].Name = msExtrusionSurface.copy(5);
+        aArgs[0].Value <<= (sal_Int32)nSurface;
 
-        SfxToolBoxControl::Dispatch( Reference< ::com::sun::star::frame::XDispatchProvider >(
-                                     mxFrame->getController(), UNO_QUERY ),
-                                     aCommand,
-                                     aArgs );
-//      pDisp->Execute( SID_EXTRUSION_SURFACE, SFX_CALLMODE_RECORD, &aItem, 0L , 0L );
+        mrController.dispatchCommand( msExtrusionSurface, aArgs );
 
         implSetSurface( nSurface, true );
     }
@@ -1356,83 +931,57 @@ IMPL_LINK( ExtrusionSurfaceWindow, SelectHdl, void *, EMPTYARG )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+// ========================================================================
 
-void ExtrusionSurfaceWindow::StartSelection()
+ExtrusionSurfaceControl::ExtrusionSurfaceControl( const Reference< lang::XMultiServiceFactory >& rServiceManager )
+: svt::PopupWindowController( rServiceManager, Reference< frame::XFrame >(), OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionSurfaceFloater" ) ) )
 {
 }
 
 // -----------------------------------------------------------------------
 
-BOOL ExtrusionSurfaceWindow::Close()
+::Window* ExtrusionSurfaceControl::createPopupWindow( ::Window* pParent )
 {
-    return SfxPopupWindow::Close();
+    return new ExtrusionSurfaceWindow( *this, m_xFrame, pParent );
 }
 
 // -----------------------------------------------------------------------
-
-void ExtrusionSurfaceWindow::PopupModeEnd()
-{
-    if ( IsVisible() )
-    {
-        mbPopupMode = FALSE;
-    }
-    SfxPopupWindow::PopupModeEnd();
-}
-
+// XServiceInfo
 // -----------------------------------------------------------------------
 
-void ExtrusionSurfaceWindow::GetFocus (void)
+OUString SAL_CALL ExtrusionSurfaceControl_getImplementationName()
 {
-    SfxPopupWindow::GetFocus();
-    // Grab the focus to the line ends value set so that it can be controlled
-    // with the keyboard.
-    if( mpMenu )
-        mpMenu->GrabFocus();
+    return OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svx.ExtrusionSurfaceController" ));
 }
 
-// ========================================================================
+// --------------------------------------------------------------------
 
-ExtrusionSurfaceControl::ExtrusionSurfaceControl(
-    USHORT nSlotId, USHORT nId, ToolBox &rTbx )
-: SfxToolBoxControl( nSlotId, nId, rTbx )
+Sequence< OUString > SAL_CALL ExtrusionSurfaceControl_getSupportedServiceNames() throw( RuntimeException )
 {
-    rTbx.SetItemBits( nId, TIB_DROPDOWNONLY | rTbx.GetItemBits( nId ) );
+    Sequence< OUString > aSNS( 1 );
+    aSNS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ToolbarController" ));
+    return aSNS;
 }
 
-// -----------------------------------------------------------------------
+// --------------------------------------------------------------------
 
-ExtrusionSurfaceControl::~ExtrusionSurfaceControl()
+Reference< XInterface > SAL_CALL SAL_CALL ExtrusionSurfaceControl_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) throw( RuntimeException )
 {
+    return *new ExtrusionSurfaceControl( rSMgr );
 }
 
-// -----------------------------------------------------------------------
-
-SfxPopupWindowType ExtrusionSurfaceControl::GetPopupWindowType() const
-{
-    return SFX_POPUPWINDOW_ONCLICK;
-}
-
-// -----------------------------------------------------------------------
+// --------------------------------------------------------------------
 
-SfxPopupWindow* ExtrusionSurfaceControl::CreatePopupWindow()
+OUString SAL_CALL ExtrusionSurfaceControl::getImplementationName(  ) throw (RuntimeException)
 {
-    ExtrusionSurfaceWindow* pWin = new ExtrusionSurfaceWindow( GetId(), m_xFrame, &GetToolBox() );
-    pWin->StartPopupMode( &GetToolBox(), TRUE );
-    pWin->StartSelection();
-    SetPopupWindow( pWin );
-    return pWin;
+    return ExtrusionSurfaceControl_getImplementationName();
 }
 
-// -----------------------------------------------------------------------
+// --------------------------------------------------------------------
 
-void ExtrusionSurfaceControl::StateChanged( USHORT, SfxItemState eState, const SfxPoolItem* )
+Sequence< OUString > SAL_CALL ExtrusionSurfaceControl::getSupportedServiceNames(  ) throw (RuntimeException)
 {
-    USHORT nId = GetId();
-    ToolBox& rTbx = GetToolBox();
-
-    rTbx.EnableItem( nId, SFX_ITEM_DISABLED != eState );
-    rTbx.SetItemState( nId, ( SFX_ITEM_DONTCARE == eState ) ? STATE_DONTKNOW : STATE_NOCHECK );
+    return ExtrusionSurfaceControl_getSupportedServiceNames();
 }
 
 //========================================================================
@@ -1498,3 +1047,5 @@ void ExtrusionColorControl::StateChanged( USHORT nSID, SfxItemState eState, cons
     rTbx.EnableItem( nId, SFX_ITEM_DISABLED != eState );
     rTbx.SetItemState( nId, ( SFX_ITEM_DONTCARE == eState ) ? STATE_DONTKNOW : STATE_NOCHECK );
 }
+
+}
diff --git a/svx/source/tbxctrls/extrusioncontrols.hxx b/svx/source/tbxctrls/extrusioncontrols.hxx
new file mode 100644
index 000000000000..4f5e2404d83f
--- /dev/null
+++ b/svx/source/tbxctrls/extrusioncontrols.hxx
@@ -0,0 +1,252 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef _SVX_EXTRUSION_CONTROLS_HXX
+#define _SVX_EXTRUSION_CONTROLS_HXX
+
+#include "svx/svxdllapi.h"
+
+#include <svtools/valueset.hxx>
+#include <svtools/svtreebx.hxx>
+#include <vcl/button.hxx>
+#include <vcl/dialog.hxx>
+#include <vcl/field.hxx>
+#include <vcl/fixed.hxx>
+
+#include <svtools/toolbarmenu.hxx>
+#include <svtools/popupwindowcontroller.hxx>
+#include <svtools/popupmenucontrollerbase.hxx>
+
+class SfxBindings;
+class SfxStatusForwarder;
+
+//========================================================================
+
+namespace svx
+{
+class ToolboxButtonColorUpdater;
+
+class ExtrusionDirectionWindow : public svtools::ToolbarMenu
+{
+public:
+    ExtrusionDirectionWindow( svt::ToolboxController& rController, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, Window* pParentWindow );
+
+    virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException );
+    virtual void DataChanged( const DataChangedEvent& rDCEvt );
+
+private:
+    svt::ToolboxController& mrController;
+    ValueSet* mpDirectionSet;
+
+    Image       maImgDirection[9];
+    Image       maImgDirectionH[9];
+
+    Image       maImgPerspective;
+    Image       maImgPerspectiveH;
+    Image       maImgParallel;
+    Image       maImgParallelH;
+
+    const rtl::OUString msExtrusionDirection;
+    const rtl::OUString msExtrusionProjection;
+
+    DECL_LINK( SelectHdl, void * );
+    void            FillValueSet();
+
+    void implSetDirection( sal_Int32 nSkew, bool bEnabled = true );
+    void implSetProjection( sal_Int32 nProjection, bool bEnabled = true );
+
+};
+
+//========================================================================
+
+class ExtrusionDirectionControl : public svt::PopupWindowController
+{
+public:
+    ExtrusionDirectionControl( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager );
+
+    virtual ::Window* createPopupWindow( ::Window* pParent );
+
+    // XServiceInfo
+    virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException );
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException );
+};
+
+//========================================================================
+
+class ExtrusionDepthWindow : public svtools::ToolbarMenu
+{
+private:
+    svt::ToolboxController& mrController;
+
+    Image maImgDepth0;
+    Image maImgDepth1;
+    Image maImgDepth2;
+    Image maImgDepth3;
+    Image maImgDepth4;
+    Image maImgDepthInfinity;
+
+    Image maImgDepth0h;
+    Image maImgDepth1h;
+    Image maImgDepth2h;
+    Image maImgDepth3h;
+    Image maImgDepth4h;
+    Image maImgDepthInfinityh;
+
+    FieldUnit   meUnit;
+    double      mfDepth;
+
+    const rtl::OUString msExtrusionDepth;
+    const rtl::OUString msMetricUnit;
+
+    DECL_LINK( SelectHdl, void * );
+
+    void    implFillStrings( FieldUnit eUnit );
+    void    implSetDepth( double fDepth );
+
+public:
+    ExtrusionDepthWindow( svt::ToolboxController& rController, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, Window* pParentWindow );
+
+    virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException );
+    virtual void DataChanged( const DataChangedEvent& rDCEvt );
+};
+
+//========================================================================
+
+class ExtrusionDepthController : public svt::PopupWindowController
+{
+public:
+    ExtrusionDepthController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager );
+
+    virtual ::Window* createPopupWindow( ::Window* pParent );
+
+    // XServiceInfo
+    virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException );
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException );
+};
+
+//========================================================================
+
+class ExtrusionLightingWindow : public svtools::ToolbarMenu
+{
+private:
+    svt::ToolboxController& mrController;
+    ValueSet*    mpLightingSet;
+
+    Image maImgLightingOff[9];
+    Image maImgLightingOn[9];
+    Image maImgLightingPreview[9];
+
+    Image maImgLightingOffh[9];
+    Image maImgLightingOnh[9];
+    Image maImgLightingPreviewh[9];
+
+    Image maImgBright;
+    Image maImgNormal;
+    Image maImgDim;
+    Image maImgBrighth;
+    Image maImgNormalh;
+    Image maImgDimh;
+
+    int     mnLevel;
+    bool    mbLevelEnabled;
+    int     mnDirection;
+    bool    mbDirectionEnabled;
+
+    const rtl::OUString msExtrusionLightingDirection;
+    const rtl::OUString msExtrusionLightingIntensity;
+
+    void    implSetIntensity( int nLevel, bool bEnabled );
+    void    implSetDirection( int nDirection, bool bEnabled );
+
+    DECL_LINK( SelectHdl, void * );
+public:
+    ExtrusionLightingWindow( svt::ToolboxController& rController, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, Window* pParentWindow );
+
+    virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException );
+    virtual void DataChanged( const DataChangedEvent& rDCEvt );
+};
+
+//========================================================================
+
+class ExtrusionLightingControl : public svt::PopupWindowController
+{
+public:
+    ExtrusionLightingControl( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager );
+
+    virtual ::Window* createPopupWindow( ::Window* pParent );
+
+    // XServiceInfo
+    virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException );
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException );
+};
+
+//========================================================================
+
+class ExtrusionSurfaceWindow : public svtools::ToolbarMenu
+{
+private:
+    svt::ToolboxController& mrController;
+
+    Image maImgSurface1;
+    Image maImgSurface2;
+    Image maImgSurface3;
+    Image maImgSurface4;
+    Image maImgSurface1h;
+    Image maImgSurface2h;
+    Image maImgSurface3h;
+    Image maImgSurface4h;
+
+    const rtl::OUString msExtrusionSurface;
+
+    DECL_LINK( SelectHdl, void * );
+
+    void    implSetSurface( int nSurface, bool bEnabled );
+
+public:
+    ExtrusionSurfaceWindow( svt::ToolboxController& rController, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, Window* pParentWindow );
+
+    virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException );
+};
+
+//========================================================================
+
+class ExtrusionSurfaceControl : public svt::PopupWindowController
+{
+public:
+    ExtrusionSurfaceControl( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager );
+
+    virtual ::Window* createPopupWindow( ::Window* pParent );
+
+    // XServiceInfo
+    virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException );
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException );
+};
+
+//========================================================================
+
+}
+#endif
+
diff --git a/svx/source/tbxctrls/extrusioncontrols.src b/svx/source/tbxctrls/extrusioncontrols.src
index 0cf4cafdc58c..084606439cc3 100644
--- a/svx/source/tbxctrls/extrusioncontrols.src
+++ b/svx/source/tbxctrls/extrusioncontrols.src
@@ -30,9 +30,9 @@
 
 #define MASKCOLOR   MaskColor = Color { Red=0xFFFF; Green=0x0000; Blue=0xFFFF; };
 
-FloatingWindow RID_SVXFLOAT_EXTRUSION_DIRECTION
+DockingWindow RID_SVXFLOAT_EXTRUSION_DIRECTION
 {
-    Border = TRUE ;
+    Border = FALSE ;
     Hide = TRUE ;
     SVLook = TRUE ;
     Sizeable = FALSE ;
@@ -200,9 +200,9 @@ FloatingWindow RID_SVXFLOAT_EXTRUSION_DIRECTION
     };
 };
 
-FloatingWindow RID_SVXFLOAT_EXTRUSION_DEPTH
+DockingWindow RID_SVXFLOAT_EXTRUSION_DEPTH
 {
-    Border = TRUE ;
+    Border = FALSE ;
     Hide = TRUE ;
     SVLook = TRUE ;
     Sizeable = FALSE ;
@@ -289,9 +289,10 @@ FloatingWindow RID_SVXFLOAT_EXTRUSION_DEPTH
     };
 };
 
-FloatingWindow RID_SVXFLOAT_EXTRUSION_LIGHTING
+
+DockingWindow RID_SVXFLOAT_EXTRUSION_LIGHTING
 {
-    Border = TRUE ;
+    Border = FALSE ;
     Hide = TRUE ;
     SVLook = TRUE ;
     Sizeable = FALSE ;
@@ -605,9 +606,9 @@ FloatingWindow RID_SVXFLOAT_EXTRUSION_LIGHTING
     };
 };
 
-FloatingWindow RID_SVXFLOAT_EXTRUSION_SURFACE
+DockingWindow RID_SVXFLOAT_EXTRUSION_SURFACE
 {
-    Border = TRUE ;
+    Border = FALSE ;
     Hide = TRUE ;
     SVLook = TRUE ;
     Sizeable = FALSE ;
@@ -703,7 +704,7 @@ ModalDialog RID_SVX_MDLG_EXTRUSION_DEPTH
     MetricField MTR_DEPTH
     {
          //HelpId = HID_SD_CTL_FAVORITES ;
-        Border = TRUE ;
+        Border = FALSE ;
         Pos = MAP_APPFONT ( 3 , 14 ) ;
         Size = MAP_APPFONT ( WIDTH - 50 - 12, 12 ) ;
         TabStop = TRUE ;
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx
index 1b4f89ca1e8c..80185ee20af7 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -27,40 +27,53 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
+
 #include <com/sun/star/text/WritingMode.hpp>
-#include <sfx2/app.hxx>
+
+#include <vcl/toolbox.hxx>
+
 #include <svl/itempool.hxx>
-#include <svx/fmmodel.hxx>
+
+#include <svtools/toolbarmenu.hxx>
+#include <svtools/popupwindowcontroller.hxx>
+#include <svtools/popupmenucontrollerbase.hxx>
+
+#include <sfx2/app.hxx>
 #include <sfx2/dispatch.hxx>
-#include <dlgutil.hxx>
 
+#include <editeng/eeitem.hxx>
+#include <editeng/frmdiritem.hxx>
+
+#include <svx/fmmodel.hxx>
 #include <svx/svxids.hrc>
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
-#include "gallery.hxx"
 #include <svx/svdpage.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdview.hxx>
 #include <svx/svdoutl.hxx>
-#include <editeng/eeitem.hxx>
-#include <editeng/frmdiritem.hxx>
-#include "toolbarmenu.hxx"
+
+#include "gallery.hxx"
+#include <dlgutil.hxx>
 
 #include "fontworkgallery.hxx"
 #include "fontworkgallery.hrc"
 
 #include <algorithm>
 
-#ifndef _TOOLBOX_HXX //autogen
-#include <vcl/toolbox.hxx>
-#endif
-#ifndef _SVX_HELPID_HRC
 #include "helpid.hrc"
-#endif
-using namespace svx;
+
+using ::rtl::OUString;
+using ::svtools::ToolbarMenu;
+
+using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::frame;
+
+namespace svx
+{
 
 const int nColCount = 4;
 const int nLineCount = 4;
@@ -291,7 +304,7 @@ IMPL_LINK( FontWorkGalleryDialog, DoubleClickFavoriteHdl, void*, EMPTYARG )
     return( 0L );
 }
 
-// -----------------------------------------------------------------------
+//------------------------------------------------------------------------
 
 SFX_IMPL_TOOLBOX_CONTROL( FontWorkShapeTypeControl, SfxStringItem );
 FontWorkShapeTypeControl::FontWorkShapeTypeControl( USHORT nSlotId, USHORT nId, ToolBox &rTbx )
@@ -325,143 +338,104 @@ SfxPopupWindow* FontWorkShapeTypeControl::CreatePopupWindow()
 
 // -----------------------------------------------------------------------
 
-void FontWorkShapeTypeControl::StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState )
-{
-    SfxToolBoxControl::StateChanged( nSID, eState, pState );
-}
-
-// -----------------------------------------------------------------------
-
 void FontWorkShapeTypeControl::Select( BOOL )
 {
 
 }
 
-// ####################################################################
+// ========================================================================
+// FontWorkAlignmentWindow
+// ========================================================================
 
-SFX_IMPL_TOOLBOX_CONTROL( FontWorkAlignmentControl, SfxBoolItem );
-
-FontWorkAlignmentWindow::FontWorkAlignmentWindow(
-    USHORT nId,
-    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame ) :
-
-    SfxPopupWindow( nId,
-                    rFrame,
-                    SVX_RES( RID_SVXFLOAT_FONTWORK_ALIGNMENT )),
-    maImgAlgin1( SVX_RES( IMG_FONTWORK_ALIGN_LEFT_16 ) ),
-    maImgAlgin2( SVX_RES( IMG_FONTWORK_ALIGN_CENTER_16 ) ),
-    maImgAlgin3( SVX_RES( IMG_FONTWORK_ALIGN_RIGHT_16 ) ),
-    maImgAlgin4( SVX_RES( IMG_FONTWORK_ALIGN_WORD_16 ) ),
-    maImgAlgin5( SVX_RES( IMG_FONTWORK_ALIGN_STRETCH_16 ) ),
-    maImgAlgin1h( SVX_RES( IMG_FONTWORK_ALIGN_LEFT_16_H ) ),
-    maImgAlgin2h( SVX_RES( IMG_FONTWORK_ALIGN_CENTER_16_H ) ),
-    maImgAlgin3h( SVX_RES( IMG_FONTWORK_ALIGN_RIGHT_16_H ) ),
-    maImgAlgin4h( SVX_RES( IMG_FONTWORK_ALIGN_WORD_16_H ) ),
-    maImgAlgin5h( SVX_RES( IMG_FONTWORK_ALIGN_STRETCH_16_H ) ),
-    mxFrame( rFrame ),
-    mbPopupMode( true )
-{
-    SetHelpId( HID_WIN_FONTWORK_ALIGN );
-    implInit();
-}
-
-FontWorkAlignmentWindow::FontWorkAlignmentWindow(
-    USHORT nId,
-    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
-    Window* /*pParentWindow*/ ) :
-
-    SfxPopupWindow( nId,
-                    rFrame,
-                    SVX_RES( RID_SVXFLOAT_FONTWORK_ALIGNMENT )),
-    maImgAlgin1( SVX_RES( IMG_FONTWORK_ALIGN_LEFT_16 ) ),
-    maImgAlgin2( SVX_RES( IMG_FONTWORK_ALIGN_CENTER_16 ) ),
-    maImgAlgin3( SVX_RES( IMG_FONTWORK_ALIGN_RIGHT_16 ) ),
-    maImgAlgin4( SVX_RES( IMG_FONTWORK_ALIGN_WORD_16 ) ),
-    maImgAlgin5( SVX_RES( IMG_FONTWORK_ALIGN_STRETCH_16 ) ),
-    maImgAlgin1h( SVX_RES( IMG_FONTWORK_ALIGN_LEFT_16_H ) ),
-    maImgAlgin2h( SVX_RES( IMG_FONTWORK_ALIGN_CENTER_16_H ) ),
-    maImgAlgin3h( SVX_RES( IMG_FONTWORK_ALIGN_RIGHT_16_H ) ),
-    maImgAlgin4h( SVX_RES( IMG_FONTWORK_ALIGN_WORD_16_H ) ),
-    maImgAlgin5h( SVX_RES( IMG_FONTWORK_ALIGN_STRETCH_16_H ) ),
-    mxFrame( rFrame ),
-    mbPopupMode( true )
-{
-    SetHelpId( HID_WIN_FONTWORK_ALIGN );
-    implInit();
-}
-
-void FontWorkAlignmentWindow::implInit()
+class FontWorkAlignmentWindow : public ToolbarMenu
+{
+public:
+    FontWorkAlignmentWindow( svt::ToolboxController& rController, const Reference< XFrame >& rFrame, Window* pParentWindow );
+
+    virtual void SAL_CALL statusChanged( const frame::FeatureStateEvent& Event ) throw ( RuntimeException );
+    virtual void DataChanged( const DataChangedEvent& rDCEvt );
+
+private:
+    svt::ToolboxController& mrController;
+
+    Image maImgAlgin1;
+    Image maImgAlgin2;
+    Image maImgAlgin3;
+    Image maImgAlgin4;
+    Image maImgAlgin5;
+    Image maImgAlgin1h;
+    Image maImgAlgin2h;
+    Image maImgAlgin3h;
+    Image maImgAlgin4h;
+    Image maImgAlgin5h;
+
+    const rtl::OUString msFontworkAlignment;
+
+    DECL_LINK( SelectHdl, void * );
+
+    void    implSetAlignment( int nAlignmentMode, bool bEnabled );
+};
+
+FontWorkAlignmentWindow::FontWorkAlignmentWindow( svt::ToolboxController& rController, const Reference< XFrame >& rFrame, Window* pParentWindow )
+: ToolbarMenu( rFrame, pParentWindow, SVX_RES( RID_SVXFLOAT_FONTWORK_ALIGNMENT ))
+, mrController( rController )
+, maImgAlgin1( SVX_RES( IMG_FONTWORK_ALIGN_LEFT_16 ) )
+, maImgAlgin2( SVX_RES( IMG_FONTWORK_ALIGN_CENTER_16 ) )
+, maImgAlgin3( SVX_RES( IMG_FONTWORK_ALIGN_RIGHT_16 ) )
+, maImgAlgin4( SVX_RES( IMG_FONTWORK_ALIGN_WORD_16 ) )
+, maImgAlgin5( SVX_RES( IMG_FONTWORK_ALIGN_STRETCH_16 ) )
+, maImgAlgin1h( SVX_RES( IMG_FONTWORK_ALIGN_LEFT_16_H ) )
+, maImgAlgin2h( SVX_RES( IMG_FONTWORK_ALIGN_CENTER_16_H ) )
+, maImgAlgin3h( SVX_RES( IMG_FONTWORK_ALIGN_RIGHT_16_H ) )
+, maImgAlgin4h( SVX_RES( IMG_FONTWORK_ALIGN_WORD_16_H ) )
+, maImgAlgin5h( SVX_RES( IMG_FONTWORK_ALIGN_STRETCH_16_H ) )
+, msFontworkAlignment( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontworkAlignment" ) )
 {
-    SetHelpId( HID_POPUP_FONTWORK_ALIGN );
-
     bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
 
-    mpMenu = new ToolbarMenu( this, WB_CLIPCHILDREN );
-    mpMenu->SetHelpId( HID_POPUP_FONTWORK_ALIGN );
-    mpMenu->SetSelectHdl( LINK( this, FontWorkAlignmentWindow, SelectHdl ) );
-
-    mpMenu->appendEntry( 0, String( SVX_RES( STR_ALIGN_LEFT ) ), bHighContrast ? maImgAlgin1h : maImgAlgin1 );
-    mpMenu->appendEntry( 1, String( SVX_RES( STR_ALIGN_CENTER ) ), bHighContrast ? maImgAlgin2h : maImgAlgin2 );
-    mpMenu->appendEntry( 2, String( SVX_RES( STR_ALIGN_RIGHT ) ), bHighContrast ? maImgAlgin3h : maImgAlgin3 );
-    mpMenu->appendEntry( 3, String( SVX_RES( STR_ALIGN_WORD ) ), bHighContrast ? maImgAlgin4h : maImgAlgin4 );
-    mpMenu->appendEntry( 4, String( SVX_RES( STR_ALIGN_STRETCH ) ), bHighContrast ? maImgAlgin5h : maImgAlgin5 );
+    SetHelpId( HID_POPUP_FONTWORK_ALIGN );
+    SetSelectHdl( LINK( this, FontWorkAlignmentWindow, SelectHdl ) );
 
-    SetOutputSizePixel( mpMenu->getMenuSize() );
-    mpMenu->SetOutputSizePixel( GetOutputSizePixel() );
+    appendEntry( 0, String( SVX_RES( STR_ALIGN_LEFT ) ), bHighContrast ? maImgAlgin1h : maImgAlgin1 );
+    appendEntry( 1, String( SVX_RES( STR_ALIGN_CENTER ) ), bHighContrast ? maImgAlgin2h : maImgAlgin2 );
+    appendEntry( 2, String( SVX_RES( STR_ALIGN_RIGHT ) ), bHighContrast ? maImgAlgin3h : maImgAlgin3 );
+    appendEntry( 3, String( SVX_RES( STR_ALIGN_WORD ) ), bHighContrast ? maImgAlgin4h : maImgAlgin4 );
+    appendEntry( 4, String( SVX_RES( STR_ALIGN_STRETCH ) ), bHighContrast ? maImgAlgin5h : maImgAlgin5 );
 
-    mpMenu->Show();
+    SetOutputSizePixel( getMenuSize() );
 
     FreeResource();
 
-    AddStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontworkAlignment" )));
-}
-
-SfxPopupWindow* FontWorkAlignmentWindow::Clone() const
-{
-    return new FontWorkAlignmentWindow( GetId(), mxFrame );
-}
-
-// -----------------------------------------------------------------------
-
-FontWorkAlignmentWindow::~FontWorkAlignmentWindow()
-{
-    delete mpMenu;
+    AddStatusListener( msFontworkAlignment );
 }
 
 // -----------------------------------------------------------------------
 
 void FontWorkAlignmentWindow::implSetAlignment( int nSurface, bool bEnabled )
 {
-    if( mpMenu )
+    int i;
+    for( i = 0; i < 5; i++ )
     {
-        int i;
-        for( i = 0; i < 5; i++ )
-        {
-            mpMenu->checkEntry( i, (i == nSurface) && bEnabled );
-            mpMenu->enableEntry( i, bEnabled );
-        }
+        checkEntry( i, (i == nSurface) && bEnabled );
+        enableEntry( i, bEnabled );
     }
 }
 
 // -----------------------------------------------------------------------
 
-void FontWorkAlignmentWindow::StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState )
+void SAL_CALL FontWorkAlignmentWindow::statusChanged( const frame::FeatureStateEvent& Event ) throw ( RuntimeException )
 {
-    switch( nSID )
+    if( Event.FeatureURL.Main.equals( msFontworkAlignment ) )
     {
-        case SID_FONTWORK_ALIGNMENT:
+        if( !Event.IsEnabled )
         {
-            if( eState == SFX_ITEM_DISABLED )
-            {
-                implSetAlignment( 0, false );
-            }
-            else
-            {
-                const SfxInt32Item* pStateItem = PTR_CAST( SfxInt32Item, pState );
-                if( pStateItem )
-                    implSetAlignment( pStateItem->GetValue(), true );
-            }
-            break;
+            implSetAlignment( 0, false );
+        }
+        else
+        {
+            sal_Int32 nValue = 0;
+            if( Event.State >>= nValue )
+                implSetAlignment( nValue, true );
         }
     }
 }
@@ -470,17 +444,17 @@ void FontWorkAlignmentWindow::StateChanged( USHORT nSID, SfxItemState eState, co
 
 void FontWorkAlignmentWindow::DataChanged( const DataChangedEvent& rDCEvt )
 {
-    SfxPopupWindow::DataChanged( rDCEvt );
+    ToolbarMenu::DataChanged( rDCEvt );
 
     if( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) )
     {
         bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
 
-        mpMenu->appendEntry( 0, String( SVX_RES( STR_ALIGN_LEFT ) ), bHighContrast ? maImgAlgin1h : maImgAlgin1 );
-        mpMenu->appendEntry( 1, String( SVX_RES( STR_ALIGN_CENTER ) ), bHighContrast ? maImgAlgin2h : maImgAlgin2 );
-        mpMenu->appendEntry( 2, String( SVX_RES( STR_ALIGN_RIGHT ) ), bHighContrast ? maImgAlgin3h : maImgAlgin3 );
-        mpMenu->appendEntry( 3, String( SVX_RES( STR_ALIGN_WORD ) ), bHighContrast ? maImgAlgin4h : maImgAlgin4 );
-        mpMenu->appendEntry( 4, String( SVX_RES( STR_ALIGN_STRETCH ) ), bHighContrast ? maImgAlgin5h : maImgAlgin5 );
+        appendEntry( 0, String( SVX_RES( STR_ALIGN_LEFT ) ), bHighContrast ? maImgAlgin1h : maImgAlgin1 );
+        appendEntry( 1, String( SVX_RES( STR_ALIGN_CENTER ) ), bHighContrast ? maImgAlgin2h : maImgAlgin2 );
+        appendEntry( 2, String( SVX_RES( STR_ALIGN_RIGHT ) ), bHighContrast ? maImgAlgin3h : maImgAlgin3 );
+        appendEntry( 3, String( SVX_RES( STR_ALIGN_WORD ) ), bHighContrast ? maImgAlgin4h : maImgAlgin4 );
+        appendEntry( 4, String( SVX_RES( STR_ALIGN_STRETCH ) ), bHighContrast ? maImgAlgin5h : maImgAlgin5 );
     }
 }
 
@@ -491,25 +465,14 @@ IMPL_LINK( FontWorkAlignmentWindow, SelectHdl, void *, EMPTYARG )
     if ( IsInPopupMode() )
         EndPopupMode();
 
-//  SfxDispatcher* pDisp = GetBindings().GetDispatcher();
-
-    sal_Int32 nAlignment = mpMenu->getSelectedEntryId();
+    sal_Int32 nAlignment = getSelectedEntryId();
     if( nAlignment >= 0 )
     {
-        SfxInt32Item    aItem( SID_FONTWORK_ALIGNMENT, nAlignment );
-        rtl::OUString   aCommand( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontworkAlignment" ));
-
-        Any a;
-        INetURLObject aObj( aCommand );
         Sequence< PropertyValue > aArgs( 1 );
-        aArgs[0].Name = aObj.GetURLPath();
-        aItem.QueryValue( a );
-        aArgs[0].Value = a;
+        aArgs[0].Name = msFontworkAlignment.copy(5);
+        aArgs[0].Value <<= (sal_Int32)nAlignment;
 
-        SfxToolBoxControl::Dispatch( Reference< ::com::sun::star::frame::XDispatchProvider >(
-                                     mxFrame->getController(), UNO_QUERY ),
-                                     aCommand,
-                                     aArgs );
+        mrController.dispatchCommand( msFontworkAlignment, aArgs );
 
         implSetAlignment( nAlignment, true );
     }
@@ -517,250 +480,189 @@ IMPL_LINK( FontWorkAlignmentWindow, SelectHdl, void *, EMPTYARG )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+// ========================================================================
+// FontWorkAlignmentControl
+// ========================================================================
 
-void FontWorkAlignmentWindow::StartSelection()
+class FontWorkAlignmentControl : public svt::PopupWindowController
 {
-}
+public:
+    FontWorkAlignmentControl( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager );
+
+    virtual ::Window* createPopupWindow( ::Window* pParent );
+
+    // XServiceInfo
+    virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException );
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException );
+};
+
 
 // -----------------------------------------------------------------------
 
-BOOL FontWorkAlignmentWindow::Close()
+FontWorkAlignmentControl::FontWorkAlignmentControl( const Reference< lang::XMultiServiceFactory >& rServiceManager )
+: svt::PopupWindowController( rServiceManager, Reference< frame::XFrame >(), OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontworkAlignment" ) ) )
 {
-    return SfxPopupWindow::Close();
 }
 
 // -----------------------------------------------------------------------
 
-void FontWorkAlignmentWindow::PopupModeEnd()
+::Window* FontWorkAlignmentControl::createPopupWindow( ::Window* pParent )
 {
-    if ( IsVisible() )
-    {
-        mbPopupMode = FALSE;
-    }
-    SfxPopupWindow::PopupModeEnd();
+    return new FontWorkAlignmentWindow( *this, m_xFrame, pParent );
 }
 
 // -----------------------------------------------------------------------
+// XServiceInfo
+// -----------------------------------------------------------------------
 
-void FontWorkAlignmentWindow::GetFocus (void)
+OUString SAL_CALL FontWorkAlignmentControl_getImplementationName()
 {
-    SfxPopupWindow::GetFocus();
-    // Grab the focus to the line ends value set so that it can be controlled
-    // with the keyboard.
-    if( mpMenu )
-        mpMenu->GrabFocus();
+    return OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svx.FontWorkAlignmentController" ));
 }
 
-// ========================================================================
+// --------------------------------------------------------------------
 
-FontWorkAlignmentControl::FontWorkAlignmentControl(
-    USHORT nSlotId, USHORT nId, ToolBox &rTbx )
-: SfxToolBoxControl( nSlotId, nId, rTbx )
+Sequence< OUString > SAL_CALL FontWorkAlignmentControl_getSupportedServiceNames() throw( RuntimeException )
 {
-    rTbx.SetItemBits( nId, TIB_DROPDOWNONLY | rTbx.GetItemBits( nId ) );
+    Sequence< OUString > aSNS( 1 );
+    aSNS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ToolbarController" ));
+    return aSNS;
 }
 
-// -----------------------------------------------------------------------
+// --------------------------------------------------------------------
 
-FontWorkAlignmentControl::~FontWorkAlignmentControl()
+Reference< XInterface > SAL_CALL SAL_CALL FontWorkAlignmentControl_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) throw( RuntimeException )
 {
+    return *new FontWorkAlignmentControl( rSMgr );
 }
 
-// -----------------------------------------------------------------------
+// --------------------------------------------------------------------
 
-SfxPopupWindowType FontWorkAlignmentControl::GetPopupWindowType() const
+OUString SAL_CALL FontWorkAlignmentControl::getImplementationName(  ) throw (RuntimeException)
 {
-    return SFX_POPUPWINDOW_ONCLICK;
+    return FontWorkAlignmentControl_getImplementationName();
 }
 
-// -----------------------------------------------------------------------
+// --------------------------------------------------------------------
 
-SfxPopupWindow* FontWorkAlignmentControl::CreatePopupWindow()
+Sequence< OUString > SAL_CALL FontWorkAlignmentControl::getSupportedServiceNames(  ) throw (RuntimeException)
 {
-    FontWorkAlignmentWindow* pWin = new FontWorkAlignmentWindow( GetId(), m_xFrame, &GetToolBox() );
-    pWin->StartPopupMode( &GetToolBox(), TRUE );
-    pWin->StartSelection();
-    SetPopupWindow( pWin );
-    return pWin;
+    return FontWorkAlignmentControl_getSupportedServiceNames();
 }
 
-// -----------------------------------------------------------------------
 
-void FontWorkAlignmentControl::StateChanged( USHORT /*nSID*/, SfxItemState eState, const SfxPoolItem* /*pState*/ )
-{
-    USHORT nId = GetId();
-    ToolBox& rTbx = GetToolBox();
+// ####################################################################
 
-    rTbx.EnableItem( nId, SFX_ITEM_DISABLED != eState );
-    rTbx.SetItemState( nId, ( SFX_ITEM_DONTCARE == eState ) ? STATE_DONTKNOW : STATE_NOCHECK );
-}
+class FontWorkCharacterSpacingWindow : public ToolbarMenu
+{
+public:
+    FontWorkCharacterSpacingWindow( svt::ToolboxController& rController, const Reference< XFrame >& rFrame, Window* pParentWindow );
 
-// ####################################################################
+    virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException );
+private:
+    svt::ToolboxController& mrController;
 
-SFX_IMPL_TOOLBOX_CONTROL( FontWorkCharacterSpacingControl, SfxBoolItem );
+    const rtl::OUString msFontworkCharacterSpacing;
+    const rtl::OUString msFontworkKernCharacterPairs;
 
-FontWorkCharacterSpacingWindow::FontWorkCharacterSpacingWindow(
-    USHORT nId,
-    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame ) :
+    DECL_LINK( SelectHdl, void * );
 
-    SfxPopupWindow( nId,
-                    rFrame,
-                    SVX_RES( RID_SVXFLOAT_FONTWORK_CHARSPACING )),
-    mxFrame( rFrame ),
-    mbPopupMode( true )
-{
-    SetHelpId( HID_WIN_FONTWORK_CHARSPACE );
-    implInit();
-}
+    void    implSetCharacterSpacing( sal_Int32 nCharacterSpacing, bool bEnabled );
+    void    implSetKernCharacterPairs( sal_Bool bKernOnOff, bool bEnabled );
 
-FontWorkCharacterSpacingWindow::FontWorkCharacterSpacingWindow(
-    USHORT nId,
-    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
-    Window* pParentWindow ) :
+};
 
-    SfxPopupWindow( nId,
-                    rFrame,
-                    pParentWindow,
-                    SVX_RES( RID_SVXFLOAT_FONTWORK_CHARSPACING )),
-    mxFrame( rFrame ),
-    mbPopupMode( true )
-{
-    SetHelpId( HID_WIN_FONTWORK_CHARSPACE );
-    implInit();
-}
+// -----------------------------------------------------------------------
 
-void FontWorkCharacterSpacingWindow::implInit()
+FontWorkCharacterSpacingWindow::FontWorkCharacterSpacingWindow( svt::ToolboxController& rController, const Reference< XFrame >& rFrame, Window* pParentWindow )
+: ToolbarMenu( rFrame, pParentWindow, SVX_RES( RID_SVXFLOAT_FONTWORK_CHARSPACING ))
+, mrController( rController )
+, msFontworkCharacterSpacing( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontworkCharacterSpacing" ) )
+, msFontworkKernCharacterPairs( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontworkKernCharacterPairs" ) )
 {
     SetHelpId( HID_POPUP_FONTWORK_CHARSPACE );
+    SetSelectHdl( LINK( this, FontWorkCharacterSpacingWindow, SelectHdl ) );
 
-//  bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
-
-    mpMenu = new ToolbarMenu( this, WB_CLIPCHILDREN );
-    mpMenu->SetHelpId( HID_POPUP_FONTWORK_CHARSPACE );
-    mpMenu->SetSelectHdl( LINK( this, FontWorkCharacterSpacingWindow, SelectHdl ) );
-
-    mpMenu->appendEntry( 0, String( SVX_RES( STR_CHARS_SPACING_VERY_TIGHT ) ), MIB_RADIOCHECK );
-    mpMenu->appendEntry( 1, String( SVX_RES( STR_CHARS_SPACING_TIGHT ) ), MIB_RADIOCHECK );
-    mpMenu->appendEntry( 2, String( SVX_RES( STR_CHARS_SPACING_NORMAL ) ), MIB_RADIOCHECK );
-    mpMenu->appendEntry( 3, String( SVX_RES( STR_CHARS_SPACING_LOOSE ) ), MIB_RADIOCHECK );
-    mpMenu->appendEntry( 4, String( SVX_RES( STR_CHARS_SPACING_VERY_LOOSE ) ), MIB_RADIOCHECK );
-    mpMenu->appendEntry( 5, String( SVX_RES( STR_CHARS_SPACING_CUSTOM ) ), MIB_RADIOCHECK );
-    mpMenu->appendSeparator();
-    mpMenu->appendEntry( 6, String( SVX_RES( STR_CHARS_SPACING_KERN_PAIRS ) ), MIB_CHECKABLE );
+    appendEntry( 0, String( SVX_RES( STR_CHARS_SPACING_VERY_TIGHT ) ), MIB_RADIOCHECK );
+    appendEntry( 1, String( SVX_RES( STR_CHARS_SPACING_TIGHT ) ), MIB_RADIOCHECK );
+    appendEntry( 2, String( SVX_RES( STR_CHARS_SPACING_NORMAL ) ), MIB_RADIOCHECK );
+    appendEntry( 3, String( SVX_RES( STR_CHARS_SPACING_LOOSE ) ), MIB_RADIOCHECK );
+    appendEntry( 4, String( SVX_RES( STR_CHARS_SPACING_VERY_LOOSE ) ), MIB_RADIOCHECK );
+    appendEntry( 5, String( SVX_RES( STR_CHARS_SPACING_CUSTOM ) ), MIB_RADIOCHECK );
+    appendSeparator();
+    appendEntry( 6, String( SVX_RES( STR_CHARS_SPACING_KERN_PAIRS ) ), MIB_CHECKABLE );
 
-    SetOutputSizePixel( mpMenu->getMenuSize() );
-    mpMenu->SetOutputSizePixel( GetOutputSizePixel() );
-
-    mpMenu->Show();
+    SetOutputSizePixel( getMenuSize() );
 
     FreeResource();
 
-    AddStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontworkCharacterSpacing" )));
-}
-
-SfxPopupWindow* FontWorkCharacterSpacingWindow::Clone() const
-{
-    return new FontWorkCharacterSpacingWindow( GetId(), mxFrame );
-}
-
-// -----------------------------------------------------------------------
-
-FontWorkCharacterSpacingWindow::~FontWorkCharacterSpacingWindow()
-{
-    delete mpMenu;
+    AddStatusListener( msFontworkCharacterSpacing );
+    AddStatusListener( msFontworkKernCharacterPairs );
 }
 
 // -----------------------------------------------------------------------
 
 void FontWorkCharacterSpacingWindow::implSetCharacterSpacing( sal_Int32 nCharacterSpacing, bool bEnabled )
 {
-    if( mpMenu )
+    sal_Int32 i;
+    for ( i = 0; i < 6; i++ )
     {
-        sal_Int32 i;
-        for ( i = 0; i < 6; i++ )
-        {
-            mpMenu->checkEntry( i, sal_False );
-            mpMenu->enableEntry( i, bEnabled );
-        }
-        if ( nCharacterSpacing != -1 )
+        checkEntry( i, sal_False );
+        enableEntry( i, bEnabled );
+    }
+    if ( nCharacterSpacing != -1 )
+    {
+        sal_Int32 nEntry;
+        switch( nCharacterSpacing )
         {
-            sal_Int32 nEntry;
-            switch( nCharacterSpacing )
-            {
-                case 80 : nEntry = 0; break;
-                case 90 : nEntry = 1; break;
-                case 100 : nEntry = 2; break;
-                case 120 : nEntry = 3; break;
-                case 150 : nEntry = 4; break;
-                default : nEntry = 5; break;
-            }
-            mpMenu->checkEntry( nEntry, bEnabled );
+            case 80 : nEntry = 0; break;
+            case 90 : nEntry = 1; break;
+            case 100 : nEntry = 2; break;
+            case 120 : nEntry = 3; break;
+            case 150 : nEntry = 4; break;
+            default : nEntry = 5; break;
         }
+        checkEntry( nEntry, bEnabled );
     }
 }
 
+// -----------------------------------------------------------------------
+
 void FontWorkCharacterSpacingWindow::implSetKernCharacterPairs( sal_Bool, bool bEnabled )
 {
-    if( mpMenu )
-    {
-        mpMenu->enableEntry( 6, bEnabled );
-        mpMenu->checkEntry( 6, bEnabled );
-    }
+    enableEntry( 6, bEnabled );
+    checkEntry( 6, bEnabled );
 }
 
 // -----------------------------------------------------------------------
 
-void FontWorkCharacterSpacingWindow::StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState )
+void SAL_CALL FontWorkCharacterSpacingWindow::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException )
 {
-    switch( nSID )
+    if( Event.FeatureURL.Main.equals( msFontworkCharacterSpacing ) )
     {
-        case SID_FONTWORK_CHARACTER_SPACING:
+        if( !Event.IsEnabled )
         {
-            if( eState == SFX_ITEM_DISABLED )
-                implSetCharacterSpacing( 0, false );
-            else
-            {
-                const SfxInt32Item* pStateItem = PTR_CAST( SfxInt32Item, pState );
-                if( pStateItem )
-                    implSetCharacterSpacing( pStateItem->GetValue(), true );
-            }
+            implSetCharacterSpacing( 0, false );
         }
-        break;
-
-        case SID_FONTWORK_KERN_CHARACTER_PAIRS :
+        else
         {
-            if( eState == SFX_ITEM_DISABLED )
-                implSetKernCharacterPairs( 0, false );
-            else
-            {
-                const SfxBoolItem* pStateItem = PTR_CAST( SfxBoolItem, pState );
-                if( pStateItem )
-                    implSetKernCharacterPairs( pStateItem->GetValue(), true );
-            }
+            sal_Int32 nValue = 0;
+            if( Event.State >>= nValue )
+                implSetCharacterSpacing( nValue, true );
         }
-        break;
     }
-}
-
-// -----------------------------------------------------------------------
-
-void FontWorkCharacterSpacingWindow::DataChanged( const DataChangedEvent& rDCEvt )
-{
-    SfxPopupWindow::DataChanged( rDCEvt );
-
-    if( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) )
+    else if( Event.FeatureURL.Main.equals( msFontworkKernCharacterPairs ) )
     {
-//      bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
-
-        mpMenu->appendEntry( 0, String( SVX_RES( STR_CHARS_SPACING_VERY_TIGHT ) ), MIB_CHECKABLE );
-        mpMenu->appendEntry( 1, String( SVX_RES( STR_CHARS_SPACING_TIGHT ) ), MIB_CHECKABLE );
-        mpMenu->appendEntry( 2, String( SVX_RES( STR_CHARS_SPACING_NORMAL ) ), MIB_CHECKABLE );
-        mpMenu->appendEntry( 3, String( SVX_RES( STR_CHARS_SPACING_LOOSE ) ),  MIB_CHECKABLE );
-        mpMenu->appendEntry( 4, String( SVX_RES( STR_CHARS_SPACING_VERY_LOOSE ) ), MIB_CHECKABLE );
-        mpMenu->appendEntry( 5, String( SVX_RES( STR_CHARS_SPACING_CUSTOM ) ), MIB_CHECKABLE );
-        mpMenu->appendSeparator();
-        mpMenu->appendEntry( 6, String( SVX_RES( STR_CHARS_SPACING_KERN_PAIRS ) ), MIB_CHECKABLE );
+        if( !Event.IsEnabled )
+        {
+            implSetKernCharacterPairs( 0, false );
+        }
+        else
+        {
+            sal_Bool bValue = sal_False;
+            if( Event.State >>= bValue )
+                implSetKernCharacterPairs( bValue, true );
+        }
     }
 }
 
@@ -771,7 +673,7 @@ IMPL_LINK( FontWorkCharacterSpacingWindow, SelectHdl, void *, EMPTYARG )
     if ( IsInPopupMode() )
         EndPopupMode();
 
-    sal_Int32 nSelection = mpMenu->getSelectedEntryId();
+    sal_Int32 nSelection = getSelectedEntryId();
     sal_Int32 nCharacterSpacing;
     switch( nSelection )
     {
@@ -784,53 +686,31 @@ IMPL_LINK( FontWorkCharacterSpacingWindow, SelectHdl, void *, EMPTYARG )
     }
     if ( nSelection == 5 )  // custom spacing
     {
-        SfxInt32Item    aItem( SID_FONTWORK_CHARACTER_SPACING, nCharacterSpacing );
-        rtl::OUString   aCommand( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontworkCharacterSpacingDialog" ));
-
-        Any a;
         Sequence< PropertyValue > aArgs( 1 );
-        aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FontworkCharacterSpacing" ));
-        aItem.QueryValue( a );
-        aArgs[0].Value = a;
-        SfxToolBoxControl::Dispatch( Reference< ::com::sun::star::frame::XDispatchProvider >(
-                                        mxFrame->getController(), UNO_QUERY ),
-                                        aCommand,
-                                        aArgs );
+        aArgs[0].Name = msFontworkCharacterSpacing.copy(5);
+        aArgs[0].Value <<= (sal_Int32)nCharacterSpacing;
+
+        mrController.dispatchCommand( OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontworkCharacterSpacingDialog" )), aArgs );
     }
     else if ( nSelection == 6 ) // KernCharacterPairs
     {
-        sal_Bool bOnOff = sal_True;
-        SfxBoolItem    aItem( SID_FONTWORK_KERN_CHARACTER_PAIRS, bOnOff );
         rtl::OUString   aCommand( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontworkKernCharacterPairs" ));
 
-        Any a;
         Sequence< PropertyValue > aArgs( 1 );
-        aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FontworkKernCharacterPairs" ));
-        aItem.QueryValue( a );
-        aArgs[0].Value = a;
-        SfxToolBoxControl::Dispatch( Reference< ::com::sun::star::frame::XDispatchProvider >(
-                                        mxFrame->getController(), UNO_QUERY ),
-                                        aCommand,
-                                        aArgs );
-
-        implSetKernCharacterPairs( bOnOff, true );
+        aArgs[0].Name = msFontworkKernCharacterPairs.copy(5);
+        aArgs[0].Value <<= (sal_Bool) sal_True;
+
+        mrController.dispatchCommand( msFontworkKernCharacterPairs, aArgs );
+
+        implSetKernCharacterPairs( sal_True, true );
     }
     else if( nSelection >= 0 )
     {
-        SfxInt32Item    aItem( SID_FONTWORK_CHARACTER_SPACING, nCharacterSpacing );
-        rtl::OUString   aCommand( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontworkCharacterSpacing" ));
-
-        Any a;
-        INetURLObject aObj( aCommand );
         Sequence< PropertyValue > aArgs( 1 );
-        aArgs[0].Name = aObj.GetURLPath();
-        aItem.QueryValue( a );
-        aArgs[0].Value = a;
+        aArgs[0].Name = msFontworkCharacterSpacing.copy(5);
+        aArgs[0].Value <<=( sal_Int32)nCharacterSpacing;
 
-        SfxToolBoxControl::Dispatch( Reference< ::com::sun::star::frame::XDispatchProvider >(
-                                     mxFrame->getController(), UNO_QUERY ),
-                                     aCommand,
-                                     aArgs );
+        mrController.dispatchCommand( msFontworkCharacterSpacing,  aArgs );
 
         implSetCharacterSpacing( nCharacterSpacing, true );
     }
@@ -838,86 +718,77 @@ IMPL_LINK( FontWorkCharacterSpacingWindow, SelectHdl, void *, EMPTYARG )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+// ========================================================================
+// FontWorkCharacterSpacingControl
+// ========================================================================
 
-void FontWorkCharacterSpacingWindow::StartSelection()
+class FontWorkCharacterSpacingControl : public svt::PopupWindowController
 {
-}
+public:
+    FontWorkCharacterSpacingControl( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager );
 
-// -----------------------------------------------------------------------
+    virtual ::Window* createPopupWindow( ::Window* pParent );
 
-BOOL FontWorkCharacterSpacingWindow::Close()
-{
-    return SfxPopupWindow::Close();
-}
+    // XServiceInfo
+    virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException );
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException );
+};
 
-// -----------------------------------------------------------------------
 
-void FontWorkCharacterSpacingWindow::PopupModeEnd()
+FontWorkCharacterSpacingControl::FontWorkCharacterSpacingControl( const Reference< lang::XMultiServiceFactory >& rServiceManager )
+: svt::PopupWindowController( rServiceManager, Reference< frame::XFrame >(), OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontworkCharacterSpacingFloater" ) ) )
 {
-    if ( IsVisible() )
-    {
-        mbPopupMode = FALSE;
-    }
-    SfxPopupWindow::PopupModeEnd();
 }
 
 // -----------------------------------------------------------------------
 
-void FontWorkCharacterSpacingWindow::GetFocus (void)
+::Window* FontWorkCharacterSpacingControl::createPopupWindow( ::Window* pParent )
 {
-    SfxPopupWindow::GetFocus();
-    // Grab the focus to the line ends value set so that it can be controlled
-    // with the keyboard.
-    if( mpMenu )
-        mpMenu->GrabFocus();
+    return new FontWorkCharacterSpacingWindow( *this, m_xFrame, pParent );
 }
 
-// ========================================================================
+// -----------------------------------------------------------------------
+// XServiceInfo
+// -----------------------------------------------------------------------
 
-FontWorkCharacterSpacingControl::FontWorkCharacterSpacingControl(
-    USHORT nSlotId, USHORT nId, ToolBox &rTbx )
-: SfxToolBoxControl( nSlotId, nId, rTbx )
+OUString SAL_CALL FontWorkCharacterSpacingControl_getImplementationName()
 {
-    rTbx.SetItemBits( nId, TIB_DROPDOWNONLY | rTbx.GetItemBits( nId ) );
+    return OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svx.FontWorkCharacterSpacingController" ));
 }
 
-// -----------------------------------------------------------------------
+// --------------------------------------------------------------------
 
-FontWorkCharacterSpacingControl::~FontWorkCharacterSpacingControl()
+Sequence< OUString > SAL_CALL FontWorkCharacterSpacingControl_getSupportedServiceNames() throw( RuntimeException )
 {
+    Sequence< OUString > aSNS( 1 );
+    aSNS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ToolbarController" ));
+    return aSNS;
 }
 
-// -----------------------------------------------------------------------
+// --------------------------------------------------------------------
 
-SfxPopupWindowType FontWorkCharacterSpacingControl::GetPopupWindowType() const
+Reference< XInterface > SAL_CALL SAL_CALL FontWorkCharacterSpacingControl_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) throw( RuntimeException )
 {
-    return SFX_POPUPWINDOW_ONCLICK;
+    return *new FontWorkCharacterSpacingControl( rSMgr );
 }
 
-// -----------------------------------------------------------------------
+// --------------------------------------------------------------------
 
-SfxPopupWindow* FontWorkCharacterSpacingControl::CreatePopupWindow()
+OUString SAL_CALL FontWorkCharacterSpacingControl::getImplementationName(  ) throw (RuntimeException)
 {
-    FontWorkCharacterSpacingWindow* pWin = new FontWorkCharacterSpacingWindow( GetId(), m_xFrame, &GetToolBox() );
-    pWin->StartPopupMode( &GetToolBox(), TRUE );
-    pWin->StartSelection();
-    SetPopupWindow( pWin );
-    return pWin;
+    return FontWorkCharacterSpacingControl_getImplementationName();
 }
 
-// -----------------------------------------------------------------------
+// --------------------------------------------------------------------
 
-void FontWorkCharacterSpacingControl::StateChanged( USHORT, SfxItemState eState, const SfxPoolItem* )
+Sequence< OUString > SAL_CALL FontWorkCharacterSpacingControl::getSupportedServiceNames(  ) throw (RuntimeException)
 {
-    USHORT nId = GetId();
-    ToolBox& rTbx = GetToolBox();
-
-    rTbx.EnableItem( nId, SFX_ITEM_DISABLED != eState );
-    rTbx.SetItemState( nId, ( SFX_ITEM_DONTCARE == eState ) ? STATE_DONTKNOW : STATE_NOCHECK );
+    return FontWorkCharacterSpacingControl_getSupportedServiceNames();
 }
 
-// -----------------------------------------------------------------------
+// ========================================================================
+// FontworkCharacterSpacingDialog
+// ========================================================================
 
 FontworkCharacterSpacingDialog::FontworkCharacterSpacingDialog( Window* pParent, sal_Int32 nScale )
 :   ModalDialog( pParent, SVX_RES( RID_SVX_MDLG_FONTWORK_CHARSPACING ) ),
@@ -939,3 +810,5 @@ sal_Int32 FontworkCharacterSpacingDialog::getScale() const
 {
     return (sal_Int32)maMtrScale.GetValue();
 }
+
+}
diff --git a/svx/source/tbxctrls/fontworkgallery.src b/svx/source/tbxctrls/fontworkgallery.src
index 88c294407860..e5f52158b4b6 100644
--- a/svx/source/tbxctrls/fontworkgallery.src
+++ b/svx/source/tbxctrls/fontworkgallery.src
@@ -55,7 +55,7 @@ ModalDialog RID_SVX_MDLG_FONTWORK_GALLERY
     Control CTL_FAVORITES
     {
         HelpId = HID_CTL_FONTWORK_FAVORITES ;
-        Border = TRUE ;
+        Border = FALSE ;
         Pos = MAP_APPFONT ( 3 , 14 ) ;
         Size = MAP_APPFONT ( WIDTH - 6,
                              HEIGHT - RSC_CD_PUSHBUTTON_HEIGHT -
@@ -92,9 +92,9 @@ ModalDialog RID_SVX_MDLG_FONTWORK_GALLERY
     };
 };
 
-FloatingWindow RID_SVXFLOAT_FONTWORK_ALIGNMENT
+DockingWindow RID_SVXFLOAT_FONTWORK_ALIGNMENT
 {
-    Border = TRUE ;
+    Border = FALSE ;
     Hide = TRUE ;
     SVLook = TRUE ;
     Sizeable = FALSE ;
@@ -227,9 +227,9 @@ FloatingWindow RID_SVXFLOAT_FONTWORK_ALIGNMENT
     };
 };
 
-FloatingWindow RID_SVXFLOAT_FONTWORK_CHARSPACING
+DockingWindow RID_SVXFLOAT_FONTWORK_CHARSPACING
 {
-    Border = TRUE ;
+    Border = FALSE ;
     Hide = TRUE ;
     SVLook = TRUE ;
     Sizeable = FALSE ;
@@ -306,7 +306,7 @@ ModalDialog RID_SVX_MDLG_FONTWORK_CHARSPACING
     };
     MetricField MF_VALUE
     {
-        Border = TRUE ;
+        Border = FALSE ;
         Pos = MAP_APPFONT ( 6 , 17 ) ;
         Size = MAP_APPFONT ( 32 , 12 ) ;
         TabStop = TRUE ;
diff --git a/svx/source/tbxctrls/makefile.mk b/svx/source/tbxctrls/makefile.mk
index 47da008e87a3..9b08caa587aa 100644
--- a/svx/source/tbxctrls/makefile.mk
+++ b/svx/source/tbxctrls/makefile.mk
@@ -44,7 +44,6 @@ LIB1OBJFILES= \
         $(SLO)$/fontworkgallery.obj\
         $(SLO)$/extrusioncontrols.obj \
         $(SLO)$/tbcontrl.obj	\
-        $(SLO)$/toolbarmenu.obj \
         $(SLO)$/tbxcolorupdate.obj
 
 LIB2TARGET= $(SLB)$/$(TARGET).lib
diff --git a/svx/source/tbxctrls/toolbarmenu.cxx b/svx/source/tbxctrls/toolbarmenu.cxx
deleted file mode 100644
index 3875e0471c7d..000000000000
--- a/svx/source/tbxctrls/toolbarmenu.cxx
+++ /dev/null
@@ -1,1029 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-#include <vcl/menu.hxx>
-#include <vcl/decoview.hxx>
-#include <vcl/image.hxx>
-
-#include "toolbarmenu.hxx"
-
-const int EXTRAITEMHEIGHT = 4;
-const int SEPARATOR_HEIGHT = 8;
-
-class ToolbarMenuEntry
-{
-public:
-    int mnEntryId;
-    MenuItemBits mnBits;
-    Size maSize;
-
-    bool mbHasText;
-    bool mbHasImage;
-    bool mbHasControl;
-    bool mbChecked;
-    bool mbEnabled;
-
-    String maText;
-    Image maImage;
-    Control* mpControl;
-
-public:
-    ToolbarMenuEntry( int nEntryId, const String& rText, MenuItemBits nBits );
-    ToolbarMenuEntry( int nEntryId, const Image& rImage, MenuItemBits nBits );
-    ToolbarMenuEntry( int nEntryId, const Image& rImage, const String& rText, MenuItemBits nBits );
-    ToolbarMenuEntry( int nEntryId, Control* pControl, MenuItemBits nBits );
-    ToolbarMenuEntry( int nEntryId, const String& rText, Control* pControl, MenuItemBits nBits );
-    ~ToolbarMenuEntry();
-
-    void init( int nEntryId, MenuItemBits nBits );
-};
-
-void ToolbarMenuEntry::init( int nEntryId, MenuItemBits nBits )
-{
-    mnEntryId = nEntryId;
-    mnBits = nBits;
-
-    mbHasText = false;
-    mbHasImage = false;
-    mbHasControl = false;
-    mbChecked = false;
-    mbEnabled = true;
-
-    mpControl = NULL;
-}
-
-ToolbarMenuEntry::ToolbarMenuEntry( int nEntryId, const String& rText, MenuItemBits nBits )
-{
-    init( nEntryId, nBits );
-
-    maText = rText;
-    mbHasText = true;
-}
-
-ToolbarMenuEntry::ToolbarMenuEntry( int nEntryId, const Image& rImage, MenuItemBits nBits )
-{
-    init( nEntryId, nBits );
-
-    maImage = rImage;
-    mbHasImage = true;
-}
-
-ToolbarMenuEntry::ToolbarMenuEntry( int nEntryId, const Image& rImage, const String& rText, MenuItemBits nBits )
-{
-    init( nEntryId, nBits );
-
-    maText = rText;
-    mbHasText = true;
-
-    maImage = rImage;
-    mbHasImage = true;
-}
-
-ToolbarMenuEntry::ToolbarMenuEntry( int nEntryId, Control* pControl, MenuItemBits nBits )
-{
-    init( nEntryId, nBits );
-
-    if( pControl )
-    {
-        mpControl = pControl;
-        mpControl->Show();
-    }
-}
-
-ToolbarMenuEntry::ToolbarMenuEntry( int nEntryId, const String& rText, Control* pControl, MenuItemBits nBits )
-{
-    init( nEntryId, nBits );
-
-    maText = rText;
-    mbHasText = true;
-
-    if( pControl )
-    {
-        mpControl = pControl;
-        mpControl->Show();
-    }
-}
-
-ToolbarMenuEntry::~ToolbarMenuEntry()
-{
-    delete mpControl;
-}
-
-ToolbarMenu::ToolbarMenu( Window* pParent, WinBits nStyle ) :
-    Control( pParent, nStyle )
-{
-    mnCheckPos = 0;
-    mnImagePos = 0;
-    mnTextPos = 0;
-
-    mnHighlightedEntry = -1;
-    mnSelectedEntry = -1;
-    initWindow();
-}
-
-ToolbarMenu::~ToolbarMenu()
-{
-    // delete all menu entries
-    const int nEntryCount = maEntryVector.size();
-    int nEntry;
-    for( nEntry = 0; nEntry < nEntryCount; nEntry++ )
-    {
-        delete maEntryVector[nEntry];
-    }
-}
-
-int ToolbarMenu::getSelectedEntryId() const
-{
-    ToolbarMenuEntry* pEntry = implGetEntry( mnSelectedEntry );
-    return pEntry ? pEntry->mnEntryId : -1;
-}
-
-int ToolbarMenu::getHighlightedEntryId() const
-{
-    ToolbarMenuEntry* pEntry = implGetEntry( mnHighlightedEntry );
-    return pEntry ? pEntry->mnEntryId : -1;
-}
-
-void ToolbarMenu::checkEntry( int nEntryId, bool bChecked )
-{
-    ToolbarMenuEntry* pEntry = implSearchEntry( nEntryId );
-    if( pEntry && pEntry->mbChecked != bChecked )
-    {
-        pEntry->mbChecked = bChecked;
-        Invalidate();
-    }
-}
-
-bool ToolbarMenu::isEntryChecked( int nEntryId ) const
-{
-    ToolbarMenuEntry* pEntry = implSearchEntry( nEntryId );
-    return pEntry && pEntry->mbChecked;
-}
-
-void ToolbarMenu::enableEntry( int nEntryId, bool bEnable )
-{
-    ToolbarMenuEntry* pEntry = implSearchEntry( nEntryId );
-    if( pEntry && pEntry->mbEnabled != bEnable )
-    {
-        pEntry->mbEnabled = bEnable;
-        if( pEntry->mpControl )
-        {
-            pEntry->mpControl->Enable( bEnable );
-
-            // hack for the valueset to make it paint itself anew
-            pEntry->mpControl->Resize();
-        }
-        Invalidate();
-    }
-}
-
-bool ToolbarMenu::isEntryEnabled( int nEntryId ) const
-{
-    ToolbarMenuEntry* pEntry = implSearchEntry( nEntryId );
-    return pEntry && pEntry->mbEnabled;
-}
-
-void ToolbarMenu::setEntryText( int nEntryId, const String& rStr )
-{
-    ToolbarMenuEntry* pEntry = implSearchEntry( nEntryId );
-    if( pEntry && pEntry->maText != rStr )
-    {
-        pEntry->maText = rStr;
-        maSize = implCalcSize();
-        if( IsVisible() )
-            Invalidate();
-    }
-}
-
-const String& ToolbarMenu::getEntryText( int nEntryId ) const
-{
-    ToolbarMenuEntry* pEntry = implSearchEntry( nEntryId );
-    if( pEntry )
-        return pEntry->maText;
-    else
-    {
-        static String aEmptyStr;
-        return aEmptyStr;
-    }
-}
-
-void ToolbarMenu::setEntryImage( int nEntryId, const Image& rImage )
-{
-    ToolbarMenuEntry* pEntry = implSearchEntry( nEntryId );
-    if( pEntry && pEntry->maImage != rImage )
-    {
-        pEntry->maImage = rImage;
-        maSize = implCalcSize();
-        if( IsVisible() )
-            Invalidate();
-    }
-}
-
-const Image& ToolbarMenu::getEntryImage( int nEntryId ) const
-{
-    ToolbarMenuEntry* pEntry = implSearchEntry( nEntryId );
-    if( pEntry )
-        return pEntry->maImage;
-    else
-    {
-        static Image aEmptyImage;
-        return aEmptyImage;
-    }
-}
-
-void ToolbarMenu::initWindow()
-{
-    const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
-
-    SetPointFont( rStyleSettings.GetMenuFont() );
-    SetBackground( Wallpaper( rStyleSettings.GetMenuColor() ) );
-    SetTextColor( rStyleSettings.GetMenuTextColor() );
-    SetTextFillColor();
-    SetLineColor();
-
-    maSize = implCalcSize();
-}
-
-Size ToolbarMenu::implCalcSize()
-{
-    const long nFontHeight = GetTextHeight();
-    long nExtra = nFontHeight/4;
-
-    Size aSz;
-    Size aMaxImgSz;
-    long nMaxTextWidth = 0;
-    long nMinMenuItemHeight = nFontHeight;
-    sal_Bool bCheckable = sal_False;
-
-    const int nEntryCount = maEntryVector.size();
-    int nEntry;
-
-    const StyleSettings& rSettings = GetSettings().GetStyleSettings();
-    if ( rSettings.GetUseImagesInMenus() )
-    {
-        nMinMenuItemHeight = 16;
-
-        for( nEntry = 0; nEntry < nEntryCount; nEntry++ )
-        {
-            ToolbarMenuEntry* pEntry = maEntryVector[nEntry];
-            if( pEntry && pEntry->mbHasImage )
-            {
-                Size aImgSz = pEntry->maImage.GetSizePixel();
-                if ( aImgSz.Height() > aMaxImgSz.Height() )
-                    aMaxImgSz.Height() = aImgSz.Height();
-                if ( aImgSz.Height() > nMinMenuItemHeight )
-                    nMinMenuItemHeight = aImgSz.Height();
-                break;
-            }
-        }
-    }
-
-    for( nEntry = 0; nEntry < nEntryCount; nEntry++ )
-    {
-        ToolbarMenuEntry* pEntry = maEntryVector[nEntry];
-
-        if( pEntry )
-        {
-            pEntry->maSize.Height() = 0;
-            pEntry->maSize.Width() = 0;
-
-
-            if ( ( pEntry->mnBits ) & ( MIB_RADIOCHECK | MIB_CHECKABLE ) )
-                bCheckable = sal_True;
-
-            // Image:
-            if( pEntry->mbHasImage )
-            {
-                Size aImgSz = pEntry->maImage.GetSizePixel();
-                if ( (aImgSz.Width() + 4) > aMaxImgSz.Width() )
-                    aMaxImgSz.Width() = aImgSz.Width() + 4;
-                if ( (aImgSz.Height() + 4) > aMaxImgSz.Height() )
-                    aMaxImgSz.Height() = aImgSz.Height() + 4;
-                if ( (aImgSz.Height() + 4) > pEntry->maSize.Height() )
-                    pEntry->maSize.Height() = aImgSz.Height() + 4;
-            }
-        }
-    }
-
-    int gfxExtra = Max( nExtra, 7L );
-
-    mnCheckPos = nExtra;
-//  mnImagePos = mnCheckPos + nFontHeight/2 + gfxExtra;
-    mnImagePos = nExtra;
-    mnTextPos = mnImagePos + aMaxImgSz.Width();
-
-    for( nEntry = 0; nEntry < nEntryCount; nEntry++ )
-    {
-        ToolbarMenuEntry* pEntry = maEntryVector[nEntry];
-
-        if( pEntry )
-        {
-            // Text:
-            if( pEntry->mbHasText )
-            {
-                long nTextWidth = GetCtrlTextWidth( pEntry->maText );
-                if ( nTextWidth > nMaxTextWidth )
-                    nMaxTextWidth = nTextWidth;
-                long nTextHeight = GetTextHeight();
-
-                pEntry->maSize.Height() = Max( Max( nTextHeight, pEntry->maSize.Height() ), nMinMenuItemHeight );
-            }
-
-            // Control:
-            if( pEntry->mpControl )
-            {
-                long nTextWidth = pEntry->mbHasText ? GetCtrlTextWidth( pEntry->maText ) : -mnTextPos;
-
-                Size aControlSize( pEntry->mpControl->GetOutputSizePixel() );
-
-                if( nTextWidth )
-                    nTextWidth += nExtra;
-
-                nTextWidth += aControlSize.Width();
-
-                if ( nTextWidth > nMaxTextWidth )
-                    nMaxTextWidth = nTextWidth;
-
-                if ( aControlSize.Height() > pEntry->maSize.Height() )
-                    pEntry->maSize.Height() = aControlSize.Height();
-            }
-
-            pEntry->maSize.Height() += EXTRAITEMHEIGHT;
-
-            aSz.Height() += pEntry->maSize.Height();
-        }
-        else
-        {
-            aSz.Height() += SEPARATOR_HEIGHT;
-        }
-    }
-
-    if ( aMaxImgSz.Width() )
-        mnTextPos += gfxExtra;
-    if ( bCheckable )
-        mnTextPos += 16;
-
-
-    aSz.Width() = mnTextPos + nMaxTextWidth;
-    aSz.Width() += 2*nExtra;
-
-    // positionate controls
-    int nY = 0;
-    for( nEntry = 0; nEntry < nEntryCount; nEntry++ )
-    {
-        ToolbarMenuEntry* pEntry = maEntryVector[nEntry];
-
-        if( pEntry )
-        {
-            if( pEntry->mpControl )
-            {
-                Size aControlSize( pEntry->mpControl->GetOutputSizePixel() );
-                Point aControlPos( pEntry->mbHasText ? mnTextPos : ( aSz.Width() - aControlSize.Width() ) / 2, nY);
-                if( pEntry->mbHasText )
-                    aControlPos.X() += GetCtrlTextWidth( pEntry->maText ) + 4*gfxExtra;
-
-                pEntry->mpControl->SetPosPixel( aControlPos );
-            }
-
-            nY += pEntry->maSize.Height();
-        }
-        else
-        {
-            nY += SEPARATOR_HEIGHT;
-        }
-    }
-
-    return aSz;
-}
-
-void ToolbarMenu::GetFocus()
-{
-/*
-    if( mnHighlightedEntry == -1 )
-    {
-        implChangeHighlightEntry( 0 );
-    }
-*/
-    Control::GetFocus();
-}
-
-void ToolbarMenu::LoseFocus()
-{
-    if( mnHighlightedEntry != -1 )
-    {
-        implChangeHighlightEntry( -1 );
-    }
-    Control::LoseFocus();
-}
-
-void ToolbarMenu::appendEntry( int nEntryId, const String& rStr, MenuItemBits nItemBits )
-{
-    appendEntry( new ToolbarMenuEntry( nEntryId, rStr, nItemBits ) );
-}
-
-void ToolbarMenu::appendEntry( int nEntryId, const Image& rImage, MenuItemBits nItemBits )
-{
-    appendEntry( new ToolbarMenuEntry( nEntryId, rImage, nItemBits ) );
-}
-
-void ToolbarMenu::appendEntry( int nEntryId, const String& rStr, const Image& rImage, MenuItemBits nItemBits )
-{
-    appendEntry( new ToolbarMenuEntry( nEntryId, rImage, rStr, nItemBits ) );
-}
-
-void ToolbarMenu::appendEntry( int nEntryId, Control* pControl, MenuItemBits nItemBits )
-{
-    appendEntry( new ToolbarMenuEntry( nEntryId, pControl, nItemBits ) );
-}
-
-void ToolbarMenu::appendEntry( int nEntryId, const String& rStr, Control* pControl, MenuItemBits nItemBits )
-{
-    appendEntry( new ToolbarMenuEntry( nEntryId, rStr, pControl, nItemBits ) );
-}
-
-void ToolbarMenu::appendEntry( ToolbarMenuEntry* pEntry )
-{
-    maEntryVector.push_back( pEntry );
-    maSize = implCalcSize();
-    if( IsVisible() )
-        Invalidate();
-}
-
-void ToolbarMenu::appendSeparator()
-{
-    appendEntry( 0 );
-}
-
-void ToolbarMenu::Resize()
-{
-    Window::Resize();
-}
-
-ToolbarMenuEntry* ToolbarMenu::implGetEntry( int nEntry ) const
-{
-    if( (nEntry < 0) || (nEntry >= (int)maEntryVector.size() ) )
-        return NULL;
-
-    return maEntryVector[nEntry];
-}
-
-ToolbarMenuEntry* ToolbarMenu::implSearchEntry( int nEntryId ) const
-{
-    const int nEntryCount = maEntryVector.size();
-    int nEntry;
-    for( nEntry = 0; nEntry < nEntryCount; nEntry++ )
-    {
-        ToolbarMenuEntry* p = maEntryVector[nEntry];
-        if( p && p->mnEntryId == nEntryId )
-        {
-            return p;
-        }
-    }
-
-    return NULL;
-}
-
-void ToolbarMenu::implHighlightEntry( int nHighlightEntry, bool bHighlight )
-{
-    Size    aSz = GetOutputSizePixel();
-    long    nY = 0;
-    long    nX = 0;
-
-    const int nEntryCount = maEntryVector.size();
-    int nEntry;
-    for( nEntry = 0; nEntry < nEntryCount; nEntry++ )
-    {
-        ToolbarMenuEntry* p = maEntryVector[nEntry];
-        if( p )
-        {
-            if(nEntry == nHighlightEntry)
-            {
-//              bool bRestoreLineColor = false;
-                Color oldLineColor;
-/*
-                if( bHighlight && ((p->mpControl == NULL) || (p->mbHasText)) )
-                {
-                    if( p->mbEnabled )
-                    {
-                        SetFillColor( GetSettings().GetStyleSettings().GetMenuHighlightColor() );
-                    }
-                    else
-                    {
-                        SetFillColor();
-                        oldLineColor = GetLineColor();
-                        SetLineColor( GetSettings().GetStyleSettings().GetMenuHighlightColor() );
-                        bRestoreLineColor = true;
-                    }
-                }
-                else
-*/
-                    SetFillColor( GetSettings().GetStyleSettings().GetMenuColor() );
-
-                Rectangle aRect( Point( nX, nY ), Size( aSz.Width(), p->maSize.Height() ) );
-                if( p->mnBits & MIB_POPUPSELECT )
-                {
-                    long nFontHeight = GetTextHeight();
-                    aRect.Right() -= nFontHeight + nFontHeight/4;
-                }
-                DrawRect( aRect );
-                implPaint( p, bHighlight );
-
-                if( bHighlight && ((p->mpControl == NULL) || (p->mbHasText)) )
-                {
-                    aRect.nLeft += 1;
-                    aRect.nTop += 1;
-                    aRect.nBottom -= 1;
-                    aRect.nRight -= 1;
-                    DrawSelectionBackground( aRect, true, false, TRUE, TRUE );
-                }
-/*
-                if( bRestoreLineColor )
-                    SetLineColor( oldLineColor );
-*/
-                maHighlightHdl.Call( this );
-                break;
-            }
-
-            nY += p->maSize.Height();
-        }
-        else
-        {
-            nY += SEPARATOR_HEIGHT;
-        }
-    }
-}
-
-void ToolbarMenu::implSelectEntry( int nSelectedEntry )
-{
-    mnSelectedEntry = nSelectedEntry;
-
-    ToolbarMenuEntry* pEntry = NULL;
-    if( nSelectedEntry != -1 )
-        pEntry = maEntryVector[ nSelectedEntry ];
-
-    if( pEntry )
-        maSelectHdl.Call( this );
-}
-
-void ToolbarMenu::MouseButtonDown( const MouseEvent& rMEvt )
-{
-    implHighlightEntry( rMEvt, true );
-
-    implSelectEntry( mnHighlightedEntry );
-}
-
-void ToolbarMenu::MouseButtonUp( const MouseEvent& )
-{
-}
-
-void ToolbarMenu::MouseMove( const MouseEvent& rMEvt )
-{
-    if ( !IsVisible() )
-        return;
-
-    implHighlightEntry( rMEvt, false );
-}
-
-void ToolbarMenu::implHighlightEntry( const MouseEvent& rMEvt, bool bMBDown )
-{
-    long nY = 0;
-    long nMouseY = rMEvt.GetPosPixel().Y();
-    Size aOutSz = GetOutputSizePixel();
-    if ( ( nMouseY >= 0 ) && ( nMouseY < aOutSz.Height() ) )
-    {
-        bool bHighlighted = FALSE;
-
-        const int nEntryCount = maEntryVector.size();
-        int nEntry;
-        for( nEntry = 0; nEntry < nEntryCount; nEntry++ )
-        {
-            ToolbarMenuEntry* pEntry = maEntryVector[nEntry];
-            if( pEntry )
-            {
-                long nOldY = nY;
-                nY += pEntry->maSize.Height();
-                if ( ( nOldY <= nMouseY ) && ( nY > nMouseY ) )
-                {
-                    if( bMBDown )
-                    {
-                        if( nEntry != mnHighlightedEntry )
-                        {
-                            implChangeHighlightEntry( nEntry );
-                        }
-                    }
-                    else
-                    {
-                        if ( nEntry != mnHighlightedEntry )
-                        {
-                            implChangeHighlightEntry( nEntry );
-                        }
-                    }
-                    bHighlighted = true;
-                }
-            }
-            else
-            {
-                nY += SEPARATOR_HEIGHT;
-            }
-        }
-        if ( !bHighlighted )
-            implChangeHighlightEntry( -1 );
-    }
-    else
-    {
-        implChangeHighlightEntry( -1 );
-    }
-}
-
-void ToolbarMenu::implChangeHighlightEntry( int nEntry )
-{
-    if( mnHighlightedEntry != -1 )
-    {
-        implHighlightEntry( mnHighlightedEntry, false );
-    }
-
-    mnHighlightedEntry = nEntry;
-    if( mnHighlightedEntry != -1 )
-    {
-        implHighlightEntry( mnHighlightedEntry, true );
-    }
-}
-
-ToolbarMenuEntry* ToolbarMenu::implCursorUpDown( bool bUp, bool bHomeEnd )
-{
-    int n = mnHighlightedEntry;
-    if( n == -1 )
-    {
-        if( bUp )
-            n = 0;
-        else
-            n = maEntryVector.size()-1;
-    }
-
-    int nLoop = n;
-
-    if( bHomeEnd )
-    {
-        // absolute positioning
-        if( bUp )
-        {
-            n = maEntryVector.size();
-            nLoop = n-1;
-        }
-        else
-        {
-            n = -1;
-            nLoop = n+1;
-        }
-    }
-
-    do
-    {
-        if( bUp )
-        {
-            if ( n )
-                n--;
-            else
-                if( mnHighlightedEntry == -1 )
-                    n = maEntryVector.size()-1;
-//                else
-//                    break;
-        }
-        else
-        {
-            if( n < ((int)maEntryVector.size()-1) )
-                n++;
-            else
-                if( mnHighlightedEntry == -1 )
-                    n = 0;
-//                else
-//                    break;
-        }
-
-        ToolbarMenuEntry* pData = maEntryVector[n];
-        if( pData )
-        {
-            implChangeHighlightEntry( n );
-            return pData;
-        }
-    } while ( n != nLoop );
-
-    return 0;
-}
-
-void ToolbarMenu::KeyInput( const KeyEvent& rKEvent )
-{
-    USHORT nCode = rKEvent.GetKeyCode().GetCode();
-    switch ( nCode )
-    {
-        case KEY_UP:
-        case KEY_DOWN:
-        {
-            int nOldEntry = mnHighlightedEntry;
-            ToolbarMenuEntry*p = implCursorUpDown( nCode == KEY_UP, false );
-            if( p && p->mpControl && !p->mbHasText )
-            {
-                p->mpControl->GrabFocus();
-                if( nOldEntry != mnHighlightedEntry )
-                {
-                    KeyCode aKeyCode( (nCode == KEY_UP) ? KEY_END : KEY_HOME );
-                    KeyEvent aKeyEvent( 0, aKeyCode );
-                    p->mpControl->KeyInput( aKeyEvent );
-                }
-            }
-        }
-        break;
-        case KEY_END:
-        case KEY_HOME:
-        {
-            ToolbarMenuEntry* p = implCursorUpDown( nCode == KEY_END, true );
-            if( p && p->mpControl && !p->mbHasText )
-            {
-                p->mpControl->GrabFocus();
-                KeyCode aKeyCode( KEY_HOME );
-                KeyEvent aKeyEvent( 0, aKeyCode );
-                p->mpControl->KeyInput( aKeyEvent );
-            }
-        }
-        break;
-        case KEY_F6:
-        case KEY_ESCAPE:
-        {
-            // Ctrl-F6 acts like ESC here, the menu bar however will then put the focus in the document
-            if( nCode == KEY_F6 && !rKEvent.GetKeyCode().IsMod1() )
-                break;
-
-            implSelectEntry( -1 );
-/*
-            if ( !pMenu->pStartedFrom )
-            {
-                StopExecute();
-                KillActivePopup();
-            }
-            else if ( pMenu->pStartedFrom->bIsMenuBar )
-            {
-                // Forward...
-                ((MenuBarWindow*)((MenuBar*)pMenu->pStartedFrom)->ImplGetWindow())->KeyInput( rKEvent );
-            }
-            else
-            {
-                StopExecute();
-                ToolbarMenu* pFloat = ((PopupMenu*)pMenu->pStartedFrom)->ImplGetFloatingWindow();
-                pFloat->GrabFocus();
-                pFloat->KillActivePopup();
-            }
-*/
-        }
-        break;
-
-        case KEY_RETURN:
-        {
-            ToolbarMenuEntry* pEntry = implGetEntry( mnHighlightedEntry );
-            if ( pEntry && pEntry->mbEnabled )
-            {
-                if( pEntry->mpControl )
-                {
-                    pEntry->mpControl->GrabFocus();
-                }
-                else
-                {
-                    implSelectEntry( mnHighlightedEntry );
-                }
-            }
-  //          else
-  //              StopExecute();
-        }
-        break;
-        default:
-        {
-/*
-            xub_Unicode nCharCode = rKEvent.GetCharCode();
-            USHORT nPos;
-            USHORT nDuplicates = 0;
-            MenuItemData* pData = nCharCode ? pMenu->GetItemList()->SearchItem( nCharCode, nPos, nDuplicates, nHighlightedItem ) : NULL;
-            if ( pData )
-            {
-                if ( pData->pSubMenu || nDuplicates > 1 )
-                {
-                    implChangeHighlightEntry( nPos );
-                    HighlightChanged( 0 );
-                }
-                else
-                {
-                    nHighlightedItem = nPos;
-                    EndExecute();
-                }
-            }
-            else
-            {
-                // Bei ungueltigen Tasten Beepen, aber nicht bei HELP und F-Tasten
-                if ( !rKEvent.GetKeyCode().IsControlMod() && ( nCode != KEY_HELP ) && ( rKEvent.GetKeyCode().GetGroup() != KEYGROUP_FKEYS ) )
-                    Sound::Beep();
-                FloatingWindow::KeyInput( rKEvent );
-            }
-    */
-        }
-    }
-}
-
-void ToolbarMenu::implPaint( ToolbarMenuEntry* pThisOnly, bool bHighlighted )
-{
-    const long nFontHeight = GetTextHeight();
-    const long nExtra = nFontHeight/4;
-
-    DecorationView aDecoView( this );
-    const StyleSettings& rSettings = GetSettings().GetStyleSettings();
-
-    const Size aOutSz( GetOutputSizePixel() );
-//    const long nMaxY = aOutSz.Height();
-
-    Point aTopLeft, aTmpPos;
-
-    const int nEntryCount = maEntryVector.size();
-    int nEntry;
-    for( nEntry = 0; nEntry < nEntryCount; nEntry++ )
-    {
-        ToolbarMenuEntry* pEntry = maEntryVector[nEntry];
-        Point aPos( aTopLeft );
-
-        USHORT  nTextStyle   = 0;
-        USHORT  nSymbolStyle = 0;
-        USHORT  nImageStyle  = 0;
-        if( pEntry && !pEntry->mbEnabled )
-        {
-            nTextStyle   |= TEXT_DRAW_DISABLE;
-            nSymbolStyle |= SYMBOL_DRAW_DISABLE;
-            nImageStyle  |= IMAGE_DRAW_DISABLE;
-        }
-
-        // Separator
-        if( pEntry == NULL )
-        {
-            if( pThisOnly == NULL  )
-            {
-                aTmpPos.Y() = aPos.Y() + ((SEPARATOR_HEIGHT-2)/2);
-                aTmpPos.X() = aPos.X() + 2;
-
-                SetLineColor( rSettings.GetShadowColor() );
-                DrawLine( aTmpPos, Point( aOutSz.Width() - 3, aTmpPos.Y() ) );
-                aTmpPos.Y()++;
-                SetLineColor( rSettings.GetLightColor() );
-                DrawLine( aTmpPos, Point( aOutSz.Width() - 3, aTmpPos.Y() ) );
-                SetLineColor();
-            }
-
-            aTopLeft.Y() += SEPARATOR_HEIGHT;
-        }
-        else
-        {
-            if( !pThisOnly || ( pEntry == pThisOnly ) )
-            {
-                if( pThisOnly && bHighlighted )
-                    SetTextColor( rSettings.GetMenuHighlightTextColor() );
-
-                long nTextOffsetY = ((pEntry->maSize.Height()-nFontHeight)/2);
-
-                // Image
-                if( pEntry->mbHasImage )
-                {
-                    aTmpPos.X() = aPos.X() + mnImagePos;
-                    aTmpPos.Y() = aPos.Y();
-                    aTmpPos.Y() += (pEntry->maSize.Height()-pEntry->maImage.GetSizePixel().Height())/2;
-                    DrawImage( aTmpPos, pEntry->maImage, nImageStyle );
-                }
-                // Text:
-                if( pEntry->mbHasText )
-                {
-                    aTmpPos.X() = aPos.X() + mnTextPos;
-                    aTmpPos.Y() = aPos.Y();
-                    aTmpPos.Y() += nTextOffsetY;
-                    USHORT nStyle = nTextStyle|TEXT_DRAW_MNEMONIC;
-
-                    DrawCtrlText( aTmpPos, pEntry->maText, 0, pEntry->maText.Len(), nStyle );
-                }
-                // CheckMark
-                if( pEntry->mbChecked )
-                {
-                    if( pEntry->mbHasImage )
-                    {
-                        aTmpPos.X() = aPos.X() + mnImagePos;
-                        aTmpPos.Y() = aPos.Y();
-                        aTmpPos.Y() += (pEntry->maSize.Height()-pEntry->maImage.GetSizePixel().Height())/2;
-
-                        Rectangle aRect( aTmpPos, pEntry->maImage.GetSizePixel() );
-                        aRect.nLeft -= 2;
-                        aRect.nTop -= 2;
-                        aRect.nRight += 2;
-                        aRect.nBottom += 2;
-                        DrawSelectionBackground( aRect, false, true, TRUE, TRUE );
-                    }
-                    else
-                    {
-                        Rectangle aRect;
-                        SymbolType eSymbol;
-                        aTmpPos.Y() = aPos.Y();
-                        aTmpPos.Y() += nExtra/2;
-                        aTmpPos.Y() += pEntry->maSize.Height() / 2;
-                        if ( pEntry->mnBits & MIB_RADIOCHECK )
-                        {
-                            aTmpPos.X() = aPos.X() + mnCheckPos;
-                            eSymbol = SYMBOL_RADIOCHECKMARK;
-                            aTmpPos.Y() -= nFontHeight/4;
-                            aRect = Rectangle( aTmpPos, Size( nFontHeight/2, nFontHeight/2 ) );
-                        }
-                        else
-                        {
-                            aTmpPos.X() = aPos.X() + mnCheckPos;
-                            eSymbol = SYMBOL_CHECKMARK;
-                            aTmpPos.Y() -= nFontHeight/4;
-                            aRect = Rectangle( aTmpPos, Size( (nFontHeight*25)/40, nFontHeight/2 ) );
-                        }
-                        aDecoView.DrawSymbol( aRect, eSymbol, GetTextColor(), nSymbolStyle );
-                    }
-                }
-
-                if( pThisOnly && bHighlighted )
-                    SetTextColor( rSettings.GetMenuTextColor() );
-            }
-
-            aTopLeft.Y() += pEntry->maSize.Height();
-        }
-    }
-}
-
-void ToolbarMenu::Paint( const Rectangle& )
-{
-    implPaint();
-
-    if( mnHighlightedEntry != -1 )
-        implHighlightEntry( mnHighlightedEntry, true );
-}
-
-void ToolbarMenu::RequestHelp( const HelpEvent& rHEvt )
-{
-    Window::RequestHelp( rHEvt );
-}
-
-void ToolbarMenu::StateChanged( StateChangedType nType )
-{
-    Control::StateChanged( nType );
-
-    if ( ( nType == STATE_CHANGE_CONTROLFOREGROUND ) || ( nType == STATE_CHANGE_CONTROLBACKGROUND ) )
-    {
-        initWindow();
-        Invalidate();
-    }
-}
-
-void ToolbarMenu::DataChanged( const DataChangedEvent& rDCEvt )
-{
-    Control::DataChanged( rDCEvt );
-
-    if ( (rDCEvt.GetType() == DATACHANGED_FONTS) ||
-         (rDCEvt.GetType() == DATACHANGED_FONTSUBSTITUTION) ||
-         ((rDCEvt.GetType() == DATACHANGED_SETTINGS) &&
-          (rDCEvt.GetFlags() & SETTINGS_STYLE)) )
-    {
-        initWindow();
-        Invalidate();
-    }
-}
-
-void ToolbarMenu::Command( const CommandEvent& rCEvt )
-{
-    if ( rCEvt.GetCommand() == COMMAND_WHEEL )
-    {
-        const CommandWheelData* pData = rCEvt.GetWheelData();
-        if( !pData->GetModifier() && ( pData->GetMode() == COMMAND_WHEEL_SCROLL ) )
-        {
-            implCursorUpDown( pData->GetDelta() > 0L, false );
-        }
-    }
-}
diff --git a/svx/source/tbxctrls/toolbarmenu.hxx b/svx/source/tbxctrls/toolbarmenu.hxx
deleted file mode 100644
index 30f56c92b943..000000000000
--- a/svx/source/tbxctrls/toolbarmenu.hxx
+++ /dev/null
@@ -1,90 +0,0 @@
-#include <vcl/ctrl.hxx>
-
-#include <vector>
-
-class ToolbarMenuEntry;
-typedef std::vector< ToolbarMenuEntry * > ToolbarMenuEntryVector;
-
-class ToolbarMenu : public Control
-{
-private:
-    ToolbarMenuEntryVector  maEntryVector;
-
-    int mnCheckPos;
-    int mnImagePos;
-    int mnTextPos;
-
-    int mnHighlightedEntry;
-    int mnSelectedEntry;
-
-    Size maSize;
-
-    Link            maHighlightHdl;
-    Link            maSelectHdl;
-
-    void            StateChanged( StateChangedType nType );
-    void            DataChanged( const DataChangedEvent& rDCEvt );
-
-    void            initWindow();
-
-    Size            implCalcSize();
-
-    void            appendEntry( ToolbarMenuEntry* pEntry );
-
-    void            implPaint( ToolbarMenuEntry* pThisOnly = NULL, bool bHighlight = false );
-
-    void            implHighlightEntry( int nHighlightEntry, bool bHighlight );
-    void            implHighlightEntry( const MouseEvent& rMEvt, bool bMBDown );
-
-    void            implChangeHighlightEntry( int nEntry );
-    void            implSelectEntry( int nSelectedEntry );
-
-    ToolbarMenuEntry*   implCursorUpDown( bool bUp, bool bHomeEnd );
-    ToolbarMenuEntry*   implGetEntry( int nEntry ) const;
-    ToolbarMenuEntry*   implSearchEntry( int nEntryId ) const;
-
-public:
-                    ToolbarMenu( Window* pParent, WinBits nStyle );
-                    ~ToolbarMenu();
-
-    virtual void    MouseMove( const MouseEvent& rMEvt );
-    virtual void    MouseButtonDown( const MouseEvent& rMEvt );
-    virtual void    MouseButtonUp( const MouseEvent& rMEvt );
-    virtual void    KeyInput( const KeyEvent& rKEvent );
-    virtual void    Command( const CommandEvent& rCEvt );
-    virtual void    Paint( const Rectangle& rRect );
-    virtual void    RequestHelp( const HelpEvent& rHEvt );
-    virtual void    Resize();
-    virtual void    GetFocus();
-    virtual void    LoseFocus();
-
-    void            appendEntry( int nEntryId, const String& rStr, MenuItemBits nItemBits = 0 );
-    void            appendEntry( int nEntryId, const Image& rImage, MenuItemBits nItemBits = 0 );
-    void            appendEntry( int nEntryId, const String& rStr, const Image& rImage, MenuItemBits nItemBits = 0 );
-    void            appendEntry( int nEntryId, Control* pControl, MenuItemBits nItemBits = 0 );
-    void            appendEntry( int nEntryId, const String& rStr, Control* pControl, MenuItemBits nItemBits = 0 );
-    void            appendSeparator();
-
-    void            checkEntry( int nEntryId, bool bCheck = true );
-    bool            isEntryChecked( int nEntryId ) const;
-
-    void            enableEntry( int nEntryId, bool bEnable = true );
-    bool            isEntryEnabled( int nEntryId ) const;
-
-    void            setEntryText( int nEntryId, const String& rStr );
-    const String&   getEntryText( int nEntryId ) const;
-
-    void            setEntryImage( int nEntryId, const Image& rImage );
-    const Image&    getEntryImage( int nEntryId ) const;
-
-    const Size&     getMenuSize() const { return maSize; }
-
-    void            SetHighlightHdl( const Link& rLink )    { maHighlightHdl = rLink; }
-    const Link&     GetHighlightHdl() const                 { return maHighlightHdl; }
-
-    void            SetSelectHdl( const Link& rLink )       { maSelectHdl = rLink; }
-    const Link&     GetSelectHdl() const                    { return maSelectHdl; }
-
-    int             getSelectedEntryId() const;
-    int             getHighlightedEntryId() const;
-};
diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx
index daf1f23d4442..3005289268b9 100644
--- a/svx/source/toolbars/extrusionbar.cxx
+++ b/svx/source/toolbars/extrusionbar.cxx
@@ -53,7 +53,8 @@
 #include "chrtitem.hxx"
 
 #include <svx/extrusionbar.hxx>
-#include "extrusioncontrols.hxx"
+#include "extrusiondepthdialog.hxx"
+
 
 using namespace ::svx;
 using namespace ::rtl;
diff --git a/svx/source/unodraw/unoctabl.cxx b/svx/source/unodraw/unoctabl.cxx
index 5dd4814c6ab5..8b4351cc8df0 100644
--- a/svx/source/unodraw/unoctabl.cxx
+++ b/svx/source/unodraw/unoctabl.cxx
@@ -233,9 +233,7 @@ uno::Reference< uno::XInterface > SAL_CALL create_EnhancedCustomShapeEngine( con
 // export this service
 //
 
-#ifndef SVX_LIGHT
 #include "UnoGraphicExporter.hxx"
-#endif
 #include "unogalthemeprovider.hxx"
 #include <com/sun/star/registry/XRegistryKey.hpp>
 #include "sal/types.h"
@@ -244,6 +242,15 @@ uno::Reference< uno::XInterface > SAL_CALL create_EnhancedCustomShapeEngine( con
 #include "uno/lbnames.h"
 #include <svx/sdr/primitive2d/primitiveFactory2d.hxx>
 
+/*
+namespace svx
+{
+extern OUString SAL_CALL ExtrusionDepthController_getImplementationName();
+extern uno::Reference< uno::XInterface > SAL_CALL ExtrusionDepthController_createInstance(const uno::Reference< lang::XMultiServiceFactory > &)  throw( uno::RuntimeException );
+extern uno::Sequence< OUString > SAL_CALL ExtrusionDepthController_getSupportedServiceNames() throw( uno::RuntimeException );
+}
+*/
+
 extern "C"
 {
 
@@ -279,9 +286,7 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo (
             writeInfo( pKey, SvxUnoColorTable::getImplementationName_Static(), SvxUnoColorTable::getSupportedServiceNames_Static() );
             writeInfo( pKey, EnhancedCustomShapeEngine_getImplementationName(), EnhancedCustomShapeEngine_getSupportedServiceNames() );
             writeInfo( pKey, svx::RecoveryUI::st_getImplementationName(), svx::RecoveryUI::st_getSupportedServiceNames() );
-#ifndef SVX_LIGHT
             writeInfo( pKey, svx::GraphicExporter_getImplementationName(), svx::GraphicExporter_getSupportedServiceNames() );
-#endif
             writeInfo( pKey, svx::FontHeightToolBoxControl::getImplementationName_Static(), svx::FontHeightToolBoxControl::getSupportedServiceNames_Static() );
             writeInfo( pKey, ::unogallery::GalleryThemeProvider_getImplementationName(),::unogallery::GalleryThemeProvider_getSupportedServiceNames() );
 
@@ -292,6 +297,7 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo (
 
             writeInfo( pKey, ::svx::SvXMLGraphicImportHelper_getImplementationName(),::svx::SvXMLGraphicImportHelper_getSupportedServiceNames() );
             writeInfo( pKey, ::svx::SvXMLGraphicExportHelper_getImplementationName(),::svx::SvXMLGraphicExportHelper_getSupportedServiceNames() );
+//          writeInfo( pKey, ::svx::ExtrusionDepthController_getImplementationName(),::svx::ExtrusionDepthController_getSupportedServiceNames() );
         }
         catch (registry::InvalidRegistryException &)
         {
@@ -338,7 +344,6 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory (
                 svx::RecoveryUI::st_createInstance,
                 svx::RecoveryUI::st_getSupportedServiceNames() );
         }
-#ifndef SVX_LIGHT
         else if( svx::GraphicExporter_getImplementationName().equalsAscii( pImplName ) )
         {
             xFactory = ::cppu::createSingleFactory( reinterpret_cast< lang::XMultiServiceFactory * >( pServiceManager ),
@@ -346,7 +351,6 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory (
                 svx::GraphicExporter_createInstance,
                 svx::GraphicExporter_getSupportedServiceNames() );
         }
-#endif
         else if ( svx::FontHeightToolBoxControl::getImplementationName_Static().equalsAscii( pImplName ) )
         {
             xFactory = createSingleFactory( reinterpret_cast< lang::XMultiServiceFactory * >( pServiceManager ),
@@ -385,7 +389,16 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory (
                 ::svx::SvXMLGraphicExportHelper_createInstance,
                 ::svx::SvXMLGraphicExportHelper_getSupportedServiceNames() );
         }
-
+/*
+        else if( ::svx::ExtrusionDepthController_getImplementationName().equalsAscii( pImplName ) )
+        {
+            xFactory = ::cppu::createSingleFactory(
+                reinterpret_cast< lang::XMultiServiceFactory * >( pServiceManager ),
+                ::svx::ExtrusionDepthController_getImplementationName(),
+                ::svx::ExtrusionDepthController_createInstance,
+                ::svx::ExtrusionDepthController_getSupportedServiceNames() );
+        }
+*/
         if( xFactory.is())
         {
             xFactory->acquire();
diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx
index 9fea6a6fda5d..9d5e1695c5cb 100644
--- a/svx/source/unodraw/unopage.cxx
+++ b/svx/source/unodraw/unopage.cxx
@@ -654,11 +654,17 @@ void SvxDrawPage::GetTypeAndInventor( sal_uInt16& rType, sal_uInt32& rInventor,
 
     if( nTempType == UHASHMAP_NOTFOUND )
     {
-        if( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.TableShape")) )
+        if( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.TableShape")) ||
+            aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.TableShape")) )
         {
             rInventor = SdrInventor;
             rType = OBJ_TABLE;
         }
+        else if( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.MediaShape" )) )
+        {
+            rInventor = SdrInventor;
+            rType = OBJ_MEDIA;
+        }
     }
     else if(nTempType & E3D_INVENTOR_FLAG)
     {
diff --git a/svx/util/makefile.mk b/svx/util/makefile.mk
index 0006fa2ff5fe..050decc8d4f5 100644
--- a/svx/util/makefile.mk
+++ b/svx/util/makefile.mk
@@ -45,6 +45,10 @@ SHL1TARGET= svxcore$(DLLPOSTFIX)
 SHL1IMPLIB= isvxcore
 SHL1USE_EXPORTS=name
 
+SHL1OBJS= \
+    $(SLO)$/coreservices.obj
+
+
 SHL1LIBS= \
     $(SLB)$/animation.lib \
     $(SLB)$/attribute.lib \
diff --git a/xmloff/inc/xmloff/shapeexport.hxx b/xmloff/inc/xmloff/shapeexport.hxx
index 1b30658ef89c..b12f93f0b8b2 100644
--- a/xmloff/inc/xmloff/shapeexport.hxx
+++ b/xmloff/inc/xmloff/shapeexport.hxx
@@ -111,7 +111,8 @@ enum XmlShapeType
     XmlShapeTypePresPageShape,                      // "com.sun.star.presentation.PageShape"
     XmlShapeTypePresOLE2Shape,                      // "com.sun.star.presentation.OLE2Shape"
     XmlShapeTypePresChartShape,                     // "com.sun.star.presentation.ChartShape"
-    XmlShapeTypePresSheetShape,                     // "com.sun.star.presentation.OLE2Shape"
+    XmlShapeTypePresSheetShape,                     // "com.sun.star.presentation.CalcShape"
+    XmlShapeTypePresTableShape,                     // "com.sun.star.presentation.TableShape"
     XmlShapeTypePresOrgChartShape,                  // "com.sun.star.presentation.OrgChartShape"
     XmlShapeTypePresNotesShape,                     // "com.sun.star.presentation.NotesShape"
     XmlShapeTypeHandoutShape,                       // "com.sun.star.presentation.HandoutShape"
@@ -121,8 +122,9 @@ enum XmlShapeType
     XmlShapeTypePresSlideNumberShape,               // "com.sun.star.presentation.SlideNumberShape"
     XmlShapeTypePresDateTimeShape,                  // "com.sun.star.presentation.DateTimeShape"
 
-    XmlShapeTypeDrawCustomShape,                    // "com.sun.star.draw.CustomShape"
-    XmlShapeTypeDrawMediaShape,                     // "com.sun.star.draw.MediaShape"
+    XmlShapeTypeDrawCustomShape,                    // "com.sun.star.drawing.CustomShape"
+    XmlShapeTypeDrawMediaShape,                     // "com.sun.star.drawing.MediaShape"
+    XmlShapeTypePresMediaShape,                     // "com.sun.star.presentation.MediaShape"
 
     XmlShapeTypeDrawTableShape,                     // "com.sun.star.drawing.TableShape"
 
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index 709677c6ae07..ca85fe5cbac9 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -467,6 +467,7 @@ void XMLShapeExport::collectShapeAutoStyles(const uno::Reference< drawing::XShap
                 mrExport.getInterfaceToIdentifierMapper().registerReference( xConnection );
             break;
         }
+        case XmlShapeTypePresTableShape:
         case XmlShapeTypeDrawTableShape:
         {
             try
@@ -759,6 +760,7 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape
             break;
         }
 
+        case XmlShapeTypePresTableShape:
         case XmlShapeTypeDrawTableShape:
         {
             ImpExportTableShape( xShape, aShapeInfo.meShapeType, nFeatures, pRefPoint );
@@ -828,6 +830,7 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape
             break;
         }
 
+        case XmlShapeTypePresMediaShape:
         case XmlShapeTypeDrawMediaShape:
         {
             ImpExportMediaShape( xShape, aShapeInfo.meShapeType, nFeatures, pRefPoint );
@@ -1085,7 +1088,7 @@ void XMLShapeExport::ImpCalcShapeType(const uno::Reference< drawing::XShape >& x
                     // get info about presentation shape
                     uno::Reference <beans::XPropertySet> xPropSet(xShape, uno::UNO_QUERY);
 
-                    if(xPropSet.is())
+                    if(xPropSet.is()) try
                     {
                         rtl::OUString sCLSID;
                         if(xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("CLSID"))) >>= sCLSID)
@@ -1097,16 +1100,22 @@ void XMLShapeExport::ImpCalcShapeType(const uno::Reference< drawing::XShape >& x
                             }
                         }
                     }
+                    catch( uno::Exception& )
+                    {
+                        DBG_ERROR( "XMLShapeExport::ImpCalcShapeType(), expected ole shape to have the CLSID property?" );
+                    }
                 }
                 else if(aType.EqualsAscii("Chart", 26, 5)) { eShapeType = XmlShapeTypePresChartShape;  }
                 else if(aType.EqualsAscii("OrgChart", 26, 8)) { eShapeType = XmlShapeTypePresOrgChartShape;  }
-                else if(aType.EqualsAscii("TableShape", 26, 10)) { eShapeType = XmlShapeTypePresSheetShape; }
+                else if(aType.EqualsAscii("CalcShape", 26, 9)) { eShapeType = XmlShapeTypePresSheetShape; }
+                else if(aType.EqualsAscii("TableShape", 26, 10)) { eShapeType = XmlShapeTypePresTableShape; }
                 else if(aType.EqualsAscii("Notes", 26, 5)) { eShapeType = XmlShapeTypePresNotesShape;  }
                 else if(aType.EqualsAscii("HandoutShape", 26, 12)) { eShapeType = XmlShapeTypeHandoutShape; }
                 else if(aType.EqualsAscii("HeaderShape", 26, 11)) { eShapeType = XmlShapeTypePresHeaderShape; }
                 else if(aType.EqualsAscii("FooterShape", 26, 11)) { eShapeType = XmlShapeTypePresFooterShape; }
                 else if(aType.EqualsAscii("SlideNumberShape", 26, 16)) { eShapeType = XmlShapeTypePresSlideNumberShape; }
                 else if(aType.EqualsAscii("DateTimeShape", 26, 13)) { eShapeType = XmlShapeTypePresDateTimeShape; }
+                else if(aType.EqualsAscii("MediaShape", 26, 10)) { eShapeType = XmlShapeTypePresMediaShape; }
             }
         }
     }
diff --git a/xmloff/source/draw/shapeexport2.cxx b/xmloff/source/draw/shapeexport2.cxx
index fb1d15f57350..21097108ca29 100644
--- a/xmloff/source/draw/shapeexport2.cxx
+++ b/xmloff/source/draw/shapeexport2.cxx
@@ -1996,7 +1996,7 @@ void XMLShapeExport::ImpExportPluginShape(
 
 void XMLShapeExport::ImpExportMediaShape(
     const uno::Reference< drawing::XShape >& xShape,
-    XmlShapeType, sal_Int32 nFeatures, com::sun::star::awt::Point* pRefPoint)
+    XmlShapeType eShapeType, sal_Int32 nFeatures, com::sun::star::awt::Point* pRefPoint)
 {
     const uno::Reference< beans::XPropertySet > xPropSet(xShape, uno::UNO_QUERY);
     if(xPropSet.is())
@@ -2004,6 +2004,9 @@ void XMLShapeExport::ImpExportMediaShape(
         // Transformation
         ImpExportNewTrans(xPropSet, nFeatures, pRefPoint);
 
+        if(eShapeType == XmlShapeTypePresMediaShape)
+            ImpExportPresentationAttributes( xPropSet, GetXMLToken(XML_PRESENTATION_OBJECT) );
+
         sal_Bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210#
         SvXMLElementExport aElem( mrExport, XML_NAMESPACE_DRAW,
                                   XML_FRAME, bCreateNewline, sal_True );
diff --git a/xmloff/source/draw/shapeexport4.cxx b/xmloff/source/draw/shapeexport4.cxx
index 710d343ba42c..3f52fcd50084 100644
--- a/xmloff/source/draw/shapeexport4.cxx
+++ b/xmloff/source/draw/shapeexport4.cxx
@@ -1095,7 +1095,7 @@ void XMLShapeExport::ImpExportCustomShape(
     }
 }
 
-void XMLShapeExport::ImpExportTableShape( const uno::Reference< drawing::XShape >& xShape, XmlShapeType /*eShapeType*/, sal_Int32 nFeatures, com::sun::star::awt::Point* pRefPoint )
+void XMLShapeExport::ImpExportTableShape( const uno::Reference< drawing::XShape >& xShape, XmlShapeType eShapeType, sal_Int32 nFeatures, com::sun::star::awt::Point* pRefPoint )
 {
     uno::Reference< beans::XPropertySet > xPropSet(xShape, uno::UNO_QUERY);
     uno::Reference< container::XNamed > xNamed(xShape, uno::UNO_QUERY);
@@ -1109,8 +1109,8 @@ void XMLShapeExport::ImpExportTableShape( const uno::Reference< drawing::XShape
         sal_Bool bIsEmptyPresObj = sal_False;
 
         // presentation settings
-//      if(eShapeType == XmlShapeTypePresTableShape)
-//          bIsEmptyPresObj = ImpExportPresentationAttributes( xPropSet, GetXMLToken(XML_PRESENTATION_TABLE) );
+        if(eShapeType == XmlShapeTypePresTableShape)
+            bIsEmptyPresObj = ImpExportPresentationAttributes( xPropSet, GetXMLToken(XML_PRESENTATION_TABLE) );
 
         const bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 );
         const bool bExportEmbedded(0 != (mrExport.getExportFlags() & EXPORT_EMBEDDED));
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index f4e7c1466ecd..e8b5ba61ea8d 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -2548,7 +2548,7 @@ void SdXMLObjectShapeContext::StartElement( const ::com::sun::star::uno::Referen
         }
         else if( IsXMLToken( maPresentationClass, XML_PRESENTATION_TABLE ) )
         {
-            pService = "com.sun.star.presentation.TableShape";
+            pService = "com.sun.star.presentation.CalcShape";
         }
         else if( IsXMLToken( maPresentationClass, XML_PRESENTATION_OBJECT ) )
         {
@@ -2905,8 +2905,21 @@ void SdXMLPluginShapeContext::StartElement( const ::com::sun::star::uno::Referen
 
     const char* pService;
 
+    sal_Bool bIsPresShape = sal_False;
+
     if( mbMedia )
+    {
         pService = "com.sun.star.drawing.MediaShape";
+
+        bIsPresShape = maPresentationClass.getLength() && GetImport().GetShapeImport()->IsPresentationShapesSupported();
+        if( bIsPresShape )
+        {
+            if( IsXMLToken( maPresentationClass, XML_PRESENTATION_OBJECT ) )
+            {
+                pService = "com.sun.star.presentation.MediaShape";
+            }
+        }
+    }
     else
         pService = "com.sun.star.drawing.PluginShape";
 
@@ -2916,6 +2929,23 @@ void SdXMLPluginShapeContext::StartElement( const ::com::sun::star::uno::Referen
     {
         SetLayer();
 
+        if(bIsPresShape)
+        {
+            uno::Reference< beans::XPropertySet > xProps( mxShape, uno::UNO_QUERY );
+            if(xProps.is())
+            {
+                uno::Reference< beans::XPropertySetInfo > xPropsInfo( xProps->getPropertySetInfo() );
+                if( xPropsInfo.is() )
+                {
+                    if( !mbIsPlaceholder && xPropsInfo->hasPropertyByName(OUString(RTL_CONSTASCII_USTRINGPARAM("IsEmptyPresentationObject") )))
+                        xProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("IsEmptyPresentationObject") ), ::cppu::bool2any( sal_False ) );
+
+                    if( mbIsUserTransformed && xPropsInfo->hasPropertyByName(OUString(RTL_CONSTASCII_USTRINGPARAM("IsPlaceholderDependent") )))
+                        xProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("IsPlaceholderDependent") ), ::cppu::bool2any( sal_False ) );
+                }
+            }
+        }
+
         // set pos, size, shear and rotate
         SetTransformation();
         GetImport().GetShapeImport()->finishShape( mxShape, mxAttrList, mxShapes );
@@ -3539,8 +3569,7 @@ void SdXMLTableShapeContext::StartElement( const ::com::sun::star::uno::Referenc
 {
     const char* pService = "com.sun.star.drawing.TableShape";
 
-    sal_Bool bIsPresShape = sal_False; //maPresentationClass.getLength() && GetImport().GetShapeImport()->IsPresentationShapesSupported();
-/*
+    sal_Bool bIsPresShape = maPresentationClass.getLength() && GetImport().GetShapeImport()->IsPresentationShapesSupported();
     if( bIsPresShape )
     {
         if( IsXMLToken( maPresentationClass, XML_PRESENTATION_TABLE ) )
@@ -3548,7 +3577,7 @@ void SdXMLTableShapeContext::StartElement( const ::com::sun::star::uno::Referenc
             pService = "com.sun.star.presentation.TableShape";
         }
     }
-*/
+
     AddShape( pService );
 
     if( mxShape.is() )
diff --git a/xmloff/source/table/XMLTableExport.cxx b/xmloff/source/table/XMLTableExport.cxx
index 7affab134134..ad3a1f96752f 100644
--- a/xmloff/source/table/XMLTableExport.cxx
+++ b/xmloff/source/table/XMLTableExport.cxx
@@ -353,6 +353,8 @@ static bool has_states( const std::vector< XMLPropertyState >& xPropStates )
             // get the current row
             Reference< XCellRange > xCellRange( xIndexAccess->getByIndex(rowIndex), UNO_QUERY_THROW );
 
+            OUString sDefaultCellStyle;
+
             // table:style-name
             if( pTableInfo.get() )
             {
@@ -360,11 +362,11 @@ static bool has_states( const std::vector< XMLPropertyState >& xPropStates )
                 const OUString sStyleName( pTableInfo->maRowStyleMap[xKey] );
                 if( sStyleName.getLength() )
                     mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_STYLE_NAME, sStyleName );
-            }
 
-            const OUString sDefaultCellStyle( pTableInfo->maDefaultRowCellStyles[rowIndex] );
-            if( sDefaultCellStyle.getLength() )
-                mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DEFAULT_CELL_STYLE_NAME, sDefaultCellStyle );
+                sDefaultCellStyle = pTableInfo->maDefaultRowCellStyles[rowIndex];
+                if( sDefaultCellStyle.getLength() )
+                    mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DEFAULT_CELL_STYLE_NAME, sDefaultCellStyle );
+            }
 
             // write row element
             SvXMLElementExport tableRowElement( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_ROW, sal_True, sal_True );
author	Christian Lippka <christian.lippka@sun.com>	2010-04-12 13:03:45 +0200
committer	Christian Lippka <christian.lippka@sun.com>	2010-04-12 13:03:45 +0200
commit	c6963ac502f6b693d6c9bd6d2a3c08a442d3e86d (patch)
tree	dcc0948502746ef5e614cc9cf37fd1f1d97579e5
parent	a001605a190749900d3e09aa864ce56925ff848e (diff)
parent	f6b04c513837462449c4c4308bd76dec41cd5ed4 (diff)