cws tl74: merge with DEV300_m81

60 files changed, 1949 insertions, 2810 deletions

diff --git a/svx/source/core/coreservices.cxx b/svx/source/core/coreservices.cxx
new file mode 100644
index 0000000000..2df0bf05a1
--- /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 0000000000..da874894ba
--- /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/dialog/docrecovery.src b/svx/source/dialog/docrecovery.src
index 67df927ee8..32c3560031 100644
--- a/svx/source/dialog/docrecovery.src
+++ b/svx/source/dialog/docrecovery.src
@@ -370,7 +370,7 @@ TabPage RID_SVXPAGE_ERR_REP_WELCOME
         Pos = MAP_APPFONT( RECOV_COL1, RECOV_ROW2 );
         Size = MAP_APPFONT( RECOV_CONTROLWIDTH, (RECOV_ROW7-RECOV_ROW2-RSC_SP_CTRL_Y) );
         WordBreak = TRUE;
-        Text[ en-US ] = "This error report tool gathers information about how %PRODUCTNAME is working and sends it to Sun Microsystems to help improve future versions.\n\nIt's easy - just send the report without any further effort on your part by clicking 'Send' in the next dialog, or you can briefly describe how the error occurred and then click 'Send'. If you want to see the report, click the 'Show Report' button. No data will be sent if you click 'Do Not Send'.\n\nCustomer Privacy\nThe information gathered is limited to data concerning the state of %PRODUCTNAME %PRODUCTVERSION when the error occurred. Other information about passwords or document contents is not collected.\n\nThe information will only be used to improve the quality of %PRODUCTNAME and will not be shared with third parties.\nFor more information on Sun Microsystems' privacy policy, visit\nhttp://www.sun.com/privacy/";
+        Text[ en-US ] = "This error report tool gathers information about how %PRODUCTNAME is working and sends it to Oracle to help improve future versions.\n\nIt's easy - just send the report without any further effort on your part by clicking 'Send' in the next dialog, or you can briefly describe how the error occurred and then click 'Send'. If you want to see the report, click the 'Show Report' button. No data will be sent if you click 'Do Not Send'.\n\nCustomer Privacy\nThe information gathered is limited to data concerning the state of %PRODUCTNAME %PRODUCTVERSION when the error occurred. Other information about passwords or document contents is not collected.\n\nThe information will only be used to improve the quality of %PRODUCTNAME and will not be shared with third parties.\nFor more information on Oracle's privacy policy, visit\nwww.oracle.com/html/services-privacy-policy.html";
     };
     FixedLine FL_RECOV_BOTTOM
     {
@@ -472,7 +472,7 @@ TabPage RID_SVXPAGE_ERR_REP_SEND
         Pos = MAP_APPFONT( ERRSEND_COL0, ERRSEND_ROW12 );
         Size = MAP_APPFONT( ERRSEND_CONTROLWIDTH2, RSC_CD_CHECKBOX_HEIGHT );
         Check = FALSE;
-        Text[ en-US ] = "~I allow Sun Microsystems to contact me regarding this report.";
+        Text[ en-US ] = "~I allow Oracle to contact me regarding this report.";
     };
     FixedText FT_ERRSEND_EMAILADDR
     {
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index b39f59010e..5a2824c24d 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -831,6 +831,18 @@ void SvxSearchDialog::CalculateDelta_Impl()
         pMoreBtn->AddWindow( &aNoFormatBtn );
     }
 
+    if (bDrawApp || bImpressApp)
+    {
+        // "Find All" button is hidden--align "Find" vertically to the
+        // search listbox
+        Point aNewPt(aSearchBtn.GetPosPixel());
+        const Size aBtnSz(aSearchBtn.GetSizePixel());
+        const Size aLBSz(aSearchLB.GetSizePixel());
+        const int nOff((aLBSz.Height() - aBtnSz.Height()) / 2);
+        aNewPt.Y() = aSearchLB.GetPosPixel().Y() + nOff;
+        aSearchBtn.SetPosPixel(aNewPt);
+    }
+
     if ( bDrawApp )
     {
         // Draw App: "Regular expressions" and "Search for Styles" check boxes are hidden
@@ -1016,6 +1028,8 @@ void SvxSearchDialog::Init_Impl( int bSearchPattern )
 
         if ( pSearchItem->GetAppFlag() == SVX_SEARCHAPP_DRAW )
         {
+            aSearchAllBtn.Hide();
+
             aRegExpBtn.Hide();
             aLayoutBtn.Hide();
 
diff --git a/svx/source/engine3d/makefile.mk b/svx/source/engine3d/makefile.mk
index 6e6e3f97c5..71916df4a8 100644
--- a/svx/source/engine3d/makefile.mk
+++ b/svx/source/engine3d/makefile.mk
@@ -64,18 +64,10 @@ LIB1OBJFILES= \
 
 LIB2TARGET= $(SLB)$/$(TARGET).lib
 LIB2OBJFILES= \
-        $(SLO)$/volume3d.obj	\
-        $(SLO)$/viewpt3d.obj	\
         $(SLO)$/float3d.obj
 
 SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES)
 
-#disable optimizer for MSCompiler and ICC
-.IF "$(COM)"=="ICC" || "$(COM)"=="MSC"
-NOOPTFILES=\
-        $(SLO)$/viewpt3d.obj
-.ENDIF
-
 SRS1NAME=engine3d
 SRC1FILES=\
         string3d.src	\
diff --git a/svx/source/engine3d/viewpt3d.cxx b/svx/source/engine3d/viewpt3d.cxx
deleted file mode 100644
index 61357e19cd..0000000000
--- a/svx/source/engine3d/viewpt3d.cxx
+++ /dev/null
@@ -1,32 +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 <svx/viewpt3d.hxx>
-
-// eof
diff --git a/svx/source/engine3d/volume3d.cxx b/svx/source/engine3d/volume3d.cxx
deleted file mode 100644
index c0d6db9d7c..0000000000
--- a/svx/source/engine3d/volume3d.cxx
+++ /dev/null
@@ -1,32 +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 <svx/volume3d.hxx>
-
-// eof
diff --git a/svx/source/fmcomp/dbaexchange.cxx b/svx/source/fmcomp/dbaexchange.cxx
index 6859e7023c..f61cbeac29 100644
--- a/svx/source/fmcomp/dbaexchange.cxx
+++ b/svx/source/fmcomp/dbaexchange.cxx
@@ -135,30 +135,19 @@ namespace svx
         {
             try
             {
-                // need a query composer for this
-                Reference< XSQLQueryComposerFactory > xComposerFac;
-                _rxForm->getPropertyValue(FM_PROP_ACTIVE_CONNECTION) >>= xComposerFac;
-                Reference< XSQLQueryComposer > xComposer;
-                if (xComposerFac.is())
-                    xComposer = xComposerFac->createQueryComposer();
-
-                if (xComposer.is())
+                Reference< XTablesSupplier > xSupTab;
+                _rxForm->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SingleSelectQueryComposer"))) >>= xSupTab;
+                
+                if(xSupTab.is())
                 {
-                    ::rtl::OUString sActiveCommand;
-                    _rxForm->getPropertyValue(FM_PROP_ACTIVECOMMAND) >>= sActiveCommand;
-                    xComposer->setQuery(sActiveCommand);
-                    Reference< XTablesSupplier > xSupTab(xComposer, UNO_QUERY);
-                    if(xSupTab.is())
+                    Reference< XNameAccess > xNames = xSupTab->getTables();
+                    if (xNames.is())
                     {
-                        Reference< XNameAccess > xNames = xSupTab->getTables();
-                        if (xNames.is())
+                        Sequence< ::rtl::OUString > aTables = xNames->getElementNames();
+                        if (1 == aTables.getLength())
                         {
-                            Sequence< ::rtl::OUString > aTables = xNames->getElementNames();
-                            if (1 == aTables.getLength())
-                            {
-                                sCommand		= aTables[0];
-                                nCommandType	= CommandType::TABLE;
-                            }
+                            sCommand		= aTables[0];
+                            nCommandType	= CommandType::TABLE;
                         }
                     }
                 }
@@ -457,34 +446,10 @@ namespace svx
         String sObjectKind = (CommandType::TABLE == nObjectType) ? String('1') : String('0');
 
         // check if the SQL-statement is modified
-        sal_Bool bHasFilterOrSort(sal_False);
         ::rtl::OUString sCompleteStatement;
         try
         {
-            ::rtl::OUString sFilter, sSort;
-            if (::cppu::any2bool(_rxLivingForm->getPropertyValue(FM_PROP_APPLYFILTER)))
-                _rxLivingForm->getPropertyValue(FM_PROP_FILTER) >>= sFilter;
-            _rxLivingForm->getPropertyValue(FM_PROP_SORT) >>= sSort;
-            bHasFilterOrSort = (sFilter.getLength()>0) || (sSort.getLength()>0);
-
             _rxLivingForm->getPropertyValue(FM_PROP_ACTIVECOMMAND) >>= sCompleteStatement;
-
-            // create a composer
-            Reference< XSQLQueryComposerFactory > xFactory( xConnection, UNO_QUERY );
-            Reference< XSQLQueryComposer > xComposer;
-            if (xFactory.is())
-                xComposer = xFactory->createQueryComposer();
-
-            // let the composer compose
-            if (xComposer.is())
-            {
-                xComposer->setQuery(sCompleteStatement);
-                xComposer->setFilter(sFilter);
-                xComposer->setOrder(sSort);
-                sCompleteStatement = xComposer->getComposedQuery();
-            }
-            // Usually, I would expect the result of the composing to be the same as the ActiveCommand property
-            // But this code here is pretty old, and I don't know wha the side effects are if I remove it now ...
         }
         catch(Exception&)
         {
@@ -496,7 +461,7 @@ namespace svx
                     ,sConnectionResource
                     ,nObjectType
                     ,sObjectName,xConnection
-                    ,!((CommandType::QUERY == nObjectType) && !bHasFilterOrSort)
+                    ,!((CommandType::QUERY == nObjectType))
                     ,sCompleteStatement);
     }
 
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index 779017ff0c..8d0c1d2fe5 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -210,10 +210,11 @@ void FmGridHeader::RequestHelp( const HelpEvent& rHEvt )
             Reference< ::com::sun::star::container::XIndexContainer >  xColumns(static_cast<FmGridControl*>(GetParent())->GetPeer()->getColumns());
             try
             {
-                Reference< ::com::sun::star::beans::XPropertySet >	xColumn;
-                ::cppu::extractInterface(xColumn, xColumns->getByIndex(nPos));
+                Reference< ::com::sun::star::beans::XPropertySet >	xColumn(xColumns->getByIndex(nPos),UNO_QUERY);
                 ::rtl::OUString aHelpText;
                 xColumn->getPropertyValue(FM_PROP_HELPTEXT) >>= aHelpText;
+                if ( !aHelpText.getLength() )
+                    xColumn->getPropertyValue(FM_PROP_DESCRIPTION) >>= aHelpText;
                 if ( aHelpText.getLength() )
                 {
                     if ( rHEvt.GetMode() & HELPMODE_BALLOON )
@@ -1737,11 +1738,12 @@ void FmGridControl::InitColumnByField(
             _pColumn->SetObject( (sal_Int16)nFieldPos );
             return;
         }
-
+/*
         // handle readonly columns
         sal_Bool bReadOnly = sal_True;
         xField->getPropertyValue( FM_PROP_ISREADONLY ) >>= bReadOnly;
         _pColumn->SetReadOnly( bReadOnly );
+*/
     }
 
     // the control type is determined by the ColumnServiceName
@@ -1999,7 +2001,11 @@ namespace
             {
                 Reference<XPropertySet> xProp(GetPeer()->getColumns(),UNO_QUERY);
                 if ( xProp.is() )
+                {
                     xProp->getPropertyValue(FM_PROP_HELPTEXT) >>= sRetText;
+                    if ( !sRetText.getLength() )
+                        xProp->getPropertyValue(FM_PROP_DESCRIPTION) >>= sRetText;
+                }
             }
             break;
         case ::svt::BBTYPE_COLUMNHEADERCELL:
@@ -2008,6 +2014,13 @@ namespace
                 GetModelColumnPos(
                     sal::static_int_cast< sal_uInt16 >(_nPosition)),
                 FM_PROP_HELPTEXT);
+            if ( !sRetText.getLength() )
+                sRetText = getColumnPropertyFromPeer(
+                            GetPeer(),
+                            GetModelColumnPos(
+                                sal::static_int_cast< sal_uInt16 >(_nPosition)),
+                            FM_PROP_DESCRIPTION);
+                    
             break;
         default:
             sRetText = DbGridControl::GetAccessibleObjectDescription(_eObjType,_nPosition);
@@ -2029,7 +2042,7 @@ void FmGridControl::Select()
     // die HandleColumn wird nicht selektiert
     switch (nSelectedColumn)
     {
-        case -1	: break;	// no selection
+        case SAL_MAX_UINT16: break;	// no selection
         case  0	: nSelectedColumn = SAL_MAX_UINT16; break;
                     // handle col can't be seledted
         default	:
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index dfedec322e..fa935b060a 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -45,6 +45,8 @@
 #include <com/sun/star/form/XBoundComponent.hpp>
 #include <com/sun/star/script/XEventAttacherManager.hpp>
 #include <com/sun/star/sdb/XSQLQueryComposerFactory.hpp>
+#include <com/sun/star/sdbcx/XTablesSupplier.hpp>
+#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
 #include <com/sun/star/sdbc/ColumnValue.hpp>
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <com/sun/star/sdbc/XStatement.hpp>
@@ -82,6 +84,7 @@ using namespace ::svt;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::sdbc;
+using namespace ::com::sun::star::sdbcx;
 using namespace ::com::sun::star::sdb;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::form;
@@ -551,6 +554,7 @@ TYPEINIT1( DbFilterField, DbCellControl )
 //------------------------------------------------------------------------------
 DbCellControl::DbCellControl( DbGridColumn& _rColumn, sal_Bool /*_bText*/ )
     :OPropertyChangeListener(m_aMutex)
+    ,m_pFieldChangeBroadcaster(NULL)
     ,m_bTransparent( sal_False )
     ,m_bAlignedController( sal_True )
     ,m_bAccessingValueProperty( sal_False )
@@ -574,6 +578,27 @@ DbCellControl::DbCellControl( DbGridColumn& _rColumn, sal_Bool /*_bText*/ )
         implDoPropertyListening( FM_PROP_STATE, sal_False );
         implDoPropertyListening( FM_PROP_TEXT, sal_False );
         implDoPropertyListening( FM_PROP_EFFECTIVE_VALUE, sal_False );
+
+        // be listener at the bound field as well
+        try
+        {
+            Reference< XPropertySetInfo > xPSI( xColModelProps->getPropertySetInfo(), UNO_SET_THROW );
+            if ( xPSI->hasPropertyByName( FM_PROP_BOUNDFIELD ) )
+            {
+                Reference< XPropertySet > xField;
+                xColModelProps->getPropertyValue( FM_PROP_BOUNDFIELD ) >>= xField;
+                if ( xField.is() )
+                {
+                    m_pFieldChangeBroadcaster = new ::comphelper::OPropertyChangeMultiplexer(this, xField);
+                    m_pFieldChangeBroadcaster->acquire();
+                    m_pFieldChangeBroadcaster->addProperty( FM_PROP_ISREADONLY );
+                }
+            }
+        }
+        catch( const Exception& )
+        {
+            DBG_ERROR( "DbCellControl::doPropertyListening: caught an exception!" );
+        }
     }
 }
 
@@ -605,17 +630,22 @@ void DbCellControl::doPropertyListening( const ::rtl::OUString& _rPropertyName )
 {
     implDoPropertyListening( _rPropertyName );
 }
-
 //------------------------------------------------------------------------------
-DbCellControl::~DbCellControl()
+void lcl_clearBroadCaster(::comphelper::OPropertyChangeMultiplexer*& _pBroadcaster)
 {
-    if ( m_pModelChangeBroadcaster )
+    if ( _pBroadcaster )
     {
-        m_pModelChangeBroadcaster->dispose();
-        m_pModelChangeBroadcaster->release();
-        m_pModelChangeBroadcaster = NULL;
+        _pBroadcaster->dispose();
+        _pBroadcaster->release();
+        _pBroadcaster = NULL;
         // no delete, this is done implicitly
     }
+}
+//------------------------------------------------------------------------------
+DbCellControl::~DbCellControl()
+{
+    lcl_clearBroadCaster(m_pModelChangeBroadcaster);
+    lcl_clearBroadCaster(m_pFieldChangeBroadcaster);
 
     delete m_pWindow;
     delete m_pPainter;
@@ -660,7 +690,14 @@ void DbCellControl::_propertyChanged(const PropertyChangeEvent& _rEvent) throw(R
     }
     else if ( _rEvent.PropertyName.equals( FM_PROP_READONLY ) )
     {
-        implAdjustReadOnly( xSourceProps );
+        implAdjustReadOnly( xSourceProps, true);
+    }
+    else if ( _rEvent.PropertyName.equals( FM_PROP_ISREADONLY ) )
+    {
+        sal_Bool bReadOnly = sal_True;
+        _rEvent.NewValue >>= bReadOnly;
+        m_rColumn.SetReadOnly(bReadOnly);
+        implAdjustReadOnly( xSourceProps, false);
     }
     else if ( _rEvent.PropertyName.equals( FM_PROP_ENABLED ) )
     {
@@ -798,7 +835,7 @@ void DbCellControl::ImplInitWindow( Window& rParent, const InitWindowFacet _eIni
 }
 
 //------------------------------------------------------------------------------
-void DbCellControl::implAdjustReadOnly( const Reference< XPropertySet >& _rxModel )
+void DbCellControl::implAdjustReadOnly( const Reference< XPropertySet >& _rxModel,bool i_bReadOnly )
 {
     DBG_ASSERT( m_pWindow, "DbCellControl::implAdjustReadOnly: not to be called without window!" );
     DBG_ASSERT( _rxModel.is(), "DbCellControl::implAdjustReadOnly: invalid model!" );
@@ -807,9 +844,12 @@ void DbCellControl::implAdjustReadOnly( const Reference< XPropertySet >& _rxMode
         Edit* pEditWindow = dynamic_cast< Edit* >( m_pWindow );
         if ( pEditWindow )
         {
-            sal_Bool bReadOnly = sal_True;
-            _rxModel->getPropertyValue( FM_PROP_READONLY ) >>= bReadOnly;
-            static_cast< Edit* >( m_pWindow )->SetReadOnly( m_rColumn.IsReadOnly() || bReadOnly );
+            sal_Bool bReadOnly = m_rColumn.IsReadOnly();
+            if ( !bReadOnly )
+            {
+                _rxModel->getPropertyValue( i_bReadOnly ? FM_PROP_READONLY : FM_PROP_ISREADONLY) >>= bReadOnly;
+            }
+            static_cast< Edit* >( m_pWindow )->SetReadOnly( bReadOnly );
         }
     }
 }
@@ -846,7 +886,7 @@ void DbCellControl::Init( Window& rParent, const Reference< XRowSet >& _rxCursor
 
             if ( xModelPSI->hasPropertyByName( FM_PROP_READONLY ) )
             {
-                implAdjustReadOnly( xModel );
+                implAdjustReadOnly( xModel,true );
             }
 
             if ( xModelPSI->hasPropertyByName( FM_PROP_ENABLED ) )
@@ -1003,7 +1043,7 @@ double DbCellControl::GetValue(const Reference< ::com::sun::star::sdb::XColumn >
 //------------------------------------------------------------------------------
 void DbCellControl::invalidatedController()
 {
-    m_rColumn.GetParent().refreshController(m_rColumn.GetId(), DbGridControl::GrantCellControlAccess());
+    m_rColumn.GetParent().refreshController(m_rColumn.GetId(), DbGridControl::GrantControlAccess());
 }
 
 /*************************************************************************/
@@ -3039,43 +3079,22 @@ void DbFilterField::Update()
         if (!xForm.is())
             return;
 
-        Reference< XConnection >  xConnection(getRowSetConnection(xForm));
-        if (!xConnection.is())
-            return;
-
-        Reference< ::com::sun::star::sdb::XSQLQueryComposerFactory >  xFactory(xConnection, UNO_QUERY);
-        if (!xFactory.is())
-        {
-            DBG_ERROR("DbFilterField::Update : used the right place to request the ::com::sun::star::sdb::XSQLQueryComposerFactory interface ?");
-            return;
-        }
+        Reference<XPropertySet> xFormProp(xForm,UNO_QUERY);
+        Reference< XTablesSupplier > xSupTab;
+        xFormProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SingleSelectQueryComposer"))) >>= xSupTab;
 
-        Reference< ::com::sun::star::sdb::XSQLQueryComposer >  xComposer = xFactory->createQueryComposer();
-        try
-        {
-            Reference< ::com::sun::star::beans::XPropertySet >  xFormAsSet(xForm, UNO_QUERY);
-            ::rtl::OUString sStatement;
-            xFormAsSet->getPropertyValue(FM_PROP_ACTIVECOMMAND) >>= sStatement;
-            xComposer->setQuery(sStatement);
-        }
-        catch(const Exception&)
-        {
-            ::comphelper::disposeComponent(xComposer);
-            return;
-        }
-
-        Reference< ::com::sun::star::beans::XPropertySet >  xComposerAsSet(xComposer, UNO_QUERY);
-        if (!xComposerAsSet.is())
+        Reference< XConnection >  xConnection(getRowSetConnection(xForm));
+        if (!xSupTab.is())
             return;
 
         // search the field
-        Reference< ::com::sun::star::container::XNameAccess >    xFieldNames;
-        Reference< ::com::sun::star::container::XNameAccess >    xTablesNames;
-        Reference< ::com::sun::star::beans::XPropertySet >       xComposerFieldAsSet;
-
-        ::cppu::extractInterface(xFieldNames, xComposerAsSet->getPropertyValue(FM_PROP_SELECTED_FIELDS));
-        ::cppu::extractInterface(xTablesNames, xComposerAsSet->getPropertyValue(FM_PROP_SELECTED_TABLES));
-        ::cppu::extractInterface(xComposerFieldAsSet, xFieldNames->getByName(aName));
+        Reference< XColumnsSupplier > xSupCol(xSupTab,UNO_QUERY);
+        Reference< ::com::sun::star::container::XNameAccess >    xFieldNames = xSupCol->getColumns();
+        if (!xFieldNames->hasByName(aName))
+            return;
+        
+        Reference< ::com::sun::star::container::XNameAccess >    xTablesNames = xSupTab->getTables();
+        Reference< ::com::sun::star::beans::XPropertySet >       xComposerFieldAsSet(xFieldNames->getByName(aName),UNO_QUERY);
 
         if (xComposerFieldAsSet.is() && ::comphelper::hasProperty(FM_PROP_TABLENAME, xComposerFieldAsSet) &&
             ::comphelper::hasProperty(FM_PROP_FIELDSOURCE, xComposerFieldAsSet))
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 4e21fc3761..4a9ac64865 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -44,6 +44,8 @@
 #include <com/sun/star/sdbc/ResultSetConcurrency.hpp>
 #include <com/sun/star/accessibility/XAccessible.hpp>
 #include <com/sun/star/sdb/XResultSetAccess.hpp>
+#include <com/sun/star/sdb/RowChangeAction.hpp>
+#include <com/sun/star/sdb/XRowsChangeBroadcaster.hpp>
 #include <com/sun/star/sdbc/XResultSetUpdate.hpp>
 #include <com/sun/star/sdbcx/Privilege.hpp>
 #include <com/sun/star/container/XChild.hpp>
@@ -102,6 +104,39 @@ using namespace com::sun::star::accessibility;
             | BROWSER_VLINESFULL        \
             | BROWSER_HEADERBAR_NEW     \
 
+class RowSetEventListener : public ::cppu::WeakImplHelper1<XRowsChangeListener>
+{
+    DbGridControl* m_pControl;
+public:
+    RowSetEventListener(DbGridControl* i_pControl) : m_pControl(i_pControl)
+    {
+    }
+private:
+    // XEventListener
+    virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& /*i_aEvt*/) throw ( RuntimeException )
+    {
+    }
+    virtual void SAL_CALL rowsChanged(const ::com::sun::star::sdb::RowsChangeEvent& i_aEvt) throw ( RuntimeException )
+    {
+        if ( i_aEvt.Action == RowChangeAction::UPDATE )
+        {
+            ::DbGridControl::GrantControlAccess aAccess;
+            CursorWrapper* pSeek = m_pControl->GetSeekCursor(aAccess);
+            const DbGridRowRef& rSeekRow = m_pControl->GetSeekRow(aAccess);
+            const Any* pIter = i_aEvt.Bookmarks.getConstArray();
+            const Any* pEnd  = pIter + i_aEvt.Bookmarks.getLength();
+            for(;pIter != pEnd;++pIter)
+            {
+                pSeek->moveToBookmark(*pIter);
+                // get the data
+                rSeekRow->SetState(pSeek, sal_True);
+                sal_Int32 nSeekPos = pSeek->getRow() - 1;
+                m_pControl->SetSeekPos(nSeekPos,aAccess);
+                m_pControl->RowModified(nSeekPos);
+            }
+        }
+    }
+};
 //==============================================================================
 
 class GridFieldValueListener;
@@ -987,6 +1022,7 @@ DbGridControl::~DbGridControl()
         m_pDataSourcePropMultiplexer = NULL;
         m_pDataSourcePropListener = NULL;
     }
+    m_xRowSetListener.clear();
 
     delete m_pDataCursor;
     delete m_pSeekCursor;
@@ -1377,7 +1413,7 @@ sal_Bool DbGridControl::IsPermanentCursorEnabled() const
 }
 
 //------------------------------------------------------------------------------
-void DbGridControl::refreshController(sal_uInt16 _nColId, GrantCellControlAccess /*_aAccess*/)
+void DbGridControl::refreshController(sal_uInt16 _nColId, GrantControlAccess /*_aAccess*/)
 {
     if ((GetCurColumnId() == _nColId) && IsEditing())
     {	// the controller which is currently active needs to be refreshed
@@ -1412,6 +1448,7 @@ void DbGridControl::setDataSource(const Reference< XRowSet >& _xCursor, sal_uInt
         m_pDataSourcePropMultiplexer = NULL;
         m_pDataSourcePropListener = NULL;
     }
+    m_xRowSetListener.clear();
 
     // is the new cursor valid ?
     // the cursor is only valid if it contains some columns
@@ -1503,7 +1540,7 @@ void DbGridControl::setDataSource(const Reference< XRowSet >& _xCursor, sal_uInt
             Reference< XPropertySet >  xSet(_xCursor, UNO_QUERY);
             if (xSet.is())
             {
-                // feststellen welche Updatem�glichkeiten bestehen
+                // feststellen welche Updatemoeglichkeiten bestehen
                 sal_Int32 nConcurrency = ResultSetConcurrency::READ_ONLY;
                 xSet->getPropertyValue(FM_PROP_RESULTSET_CONCURRENCY) >>= nConcurrency;
 
@@ -1565,6 +1602,12 @@ void DbGridControl::setDataSource(const Reference< XRowSet >& _xCursor, sal_uInt
         xSet->getPropertyValue(FM_PROP_ROWCOUNT) >>= nRecordCount;
         m_bRecordCountFinal = ::comphelper::getBOOL(xSet->getPropertyValue(FM_PROP_ROWCOUNTFINAL));
 
+        m_xRowSetListener = new RowSetEventListener(this);
+        Reference< XRowsChangeBroadcaster> xChangeBroad(xSet,UNO_QUERY);
+        if ( xChangeBroad.is( ) )
+            xChangeBroad->addRowsChangeListener(m_xRowSetListener);
+        
+
         // insert the currently known rows
         // and one row if we are able to insert rows
         if (m_nOptions & OPT_INSERT)
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 6070adb015..c1e5967936 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -43,7 +43,7 @@
 #include <svtools/miscopt.hxx>
 #include <unotools/pathoptions.hxx>
 #include <unotools/viewoptions.hxx>
-#include <svl/svtools.hrc>
+#include <svtools/svtools.hrc>
 #include <sfx2/app.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <sfx2/objitem.hxx>
@@ -3683,11 +3683,8 @@ namespace svxform
         m_aURLED.DisableHistory();
         m_aFilePickerBtn.SetClickHdl( LINK( this, AddInstanceDialog, FilePickerHdl ) );
 
-        // load the filter name from svtools resource
-        ByteString aResMgrName( "svt" );
-        ResMgr* pSvtResMgr = ResMgr::CreateResMgr(
-            aResMgrName.GetBuffer(), Application::GetSettings().GetUILocale() );
-        m_sAllFilterName = String( ResId( STR_FILTERNAME_ALL, *pSvtResMgr ) );
+        // load the filter name from fps_office resource
+        m_sAllFilterName = String( ResId( STR_FILTERNAME_ALL, *CREATEVERSIONRESMGR(fps_office) ) );
     }
 
     AddInstanceDialog::~AddInstanceDialog()
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index c40841f221..4a9a859c0e 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -78,6 +78,7 @@
 #include <svx/fmglob.hxx>
 #include <svl/eitem.hxx>
 #include <tools/shl.hxx>
+#include <tools/diagnose_ex.h>
 #include <svx/svdpage.hxx>
 #include <svx/fmmodel.hxx>
 #include <svx/dialmgr.hxx>
@@ -98,6 +99,8 @@
 #include <svx/svxdlg.hxx> //CHINA001
 #include <svx/dialogs.hrc> //CHINA001
 
+#include "svx/sdrobjectfilter.hxx"
+
 #define HANDLE_SQL_ERRORS( action, successflag, context, message )			\
     try 																	\
     {																		\
@@ -544,7 +547,7 @@ void FmFormShell::Execute(SfxRequest &rReq)
         case SID_FM_SCROLLBAR:
         case SID_FM_SPINBUTTON:
         {
-            SFX_REQUEST_ARG( rReq, pGrabFocusItem, SfxBoolItem, SID_FM_GRABCONTROLFOCUS, sal_False );
+            SFX_REQUEST_ARG( rReq, pGrabFocusItem, SfxBoolItem, SID_FM_TOGGLECONTROLFOCUS, sal_False );
             if ( pGrabFocusItem && pGrabFocusItem->GetValue() )
             {	// see below
                 SfxViewShell* pShell = GetViewShell();
@@ -572,9 +575,9 @@ void FmFormShell::Execute(SfxRequest &rReq)
             {
                 //	#99013# if selected with control key, return focus to current view
                 // do this asynchron, so that the creation can be finished first
-                // reusing the SID_FM_GRABCONTROLFOCUS is somewhat hacky ... which it wouldn't if it would have another
+                // reusing the SID_FM_TOGGLECONTROLFOCUS is somewhat hacky ... which it wouldn't if it would have another
                 // name, so I do not really have a big problem with this ....
-                SfxBoolItem aGrabFocusIndicatorItem( SID_FM_GRABCONTROLFOCUS, sal_True );
+                SfxBoolItem aGrabFocusIndicatorItem( SID_FM_TOGGLECONTROLFOCUS, sal_True );
                 GetViewShell()->GetViewFrame()->GetDispatcher()->Execute( nSlot, SFX_CALLMODE_ASYNCHRON,
                                           &aGrabFocusIndicatorItem, NULL );
             }
@@ -595,11 +598,27 @@ void FmFormShell::Execute(SfxRequest &rReq)
         }
         break;
 
-        case SID_FM_GRABCONTROLFOCUS:
+        case SID_FM_TOGGLECONTROLFOCUS:
         {
             FmFormView* pFormView = GetFormView();
-            if ( pFormView )
+            if ( !pFormView )
+                break;
+
+            // if we execute this ourself, then either the application does not implement an own handling for this,
+            // of we're on the top of the dispatcher stack, which means a control has the focus.
+            // In the latter case, we put the focus to the document window, otherwise, we focus the first control
+            const bool bHasControlFocus = GetImpl()->HasControlFocus();
+            if ( bHasControlFocus )
+            {
+                const OutputDevice* pDevice = GetCurrentViewDevice();
+                Window* pWindow = dynamic_cast< Window* >( const_cast< OutputDevice* >( pDevice ) );
+                if ( pWindow )
+                    pWindow->GrabFocus();
+            }
+            else
+            {
                 pFormView->GrabFirstControlFocus( );
+            }
         }
         break;
 
@@ -1353,6 +1372,78 @@ namespace
 }
 
 //------------------------------------------------------------------------
+void FmFormShell::ToggleControlFocus( const SdrUnoObj& i_rUnoObject, const SdrView& i_rView, OutputDevice& i_rDevice ) const
+{
+    try
+    {
+        // check if the focus currently is in a control
+        // Well, okay, do it the other way 'round: Check whether the current control of the active controller
+        // actually has the focus. This should be equivalent.
+        const bool bHasControlFocus = GetImpl()->HasControlFocus();
+
+        if ( bHasControlFocus )
+        {
+            Window* pWindow( dynamic_cast< Window* >( &i_rDevice ) );
+            OSL_ENSURE( pWindow, "FmFormShell::ToggleControlFocus: I need a Window, really!" );
+            if ( pWindow )
+                pWindow->GrabFocus();
+        }
+        else
+        {
+            Reference< XControl > xControl;
+            GetFormControl( i_rUnoObject.GetUnoControlModel(), i_rView, i_rDevice, xControl );
+            Reference< XWindow > xControlWindow( xControl, UNO_QUERY );
+            if ( xControlWindow.is() )
+                xControlWindow->setFocus();
+        }
+    }
+    catch( const Exception& )
+    {
+        DBG_UNHANDLED_EXCEPTION();
+    }
+}
+
+//------------------------------------------------------------------------
+namespace
+{
+    class FocusableControlsFilter : public ::svx::ISdrObjectFilter
+    {
+    public:
+        FocusableControlsFilter( const SdrView& i_rView, const OutputDevice& i_rDevice )
+            :m_rView( i_rView )
+            ,m_rDevice( i_rDevice )
+        {
+        }
+
+    public:
+        virtual bool    includeObject( const SdrObject& i_rObject ) const
+        {
+            const SdrUnoObj* pUnoObj = dynamic_cast< const SdrUnoObj* >( &i_rObject );
+            if ( !pUnoObj )
+                return false;
+
+            Reference< XControl > xControl = pUnoObj->GetUnoControl( m_rView, m_rDevice );
+            return FmXFormView::isFocusable( xControl );
+        }
+
+    private:
+        const SdrView&      m_rView;
+        const OutputDevice& m_rDevice;
+    };
+}
+
+//------------------------------------------------------------------------
+::std::auto_ptr< ::svx::ISdrObjectFilter > FmFormShell::CreateFocusableControlFilter( const SdrView& i_rView, const OutputDevice& i_rDevice ) const
+{
+    ::std::auto_ptr< ::svx::ISdrObjectFilter > pFilter;
+    
+    if ( !i_rView.IsDesignMode() )
+        pFilter.reset( new FocusableControlsFilter( i_rView, i_rDevice ) );
+
+    return pFilter;
+}
+
+//------------------------------------------------------------------------
 SdrUnoObj* FmFormShell::GetFormControl( const Reference< XControlModel >& _rxModel, const SdrView& _rView, const OutputDevice& _rDevice, Reference< XControl >& _out_rxControl ) const
 {
     if ( !_rxModel.is() )
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index d4028a3b18..0cff58e487 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -56,6 +56,7 @@
 #include "svx/svxids.hrc"
 
 /** === begin UNO includes === **/
+#include <com/sun/star/awt/XWindow2.hpp>
 #include <com/sun/star/awt/XCheckBox.hpp>
 #include <com/sun/star/awt/XListBox.hpp>
 #include <com/sun/star/awt/XTextComponent.hpp>
@@ -941,7 +942,6 @@ void SAL_CALL FmXFormShell::formDeactivated(const EventObject& rEvent) throw( Ru
 void FmXFormShell::disposing()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::disposing" );
-    OSL_TRACE( "--- FmXFormShell::disposing      : %p, ........, ........", this );
     impl_checkDisposed();
 
     FmXFormShell_BASE::disposing();
@@ -1579,22 +1579,25 @@ void FmXFormShell::ExecuteSearch()
         return;
 
     // filter out the forms which do not contain valid controls at all
-    FmFormArray::reverse_iterator form = m_aSearchForms.rbegin();
-    ::std::vector< String >::reverse_iterator contextName = aContextNames.rbegin();
-    sal_Int32 i = m_aSearchForms.size();
-    for (   ;
-            form != m_aSearchForms.rend();
-            ++form, ++contextName, --i
-        )
     {
-        FmSearchContext aTestContext;
-        aTestContext.nContext = static_cast< sal_Int16 >( i-1 );
-        sal_uInt32 nValidControls = OnSearchContextRequest( &aTestContext );
-        if ( nValidControls == 0 )
+        FmFormArray aValidForms;
+        ::std::vector< String > aValidContexts;
+        FmFormArray::const_iterator form = m_aSearchForms.begin();
+        ::std::vector< String >::const_iterator contextName = aContextNames.begin();
+        for ( ; form != m_aSearchForms.end(); ++form, ++contextName )
         {
-            m_aSearchForms.erase( form.base() - 1 );
-            aContextNames.erase( contextName.base() - 1 );
+            FmSearchContext aTestContext;
+            aTestContext.nContext = static_cast< sal_Int16 >( form - m_aSearchForms.begin() );
+            sal_uInt32 nValidControls = OnSearchContextRequest( &aTestContext );
+            if ( nValidControls > 0 )
+            {
+                aValidForms.push_back( *form );
+                aValidContexts.push_back( *contextName );
+            }
         }
+
+        m_aSearchForms.swap( aValidForms );
+        aContextNames.swap( aValidContexts );
     }
 
     if (m_aSearchForms.size() == 0)
@@ -1606,7 +1609,7 @@ void FmXFormShell::ExecuteSearch()
     // jetzt brauche ich noch einen 'initial context'
     sal_Int16 nInitialContext = 0;
     Reference< XForm> xActiveForm( getActiveForm());
-    for (i=0; i<(sal_Int32)m_aSearchForms.size(); ++i)
+    for ( size_t i=0; i<m_aSearchForms.size(); ++i )
     {
         if (m_aSearchForms.at(i) == xActiveForm)
         {
@@ -2373,6 +2376,8 @@ IMPL_LINK(FmXFormShell, OnFoundData, FmFoundRecordInformation*, pfriWhere)
     FmFormObj* pFormObject = FmFormObj::GetFormObject( pObject );
     Reference< XControlModel > xControlModel( pFormObject ? pFormObject->GetUnoControlModel() : Reference< XControlModel >() );
     DBG_ASSERT( xControlModel.is(), "FmXFormShell::OnFoundData: invalid control!" );
+    if ( !xControlModel.is() )
+        return 0;
 
     // disable the permanent cursor for the last grid we found a record
     if (m_xLastGridFound.is() && (m_xLastGridFound != xControlModel))
@@ -2390,7 +2395,7 @@ IMPL_LINK(FmXFormShell, OnFoundData, FmFoundRecordInformation*, pfriWhere)
     sal_Int32 nGridColumn = m_arrRelativeGridColumn.GetObject(pfriWhere->nFieldPos);
     if (nGridColumn != -1)
     {	// dummer weise muss ich mir das Control erst wieder besorgen
-        Reference< XControl> xControl( GetControlFromModel(xControlModel));
+        Reference< XControl> xControl( impl_getControl( xControlModel, *pFormObject ) );
         Reference< XGrid> xGrid(xControl, UNO_QUERY);
         DBG_ASSERT(xGrid.is(), "FmXFormShell::OnFoundData : ungueltiges Control !");
         // wenn eine der Asserts anschlaegt, habe ich beim Aufbauen von m_arrSearchedControls wohl was falsch gemacht
@@ -2402,7 +2407,8 @@ IMPL_LINK(FmXFormShell, OnFoundData, FmFoundRecordInformation*, pfriWhere)
         xModelSet->setPropertyValue( FM_PROP_CURSORCOLOR, makeAny( sal_Int32( COL_LIGHTRED ) ) );
         m_xLastGridFound = xControlModel;
 
-        xGrid->setCurrentColumnPosition((sal_Int16)nGridColumn);
+        if ( xGrid.is() )
+            xGrid->setCurrentColumnPosition((sal_Int16)nGridColumn);
     }
 
     // als der Cursor neu positioniert wurde, habe ich (in positioned) meine Formularleisten-Slots invalidiert, aber das greift
@@ -2510,7 +2516,7 @@ IMPL_LINK(FmXFormShell, OnSearchContextRequest, FmSearchContext*, pfmscContextIn
 
         // ... nach der ControlSource-Eigenschaft fragen
         SearchableControlIterator iter( xCurrentFormComponent );
-        Reference< XControl> xControlBehindModel;
+        Reference< XControl> xControl;
             // das Control, das als Model xControlModel hat
             // (das folgende while kann mehrmals durchlaufen werden, ohne dass das Control sich aendert, dann muss
             // ich nicht jedesmal neu suchen)
@@ -2522,10 +2528,12 @@ IMPL_LINK(FmXFormShell, OnSearchContextRequest, FmSearchContext*, pfmscContextIn
             if ( sControlSource.getLength() == 0 )
             {	// das aktuelle Element hat keine ControlSource, also ist es ein GridControl (das ist das einzige, was
                 // der SearchableControlIterator noch zulaesst)
-                xControlBehindModel = GetControlFromModel(xControlModel);
-                DBG_ASSERT(xControlBehindModel.is(), "FmXFormShell::OnSearchContextRequest : didn't ::std::find a control with requested model !");
+                xControl = impl_getControl( xControlModel, *pFormObject );
+                DBG_ASSERT(xControl.is(), "FmXFormShell::OnSearchContextRequest : didn't ::std::find a control with requested model !");
 
-                Reference< XGridPeer> xGridPeer(xControlBehindModel->getPeer(), UNO_QUERY);
+                Reference< XGridPeer> xGridPeer;
+                if ( xControl.is() )
+                    xGridPeer.set( xControl->getPeer(), UNO_QUERY );
                 do
                 {
                     if (!xGridPeer.is())
@@ -2579,13 +2587,13 @@ IMPL_LINK(FmXFormShell, OnSearchContextRequest, FmSearchContext*, pfmscContextIn
                 if (sControlSource.getLength() && xValidFormFields->hasByName(sControlSource))
                 {
                     // jetzt brauche ich das Control zum SdrObject
-                    if (!xControlBehindModel.is())
+                    if (!xControl.is())
                     {
-                        xControlBehindModel = GetControlFromModel(xControlModel);
-                        DBG_ASSERT(xControlBehindModel.is(), "FmXFormShell::OnSearchContextRequest : didn't ::std::find a control with requested model !");
+                        xControl = impl_getControl( xControlModel, *pFormObject );
+                        DBG_ASSERT(xControl.is(), "FmXFormShell::OnSearchContextRequest : didn't ::std::find a control with requested model !");
                     }
 
-                    if (IsSearchableControl(xControlBehindModel))
+                    if (IsSearchableControl(xControl))
                     {	// alle Tests ueberstanden -> in die Liste mit aufnehmen
                         strFieldList += sControlSource.getStr();
                         strFieldList += ';';
@@ -2601,7 +2609,7 @@ IMPL_LINK(FmXFormShell, OnSearchContextRequest, FmSearchContext*, pfmscContextIn
                         m_arrRelativeGridColumn.Insert(-1, m_arrRelativeGridColumn.Count());
 
                         // und fuer die formatierte Suche ...
-                        pfmscContextInfo->arrFields.push_back(Reference< XInterface>(xControlBehindModel, UNO_QUERY));
+                        pfmscContextInfo->arrFields.push_back(Reference< XInterface>(xControl, UNO_QUERY));
                     }
                 }
             }
@@ -2975,24 +2983,48 @@ void FmXFormShell::SetDesignMode(sal_Bool bDesign)
 }
 
 //------------------------------------------------------------------------------
-Reference< XControl> FmXFormShell::GetControlFromModel(const Reference< XControlModel>& xModel)
+Reference< XControl> FmXFormShell::impl_getControl( const Reference< XControlModel >& i_rxModel, const FmFormObj& i_rKnownFormObj )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::GetControlFromModel" );
     if ( impl_checkDisposed() )
         return NULL;
 
-    Reference< XControlContainer> xControlContainer( getControlContainerForView() );
+    Reference< XControl > xControl;
+    try
+    {
+        Reference< XControlContainer> xControlContainer( getControlContainerForView(), UNO_SET_THROW );
+
+        Sequence< Reference< XControl > > seqControls( xControlContainer->getControls() );
+        const Reference< XControl >* pControls = seqControls.getArray();
+        // ... die ich dann durchsuchen kann
+        for (sal_Int32 i=0; i<seqControls.getLength(); ++i)
+        {
+            xControl.set( pControls[i], UNO_SET_THROW );
+            Reference< XControlModel > xCurrentModel( xControl->getModel() );
+            if ( xCurrentModel == i_rxModel )
+                break;
+            xControl.clear();
+        }
+
+        if ( !xControl.is() )
+        {
+            // fallabck (some controls might not have been created, yet, since they were never visible so far)
+            Reference< XControl > xContainerControl( xControlContainer, UNO_QUERY_THROW );
+            const Window* pContainerWindow = VCLUnoHelper::GetWindow( xContainerControl->getPeer() );
+            ENSURE_OR_THROW( pContainerWindow, "unexpected control container implementation" );
+
+            const SdrView* pSdrView = m_pShell ? m_pShell->GetFormView() : NULL;
+            ENSURE_OR_THROW( pSdrView, "no current view" );
 
-    Sequence< Reference< XControl> > seqControls( xControlContainer->getControls() );
-    Reference< XControl>* pControls = seqControls.getArray();
-    // ... die ich dann durchsuchen kann
-    for (int i=0; i<seqControls.getLength(); ++i)
+            xControl.set( i_rKnownFormObj.GetUnoControl( *pSdrView, *pContainerWindow ), UNO_QUERY_THROW );
+        }
+    }
+    catch( const Exception& )
     {
-        Reference< XControlModel> xSearchLoopModel( pControls[i]->getModel());
-        if ((XControlModel*)xSearchLoopModel.get() == (XControlModel*)xModel.get())
-            return pControls[i];
+        DBG_UNHANDLED_EXCEPTION();
     }
-    return Reference< XControl>(NULL);
+
+    OSL_ENSURE( xControl.is(), "FmXFormShell::impl_getControl: no control found!" );
+    return xControl;
 }
 
 //------------------------------------------------------------------------------
@@ -3761,7 +3793,6 @@ void FmXFormShell::SetWizardUsing(sal_Bool _bUseThem)
 void FmXFormShell::viewDeactivated( FmFormView& _rCurrentView, sal_Bool _bDeactivateController /* = sal_True */ )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::viewDeactivated" );
-    OSL_TRACE( "--- FmXFormShell::viewDeactivated: %p, %p, ........", this, &_rCurrentView );
 
     if ( _rCurrentView.GetImpl() && !_rCurrentView.IsDesignMode() )
     {
@@ -3796,7 +3827,6 @@ void FmXFormShell::viewDeactivated( FmFormView& _rCurrentView, sal_Bool _bDeacti
     // remove callbacks at the page
     if ( pPage )
     {
-        OSL_TRACE( "--- FmXFormShell::resetHandler   : %p, ........, %p", this, pPage );
         pPage->GetImpl().SetFormsCreationHdl( Link() );
     }
     UpdateForms( sal_True );
@@ -3835,7 +3865,6 @@ IMPL_LINK( FmXFormShell, OnFormsCreated, FmFormPage*, /*_pPage*/ )
 void FmXFormShell::viewActivated( FmFormView& _rCurrentView, sal_Bool _bSyncAction /* = sal_False */ )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::viewActivated" );
-    OSL_TRACE( "--- FmXFormShell::viewActivated  : %p, %p, ........", this, &_rCurrentView );
 
     FmFormPage* pPage = _rCurrentView.GetCurPage();
 
@@ -3865,7 +3894,6 @@ void FmXFormShell::viewActivated( FmFormView& _rCurrentView, sal_Bool _bSyncActi
     // set callbacks at the page
     if ( pPage )
     {
-        OSL_TRACE( "--- FmXFormShell::setHandler     : %p, ........, %p", this, pPage );
         pPage->GetImpl().SetFormsCreationHdl( LINK( this, FmXFormShell, OnFormsCreated ) );
     }
 
@@ -4156,6 +4184,31 @@ void FmXFormShell::handleMouseButtonDown( const SdrViewEvent& _rViewEvent )
     }
 }
 
+//------------------------------------------------------------------------------
+bool FmXFormShell::HasControlFocus() const
+{
+    bool bHasControlFocus = false;
+
+    try
+    {
+        Reference< XFormController > xController( getActiveController() );
+        Reference< XControl > xCurrentControl;
+        if ( xController.is() )
+            xCurrentControl.set( xController->getCurrentControl() );
+        if ( xCurrentControl.is() )
+        {
+            Reference< XWindow2 > xPeerWindow( xCurrentControl->getPeer(), UNO_QUERY_THROW );
+            bHasControlFocus = xPeerWindow->hasFocus();
+        }
+    }
+    catch( const Exception& )
+    {
+        DBG_UNHANDLED_EXCEPTION();
+    }
+
+    return bHasControlFocus;
+}
+
 //==============================================================================
 //==============================================================================
 SearchableControlIterator::SearchableControlIterator(Reference< XInterface> xStartingPoint)
diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx
index c55d15781c..501420329e 100644
--- a/svx/source/form/fmtextcontrolshell.cxx
+++ b/svx/source/form/fmtextcontrolshell.cxx
@@ -130,7 +130,6 @@ namespace svx
         SID_ATTR_LRSPACE,           /* 48 */
         SID_ATTR_ULSPACE,           /* 49 */
         SID_ATTR_CHAR_AUTOKERN,
-        SID_ATTR_CHAR_OVERLINE,
         SID_SET_SUPER_SCRIPT,
         SID_SET_SUB_SCRIPT,
         SID_CHAR_DLG,
@@ -141,6 +140,7 @@ namespace svx
         SID_ATTR_CHAR_RELIEF,
         SID_ATTR_PARA_LEFT_TO_RIGHT,    /* 950 */
         SID_ATTR_PARA_RIGHT_TO_LEFT,
+        SID_ATTR_CHAR_OVERLINE,
         0
     };
 
diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx
index e1d139dd10..3409125a5f 100644
--- a/svx/source/form/fmtools.cxx
+++ b/svx/source/form/fmtools.cxx
@@ -72,6 +72,8 @@
 /** === end UNO includes === **/
 
 #include <basic/sbxvar.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
 #include <comphelper/container.hxx>
 #include <comphelper/extract.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index 3900c5b694..c674648e08 100644
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -90,25 +90,7 @@ class ScriptEventListenerWrapper : public ScriptEventListener_BASE
 public:
     ScriptEventListenerWrapper( FmFormModel& _rModel) throw ( RuntimeException ) : pModel(&_rModel) 
     {
-        Reference < XPropertySet > xProps(
-            ::comphelper::getProcessServiceFactory(), UNO_QUERY );
-        if ( xProps.is() )
-        {
-            Reference< XComponentContext > xCtx( xProps->getPropertyValue(
-                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), UNO_QUERY );
-            if ( xCtx.is() )
-            {
-                Reference< XMultiComponentFactory > xMFac( 
-                    xCtx->getServiceManager(), UNO_QUERY );
-                if ( xMFac.is() )
-                {
-                    m_vbaListener.set( xMFac->createInstanceWithContext( 
-                        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
-                            "ooo.vba.EventListener"  ) ), xCtx ), 
-                                UNO_QUERY_THROW );
-                }
-            }
-        }
+
     }
     // XEventListener
     virtual void SAL_CALL disposing(const EventObject& ) throw( RuntimeException ){}
@@ -136,6 +118,33 @@ public:
 private:
     void setModel()
     {
+        if ( !m_vbaListener.is() )
+                {
+            Reference < XPropertySet > xProps(
+            ::comphelper::getProcessServiceFactory(), UNO_QUERY );
+            if ( xProps.is() )
+            {
+                Reference< XComponentContext > xCtx( xProps->getPropertyValue(
+                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), UNO_QUERY );
+                if ( xCtx.is() )
+                {
+                    Reference< XMultiComponentFactory > xMFac( 
+                    xCtx->getServiceManager(), UNO_QUERY );
+                    SfxObjectShellRef xObjSh = pModel->GetObjectShell();
+                    Reference< XMultiServiceFactory > xDocFac;
+                    if ( xObjSh.Is() )
+                        xDocFac.set( xObjSh->GetModel(), UNO_QUERY );
+  
+                    if ( xMFac.is() )
+                    {
+                        m_vbaListener.set( xMFac->createInstanceWithContext( 
+                            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
+                                "ooo.vba.EventListener"  ) ), xCtx ), 
+                                    UNO_QUERY_THROW );
+                    }
+                }
+            }
+        }
         Reference< XPropertySet > xProps( m_vbaListener, UNO_QUERY );
         if ( xProps.is() )
         {
diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx
index 0df6f9d86e..17c2776de0 100644
--- a/svx/source/form/fmview.cxx
+++ b/svx/source/form/fmview.cxx
@@ -339,8 +339,6 @@ void FmFormView::GrabFirstControlFocus( sal_Bool _bForceSync )
 //------------------------------------------------------------------------
 SdrPageView* FmFormView::ShowSdrPage(SdrPage* pPage)
 {
-    OSL_TRACE( "--- FmFormView::ShowSdrPage      : ........, %p, %p", this, pPage );
-
     SdrPageView* pPV = E3dView::ShowSdrPage(pPage);
 
     if (pPage)
@@ -377,8 +375,6 @@ SdrPageView* FmFormView::ShowSdrPage(SdrPage* pPage)
 //------------------------------------------------------------------------
 void FmFormView::HideSdrPage()
 {
-    OSL_TRACE( "--- FmFormView::HideSdrPage      : ........, %p, %p", this, GetCurPage() );
-
     // --- 1. deactivate controls
     if ( !IsDesignMode() )
         DeactivateControls(GetSdrPageView());
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index 8d75e4a882..802cbb59dd 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -823,6 +823,48 @@ void FmXFormView::AutoFocus( sal_Bool _bSync )
     else
         m_nAutoFocusEvent = Application::PostUserEvent(LINK(this, FmXFormView, OnAutoFocus));
 }
+
+// -----------------------------------------------------------------------------
+bool FmXFormView::isFocusable( const Reference< XControl >& i_rControl )
+{
+    if ( !i_rControl.is() )
+        return false;
+
+    try
+    {
+        Reference< XPropertySet > xModelProps( i_rControl->getModel(), UNO_QUERY_THROW );
+
+        // only enabled controls are allowed to participate
+        sal_Bool bEnabled = sal_False;
+        OSL_VERIFY( xModelProps->getPropertyValue( FM_PROP_ENABLED ) >>= bEnabled );
+        if ( !bEnabled )
+            return false;
+
+        // check the class id of the control model
+        sal_Int16 nClassId = FormComponentType::CONTROL;
+        OSL_VERIFY( xModelProps->getPropertyValue( FM_PROP_CLASSID ) >>= nClassId );
+
+        // controls which are not focussable
+        if	(	( FormComponentType::CONTROL != nClassId )
+            &&	( FormComponentType::IMAGEBUTTON != nClassId )
+            &&	( FormComponentType::GROUPBOX != nClassId )
+            &&	( FormComponentType::FIXEDTEXT != nClassId )
+            &&	( FormComponentType::HIDDENCONTROL != nClassId )
+            &&	( FormComponentType::IMAGECONTROL != nClassId )
+            &&	( FormComponentType::SCROLLBAR != nClassId )
+            &&	( FormComponentType::SPINBUTTON!= nClassId )
+            )
+        {
+            return true;
+        }
+    }
+    catch( const Exception& e )
+    {
+        DBG_UNHANDLED_EXCEPTION();
+    }
+    return false;
+}
+
 // -----------------------------------------------------------------------------
 static Reference< XControl > lcl_firstFocussableControl( const Sequence< Reference< XControl > >& _rControls )
 {
@@ -833,47 +875,19 @@ static Reference< XControl > lcl_firstFocussableControl( const Sequence< Referen
     const Reference< XControl >* pControlsEnd = _rControls.getConstArray() + _rControls.getLength();
     for ( ; pControls != pControlsEnd; ++pControls )
     {
-        try
-        {
-            if ( !pControls->is() )
-                continue;
-
-            Reference< XPropertySet > xModelProps( (*pControls)->getModel(), UNO_QUERY_THROW );
-
-            // only enabled controls are allowed to participate
-            sal_Bool bEnabled = sal_False;
-            OSL_VERIFY( xModelProps->getPropertyValue( FM_PROP_ENABLED ) >>= bEnabled );
-            if ( !bEnabled )
-                continue;
-
-            // check the class id of the control model
-            sal_Int16 nClassId = FormComponentType::CONTROL;
-            OSL_VERIFY( xModelProps->getPropertyValue( FM_PROP_CLASSID ) >>= nClassId );
-
-            // controls which are not focussable
-            if	(	( FormComponentType::CONTROL != nClassId )
-                &&	( FormComponentType::IMAGEBUTTON != nClassId )
-                &&	( FormComponentType::GROUPBOX != nClassId )
-                &&	( FormComponentType::FIXEDTEXT != nClassId )
-                &&	( FormComponentType::HIDDENCONTROL != nClassId )
-                &&	( FormComponentType::IMAGECONTROL != nClassId )
-                &&	( FormComponentType::SCROLLBAR != nClassId )
-                &&	( FormComponentType::SPINBUTTON!= nClassId )
-                )
-            {
-                xReturn = *pControls;
-                break;
-            }
-        }
-        catch( const Exception& e )
+        if ( !pControls->is() )
+            continue;
+
+        if ( FmXFormView::isFocusable( *pControls ) )
         {
-            (void)e;	// make compiler happy
+            xReturn = *pControls;
+            break;
         }
-
-        if ( !xReturn.is() && _rControls.getLength() )
-            xReturn = _rControls[0];
     }
 
+    if ( !xReturn.is() && _rControls.getLength() )
+        xReturn = _rControls[0];
+
     return xReturn;
 }
 
@@ -1008,11 +1022,6 @@ IMPL_LINK(FmXFormView, OnAutoFocus, void*, /*EMPTYTAG*/)
 }
 
 // -----------------------------------------------------------------------------
-namespace
-{
-}
-
-// -----------------------------------------------------------------------------
 void FmXFormView::onCreatedFormObject( FmFormObj& _rFormObject )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::onCreatedFormObject" );
@@ -1590,7 +1599,13 @@ bool FmXFormView::createControlLabelPair( const ::comphelper::ComponentContext&
         xLabelModel.set( pLabel->GetUnoControlModel(), UNO_QUERY );
         if ( xLabelModel.is() )
         {
-            xLabelModel->setPropertyValue( FM_PROP_LABEL, makeAny( sFieldName + _rFieldPostfix ) );
+            ::rtl::OUString sLabel;
+            if ( _rxField.is() && _rxField->getPropertySetInfo()->hasPropertyByName(FM_PROP_LABEL) )
+                _rxField->getPropertyValue(FM_PROP_LABEL) >>= sLabel;
+            if ( !sLabel.getLength() )
+                sLabel = sFieldName;
+
+            xLabelModel->setPropertyValue( FM_PROP_LABEL, makeAny( sLabel + _rFieldPostfix ) );
             String sObjectLabel( SVX_RES( RID_STR_OBJECT_LABEL ) );
             sObjectLabel.SearchAndReplaceAllAscii( "#object#", sFieldName );
             xLabelModel->setPropertyValue( FM_PROP_NAME, makeAny( ::rtl::OUString( sObjectLabel ) ) );
diff --git a/svx/source/form/formcontrolfactory.cxx b/svx/source/form/formcontrolfactory.cxx
index 089b6986e0..e68d525f52 100644
--- a/svx/source/form/formcontrolfactory.cxx
+++ b/svx/source/form/formcontrolfactory.cxx
@@ -40,6 +40,7 @@
 #include <com/sun/star/form/XFormComponent.hpp>
 #include <com/sun/star/form/FormComponentType.hpp>
 #include <com/sun/star/awt/ScrollBarOrientation.hpp>
+#include <com/sun/star/awt/MouseWheelBehavior.hpp>
 #include <com/sun/star/form/XGridColumnFactory.hpp>
 #include <com/sun/star/style/VerticalAlignment.hpp>
 #include <com/sun/star/awt/LineEndFormat.hpp>
@@ -97,6 +98,7 @@ namespace svxform
     /** === end UNO using === **/
     namespace FormComponentType = ::com::sun::star::form::FormComponentType;
     namespace ScrollBarOrientation = ::com::sun::star::awt::ScrollBarOrientation;
+    namespace MouseWheelBehavior = ::com::sun::star::awt::MouseWheelBehavior;
     namespace LineEndFormat = ::com::sun::star::awt::LineEndFormat;
     namespace ImageScaleMode = ::com::sun::star::awt::ImageScaleMode;
     namespace DataType = ::com::sun::star::sdbc::DataType;
@@ -506,6 +508,12 @@ namespace svxform
                 _rxControlModel->setPropertyValue( FM_PROP_STRICTFORMAT, makeAny( sal_Bool( sal_True ) ) );
             }
 
+            // mouse wheel: don't use it for scrolling by default (i110036)
+            if ( xPSI->hasPropertyByName( FM_PROP_MOUSE_WHEEL_BEHAVIOR ) )
+            {
+                _rxControlModel->setPropertyValue( FM_PROP_MOUSE_WHEEL_BEHAVIOR, makeAny( MouseWheelBehavior::SCROLL_DISABLED ) );
+            }
+
             if ( xPSI->hasPropertyByName( FM_PROP_WRITING_MODE ) )
                 _rxControlModel->setPropertyValue( FM_PROP_WRITING_MODE, makeAny( WritingMode2::CONTEXT ) );
         }
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx
index 4e1a0b3f95..2adf2854ed 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -2232,7 +2232,7 @@ namespace svxform
             {
                 SdrPaintWindow* pPaintWindow = pFormView->GetPaintWindow( i );
                 OutputDevice& rOutDev = pPaintWindow->GetOutputDevice();
-                if ( OUTDEV_WINDOW == rOutDev.GetOutDevType() )
+                if ( ( OUTDEV_WINDOW == rOutDev.GetOutDevType() ) && !aMarkRect.IsEmpty() )
                 {
                     pFormView->MakeVisible( aMarkRect, (Window&)rOutDev );
                 }
diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx
index 0165212e24..8ecaa916ea 100644
--- a/svx/source/form/tabwin.cxx
+++ b/svx/source/form/tabwin.cxx
@@ -91,9 +91,46 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::form;
 using namespace ::com::sun::star::container;
+using namespace ::com::sun::star;
 using namespace ::svxform;
 using namespace ::svx;
 
+
+struct ColumnInfo
+{
+    ::rtl::OUString sColumnName;
+    ::rtl::OUString sLabel;
+    bool bColumn;
+    ColumnInfo(const ::rtl::OUString& i_sColumnName,const ::rtl::OUString& i_sLabel) 
+        : sColumnName(i_sColumnName)
+        , sLabel(i_sLabel)
+        , bColumn(true)
+    {
+    }
+    ColumnInfo(const ::rtl::OUString& i_sColumnName) 
+        : sColumnName(i_sColumnName)
+        , bColumn(false)
+    {
+    }
+};
+
+void lcl_addToList( SvTreeListBox& _rListBox, const uno::Reference< container::XNameAccess>& i_xColumns )
+{
+    uno::Sequence< ::rtl::OUString > aEntries = i_xColumns->getElementNames();
+    const ::rtl::OUString* pEntries = aEntries.getConstArray();
+    sal_Int32 nEntries = aEntries.getLength();
+    for ( sal_Int32 i = 0; i < nEntries; ++i, ++pEntries )
+    {
+        uno::Reference< beans::XPropertySet> xColumn(i_xColumns->getByName(*pEntries),UNO_QUERY_THROW);
+        ::rtl::OUString sLabel;
+        if ( xColumn->getPropertySetInfo()->hasPropertyByName(FM_PROP_LABEL) )
+            xColumn->getPropertyValue(FM_PROP_LABEL) >>= sLabel;
+        if ( sLabel.getLength() )
+            _rListBox.InsertEntry( sLabel,NULL,FALSE,LIST_APPEND,new ColumnInfo(*pEntries,sLabel) );
+        else
+            _rListBox.InsertEntry( *pEntries,NULL,FALSE,LIST_APPEND,new ColumnInfo(*pEntries,sLabel) );
+    }
+}
 //==================================================================
 // class FmFieldWinListBox
 //==================================================================
@@ -149,7 +186,8 @@ void FmFieldWinListBox::StartDrag( sal_Int8 /*_nAction*/, const Point& /*_rPosPi
     aDescriptor[ daConnection ] <<= pTabWin->GetConnection().getTyped();
     aDescriptor[ daCommand ]    <<= pTabWin->GetObjectName();
     aDescriptor[ daCommandType ]<<= pTabWin->GetObjectType();
-    aDescriptor[ daColumnName ] <<= ::rtl::OUString( GetEntryText( pSelected ) );
+    ColumnInfo* pInfo = static_cast<ColumnInfo*>(pSelected->GetUserData());
+    aDescriptor[ daColumnName ]	<<= pInfo->sColumnName;
 
     TransferableHelper* pTransferColumn = new OColumnTransferable(
         aDescriptor, CTF_FIELD_DESCRIPTOR | CTF_CONTROL_EXCHANGE | CTF_COLUMN_DESCRIPTOR
@@ -238,7 +276,8 @@ sal_Bool FmFieldWin::createSelectionControls( )
 
         aDescr[ daCommand ]		<<= GetObjectName();
         aDescr[ daCommandType ]	<<= GetObjectType();
-        aDescr[ daColumnName ]	<<= ::rtl::OUString( pListBox->GetEntryText( pSelected) );
+        ColumnInfo* pInfo = static_cast<ColumnInfo*>(pSelected->GetUserData());
+        aDescr[ daColumnName ]	<<= pInfo->sColumnName;//::rtl::OUString( pListBox->GetEntryText( pSelected) );
 
         // transfer this to the SFX world
         SfxUnoAnyItem aDescriptorItem( SID_FM_DATACCESS_DESCRIPTOR, makeAny( aDescr.createPropertyValueSequence() ) );
@@ -344,15 +383,14 @@ void FmFieldWin::UpdateContent(const ::com::sun::star::uno::Reference< ::com::su
         // the place, and connectRowset should be replaced with ensureRowSetConnection
 
         // get the fields of the object
-        Sequence< ::rtl::OUString> aFieldNames;
+        
         if ( m_aConnection.is() && m_aObjectName.getLength() )
-            aFieldNames = getFieldNamesByCommandDescriptor( m_aConnection, m_nObjectType, m_aObjectName );
-
-        // put them into the list
-        const ::rtl::OUString* pFieldNames = aFieldNames.getConstArray();
-        sal_Int32 nFieldsCount = aFieldNames.getLength();
-        for ( sal_Int32 i = 0; i < nFieldsCount; ++i, ++pFieldNames)
-            pListBox->InsertEntry( * pFieldNames);
+        {
+            Reference< XComponent > xKeepFieldsAlive;
+            Reference< XNameAccess > xColumns = getFieldsByCommandDescriptor( m_aConnection, m_nObjectType, m_aObjectName,xKeepFieldsAlive );
+            if ( xColumns.is() )
+                lcl_addToList(*pListBox,xColumns);
+        }       
 
         // Prefix setzen
         UniString  aPrefix;
diff --git a/svx/source/inc/fmprop.hrc b/svx/source/inc/fmprop.hrc
index 981fd384f0..d9f49b2fcc 100644
--- a/svx/source/inc/fmprop.hrc
+++ b/svx/source/inc/fmprop.hrc
@@ -174,5 +174,6 @@
 #define FM_PROP_INPUT_REQUIRED               rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "InputRequired" ) )
 #define FM_PROP_WRITING_MODE                 rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "WritingMode" ) )
 #define FM_PROP_MOUSE_WHEEL_BEHAVIOR         rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MouseWheelBehavior" ) )
+#define FM_PROP_DESCRIPTION					rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Description" ) )
 
 #endif // _SVX_FMPROP_HRC
diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx
index 957d737a1b..e90391d138 100644
--- a/svx/source/inc/fmshimp.hxx
+++ b/svx/source/inc/fmshimp.hxx
@@ -163,6 +163,7 @@ typedef ::utl::ConfigItem					FmXFormShell_CFGBASE;
 struct SdrViewEvent;
 class FmFormShell;
 class FmFormView;
+class FmFormObj;
 class SAL_DLLPRIVATE FmXFormShell   :public FmXFormShell_BASE
                                     ,public FmXFormShell_CFGBASE
                                     ,public ::svxform::OStaticDataAccessTools
@@ -349,8 +350,11 @@ protected:
     void startListening();
     void stopListening();
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>	GetControlFromModel(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel>& xModel);
-        // liefert das Control, welches das angegebene Model hat
+    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >
+        impl_getControl(
+            const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel>& i_rxModel,
+            const FmFormObj& i_rKnownFormObj
+        );
 
     // sammelt in strNames die Namen aller Formulare
     static void impl_collectFormSearchContexts_nothrow(
@@ -477,6 +481,9 @@ public:
         // if the form belongs to the controller (extern) displaying a grid, the according internal form will
         // be displayed, _xForm else
 
+    // check if the current control of the active controler has the focus
+    bool    HasControlFocus() const;
+
 private:
     DECL_LINK(OnFoundData, FmFoundRecordInformation*);
     DECL_LINK(OnCanceledNotFound, FmFoundRecordInformation*);
diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx
index 84a941ae1e..4087d8b1f4 100644
--- a/svx/source/inc/fmvwimp.hxx
+++ b/svx/source/inc/fmvwimp.hxx
@@ -240,6 +240,11 @@ public:
 
     void    onCreatedFormObject( FmFormObj& _rFormObject );
 
+    static bool
+            isFocusable(
+                const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& i_rControl
+            );
+
 private:
     FmWinRecList::iterator findWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& _rxCC );
     //void addWindow(const SdrPageViewWinRec*);
diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx
index 9c1e7cf359..31bd37114c 100644
--- a/svx/source/inc/gridcell.hxx
+++ b/svx/source/inc/gridcell.hxx
@@ -219,6 +219,7 @@ class DbCellControl
 {
 private:
     ::comphelper::OPropertyChangeMultiplexer*	m_pModelChangeBroadcaster;
+    ::comphelper::OPropertyChangeMultiplexer*	m_pFieldChangeBroadcaster;
 
 private:
     sal_Bool					m_bTransparent : 1;
@@ -348,7 +349,7 @@ private:
     void implDoPropertyListening( const ::rtl::OUString& _rPropertyName, sal_Bool _bWarnIfNotExistent = sal_True );
 
     /// updates the "readonly" setting on m_pWindow, according to the respective property value in the given model
-    void implAdjustReadOnly( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxModel );
+    void implAdjustReadOnly( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxModel,bool i_bReadOnly );
 
     /// updates the "enabled" setting on m_pWindow, according to the respective property value in the given model
     void implAdjustEnabled( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxModel );
diff --git a/svx/source/intro/iso.src b/svx/source/intro/iso.src
index d1fcbc3420..a7395f49be 100644
--- a/svx/source/intro/iso.src
+++ b/svx/source/intro/iso.src
@@ -30,7 +30,7 @@
 #endif
 
 #ifndef _SVTOOLS_HRC
-#include <svl/svtools.hrc>
+#include <svtools/svtools.hrc>
 #endif
 
 #include "intro.hrc"
diff --git a/svx/source/intro/ooo.src b/svx/source/intro/ooo.src
index 4c17838687..074c9b305f 100644
--- a/svx/source/intro/ooo.src
+++ b/svx/source/intro/ooo.src
@@ -26,7 +26,7 @@
  ************************************************************************/
 
 #ifndef _SVTOOLS_HRC
-#include <svl/svtools.hrc>
+#include <svtools/svtools.hrc>
 #endif
 
 #ifndef _SVTOOLS_IMAGEMGR_HRC
diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
index 3b53a9c543..c94a9bf054 100644
--- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
@@ -299,10 +299,14 @@ namespace sdr { namespace contact {
     //--------------------------------------------------------------------
     void ControlHolder::invalidate() const
     {
-        Window* pWindow = VCLUnoHelper::GetWindow( m_xControl->getPeer() );
-        OSL_ENSURE( pWindow, "ControlHolder::invalidate: no implementation access!" );
-        if ( pWindow )
-            pWindow->Invalidate();
+        Reference< XWindowPeer > xPeer( m_xControl->getPeer() );
+        if ( xPeer.is() )
+        {
+            Window* pWindow = VCLUnoHelper::GetWindow( xPeer );
+            OSL_ENSURE( pWindow, "ControlHolder::invalidate: no implementation access!" );
+            if ( pWindow )
+                pWindow->Invalidate();
+        }
     }
 
     //--------------------------------------------------------------------
@@ -1689,6 +1693,9 @@ namespace sdr { namespace contact {
         if ( !bHadControl && rControl.is() && rControl.isVisible() )
             rControl.invalidate();
 
+        if ( !bHadControl && rControl.is() && rControl.isVisible() )
+            rControl.invalidate();
+
         // check if we already have an XControl.
         if ( !xControlModel.is() || !rControl.is() )
             // use the default mechanism. This will create a ControlPrimitive2D without
diff --git a/svx/source/sdr/overlay/overlaybitmapex.cxx b/svx/source/sdr/overlay/overlaybitmapex.cxx
index ad35d659ee..693c880dfb 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/unifiedtransparenceprimitive2d.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::UnifiedTransparencePrimitive2D(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/sdr/properties/attributeproperties.cxx b/svx/source/sdr/properties/attributeproperties.cxx
index 2bc06ea473..1661c4d562 100644
--- a/svx/source/sdr/properties/attributeproperties.cxx
+++ b/svx/source/sdr/properties/attributeproperties.cxx
@@ -259,6 +259,8 @@ namespace sdr
 
         void AttributeProperties::MoveToItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, SdrModel* pNewModel)
         {
+            OSL_ASSERT(pNewModel!=NULL);
+
             if(pSrcPool && pDestPool && (pSrcPool != pDestPool))
             {
                 if(mpItemSet)
@@ -281,7 +283,35 @@ namespace sdr
                     // set stylesheet (if used)
                     if(pStySheet)
                     {
-                        ImpAddStyleSheet(pStySheet, sal_True);
+                        // #i109515#
+                        SfxItemPool* pStyleSheetPool = &pStySheet->GetPool().GetPool();
+                        
+                        if(pStyleSheetPool == pDestPool)
+                        {
+                            // just re-set stylesheet
+                            ImpAddStyleSheet(pStySheet, sal_True);
+                        }
+                        else
+                        {
+                            // StyleSheet is NOT from the correct pool.
+                            // Look one up in the right pool with the same
+                            // name or use the default.
+
+                            // Look up the style in the new document.
+                            OSL_ASSERT(pNewModel->GetStyleSheetPool() != NULL);
+                            SfxStyleSheet* pNewStyleSheet = dynamic_cast<SfxStyleSheet*>(
+                                pNewModel->GetStyleSheetPool()->Find(
+                                    pStySheet->GetName(),
+                                    SFX_STYLE_FAMILY_ALL));
+                            if (pNewStyleSheet == NULL
+                                || &pNewStyleSheet->GetPool().GetPool() != pDestPool)
+                            {
+                                // There is no copy of the style in the new
+                                // document.  Use the default as a fallback.
+                                pNewStyleSheet = pNewModel->GetDefaultStyleSheet();
+                            }
+                            ImpAddStyleSheet(pNewStyleSheet, sal_True);
+                        }
                     }
 
                     delete pOldSet;
diff --git a/svx/source/svdraw/makefile.mk b/svx/source/svdraw/makefile.mk
index 0108615b10..514c5b6d2c 100644
--- a/svx/source/svdraw/makefile.mk
+++ b/svx/source/svdraw/makefile.mk
@@ -113,8 +113,6 @@ LIB1OBJFILES= \
 
 LIB2TARGET= $(SLB)$/$(TARGET).lib
 LIB2OBJFILES= \
-         $(SLO)$/svdoimp.obj         \
-         $(SLO)$/svdscrol.obj        \
          $(SLO)$/ActionDescriptionProvider.obj \
          $(SLO)$/impgrfll.obj
 
diff --git a/svx/source/svdraw/svdcrtmt.hxx b/svx/source/svdraw/svdcrtmt.hxx
deleted file mode 100644
index 2b99c4a550..0000000000
--- a/svx/source/svdraw/svdcrtmt.hxx
+++ /dev/null
@@ -1,32 +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 _SVDCRTMT_HXX
-#define _SVDCRTMT_HXX
-
-#endif //_SVDCRTMT_HXX
-
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 6fb8f14ec2..880c48ecfb 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 5711ed7d80..36eba23915 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(const MouseEvent& /*rMEvt*/)
+{
+}
+
+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 658b63d6fa..59d1eee267 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(rMEvt);
+        }
+    }
+    return SdrSnapView::MouseMove(rMEvt, pWin);
+}
+
 void SdrMarkView::ForceRefToMarked()
 {
     switch(eDragMode)
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 03a7d30e92..6beb3dba74 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -700,7 +700,10 @@ void SdrObjCustomShape::MergeDefaultAttributes( const rtl::OUString* pType )
         for ( i = 0; i < nCount; i++ )
         {
             if ( seqAdjustmentValues[ i ].State != com::sun::star::beans::PropertyState_DIRECT_VALUE )
+            {
                 seqAdjustmentValues[ i ].Value <<= pDefData[ i ];
+                seqAdjustmentValues[ i ].State = com::sun::star::beans::PropertyState_DIRECT_VALUE;
+            }
         }
     }
     aPropVal.Name = sAdjustmentValues;
@@ -2075,7 +2078,7 @@ void SdrObjCustomShape::ImpCheckCustomGluePointsAreAdded()
                     sal_Int32 nXDiff = aBoundRect.Left() - aRect.Left();
                     sal_Int32 nYDiff = aBoundRect.Top() - aRect.Top();
 
-                    if (nShearWink&&(bMirroredX&&!bMirroredY)||(bMirroredY&&!bMirroredX))
+                    if (nShearWink&&((bMirroredX&&!bMirroredY)||(bMirroredY&&!bMirroredX)))
                     {
                         nShearWink = -nShearWink;
                         fTan = -fTan;
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 0e910b9e2e..8e8951b21a 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -47,7 +47,6 @@
 #include <svx/svdpage.hxx>
 #include <svx/svdovirt.hxx>  // Fuer Add/Del Ref
 #include <svx/svdview.hxx>   // fuer Dragging (Ortho abfragen)
-#include "svdscrol.hxx"
 #include "svdglob.hxx"   // StringCache
 #include "svdstr.hrc"    // Objektname
 #include <svx/svdogrp.hxx>   // Factory
@@ -121,6 +120,7 @@
 #include <svx/sdrhittesthelper.hxx>
 #include <svx/svdundo.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
+#include <svx/sdrobjectfilter.hxx>
 
 using namespace ::com::sun::star;
 
@@ -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();
@@ -3266,4 +3271,11 @@ void SdrObjFactory::RemoveMakeUserDataHdl(const Link& rLink)
     rLL.RemoveLink(rLink);
 }
 
+namespace svx
+{
+    ISdrObjectFilter::~ISdrObjectFilter()
+    {
+    }
+}
+
 // eof
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 801609ae89..4225d599ff 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/svdoimp.cxx b/svx/source/svdraw/svdoimp.cxx
deleted file mode 100644
index 4362f5599e..0000000000
--- a/svx/source/svdraw/svdoimp.cxx
+++ /dev/null
@@ -1,33 +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 <svdoimp.hxx>
-
-///////////////////////////////////////////////////////////////////////////////
-// eof
diff --git a/svx/source/svdraw/svdomedia.cxx b/svx/source/svdraw/svdomedia.cxx
index d6fc98c9a2..88651ed5b2 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/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 173abeba43..b65bde818f 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -35,7 +35,6 @@
 #include <svx/svdpage.hxx>  // und fuer AnimationHandler (Laufschrift)
 #include <svx/svdetc.hxx>
 #include <svx/svdoutl.hxx>
-#include "svdscrol.hxx"  // fuer Laufschrift
 #include <svx/svdmodel.hxx>  // OutlinerDefaults
 #include "svdglob.hxx"  // Stringcache
 #include "svdstr.hrc"   // Objektname
diff --git a/svx/source/svdraw/svdscrol.cxx b/svx/source/svdraw/svdscrol.cxx
deleted file mode 100644
index 0e7ebaf7eb..0000000000
--- a/svx/source/svdraw/svdscrol.cxx
+++ /dev/null
@@ -1,33 +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 "svdscrol.hxx"
-
-// eof
diff --git a/svx/source/svdraw/svdscrol.hxx b/svx/source/svdraw/svdscrol.hxx
deleted file mode 100644
index bf900c6380..0000000000
--- a/svx/source/svdraw/svdscrol.hxx
+++ /dev/null
@@ -1,31 +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 _SVDSCROL_HXX
-#define _SVDSCROL_HXX
-
-#endif //_SVDSCROL_HXX
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index 311678c5ba..4670b92c4b 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 8fa586b76e..9dac57ead2 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 f178395199..86efecf955 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 ) ) );
-
-    SetOutputSizePixel( mpMenu->getMenuSize() );
-    mpMenu->SetOutputSizePixel( GetOutputSizePixel() );
+    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 ) ) );
 
-    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 );
+        }
+        else
+        {
+            double fValue = 0.0;
+            if( Event.State >>= fValue )
+                implSetDepth( fValue );
         }
-        case SID_ATTR_METRIC:
+    }
+    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
         {
@@ -689,22 +501,13 @@ 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 );
+    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 );
 
-    SetOutputSizePixel( mpMenu->getMenuSize() );
-    mpMenu->SetOutputSizePixel( GetOutputSizePixel() );
-
-    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 )
-{
-    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 )
+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();
-}
-
-// -----------------------------------------------------------------------
-
-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 ) );
-
-    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 );
+    SetHelpId( HID_MENU_EXTRUSION_SURFACE );
+    SetSelectHdl( LINK( this, ExtrusionSurfaceWindow, SelectHdl ) );
 
-    SetOutputSizePixel( mpMenu->getMenuSize() );
-    mpMenu->SetOutputSizePixel( GetOutputSizePixel() );
+    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 );
 
-    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 0000000000..4dc979c2a7
--- /dev/null
+++ b/svx/source/tbxctrls/extrusioncontrols.hxx
@@ -0,0 +1,260 @@
+/*************************************************************************
+ *
+ * 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 );       
+
+    using svt::PopupWindowController::createPopupWindow;
+};
+
+//========================================================================
+
+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 );       
+
+    using svt::PopupWindowController::createPopupWindow;
+};
+
+//========================================================================
+
+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 );       
+    
+    using svt::PopupWindowController::createPopupWindow;
+};
+
+//========================================================================
+
+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 );       
+
+    using svt::PopupWindowController::createPopupWindow;
+};
+
+//========================================================================
+
+}
+#endif
+
diff --git a/svx/source/tbxctrls/extrusioncontrols.src b/svx/source/tbxctrls/extrusioncontrols.src
index 37447b3cba..8262348890 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 ;
@@ -199,10 +199,10 @@ FloatingWindow RID_SVXFLOAT_EXTRUSION_DIRECTION
         Text [ en-US ] = "Extrusion South-East";
     };
 };
-
-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 2ea1f2046e..06d36f0d95 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,191 @@ 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 );
 
-BOOL FontWorkAlignmentWindow::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 );       
 
-// -----------------------------------------------------------------------
+    using  svt::PopupWindowController::createPopupWindow;
+};
 
-void FontWorkAlignmentWindow::PopupModeEnd()
-{
-    if ( IsVisible() )
-    {
-        mbPopupMode = FALSE;
-    }
-    SfxPopupWindow::PopupModeEnd();
-}
 
 // -----------------------------------------------------------------------
 
-void FontWorkAlignmentWindow::GetFocus (void)
+FontWorkAlignmentControl::FontWorkAlignmentControl( const Reference< lang::XMultiServiceFactory >& rServiceManager )
+: svt::PopupWindowController( rServiceManager, Reference< frame::XFrame >(), OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontworkAlignment" ) ) )
 {
-    SfxPopupWindow::GetFocus();
-    // Grab the focus to the line ends value set so that it can be controlled
-    // with the keyboard.
-    if( mpMenu )
-        mpMenu->GrabFocus();
 }
 
-// ========================================================================
+// -----------------------------------------------------------------------
 
-FontWorkAlignmentControl::FontWorkAlignmentControl(
-    USHORT nSlotId, USHORT nId, ToolBox &rTbx )
-: SfxToolBoxControl( nSlotId, nId, rTbx )
+::Window* FontWorkAlignmentControl::createPopupWindow( ::Window* pParent )
 {
-    rTbx.SetItemBits( nId, TIB_DROPDOWNONLY | rTbx.GetItemBits( nId ) );
+    return new FontWorkAlignmentWindow( *this, m_xFrame, pParent );
 }
 
 // -----------------------------------------------------------------------
+// XServiceInfo
+// -----------------------------------------------------------------------
 
-FontWorkAlignmentControl::~FontWorkAlignmentControl()
+OUString SAL_CALL FontWorkAlignmentControl_getImplementationName()
 {
+    return OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svx.FontWorkAlignmentController" ));
 }
 
-// -----------------------------------------------------------------------
+// --------------------------------------------------------------------
 
-SfxPopupWindowType FontWorkAlignmentControl::GetPopupWindowType() const
+Sequence< OUString > SAL_CALL FontWorkAlignmentControl_getSupportedServiceNames() throw( RuntimeException )
 {
-    return SFX_POPUPWINDOW_ONCLICK;
+    Sequence< OUString > aSNS( 1 );
+    aSNS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ToolbarController" ));
+    return aSNS;
 }
 
-// -----------------------------------------------------------------------
+// --------------------------------------------------------------------
 
-SfxPopupWindow*	FontWorkAlignmentControl::CreatePopupWindow()
+Reference< XInterface > SAL_CALL SAL_CALL FontWorkAlignmentControl_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) throw( RuntimeException )
 {
-    FontWorkAlignmentWindow* pWin = new FontWorkAlignmentWindow( GetId(), m_xFrame, &GetToolBox() );
-    pWin->StartPopupMode( &GetToolBox(), TRUE );
-    pWin->StartSelection();
-    SetPopupWindow( pWin );
-    return pWin;
+    return *new FontWorkAlignmentControl( rSMgr );
 }
 
-// -----------------------------------------------------------------------
+// --------------------------------------------------------------------
 
-void FontWorkAlignmentControl::StateChanged( USHORT /*nSID*/, SfxItemState eState, const SfxPoolItem* /*pState*/ )
+OUString SAL_CALL FontWorkAlignmentControl::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 FontWorkAlignmentControl_getImplementationName();
 }
 
-// ####################################################################
-
-SFX_IMPL_TOOLBOX_CONTROL( FontWorkCharacterSpacingControl, SfxBoolItem );
+// --------------------------------------------------------------------
 
-FontWorkCharacterSpacingWindow::FontWorkCharacterSpacingWindow( 
-    USHORT nId,
-    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame ) :
-
-    SfxPopupWindow( nId, 
-                    rFrame,
-                    SVX_RES( RID_SVXFLOAT_FONTWORK_CHARSPACING )),
-    mxFrame( rFrame ),
-    mbPopupMode( true )
+Sequence< OUString > SAL_CALL FontWorkAlignmentControl::getSupportedServiceNames(  ) throw (RuntimeException)
 {
-    SetHelpId( HID_WIN_FONTWORK_CHARSPACE );
-    implInit();
+    return FontWorkAlignmentControl_getSupportedServiceNames();
 }
 
-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()
+class FontWorkCharacterSpacingWindow : public ToolbarMenu
 {
-    SetHelpId( HID_POPUP_FONTWORK_CHARSPACE );
+public:
+    FontWorkCharacterSpacingWindow( svt::ToolboxController& rController, const Reference< XFrame >& rFrame, Window* pParentWindow );
 
-//	bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
+    virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException );
+private:
+    svt::ToolboxController& mrController;
 
-    mpMenu = new ToolbarMenu( this, WB_CLIPCHILDREN );
-    mpMenu->SetHelpId( HID_POPUP_FONTWORK_CHARSPACE );
-    mpMenu->SetSelectHdl( LINK( this, FontWorkCharacterSpacingWindow, SelectHdl ) );
+    const rtl::OUString msFontworkCharacterSpacing;
+    const rtl::OUString msFontworkKernCharacterPairs;
 
-    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 );
+    DECL_LINK( SelectHdl, void * );
 
-    SetOutputSizePixel( mpMenu->getMenuSize() );
-    mpMenu->SetOutputSizePixel( GetOutputSizePixel() );
+    void	implSetCharacterSpacing( sal_Int32 nCharacterSpacing, bool bEnabled );
+    void	implSetKernCharacterPairs( sal_Bool bKernOnOff, bool bEnabled );
 
-    mpMenu->Show();
-
-    FreeResource();
+};
 
-    AddStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontworkCharacterSpacing" )));
-}
+// -----------------------------------------------------------------------
 
-SfxPopupWindow* FontWorkCharacterSpacingWindow::Clone() const
+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" ) )
 {
-    return new FontWorkCharacterSpacingWindow( GetId(), mxFrame );
-}
+    SetHelpId( HID_POPUP_FONTWORK_CHARSPACE );
+    SetSelectHdl( LINK( this, FontWorkCharacterSpacingWindow, SelectHdl ) );
 
-// -----------------------------------------------------------------------
+    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 );
 
-FontWorkCharacterSpacingWindow::~FontWorkCharacterSpacingWindow()
-{
-    delete mpMenu;
+    SetOutputSizePixel( getMenuSize() );
+
+    FreeResource();
+
+    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 +675,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 +688,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 +720,79 @@ 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 );       
 
-// -----------------------------------------------------------------------
+    using svt::PopupWindowController::createPopupWindow;
+};
 
-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 +814,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 7d5b20e3e6..f4d5e421bc 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 47da008e87..9b08caa587 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 e7cf418ce7..0000000000
--- 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 5b152fe4c6..0000000000
--- 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 1adb91606c..9b9a56dc48 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/unodialogs/textconversiondlgs/export.map b/svx/source/unodialogs/textconversiondlgs/export.map
deleted file mode 100644
index ff4971857d..0000000000
--- a/svx/source/unodialogs/textconversiondlgs/export.map
+++ /dev/null
@@ -1,8 +0,0 @@
-EXTDBI_1_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-        *;
-};
diff --git a/svx/source/unodialogs/textconversiondlgs/makefile.mk b/svx/source/unodialogs/textconversiondlgs/makefile.mk
index 6cdec3906c..b5013ca9d1 100644
--- a/svx/source/unodialogs/textconversiondlgs/makefile.mk
+++ b/svx/source/unodialogs/textconversiondlgs/makefile.mk
@@ -59,7 +59,7 @@ SHL1TARGET= txcnvdlg
 .ELSE
 SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
 .ENDIF
-SHL1VERSIONMAP= export.map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 
 SHL1STDLIBS= \
         $(CPPULIB)  \
diff --git a/svx/source/unodraw/unoctabl.cxx b/svx/source/unodraw/unoctabl.cxx
index 8e4a387893..5125998969 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 b7811bfde2..e62f770eb4 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/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 396b3e45f4..a6a6ca22e8 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * 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
@@ -358,7 +358,7 @@ const ::com::sun::star::uno::Sequence< sal_Int8 > & SvxShape::getUnoTunnelId() t
 }
 
 //----------------------------------------------------------------------
-SvxShape* SvxShape::getImplementation( const uno::Reference< uno::XInterface >& xInt ) 
+SvxShape* SvxShape::getImplementation( const uno::Reference< uno::XInterface >& xInt )
 {
     uno::Reference< lang::XUnoTunnel > xUT( xInt, ::com::sun::star::uno::UNO_QUERY );
     if( xUT.is() )
@@ -577,6 +577,37 @@ void SvxShape::ForceMetricToItemPoolMetric(Pair& rPoint) const throw()
 }
 
 //----------------------------------------------------------------------
+// --> OD 2010-02-19 #i108851# - reintroduction of fix for issue i59051
+void SvxShape::ForceMetricToItemPoolMetric(basegfx::B2DPolyPolygon& rPolyPolygon) const throw()
+{
+    DBG_TESTSOLARMUTEX();
+    if(mpModel)
+    {
+        SfxMapUnit eMapUnit = mpModel->GetItemPool().GetMetric(0);
+        if(eMapUnit != SFX_MAPUNIT_100TH_MM)
+        {
+            switch(eMapUnit)
+            {
+                case SFX_MAPUNIT_TWIP :
+                {
+                    basegfx::B2DHomMatrix aTransform;
+                    const double fMMToTWIPS(72.0 / 127.0);
+
+                    aTransform.scale(fMMToTWIPS, fMMToTWIPS);
+                    rPolyPolygon.transform(aTransform);
+                    break;
+                }
+                default:
+                {
+                    DBG_ERROR("Missing unit translation to PoolMetric!");
+                }
+            }
+        }
+    }
+}
+// <--
+
+//----------------------------------------------------------------------
 void SvxShape::ForceMetricTo100th_mm(Pair& rPoint) const throw()
 {
     DBG_TESTSOLARMUTEX();
@@ -604,6 +635,38 @@ void SvxShape::ForceMetricTo100th_mm(Pair& rPoint) const throw()
 }
 
 //----------------------------------------------------------------------
+// --> OD 2010-02-19 #i108851# - reintroduction of fix for issue i59051
+void SvxShape::ForceMetricTo100th_mm(basegfx::B2DPolyPolygon& rPolyPolygon) const throw()
+{
+    DBG_TESTSOLARMUTEX();
+    SfxMapUnit eMapUnit = SFX_MAPUNIT_100TH_MM;
+    if(mpModel)
+    {
+        eMapUnit = mpModel->GetItemPool().GetMetric(0);
+        if(eMapUnit != SFX_MAPUNIT_100TH_MM)
+        {
+            switch(eMapUnit)
+            {
+                case SFX_MAPUNIT_TWIP :
+                {
+                    basegfx::B2DHomMatrix aTransform;
+                    const double fTWIPSToMM(127.0 / 72.0);
+                    aTransform.scale(fTWIPSToMM, fTWIPSToMM);
+                    rPolyPolygon.transform(aTransform);
+                    break;
+                }
+                default:
+                {
+                    DBG_ERROR("Missing unit translation to 100th mm!");
+                }
+            }
+        }
+    }
+}
+// <--
+//----------------------------------------------------------------------
+
+
 //----------------------------------------------------------------------
 void SvxItemPropertySet_ObtainSettingsFromPropertySet(const SvxItemPropertySet& rPropSet,
   SfxItemSet& rSet, uno::Reference< beans::XPropertySet > xSet, const SfxItemPropertyMap* pMap )
@@ -635,7 +698,6 @@ void SvxItemPropertySet_ObtainSettingsFromPropertySet(const SvxItemPropertySet&
                         {
                             if(rSet.GetPool()->IsWhich(pEntry->nWID))
                                 rSet.Put(rSet.GetPool()->GetDefaultItem(pEntry->nWID));
-
                             // setzen
                             SvxItemPropertySet_setPropertyValue(rPropSet, pEntry, *pUsrAny, rSet);
                         }
@@ -650,7 +712,6 @@ void SvxItemPropertySet_ObtainSettingsFromPropertySet(const SvxItemPropertySet&
 }
 
 
-
 void SvxShape::ObtainSettingsFromPropertySet(const SvxItemPropertySet& rPropSet)
 {
     DBG_TESTSOLARMUTEX();
@@ -2505,10 +2566,15 @@ bool SvxShape::setPropertyValueImpl( const ::rtl::OUString&, const SfxItemProper
                     if( rValue >>= aUnoPoint )
                     {
                         Point aPoint( aUnoPoint.X, aUnoPoint.Y );
+
+                        // --> OD 2010-02-19 #i108851# - reintroduction of fix for issue i59051
+                        // perform metric change before applying anchor position,
+                        // because the anchor position is in pool metric.
+                        ForceMetricToItemPoolMetric( aPoint );
+                        // <--
                         if( mpModel->IsWriter() )
                             aPoint += mpObj->GetAnchorPos();
 
-                        ForceMetricToItemPoolMetric( aPoint );
                         pEdgeObj->SetTailPoint( pProperty->nWID == OWN_ATTR_EDGE_START_POS, aPoint );
                         return true;
                     }
@@ -2532,6 +2598,9 @@ bool SvxShape::setPropertyValueImpl( const ::rtl::OUString&, const SfxItemProper
                     if ( rValue >>= aPolyPoly )
                     {
                         basegfx::B2DPolyPolygon aNewPolyPolygon( SvxConvertPolyPolygonBezierToB2DPolyPolygon( &aPolyPoly ) );
+                        // --> OD 2010-02-19 #i108851# - reintroduction of fix for issue i59051
+                        ForceMetricToItemPoolMetric( aNewPolyPolygon );
+                        // <--
                         if( mpModel->IsWriter() )
                         {
                             Point aPoint( mpObj->GetAnchorPos() );
@@ -2554,6 +2623,9 @@ bool SvxShape::setPropertyValueImpl( const ::rtl::OUString&, const SfxItemProper
         {
             Point aPoint( aUnoPoint.X, aUnoPoint.Y );
 
+            // --> OD 2010-02-19 #i108851# - reintroduction of fix for issue i59051
+            ForceMetricToItemPoolMetric( aPoint );
+            // <--
             if( mpModel->IsWriter() )
                 aPoint += mpObj->GetAnchorPos();
 
@@ -2797,7 +2869,7 @@ bool SvxShape::getPropertyValueImpl( const ::rtl::OUString&, const SfxItemProper
         basegfx::B2DPolyPolygon aNewPolyPolygon;
         basegfx::B2DHomMatrix aNewHomogenMatrix;
         mpObj->TRGetBaseGeometry(aNewHomogenMatrix, aNewPolyPolygon);
-        
+
         aVclPoint.X() -= basegfx::fround(aNewHomogenMatrix.get(0, 2));
         aVclPoint.Y() -= basegfx::fround(aNewHomogenMatrix.get(1, 2));
 
@@ -2970,6 +3042,9 @@ bool SvxShape::getPropertyValueImpl( const ::rtl::OUString&, const SfxItemProper
                         Point aPoint( mpObj->GetAnchorPos() );
                         aPolyPoly.transform(basegfx::tools::createTranslateB2DHomMatrix(-aPoint.X(), -aPoint.Y()));
                     }
+                    // --> OD 2010-02-19 #i108851# - reintroduction of fix for issue 59051
+                    ForceMetricTo100th_mm( aPolyPoly );
+                    // <--
                     drawing::PolyPolygonBezierCoords aRetval;
                     SvxConvertB2DPolyPolygonToPolyPolygonBezier( aPolyPoly, aRetval);
                     rValue <<= aRetval;
@@ -2990,6 +3065,9 @@ bool SvxShape::getPropertyValueImpl( const ::rtl::OUString&, const SfxItemProper
             if( mpModel->IsWriter() )
                 aPoint -= mpObj->GetAnchorPos();
 
+            // --> OD 2010-02-19 #i108851# - reintroduction of fix for issue 59051
+            ForceMetricTo100th_mm( aPoint );
+            // <--
             awt::Point aUnoPoint( aPoint.X(), aPoint.Y() );
 
             rValue <<= aUnoPoint;