sb111: merged in DEV300_m70

170 files changed, 6413 insertions, 4693 deletions

diff --git a/basic/source/app/app.cxx b/basic/source/app/app.cxx
index 65af8f7e62..93bb3c3601 100644
--- a/basic/source/app/app.cxx
+++ b/basic/source/app/app.cxx
@@ -1366,19 +1366,10 @@ long BasicFrame::Command( short nID, BOOL bChecked )
 //			InitMenu(GetMenuBar()->GetPopupMenu( RID_APPRUN ));
             break;
         case RID_FILEPRINT:
-#ifndef UNX
             if( pWork )
                 pPrn->Print( pWork->GetText(), pWork->pDataEdit->GetText(), this );
-#else
-            InfoBox( this, SttResId( IDS_NOPRINTERERROR ) ).Execute();
-#endif
             break;
         case RID_FILESETUP:
-#ifndef UNX
-            pPrn->Setup();
-#else
-            InfoBox( this, SttResId( IDS_NOPRINTERERROR ) ).Execute();
-#endif
             break;
         case RID_QUIT:
             if( Close() ) aBasicApp.Quit();
diff --git a/basic/source/app/makefile.mk b/basic/source/app/makefile.mk
index 13c3b4a8b5..3a52f402b3 100644
--- a/basic/source/app/makefile.mk
+++ b/basic/source/app/makefile.mk
@@ -61,6 +61,7 @@ OBJFILES = \
 
 EXCEPTIONSFILES = \
     $(OBJ)$/app.obj \
+    $(OBJ)$/printer.obj     \
     $(OBJ)$/process.obj
 
 .IF "$(GUI)" == "WNT"
diff --git a/basic/source/app/printer.cxx b/basic/source/app/printer.cxx
index 424089c27e..d7ceedcf4f 100644
--- a/basic/source/app/printer.cxx
+++ b/basic/source/app/printer.cxx
@@ -64,35 +64,32 @@ public:
     void ChangeMessage( short );
 };
 
-BasicPrinter::BasicPrinter() : Printer()
+BasicPrinter::BasicPrinter() : mpPrinter( new Printer() )
 {
     nPage = 0; nLine = 9999;
-    SetMapMode( MapMode( MAP_POINT ) );
-    Size s( GetOutputSize() );
+    mpPrinter->SetMapMode( MapMode( MAP_POINT ) );
+    Size s( mpPrinter->GetOutputSize() );
     // Use 10 point font
     Font aFont( FAMILY_MODERN, Size( 0, 10 ) );
     aFont.SetPitch( PITCH_FIXED );
-    SetFont( aFont );
+    mpPrinter->SetFont( aFont );
     // Output: 6 Lines/Inch = 12 Point
     nLines = (short) s.Height() / 12;
     nYoff  = 12;
-    SetStartPrintHdl( LINK( this, BasicPrinter, StartPrintHdl ) );
-    SetEndPrintHdl( LINK( this, BasicPrinter, EndPrintHdl ) );
-    SetPrintPageHdl( LINK( this, BasicPrinter, PrintPageHdl ) );
 }
 
 void BasicPrinter::Header()
 {
-    if( nPage ) EndPage();
+    if( nPage ) mpListener->EndPage();
     nPage++;
-    StartPage();
+    mpListener->StartPage();
     String aHdr;
     String aPage( SttResId( IDS_PAGE ) );
     aPage.Append( String::CreateFromInt32(nPage) );
     aHdr = aFile.Copy( 0, 80 - aPage.Len() );
     aHdr.Expand( 80 - aPage.Len(), ' ' );
     aHdr += aPage;
-    DrawText( Point( 0, 0 ), aHdr );
+    mpPrinter->DrawText( Point( 0, 0 ), aHdr );
     nLine = 2;
 }
 
@@ -100,98 +97,29 @@ void BasicPrinter::Print( const String& rFile, const String& rText, BasicFrame *
 {
     nPage = 0; nLine = 9999;
     aFile = rFile;
-    // Setup dialog
-    SttResId aResId( IDD_PRINT_DIALOG );
-    pDlg = new PrintingDialog
-          ( aBasicApp.pFrame, this, aResId, aFile );
-    // Set position of dialog
-    Size s1 = aBasicApp.pFrame->GetSizePixel();
-    Size s2 = pDlg->GetSizePixel();
-    pDlg->SetPosPixel( Point( (s1.Width() - s2.Width() )  / 2,
-                                (s1.Height()- s2.Height() ) / 2 ) );
     // Disable PRINT-Menu
     MenuBar* pBar = pFrame->GetMenuBar();
     Menu* pFileMenu = pBar->GetPopupMenu( RID_APPFILE );
     pFileMenu->EnableItem( RID_FILEPRINT, FALSE );
 
-    pDlg->ChangeMessage( 1 );
-    pDlg->Show();
-    StartJob( rFile );
-    StartPage();
+    mpListener.reset( new vcl::OldStylePrintAdaptor( mpPrinter ) );
+    mpListener->StartPage();
     xub_StrLen nDone=0;
     while( nDone < rText.Len() )
     {
         if( nLine >= nLines ) Header();
         xub_StrLen nLineEnd = std::min( rText.Search( '\n', nDone ), rText.Search( '\r', nDone ) );
-        DrawText( Point( 0, nLine * nYoff ), rText, nDone, nLineEnd-nDone-1 );
+        mpPrinter->DrawText( Point( 0, nLine * nYoff ), rText, nDone, nLineEnd-nDone-1 );
         nDone = nLineEnd;
         if( nDone <= rText.Len() && rText.GetChar(nDone) == '\r' ) nDone++;
         if( nDone <= rText.Len() && rText.GetChar(nDone) == '\n' ) nDone++;
         nLine++;
-        Application::Reschedule();
     }
-    EndPage();
-    EndJob();
+    mpListener->EndPage();
+    
+    Printer::PrintJob( mpListener, mpPrinter->GetJobSetup() );
     nPage = 1;
-    while( IsPrinting() ) Application::Reschedule();
-    delete pDlg; pDlg = NULL;
     pFileMenu->EnableItem( RID_FILEPRINT, TRUE );
 }
 
-IMPL_LINK_INLINE_START( BasicPrinter, StartPrintHdl, Printer *, pPrinter )
-{
-    (void) pPrinter; /* avoid warning about unused parameter */ 
-    if( pDlg != NULL ) 
-        pDlg->Show();
-    return 0;
-}
-IMPL_LINK_INLINE_END( BasicPrinter, StartPrintHdl, Printer *, pPrinter )
-
-IMPL_LINK_INLINE_START( BasicPrinter, EndPrintHdl, Printer *, pPrinter )
-{
-    (void) pPrinter; /* avoid warning about unused parameter */ 
-    if( pDlg != NULL) 
-       pDlg->Hide();
-    return 0;
-}
-IMPL_LINK_INLINE_END( BasicPrinter, EndPrintHdl, Printer *, pPrinter )
-
-IMPL_LINK_INLINE_START( BasicPrinter, PrintPageHdl, Printer *, pPrinter )
-{
-    (void) pPrinter; /* avoid warning about unused parameter */ 
-    if( pDlg != NULL) 
-        pDlg->ChangeMessage( nPage );
-    return 0;
-}
-IMPL_LINK_INLINE_END( BasicPrinter, PrintPageHdl, Printer *, pPrinter )
-
-IMPL_LINK_INLINE( BasicPrinter, Abort , void *, EMPTYARG,
-{
-    AbortJob();
-    return 0L;
-}
-)
-
-/////////////////////////////////////////////////////////////////////////
-
-PrintingDialog::PrintingDialog
-              ( Window* pParent, BasicPrinter* pPrn, ResId& rId, String& rName )
-: ModelessDialog( pParent, rId )
-, aName  ( rName )
-, aText  ( this, ResId( RID_TEXT, *rId.GetResMgr() ) )
-, aCancel( this, ResId( RID_CANCEL, *rId.GetResMgr() ) )
-{
-    FreeResource();
-    aCancel.SetClickHdl( LINK( pPrn, BasicPrinter, Abort ) );
-}
-
-void PrintingDialog::ChangeMessage( short nPage )
-{
-    String aMsg( SttResId( IDS_PRINTMSG ) );
-    aMsg += aName;
-    aMsg += CUniString("\n");
-    aMsg += String( SttResId( IDS_PAGE ) );
-    aMsg += String::CreateFromInt32( nPage );
-    aText.SetText( aMsg );
-}
 
diff --git a/basic/source/app/printer.hxx b/basic/source/app/printer.hxx
index 736b78e497..af6770e94b 100644
--- a/basic/source/app/printer.hxx
+++ b/basic/source/app/printer.hxx
@@ -31,31 +31,25 @@
 #ifndef _BASICPRN_HXX
 #define _BASICPRN_HXX
 
-#ifndef _PRINT_HXX //autogen
-#include <vcl/print.hxx>
-#endif
-
-class PrintingDialog;
+#include "vcl/print.hxx"
+#include "vcl/oldprintadaptor.hxx"
 
-class BasicPrinter : public Printer {
+class BasicPrinter
+{
+    boost::shared_ptr<Printer>                      mpPrinter;
+    boost::shared_ptr<vcl::OldStylePrintAdaptor>    mpListener;
+    
     short nLine;						// aktuelle Zeile
     short nPage;						// aktuelle Seite
     short nLines;						// Zeilen pro Seite
     short nYoff;						// Zeilenabstand in Points
     String aFile;						// Dateiname
-    PrintingDialog* pDlg;				// Druck-Dialog
+
     void Header();						// Seitenkopf drucken
+    void StartPage();
 public:
     BasicPrinter();
     void Print( const String& rFile, const String& rText, BasicFrame *pFrame );
-    DECL_LINK( Abort, void * );
-    DECL_LINK( StartPrintHdl, Printer * );
-    DECL_LINK( EndPrintHdl, Printer * );
-    DECL_LINK( PrintPageHdl, Printer * );
-#if defined( PM20 )
-    // StarView-Bug, bald wieder zu entfernen:
-    virtual void SetPageQueueSize( USHORT ) {}
-#endif
 };
 
 #endif
diff --git a/basic/source/runtime/basrdll.cxx b/basic/source/runtime/basrdll.cxx
index 6933957799..929a71a942 100644
--- a/basic/source/runtime/basrdll.cxx
+++ b/basic/source/runtime/basrdll.cxx
@@ -32,9 +32,7 @@
 #include "precompiled_basic.hxx"
 #include <tools/shl.hxx>
 #include <vcl/svapp.hxx>
-#ifndef _SOLAR_HRC
 #include <svl/solar.hrc>
-#endif
 #include <tools/debug.hxx>
 #include <vcl/msgbox.hxx>
 
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeInputStreamHelper.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeInputStreamHelper.java
index 60b5bed9dc..53a83c4425 100644
--- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeInputStreamHelper.java
+++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeInputStreamHelper.java
@@ -1,4 +1,33 @@
-/*
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: StorageFileAccess.java,v $
+ * $Revision: 1.11 $
+ *
+ * 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.
+ *
+ ************************************************************************/
+ /*
  * NativeInputStreamHelper.java
  *
  * Created on 9. September 2004, 11:51
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeInputStream.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeInputStream.java
index 55439f2c3b..38caa8bd96 100644
--- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeInputStream.java
+++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeInputStream.java
@@ -1,3 +1,32 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: StorageFileAccess.java,v $
+ * $Revision: 1.11 $
+ *
+ * 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.
+ *
+ ************************************************************************/
 /*
  * StorageNativeInputStream.java
  *
diff --git a/connectivity/inc/connectivity/BlobHelper.hxx b/connectivity/inc/connectivity/BlobHelper.hxx
new file mode 100644
index 0000000000..10142513ed
--- /dev/null
+++ b/connectivity/inc/connectivity/BlobHelper.hxx
@@ -0,0 +1,54 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: FValue.cxx,v $
+ * $Revision: 1.34 $
+ *
+ * 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 _CONNECTIVITY_BLOBHELPER_HXX_
+#define _CONNECTIVITY_BLOBHELPER_HXX_
+
+#include "connectivity/dbtoolsdllapi.hxx"
+#include <com/sun/star/sdbc/XBlob.hpp>
+#include <cppuhelper/implbase1.hxx>
+
+namespace connectivity
+{
+    class OOO_DLLPUBLIC_DBTOOLS BlobHelper : public ::cppu::WeakImplHelper1< com::sun::star::sdbc::XBlob >
+    {
+        ::com::sun::star::uno::Sequence< sal_Int8 > m_aValue;
+    public:
+        BlobHelper(const ::com::sun::star::uno::Sequence< sal_Int8 >& _val);
+    private:
+        virtual ::sal_Int64 SAL_CALL length(  ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL getBytes( ::sal_Int64 pos, ::sal_Int32 length ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getBinaryStream(  ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual ::sal_Int64 SAL_CALL position( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& pattern, ::sal_Int64 start ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual ::sal_Int64 SAL_CALL positionOfBlob( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob >& pattern, ::sal_Int64 start ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+    };
+}
+
+#endif //_CONNECTIVITY_BLOBHELPER_HXX_
+
diff --git a/connectivity/inc/connectivity/dbmetadata.hxx b/connectivity/inc/connectivity/dbmetadata.hxx
index 6a0757ad2c..a09b698e8c 100644
--- a/connectivity/inc/connectivity/dbmetadata.hxx
+++ b/connectivity/inc/connectivity/dbmetadata.hxx
@@ -121,6 +121,17 @@ namespace dbtools
         */
         bool supportsSubqueriesInFrom() const;
 
+        /** checks whether the database supports primary keys
+
+            Since there's no dedicated API to ask a database for this, a heuristics needs to be applied.
+            First, the <code>PrimaryKeySupport<code> settings of the data source is examined. If it is <TRUE/>
+            or <FALSE/>, then value is returned. If it is <NULL/>, then the database meta data are examined
+            for support of core SQL grammar, and the result is returned. The assumption is that a database/driver
+            which supports core SQL grammar usually also supports primary keys, and vice versa. At least, experience
+            shows this is true most of the time.
+        */
+        bool supportsPrimaryKeys() const;
+
         /** determines whether names in the database should be restricted to SQL-92 identifiers
 
             Effectively, this method checks the EnableSQL92Check property of the data source settings,
diff --git a/connectivity/inc/connectivity/dbtools.hxx b/connectivity/inc/connectivity/dbtools.hxx
index 8afd0b7fa6..b0b7550611 100644
--- a/connectivity/inc/connectivity/dbtools.hxx
+++ b/connectivity/inc/connectivity/dbtools.hxx
@@ -37,6 +37,7 @@
 #include <comphelper/stl_types.hxx>
 #include <unotools/sharedunocomponent.hxx>
 #include "connectivity/dbtoolsdllapi.hxx"
+#include "connectivity/FValue.hxx"
 
 namespace com { namespace sun { namespace star {
 
@@ -593,6 +594,20 @@ namespace dbtools
                             sal_Int32 sqlType,
                             sal_Int32 scale=0) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
 
+    /** call the appropiate set method for the specific sql type @see com::sun::star::sdbc::DataType
+        @param	_xParams		the parameters where to set the value
+        @param	parameterIndex	the index of the parameter, 1 based
+        @param	x				the value to set
+        @param	sqlType			the corresponding sql type @see com::sun::star::sdbc::DataType
+        @param	scale			the scale of the sql type can be 0
+    */
+    OOO_DLLPUBLIC_DBTOOLS
+    void setObjectWithInfo(	const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XParameters>& _xParameters,
+                            sal_Int32 parameterIndex,
+                            const ::connectivity::ORowSetValue& x,
+                            sal_Int32 sqlType,
+                            sal_Int32 scale=0) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+
 
     /** implements <method scope="com.sun.star.sdb">XParameters::setObject</method>
         <p>The object which is to be set is analyzed, and in case it is a simlpe scalar type for which there
diff --git a/connectivity/inc/connectivity/sqliterator.hxx b/connectivity/inc/connectivity/sqliterator.hxx
index 9d39e2a997..ea11a64c7e 100644
--- a/connectivity/inc/connectivity/sqliterator.hxx
+++ b/connectivity/inc/connectivity/sqliterator.hxx
@@ -279,6 +279,9 @@ namespace connectivity
 
         // return true when the tableNode is a rule like catalog_name, schema_name or table_name
         sal_Bool isTableNode(const OSQLParseNode* _pTableNode) const;
+
+        // tries to find the correct type of the function
+        sal_Int32 getFunctionReturnType(const OSQLParseNode* _pNode );
     private:
         /** traverses the list of table names, and filles _rTables
         */
diff --git a/connectivity/inc/connectivity/sqlnode.hxx b/connectivity/inc/connectivity/sqlnode.hxx
index ad04cd29f4..637fb1a8f3 100644
--- a/connectivity/inc/connectivity/sqlnode.hxx
+++ b/connectivity/inc/connectivity/sqlnode.hxx
@@ -225,6 +225,10 @@ namespace connectivity
             as,
             op_column_commalist,
             table_primary_as_range_column,
+            datetime_primary,
+            concatenation,
+            char_factor,
+            bit_value_fct,
             rule_count,             // letzter_wert
             UNKNOWN_RULE            // ID indicating that a node is no rule with a matching Rule-enum value (see getKnownRuleID)
         };
diff --git a/connectivity/qa/connectivity/GeneralTest.java b/connectivity/qa/connectivity/GeneralTest.java
index f6284ff390..29c8dc15fb 100644
--- a/connectivity/qa/connectivity/GeneralTest.java
+++ b/connectivity/qa/connectivity/GeneralTest.java
@@ -30,21 +30,13 @@
 package complex.connectivity;
 
 import com.sun.star.uno.UnoRuntime;
-import com.sun.star.util.XCloseable;
 import com.sun.star.sdbc.*;
-import com.sun.star.sdb.*;
-import com.sun.star.beans.PropertyValue;
-import com.sun.star.beans.XPropertySet;
 
 import com.sun.star.lang.XMultiServiceFactory;
 
 import complexlib.ComplexTestCase;
 
-import java.io.PrintWriter;
  
-import util.utils;
-import java.util.*;
-import java.io.*;
 //import complex.connectivity.DBaseStringFunctions;
 
 public class GeneralTest  extends ComplexTestCase {
@@ -63,7 +55,7 @@ public class GeneralTest  extends ComplexTestCase {
     public void test() throws com.sun.star.uno.Exception,com.sun.star.beans.UnknownPropertyException {
         try
         {
-            XDriverManager driverManager = (XDriverManager)UnoRuntime.queryInterface(XDriverManager.class,((XMultiServiceFactory)param.getMSF()).createInstance("com.sun.star.sdbc.DriverManager"));
+            XDriverManager driverManager = UnoRuntime.queryInterface( XDriverManager.class, ((XMultiServiceFactory)param.getMSF()).createInstance( "com.sun.star.sdbc.DriverManager" ) );
             String databaseURL = "sdbc:calc:singin' in the rain" ;
             XConnection catalogConnection = driverManager.getConnection(databaseURL);
             failed();
diff --git a/connectivity/qa/connectivity/tools/AbstractDatabase.java b/connectivity/qa/connectivity/tools/AbstractDatabase.java
index 60a35c1d3d..fca1e60b41 100755
--- a/connectivity/qa/connectivity/tools/AbstractDatabase.java
+++ b/connectivity/qa/connectivity/tools/AbstractDatabase.java
@@ -38,10 +38,10 @@ import com.sun.star.sdb.XDocumentDataSource;
 import com.sun.star.sdb.XOfficeDatabaseDocument;
 import com.sun.star.sdbc.SQLException;
 import com.sun.star.sdbc.XCloseable;
-import com.sun.star.sdbc.XConnection;
 import com.sun.star.sdbc.XStatement;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.util.CloseVetoException;
+import connectivity.tools.sdb.Connection;
 import java.io.File;
 
 /**
@@ -60,7 +60,7 @@ public abstract class AbstractDatabase implements DatabaseAccess
     // the data source belonging to the database document
     protected DataSource m_dataSource;
     // the default connection
-    protected XConnection m_connection;
+    protected Connection    m_connection;
 
     public AbstractDatabase(final XMultiServiceFactory orb) throws Exception
     {
@@ -80,12 +80,10 @@ public abstract class AbstractDatabase implements DatabaseAccess
      * the ownership of the connection, so you don't need to (and should not) dispose/close it.
      *
      */
-    public XConnection defaultConnection() throws SQLException
+    public Connection defaultConnection() throws SQLException
     {
-        if (m_connection == null)
-        {
-            m_connection = m_databaseDocument.getDataSource().getConnection("", "");
-        }
+        if ( m_connection == null )
+            m_connection = new Connection( m_databaseDocument.getDataSource().getConnection("", "") );
         
         return m_connection;
     }
@@ -104,8 +102,7 @@ public abstract class AbstractDatabase implements DatabaseAccess
     {
         if (m_databaseDocument != null)
         {
-            final XStorable storeDoc = (XStorable) UnoRuntime.queryInterface(XStorable.class,
-                    m_databaseDocument);
+            final XStorable storeDoc = UnoRuntime.queryInterface(XStorable.class, m_databaseDocument);
             storeDoc.store();
         }
     }
@@ -118,8 +115,8 @@ public abstract class AbstractDatabase implements DatabaseAccess
     public void close()
     {
         // close connection
-        final XCloseable closeConn = (XCloseable) UnoRuntime.queryInterface(XCloseable.class,
-                m_connection);
+        final XCloseable closeConn = UnoRuntime.queryInterface( XCloseable.class,
+            m_connection != null ? m_connection.getXConnection() : null );
         if (closeConn != null)
         {
             try
@@ -133,8 +130,7 @@ public abstract class AbstractDatabase implements DatabaseAccess
         m_connection = null;
 
         // close document
-        final com.sun.star.util.XCloseable closeDoc = (com.sun.star.util.XCloseable) UnoRuntime.queryInterface(
-                com.sun.star.util.XCloseable.class, m_databaseDocument);
+        final com.sun.star.util.XCloseable closeDoc = UnoRuntime.queryInterface( com.sun.star.util.XCloseable.class, m_databaseDocument );
         if (closeDoc != null)
         {
             try
@@ -178,7 +174,7 @@ public abstract class AbstractDatabase implements DatabaseAccess
      */
     public XModel getModel()
     {
-        return (XModel) UnoRuntime.queryInterface(XModel.class, m_databaseDocument);
+        return UnoRuntime.queryInterface( XModel.class, m_databaseDocument );
     }
 
     public XMultiServiceFactory getORB()
@@ -191,10 +187,9 @@ public abstract class AbstractDatabase implements DatabaseAccess
     {
         m_databaseDocumentFile = _docURL;
 
-        final XNameAccess dbContext = (XNameAccess) UnoRuntime.queryInterface(XNameAccess.class,
-                m_orb.createInstance("com.sun.star.sdb.DatabaseContext"));
-        final XDocumentDataSource dataSource = (XDocumentDataSource) UnoRuntime.queryInterface(XDocumentDataSource.class,
-                dbContext.getByName(_docURL));
+        final XNameAccess dbContext = UnoRuntime.queryInterface( XNameAccess.class,
+            m_orb.createInstance( "com.sun.star.sdb.DatabaseContext" ) );
+        final XDocumentDataSource dataSource = UnoRuntime.queryInterface( XDocumentDataSource.class, dbContext.getByName( _docURL ) );
 
         m_databaseDocument = dataSource.getDatabaseDocument();
         m_dataSource = new DataSource(m_orb, m_databaseDocument.getDataSource());
diff --git a/connectivity/qa/connectivity/tools/CRMDatabase.java b/connectivity/qa/connectivity/tools/CRMDatabase.java
new file mode 100644
index 0000000000..3b840f3deb
--- /dev/null
+++ b/connectivity/qa/connectivity/tools/CRMDatabase.java
@@ -0,0 +1,295 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: CRMDatabase.java,v $
+ * $Revision: 1.6.2.1 $
+ *
+ * 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.
+ *
+ ************************************************************************/
+package connectivity.tools;
+
+import com.sun.star.beans.PropertyValue;
+import com.sun.star.beans.PropertyState;
+import com.sun.star.container.ElementExistException;
+import com.sun.star.container.NoSuchElementException;
+import com.sun.star.frame.XComponentLoader;
+import com.sun.star.frame.XController;
+import com.sun.star.frame.XModel;
+import com.sun.star.io.IOException;
+import com.sun.star.lang.IllegalArgumentException;
+import com.sun.star.lang.WrappedTargetException;
+import com.sun.star.lang.XComponent;
+import com.sun.star.lang.XMultiServiceFactory;
+import com.sun.star.sdb.XSingleSelectQueryComposer;
+import com.sun.star.sdb.application.XDatabaseDocumentUI;
+import com.sun.star.sdbc.SQLException;
+import com.sun.star.sdbcx.XTablesSupplier;
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.util.XRefreshable;
+import connectivity.tools.sdb.Connection;
+
+/** implements a small Customer Relationship Management database
+ *
+ *  Not finished, by far. Feel free to add features as you need them.
+ */
+public class CRMDatabase
+{
+    private static final String INTEGER = "INTEGER";
+    private static final String VARCHAR50 = "VARCHAR(50)";
+    private final XMultiServiceFactory        m_orb;
+    private final HsqlDatabase                m_database;
+    private final DataSource                  m_dataSource;
+    private final Connection                  m_connection;
+
+    /** constructs the CRM database
+     */
+    public CRMDatabase( XMultiServiceFactory _orb, boolean _withUI ) throws Exception
+    {
+        m_orb = _orb;
+
+        m_database = new HsqlDatabase( m_orb );
+        m_dataSource = m_database.getDataSource();
+
+        if ( _withUI )
+        {
+            final XComponentLoader loader = UnoRuntime.queryInterface( XComponentLoader.class,
+                m_orb.createInstance( "com.sun.star.frame.Desktop" ) );
+            PropertyValue[] loadArgs = new PropertyValue[] {
+                new PropertyValue( "PickListEntry", 0, false, PropertyState.DIRECT_VALUE )
+            };
+            loader.loadComponentFromURL( m_database.getDocumentURL(), "_blank", 0, loadArgs );
+            getDocumentUI().connect();
+            m_connection = new Connection( getDocumentUI().getActiveConnection() );
+        }
+        else
+        {
+            m_connection = m_database.defaultConnection();
+        }
+
+        createTables();
+        createQueries();
+    }
+
+    /**
+     * creates a CRMDatabase from an existing document, given by URL
+     * @param _orb
+     * @param _existingDocumentURL
+     * @throws Exceptio
+     */
+    public CRMDatabase( XMultiServiceFactory _orb, final String _existingDocumentURL ) throws Exception
+    {
+        m_orb = _orb;
+
+        m_database = new HsqlDatabase( m_orb, _existingDocumentURL );
+        m_dataSource = m_database.getDataSource();
+        m_connection = m_database.defaultConnection();
+    }
+
+    // --------------------------------------------------------------------------------------------------------
+    /** returns the database document underlying the CRM database
+     */
+    public final HsqlDatabase getDatabase()
+    {
+        return m_database;
+    }
+
+    // --------------------------------------------------------------------------------------------------------
+    /** returns the default connection to the database
+     */
+    public final Connection getConnection()
+    {
+        return m_connection;
+    }
+
+    // --------------------------------------------------------------------------------------------------------
+    public void saveAndClose() throws SQLException, IOException
+    {
+        XDatabaseDocumentUI ui = getDocumentUI();
+        if ( ui != null )
+            ui.closeSubComponents();
+        m_database.store();
+        m_database.closeAndDelete();
+    }
+
+    // --------------------------------------------------------------------------------------------------------
+    public XDatabaseDocumentUI getDocumentUI()
+    {
+        XModel docModel = UnoRuntime.queryInterface( XModel.class, m_database.getDatabaseDocument() );
+        return UnoRuntime.queryInterface( XDatabaseDocumentUI.class, docModel.getCurrentController() );
+    }
+
+    // --------------------------------------------------------------------------------------------------------
+    public XController loadSubComponent( final int _objectType, final String _name ) throws IllegalArgumentException, SQLException, NoSuchElementException
+    {
+        XDatabaseDocumentUI docUI = getDocumentUI();
+        if ( !docUI.isConnected() )
+            docUI.connect();
+
+        XComponent subComponent = docUI.loadComponent( _objectType, _name, false );
+        XController controller = UnoRuntime.queryInterface( XController.class, subComponent );
+        if ( controller != null )
+            return controller;
+        XModel document = UnoRuntime.queryInterface( XModel.class, subComponent );
+        return document.getCurrentController();
+    }
+
+    // --------------------------------------------------------------------------------------------------------
+    private void createTables() throws SQLException
+    {
+        HsqlTableDescriptor table = new HsqlTableDescriptor( "categories",
+            new HsqlColumnDescriptor[] {
+                new HsqlColumnDescriptor( "ID",INTEGER, HsqlColumnDescriptor.PRIMARY ),
+                new HsqlColumnDescriptor( "Name",VARCHAR50),
+                new HsqlColumnDescriptor( "Description", "VARCHAR(1024)" ),
+                new HsqlColumnDescriptor( "Image", "LONGVARBINARY" ) } );
+        m_database.createTable( table, true );
+
+        m_database.executeSQL( "INSERT INTO \"categories\" ( \"ID\", \"Name\" ) VALUES ( 1, 'Food' )" );
+        m_database.executeSQL( "INSERT INTO \"categories\" ( \"ID\", \"Name\" ) VALUES ( 2, 'Furniture' )" );
+
+        table = new HsqlTableDescriptor( "products",
+            new HsqlColumnDescriptor[] {
+                new HsqlColumnDescriptor( "ID",INTEGER, HsqlColumnDescriptor.PRIMARY ),
+                new HsqlColumnDescriptor( "Name",VARCHAR50),
+                new HsqlColumnDescriptor( "CategoryID",INTEGER, HsqlColumnDescriptor.REQUIRED, "categories", "ID" ) } );
+        m_database.createTable( table, true );
+
+        m_database.executeSQL( "INSERT INTO \"products\" VALUES ( 1, 'Oranges', 1 )" );
+        m_database.executeSQL( "INSERT INTO \"products\" VALUES ( 2, 'Apples', 1 )" );
+        m_database.executeSQL( "INSERT INTO \"products\" VALUES ( 3, 'Pears', 1 )" );
+        m_database.executeSQL( "INSERT INTO \"products\" VALUES ( 4, 'Strawberries', 1 )" );
+
+        table = new HsqlTableDescriptor( "customers",
+            new HsqlColumnDescriptor[] {
+                new HsqlColumnDescriptor( "ID",INTEGER, HsqlColumnDescriptor.PRIMARY ),
+                new HsqlColumnDescriptor( "Name",VARCHAR50),
+                new HsqlColumnDescriptor( "Address",VARCHAR50),
+                new HsqlColumnDescriptor( "City",VARCHAR50),
+                new HsqlColumnDescriptor( "Postal",VARCHAR50),
+                new HsqlColumnDescriptor( "Comment","LONGVARCHAR")} );
+        m_database.createTable( table, true );
+
+        m_database.executeSQL( "INSERT INTO \"customers\" VALUES(1,'Food, Inc.','Down Under','Melbourne','509','Prefered') " );
+        m_database.executeSQL( "INSERT INTO \"customers\" VALUES(2,'Simply Delicious','Down Under','Melbourne','518',null) " );
+        m_database.executeSQL( "INSERT INTO \"customers\" VALUES(3,'Pure Health','10 Fish St.','San Francisco','94107',null) " );
+        m_database.executeSQL( "INSERT INTO \"customers\" VALUES(4,'Milk And More','Arlington Road 21','Dublin','31021','Good one.') " );
+
+        table = new HsqlTableDescriptor( "orders",
+            new HsqlColumnDescriptor[] {
+                new HsqlColumnDescriptor( "ID",INTEGER, HsqlColumnDescriptor.PRIMARY ),
+                new HsqlColumnDescriptor( "CustomerID",INTEGER, HsqlColumnDescriptor.REQUIRED, "customers", "ID"  ),
+                new HsqlColumnDescriptor( "OrderDate", "DATE" ),
+                new HsqlColumnDescriptor( "ShipDate", "DATE" ) } );
+        m_database.createTable( table, true );
+
+        m_database.executeSQL( "INSERT INTO \"orders\" (\"ID\", \"CustomerID\", \"OrderDate\") VALUES(1, 1, {D '2009-01-01'})" );
+        m_database.executeSQL( "INSERT INTO \"orders\" VALUES(2, 2, {D '2009-01-01'}, {D '2009-01-23'})" );
+
+        table = new HsqlTableDescriptor( "orders_details",
+            new HsqlColumnDescriptor[] {
+                new HsqlColumnDescriptor( "OrderID",INTEGER, HsqlColumnDescriptor.PRIMARY, "orders", "ID" ),
+                new HsqlColumnDescriptor( "ProductID",INTEGER, HsqlColumnDescriptor.PRIMARY, "products", "ID"  ),
+                new HsqlColumnDescriptor( "Quantity",INTEGER) } );
+        m_database.createTable( table, true );
+
+        m_database.executeSQL( "INSERT INTO \"orders_details\" VALUES(1, 1, 100)" );
+        m_database.executeSQL( "INSERT INTO \"orders_details\" VALUES(1, 2, 100)" );
+        m_database.executeSQL( "INSERT INTO \"orders_details\" VALUES(2, 2, 2000)" );
+        m_database.executeSQL( "INSERT INTO \"orders_details\" VALUES(2, 3, 2000)" );
+        m_database.executeSQL( "INSERT INTO \"orders_details\" VALUES(2, 4, 2000)" );
+
+        // since we created the tables by directly executing the SQL statements, we need to refresh
+        // the tables container
+        m_connection.refreshTables();
+    }
+
+    // --------------------------------------------------------------------------------------------------------
+    private void validateUnparseable()
+    {
+        // The "unparseable" query should be indeed be unparseable by OOo (though a valid HSQL query)
+        XSingleSelectQueryComposer composer;
+        QueryDefinition unparseableQuery;
+        try
+        {
+            final XMultiServiceFactory factory = UnoRuntime.queryInterface(
+                    XMultiServiceFactory.class, m_database.defaultConnection().getXConnection() );
+            composer = UnoRuntime.queryInterface(
+                    XSingleSelectQueryComposer.class, factory.createInstance( "com.sun.star.sdb.SingleSelectQueryComposer" ) );
+            unparseableQuery = m_dataSource.getQueryDefinition( "unparseable" );
+        }
+        catch( Exception e )
+        {
+            throw new RuntimeException( "caught an unexpected exception: " + e.getMessage() );
+        }
+
+        boolean caughtExpected = false;
+        try
+        {
+            composer.setQuery( unparseableQuery.getCommand() );
+        }
+        catch (WrappedTargetException e) { }
+        catch( SQLException e )
+        {
+            caughtExpected = true;
+        }
+
+        if ( !caughtExpected )
+            throw new RuntimeException( "Somebody improved the parser! This is bad :), since we need an unparsable query here!" );
+    }
+
+    // --------------------------------------------------------------------------------------------------------
+    private void createQueries() throws ElementExistException, WrappedTargetException, com.sun.star.lang.IllegalArgumentException
+    {
+        m_database.getDataSource().createQuery(
+            "all orders",
+            "SELECT \"orders\".\"ID\" AS \"Order No.\", " +
+                    "\"customers\".\"Name\" AS \"Customer Name\", " +
+                    "\"orders\".\"OrderDate\" AS \"Order Date\", " +
+                    "\"orders\".\"ShipDate\" AS \"Ship Date\", " +
+                    "\"orders_details\".\"Quantity\", " +
+                    "\"products\".\"Name\" AS \"Product Name\" " +
+            "FROM \"orders_details\" AS \"orders_details\", " +
+                  "\"orders\" AS \"orders\", " +
+                  "\"products\" AS \"products\", " +
+                  "\"customers\" AS \"customers\" " +
+            "WHERE  ( \"orders_details\".\"OrderID\" = \"orders\".\"ID\" " +
+                 "AND \"orders_details\".\"ProductID\" = \"products\".\"ID\" " +
+                 "AND \"orders\".\"CustomerID\" = \"customers\".\"ID\" )"
+        );
+
+        m_database.getDataSource().createQuery(
+            "unshipped orders",
+            "SELECT * " +
+            "FROM \"all orders\"" +
+            "WHERE ( \"ShipDate\" IS NULL )"
+        );
+
+        m_database.getDataSource().createQuery( "parseable", "SELECT * FROM \"customers\"" );
+        m_database.getDataSource().createQuery( "parseable native", "SELECT * FROM INFORMATION_SCHEMA.SYSTEM_VIEWS", false );
+        m_database.getDataSource().createQuery( "unparseable",
+            "SELECT CAST( \"ID\" AS VARCHAR(3) ) AS \"ID_VARCHAR\" FROM \"products\"", false );
+
+        validateUnparseable();
+    }
+}
diff --git a/connectivity/qa/connectivity/tools/DataSource.java b/connectivity/qa/connectivity/tools/DataSource.java
index 578d906fb2..df43ee5eee 100644
--- a/connectivity/qa/connectivity/tools/DataSource.java
+++ b/connectivity/qa/connectivity/tools/DataSource.java
@@ -39,10 +39,8 @@ import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.sdb.XQueryDefinitionsSupplier;
 import com.sun.star.sdbc.XDataSource;
-import com.sun.star.sdbcx.XTablesSupplier;
 import com.sun.star.uno.Exception;
 import com.sun.star.uno.UnoRuntime;
-import com.sun.star.util.XRefreshable;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -57,11 +55,10 @@ public class DataSource
     {
         m_orb = _orb;
 
-        final XNameAccess dbContext = (XNameAccess) UnoRuntime.queryInterface(XNameAccess.class,
-                _orb.createInstance("com.sun.star.sdb.DatabaseContext"));
+        final XNameAccess dbContext = UnoRuntime.queryInterface(
+            XNameAccess.class, _orb.createInstance( "com.sun.star.sdb.DatabaseContext" ) );
 
-        m_dataSource = (XDataSource) UnoRuntime.queryInterface(XDataSource.class,
-                dbContext.getByName(_registeredName));
+        m_dataSource = UnoRuntime.queryInterface( XDataSource.class, dbContext.getByName( _registeredName ) );
     }
 
     public DataSource(final XMultiServiceFactory _orb,final XDataSource _dataSource)
@@ -86,13 +83,11 @@ public class DataSource
      */
     public void createQuery(final String _name, final String _sqlCommand, final boolean _escapeProcessing) throws ElementExistException, WrappedTargetException, com.sun.star.lang.IllegalArgumentException
     {
-        final XSingleServiceFactory queryDefsFac = (XSingleServiceFactory) UnoRuntime.queryInterface(
-                XSingleServiceFactory.class, getQueryDefinitions());
+        final XSingleServiceFactory queryDefsFac = UnoRuntime.queryInterface( XSingleServiceFactory.class, getQueryDefinitions() );
         XPropertySet queryDef = null;
         try
         {
-            queryDef = (XPropertySet) UnoRuntime.queryInterface(
-                    XPropertySet.class, queryDefsFac.createInstance());
+            queryDef = UnoRuntime.queryInterface( XPropertySet.class, queryDefsFac.createInstance() );
             queryDef.setPropertyValue("Command", _sqlCommand);
             queryDef.setPropertyValue("EscapeProcessing", Boolean.valueOf(_escapeProcessing));
         }
@@ -101,8 +96,7 @@ public class DataSource
             e.printStackTrace(System.err);
         }
 
-        final XNameContainer queryDefsContainer = (XNameContainer) UnoRuntime.queryInterface(
-                XNameContainer.class, getQueryDefinitions());
+        final XNameContainer queryDefsContainer = UnoRuntime.queryInterface( XNameContainer.class, getQueryDefinitions() );
         queryDefsContainer.insertByName(_name, queryDef);
     }
 
@@ -113,8 +107,7 @@ public class DataSource
         final XNameAccess allDefs = getQueryDefinitions();
         try
         {
-            return new QueryDefinition(
-                    (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, allDefs.getByName(_name)));
+            return new QueryDefinition( UnoRuntime.queryInterface( XPropertySet.class, allDefs.getByName( _name) ) );
         }
         catch (WrappedTargetException e)
         {
@@ -126,25 +119,11 @@ public class DataSource
      */
     public XNameAccess getQueryDefinitions()
     {
-        final XQueryDefinitionsSupplier suppQueries = (XQueryDefinitionsSupplier) UnoRuntime.queryInterface(
+        final XQueryDefinitionsSupplier suppQueries = UnoRuntime.queryInterface(
                 XQueryDefinitionsSupplier.class, m_dataSource);
         return suppQueries.getQueryDefinitions();
     }
 
-    /** refreshs the table container of a given connection
-     *
-     *  This is usually necessary if you created tables by directly executing SQL statements,
-     *  bypassing the SDBCX layer.
-     */
-    public void refreshTables(final com.sun.star.sdbc.XConnection _connection)
-    {
-        final XTablesSupplier suppTables = (XTablesSupplier) UnoRuntime.queryInterface(
-                XTablesSupplier.class, _connection);
-        final XRefreshable refreshTables = (XRefreshable) UnoRuntime.queryInterface(
-                XRefreshable.class, suppTables.getTables());
-        refreshTables.refresh();
-    }
-
     /** returns the name of the data source
      * 
      * If a data source is registered at the database context, the name is the registration
@@ -157,8 +136,7 @@ public class DataSource
         String name = null;
         try
         {
-            final XPropertySet dataSourceProps = (XPropertySet) UnoRuntime.queryInterface(
-                    XPropertySet.class, m_dataSource);
+            final XPropertySet dataSourceProps = UnoRuntime.queryInterface( XPropertySet.class, m_dataSource );
             name = (String) dataSourceProps.getPropertyValue("Name");
         }
         catch (Exception ex)
diff --git a/connectivity/qa/connectivity/tools/DatabaseAccess.java b/connectivity/qa/connectivity/tools/DatabaseAccess.java
index bc39bb0990..78608063e6 100755
--- a/connectivity/qa/connectivity/tools/DatabaseAccess.java
+++ b/connectivity/qa/connectivity/tools/DatabaseAccess.java
@@ -34,7 +34,7 @@ import com.sun.star.io.IOException;
 import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sdb.XOfficeDatabaseDocument;
 import com.sun.star.sdbc.SQLException;
-import com.sun.star.sdbc.XConnection;
+import connectivity.tools.sdb.Connection;
 
 /**
  *
@@ -42,7 +42,7 @@ import com.sun.star.sdbc.XConnection;
  */
 public interface DatabaseAccess
 {
-    XConnection defaultConnection() throws SQLException;
+    Connection defaultConnection() throws SQLException;
 
     void executeSQL(final String statementString) throws SQLException;
 
diff --git a/connectivity/qa/connectivity/tools/HsqlDatabase.java b/connectivity/qa/connectivity/tools/HsqlDatabase.java
index 036edd9a6a..b3fd724c17 100644
--- a/connectivity/qa/connectivity/tools/HsqlDatabase.java
+++ b/connectivity/qa/connectivity/tools/HsqlDatabase.java
@@ -30,6 +30,7 @@
 package connectivity.tools;
 
 import com.sun.star.beans.PropertyValue;
+import com.sun.star.beans.PropertyState;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.container.ElementExistException;
 import com.sun.star.frame.XStorable;
@@ -83,9 +84,9 @@ public class HsqlDatabase extends AbstractDatabase
         dsProperties.setPropertyValue("URL", "sdbc:embedded:hsqldb");
 
         final XStorable storable = (XStorable) UnoRuntime.queryInterface(XStorable.class, m_databaseDocument);
-        storable.storeAsURL(m_databaseDocumentFile, new PropertyValue[]
-                {
-                });
+        storable.storeAsURL( m_databaseDocumentFile, new PropertyValue[]
+            {	new PropertyValue( "PickListEntry", 0, false, PropertyState.DIRECT_VALUE )
+            } );
     }
 
     /** drops the table with a given name
@@ -208,10 +209,8 @@ public class HsqlDatabase extends AbstractDatabase
     public void createTableInSDBCX(final HsqlTableDescriptor _tableDesc) throws SQLException, ElementExistException
     {
         final XPropertySet sdbcxDescriptor = _tableDesc.createSdbcxDescriptor(defaultConnection());
-        final XTablesSupplier suppTables = (XTablesSupplier) UnoRuntime.queryInterface(
-                XTablesSupplier.class, defaultConnection());
-        final XAppend appendTable = (XAppend) UnoRuntime.queryInterface(
-                XAppend.class, suppTables.getTables());
+        final XTablesSupplier suppTables = UnoRuntime.queryInterface( XTablesSupplier.class, defaultConnection().getXConnection() );
+        final XAppend appendTable = UnoRuntime.queryInterface( XAppend.class, suppTables.getTables() );
         appendTable.appendByDescriptor(sdbcxDescriptor);
     }
 }
diff --git a/connectivity/qa/connectivity/tools/HsqlTableDescriptor.java b/connectivity/qa/connectivity/tools/HsqlTableDescriptor.java
index 483241904b..4b900c7056 100644
--- a/connectivity/qa/connectivity/tools/HsqlTableDescriptor.java
+++ b/connectivity/qa/connectivity/tools/HsqlTableDescriptor.java
@@ -33,11 +33,11 @@ package connectivity.tools;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.container.XNameAccess;
 import com.sun.star.sdbc.ColumnValue;
-import com.sun.star.sdbc.XConnection;
 import com.sun.star.sdbcx.XColumnsSupplier;
 import com.sun.star.sdbcx.XDataDescriptorFactory;
 import com.sun.star.sdbcx.XTablesSupplier;
 import com.sun.star.uno.UnoRuntime;
+import connectivity.tools.sdb.Connection;
 
 /** is a very simply descriptor of a HSQL table, to be used with a HsqlDatabase.createTable method
  */
@@ -67,12 +67,10 @@ public class HsqlTableDescriptor
         return m_columns;
     }
 
-    public XPropertySet createSdbcxDescriptor( XConnection _forConnection )
+    public XPropertySet createSdbcxDescriptor( Connection _forConnection )
     {
-        XTablesSupplier suppTables = (XTablesSupplier)UnoRuntime.queryInterface(
-            XTablesSupplier.class, _forConnection );
-        XDataDescriptorFactory tableDescFac = (XDataDescriptorFactory)UnoRuntime.queryInterface(
-            XDataDescriptorFactory.class, suppTables.getTables() );
+        XTablesSupplier suppTables = UnoRuntime.queryInterface( XTablesSupplier.class, _forConnection.getXConnection() );
+        XDataDescriptorFactory tableDescFac = UnoRuntime.queryInterface( XDataDescriptorFactory.class, suppTables.getTables() );
         XPropertySet tableDesc = tableDescFac.createDataDescriptor();
 
         try
@@ -81,12 +79,10 @@ public class HsqlTableDescriptor
         }
         catch ( Exception e ) { e.printStackTrace( System.err ); }
         
-        XColumnsSupplier suppDescCols = (XColumnsSupplier)UnoRuntime.queryInterface(
-            XColumnsSupplier.class, tableDesc );
+        XColumnsSupplier suppDescCols = UnoRuntime.queryInterface( XColumnsSupplier.class, tableDesc );
 
         XNameAccess descColumns = suppDescCols.getColumns();
-        XDataDescriptorFactory columnDescFac = (XDataDescriptorFactory)UnoRuntime.queryInterface(
-            XDataDescriptorFactory.class, descColumns );
+        XDataDescriptorFactory columnDescFac = UnoRuntime.queryInterface( XDataDescriptorFactory.class, descColumns );
 
         HsqlColumnDescriptor[] myColumns = getColumns();
         for ( int i = 0; i < myColumns.length; ++i )
diff --git a/connectivity/qa/connectivity/tools/makefile.mk b/connectivity/qa/connectivity/tools/makefile.mk
index 589a85ea38..32aa94c773 100644
--- a/connectivity/qa/connectivity/tools/makefile.mk
+++ b/connectivity/qa/connectivity/tools/makefile.mk
@@ -29,10 +29,10 @@
 #
 #*************************************************************************
 
-PRJ = ..$/..$/..
+PRJ = ../../..
 TARGET  = ConnectivityTools
 PRJNAME = connectivity
-PACKAGE = connectivity$/tools
+PACKAGE = connectivity/tools
 
 # --- Settings -----------------------------------------------------
 .INCLUDE: settings.mk
@@ -46,14 +46,8 @@ all:
 #----- compile .java files -----------------------------------------
 
 JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunnerLight.jar
-# Do not use $/ with the $(FIND) command as for W32-4nt this leads to a backslash
-# in a posix command. In this special case use / instead of $/
-.IF "$(GUI)"=="OS2"
-JAVAFILES       := $(shell @ls ./*.java)
-.ELSE
-JAVAFILES       := $(shell @$(FIND) ./*.java)
-.ENDIF
-JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
+JAVAFILES       := $(shell @$(FIND) . -name "*.java")
+JAVACLASSFILES	:= $(foreach,i,$(JAVAFILES) $(CLASSDIR)/$(PACKAGE)/$(i:d)$(i:b).class)
 
 #----- make a jar from compiled files ------------------------------
 
diff --git a/connectivity/qa/connectivity/tools/sdb/Connection.java b/connectivity/qa/connectivity/tools/sdb/Connection.java
new file mode 100644
index 0000000000..aac120fb1e
--- /dev/null
+++ b/connectivity/qa/connectivity/tools/sdb/Connection.java
@@ -0,0 +1,93 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package connectivity.tools.sdb;
+
+import com.sun.star.lang.XMultiServiceFactory;
+import com.sun.star.sdb.XSingleSelectQueryComposer;
+import com.sun.star.sdbc.SQLException;
+import com.sun.star.sdbc.XConnection;
+import com.sun.star.sdbc.XDatabaseMetaData;
+import com.sun.star.sdbc.XPreparedStatement;
+import com.sun.star.sdbc.XResultSet;
+import com.sun.star.sdbc.XStatement;
+import com.sun.star.sdbcx.XTablesSupplier;
+import com.sun.star.uno.Exception;
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.util.XRefreshable;
+
+/**
+ * is a convenience wrapper around a SDB-level connection object
+ */
+public class Connection
+{
+    private final   XConnection m_connection;
+
+    public Connection( final XConnection _connection )
+    {
+        m_connection = _connection;
+    }
+
+    public XConnection  getXConnection()
+    {
+        return m_connection;
+    }
+
+    public boolean execute( final String _sql ) throws SQLException
+    {
+        XStatement statement = createStatement();
+        return statement.execute( _sql );
+    }
+
+    public XResultSet executeQuery( final String _sql ) throws SQLException
+    {
+        XStatement statement = createStatement();
+        return statement.executeQuery( _sql );
+    }
+
+    public int executeUpdate( final String _sql ) throws SQLException
+    {
+        XStatement statement = createStatement();
+        return statement.executeUpdate( _sql );
+    }
+
+    public void refreshTables()
+    {
+        final XTablesSupplier suppTables = UnoRuntime.queryInterface(XTablesSupplier.class, m_connection);
+        final XRefreshable refresh = UnoRuntime.queryInterface( XRefreshable.class, suppTables.getTables() );
+        refresh.refresh();
+    }
+
+    public XSingleSelectQueryComposer createSingleSelectQueryComposer() throws Exception
+    {
+        final XMultiServiceFactory connectionFactory = UnoRuntime.queryInterface( XMultiServiceFactory.class, m_connection );
+        return UnoRuntime.queryInterface(
+            XSingleSelectQueryComposer.class, connectionFactory.createInstance( "com.sun.star.sdb.SingleSelectQueryComposer" ) );
+    }
+
+    public
+    XStatement createStatement() throws SQLException
+    {
+        return m_connection.createStatement();
+    }
+
+    public
+    XPreparedStatement prepareStatement( String _sql ) throws SQLException
+    {
+        return m_connection.prepareStatement( _sql );
+    }
+
+    public
+    XDatabaseMetaData getMetaData() throws SQLException
+    {
+        return m_connection.getMetaData();
+    }
+
+    public
+    void close() throws SQLException
+    {
+        m_connection.close();
+    }
+}
diff --git a/connectivity/source/commontools/BlobHelper.cxx b/connectivity/source/commontools/BlobHelper.cxx
new file mode 100644
index 0000000000..ba6aaf2715
--- /dev/null
+++ b/connectivity/source/commontools/BlobHelper.cxx
@@ -0,0 +1,72 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: FValue.cxx,v $
+ * $Revision: 1.34 $
+ *
+ * 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_connectivity.hxx"
+#include "connectivity/BlobHelper.hxx"
+#include <comphelper/seqstream.hxx>
+#include "connectivity/dbexception.hxx"
+
+using namespace connectivity;
+using namespace dbtools;
+using namespace ::com::sun::star::sdbc;
+using namespace ::com::sun::star::uno;
+
+BlobHelper::BlobHelper(const ::com::sun::star::uno::Sequence< sal_Int8 >& _val) : m_aValue(_val)
+{
+}
+// -----------------------------------------------------------------------------
+::sal_Int64 SAL_CALL BlobHelper::length(  ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
+{
+    return m_aValue.getLength();
+}
+// -----------------------------------------------------------------------------
+::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL BlobHelper::getBytes( ::sal_Int64 pos, ::sal_Int32 _length ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
+{
+    if ( sal_Int32(pos + _length) > m_aValue.getLength() )
+        throw ::com::sun::star::sdbc::SQLException();
+    return ::com::sun::star::uno::Sequence< ::sal_Int8 >(m_aValue.getConstArray() + sal_Int32(pos),_length);
+}
+// -----------------------------------------------------------------------------
+::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL BlobHelper::getBinaryStream(  ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
+{
+    return new ::comphelper::SequenceInputStream(m_aValue);
+}
+// -----------------------------------------------------------------------------
+::sal_Int64 SAL_CALL BlobHelper::position( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& /*pattern*/, ::sal_Int64 /*start*/ ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
+{
+    ::dbtools::throwFeatureNotImplementedException( "XBlob::position", *this );    
+    return 0;
+}
+// -----------------------------------------------------------------------------
+::sal_Int64 SAL_CALL BlobHelper::positionOfBlob( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob >& /*pattern*/, ::sal_Int64 /*start*/ ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
+{
+    ::dbtools::throwFeatureNotImplementedException( "XBlob::positionOfBlob", *this ); 
+    return 0;
+}
diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx
index 3068acde8b..7783a31f9b 100644
--- a/connectivity/source/commontools/FValue.cxx
+++ b/connectivity/source/commontools/FValue.cxx
@@ -257,6 +257,7 @@ void ORowSetValue::setTypeKind(sal_Int32 _eType)
             case DataType::BLOB:
             case DataType::CLOB:
             case DataType::OBJECT:
+            case DataType::OTHER:
                 (*this) = getAny();
                 break;
             default:
@@ -847,6 +848,7 @@ bool ORowSetValue::operator==(const ORowSetValue& _rRH) const
         case DataType::BLOB:
         case DataType::CLOB:
         case DataType::OBJECT:
+        case DataType::OTHER:
             bRet = false;
             break;
         default:
@@ -913,6 +915,7 @@ Any ORowSetValue::makeAny() const
             case DataType::BLOB:
             case DataType::CLOB:
             case DataType::OBJECT:
+            case DataType::OTHER:
                 rValue = getAny();
                 break;
             case DataType::BIT:
@@ -1019,6 +1022,19 @@ Any ORowSetValue::makeAny() const
                 else
                     aRet = ::rtl::OUString::valueOf((sal_Int64)*this);
                 break;
+            case DataType::CLOB:
+                {
+                    Any aValue( getAny() );
+                    Reference< XClob > xClob;
+                    if ( aValue >>= xClob )
+                    {
+                        if ( xClob.is() )
+                        {
+                            aRet = xClob->getSubString(1,(sal_Int32)xClob->length() );
+                        }
+                    }
+                }
+                break;
         }
     }
     return aRet;
@@ -1090,6 +1106,9 @@ sal_Bool ORowSetValue::getBool()	const
             case DataType::INTEGER:
                 bRet = m_bSigned ? (m_aValue.m_nInt32 != 0) : (*static_cast<sal_Int64*>(m_aValue.m_pValue) != sal_Int64(0));
                 break;
+            default:
+                OSL_ENSURE(0,"Illegal conversion!");
+                break;
         }
     }
     return bRet;
@@ -1131,6 +1150,8 @@ sal_Int8 ORowSetValue::getInt8()	const
             case DataType::BINARY:
             case DataType::VARBINARY:
             case DataType::LONGVARBINARY:
+            case DataType::BLOB:
+            case DataType::CLOB:
                 OSL_ASSERT(!"getInt8() for this type is not allowed!");
                 break;
             case DataType::BIT:
@@ -1155,6 +1176,9 @@ sal_Int8 ORowSetValue::getInt8()	const
                 else
                     nRet = static_cast<sal_Int8>(*static_cast<sal_Int64*>(m_aValue.m_pValue));
                 break;
+            default:
+                OSL_ENSURE(0,"Illegal conversion!");
+                break;
         }
     }
     return nRet;
@@ -1196,6 +1220,8 @@ sal_Int16 ORowSetValue::getInt16()	const
             case DataType::BINARY:
             case DataType::VARBINARY:
             case DataType::LONGVARBINARY:
+            case DataType::BLOB:
+            case DataType::CLOB:
                 OSL_ASSERT(!"getInt16() for this type is not allowed!");
                 break;
             case DataType::BIT:
@@ -1220,6 +1246,9 @@ sal_Int16 ORowSetValue::getInt16()	const
                 else
                     nRet = static_cast<sal_Int16>(*static_cast<sal_Int64*>(m_aValue.m_pValue));
                 break;
+            default:
+                OSL_ENSURE(0,"Illegal conversion!");
+                break;
         }
     }
     return nRet;
@@ -1261,6 +1290,8 @@ sal_Int32 ORowSetValue::getInt32()	const
             case DataType::BINARY:
             case DataType::VARBINARY:
             case DataType::LONGVARBINARY:
+            case DataType::BLOB:
+            case DataType::CLOB:
                 OSL_ASSERT(!"getInt32() for this type is not allowed!");
                 break;
             case DataType::BIT:
@@ -1285,6 +1316,9 @@ sal_Int32 ORowSetValue::getInt32()	const
                 else
                     nRet = static_cast<sal_Int32>(*static_cast<sal_Int64*>(m_aValue.m_pValue));
                 break;
+            default:
+                OSL_ENSURE(0,"Illegal conversion!");
+                break;
         }
     }
     return nRet;
@@ -1326,6 +1360,8 @@ sal_Int64 ORowSetValue::getLong()	const
             case DataType::BINARY:
             case DataType::VARBINARY:
             case DataType::LONGVARBINARY:
+            case DataType::BLOB:
+            case DataType::CLOB:
                 OSL_ASSERT(!"getInt32() for this type is not allowed!");
                 break;
             case DataType::BIT:
@@ -1350,6 +1386,9 @@ sal_Int64 ORowSetValue::getLong()	const
                 else
                     nRet = *(sal_Int64*)m_aValue.m_pValue;
                 break;
+            default:
+                OSL_ENSURE(0,"Illegal conversion!");
+                break;
         }
     }
     return nRet;
@@ -1395,6 +1434,8 @@ float ORowSetValue::getFloat()	const
             case DataType::BINARY:
             case DataType::VARBINARY:
             case DataType::LONGVARBINARY:
+            case DataType::BLOB:
+            case DataType::CLOB:
                 OSL_ASSERT(!"getDouble() for this type is not allowed!");
                 break;
             case DataType::BIT:
@@ -1419,6 +1460,9 @@ float ORowSetValue::getFloat()	const
                 else
                     nRet = float(*(sal_Int64*)m_aValue.m_pValue);
                 break;
+            default:
+                OSL_ENSURE(0,"Illegal conversion!");
+                break;
         }
     }
     return nRet;
@@ -1466,6 +1510,8 @@ double ORowSetValue::getDouble()	const
             case DataType::BINARY:
             case DataType::VARBINARY:
             case DataType::LONGVARBINARY:
+            case DataType::BLOB:
+            case DataType::CLOB:
                 OSL_ASSERT(!"getDouble() for this type is not allowed!");
                 break;
             case DataType::BIT:
@@ -1490,6 +1536,9 @@ double ORowSetValue::getDouble()	const
                 else
                     nRet = double(*(sal_Int64*)m_aValue.m_pValue);
                 break;
+            default:
+                OSL_ENSURE(0,"Illegal conversion!");
+                break;
         }
     }
     return nRet;
@@ -1551,6 +1600,8 @@ void ORowSetValue::setFromDouble(const double& _rVal,sal_Int32 _nDatatype)
         case DataType::BINARY:
         case DataType::VARBINARY:
         case DataType::LONGVARBINARY:
+        case DataType::BLOB:
+        case DataType::CLOB:
             OSL_ASSERT(!"setFromDouble() for this type is not allowed!");
             break;
         case DataType::BIT:
@@ -1595,12 +1646,39 @@ Sequence<sal_Int8>	ORowSetValue::getSequence() const
             case DataType::BLOB:
             {
                 Reference<XInputStream> xStream;
-                Any aValue = getAny();
+                const Any aValue = makeAny();
                 if(aValue.hasValue())
                 {
-                    aValue >>= xStream;
+                    Reference<XBlob> xBlob(aValue,UNO_QUERY);
+                    if ( xBlob.is() )
+                        xStream = xBlob->getBinaryStream();
+                    else
+                    {
+                        Reference<XClob> xClob(aValue,UNO_QUERY);
+                        if ( xClob.is() )
+                            xStream = xClob->getCharacterStream();
+                    }
                     if(xStream.is())
-                        xStream->readBytes(aSeq,xStream->available());
+                    {
+                        const sal_uInt32	nBytesToRead = 65535;
+                        sal_uInt32			nRead;
+
+                        do
+                        {
+                            ::com::sun::star::uno::Sequence< sal_Int8 > aReadSeq;
+                            
+                            nRead = xStream->readSomeBytes( aReadSeq, nBytesToRead );
+
+                            if( nRead )
+                            {
+                                const sal_uInt32 nOldLength = aSeq.getLength();
+                                aSeq.realloc( nOldLength + nRead );
+                                rtl_copyMemory( aSeq.getArray() + nOldLength, aReadSeq.getConstArray(), aReadSeq.getLength() );
+                            }
+                        }
+                        while( nBytesToRead == nRead );
+                        xStream->closeInput();
+                    }
                 }
             }
             break;
@@ -1658,6 +1736,9 @@ Sequence<sal_Int8>	ORowSetValue::getSequence() const
                     aValue.Year		= pDateTime->Year;
                 }
                 break;
+            default:
+                OSL_ENSURE(0,"Illegal conversion!");
+                break;
         }
     }
     return aValue;
@@ -1696,6 +1777,10 @@ Sequence<sal_Int8>	ORowSetValue::getSequence() const
                 break;
             case DataType::TIME:
                 aValue = *static_cast< ::com::sun::star::util::Time*>(m_aValue.m_pValue);
+                break;
+            default:
+                OSL_ENSURE(0,"Illegal conversion!");
+                break;
         }
     }
     return aValue;
@@ -1743,6 +1828,9 @@ Sequence<sal_Int8>	ORowSetValue::getSequence() const
             case DataType::TIMESTAMP:
                 aValue = *static_cast< ::com::sun::star::util::DateTime*>(m_aValue.m_pValue);
                 break;
+            default:
+                OSL_ENSURE(0,"Illegal conversion!");
+                break;
         }
     }
     return aValue;
@@ -1833,6 +1921,9 @@ namespace detail
         virtual Sequence< sal_Int8 >        getBytes() const = 0;
         virtual Reference< XInputStream >   getBinaryStream() const = 0;
         virtual Reference< XInputStream >   getCharacterStream() const = 0;
+        virtual Reference< XBlob >   		getBlob() const = 0;
+        virtual Reference< XClob >   		getClob() const = 0;
+        virtual Any                         getObject() const = 0;
         virtual sal_Bool                    wasNull() const = 0;
 
         virtual ~IValueSource() { }
@@ -1862,6 +1953,9 @@ namespace detail
         virtual Sequence< sal_Int8 >        getBytes() const            { return m_xRow->getBytes( m_nPos ); };
         virtual Reference< XInputStream >   getBinaryStream() const     { return m_xRow->getBinaryStream( m_nPos ); };
         virtual Reference< XInputStream >   getCharacterStream() const  { return m_xRow->getCharacterStream( m_nPos ); };
+        virtual Reference< XBlob >   		getBlob() const				{ return m_xRow->getBlob( m_nPos ); };
+        virtual Reference< XClob >   		getClob() const 			{ return m_xRow->getClob( m_nPos ); };
+        virtual Any                         getObject() const           { return m_xRow->getObject( m_nPos, NULL ); };
         virtual sal_Bool                    wasNull() const             { return m_xRow->wasNull( ); };
 
     private:
@@ -1892,6 +1986,9 @@ namespace detail
         virtual Sequence< sal_Int8 >        getBytes() const            { return m_xColumn->getBytes(); };
         virtual Reference< XInputStream >   getBinaryStream() const     { return m_xColumn->getBinaryStream(); };
         virtual Reference< XInputStream >   getCharacterStream() const  { return m_xColumn->getCharacterStream(); };
+        virtual Reference< XBlob >   		getBlob() const				{ return m_xColumn->getBlob(); };
+        virtual Reference< XClob >   		getClob() const 			{ return m_xColumn->getClob(); };
+        virtual Any                         getObject() const           { return m_xColumn->getObject( NULL ); };
         virtual sal_Bool                    wasNull() const             { return m_xColumn->wasNull( ); };
 
     private:
@@ -1987,13 +2084,17 @@ void ORowSetValue::impl_fill( const sal_Int32 _nType, sal_Bool _bNullable, const
             (*this) = _rValueSource.getLong();
         break;
     case DataType::CLOB:
-        (*this) = ::com::sun::star::uno::makeAny(_rValueSource.getCharacterStream());
+        (*this) = ::com::sun::star::uno::makeAny(_rValueSource.getClob());
         setTypeKind(DataType::CLOB);
         break;
     case DataType::BLOB:
-        (*this) = ::com::sun::star::uno::makeAny(_rValueSource.getBinaryStream());
+        (*this) = ::com::sun::star::uno::makeAny(_rValueSource.getBlob());
         setTypeKind(DataType::BLOB);
         break;
+    case DataType::OTHER:
+        (*this) = _rValueSource.getObject();
+        setTypeKind(DataType::OTHER);
+        break;
     default:
         OSL_ENSURE( false, "ORowSetValue::fill: unsupported type!" );
         bReadData = false;
@@ -2139,6 +2240,29 @@ void ORowSetValue::fill(const Any& _rValue)
 
             break;
         }
+        case TypeClass_INTERFACE:
+            {
+                Reference< XClob > xClob;
+                if ( _rValue >>= xClob )
+                {
+                    (*this) = _rValue;
+                    setTypeKind(DataType::CLOB);
+                }
+                else
+                {
+                    Reference< XBlob > xBlob;
+                    if ( _rValue >>= xBlob )
+                    {
+                        (*this) = _rValue;
+                        setTypeKind(DataType::BLOB);
+                    }
+                    else
+                    {
+                        (*this) = _rValue;
+                    }
+                }
+            }
+            break;
             
         default:
             OSL_ENSURE(0,"Unknown type");
diff --git a/connectivity/source/commontools/dbmetadata.cxx b/connectivity/source/commontools/dbmetadata.cxx
index 5e07514624..13ff267071 100644
--- a/connectivity/source/commontools/dbmetadata.cxx
+++ b/connectivity/source/commontools/dbmetadata.cxx
@@ -257,6 +257,27 @@ namespace dbtools
     }
 
     //--------------------------------------------------------------------
+    bool DatabaseMetaData::supportsPrimaryKeys() const
+    {
+        lcl_checkConnected( *m_pImpl );
+
+        bool doesSupportPrimaryKeys = false;
+        try
+        {
+            Any setting;
+            if  (   !( lcl_getConnectionSetting( "PrimaryKeySupport", *m_pImpl, setting ) )
+                ||  !( setting >>= doesSupportPrimaryKeys )
+                )
+                doesSupportPrimaryKeys = m_pImpl->xConnectionMetaData->supportsCoreSQLGrammar();
+        }
+        catch( const Exception& )
+        {
+            DBG_UNHANDLED_EXCEPTION();
+        }
+        return doesSupportPrimaryKeys;
+    }
+
+    //--------------------------------------------------------------------
     const ::rtl::OUString&  DatabaseMetaData::getIdentifierQuoteString() const
     {
         return lcl_getConnectionStringSetting( *m_pImpl, m_pImpl->sCachedIdentifierQuoteString, &XDatabaseMetaData::getIdentifierQuoteString );
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index eaf1d6fe8e..5dc4330bc0 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -213,6 +213,7 @@ sal_Int32 getDefaultNumberFormat(sal_Int32 _nDataType,
         case DataType::CHAR:
         case DataType::VARCHAR:
         case DataType::LONGVARCHAR:
+        case DataType::CLOB:
             nFormat = _xTypes->getStandardFormat(NumberFormat::TEXT, _rLocale);
             break;
         case DataType::DATE:
@@ -234,10 +235,10 @@ sal_Int32 getDefaultNumberFormat(sal_Int32 _nDataType,
         case DataType::STRUCT:
         case DataType::ARRAY:
         case DataType::BLOB:
-        case DataType::CLOB:
         case DataType::REF:
         default:
-            nFormat = NumberFormat::UNDEFINED;
+            nFormat = _xTypes->getStandardFormat(NumberFormat::UNDEFINED, _rLocale);
+            //nFormat = NumberFormat::UNDEFINED;
     }
     return nFormat;
 }
@@ -1850,9 +1851,20 @@ void setObjectWithInfo(const Reference<XParameters>& _xParams,
                        sal_Int32 parameterIndex,
                        const Any& x,
                        sal_Int32 sqlType,
-                       sal_Int32 /*scale*/)  throw(SQLException, RuntimeException)
+                       sal_Int32 scale)  throw(SQLException, RuntimeException)
+{
+    ORowSetValue aVal;
+    aVal.fill(x);
+    setObjectWithInfo(_xParams,parameterIndex,aVal,sqlType,scale);
+}
+// -----------------------------------------------------------------------------
+void setObjectWithInfo(const Reference<XParameters>& _xParams,
+                       sal_Int32 parameterIndex,
+                       const ::connectivity::ORowSetValue& _rValue,
+                       sal_Int32 sqlType,
+                       sal_Int32 scale)  throw(SQLException, RuntimeException)
 {
-    if(!x.hasValue())
+    if ( _rValue.isNull() )
         _xParams->setNull(parameterIndex,sqlType);
     else
     {
@@ -1860,65 +1872,62 @@ void setObjectWithInfo(const Reference<XParameters>& _xParams,
         {
             case DataType::DECIMAL:
             case DataType::NUMERIC:
-                _xParams->setObjectWithInfo(parameterIndex,x,sqlType,0);
+                _xParams->setObjectWithInfo(parameterIndex,_rValue.makeAny(),sqlType,scale);
                 break;
             case DataType::CHAR:
             case DataType::VARCHAR:
-            //case DataType::DECIMAL:
-            //case DataType::NUMERIC:
             case DataType::LONGVARCHAR:
-                _xParams->setString(parameterIndex,::comphelper::getString(x));
+                _xParams->setString(parameterIndex,_rValue);
                 break;
-            case DataType::BIGINT:
+            case DataType::CLOB:
                 {
-                    sal_Int64 nValue = 0;
-                    if(x >>= nValue)
+                    Any x(_rValue.makeAny());
+                    ::rtl::OUString sValue;
+                    if ( x >>= sValue )
+                        _xParams->setString(parameterIndex,sValue);
+                    else
                     {
-                        _xParams->setLong(parameterIndex,nValue);
-                        break;
+                        Reference< XClob > xClob;
+                        if(x >>= xClob)
+                            _xParams->setClob(parameterIndex,xClob);
+                        else
+                        {
+                            Reference< ::com::sun::star::io::XInputStream > xStream;
+                            if(x >>= xStream)
+                                _xParams->setCharacterStream(parameterIndex,xStream,xStream->available());
+                        }
                     }
                 }
                 break;
+            case DataType::BIGINT:
+                if ( _rValue.isSigned() )
+                    _xParams->setLong(parameterIndex,_rValue);
+                else
+                    _xParams->setString(parameterIndex,_rValue);
+                break;
 
             case DataType::FLOAT:
+                _xParams->setFloat(parameterIndex,_rValue);
+                break;
             case DataType::REAL:
-                {
-                    float nValue = 0;
-                    if(x >>= nValue)
-                    {
-                        _xParams->setFloat(parameterIndex,nValue);
-                        break;
-                    }
-                }
-                // run through if we couldn't set a float value
             case DataType::DOUBLE:
-                _xParams->setDouble(parameterIndex,::comphelper::getDouble(x));
+                _xParams->setDouble(parameterIndex,_rValue);
                 break;
             case DataType::DATE:
-                {
-                    ::com::sun::star::util::Date aValue;
-                    if(x >>= aValue)
-                        _xParams->setDate(parameterIndex,aValue);
-                }
+                _xParams->setDate(parameterIndex,_rValue);
                 break;
             case DataType::TIME:
-                {
-                    ::com::sun::star::util::Time aValue;
-                    if(x >>= aValue)
-                        _xParams->setTime(parameterIndex,aValue);
-                }
+                _xParams->setTime(parameterIndex,_rValue);
                 break;
             case DataType::TIMESTAMP:
-                {
-                    ::com::sun::star::util::DateTime aValue;
-                    if(x >>= aValue)
-                        _xParams->setTimestamp(parameterIndex,aValue);
-                }
+                _xParams->setTimestamp(parameterIndex,_rValue);
                 break;
             case DataType::BINARY:
             case DataType::VARBINARY:
             case DataType::LONGVARBINARY:
+            case DataType::BLOB:
                 {
+                    Any x(_rValue.makeAny());
                     Sequence< sal_Int8> aBytes;
                     if(x >>= aBytes)
                         _xParams->setBytes(parameterIndex,aBytes);
@@ -1944,16 +1953,25 @@ void setObjectWithInfo(const Reference<XParameters>& _xParams,
                 break;
             case DataType::BIT:
             case DataType::BOOLEAN:
-                _xParams->setBoolean(parameterIndex,::cppu::any2bool(x));
+                _xParams->setBoolean(parameterIndex,_rValue);
                 break;
             case DataType::TINYINT:
-                _xParams->setByte(parameterIndex,(sal_Int8)::comphelper::getINT32(x));
+                if ( _rValue.isSigned() )
+                    _xParams->setByte(parameterIndex,_rValue);
+                else
+                    _xParams->setShort(parameterIndex,_rValue);
                 break;
             case DataType::SMALLINT:
-                _xParams->setShort(parameterIndex,(sal_Int16)::comphelper::getINT32(x));
+                if ( _rValue.isSigned() )
+                    _xParams->setShort(parameterIndex,_rValue);
+                else
+                    _xParams->setInt(parameterIndex,_rValue);
                 break;
             case DataType::INTEGER:
-                _xParams->setInt(parameterIndex,::comphelper::getINT32(x));
+                if ( _rValue.isSigned() )
+                    _xParams->setInt(parameterIndex,_rValue);
+                else
+                    _xParams->setLong(parameterIndex,_rValue);
                 break;
             default:
                 {
diff --git a/connectivity/source/commontools/makefile.mk b/connectivity/source/commontools/makefile.mk
index cb5a4ad3f7..1cc6cf4949 100644
--- a/connectivity/source/commontools/makefile.mk
+++ b/connectivity/source/commontools/makefile.mk
@@ -89,6 +89,7 @@ EXCEPTIONSFILES=\
         $(SLO)$/ParamterSubstitution.obj                \
         $(SLO)$/DriversConfig.obj                       \
         $(SLO)$/formattedcolumnvalue.obj                \
+        $(SLO)$/BlobHelper.obj							\
         $(SLO)$/warningscontainer.obj
 
 SLOFILES=\
diff --git a/connectivity/source/commontools/predicateinput.cxx b/connectivity/source/commontools/predicateinput.cxx
index 94d269955b..8bb6b79974 100644
--- a/connectivity/source/commontools/predicateinput.cxx
+++ b/connectivity/source/commontools/predicateinput.cxx
@@ -148,9 +148,10 @@ namespace dbtools
             sal_Int32 nType = DataType::OTHER;
             _rxField->getPropertyValue( ::rtl::OUString::createFromAscii( "Type" ) ) >>= nType;
 
-            if	(	( DataType::CHAR == nType )
-                ||	( DataType::VARCHAR == nType )
+            if	(	( DataType::CHAR		== nType )
+                ||	( DataType::VARCHAR		== nType )
                 ||	( DataType::LONGVARCHAR == nType )
+                ||	( DataType::CLOB		== nType )
                 )
             {	// yes -> force a quoted text and try again
                 ::rtl::OUString sQuoted( _rStatement );
diff --git a/connectivity/source/drivers/ado/AResultSet.cxx b/connectivity/source/drivers/ado/AResultSet.cxx
index 10295db9a4..142286adca 100644
--- a/connectivity/source/drivers/ado/AResultSet.cxx
+++ b/connectivity/source/drivers/ado/AResultSet.cxx
@@ -334,11 +334,9 @@ Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 /*columnIndex*/ ) throw
 }
 // -------------------------------------------------------------------------
 
-Any SAL_CALL OResultSet::getObject( sal_Int32 /*columnIndex*/, const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException)
+Any SAL_CALL OResultSet::getObject( sal_Int32 columnIndex, const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException)
 {
-
-    ::dbtools::throwFeatureNotImplementedException( "XRow::getObject", *this );
-    return Any();
+    return getValue(columnIndex).makeAny();
 }
 // -------------------------------------------------------------------------
 
@@ -786,14 +784,24 @@ void SAL_CALL OResultSet::updateTimestamp( sal_Int32 columnIndex, const ::com::s
 }
 // -------------------------------------------------------------------------
 
-void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 /*columnIndex*/, const Reference< ::com::sun::star::io::XInputStream >& /*x*/, sal_Int32 /*length*/ ) throw(SQLException, RuntimeException)
+void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException)
 {
-    ::dbtools::throwFeatureNotImplementedException( "XRowUpdate::updateBinaryStream", *this );
+    if(!x.is())
+        ::dbtools::throwFunctionSequenceException(*this);
+
+    Sequence<sal_Int8> aSeq;
+    x->readBytes(aSeq,length);
+    updateBytes(columnIndex,aSeq);
 }
 // -------------------------------------------------------------------------
-void SAL_CALL OResultSet::updateCharacterStream( sal_Int32 /*columnIndex*/, const Reference< ::com::sun::star::io::XInputStream >& /*x*/, sal_Int32 /*length*/ ) throw(SQLException, RuntimeException)
+void SAL_CALL OResultSet::updateCharacterStream( sal_Int32 columnIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException)
 {
-    ::dbtools::throwFeatureNotImplementedException( "XRowUpdate::updateCharacterStream", *this );
+    if(!x.is())
+        ::dbtools::throwFunctionSequenceException(*this);
+
+    Sequence<sal_Int8> aSeq;
+    x->readBytes(aSeq,length);
+    updateBytes(columnIndex,aSeq);
 }
 // -------------------------------------------------------------------------
 void SAL_CALL OResultSet::refreshRow(  ) throw(SQLException, RuntimeException)
diff --git a/connectivity/source/drivers/ado/Aolevariant.cxx b/connectivity/source/drivers/ado/Aolevariant.cxx
index 650c77a244..b98cf943f5 100644
--- a/connectivity/source/drivers/ado/Aolevariant.cxx
+++ b/connectivity/source/drivers/ado/Aolevariant.cxx
@@ -39,8 +39,17 @@
 #include "diagnose_ex.h"
 #include "resource/sharedresources.hxx"
 #include "resource/ado_res.hrc"
-
+#include "com/sun/star/bridge/oleautomation/Date.hpp"
+#include "com/sun/star/bridge/oleautomation/Currency.hpp"
+#include "com/sun/star/bridge/oleautomation/SCode.hpp"
+#include "com/sun/star/bridge/oleautomation/Decimal.hpp"
+
+using namespace com::sun::star::beans;
+using namespace com::sun::star::uno;
+using namespace com::sun::star::bridge::oleautomation;
 using namespace connectivity::ado;
+using ::rtl::OUString;
+
 OLEString::OLEString()
     :m_sStr(NULL)
 {
@@ -698,6 +707,88 @@ SAFEARRAY* OLEVariant::getUI1SAFEARRAYPtr() const
     return V_ARRAY(&varDest);
 }
 // -----------------------------------------------------------------------------
+::com::sun::star::uno::Any OLEVariant::makeAny() const
+{
+    ::com::sun::star::uno::Any aValue;
+    switch (V_VT(this))
+    {
+        case VT_EMPTY:
+        case VT_NULL:
+            aValue.setValue(NULL, Type());
+            break;
+        case VT_I2:
+            aValue.setValue( & iVal, getCppuType( (sal_Int16*)0));
+            break;
+        case VT_I4:
+            aValue.setValue( & lVal, getCppuType( (sal_Int32*)0));
+            break;
+        case VT_R4:
+            aValue.setValue( & fltVal, getCppuType( (float*)0));
+            break;
+        case VT_R8:
+            aValue.setValue(& dblVal, getCppuType( (double*)0));
+            break;
+        case VT_CY:
+         {
+             Currency cy(cyVal.int64);
+             aValue <<= cy;
+            break;
+         }
+        case VT_DATE:
+         {
+             aValue <<= (::com::sun::star::util::Date)*this;
+            break;
+         }
+        case VT_BSTR:
+        {
+            OUString b(reinterpret_cast<const sal_Unicode*>(bstrVal));
+            aValue.setValue( &b, getCppuType( &b));
+            break;
+        }
+        case VT_BOOL:
+        {
+            sal_Bool b= boolVal == VARIANT_TRUE;
+            aValue.setValue( &b, getCppuType( &b));
+            break;
+        }
+        case VT_I1:
+            aValue.setValue( & cVal, getCppuType((sal_Int8*)0));
+            break;
+        case VT_UI1: // there is no unsigned char in UNO
+            aValue.setValue( & bVal, getCppuType( (sal_Int8*)0));
+            break;
+        case VT_UI2:
+            aValue.setValue( & uiVal, getCppuType( (sal_uInt16*)0));
+            break;
+        case VT_UI4:
+            aValue.setValue( & ulVal, getCppuType( (sal_uInt32*)0));
+            break;
+        case VT_INT:
+            aValue.setValue( & intVal, getCppuType( (sal_Int32*)0));
+            break;
+        case VT_UINT:
+            aValue.setValue( & uintVal, getCppuType( (sal_uInt32*)0));
+            break;
+        case VT_VOID:
+            aValue.setValue( NULL, Type());
+            break;
+         case VT_DECIMAL:
+         {
+             Decimal dec;
+             dec.Scale = decVal.scale;
+             dec.Sign = decVal.sign;
+             dec.LowValue = decVal.Lo32;
+             dec.MiddleValue = decVal.Mid32;
+             dec.HighValue = decVal.Hi32;
+             aValue <<= dec;
+             break;
+         }
+
+        default:
+            break;
+    }
+    return aValue;
+}
 // -----------------------------------------------------------------------------
 // -----------------------------------------------------------------------------
 // -----------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/ado/ado.xcu b/connectivity/source/drivers/ado/ado.xcu
index fe4596f19e..a61ac3aaa1 100755
--- a/connectivity/source/drivers/ado/ado.xcu
+++ b/connectivity/source/drivers/ado/ado.xcu
@@ -115,6 +115,11 @@
             <value>true</value>
           </prop>
         </node>
+        <node oor:name="PrimaryKeySupport" oor:op="replace">
+          <prop oor:name="Value" oor:type="xs:boolean">
+            <value>true</value>
+          </prop>
+        </node>
       </node>
       <node oor:name="MetaData">
         <node oor:name="SupportsTableCreation" oor:op="replace">
diff --git a/connectivity/source/drivers/ado/adoimp.cxx b/connectivity/source/drivers/ado/adoimp.cxx
index cd89c61711..def609be32 100644
--- a/connectivity/source/drivers/ado/adoimp.cxx
+++ b/connectivity/source/drivers/ado/adoimp.cxx
@@ -157,8 +157,10 @@ DataTypeEnum ADOS::MapJdbc2ADOType(sal_Int32 _nType,sal_Int32 _nJetEngine)
         case DataType::BIT:				return adBoolean;			break;
         case DataType::BINARY:			return adBinary;			break;
         case DataType::VARCHAR:			return adVarWChar;			break;
+        case DataType::CLOB:
         case DataType::LONGVARCHAR:		return adLongVarWChar;		break;
         case DataType::VARBINARY:		return adVarBinary;			break;
+        case DataType::BLOB:
         case DataType::LONGVARBINARY:	return adLongVarBinary;		break;
         case DataType::CHAR:			return adWChar;				break;
         case DataType::TINYINT:			return isJetEngine(_nJetEngine) ? adUnsignedTinyInt : adTinyInt;break;
diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx
index 6d82486dae..652d41d886 100644
--- a/connectivity/source/drivers/file/FStatement.cxx
+++ b/connectivity/source/drivers/file/FStatement.cxx
@@ -497,13 +497,16 @@ void OStatement_Base::construct(const ::rtl::OUString& sql)  throw(SQLException,
             // SELECT statement without columns -> error
             m_pConnection->throwGenericSQLException(STR_QUERY_NO_COLUMN,*this);
 
-        if ( m_aSQLIterator.getStatementType() == SQL_STATEMENT_CREATE_TABLE )
-            // CREATE TABLE is not supported at all
-            m_pConnection->throwGenericSQLException(STR_QUERY_TOO_COMPLEX,*this);
-
-        if ( ( m_aSQLIterator.getStatementType() == SQL_STATEMENT_ODBC_CALL ) || ( m_aSQLIterator.getStatementType() == SQL_STATEMENT_UNKNOWN ) )
-            // ODBC call or unknown statement type -> error
-            m_pConnection->throwGenericSQLException(STR_QUERY_TOO_COMPLEX,*this);
+        switch(m_aSQLIterator.getStatementType())
+        {
+            case SQL_STATEMENT_CREATE_TABLE:
+            case SQL_STATEMENT_ODBC_CALL:
+            case SQL_STATEMENT_UNKNOWN:
+                m_pConnection->throwGenericSQLException(STR_QUERY_TOO_COMPLEX,*this);
+                break;
+            default:
+                break;
+        }
         
         // at this moment we support only one table per select statement
         Reference< ::com::sun::star::lang::XUnoTunnel> xTunnel(xTabs.begin()->second,UNO_QUERY);
diff --git a/connectivity/source/drivers/jdbc/Boolean.cxx b/connectivity/source/drivers/jdbc/Boolean.cxx
index 4e17033cee..c9f222827b 100644
--- a/connectivity/source/drivers/jdbc/Boolean.cxx
+++ b/connectivity/source/drivers/jdbc/Boolean.cxx
@@ -40,17 +40,19 @@ jclass java_lang_Boolean::theClass = 0;
 
 java_lang_Boolean::~java_lang_Boolean()
 {}
-
-jclass java_lang_Boolean::getMyClass() const
+jclass java_lang_Boolean::st_getMyClass()
 {
     // die Klasse muss nur einmal geholt werden, daher statisch
     if( !theClass )
-    {
         theClass = findMyClass("java/lang/Boolean");
-    }
     return theClass;
 }
 
+jclass java_lang_Boolean::getMyClass() const
+{
+    return st_getMyClass();
+}
+
 java_lang_Boolean::java_lang_Boolean( sal_Bool _par0 ): java_lang_Object( NULL, (jobject)NULL )
 {
     SDBThreadAttach t;
diff --git a/connectivity/source/drivers/jdbc/CallableStatement.cxx b/connectivity/source/drivers/jdbc/CallableStatement.cxx
index 8167c0ee8a..94cf7f58ea 100644
--- a/connectivity/source/drivers/jdbc/CallableStatement.cxx
+++ b/connectivity/source/drivers/jdbc/CallableStatement.cxx
@@ -227,9 +227,8 @@ void SAL_CALL java_sql_CallableStatement::registerOutParameter( sal_Int32 parame
         static jmethodID mID(NULL);
         obtainMethodId(t.pEnv, cMethodName,cSignature, mID);
         // Parameter konvertieren
-        jstring str = convertwchar_tToJavaString(t.pEnv,typeName);
-        t.pEnv->CallVoidMethod( object, mID, parameterIndex,sqlType,str);
-        t.pEnv->DeleteLocalRef(str);
+        jdbc::LocalRef< jstring > str( t.env(),convertwchar_tToJavaString(t.pEnv,typeName));
+        t.pEnv->CallVoidMethod( object, mID, parameterIndex,sqlType,str.get());
         ThrowLoggedSQLException( m_aLogger, t.pEnv, *this );
     }
 }
@@ -336,23 +335,22 @@ void java_sql_CallableStatement::createStatement(JNIEnv* /*_pEnv*/)
         // Java-Call absetzen
         jobject out = NULL;
         // Parameter konvertieren
-        jstring str = convertwchar_tToJavaString(t.pEnv,m_sSqlStatement);
+        jdbc::LocalRef< jstring > str( t.env(),convertwchar_tToJavaString(t.pEnv,m_sSqlStatement));
 
         static jmethodID mID(NULL);
         if ( !mID  )
             mID  = t.pEnv->GetMethodID( m_pConnection->getMyClass(), cMethodName, cSignature );
         if( mID ){
-            out = t.pEnv->CallObjectMethod( m_pConnection->getJavaObject(), mID, str ,m_nResultSetType,m_nResultSetConcurrency);
+            out = t.pEnv->CallObjectMethod( m_pConnection->getJavaObject(), mID, str.get() ,m_nResultSetType,m_nResultSetConcurrency);
         } //mID
         else
         {
             static const char * cSignature2 = "(Ljava/lang/String;)Ljava/sql/CallableStatement;";
             static jmethodID mID2 = t.pEnv->GetMethodID( m_pConnection->getMyClass(), cMethodName, cSignature2 );OSL_ENSURE(mID2,"Unknown method id!");
             if( mID2 ){
-                out = t.pEnv->CallObjectMethod( m_pConnection->getJavaObject(), mID2, str );
+                out = t.pEnv->CallObjectMethod( m_pConnection->getJavaObject(), mID2, str.get() );
             } //mID
         }
-        t.pEnv->DeleteLocalRef(str);
         ThrowLoggedSQLException( m_aLogger, t.pEnv, *this );
 
         if ( out )
diff --git a/connectivity/source/drivers/jdbc/Clob.cxx b/connectivity/source/drivers/jdbc/Clob.cxx
index c3c53d5809..a1bbc0710a 100644
--- a/connectivity/source/drivers/jdbc/Clob.cxx
+++ b/connectivity/source/drivers/jdbc/Clob.cxx
@@ -34,6 +34,8 @@
 #include "java/tools.hxx"
 #include "java/io/Reader.hxx"
 #include <connectivity/dbexception.hxx>
+#include <rtl/logfile.hxx>
+
 using namespace connectivity;
 //**************************************************************
 //************ Class: java.sql.Clob
@@ -61,6 +63,7 @@ jclass java_sql_Clob::getMyClass() const
 
 sal_Int64 SAL_CALL java_sql_Clob::length(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "jdbc", "Ocke.Janssen@sun.com", "java_sql_Clob::length" );
     jlong out(0);
     SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
     
@@ -79,6 +82,7 @@ sal_Int64 SAL_CALL java_sql_Clob::length(  ) throw(::com::sun::star::sdbc::SQLEx
 
 ::rtl::OUString SAL_CALL java_sql_Clob::getSubString( sal_Int64 pos, sal_Int32 subStringLength ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "jdbc", "Ocke.Janssen@sun.com", "java_sql_Clob::getSubString" );
     SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
     ::rtl::OUString aStr;
     {
@@ -98,6 +102,7 @@ sal_Int64 SAL_CALL java_sql_Clob::length(  ) throw(::com::sun::star::sdbc::SQLEx
 
 ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL java_sql_Clob::getCharacterStream(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "jdbc", "Ocke.Janssen@sun.com", "java_sql_Clob::getCharacterStream" );
     SDBThreadAttach t;
     static jmethodID mID(NULL);
     jobject out = callObjectMethod(t.pEnv,"getCharacterStream","()Ljava/io/Reader;", mID);
@@ -108,6 +113,7 @@ sal_Int64 SAL_CALL java_sql_Clob::length(  ) throw(::com::sun::star::sdbc::SQLEx
 
 sal_Int64 SAL_CALL java_sql_Clob::position( const ::rtl::OUString& searchstr, sal_Int32 start ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "jdbc", "Ocke.Janssen@sun.com", "java_sql_Clob::position" );
     jlong out(0);
     SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
     
@@ -130,6 +136,7 @@ sal_Int64 SAL_CALL java_sql_Clob::position( const ::rtl::OUString& searchstr, sa
 
 sal_Int64 SAL_CALL java_sql_Clob::positionOfClob( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob >& /*pattern*/, sal_Int64 /*start*/ ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "jdbc", "Ocke.Janssen@sun.com", "java_sql_Clob::positionOfClob" );
     ::dbtools::throwFeatureNotImplementedException( "XClob::positionOfClob", *this );
     // this was put here in CWS warnings01. The previous implementation was defective, as it did ignore
     // the pattern parameter. Since the effort for proper implementation is rather high - we would need
diff --git a/connectivity/source/drivers/jdbc/InputStream.cxx b/connectivity/source/drivers/jdbc/InputStream.cxx
index 0236c7f350..17c9b54152 100644
--- a/connectivity/source/drivers/jdbc/InputStream.cxx
+++ b/connectivity/source/drivers/jdbc/InputStream.cxx
@@ -84,8 +84,9 @@ void SAL_CALL java_io_InputStream::closeInput(  ) throw(::com::sun::star::io::No
 // -----------------------------------------------------
 sal_Int32 SAL_CALL java_io_InputStream::readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException)
 {
-    if ( aData.getLength() < nBytesToRead )
-        throw ::com::sun::star::io::BufferSizeExceededException();
+    if (nBytesToRead < 0)
+        throw ::com::sun::star::io::BufferSizeExceededException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), *this );
+
     jint out(0);
     SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
     
@@ -102,7 +103,8 @@ sal_Int32 SAL_CALL java_io_InputStream::readBytes( ::com::sun::star::uno::Sequen
         if(out > 0)
         {
             jboolean p = sal_False;
-            memcpy(aData.getArray(),t.pEnv->GetByteArrayElements(pByteArray,&p),out);
+            aData.realloc ( out );
+            rtl_copyMemory(aData.getArray(),t.pEnv->GetByteArrayElements(pByteArray,&p),out);
         }
         t.pEnv->DeleteLocalRef((jbyteArray)pByteArray);
     } //t.pEnv
diff --git a/connectivity/source/drivers/jdbc/JConnection.cxx b/connectivity/source/drivers/jdbc/JConnection.cxx
index e2f1afcb77..17e8d2dbbe 100644
--- a/connectivity/source/drivers/jdbc/JConnection.cxx
+++ b/connectivity/source/drivers/jdbc/JConnection.cxx
@@ -56,6 +56,7 @@
 #include <rtl/ustrbuf.hxx>
 #include <jni.h>
 #include "resource/common_res.hrc"
+#include <unotools/confignode.hxx>
 
 #include <list>
 #include <memory>
@@ -553,10 +554,9 @@ Reference< XPreparedStatement > SAL_CALL java_sql_Connection::prepareCall( const
         static jmethodID mID(NULL);
         obtainMethodId(t.pEnv, cMethodName,cSignature, mID);
         // Parameter konvertieren
-        jstring str = convertwchar_tToJavaString(t.pEnv,sql);
+        jdbc::LocalRef< jstring > str( t.env(),convertwchar_tToJavaString(t.pEnv,sql));
 
-        jobject out = t.pEnv->CallObjectMethod( object, mID, str );
-        t.pEnv->DeleteLocalRef(str);
+        jobject out = t.pEnv->CallObjectMethod( object, mID, str.get() );
         aStr = JavaString2String(t.pEnv, (jstring)out );
         ThrowLoggedSQLException( m_aLogger, t.pEnv, *this );
     } //t.pEnv
@@ -767,7 +767,20 @@ void java_sql_Connection::loadDriverFromProperties( const ::rtl::OUString& _sDri
     enableAutoRetrievingEnabled( bAutoRetrievingEnabled );
     setAutoRetrievingStatement( sGeneratedValueStatement );
 }
-
+// -----------------------------------------------------------------------------
+::rtl::OUString java_sql_Connection::impl_getJavaDriverClassPath_nothrow(const ::rtl::OUString& _sDriverClass)
+{
+    static const ::rtl::OUString s_sNodeName(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.DataAccess/JDBC/DriverClassPaths"));
+    ::utl::OConfigurationTreeRoot aNamesRoot = ::utl::OConfigurationTreeRoot::createWithServiceFactory(
+        m_pDriver->getContext().getLegacyServiceFactory(), s_sNodeName, -1, ::utl::OConfigurationTreeRoot::CM_READONLY);
+    ::rtl::OUString sURL;
+    if ( aNamesRoot.isValid() && aNamesRoot.hasByName( _sDriverClass ) )
+    {
+        ::utl::OConfigurationNode aRegisterObj = aNamesRoot.openNode( _sDriverClass );
+        OSL_VERIFY( aRegisterObj.getNodeValue( "Path" ) >>= sURL );
+    }
+    return sURL;
+}
 // -----------------------------------------------------------------------------
 sal_Bool java_sql_Connection::construct(const ::rtl::OUString& url,
                                     const Sequence< PropertyValue >& info)
@@ -790,6 +803,8 @@ sal_Bool java_sql_Connection::construct(const ::rtl::OUString& url,
     ::comphelper::NamedValueCollection aSettings( info );
     sDriverClass = aSettings.getOrDefault( "JavaDriverClass", sDriverClass );
     sDriverClassPath = aSettings.getOrDefault( "JavaDriverClassPath", sDriverClassPath);
+    if ( !sDriverClassPath.getLength() )
+        sDriverClassPath = impl_getJavaDriverClassPath_nothrow(sDriverClass);
     bAutoRetrievingEnabled = aSettings.getOrDefault( "IsAutoRetrievingEnabled", bAutoRetrievingEnabled );
     sGeneratedValueStatement = aSettings.getOrDefault( "AutoRetrievingStatement", sGeneratedValueStatement );
     m_bParameterSubstitution = aSettings.getOrDefault( "ParameterNameSubstitution", m_bParameterSubstitution );
@@ -810,8 +825,8 @@ sal_Bool java_sql_Connection::construct(const ::rtl::OUString& url,
         static const char * cSignature = "(Ljava/lang/String;Ljava/util/Properties;)Ljava/sql/Connection;";
         static const char * cMethodName = "connect";
         // Java-Call absetzen
-        jmethodID mID = NULL;
-        if ( !mID  )

+        static jmethodID mID = NULL;
+        if ( !mID  )
             mID  = t.pEnv->GetMethodID( m_Driver_theClass, cMethodName, cSignature );
         if ( mID )
         {
diff --git a/connectivity/source/drivers/jdbc/Object.cxx b/connectivity/source/drivers/jdbc/Object.cxx
index b8e8c87954..72f3731f5a 100644
--- a/connectivity/source/drivers/jdbc/Object.cxx
+++ b/connectivity/source/drivers/jdbc/Object.cxx
@@ -43,7 +43,7 @@
 #include <vos/mutex.hxx>
 #include <osl/thread.h>
 #include <com/sun/star/uno/Sequence.hxx>
-
+#include "java/LocalRef.hxx"
 #include "resource/jdbc_log.hrc"
 #include <rtl/logfile.hxx>
 #include <comphelper/logging.hxx>
@@ -395,10 +395,9 @@ void java_lang_Object::callVoidMethodWithStringArg( const char* _pMethodName, jm
     OSL_ENSURE( t.pEnv, "java_lang_Object::callIntMethod: no Java enviroment anymore!" );
     obtainMethodId(t.pEnv, _pMethodName,"(Ljava/lang/String;)V", _inout_MethodID);
 
-    jstring str = convertwchar_tToJavaString(t.pEnv,_nArgument);
+    jdbc::LocalRef< jstring > str( t.env(),convertwchar_tToJavaString(t.pEnv,_nArgument));
     // call method
-    t.pEnv->CallVoidMethod( object, _inout_MethodID , str);
-    t.pEnv->DeleteLocalRef(str);
+    t.pEnv->CallVoidMethod( object, _inout_MethodID , str.get());
     ThrowSQLException( t.pEnv, NULL );
 }
 // -------------------------------------------------------------------------
@@ -417,10 +416,9 @@ sal_Int32 java_lang_Object::callIntMethodWithStringArg( const char* _pMethodName
             //        *this
             //    );
 
-    jstring str = convertwchar_tToJavaString(t.pEnv,_nArgument);
+    jdbc::LocalRef< jstring > str( t.env(),convertwchar_tToJavaString(t.pEnv,_nArgument));
     // call method
-    jint out = t.pEnv->CallIntMethod( object, _inout_MethodID , str);
-    t.pEnv->DeleteLocalRef(str);
+    jint out = t.pEnv->CallIntMethod( object, _inout_MethodID , str.get());
     ThrowSQLException( t.pEnv, NULL );
     return (sal_Int32)out;
 }
diff --git a/connectivity/source/drivers/jdbc/PreparedStatement.cxx b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
index 62e12c42a5..7639357a41 100644
--- a/connectivity/source/drivers/jdbc/PreparedStatement.cxx
+++ b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
@@ -45,7 +45,7 @@
 #include "resource/jdbc_log.hrc"
 #include "resource/common_res.hrc"
 #include "resource/sharedresources.hxx"
-
+#include "java/LocalRef.hxx"
 #include <string.h>
 
 using namespace connectivity;
@@ -138,10 +138,9 @@ void SAL_CALL java_sql_PreparedStatement::setString( sal_Int32 parameterIndex, c
         // Java-Call absetzen
         static jmethodID mID(NULL);
         obtainMethodId(t.pEnv, cMethodName,cSignature, mID);
-        jstring str = convertwchar_tToJavaString(t.pEnv,x);
-        t.pEnv->CallVoidMethod( object, mID, parameterIndex,str);
+        jdbc::LocalRef< jstring > str( t.env(),convertwchar_tToJavaString(t.pEnv,x));
+        t.pEnv->CallVoidMethod( object, mID, parameterIndex,str.get());
         // und aufraeumen
-        t.pEnv->DeleteLocalRef(str);
         ThrowLoggedSQLException( m_aLogger, t.pEnv, *this );
     } //t.pEnv
 }
diff --git a/connectivity/source/drivers/jdbc/ResultSet.cxx b/connectivity/source/drivers/jdbc/ResultSet.cxx
index 8a5a9a22a0..144ee27c7c 100644
--- a/connectivity/source/drivers/jdbc/ResultSet.cxx
+++ b/connectivity/source/drivers/jdbc/ResultSet.cxx
@@ -30,10 +30,13 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_connectivity.hxx"
+#include "java/lang/String.hxx"
+#include "java/lang/Boolean.hxx"
 #include "java/sql/ResultSet.hxx"
 #include "java/math/BigDecimal.hxx"
 #include "java/sql/JStatement.hxx"
 #include "java/sql/SQLWarning.hxx"
+#include "java/sql/Timestamp.hxx"
 #include "java/sql/Array.hxx"
 #include "java/sql/Ref.hxx"
 #include "java/sql/Clob.hxx"
@@ -54,6 +57,7 @@
 #include "connectivity/dbexception.hxx"
 #include "resource/common_res.hrc"
 #include "resource/sharedresources.hxx"
+#include "java/LocalRef.hxx"
 
 #include <rtl/logfile.hxx>
 #include <string.h>
@@ -324,6 +328,7 @@ Any SAL_CALL java_sql_ResultSet::getObject( sal_Int32 columnIndex, const Referen
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "jdbc", "Ocke.Janssen@sun.com", "java_sql_ResultSet::getObject" );
     jobject out(0);
+    Any aRet;
     SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
     {
         jvalue args[2];
@@ -341,15 +346,43 @@ Any SAL_CALL java_sql_ResultSet::getObject( sal_Int32 columnIndex, const Referen
             obtainMethodId(t.pEnv, cMethodName,cSignature, mID);
         }
         
-            out = t.pEnv->CallObjectMethodA( object, mID, args);
-            t.pEnv->DeleteLocalRef((jstring)args[1].l);
-            ThrowLoggedSQLException( m_aLogger, t.pEnv, *this );
-            // und aufraeumen
-        
+        out = t.pEnv->CallObjectMethodA( object, mID, args);
+        t.pEnv->DeleteLocalRef((jstring)args[1].l);
+        ThrowLoggedSQLException( m_aLogger, t.pEnv, *this );
+        // und aufraeumen
+        if ( out )
+        {
+            if ( t.pEnv->IsInstanceOf(out,java_lang_String::st_getMyClass()) )
+            {
+                java_lang_String aVal(t.pEnv,out);
+                aRet <<= (::rtl::OUString)aVal;
+            }
+            else if ( t.pEnv->IsInstanceOf(out,java_lang_Boolean::st_getMyClass()) )
+            {
+                java_lang_Boolean aVal(t.pEnv,out);
+                static jmethodID methodID = NULL;
+                aRet <<= aVal.callBooleanMethod("booleanValue",methodID);
+            }
+            else if ( t.pEnv->IsInstanceOf(out,java_sql_Date::st_getMyClass()) )
+            {
+                java_sql_Date aVal(t.pEnv,out);
+                aRet <<= (::com::sun::star::util::Date)aVal;
+            }
+            else if ( t.pEnv->IsInstanceOf(out,java_sql_Time::st_getMyClass()) )
+            {
+                java_sql_Time aVal(t.pEnv,out);
+                aRet <<= (::com::sun::star::util::Time)aVal;
+            }
+            else if ( t.pEnv->IsInstanceOf(out,java_sql_Timestamp::st_getMyClass()) )
+            {
+                java_sql_Timestamp aVal(t.pEnv,out);
+                aRet <<= (::com::sun::star::util::DateTime)aVal;
+            }
+            else
+                t.pEnv->DeleteLocalRef(out);
+        }
     } //t.pEnv
-    // ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!!
-    ::dbtools::throwFunctionNotSupportedException( "XRow::getObject", *this );
-    return out==0 ? Any() : Any();//new java_lang_Object( t.pEnv, out );
+    return aRet;
 }
 // -------------------------------------------------------------------------
 
@@ -689,9 +722,8 @@ void SAL_CALL java_sql_ResultSet::updateString( sal_Int32 columnIndex, const ::r
         
         {
             // Parameter konvertieren
-            jstring str = convertwchar_tToJavaString(t.pEnv,x);
-            t.pEnv->CallVoidMethod( object, mID,columnIndex,str);
-            t.pEnv->DeleteLocalRef(str);
+            jdbc::LocalRef< jstring > str( t.env(),convertwchar_tToJavaString(t.pEnv,x));
+            t.pEnv->CallVoidMethod( object, mID,columnIndex,str.get());
             ThrowLoggedSQLException( m_aLogger, t.pEnv, *this );
         }
     }
@@ -754,16 +786,68 @@ void SAL_CALL java_sql_ResultSet::updateTimestamp( sal_Int32 columnIndex, const
 }
 // -------------------------------------------------------------------------
 
-void SAL_CALL java_sql_ResultSet::updateBinaryStream( sal_Int32 /*columnIndex*/, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& /*x*/, sal_Int32 /*length*/ ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
+void SAL_CALL java_sql_ResultSet::updateBinaryStream( sal_Int32 columnIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "jdbc", "Ocke.Janssen@sun.com", "java_sql_ResultSet::updateBinaryStream" );
-    ::dbtools::throwFeatureNotImplementedException( "XParameters::updateBinaryStream", *this );
+    try
+    {
+        SDBThreadAttach t;
+        {
+
+            // temporaere Variable initialisieren
+            // Java-Call absetzen
+            static jmethodID mID(NULL);
+            if ( !mID  )
+            {
+                static const char * cSignature = "(ILjava/io/InputStream;I)V";
+                static const char * cMethodName = "updateBinaryStream";
+                obtainMethodId(t.pEnv, cMethodName,cSignature, mID);
+            }
+            
+            {
+                // Parameter konvertieren
+                jobject obj = createByteInputStream(x,length);
+                t.pEnv->CallVoidMethod( object, mID, columnIndex,obj,length);
+                ThrowLoggedSQLException( m_aLogger, t.pEnv, *this );
+            }
+        }
+    }
+    catch(Exception)
+    {
+        ::dbtools::throwFeatureNotImplementedException( "XRowUpdate::updateBinaryStream", *this );    
+    }    
 }
 // -------------------------------------------------------------------------
-void SAL_CALL java_sql_ResultSet::updateCharacterStream( sal_Int32 /*columnIndex*/, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& /*x*/, sal_Int32 /*length*/ ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
+void SAL_CALL java_sql_ResultSet::updateCharacterStream( sal_Int32 columnIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "jdbc", "Ocke.Janssen@sun.com", "java_sql_ResultSet::updateCharacterStream" );
-    ::dbtools::throwFeatureNotImplementedException( "XRowUpdate::updateCharacterStream", *this );
+    try
+    {
+        SDBThreadAttach t;
+        {
+
+            // temporaere Variable initialisieren
+            // Java-Call absetzen
+            static jmethodID mID(NULL);
+            if ( !mID  )
+            {
+                static const char * cSignature = "(ILjava/io/Reader;I)V";
+                static const char * cMethodName = "updateCharacterStream";
+                obtainMethodId(t.pEnv, cMethodName,cSignature, mID);
+            }
+            
+            {
+                // Parameter konvertieren
+                jobject obj = createCharArrayReader(x,length);
+                t.pEnv->CallVoidMethod( object, mID, columnIndex,obj,length);
+                ThrowLoggedSQLException( m_aLogger, t.pEnv, *this );
+            }
+        }
+    }
+    catch(Exception)
+    {
+        ::dbtools::throwFeatureNotImplementedException( "XRowUpdate::updateCharacterStream", *this );    
+    }
 }
 // -------------------------------------------------------------------------
 void SAL_CALL java_sql_ResultSet::updateObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Any& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
diff --git a/connectivity/source/drivers/jdbc/Timestamp.cxx b/connectivity/source/drivers/jdbc/Timestamp.cxx
index 5a014d12a5..fe66e881a7 100644
--- a/connectivity/source/drivers/jdbc/Timestamp.cxx
+++ b/connectivity/source/drivers/jdbc/Timestamp.cxx
@@ -71,6 +71,10 @@ java_sql_Date::~java_sql_Date()
 
 jclass java_sql_Date::getMyClass() const
 {
+    return st_getMyClass();
+}
+jclass java_sql_Date::st_getMyClass()
+{
     // die Klasse muss nur einmal geholt werden, daher statisch
     if( !theClass )
         theClass = findMyClass("java/sql/Date");
@@ -94,12 +98,15 @@ java_sql_Time::~java_sql_Time()
 
 jclass java_sql_Time::getMyClass() const
 {
+    return st_getMyClass();
+}
+jclass java_sql_Time::st_getMyClass()
+{
     // die Klasse muss nur einmal geholt werden, daher statisch
     if( !theClass )
         theClass = findMyClass("java/sql/Time");
     return theClass;
 }
-
 java_sql_Time::java_sql_Time( const ::com::sun::star::util::Time& _rOut ): java_util_Date( NULL, (jobject)NULL )
 {
     SDBThreadAttach t;
@@ -140,12 +147,15 @@ java_sql_Timestamp::~java_sql_Timestamp()
 
 jclass java_sql_Timestamp::getMyClass() const
 {
+    return st_getMyClass();
+}
+jclass java_sql_Timestamp::st_getMyClass()
+{
     // die Klasse muss nur einmal geholt werden, daher statisch
     if( !theClass )
         theClass = findMyClass("java/sql/Timestamp");
     return theClass;
 }
-
 java_sql_Timestamp::java_sql_Timestamp(const ::com::sun::star::util::DateTime& _rOut)
                    :java_util_Date( NULL, (jobject)NULL )
 {
diff --git a/connectivity/source/drivers/jdbc/jdbc.xcu b/connectivity/source/drivers/jdbc/jdbc.xcu
index 7a64519e48..56dfcbc8cb 100755
--- a/connectivity/source/drivers/jdbc/jdbc.xcu
+++ b/connectivity/source/drivers/jdbc/jdbc.xcu
@@ -145,6 +145,11 @@
             <value>true</value>
           </prop>
         </node>
+        <node oor:name="PrimaryKeySupport" oor:op="replace">
+          <prop oor:name="Value" oor:type="xs:boolean">
+            <value>true</value>
+          </prop>
+        </node>
       </node>
       <node oor:name="MetaData">
         <node oor:name="SupportsTableCreation" oor:op="replace">
diff --git a/connectivity/source/drivers/jdbc/makefile.mk b/connectivity/source/drivers/jdbc/makefile.mk
index 831a6755af..fb37a30777 100644
--- a/connectivity/source/drivers/jdbc/makefile.mk
+++ b/connectivity/source/drivers/jdbc/makefile.mk
@@ -95,6 +95,7 @@ SHL1STDLIBS=\
     $(SALLIB)					\
     $(JVMACCESSLIB)				\
     $(DBTOOLSLIB)				\
+    $(UNOTOOLSLIB)				\
     $(JVMFWKLIB)				\
     $(COMPHELPERLIB)
 
diff --git a/connectivity/source/drivers/jdbc/tools.cxx b/connectivity/source/drivers/jdbc/tools.cxx
index 8a3ca446dc..f9de90d92f 100644
--- a/connectivity/source/drivers/jdbc/tools.cxx
+++ b/connectivity/source/drivers/jdbc/tools.cxx
@@ -218,5 +218,58 @@ sal_Bool connectivity::isExceptionOccured(JNIEnv *pEnv,sal_Bool _bClear)
 
     return bRet;
 }
-
-
+// -----------------------------------------------------------------------------
+jobject connectivity::createByteInputStream(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x,sal_Int32 length)
+{   
+    SDBThreadAttach t;
+    if( !t.pEnv || !x.is() )
+        return NULL;
+    // Java-Call fuer den Konstruktor absetzen
+    // temporaere Variable initialisieren
+    jclass clazz = java_lang_Object::findMyClass("java/io/ByteArrayInputStream");
+    static jmethodID mID(NULL);
+    if  ( !mID )
+    {
+        static const char * cSignature = "([B)V";
+        mID  = t.pEnv->GetMethodID( clazz, "<init>", cSignature );
+        OSL_ENSURE( mID, cSignature );
+        if  ( !mID )
+            throw SQLException();
+    } // if  ( !_inout_MethodID )
+    jbyteArray pByteArray = t.pEnv->NewByteArray(length);
+    Sequence< sal_Int8 > aData;
+    x->readBytes(aData,length);
+    jboolean p = sal_False;
+    rtl_copyMemory(t.pEnv->GetByteArrayElements(pByteArray,&p),aData.getArray(),aData.getLength());
+    jobject out = t.pEnv->NewObject( clazz, mID,pByteArray);
+    t.pEnv->DeleteLocalRef((jbyteArray)pByteArray);
+    return out;
+}
+// -----------------------------------------------------------------------------
+jobject connectivity::createCharArrayReader(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x,sal_Int32 length)
+{   
+    SDBThreadAttach t;
+    if( !t.pEnv || !x.is() )
+        return NULL;
+    // Java-Call fuer den Konstruktor absetzen
+    // temporaere Variable initialisieren
+    jclass clazz = java_lang_Object::findMyClass("java/io/CharArrayReader");
+    static jmethodID mID(NULL);
+    if  ( !mID )
+    {
+        static const char * cSignature = "([C)V";
+        mID  = t.pEnv->GetMethodID( clazz, "<init>", cSignature );
+        OSL_ENSURE( mID, cSignature );
+        if  ( !mID )
+            throw SQLException();
+    } // if  ( !_inout_MethodID )
+    jcharArray pCharArray = t.pEnv->NewCharArray(length);
+    Sequence< sal_Int8 > aData;
+    x->readBytes(aData,length);
+    jboolean p = sal_False;
+    rtl_copyMemory(t.pEnv->GetCharArrayElements(pCharArray,&p),aData.getArray(),aData.getLength());
+    jobject out = t.pEnv->NewObject( clazz, mID,pCharArray);
+    t.pEnv->DeleteLocalRef((jcharArray)pCharArray);
+    return out;
+}
+// -----------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/odbc/odbc.xcu b/connectivity/source/drivers/odbc/odbc.xcu
index f906d08bdd..5c8d8c07d5 100755
--- a/connectivity/source/drivers/odbc/odbc.xcu
+++ b/connectivity/source/drivers/odbc/odbc.xcu
@@ -150,6 +150,11 @@
             <value>true</value>
           </prop>
         </node>
+        <node oor:name="PrimaryKeySupport" oor:op="replace">
+          <prop oor:name="Value" oor:type="xs:boolean">
+            <value>true</value>
+          </prop>
+        </node>
       </node>
       <node oor:name="MetaData">
         <node oor:name="SupportsTableCreation" oor:op="replace">
diff --git a/connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx b/connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx
index 97edeeffeb..6874e4e69f 100644
--- a/connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx
+++ b/connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx
@@ -921,6 +921,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert( sal_Int32 fromType, sal_In
             OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CONVERT_VARCHAR,nValue,*this);
             break;
         case DataType::LONGVARCHAR:
+        case DataType::CLOB:
             OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CONVERT_LONGVARCHAR,nValue,*this);
             break;
         case DataType::DATE:
@@ -939,6 +940,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert( sal_Int32 fromType, sal_In
             OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CONVERT_VARBINARY,nValue,*this);
             break;
         case DataType::LONGVARBINARY:
+        case DataType::BLOB:
             OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CONVERT_LONGVARBINARY,nValue,*this);
             break;
         case DataType::SQLNULL:
@@ -959,12 +961,6 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert( sal_Int32 fromType, sal_In
         case DataType::ARRAY:
             //	OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CORRELATION_NAME,nValue,*this);
             break;
-        case DataType::BLOB:
-            //	OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CORRELATION_NAME,nValue,*this);
-            break;
-        case DataType::CLOB:
-            //	OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CORRELATION_NAME,nValue,*this);
-            break;
         case DataType::REF:
             //	OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CORRELATION_NAME,nValue,*this);
             break;
@@ -1009,6 +1005,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert( sal_Int32 fromType, sal_In
             bConvert = (nValue & SQL_CVT_VARCHAR) == SQL_CVT_VARCHAR;
             break;
         case DataType::LONGVARCHAR:
+        case DataType::CLOB:
             bConvert = (nValue & SQL_CVT_LONGVARCHAR) == SQL_CVT_LONGVARCHAR;
             break;
         case DataType::DATE:
@@ -1027,6 +1024,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert( sal_Int32 fromType, sal_In
             bConvert = (nValue & SQL_CVT_VARBINARY) == SQL_CVT_VARBINARY;
             break;
         case DataType::LONGVARBINARY:
+        case DataType::BLOB:
             bConvert = (nValue & SQL_CVT_LONGVARBINARY) == SQL_CVT_LONGVARBINARY;
             break;
     }
diff --git a/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
index 773b9c0293..20e705ba0e 100644
--- a/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
@@ -283,7 +283,7 @@ Sequence< sal_Int8 > SAL_CALL ODatabaseMetaDataResultSet::getBytes( sal_Int32 co
         aDate.day = 0;
         aDate.month = 0;
         aDate.year = 0;
-        OTools::getValue(m_pConnection,m_aStatementHandle,columnIndex,SQL_C_DATE,m_bWasNull,**this,&aDate,sizeof aDate);
+        OTools::getValue(m_pConnection,m_aStatementHandle,columnIndex,m_pConnection->useOldDateFormat() ? SQL_C_DATE : SQL_C_TYPE_DATE,m_bWasNull,**this,&aDate,sizeof aDate);
         return Date(aDate.day,aDate.month,aDate.year);
     }
     else
@@ -434,7 +434,7 @@ sal_Int16 SAL_CALL ODatabaseMetaDataResultSet::getShort( sal_Int32 columnIndex )
     columnIndex = mapColumn(columnIndex);
     ::rtl::OUString aVal;
     if(columnIndex <= m_nDriverColumnCount)
-        aVal = OTools::getStringValue(m_pConnection,m_aStatementHandle,columnIndex,(SWORD)SQL_C_WCHAR,m_bWasNull,**this,m_nTextEncoding);
+        aVal = OTools::getStringValue(m_pConnection,m_aStatementHandle,columnIndex,impl_getColumnType_nothrow(columnIndex),m_bWasNull,**this,m_nTextEncoding);
     else
         m_bWasNull = sal_True;
 
@@ -454,7 +454,7 @@ sal_Int16 SAL_CALL ODatabaseMetaDataResultSet::getShort( sal_Int32 columnIndex )
     columnIndex = mapColumn(columnIndex);
     TIME_STRUCT aTime={0,0,0};
     if(columnIndex <= m_nDriverColumnCount)
-        OTools::getValue(m_pConnection,m_aStatementHandle,columnIndex,SQL_C_TIME,m_bWasNull,**this,&aTime,sizeof aTime);
+        OTools::getValue(m_pConnection,m_aStatementHandle,columnIndex,m_pConnection->useOldDateFormat() ? SQL_C_TIME : SQL_C_TYPE_TIME,m_bWasNull,**this,&aTime,sizeof aTime);
     else
         m_bWasNull = sal_True;
     return Time(0,aTime.second,aTime.minute,aTime.hour);
@@ -472,7 +472,7 @@ sal_Int16 SAL_CALL ODatabaseMetaDataResultSet::getShort( sal_Int32 columnIndex )
     columnIndex = mapColumn(columnIndex);
     TIMESTAMP_STRUCT aTime={0,0,0,0,0,0,0};
     if(columnIndex <= m_nDriverColumnCount)
-        OTools::getValue(m_pConnection,m_aStatementHandle,columnIndex,SQL_C_TIMESTAMP,m_bWasNull,**this,&aTime,sizeof aTime);
+        OTools::getValue(m_pConnection,m_aStatementHandle,columnIndex,m_pConnection->useOldDateFormat() ? SQL_C_TIMESTAMP : SQL_C_TYPE_TIMESTAMP,m_bWasNull,**this,&aTime,sizeof aTime);
     else
         m_bWasNull = sal_True;
     return DateTime((sal_uInt16)aTime.fraction*1000,aTime.second,aTime.minute,aTime.hour,aTime.day,aTime.month,aTime.year);
@@ -1316,5 +1316,11 @@ void ODatabaseMetaDataResultSet::checkColumnCount()
 }
 // -----------------------------------------------------------------------------
 
-
+SWORD ODatabaseMetaDataResultSet::impl_getColumnType_nothrow(sal_Int32 columnIndex)
+{
+    ::std::map<sal_Int32,SWORD>::iterator aFind = m_aODBCColumnTypes.find(columnIndex);
+    if ( aFind == m_aODBCColumnTypes.end() )
+        aFind = m_aODBCColumnTypes.insert(::std::map<sal_Int32,SWORD>::value_type(columnIndex,OResultSetMetaData::getColumnODBCType(m_pConnection,m_aStatementHandle,*this,columnIndex))).first;
+    return aFind->second;
+}
 
diff --git a/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx b/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx
index 187808bdbd..1fe1e3525e 100644
--- a/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx
+++ b/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx
@@ -321,16 +321,6 @@ void SAL_CALL OPreparedStatement::setBoolean( sal_Int32 parameterIndex, sal_Bool
     setInt (parameterIndex, value);
 }
 // -------------------------------------------------------------------------
-#define PREP_BIND_PARAM(_ty,_jt) \
-    OTools::bindParameter(m_pConnection,								\
-                                m_aStatementHandle, 					\
-                                parameterIndex,							\
-                                bindBuf,								\
-                                getLengthBuf(parameterIndex),			\
-                                (SWORD)_jt,									\
-                                sal_False,m_pConnection->useOldDateFormat(),_pData,(Reference <XInterface>)*this,getOwnConnection()->getTextEncoding())
-
-
 void OPreparedStatement::setParameter(sal_Int32 parameterIndex,sal_Int32 _nType,sal_Int32 _nSize,void* _pData)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -353,6 +343,10 @@ void OPreparedStatement::setParameter(sal_Int32 parameterIndex,sal_Int32 _nType,
         case SQL_NUMERIC:
             ++nRealSize;
             break;
+        case SQL_BINARY:
+        case SQL_VARBINARY:
+            nRealSize=1;    //dummy buffer, binary data isn't copied
+            break;
         default:
             break;
     }
@@ -480,15 +474,17 @@ void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 s
 }
 // -------------------------------------------------------------------------
 
-void SAL_CALL OPreparedStatement::setClob( sal_Int32 /*parameterIndex*/, const Reference< XClob >& /*x*/ ) throw(SQLException, RuntimeException)
+void SAL_CALL OPreparedStatement::setClob( sal_Int32 parameterIndex, const Reference< XClob >& x ) throw(SQLException, RuntimeException)
 {
-    ::dbtools::throwFunctionNotSupportedException( "XParameters::setClob", *this );
+    if ( x.is() )
+        setStream(parameterIndex, x->getCharacterStream(), (SQLLEN)x->length(), DataType::LONGVARCHAR);
 }
 // -------------------------------------------------------------------------
 
-void SAL_CALL OPreparedStatement::setBlob( sal_Int32 /*parameterIndex*/, const Reference< XBlob >& /*x*/ ) throw(SQLException, RuntimeException)
+void SAL_CALL OPreparedStatement::setBlob( sal_Int32 parameterIndex, const Reference< XBlob >& x ) throw(SQLException, RuntimeException)
 {
-    ::dbtools::throwFunctionNotSupportedException( "XParameters::setBlob", *this );
+    if ( x.is() )
+        setStream(parameterIndex, x->getBinaryStream(), (SQLLEN)x->length(), DataType::LONGVARCHAR);
 }
 // -------------------------------------------------------------------------
 
@@ -503,7 +499,12 @@ void SAL_CALL OPreparedStatement::setRef( sal_Int32 /*parameterIndex*/, const Re
     ::dbtools::throwFunctionNotSupportedException( "XParameters::setRef", *this );
 }
 // -------------------------------------------------------------------------
-
+void OPreparedStatement::setDecimal( sal_Int32 parameterIndex, const ::rtl::OUString& x )
+{
+    ::rtl::OString aString(::rtl::OUStringToOString(x,getOwnConnection()->getTextEncoding()));
+    setParameter(parameterIndex,DataType::DECIMAL,aString.getLength(),(void*)&x);
+}
+// -------------------------------------------------------------------------
 void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, const Any& x, sal_Int32 sqlType, sal_Int32 scale ) throw(SQLException, RuntimeException)
 {
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -528,6 +529,12 @@ void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, c
                 setNull(parameterIndex,sqlType);
             break;
         case DataType::DECIMAL:
+            { 
+                ORowSetValue aValue;
+                aValue.fill(x);
+                setDecimal(parameterIndex,aValue);
+            }
+            break;
         case DataType::NUMERIC:
             { 
                 ORowSetValue aValue;
@@ -568,19 +575,20 @@ void SAL_CALL OPreparedStatement::setShort( sal_Int32 parameterIndex, sal_Int16
 void SAL_CALL OPreparedStatement::setBytes( sal_Int32 parameterIndex, const Sequence< sal_Int8 >& x ) throw(SQLException, RuntimeException)
 {
     setParameter(parameterIndex,DataType::BINARY,x.getLength(),(void*)&x);
+    boundParams[parameterIndex-1].setSequence(x); // this assures that the sequence stays alive
 }
 // -------------------------------------------------------------------------
 
 
 void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 parameterIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException)
 {
-    setStream (parameterIndex, x, length, DataType::LONGVARCHAR);
+    setStream(parameterIndex, x, length, DataType::LONGVARCHAR);
 }
 // -------------------------------------------------------------------------
 
 void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException)
 {
-    setStream (parameterIndex, x, length, DataType::LONGVARBINARY);
+    setStream(parameterIndex, x, length, DataType::LONGVARBINARY);
 }
 // -------------------------------------------------------------------------
 
@@ -839,10 +847,10 @@ sal_Int32 OPreparedStatement::getPrecision ( sal_Int32 sqlType)
 // Sets an input stream as a parameter, using the given SQL type
 //--------------------------------------------------------------------
 
-void OPreparedStatement::setStream (
+void OPreparedStatement::setStream(
                                     sal_Int32 ParameterIndex,
                                     const Reference< XInputStream>& x,
-                                    sal_Int32 length,
+                                    SQLLEN length,
                                     sal_Int32 SQLtype)
                                     throw(SQLException)
 {
diff --git a/connectivity/source/drivers/odbcbase/OResultSet.cxx b/connectivity/source/drivers/odbcbase/OResultSet.cxx
index e48cfe0259..8e2254fa28 100644
--- a/connectivity/source/drivers/odbcbase/OResultSet.cxx
+++ b/connectivity/source/drivers/odbcbase/OResultSet.cxx
@@ -223,9 +223,11 @@ SQLRETURN OResultSet::unbind(sal_Bool _bUnbindHandle)
                     delete static_cast< double* >(reinterpret_cast< void * >(pValue->first));
                     break;
                 case DataType::LONGVARCHAR:
+                case DataType::CLOB:
                     delete [] static_cast< char* >(reinterpret_cast< void * >(pValue->first));
                     break;
                 case DataType::LONGVARBINARY:
+                case DataType::BLOB:
                     delete [] static_cast< char* >(reinterpret_cast< void * >(pValue->first));
                     break;
                 case DataType::DATE:
@@ -284,9 +286,11 @@ TVoidPtr OResultSet::allocBindColumn(sal_Int32 _nType,sal_Int32 _nColumnIndex)
             aPair = TVoidPtr(reinterpret_cast< sal_Int64 >(new double(0.0)),_nType);
             break;
         case DataType::LONGVARCHAR:
+        case DataType::CLOB:
             aPair = TVoidPtr(reinterpret_cast< sal_Int64 >(new char[2]),_nType);  // dient nur zum auffinden
             break;
         case DataType::LONGVARBINARY:
+        case DataType::BLOB:
             aPair = TVoidPtr(reinterpret_cast< sal_Int64 >(new char[2]),_nType);  // dient nur zum auffinden
             break;
         case DataType::DATE:
@@ -1499,6 +1503,7 @@ void OResultSet::fillRow(sal_Int32 _nToColumn)
             case DataType::DECIMAL:
             case DataType::NUMERIC:
             case DataType::LONGVARCHAR:
+            case DataType::CLOB:
                 {
                     ::std::map<sal_Int32,SWORD>::iterator aFind = m_aODBCColumnTypes.find(nColumn);
                     if ( aFind == m_aODBCColumnTypes.end() )
@@ -1514,6 +1519,7 @@ void OResultSet::fillRow(sal_Int32 _nToColumn)
                 *pColumn = getDouble(nColumn);
                 break;
             case DataType::LONGVARBINARY:
+            case DataType::BLOB:
                 *pColumn = getBytes(nColumn);
                 break;
             case DataType::DATE:
@@ -1719,6 +1725,7 @@ void OResultSet::fillNeededData(SQLRETURN _nRet)
                 case DataType::BINARY:
                 case DataType::VARBINARY:
                 case DataType::LONGVARBINARY:
+                case DataType::BLOB:
                     aSeq = m_aRow[nColumnIndex];
                     N3SQLPutData (m_aStatementHandle, aSeq.getArray(), aSeq.getLength());
                     break;
@@ -1730,6 +1737,7 @@ void OResultSet::fillNeededData(SQLRETURN _nRet)
                     break;
                 }
                 case DataType::LONGVARCHAR:
+                case DataType::CLOB:
                 {
                     ::rtl::OUString sRet;
                     sRet = m_aRow[nColumnIndex].getString();
diff --git a/connectivity/source/drivers/odbcbase/OTools.cxx b/connectivity/source/drivers/odbcbase/OTools.cxx
index 9d8873c0d1..c5506533ae 100644
--- a/connectivity/source/drivers/odbcbase/OTools.cxx
+++ b/connectivity/source/drivers/odbcbase/OTools.cxx
@@ -135,6 +135,7 @@ void OTools::bindData(	SQLSMALLINT _nOdbcType,
     {
         case SQL_CHAR:
         case SQL_VARCHAR:
+        case SQL_DECIMAL:
             if(_bUseWChar)
             {
                 *pLen = SQL_NTS;
@@ -160,7 +161,7 @@ void OTools::bindData(	SQLSMALLINT _nOdbcType,
             *pLen = sizeof(sal_Int64);
             _nColumnSize = *pLen;
             break;
-        case SQL_DECIMAL:
+        
         case SQL_NUMERIC:
             if(_bUseWChar)
             {
@@ -210,12 +211,9 @@ void OTools::bindData(	SQLSMALLINT _nOdbcType,
 
                 if(pSeq)
                 {
-                    //	memcpy(_pData,pSeq->getConstArray(),pSeq->getLength());
-                    _pData = (sal_Int8*)((const ::com::sun::star::uno::Sequence< sal_Int8 >  *)_pValue)->getConstArray();
+                    _pData = (sal_Int8*)pSeq->getConstArray();
                     *pLen = pSeq->getLength();
                 }
-                //	_pData = (sal_Int8*)((const ::com::sun::star::uno::Sequence< sal_Int8 >  *)_pValue)->getConstArray();
-                //	*pLen = ((const ::com::sun::star::uno::Sequence< sal_Int8 >  *)_pValue)->getLength();
             }
             break;
         case SQL_LONGVARBINARY:
diff --git a/connectivity/source/inc/ado/Aolevariant.hxx b/connectivity/source/inc/ado/Aolevariant.hxx
index ddacefec17..f53985d007 100644
--- a/connectivity/source/inc/ado/Aolevariant.hxx
+++ b/connectivity/source/inc/ado/Aolevariant.hxx
@@ -161,6 +161,7 @@ namespace connectivity
             double			getDate()		const;
             CY				getCurrency()	const;
             SAFEARRAY*		getUI1SAFEARRAYPtr() const;
+            ::com::sun::star::uno::Any makeAny() const;
 
             static VARIANT_BOOL VariantBool(sal_Bool bEinBoolean);
 
diff --git a/connectivity/source/inc/java/lang/Boolean.hxx b/connectivity/source/inc/java/lang/Boolean.hxx
index 9bc7dc7d61..8a4cacdc63 100644
--- a/connectivity/source/inc/java/lang/Boolean.hxx
+++ b/connectivity/source/inc/java/lang/Boolean.hxx
@@ -48,6 +48,7 @@ namespace connectivity
         java_lang_Boolean( JNIEnv * pEnv, jobject myObj ) : java_lang_Object( pEnv, myObj ){}
 
         java_lang_Boolean( sal_Bool _par0 );
+        static jclass st_getMyClass();
     };
 }
 
diff --git a/connectivity/source/inc/java/sql/Connection.hxx b/connectivity/source/inc/java/sql/Connection.hxx
index 55244525da..713433d842 100644
--- a/connectivity/source/inc/java/sql/Connection.hxx
+++ b/connectivity/source/inc/java/sql/Connection.hxx
@@ -80,6 +80,11 @@ namespace connectivity
                 const ::rtl::OUString& _sDriverClassPath,
                 const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& _rSystemProperties
             );
+        /** load driver class path from system configuration.
+            @param  _sDriverClass
+                The driver class name to look for in the configuration.
+        */
+        ::rtl::OUString impl_getJavaDriverClassPath_nothrow(const ::rtl::OUString& _sDriverClass);
 
     protected:
     // statische Daten fuer die Klasse
diff --git a/connectivity/source/inc/java/sql/Timestamp.hxx b/connectivity/source/inc/java/sql/Timestamp.hxx
index 2af09c2f02..83e6a728f9 100644
--- a/connectivity/source/inc/java/sql/Timestamp.hxx
+++ b/connectivity/source/inc/java/sql/Timestamp.hxx
@@ -54,6 +54,7 @@ namespace connectivity
         java_sql_Date( const ::com::sun::star::util::Date& _rOut );
 
         operator ::com::sun::star::util::Date();
+        static jclass st_getMyClass();
     };
 
 
@@ -73,6 +74,7 @@ namespace connectivity
         java_sql_Time( JNIEnv * pEnv, jobject myObj ) : java_util_Date( pEnv, myObj ){}
         java_sql_Time( const ::com::sun::star::util::Time& _rOut );
         operator ::com::sun::star::util::Time();
+        static jclass st_getMyClass();
     };
 
     //**************************************************************
@@ -93,6 +95,7 @@ namespace connectivity
 
         sal_Int32 getNanos();
         void  setNanos(sal_Int32 n);
+        static jclass st_getMyClass();
     };
 }
 #endif // _CONNECTIVITY_JAVA_SQL_TIMESTAMP_HXX_
diff --git a/connectivity/source/inc/java/tools.hxx b/connectivity/source/inc/java/tools.hxx
index 098126895a..897a5ac572 100644
--- a/connectivity/source/inc/java/tools.hxx
+++ b/connectivity/source/inc/java/tools.hxx
@@ -41,6 +41,7 @@
 #include <comphelper/uno3.hxx>
 
 #include <com/sun/star/container/XNameAccess.hpp>
+#include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/util/Time.hpp>
 #include <com/sun/star/util/Date.hpp>
 #include <com/sun/star/util/DateTime.hpp>
@@ -85,6 +86,9 @@ namespace connectivity
             <TRUE/> if an exception is occured
     */
     sal_Bool isExceptionOccured(JNIEnv *pEnv,sal_Bool _bClear);
+
+    jobject createByteInputStream(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x,sal_Int32 length);
+    jobject createCharArrayReader(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x,sal_Int32 length);
 }
 
 #endif // _CONNECTIVITY_JAVA_TOOLS_HXX_
diff --git a/connectivity/source/inc/odbc/OBoundParam.hxx b/connectivity/source/inc/odbc/OBoundParam.hxx
index 31d3dde82b..a2b5a4cceb 100644
--- a/connectivity/source/inc/odbc/OBoundParam.hxx
+++ b/connectivity/source/inc/odbc/OBoundParam.hxx
@@ -119,6 +119,11 @@ namespace connectivity
                 paramInputStreamLen = len;
             }
 
+            void setSequence(const ::com::sun::star::uno::Sequence< sal_Int8 >& _aSequence)
+            {
+                aSequence = _aSequence;
+            }
+
             //--------------------------------------------------------------------
             // getInputStream
             // Gets the input stream for the bound parameter
@@ -191,6 +196,7 @@ namespace connectivity
                                         // data is in native format.
 
             ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream> paramInputStream;
+            ::com::sun::star::uno::Sequence< sal_Int8 > aSequence;
                                         // When an input stream is
                                         // bound to a parameter, the
                                         // input stream is saved
diff --git a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
index 5078eb3ac5..d0134d542d 100644
--- a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
+++ b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
@@ -100,6 +100,7 @@ namespace connectivity
             sal_Int32 getFetchDirection()		const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             sal_Int32 getFetchSize()			const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             ::rtl::OUString getCursorName()		const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            SWORD                               impl_getColumnType_nothrow(sal_Int32 column);
 
             sal_Int32 mapColumn (sal_Int32	column);
 
diff --git a/connectivity/source/inc/odbc/OPreparedStatement.hxx b/connectivity/source/inc/odbc/OPreparedStatement.hxx
index dfd2a62830..e3b3592773 100644
--- a/connectivity/source/inc/odbc/OPreparedStatement.hxx
+++ b/connectivity/source/inc/odbc/OPreparedStatement.hxx
@@ -89,7 +89,7 @@ namespace connectivity
             void FreeParams();
             void putParamData (sal_Int32 index) throw(::com::sun::star::sdbc::SQLException);
             void setStream (sal_Int32 ParameterIndex,const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream>& x,
-                                                        sal_Int32 length,sal_Int32 SQLtype) throw(::com::sun::star::sdbc::SQLException);
+                                                        SQLLEN length,sal_Int32 SQLtype) throw(::com::sun::star::sdbc::SQLException);
             sal_Int32 getParamLength (	sal_Int32 index);
             sal_Int8* getLengthBuf (sal_Int32 index);
             sal_Int8* getDataBuf (sal_Int32 index);
@@ -102,6 +102,7 @@ namespace connectivity
             sal_Bool isPrepared() const { return m_bPrepared;}
             void prepareStatement();
             void checkParameterIndex(sal_Int32 _parameterIndex);
+            void setDecimal( sal_Int32 parameterIndex, const ::rtl::OUString& x );
 
             /**
                 creates the driver specific resultset (factory)
diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y
index 97875dfd4d..1680516e8d 100644
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
@@ -107,7 +107,6 @@ static connectivity::OSQLInternalNode* newNode(const sal_Char* pNewValue,
 							     const connectivity::SQLNodeType eNodeType,
 								 const sal_uInt32 nNodeID = 0)
 {
-    OSL_TRACE("connectivity: Rule Number: %d,%d",eNodeType,nNodeID);
 	return new connectivity::OSQLInternalNode(pNewValue, eNodeType, nNodeID);
 }
 
@@ -115,7 +114,6 @@ static connectivity::OSQLInternalNode* newNode(const ::rtl::OString& _NewValue,
 							    const connectivity::SQLNodeType eNodeType,
 								const sal_uInt32 nNodeID = 0)
 {
-    OSL_TRACE("connectivity: Rule Number: %d,%d",eNodeType,nNodeID);
 	return new connectivity::OSQLInternalNode(_NewValue, eNodeType, nNodeID);
 }
 
@@ -123,7 +121,6 @@ static connectivity::OSQLInternalNode* newNode(const ::rtl::OUString& _NewValue,
 							    const connectivity::SQLNodeType eNodeType,
 								const sal_uInt32 nNodeID = 0)
 {
-    OSL_TRACE("connectivity: Rule Number: %d,%d",eNodeType,nNodeID);
 	return new connectivity::OSQLInternalNode(_NewValue, eNodeType, nNodeID);
 }
 
@@ -2043,7 +2040,8 @@ join_spec:
 	  | named_columns_join
 	  ;
 join_type:
-		SQL_TOKEN_INNER
+		/* empty */ 	{$$ = SQL_NEW_RULE;}
+	  | SQL_TOKEN_INNER
 		{
 			$$ = SQL_NEW_RULE;
 			$$->append($1);
diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx
index c92fc9b709..3cb4b821cd 100644
--- a/connectivity/source/parse/sqliterator.cxx
+++ b/connectivity/source/parse/sqliterator.cxx
@@ -952,21 +952,7 @@ bool OSQLParseTreeIterator::traverseSelectColumnNames(const OSQLParseNode* pSele
                     if ( pColumnRef->isRule() )
                     {
                         bFkt = sal_True;
-                        if ( SQL_ISRULE(pColumnRef,num_value_exp) || SQL_ISRULE(pColumnRef,term) || SQL_ISRULE(pColumnRef,factor) )
-                        {
-                            nType = DataType::DOUBLE;
-                        }
-                        else
-                        {
-                            ::rtl::OUString sFunctionName;
-                            if ( SQL_ISRULE(pColumnRef,length_exp) )
-                                pColumnRef->getChild(0)->getChild(0)->parseNodeToStr(
-                                    sFunctionName, m_pImpl->m_xConnection, NULL, sal_False, sal_False );
-                            else
-                                pColumnRef->getChild(0)->parseNodeToStr(
-                                    sFunctionName, m_pImpl->m_xConnection, NULL, sal_False, sal_False );
-                            nType = ::connectivity::OSQLParser::getFunctionReturnType( sFunctionName, &m_rParser.getContext() ); 
-                        }
+                        nType = getFunctionReturnType(pColumnRef); 
                     }
                 }
                 /*
@@ -1601,7 +1587,6 @@ void OSQLParseTreeIterator::impl_traverse( sal_uInt32 _nIncludeMask )
     case SQL_STATEMENT_INSERT:
         break;
     default:
-        OSL_ENSURE( false, "OSQLParseTreeIterator::traverseAll: not yet implemented for this statement type!" );
         break;
     }
 }
@@ -2104,3 +2089,84 @@ void OSQLParseTreeIterator::impl_appendError( const SQLException& _rError )
         m_aErrors = _rError;
 }
 // -----------------------------------------------------------------------------
+sal_Int32 OSQLParseTreeIterator::getFunctionReturnType(const OSQLParseNode* _pNode )
+{
+    sal_Int32 nType = DataType::OTHER;
+    ::rtl::OUString sFunctionName;
+    if ( SQL_ISRULE(_pNode,length_exp) )
+    {
+        _pNode->getChild(0)->getChild(0)->parseNodeToStr(sFunctionName, m_pImpl->m_xConnection, NULL, sal_False, sal_False );
+        nType = ::connectivity::OSQLParser::getFunctionReturnType( sFunctionName, &m_rParser.getContext() ); 
+    }
+    else if ( SQL_ISRULE(_pNode,num_value_exp) || SQL_ISRULE(_pNode,term) || SQL_ISRULE(_pNode,factor) )
+    {
+        nType = DataType::DOUBLE;
+    }
+    else
+    {
+        _pNode->getChild(0)->parseNodeToStr(sFunctionName, m_pImpl->m_xConnection, NULL, sal_False, sal_False );
+
+        // MIN and MAX have another return type, we have to check the expression itself.
+        // @see http://qa.openoffice.org/issues/show_bug.cgi?id=99566
+        if ( SQL_ISRULE(_pNode,general_set_fct) && (SQL_ISTOKEN(_pNode->getChild(0),MIN) || SQL_ISTOKEN(_pNode->getChild(0),MAX) ))
+        {
+            const OSQLParseNode* pValueExp = _pNode->getChild(3);
+            if (SQL_ISRULE(pValueExp,column_ref))
+            {
+                ::rtl::OUString sColumnName;
+                ::rtl::OUString aTableRange;
+                getColumnRange(pValueExp,sColumnName,aTableRange);
+                OSL_ENSURE(sColumnName.getLength(),"Columnname darf nicht leer sein");
+                Reference<XPropertySet> xColumn = findColumn( sColumnName, aTableRange, true );
+
+                if ( xColumn.is() )
+                {
+                    xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex( PROPERTY_ID_TYPE)) >>= nType;
+                }
+            }
+            else
+            {
+                if ( SQL_ISRULE(pValueExp,num_value_exp) || SQL_ISRULE(pValueExp,term) || SQL_ISRULE(pValueExp,factor) )
+                {
+                    nType = DataType::DOUBLE;
+                }
+                else if ( SQL_ISRULE(pValueExp,datetime_primary) )
+                {
+                    switch(pValueExp->getChild(0)->getTokenID() )
+                    {
+                        case SQL_TOKEN_CURRENT_DATE:
+                            nType = DataType::DATE;
+                            break;
+                        case SQL_TOKEN_CURRENT_TIME:
+                            nType = DataType::TIME;
+                            break;
+                        case SQL_TOKEN_CURRENT_TIMESTAMP:
+                            nType = DataType::TIMESTAMP;
+                            break;
+                    }
+                }
+                else if ( SQL_ISRULE(pValueExp,value_exp_primary) )
+                {
+                    nType = getFunctionReturnType(pValueExp->getChild(1));
+                }
+                else if ( SQL_ISRULE(pValueExp,concatenation) 
+                        || SQL_ISRULE(pValueExp,char_factor) 
+                        || SQL_ISRULE(pValueExp,bit_value_fct) 
+                        || SQL_ISRULE(pValueExp,char_value_fct)
+                        || SQL_ISRULE(pValueExp,char_substring_fct)
+                        || SQL_ISRULE(pValueExp,fold)
+                        || SQL_ISTOKEN(pValueExp,STRING) )
+                {
+                    nType = DataType::VARCHAR;
+                }
+            }
+            if ( nType == DataType::OTHER )
+                nType = DataType::DOUBLE;
+        }
+        else
+            nType = ::connectivity::OSQLParser::getFunctionReturnType( sFunctionName, &m_rParser.getContext() ); 
+    }
+    
+    return nType;
+}
+
diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx
index a359c64df1..e0a08ca1c7 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -813,8 +813,9 @@ OSQLParseNode* OSQLParser::convertNode(sal_Int32 nType,OSQLParseNode*& pLiteral)
             case DataType::CHAR:
             case DataType::VARCHAR:
             case DataType::LONGVARCHAR:
-            if ( !SQL_ISRULE(pReturn,char_value_exp) && !buildStringNodes(pReturn) )
-                pReturn = NULL;
+            case DataType::CLOB:
+                if ( !SQL_ISRULE(pReturn,char_value_exp) && !buildStringNodes(pReturn) )
+                    pReturn = NULL;
             default:
                 break;
         }
@@ -829,6 +830,7 @@ OSQLParseNode* OSQLParser::convertNode(sal_Int32 nType,OSQLParseNode*& pLiteral)
                 case DataType::CHAR:
                 case DataType::VARCHAR:
                 case DataType::LONGVARCHAR:
+                case DataType::CLOB:
                     break;
                 case DataType::DATE:
                 case DataType::TIME:
@@ -872,12 +874,13 @@ OSQLParseNode* OSQLParser::convertNode(sal_Int32 nType,OSQLParseNode*& pLiteral)
                 case DataType::REAL:
                 case DataType::DOUBLE:
                     // kill thousand seperators if any
-                killThousandSeparator(pReturn);
+                    killThousandSeparator(pReturn);
                     break;
                 case DataType::CHAR:
                 case DataType::VARCHAR:
                 case DataType::LONGVARCHAR:
-                pReturn = buildNode_STR_NUM(pReturn);
+                case DataType::CLOB:
+                    pReturn = buildNode_STR_NUM(pReturn);
                     break;
                 default:
                     m_sErrorMessage = m_pContext->getErrorMessage(IParseContext::ERROR_INVALID_INT_COMPARE);
@@ -893,12 +896,13 @@ OSQLParseNode* OSQLParser::convertNode(sal_Int32 nType,OSQLParseNode*& pLiteral)
                 case DataType::REAL:
                 case DataType::DOUBLE:
                         // kill thousand seperators if any
-                killThousandSeparator(pReturn);
+                    killThousandSeparator(pReturn);
                     break;
                 case DataType::CHAR:
                 case DataType::VARCHAR:
                 case DataType::LONGVARCHAR:
-                pReturn = buildNode_STR_NUM(pReturn);
+                case DataType::CLOB:
+                    pReturn = buildNode_STR_NUM(pReturn);
                     break;
                 case DataType::INTEGER:
                 default:
@@ -967,6 +971,7 @@ sal_Int16 OSQLParser::buildLikeRule(OSQLParseNode*& pAppend, OSQLParseNode*& pLi
         case DataType::CHAR:
         case DataType::VARCHAR:
         case DataType::LONGVARCHAR:
+        case DataType::CLOB:
             if(pLiteral->isRule())
             {
                 pAppend->append(pLiteral);
@@ -1228,6 +1233,7 @@ OSQLParseNode* OSQLParser::predicateTree(::rtl::OUString& rErrorMessage, const :
             case DataType::CHAR:
             case DataType::VARCHAR:
             case DataType::LONGVARCHAR:
+            case DataType::CLOB:
                 s_pScanner->SetRule(s_pScanner->GetSTRINGRule());
                 break;
             default:
@@ -1415,7 +1421,11 @@ OSQLParser::OSQLParser(const ::com::sun::star::uno::Reference< ::com::sun::star:
             { OSQLParseNode::table_node, "table_node" },
             { OSQLParseNode::as, "as" },
             { OSQLParseNode::op_column_commalist, "op_column_commalist" },
-            { OSQLParseNode::table_primary_as_range_column, "table_primary_as_range_column" }
+            { OSQLParseNode::table_primary_as_range_column, "table_primary_as_range_column" },
+            { OSQLParseNode::datetime_primary, "datetime_primary" },
+            { OSQLParseNode::concatenation, "concatenation" },
+            { OSQLParseNode::char_factor, "char_factor" },
+            { OSQLParseNode::bit_value_fct, "bit_value_fct" }
         };
         size_t nRuleMapCount = sizeof( aRuleDescriptions ) / sizeof( aRuleDescriptions[0] );
         OSL_ENSURE( nRuleMapCount == size_t( OSQLParseNode::rule_count ), "OSQLParser::OSQLParser: added a new rule? Adjust this map!" );
diff --git a/framework/inc/uielement/generictoolbarcontroller.hxx b/framework/inc/uielement/generictoolbarcontroller.hxx
index 316c60da4f..377b685d69 100644
--- a/framework/inc/uielement/generictoolbarcontroller.hxx
+++ b/framework/inc/uielement/generictoolbarcontroller.hxx
@@ -37,6 +37,9 @@
 
 #include <svtools/toolboxcontroller.hxx>
 #include <vcl/toolbox.hxx>
+#include <memory>
+
+class PopupMenu;
 
 namespace framework
 {
@@ -64,7 +67,7 @@ class GenericToolbarController : public svt::ToolboxController
 
          DECL_STATIC_LINK( GenericToolbarController, ExecuteHdl_Impl, ExecuteInfo* ); 
     
-    private:
+    protected:
         ToolBox*        m_pToolbar;
         sal_uInt16      m_nID;
         sal_Bool        m_bEnumCommand : 1,
@@ -72,6 +75,28 @@ class GenericToolbarController : public svt::ToolboxController
         rtl::OUString   m_aEnumCommand;
 };
 
+class MenuToolbarController : public GenericToolbarController
+{
+    com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > m_xMenuDesc;
+    PopupMenu* pMenu;
+    com::sun::star::uno::Reference< com::sun::star::lang::XComponent > m_xMenuManager;
+    rtl::OUString m_aModuleIdentifier;
+    public:
+        MenuToolbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, 
+                                  const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame,
+                                  ToolBox* pToolBar,
+                                  USHORT   nID,
+                                  const rtl::OUString& aCommand, 
+                                  const rtl::OUString& aModuleIdentifier, 
+                                  const com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >& xMenuDesc );
+
+    ~MenuToolbarController();
+    // XToolbarController
+    virtual void SAL_CALL click() throw ( ::com::sun::star::uno::RuntimeException );
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createPopupWindow() throw (::com::sun::star::uno::RuntimeException);
+
+};
+
 }
 
 #endif // __FRAMEWORK_UIELEMENT_GENERICTOOLBARCONTROLLER_HXX_
diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx
index 9f1c2cdaaa..7ba9286122 100644
--- a/framework/inc/uielement/toolbarmanager.hxx
+++ b/framework/inc/uielement/toolbarmanager.hxx
@@ -50,10 +50,12 @@
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
+#include <com/sun/star/container/XIndexContainer.hpp>
 #include <com/sun/star/frame/XModuleManager.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/frame/XUIControllerRegistration.hpp>
 #include <com/sun/star/ui/XImageManager.hpp>
+#include <com/sun/star/ui/XUIConfigurationManager.hpp>
 #include <com/sun/star/frame/XStatusListener.hpp>
 #include <com/sun/star/frame/XSubToolbarController.hpp>
 #include <com/sun/star/frame/XToolbarController.hpp>
@@ -200,6 +202,7 @@ class ToolBarManager : public ::com::sun::star::frame::XFrameActionListener
         typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XSubToolbarController > > SubToolBarControllerVector;
         typedef BaseHash< SubToolBarControllerVector >                                                              SubToolBarToSubToolBarControllerMap;
 
+        typedef ::std::hash_map< sal_uInt16, ::com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > > MenuDescriptionMap;
         sal_Bool                                                                               m_bDisposed : 1,
                                                                                                m_bIsHiContrast : 1,
                                                                                                m_bSmallSymbols : 1,
@@ -225,10 +228,14 @@ class ToolBarManager : public ::com::sun::star::frame::XFrameActionListener
         ::com::sun::star::uno::Reference< ::com::sun::star::ui::XImageManager >                m_xModuleImageManager;
         ::com::sun::star::uno::Reference< ::com::sun::star::ui::XImageManager >                m_xDocImageManager;
         ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >                 m_xImageOrientationListener;
+        ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager >                m_xUICfgMgr;
+        ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager >                m_xDocUICfgMgr;
+
         CommandToInfoMap                                                                       m_aCommandMap;
         SubToolBarToSubToolBarControllerMap                                                    m_aSubToolBarControllerMap;
         Timer				                                                                   m_aAsyncUpdateControllersTimer;
         sal_Int16                                                                              m_nSymbolsStyle;
+        MenuDescriptionMap m_aMenuMap;
 };
     
 }
diff --git a/framework/inc/xml/menuconfiguration.hxx b/framework/inc/xml/menuconfiguration.hxx
index cff0e8d0ea..f24994bd40 100644
--- a/framework/inc/xml/menuconfiguration.hxx
+++ b/framework/inc/xml/menuconfiguration.hxx
@@ -85,6 +85,7 @@ class MenuConfiguration
             ::rtl::OUString aTargetFrame;
             ::rtl::OUString	aImageId;
             ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XDispatchProvider > xDispatchProvider;
+                        sal_Int16 nStyle;
         };
                         
         MenuConfiguration(
diff --git a/framework/inc/xml/menudocumenthandler.hxx b/framework/inc/xml/menudocumenthandler.hxx
index b6148ca820..0ecad10d1a 100644
--- a/framework/inc/xml/menudocumenthandler.hxx
+++ b/framework/inc/xml/menudocumenthandler.hxx
@@ -109,13 +109,14 @@ class ReadMenuDocumentHandlerBase : public ThreadHelpBase,	// Struct for right i
         ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler> m_xReader;
         void initPropertyCommon( com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > &rProps,
                                  const rtl::OUString &rCommandURL, const rtl::OUString &rHelpId,
-                                 const rtl::OUString &rLabel);
+                                 const rtl::OUString &rLabel, sal_Int16 nItemStyleBits );
     private:
         rtl::OUString m_aType;
         rtl::OUString m_aLabel;
         rtl::OUString m_aContainer;
         rtl::OUString m_aHelpURL;
         rtl::OUString m_aCommandURL;
+        rtl::OUString m_aStyle;
         ::com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > m_aItemProp;
 };
 
@@ -306,7 +307,7 @@ class OWriteMenuDocumentHandler
         virtual void WriteMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rSubMenuContainer ) throw
             ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException );
 
-        virtual void WriteMenuItem( const rtl::OUString& aCommandURL, const rtl::OUString& aLabel, const rtl::OUString& aHelpURL );
+        virtual void WriteMenuItem( const rtl::OUString& aCommandURL, const rtl::OUString& aLabel, const rtl::OUString& aHelpURL, sal_Int16 nStyle = 0 );
         virtual void WriteMenuSeparator();
 
         com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > m_xMenuBarContainer;
diff --git a/framework/inc/xml/toolboxconfigurationdefines.hxx b/framework/inc/xml/toolboxconfigurationdefines.hxx
index 4b0cb68873..3aee5d1f70 100644
--- a/framework/inc/xml/toolboxconfigurationdefines.hxx
+++ b/framework/inc/xml/toolboxconfigurationdefines.hxx
@@ -29,6 +29,7 @@
 #define ATTRIBUTE_WIDTH				"width"
 #define ATTRIBUTE_USER				"userdefined"
 #define ATTRIBUTE_HELPID			"helpid"
+#define ATTRIBUTE_TOOLTIP			"tooltip"
 #define ATTRIBUTE_ITEMSTYLE			"style"
 
 #define ATTRIBUTE_ID				"id"
@@ -78,6 +79,8 @@
 #define ATTRIBUTE_ITEMSTYLE_AUTOSIZE	    "autosize"
 #define ATTRIBUTE_ITEMSTYLE_DROPDOWN	    "dropdown"
 #define ATTRIBUTE_ITEMSTYLE_REPEAT		    "repeat"
+#define ATTRIBUTE_ITEMSTYLE_TEXT    "text"
 #define ATTRIBUTE_ITEMSTYLE_DROPDOWNONLY    "dropdownonly"
+#define ATTRIBUTE_ITEMSTYLE_IMAGE    "image"
 
 #endif // __FRAMEWORK_XML_TOOLBOXCONFIGURATIONDEFINES_HXX_
diff --git a/framework/inc/xml/toolboxdocumenthandler.hxx b/framework/inc/xml/toolboxdocumenthandler.hxx
index e903135420..fa1b143645 100644
--- a/framework/inc/xml/toolboxdocumenthandler.hxx
+++ b/framework/inc/xml/toolboxdocumenthandler.hxx
@@ -77,6 +77,7 @@ class OReadToolBoxDocumentHandler : private ThreadHelpBase,	// Struct for right
             TB_ATTRIBUTE_HELPID,
             TB_ATTRIBUTE_STYLE,
             TB_ATTRIBUTE_UINAME,
+            TB_ATTRIBUTE_TOOLTIP,
             TB_XML_ENTRY_COUNT
         };
 
@@ -159,10 +160,13 @@ class OReadToolBoxDocumentHandler : private ThreadHelpBase,	// Struct for right
         sal_Int32																	    m_nHashCode_Style_DropDown;
         sal_Int32																	    m_nHashCode_Style_Repeat;
         sal_Int32                                                                       m_nHashCode_Style_DropDownOnly;
+        sal_Int32                                                                       m_nHashCode_Style_Text;
+        sal_Int32                                                                       m_nHashCode_Style_Image;
         rtl::OUString                                                                   m_aType;
         rtl::OUString                                                                   m_aLabel;
         rtl::OUString                                                                   m_aStyle;
         rtl::OUString                                                                   m_aHelpURL;
+        rtl::OUString                                                                   m_aTooltip;
         rtl::OUString                                                                   m_aIsVisible;
         rtl::OUString                                                                   m_aCommandURL;
 };
@@ -181,7 +185,7 @@ class OWriteToolBoxDocumentHandler : private ThreadHelpBase	// Struct for right
               ::com::sun::star::uno::RuntimeException );
     
     protected:
-        virtual void WriteToolBoxItem( const rtl::OUString& aCommandURL, const rtl::OUString& aLabel, const rtl::OUString& aHelpURL,
+        virtual void WriteToolBoxItem( const rtl::OUString& aCommandURL, const rtl::OUString& aLabel, const rtl::OUString& aHelpURL, const rtl::OUString& aTooltip, sal_Int16 nStyle,
                                        sal_Int16 nWidth, sal_Bool bVisible ) throw
             ( ::com::sun::star::xml::sax::SAXException,
               ::com::sun::star::uno::RuntimeException );
diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx
index 8928bf6ea7..0836d08703 100644
--- a/framework/source/classes/menumanager.cxx
+++ b/framework/source/classes/menumanager.cxx
@@ -171,6 +171,12 @@ MenuManager::MenuManager(
     for ( USHORT i = 0; i < nItemCount; i++ )
     {
         USHORT nItemId = FillItemCommand(aItemCommand,pMenu, i );
+        bool bShowMenuImages( m_bShowMenuImages );
+        MenuItemBits nBits =  pMenu->GetItemBits( nItemId );
+        // overwrite the default?
+        if ( nBits )
+            bShowMenuImages = ( ( nBits & MIB_ICON ) == MIB_ICON );
+
 
         PopupMenu* pPopupMenu = pMenu->GetPopupMenu( nItemId );
         if ( pPopupMenu )
@@ -217,7 +223,7 @@ MenuManager::MenuManager(
                             aQueryLabelItemIdVector.push_back( nItemId );
 #endif
                         // Set image for the addon popup menu item
-                        if ( m_bShowMenuImages && !pPopupMenu->GetItemImage( ITEMID_ADDONLIST ))
+                        if ( bShowMenuImages && !pPopupMenu->GetItemImage( ITEMID_ADDONLIST ))
                         {
                             Image aImage = GetImageFromURL( rFrame, aItemCommand, FALSE, m_bWasHiContrast );
                             if ( !!aImage )
@@ -248,8 +254,8 @@ MenuManager::MenuManager(
                 if ( pMenu->GetItemText( nItemId ).Len() == 0 )
                     aQueryLabelItemIdVector.push_back( nItemId );
 #endif
-
-                if ( m_bShowMenuImages && !pMenu->GetItemImage( nItemId ))
+                
+                if ( bShowMenuImages && !pMenu->GetItemImage( nItemId ))
                 {
                     Image aImage = GetImageFromURL( rFrame, aItemCommand, FALSE, m_bWasHiContrast );
                     if ( !!aImage )
@@ -273,8 +279,8 @@ MenuManager::MenuManager(
                 if ( pMenu->GetItemText( nItemId ).Len() == 0 )
                     aQueryLabelItemIdVector.push_back( nItemId );
 #endif
-
-                if ( m_bShowMenuImages && !pMenu->GetItemImage( nItemId ))
+                
+                if ( bShowMenuImages && !pMenu->GetItemImage( nItemId ))
                 {
                     Image aImage = GetImageFromURL( rFrame, aItemCommand, FALSE, m_bWasHiContrast );
                     if ( !!aImage )
@@ -283,7 +289,7 @@ MenuManager::MenuManager(
             }
             else if ( pMenu->GetItemType( i ) != MENUITEM_SEPARATOR )
             {
-                if ( m_bShowMenuImages )
+                if ( bShowMenuImages )
                 {
                     if ( AddonMenuManager::IsAddonMenuId( nItemId ))
                     {
@@ -1131,7 +1137,13 @@ void MenuManager::FillMenuImages(Reference< XFrame >& _xFrame,Menu* _pMenu,sal_B
         USHORT nId = _pMenu->GetItemId( nPos );
         if ( _pMenu->GetItemType( nPos ) != MENUITEM_SEPARATOR )
         {
-            if ( bShowMenuImages )
+            bool bTmpShowMenuImages( bShowMenuImages );
+            MenuItemBits nBits =  _pMenu->GetItemBits( nId );
+            // overwrite the default?
+            if ( nBits )
+                bTmpShowMenuImages = ( ( nBits & MIB_ICON ) == MIB_ICON );
+
+            if ( bTmpShowMenuImages )
             {
                 sal_Bool		bImageSet = sal_False;
                 ::rtl::OUString aImageId;
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index 4d5f3c4b00..e3a5a5b977 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -245,6 +245,7 @@ bool LayoutManager::UIElement::operator< ( const LayoutManager::UIElement& aUIEl
 
 LayoutManager::UIElement& LayoutManager::UIElement::operator= ( const LayoutManager::UIElement& rUIElement )
 {
+    if (this == &rUIElement) { return *this; }
     m_aType             = rUIElement.m_aType;
     m_aName             = rUIElement.m_aName;
     m_aUIName           = rUIElement.m_aUIName;
diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx
index 1c4324ef03..0a465e8e26 100644
--- a/framework/source/services/backingwindow.cxx
+++ b/framework/source/services/backingwindow.cxx
@@ -49,6 +49,7 @@
 
 #include "comphelper/processfactory.hxx"
 #include "comphelper/sequenceashashmap.hxx"
+#include "comphelper/configurationhelper.hxx"
 
 #include "rtl/strbuf.hxx"
 #include "rtl/ustrbuf.hxx"
@@ -744,6 +745,41 @@ IMPL_LINK( BackingWindow, ToolboxHdl, void*, EMPTYARG )
                     //throws css::container::NoSuchElementException, css::lang::WrappedTargetException
                     Any value( xNameAccess->getByName(rtl::OUString::createFromAscii(pNode)) );
                     sURL = value.get<rtl::OUString> ();
+                    
+                    // extend the URLs with Office locale argument
+                    INetURLObject aURLObj( sURL );
+
+                    rtl::OUString sParam = aURLObj.GetParam();
+                    rtl::OUStringBuffer aURLBuf( sParam );
+                    if ( sParam.getLength() > 0 )
+                        aURLBuf.appendAscii( "&" );
+                    aURLBuf.appendAscii( "lang=" );
+
+                    // read locale from configuration
+                    ::rtl::OUString sLocale;
+                    ::rtl::OUString sPackage = ::rtl::OUString::createFromAscii("org.openoffice.Setup");
+                    ::rtl::OUString sRelPath = ::rtl::OUString::createFromAscii("L10N");
+                    ::rtl::OUString sKey     = ::rtl::OUString::createFromAscii("ooLocale");
+                    
+                    try
+                    {
+                        ::comphelper::ConfigurationHelper::readDirectKey(comphelper::getProcessServiceFactory(),
+                                                                         sPackage,
+                                                                         sRelPath,
+                                                                         sKey,
+                                                                         ::comphelper::ConfigurationHelper::E_READONLY) >>= sLocale;
+                    }
+                    catch(const com::sun::star::uno::RuntimeException& exRun)
+                        { throw exRun; }
+                    catch(const com::sun::star::uno::Exception&)
+                    { sLocale = ::rtl::OUString::createFromAscii("en-US"); }
+
+                    aURLBuf.append(sLocale);
+
+                    sParam = aURLBuf.makeStringAndClear();
+                    
+                    aURLObj.SetParam( sParam );
+                    sURL = aURLObj.GetMainURL( INetURLObject::NO_DECODE );
 
                     Reference< com::sun::star::system::XSystemShellExecute > xSystemShellExecute(
                         comphelper::getProcessServiceFactory()->createInstance(
diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx
index 311776c1bd..0a6d92975d 100644
--- a/framework/source/uielement/generictoolbarcontroller.cxx
+++ b/framework/source/uielement/generictoolbarcontroller.cxx
@@ -68,6 +68,9 @@
 #include <classes/fwkresid.hxx>
 #include <dispatch/uieventloghelper.hxx>
 
+#include <xml/menuconfiguration.hxx>
+#include <uielement/menubarmanager.hxx>
+
 using namespace ::com::sun::star::awt;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
@@ -75,6 +78,7 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::frame;
 using namespace ::com::sun::star::frame::status;
 using namespace ::com::sun::star::util;
+using namespace ::com::sun::star::container;
 
 namespace framework
 {
@@ -326,5 +330,67 @@ IMPL_STATIC_LINK_NOINSTANCE( GenericToolbarController, ExecuteHdl_Impl, ExecuteI
    return 0;
 }
 
+MenuToolbarController::MenuToolbarController( const Reference< XMultiServiceFactory >& rServiceManager, const Reference< XFrame >& rFrame, ToolBox* pToolBar, USHORT   nID, const rtl::OUString& aCommand, const rtl::OUString& aModuleIdentifier, const Reference< XIndexAccess >& xMenuDesc ) : GenericToolbarController( rServiceManager, rFrame, pToolBar, nID, aCommand ), m_xMenuDesc( xMenuDesc ), pMenu( NULL ), m_aModuleIdentifier( aModuleIdentifier )
+{
+}
+
+MenuToolbarController::~MenuToolbarController()
+{
+    try
+    {
+        if ( m_xMenuManager.is() )
+            m_xMenuManager->dispose();
+    }
+    catch( Exception& ) {}
+    if ( pMenu )
+    {
+        delete pMenu;
+        pMenu = NULL;
+    }
+ 
+}
+
+class Toolbarmenu : public PopupMenu
+{
+    public:
+    Toolbarmenu();
+    ~Toolbarmenu();
+};
+
+Toolbarmenu::Toolbarmenu()
+{
+    OSL_TRACE("**** contstructing Toolbarmenu 0x%x", this );
+}
+
+Toolbarmenu::~Toolbarmenu()
+{
+    OSL_TRACE("**** destructing Toolbarmenu 0x%x", this );
+}
+
+void SAL_CALL MenuToolbarController::click() throw (RuntimeException)
+{
+    createPopupWindow();
+}
+
+Reference< XWindow > SAL_CALL 
+MenuToolbarController::createPopupWindow() throw (::com::sun::star::uno::RuntimeException)
+{
+    if ( !pMenu ) 
+    {
+        Reference< XDispatchProvider > xDispatch;
+        Reference< XURLTransformer > xURLTransformer( m_xServiceManager->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))), UNO_QUERY );
+        pMenu = new Toolbarmenu();
+        m_xMenuManager.set( new MenuBarManager( m_xServiceManager, m_xFrame, xURLTransformer, xDispatch, m_aModuleIdentifier, pMenu, sal_True, sal_True ) );
+        if ( m_xMenuManager.is() )
+        {
+            MenuBarManager* pMgr = dynamic_cast< MenuBarManager* >( m_xMenuManager.get() );
+            pMgr->SetItemContainer( m_xMenuDesc );
+        }
+    }
+
+    ::Rectangle aRect( m_pToolbar->GetItemRect( m_nID ) );
+    pMenu->Execute( m_pToolbar, aRect, POPUPMENU_EXECUTE_DOWN );
+    return NULL; 
+}
 } // namespace
 
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index 730e022ab0..b674e27d8a 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -74,6 +74,7 @@
 #include <com/sun/star/frame/XModuleManager.hpp>
 #include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp>
 #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
+#include <com/sun/star/ui/ItemStyle.hpp>
 #include <com/sun/star/frame/status/Visibility.hpp>
 
 //_________________________________________________________________________________________________________________
@@ -136,6 +137,7 @@ static const char ITEM_DESCRIPTOR_LABEL[]             = "Label";
 static const char ITEM_DESCRIPTOR_TYPE[]              = "Type";
 static const char ITEM_DESCRIPTOR_MODULEIDENTIFIER[]  = "ModuleIdentifier";
 static const char ITEM_DESCRIPTOR_DISPATCHPROVIDER[]  = "DispatchProvider";
+static const char   ITEM_DESCRIPTOR_STYLE[]         = "Style";
 
 const sal_Int32   LEN_DESCRIPTOR_COMMANDURL           = 10;
 const sal_Int32   LEN_DESCRIPTOR_HELPURL              = 7;
@@ -144,6 +146,7 @@ const sal_Int32   LEN_DESCRIPTOR_LABEL                = 5;
 const sal_Int32   LEN_DESCRIPTOR_TYPE                 = 4;
 const sal_Int32   LEN_DESCRIPTOR_MODULEIDENTIFIER     = 16;
 const sal_Int32   LEN_DESCRIPTOR_DISPATCHPROVIDER     = 16;
+static const sal_Int32 ITEM_DESCRIPTOR_STYLE_LEN       = 5;
 
 const sal_uInt16 ADDONMENU_MERGE_ITEMID_START = 1500;
 
@@ -1327,6 +1330,11 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
         Reference< XDispatch > xDispatch;
         Reference< XStatusListener > xStatusListener;
         PopupMenu* pPopup = pMenu->GetPopupMenu( nItemId );
+        bool bItemShowMenuImages = m_bShowMenuImages;
+        MenuItemBits nBits =  pMenu->GetItemBits( nItemId );
+        // overwrite the show icons on menu option?
+        if ( nBits )
+            bItemShowMenuImages = ( ( nBits & MIB_ICON ) == MIB_ICON );
         if ( pPopup )
         {
             // Retrieve module identifier from Help Command entry
@@ -1422,7 +1430,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
                         pSubMenuManager->m_aMenuItemCommand = ::rtl::OUString();
 
                         // Set image for the addon popup menu item
-                        if ( m_bShowMenuImages && !pPopup->GetItemImage( ITEMID_ADDONLIST ))
+                        if ( bItemShowMenuImages && !pPopup->GetItemImage( ITEMID_ADDONLIST ))
                         {
                             Reference< XFrame > xTemp( rFrame );
                             Image aImage = GetImageFromURL( xTemp, aItemCommand, FALSE, m_bWasHiContrast );
@@ -1441,7 +1449,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
         }
         else if ( pMenu->GetItemType( i ) != MENUITEM_SEPARATOR )
         {
-            if ( m_bShowMenuImages )
+            if ( bItemShowMenuImages )
             {
                 if ( AddonMenuManager::IsAddonMenuId( nItemId ))
                 {
@@ -1752,7 +1760,7 @@ void MenuBarManager::FillMenu(
         sal_uInt16                      nType = 0;
         Reference< XIndexAccess >       xIndexContainer;
         Reference< XDispatchProvider >  xDispatchProvider( rDispatchProvider );
-
+        sal_Int16 nStyle = 0;
         try
         {
             if ( rItemContainer->getByIndex( n ) >>= aProp )
@@ -1781,6 +1789,8 @@ void MenuBarManager::FillMenu(
                     else if ( aPropName.equalsAsciiL( ITEM_DESCRIPTOR_DISPATCHPROVIDER,
                                                       LEN_DESCRIPTOR_DISPATCHPROVIDER ))
                         aProp[i].Value >>= xDispatchProvider;
+                   else if ( aProp[i].Name.equalsAsciiL( ITEM_DESCRIPTOR_STYLE, ITEM_DESCRIPTOR_STYLE_LEN ))
+                        aProp[i].Value >>= nStyle;
                 }
 
                 if ( nType == ::com::sun::star::ui::ItemType::DEFAULT )
@@ -1791,7 +1801,15 @@ void MenuBarManager::FillMenu(
                     sal_Int32 nHelpId = aHelpURL.toInt32();
                     if ( nHelpId > 0 )
                         pMenu->SetHelpId( nId, (USHORT)nHelpId );
-
+                    if ( nStyle )
+                    {
+                        MenuItemBits nBits = pMenu->GetItemBits( nId );
+                        if ( nStyle & ::com::sun::star::ui::ItemStyle::ICON )
+                           nBits |= MIB_ICON;
+                        if ( nStyle & ::com::sun::star::ui::ItemStyle::TEXT )
+                           nBits |= MIB_TEXT;
+                        pMenu->SetItemBits( nId, nBits );
+                    } 
                     if ( xIndexContainer.is() )
                     {
                         PopupMenu* pNewPopupMenu = new PopupMenu;
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index d9a35ede35..6775e21928 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -71,7 +71,6 @@
 #include <com/sun/star/lang/XMultiComponentFactory.hpp>
 #include <com/sun/star/frame/XModuleManager.hpp>
 #include <com/sun/star/ui/XUIElementSettings.hpp>
-#include <com/sun/star/container/XIndexContainer.hpp>
 #include <com/sun/star/ui/XUIConfigurationPersistence.hpp>
 #include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp>
 #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
@@ -122,6 +121,7 @@ namespace framework
 
 static const char   ITEM_DESCRIPTOR_COMMANDURL[]    = "CommandURL";
 static const char   ITEM_DESCRIPTOR_HELPURL[]       = "HelpURL";
+static const char   ITEM_DESCRIPTOR_TOOLTIP[]       = "Tooltip";
 static const char   ITEM_DESCRIPTOR_CONTAINER[]     = "ItemDescriptorContainer";
 static const char   ITEM_DESCRIPTOR_LABEL[]         = "Label";
 static const char   ITEM_DESCRIPTOR_TYPE[]          = "Type";
@@ -131,6 +131,7 @@ static const char   ITEM_DESCRIPTOR_STYLE[]         = "Style";
 
 static const sal_Int32 ITEM_DESCRIPTOR_COMMANDURL_LEN  = 10;
 static const sal_Int32 ITEM_DESCRIPTOR_HELPURL_LEN     = 7;
+static const sal_Int32 ITEM_DESCRIPTOR_TOOLTIP_LEN     = 7;
 static const sal_Int32 ITEM_DESCRIPTOR_CONTAINER_LEN   = 23;
 static const sal_Int32 ITEM_DESCRIPTOR_LABEL_LEN       = 5;
 static const sal_Int32 ITEM_DESCRIPTOR_TYPE_LEN        = 4;
@@ -143,6 +144,7 @@ static const char   HELPID_PREFIX_TESTTOOL[]        = ".HelpId:";
 //static sal_Int32    HELPID_PREFIX_LENGTH            = 7;
 static const USHORT STARTID_CUSTOMIZE_POPUPMENU     = 1000;
 
+#define MENUPREFIX "private:resource/menubar/"
 
 class ImageOrientationListener : public svt::FrameStatusListener
 {
@@ -968,8 +970,13 @@ void ToolBarManager::CreateControllers()
                 }
                 else
                 {
+                    MenuDescriptionMap::iterator it = m_aMenuMap.find( nId );
+                    if ( it == m_aMenuMap.end() )
                     xController = Reference< XStatusListener >(
                         new GenericToolbarController( m_xServiceManager, m_xFrame, m_pToolBar, nId, aCommandURL ));
+                    else
+                        xController = Reference< XStatusListener >(
+                            new MenuToolbarController( m_xServiceManager, m_xFrame, m_pToolBar, nId, aCommandURL, m_aModuleIdentifier, m_aMenuMap[ nId ] ));
                 }
             }
             else if ( pController )
@@ -1101,6 +1108,10 @@ sal_uInt16 ToolBarManager::ConvertStyleToToolboxItemBits( sal_Int32 nStyle )
         nItemBits |= TIB_REPEAT;
     if ( nStyle & ::com::sun::star::ui::ItemStyle::DROPDOWN_ONLY )
         nItemBits |= TIB_DROPDOWNONLY;
+    if ( nStyle & ::com::sun::star::ui::ItemStyle::TEXT )
+        nItemBits |= TIB_TEXT_ONLY;
+    if ( nStyle & ::com::sun::star::ui::ItemStyle::ICON )
+        nItemBits |= TIB_ICON_ONLY;
 
     return nItemBits;
 }
@@ -1130,8 +1141,8 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
             Reference< XUIConfigurationManagerSupplier > xSupplier( xModel, UNO_QUERY );
             if ( xSupplier.is() )
             {
-                Reference< XUIConfigurationManager > xDocUICfgMgr( xSupplier->getUIConfigurationManager(), UNO_QUERY );
-                m_xDocImageManager = Reference< XImageManager >( xDocUICfgMgr->getImageManager(), UNO_QUERY );
+                m_xDocUICfgMgr.set( xSupplier->getUIConfigurationManager(), UNO_QUERY );
+                m_xDocImageManager = Reference< XImageManager >( m_xDocUICfgMgr->getImageManager(), UNO_QUERY );
                 m_xDocImageManager->addConfigurationListener(
                                         Reference< XUIConfigurationListener >(
                                             static_cast< OWeakObject* >( this ), UNO_QUERY ));
@@ -1153,8 +1164,8 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
         Reference< XModuleUIConfigurationManagerSupplier > xModuleCfgMgrSupplier( m_xServiceManager->createInstance(
                                                                                     SERVICENAME_MODULEUICONFIGURATIONMANAGERSUPPLIER ),
                                                                                   UNO_QUERY );
-        Reference< XUIConfigurationManager > xUICfgMgr = xModuleCfgMgrSupplier->getUIConfigurationManager( m_aModuleIdentifier );
-        m_xModuleImageManager = Reference< XImageManager >( xUICfgMgr->getImageManager(), UNO_QUERY );
+        m_xUICfgMgr = xModuleCfgMgrSupplier->getUIConfigurationManager( m_aModuleIdentifier );
+        m_xModuleImageManager = Reference< XImageManager >( m_xUICfgMgr->getImageManager(), UNO_QUERY );
         m_xModuleImageManager->addConfigurationListener( Reference< XUIConfigurationListener >(
                                                             static_cast< OWeakObject* >( this ), UNO_QUERY ));
     }
@@ -1166,6 +1177,8 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
     m_aControllerMap.clear();
     m_aCommandMap.clear();
 
+    m_aMenuMap.clear();
+
     CommandInfo aCmdInfo;
     for ( sal_Int32 n = 0; n < rItemContainer->getCount(); n++ )
     {
@@ -1173,11 +1186,13 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
         rtl::OUString               aCommandURL;
         rtl::OUString               aLabel;
         rtl::OUString               aHelpURL;
+        rtl::OUString               aTooltip;
         sal_uInt16                  nType( ::com::sun::star::ui::ItemType::DEFAULT );
         sal_uInt16                  nWidth( 0 );
         sal_Bool                    bIsVisible( sal_True );
         sal_uInt32                  nStyle( 0 );
 
+        Reference< XIndexAccess >   aMenuDesc;
         try
         {
             if ( rItemContainer->getByIndex( n ) >>= aProp )
@@ -1185,9 +1200,44 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
                 for ( int i = 0; i < aProp.getLength(); i++ )
                 {
                     if ( aProp[i].Name.equalsAsciiL( ITEM_DESCRIPTOR_COMMANDURL, ITEM_DESCRIPTOR_COMMANDURL_LEN ))
+                    {
                         aProp[i].Value >>= aCommandURL;
+                        if ( aCommandURL.compareToAscii(MENUPREFIX, RTL_CONSTASCII_LENGTH(MENUPREFIX) ) == 0  )
+                        {
+                            try
+                            {
+                                Reference< XIndexAccess > xMenuContainer;
+                                if ( m_xDocUICfgMgr.is() )
+                                    xMenuContainer  = m_xDocUICfgMgr->getSettings( aCommandURL, sal_False );
+                                if ( !xMenuContainer.is() && m_xUICfgMgr.is() )
+                                    xMenuContainer = m_xUICfgMgr->getSettings( aCommandURL, sal_False );
+                                if ( xMenuContainer.is() && xMenuContainer->getCount() )
+                                {
+                                    Sequence< PropertyValue > aProps; 
+                                    // drop down menu info is currently
+                                    // the first ( and only ) menu
+                                    // in the menusettings container
+                                    xMenuContainer->getByIndex(0) >>= aProps;
+                                    for ( sal_Int32 index=0; index<aProps.getLength(); ++index )
+                                    {
+                                        if ( aProps[ index ].Name.equalsAsciiL( ITEM_DESCRIPTOR_CONTAINER, ITEM_DESCRIPTOR_CONTAINER_LEN ))
+ 
+                                        {
+                                            aProps[ index ].Value >>= aMenuDesc;
+                                            break;
+                                        }
+                                    }
+                                }
+                            }
+                            catch( Exception& )
+                            {
+                            }
+                        }
+                    }
                     else if (  aProp[i].Name.equalsAsciiL( ITEM_DESCRIPTOR_HELPURL, ITEM_DESCRIPTOR_HELPURL_LEN ))
                         aProp[i].Value >>= aHelpURL;
+                    else if (  aProp[i].Name.equalsAsciiL( ITEM_DESCRIPTOR_TOOLTIP, ITEM_DESCRIPTOR_TOOLTIP_LEN ))
+                        aProp[i].Value >>= aTooltip;
                     else if ( aProp[i].Name.equalsAsciiL( ITEM_DESCRIPTOR_LABEL, ITEM_DESCRIPTOR_LABEL_LEN ))
                         aProp[i].Value >>= aLabel;
                     else if ( aProp[i].Name.equalsAsciiL( ITEM_DESCRIPTOR_TYPE, ITEM_DESCRIPTOR_TYPE_LEN ))
@@ -1205,8 +1255,13 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
                     ::rtl::OUString aString( RetrieveLabelFromCommand( aCommandURL ));
 
                     sal_uInt16 nItemBits = ConvertStyleToToolboxItemBits( nStyle );
+                    if ( aMenuDesc.is() )
+                        m_aMenuMap[ nId ] = aMenuDesc;
                     m_pToolBar->InsertItem( nId, aString, nItemBits );
                     m_pToolBar->SetItemCommand( nId, aCommandURL );
+                    if ( aTooltip.getLength() )
+                        m_pToolBar->SetQuickHelpText( nId, aTooltip );
+                    else
                     m_pToolBar->SetQuickHelpText( nId, aString );
                     if ( aLabel.getLength() > 0 )
                         m_pToolBar->SetItemText( nId, aLabel );
diff --git a/framework/source/xml/menudocumenthandler.cxx b/framework/source/xml/menudocumenthandler.cxx
index 66addd1274..92bc785672 100644
--- a/framework/source/xml/menudocumenthandler.cxx
+++ b/framework/source/xml/menudocumenthandler.cxx
@@ -47,6 +47,7 @@
 #include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp>
 #include <com/sun/star/lang/XSingleComponentFactory.hpp>
 #include <com/sun/star/ui/ItemType.hpp>
+#include <com/sun/star/ui/ItemStyle.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 
@@ -80,11 +81,13 @@
 #define ATTRIBUTE_LABEL			    "http://openoffice.org/2001/menu^label"
 #define ATTRIBUTE_HELPID		    "http://openoffice.org/2001/menu^helpid"
 #define ATTRIBUTE_LINEBREAK		    "http://openoffice.org/2001/menu^linebreak"
+#define ATTRIBUTE_STYLE		    "http://openoffice.org/2001/menu^style"
 
 #define ATTRIBUTE_NS_ID			    "menu:id"
 #define ATTRIBUTE_NS_LABEL		    "menu:label"
 #define ATTRIBUTE_NS_HELPID		    "menu:helpid"
 #define ATTRIBUTE_NS_LINEBREAK	    "menu:linebreak"
+#define ATTRIBUTE_NS_STYLE		    "menu:style"
 
 #define ATTRIBUTE_XMLNS_MENU	    "xmlns:menu"
 
@@ -92,12 +95,16 @@
 
 #define MENUBAR_DOCTYPE			    "<!DOCTYPE menu:menubar PUBLIC \"-//OpenOffice.org//DTD OfficeDocument 1.0//EN\" \"menubar.dtd\">"
 
+#define ATTRIBUTE_ITEMSTYLE_TEXT    "text"
+#define ATTRIBUTE_ITEMSTYLE_IMAGE    "image"
+
 // Property names of a menu/menu item ItemDescriptor
 static const char ITEM_DESCRIPTOR_COMMANDURL[]  = "CommandURL";
 static const char ITEM_DESCRIPTOR_HELPURL[]     = "HelpURL";
 static const char ITEM_DESCRIPTOR_CONTAINER[]   = "ItemDescriptorContainer";
 static const char ITEM_DESCRIPTOR_LABEL[]       = "Label";
 static const char ITEM_DESCRIPTOR_TYPE[]        = "Type";
+static const char ITEM_DESCRIPTOR_STYLE[]       = "Style";
 
 // special popup menus (filled during runtime) must be saved as an empty popup menu or menuitem!!!
 static const sal_Int32 CMD_PROTOCOL_SIZE        = 5;
@@ -121,12 +128,27 @@ using namespace ::com::sun::star::ui;
 namespace framework
 {
 
+struct MenuStyleItem
+{
+    sal_Int16 nBit;
+    const char* attrName;
+};
+
+MenuStyleItem MenuItemStyles[ ] = {
+    { ::com::sun::star::ui::ItemStyle::ICON, ATTRIBUTE_ITEMSTYLE_IMAGE },
+    { ::com::sun::star::ui::ItemStyle::TEXT, ATTRIBUTE_ITEMSTYLE_TEXT },
+};
+
+
+sal_Int32 nMenuStyleItemEntries = sizeof( MenuItemStyles ) / sizeof( MenuItemStyles[ 0 ] );
+
 static void ExtractMenuParameters( const Sequence< PropertyValue > rProp,
                                    ::rtl::OUString&                       rCommandURL,
                                    ::rtl::OUString&                       rLabel,
                                    ::rtl::OUString&                       rHelpURL,
                                    Reference< XIndexAccess >&      rSubMenu,
-                                   sal_Int16&                      rType )
+                                   sal_Int16&                      rType,
+                                   sal_Int16&                      rStyle )
 {
     for ( sal_Int32 i = 0; i < rProp.getLength(); i++ )
     {
@@ -151,6 +173,10 @@ static void ExtractMenuParameters( const Sequence< PropertyValue > rProp,
         {
             rProp[i].Value >>= rType;
         }
+        else if ( rProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_STYLE ))
+        {
+            rProp[i].Value >>= rStyle;
+        }
     }
 }
 
@@ -165,7 +191,8 @@ ReadMenuDocumentHandlerBase::ReadMenuDocumentHandlerBase() :
     m_aLabel( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_LABEL )),
     m_aContainer( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_CONTAINER )),
     m_aHelpURL( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_HELPURL )),
-    m_aCommandURL( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_COMMANDURL ))
+    m_aCommandURL( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_COMMANDURL )),
+    m_aStyle( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_STYLE ))
 {
 }
 
@@ -207,20 +234,22 @@ throw(	SAXException, RuntimeException )
 
 void ReadMenuDocumentHandlerBase::initPropertyCommon(
     Sequence< PropertyValue > &rProps, const rtl::OUString &rCommandURL,
-    const rtl::OUString &rHelpId, const rtl::OUString &rLabel)
+    const rtl::OUString &rHelpId, const rtl::OUString &rLabel, sal_Int16 nItemStyleBits )
 {
     rProps[0].Name = m_aCommandURL;
     rProps[1].Name = m_aHelpURL;
     rProps[2].Name = m_aContainer;
     rProps[3].Name = m_aLabel;
-    rProps[4].Name = m_aType;
+    rProps[4].Name = m_aStyle;
+    rProps[5].Name = m_aType;
 
     // Common values
     rProps[0].Value <<= rCommandURL.intern();
     rProps[1].Value <<= rHelpId;
     rProps[2].Value <<= Reference< XIndexContainer >();
     rProps[3].Value <<= rLabel;
-    rProps[4].Value <<= ::com::sun::star::ui::ItemType::DEFAULT;
+    rProps[4].Value <<= nItemStyleBits;
+    rProps[5].Value <<= ::com::sun::star::ui::ItemType::DEFAULT;
 }
 
 // -----------------------------------------------------------------------------
@@ -373,6 +402,7 @@ throw( SAXException, RuntimeException )
         ::rtl::OUString aHelpId;
         ::rtl::OUString aCommandId;
         ::rtl::OUString aLabel;
+        sal_Int16 nItemBits(0);
 
         m_bMenuMode = sal_True;
 
@@ -399,12 +429,29 @@ throw( SAXException, RuntimeException )
                     aLabel = aValue;
                 else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_HELPID )))
                     aHelpId = aValue;
+                else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_STYLE )))
+                {
+                    ::rtl::OUString aTemp( aValue );
+                    sal_Int32 nIndex = 0;
+                    do
+                    {
+                        ::rtl::OUString aToken = aTemp.getToken( 0, '+', nIndex );
+                        if ( aToken.getLength() > 0 )
+                        {
+                            if ( aToken.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ITEMSTYLE_TEXT ) ) )
+                                nItemBits |= ::com::sun::star::ui::ItemStyle::TEXT;
+                            if ( aToken.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ITEMSTYLE_IMAGE ) ) )
+                                nItemBits |= ::com::sun::star::ui::ItemStyle::ICON;
+                        }
+                    }
+                    while ( nIndex >= 0 );                    
+                }
             }
 
             if ( aCommandId.getLength() > 0 )
             {
-                Sequence< PropertyValue > aSubMenuProp( 5 );
-                initPropertyCommon( aSubMenuProp, aCommandId, aHelpId, aLabel );
+                Sequence< PropertyValue > aSubMenuProp( 6 );
+                initPropertyCommon( aSubMenuProp, aCommandId, aHelpId, aLabel, nItemBits );
                 aSubMenuProp[2].Value <<= xSubItemContainer;
 
                 m_xMenuBarContainer->insertByIndex( m_xMenuBarContainer->getCount(), makeAny( aSubMenuProp ) );
@@ -589,6 +636,7 @@ throw( SAXException, RuntimeException )
         ::rtl::OUString aHelpId;
         ::rtl::OUString aCommandId;
         ::rtl::OUString aLabel;
+        sal_Int16 nItemBits(0);
 
         m_bMenuMode = sal_True;
 
@@ -614,12 +662,30 @@ throw( SAXException, RuntimeException )
                 aLabel = aValue;
             else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_HELPID )))
                 aHelpId = aValue;
+            else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_STYLE )))
+            {
+                ::rtl::OUString aTemp( aValue );
+                sal_Int32 nIndex = 0;
+                do
+                {
+                    ::rtl::OUString aToken = aTemp.getToken( 0, '+', nIndex );
+                    if ( aToken.getLength() > 0 )
+                    {
+                        if ( aToken.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ITEMSTYLE_TEXT ) ) )
+                            nItemBits |= ::com::sun::star::ui::ItemStyle::TEXT;
+                        if ( aToken.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ITEMSTYLE_IMAGE ) ) )
+                            nItemBits |= ::com::sun::star::ui::ItemStyle::ICON;
+                    }
+                }
+                while ( nIndex >= 0 );                    
+            }
+
         }
 
         if ( aCommandId.getLength() > 0 )
         {
-            Sequence< PropertyValue > aSubMenuProp( 5 );
-            initPropertyCommon( aSubMenuProp, aCommandId, aHelpId, aLabel );
+            Sequence< PropertyValue > aSubMenuProp( 6 );
+            initPropertyCommon( aSubMenuProp, aCommandId, aHelpId, aLabel, nItemBits );
             aSubMenuProp[2].Value <<= xSubItemContainer;
 
             m_xMenuContainer->insertByIndex( m_xMenuContainer->getCount(), makeAny( aSubMenuProp ) );
@@ -639,7 +705,7 @@ throw( SAXException, RuntimeException )
         ::rtl::OUString aHelpId;
         ::rtl::OUString aCommandId;
         ::rtl::OUString aLabel;
-
+        sal_Int16 nItemBits(0);
         // read attributes for menu item
         for ( sal_Int16 i=0; i< xAttrList->getLength(); i++ )
         {
@@ -651,12 +717,30 @@ throw( SAXException, RuntimeException )
                 aLabel = aValue;
             else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_HELPID )))
                 aHelpId = aValue;
+            else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_STYLE )))
+            {
+                ::rtl::OUString aTemp( aValue );
+                sal_Int32 nIndex = 0;
+                do
+                {
+                    ::rtl::OUString aToken = aTemp.getToken( 0, '+', nIndex );
+                    if ( aToken.getLength() > 0 )
+                    {
+                        if ( aToken.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ITEMSTYLE_TEXT ) ) )
+                            nItemBits |= ::com::sun::star::ui::ItemStyle::TEXT;
+                        if ( aToken.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ITEMSTYLE_IMAGE ) ) )
+                            nItemBits |= ::com::sun::star::ui::ItemStyle::ICON;
+                    }
+                }
+                while ( nIndex >= 0 );                    
+            }
+
         }
 
         if ( aCommandId.getLength() > 0 )
         {
-            Sequence< PropertyValue > aMenuItem( 5 );
-            initPropertyCommon( aMenuItem, aCommandId, aHelpId, aLabel );
+            Sequence< PropertyValue > aMenuItem( 6 );
+            initPropertyCommon( aMenuItem, aCommandId, aHelpId, aLabel, nItemBits );
             aMenuItem[2].Value <<= Reference< XIndexContainer >();
 
             m_xMenuContainer->insertByIndex( m_xMenuContainer->getCount(), makeAny( aMenuItem ) );
@@ -809,15 +893,16 @@ throw ( SAXException, RuntimeException )
             ::rtl::OUString    aLabel;
             ::rtl::OUString    aHelpURL;
             sal_Int16   nType( ::com::sun::star::ui::ItemType::DEFAULT );
+            sal_Int16   nItemBits( 0 );
             Reference< XIndexAccess > xSubMenu;
 
-            ExtractMenuParameters( aProps, aCommandURL, aLabel, aHelpURL, xSubMenu, nType );
+            ExtractMenuParameters( aProps, aCommandURL, aLabel, aHelpURL, xSubMenu, nType, nItemBits );
             if ( xSubMenu.is() )
             {
                 if ( aCommandURL.equalsAscii( ADDDIRECT_CMD ) ||
                     aCommandURL.equalsAscii( AUTOPILOTMENU_CMD ))
                 {
-                    WriteMenuItem( aCommandURL, aLabel, aHelpURL );
+                    WriteMenuItem( aCommandURL, aLabel, aHelpURL, nItemBits );
                     bSeparator = sal_False;
                 }
                 else if (( aCommandURL.getLength() > 0 ) && !AddonPopupMenu::IsCommandURLPrefix ( aCommandURL ))
@@ -857,7 +942,7 @@ throw ( SAXException, RuntimeException )
                     if ( aCommandURL.getLength() > 0 )
                     {
                         bSeparator = FALSE;
-                        WriteMenuItem( aCommandURL, aLabel, aHelpURL );
+                        WriteMenuItem( aCommandURL, aLabel, aHelpURL, nItemBits );
                     }
                 }
                 else if ( !bSeparator )
@@ -872,7 +957,7 @@ throw ( SAXException, RuntimeException )
 }
 
 
-void OWriteMenuDocumentHandler::WriteMenuItem( const ::rtl::OUString& aCommandURL, const ::rtl::OUString& aLabel, const ::rtl::OUString& aHelpURL)
+void OWriteMenuDocumentHandler::WriteMenuItem( const ::rtl::OUString& aCommandURL, const ::rtl::OUString& aLabel, const ::rtl::OUString& aHelpURL, sal_Int16 nStyle )
 {
     ::comphelper::AttributeList* pList = new ::comphelper::AttributeList;
     Reference< XAttributeList > xList( (XAttributeList *) pList , UNO_QUERY );
@@ -894,6 +979,24 @@ void OWriteMenuDocumentHandler::WriteMenuItem( const ::rtl::OUString& aCommandUR
                                 m_aAttributeType,
                                 aLabel );
     }
+    if (( nStyle > 0 ) && !( aCommandURL.copy( CMD_PROTOCOL_SIZE ).equalsAscii( CMD_PROTOCOL )))
+    {
+        rtl::OUString aValue;
+        MenuStyleItem* pStyle = MenuItemStyles;
+
+        for ( sal_Int32 nIndex = 0; nIndex < nMenuStyleItemEntries; ++nIndex, ++pStyle )
+        {
+            if ( nStyle & pStyle->nBit )
+            {
+                if ( aValue.getLength() )
+                    aValue = aValue.concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("+") ) );
+                aValue += rtl::OUString::createFromAscii( pStyle->attrName );
+            }
+        }
+        pList->AddAttribute( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_NS_STYLE )),
+                                m_aAttributeType,
+                                aValue );
+    }
 
     m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() );
     m_xWriteDocumentHandler->startElement( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENUITEM )), xList );
diff --git a/framework/source/xml/toolboxdocumenthandler.cxx b/framework/source/xml/toolboxdocumenthandler.cxx
index 53098b1687..279160dce2 100644
--- a/framework/source/xml/toolboxdocumenthandler.cxx
+++ b/framework/source/xml/toolboxdocumenthandler.cxx
@@ -79,6 +79,7 @@ namespace framework
 // Property names of a menu/menu item ItemDescriptor
 static const char ITEM_DESCRIPTOR_COMMANDURL[]  = "CommandURL";
 static const char ITEM_DESCRIPTOR_HELPURL[]     = "HelpURL";
+static const char ITEM_DESCRIPTOR_TOOLTIP[]     = "Tooltip";
 static const char ITEM_DESCRIPTOR_LABEL[]       = "Label";
 static const char ITEM_DESCRIPTOR_TYPE[]        = "Type";
 static const char ITEM_DESCRIPTOR_STYLE[]       = "Style";
@@ -89,6 +90,8 @@ static void ExtractToolbarParameters( const Sequence< PropertyValue > rProp,
                                       ::rtl::OUString&                       rCommandURL,
                                       ::rtl::OUString&                       rLabel,
                                       ::rtl::OUString&                       rHelpURL,
+                                      ::rtl::OUString&                       rTooltip,
+                                      sal_Int16&                      rStyle,
                                       sal_Int16&                      rWidth,
                                       sal_Bool&                       rVisible,
                                       sal_Int16&                      rType )
@@ -102,6 +105,8 @@ static void ExtractToolbarParameters( const Sequence< PropertyValue > rProp,
         }
         else if ( rProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_HELPURL ))
             rProp[i].Value >>= rHelpURL;
+        else if ( rProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_TOOLTIP ))
+            rProp[i].Value >>= rTooltip;
         else if ( rProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_LABEL ))
             rProp[i].Value >>= rLabel;
         else if ( rProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_TYPE ))
@@ -110,9 +115,30 @@ static void ExtractToolbarParameters( const Sequence< PropertyValue > rProp,
             rProp[i].Value >>= rVisible;
         else if ( rProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_WIDTH ))
             rProp[i].Value >>= rWidth;
+        else if ( rProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_STYLE ))
+            rProp[i].Value >>= rStyle;
     }
 }
 
+struct ToolboxStyleItem
+{
+    sal_Int16 nBit;
+    const char* attrName;
+};
+
+ToolboxStyleItem Styles[ ] = {
+    { ::com::sun::star::ui::ItemStyle::RADIO_CHECK, ATTRIBUTE_ITEMSTYLE_RADIO },
+    { ::com::sun::star::ui::ItemStyle::ALIGN_LEFT, ATTRIBUTE_ITEMSTYLE_LEFT },
+    { ::com::sun::star::ui::ItemStyle::AUTO_SIZE, ATTRIBUTE_ITEMSTYLE_AUTO },
+    { ::com::sun::star::ui::ItemStyle::REPEAT, ATTRIBUTE_ITEMSTYLE_REPEAT },
+    { ::com::sun::star::ui::ItemStyle::DROPDOWN_ONLY, ATTRIBUTE_ITEMSTYLE_DROPDOWNONLY },
+    { ::com::sun::star::ui::ItemStyle::DROP_DOWN, ATTRIBUTE_ITEMSTYLE_DROPDOWN },
+    { ::com::sun::star::ui::ItemStyle::ICON, ATTRIBUTE_ITEMSTYLE_IMAGE },
+    { ::com::sun::star::ui::ItemStyle::TEXT, ATTRIBUTE_ITEMSTYLE_TEXT },
+};
+
+sal_Int32 nStyleItemEntries = sizeof( Styles ) / sizeof( Styles[ 0 ] );
+
 struct ToolBarEntryProperty
 {
     OReadToolBoxDocumentHandler::ToolBox_XML_Namespace	nNamespace;
@@ -135,7 +161,8 @@ ToolBarEntryProperty ToolBoxEntries[OReadToolBoxDocumentHandler::TB_XML_ENTRY_CO
     { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR,	ATTRIBUTE_USER				},
     { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR,	ATTRIBUTE_HELPID			},
     { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR,	ATTRIBUTE_ITEMSTYLE			},
-    { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR,   ATTRIBUTE_UINAME            }
+    { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR,   ATTRIBUTE_UINAME            },
+    { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR,	ATTRIBUTE_TOOLTIP			},
 };
 
 OReadToolBoxDocumentHandler::OReadToolBoxDocumentHandler( const Reference< XIndexContainer >& rItemContainer ) :
@@ -145,6 +172,7 @@ OReadToolBoxDocumentHandler::OReadToolBoxDocumentHandler( const Reference< XInde
     m_aLabel( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_LABEL )),
     m_aStyle( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_STYLE )),
     m_aHelpURL( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_HELPURL )),
+    m_aTooltip( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_TOOLTIP )),
     m_aIsVisible( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_VISIBLE )),
     m_aCommandURL( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_COMMANDURL ))
  {
@@ -179,6 +207,8 @@ OReadToolBoxDocumentHandler::OReadToolBoxDocumentHandler( const Reference< XInde
     m_nHashCode_Style_DropDown	    = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_DROPDOWN ).hashCode();
     m_nHashCode_Style_Repeat	    = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_REPEAT ).hashCode();
     m_nHashCode_Style_DropDownOnly  = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_DROPDOWNONLY ).hashCode();
+    m_nHashCode_Style_Text  = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_TEXT ).hashCode();
+    m_nHashCode_Style_Image  = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_IMAGE ).hashCode();
 
     m_bToolBarStartFound			= sal_False;
     m_bToolBarEndFound				= sal_False;
@@ -298,6 +328,7 @@ throw(	SAXException, RuntimeException )
                 ::rtl::OUString        aLabel;
                 ::rtl::OUString        aCommandURL;
                 ::rtl::OUString        aHelpURL;
+                ::rtl::OUString        aTooltip;
                 ::rtl::OUString        aBitmapName;
                 sal_uInt16      nItemBits( 0 );
                 sal_uInt16      nWidth( 0 );
@@ -369,6 +400,12 @@ throw(	SAXException, RuntimeException )
                             }
                             break;
 
+                            case TB_ATTRIBUTE_TOOLTIP:
+                            {
+                                aTooltip = xAttribs->getValueByIndex( n );
+                            }
+                            break;
+
                             case TB_ATTRIBUTE_STYLE:
                             {
                                 // read space seperated item style list
@@ -393,6 +430,12 @@ throw(	SAXException, RuntimeException )
                                             nItemBits |= ::com::sun::star::ui::ItemStyle::REPEAT;
                                         else if ( nHashCode == m_nHashCode_Style_DropDownOnly )
                                             nItemBits |= ::com::sun::star::ui::ItemStyle::DROPDOWN_ONLY;
+                                        else if ( nHashCode == m_nHashCode_Style_DropDown )
+                                            nItemBits |= ::com::sun::star::ui::ItemStyle::DROP_DOWN;
+                                        else if ( nHashCode == m_nHashCode_Style_Text )
+                                            nItemBits |= ::com::sun::star::ui::ItemStyle::TEXT;
+                                        else if ( nHashCode == m_nHashCode_Style_Image )
+                                            nItemBits |= ::com::sun::star::ui::ItemStyle::ICON;
                                     }
                                 }
                                 while ( nIndex >= 0 );
@@ -414,13 +457,14 @@ throw(	SAXException, RuntimeException )
 
                 if ( aCommandURL.getLength() > 0 )
                 {
-                    Sequence< PropertyValue > aToolbarItemProp( 6 );
+                    Sequence< PropertyValue > aToolbarItemProp( 7 );
                     aToolbarItemProp[0].Name = m_aCommandURL;
                     aToolbarItemProp[1].Name = m_aHelpURL;
                     aToolbarItemProp[2].Name = m_aLabel;
                     aToolbarItemProp[3].Name = m_aType;
                     aToolbarItemProp[4].Name = m_aStyle;
                     aToolbarItemProp[5].Name = m_aIsVisible;
+                    aToolbarItemProp[6].Name = m_aTooltip;
 
                     aToolbarItemProp[0].Value <<= aCommandURL;
                     aToolbarItemProp[1].Value <<= aHelpURL;
@@ -428,6 +472,7 @@ throw(	SAXException, RuntimeException )
                     aToolbarItemProp[3].Value = makeAny( ::com::sun::star::ui::ItemType::DEFAULT );
                     aToolbarItemProp[4].Value <<= nItemBits;
                     aToolbarItemProp[5].Value <<= bVisible;
+                    aToolbarItemProp[6].Value <<= aTooltip;
 
                     m_rItemContainer->insertByIndex( m_rItemContainer->getCount(), makeAny( aToolbarItemProp ) );
                 }
@@ -718,13 +763,15 @@ void OWriteToolBoxDocumentHandler::WriteToolBoxDocument() throw
             ::rtl::OUString    aCommandURL;
             ::rtl::OUString    aLabel;
             ::rtl::OUString    aHelpURL;
+            ::rtl::OUString    aTooltip;
             sal_Bool    bVisible( sal_True );
             sal_Int16   nType( ::com::sun::star::ui::ItemType::DEFAULT );
             sal_Int16   nWidth( 0 );
+            sal_Int16   nStyle( 0 );
 
-            ExtractToolbarParameters( aProps, aCommandURL, aLabel, aHelpURL, nWidth, bVisible, nType );
+            ExtractToolbarParameters( aProps, aCommandURL, aLabel, aHelpURL, aTooltip, nStyle, nWidth, bVisible, nType );
             if ( nType == ::com::sun::star::ui::ItemType::DEFAULT )
-                WriteToolBoxItem( aCommandURL, aLabel, aHelpURL, nWidth, bVisible );
+                WriteToolBoxItem( aCommandURL, aLabel, aHelpURL, aTooltip, nStyle, nWidth, bVisible );
             else if ( nType == ::com::sun::star::ui::ItemType::SEPARATOR_SPACE )
                 WriteToolBoxSpace();
             else if ( nType == ::com::sun::star::ui::ItemType::SEPARATOR_LINE )
@@ -748,6 +795,8 @@ void OWriteToolBoxDocumentHandler::WriteToolBoxItem(
     const ::rtl::OUString& rCommandURL,
     const ::rtl::OUString& rLabel,
     const ::rtl::OUString& rHelpURL,
+    const ::rtl::OUString& rTooltip,
+    sal_Int16       nStyle,
     sal_Int16       nWidth,
     sal_Bool        bVisible )
 throw ( SAXException, RuntimeException )
@@ -785,6 +834,32 @@ throw ( SAXException, RuntimeException )
                              rHelpURL );
     }
 
+    if ( rTooltip.getLength() > 0 )
+    {
+        pList->AddAttribute( m_aXMLToolbarNS + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_TOOLTIP )),
+                             m_aAttributeType,
+                             rTooltip );
+    }
+
+    if ( nStyle > 0 )
+    {
+        rtl::OUString aValue;
+        ToolboxStyleItem* pStyle = Styles;
+
+        for ( sal_Int32 nIndex = 0; nIndex < nStyleItemEntries; ++nIndex, ++pStyle )
+        {
+            if ( nStyle & pStyle->nBit )
+            {
+                if ( aValue.getLength() )
+                    aValue = aValue.concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(" ") ) );
+                aValue += rtl::OUString::createFromAscii( pStyle->attrName );
+            }
+        } 
+        pList->AddAttribute( m_aXMLToolbarNS + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_ITEMSTYLE )),
+                             m_aAttributeType,
+                             aValue );
+    }
+
     if ( nWidth > 0 )
     {
         pList->AddAttribute( m_aXMLToolbarNS + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_WIDTH )),
diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx
index c20ec2c3d3..25d8ca19b7 100644
--- a/linguistic/source/gciterator.cxx
+++ b/linguistic/source/gciterator.cxx
@@ -578,7 +578,8 @@ void GrammarCheckingIterator::DequeueAndCheck()
 
                     sal_Int32 nStartPos = aFPEntryItem.m_nStartIndex;
                     sal_Int32 nSuggestedEnd = GetSuggestedEndOfSentence( aCurTxt, nStartPos, aCurLocale );
-                    DBG_ASSERT( nSuggestedEnd > nStartPos, "nSuggestedEndOfSentencePos calculation failed?" );
+                    DBG_ASSERT( (nSuggestedEnd == 0 && aCurTxt.getLength() == 0) || nSuggestedEnd > nStartPos, 
+                            "nSuggestedEndOfSentencePos calculation failed?" );
 
                     linguistic2::ProofreadingResult aRes;
 
diff --git a/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu b/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu
index a426891272..9078b3ef61 100644
--- a/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu
@@ -156,7 +156,7 @@
     </node>
   </node>
   <node oor:name="RegisteredNames">
-    <node oor:name="Bibliography" oor:op="replace">
+    <node oor:name="org.openoffice.Bibliography" oor:op="replace">
         <prop oor:name="Location" oor:type="xs:string">
             <value>$(userurl)/database/biblio.odb</value>
         </prop>
diff --git a/officecfg/registry/data/org/openoffice/Office/Math.xcu b/officecfg/registry/data/org/openoffice/Office/Math.xcu
index abfe2a48f8..a9939fa4c4 100644
--- a/officecfg/registry/data/org/openoffice/Office/Math.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Math.xcu
@@ -33,7 +33,7 @@
   <node oor:name="FontFormatList">
     <node oor:name="Id1" oor:op="replace">
       <prop oor:name="Name">
-        <value>StarSymbol</value>
+        <value>OpenSymbol</value>
       </prop>
       <prop oor:name="CharSet">
         <value>-1</value>
@@ -53,10 +53,10 @@
     </node>
     <node oor:name="Id2" oor:op="replace">
       <prop oor:name="Name">
-        <value>Times New Roman</value>
+        <value>OpenSymbol</value>
       </prop>
       <prop oor:name="CharSet">
-        <value>0</value>
+        <value>-1</value>
       </prop>
       <prop oor:name="Family">
         <value>0</value>
@@ -75,7 +75,7 @@
   <node oor:name="SymbolList">
     <node oor:name="alpha" oor:op="replace">
       <prop oor:name="Char">
-        <value>57527</value>
+        <value>945</value>
       </prop>
       <prop oor:name="Set">
         <value>Greek</value>
@@ -84,12 +84,12 @@
         <value>true</value>
       </prop>
       <prop oor:name="FontFormatId">
-        <value>Id1</value>
+        <value>Id2</value>
       </prop>
     </node>
     <node oor:name="ALPHA" oor:op="replace">
       <prop oor:name="Char">
-        <value>65</value>
+        <value>913</value>
       </prop>
       <prop oor:name="Set">
         <value>Greek</value>
@@ -103,7 +103,7 @@
     </node>
     <node oor:name="beta" oor:op="replace">
       <prop oor:name="Char">
-        <value>57528</value>
+        <value>946</value>
       </prop>
       <prop oor:name="Set">
         <value>Greek</value>
@@ -112,12 +112,12 @@
         <value>true</value>
       </prop>
       <prop oor:name="FontFormatId">
-        <value>Id1</value>
+        <value>Id2</value>
       </prop>
     </node>
     <node oor:name="BETA" oor:op="replace">
       <prop oor:name="Char">
-        <value>66</value>
+        <value>914</value>
       </prop>
       <prop oor:name="Set">
         <value>Greek</value>
@@ -131,7 +131,7 @@
     </node>
     <node oor:name="gamma" oor:op="replace">
       <prop oor:name="Char">
-        <value>57529</value>
+        <value>947</value>
       </prop>
       <prop oor:name="Set">
         <value>Greek</value>
@@ -140,12 +140,12 @@
         <value>true</value>
       </prop>
       <prop oor:name="FontFormatId">
-        <value>Id1</value>
+        <value>Id2</value>
       </prop>
     </node>
     <node oor:name="GAMMA" oor:op="replace">
       <prop oor:name="Char">
-        <value>57516</value>
+        <value>915</value>
       </prop>
       <prop oor:name="Set">
         <value>Greek</value>
@@ -154,12 +154,12 @@
         <value>true</value>
       </prop>
       <prop oor:name="FontFormatId">
-        <value>Id1</value>
+        <value>Id2</value>
       </prop>
     </node>
     <node oor:name="delta" oor:op="replace">
       <prop oor:name="Char">
-        <value>57530</value>
+        <value>948</value>
       </prop>
       <prop oor:name="Set">
         <value>Greek</value>
@@ -168,12 +168,12 @@
         <value>true</value>
       </prop>
       <prop oor:name="FontFormatId">
-        <value>Id1</value>
+        <value>Id2</value>
       </prop>
     </node>
     <node oor:name="DELTA" oor:op="replace">
       <prop oor:name="Char">
-        <value>57517</value>
+        <value>916</value>
       </prop>
       <prop oor:name="Set">
         <value>Greek</value>
@@ -182,12 +182,12 @@
         <value>true</value>
       </prop>
       <prop oor:name="FontFormatId">
-        <value>Id1</value>
+        <value>Id2</value>
       </prop>
     </node>
     <node oor:name="epsilon" oor:op="replace">
       <prop oor:name="Char">
-        <value>57531</value>
+        <value>1013</value>
       </prop>
       <prop oor:name="Set">
         <value>Greek</value>
@@ -196,12 +196,12 @@
         <value>true</value>
       </prop>
       <prop oor:name="FontFormatId">
-        <value>Id1</value>
+        <value>Id2</value>
       </prop>
     </node>
     <node oor:name="EPSILON" oor:op="replace">
       <prop oor:name="Char">
-        <value>69</value>
+        <value>917</value>
       </prop>
       <prop oor:name="Set">
         <value>Greek</value>
@@ -215,7 +215,7 @@
     </node>
     <node oor:name="zeta" oor:op="replace">
       <prop oor:name="Char">
-        <value>57532</value>
+        <value>950</value>
       </prop>
       <prop oor:name="Set">
         <value>Greek</value>
@@ -224,12 +224,12 @@
         <value>true</value>
       </prop>
       <prop oor:name="FontFormatId">
-        <value>Id1</value>
+        <value>Id2</value>
       </prop>
     </node>
     <node oor:name="ZETA" oor:op="replace">
       <prop oor:name="Char">
-        <value>90</value>
+        <value>918</value>
       </prop>
       <prop oor:name="Set">
         <value>Greek</value>
@@ -243,7 +243,7 @@
     </node>
     <node oor:name="eta" oor:op="replace">
       <prop oor:name="Char">
-        <value>57533</value>
+        <value>951</value>
       </prop>
       <prop oor:name="Set">
         <value>Greek</value>
@@ -252,12 +252,12 @@
         <value>true</value>
       </prop>
       <prop oor:name="FontFormatId">
-        <value>Id1</value>
+        <value>Id2</value>
       </prop>
     </node>
     <node oor:name="ETA" oor:op="replace">
       <prop oor:name="Char">
-        <value>72</value>
+        <value>919</value>
       </prop>
       <prop oor:name="Set">
         <value>Greek</value>
@@ -271,7 +271,7 @@
     </node>
     <node oor:name="theta" oor:op="replace">
       <prop oor:name="Char">
-        <value>57534</value>
+        <value>952</value>
       </prop>
       <prop oor:name="Set">
         <value>Greek</value>
@@ -280,12 +280,12 @@
         <value>true</value>
       </prop>
       <prop oor:name="FontFormatId">
-        <value>Id1</value>
+        <value>Id2</value>
       </prop>
     </node>
     <node oor:name="THETA" oor:op="replace">
       <prop oor:name="Char">
-        <value>57518</value>
+        <value>920</value>
       </prop>
       <prop oor:name="Set">
         <value>Greek</value>
@@ -294,12 +294,12 @@
         <value>true</value>
       </prop>
       <prop oor:name="FontFormatId">
-        <value>Id1</value>
+        <value>Id2</value>
       </prop>
     </node>
     <node oor:name="iota" oor:op="replace">
       <prop oor:name="Char">
-        <value>57535</value>
+        <value>953</value>
       </prop>
       <prop oor:name="Set">
         <value>Greek</value>
@@ -308,12 +308,12 @@
         <value>true</value>
       </prop>
       <prop oor:name="FontFormatId">
-        <value>Id1</value>
+        <value>Id2</value>
       </prop>
     </node>
     <node oor:name="IOTA" oor:op="replace">
       <prop oor:name="Char">
-        <value>73</value>
+        <value>921</value>
       </prop>
       <prop oor:name="Set">
         <value>Greek</value>
@@ -327,7 +327,7 @@
     </node>
     <node oor:name="kappa" oor:op="replace">
       <prop oor:name="Char">
-        <value>57536</value>
+        <value>954</value>
       </prop>
       <prop oor:name="Set">
         <value>Greek</value>
@@ -336,12 +336,12 @@
         <value>true</value>
       </prop>
       <prop oor:name="FontFormatId">
-        <value>Id1</value>
+        <value>Id2</value>
       </prop>
     </node>
     <node oor:name="KAPPA" oor:op="replace">
       <prop oor:name="Char">
-        <value>75</value>
+        <value>922</value>
       </prop>
       <prop oor:name="Set">
         <value>Greek</value>
@@ -355,7 +355,7 @@
     </node>
     <node oor:name="lambda" oor:op="replace">
       <prop oor:name="Char">
-        <value>57537</value>
+        <value>955</value>
       </prop>
       <prop oor:name="Set">
         <value>Greek</value>
@@ -364,12 +364,12 @@
         <value>true</value>
       </prop>
       <prop oor:name="FontFormatId">
-        <value>Id1</value>
+        <value>Id2</value>
       </prop>
     </node>
     <node oor:name="LAMBDA" oor:op="replace">
       <prop oor:name="Char">
-        <value>57519</value>
+        <value>923</value>
       </prop>
       <prop oor:name="Set">
         <value>Greek</value>
@@ -378,12 +378,12 @@
         <value>true</value>
       </prop>
       <prop oor:name="FontFormatId">
-        <value>Id1</value>
+        <value>Id2</value>
       </prop>
     </node>
     <node oor:name="mu" oor:op="replace">
       <prop oor:name="Char">
-        <value>57538</value>
+        <value>956</value>
       </prop>
       <prop oor:name="Set">
         <value>Greek</value>
@@ -392,12 +392,12 @@
         <value>true</value>
       </prop>
       <prop oor:name="FontFormatId">
-        <value>Id1</value>
+        <value>Id2</value>
       </prop>
     </node>
     <node oor:name="MU" oor:op="replace">
       <prop oor:name="Char">
-        <value>77</value>
+        <value>924</value>
       </prop>
       <prop oor:name="Set">
         <value>Greek</value>
@@ -411,7 +411,7 @@
     </node>
     <node oor:name="nu" oor:op="replace">
       <prop oor:name="Char">
-        <value>57539</value>
+        <value>957</value>
       </prop>
       <prop oor:name="Set">
         <value>Greek</value>
@@ -420,12 +420,12 @@
         <value>true</value>
       </prop>
       <prop oor:name="FontFormatId">
-        <value>Id1</value>
+        <value>Id2</value>
       </prop>
     </node>
     <node oor:name="NU" oor:op="replace">
       <prop oor:name="Char">
-        <value>78</value>
+        <value>925</value>
       </prop>
       <prop oor:name="Set">
         <value>Greek</value>
@@ -439,7 +439,7 @@
     </node>
     <node oor:name="xi" oor:op="replace">
       <prop oor:name="Char">
-        <value>57540</value>
+        <value>958</value>
       </prop>
       <prop oor:name="Set">
         <value>Greek</value>
@@ -448,12 +448,12 @@
         <value>true</value>
       </prop>
       <prop oor:name="FontFormatId">
-        <value>Id1</value>
+        <value>Id2</value>
       </prop>
     </node>
     <node oor:name="XI" oor:op="replace">
       <prop oor:name="Char">
-        <value>57520</value>
+        <value>926</value>
       </prop>
       <prop oor:name="Set">
         <value>Greek</value>
@@ -462,12 +462,12 @@
         <value>true</value>
       </prop>
       <prop oor:name="FontFormatId">
-        <value>Id1</value>
+        <value>Id2</value>
       </prop>
     </node>
     <node oor:name="omicron" oor:op="replace">
       <prop oor:name="Char">
-        <value>57541</value>
+        <value>959</value>
       </prop>
       <prop oor:name="Set">
         <value>Greek</value>
@@ -476,12 +476,12 @@
         <value>true</value>
       </prop>
       <prop oor:name="FontFormatId">
-        <value>Id1</value>
+        <value>Id2</value>
       </prop>
     </node>
     <node oor:name="OMICRON" oor:op="replace">
       <prop oor:name="Char">
-        <value>79</value>
+        <value>927</value>
       </prop>
       <prop oor:name="Set">
         <value>Greek</value>
@@ -495,7 +495,7 @@
     </node>
     <node oor:name="pi" oor:op="replace">
       <prop oor:name="Char">
-        <value>57542</value>
+        <value>960</value>
       </prop>
       <prop oor:name="Set">
         <value>Greek</value>
@@ -504,12 +504,12 @@
         <value>true</value>
       </prop>
       <prop oor:name="FontFormatId">
-        <value>Id1</value>
+        <value>Id2</value>
       </prop>
     </node>
     <node oor:name="PI" oor:op="replace">
       <prop oor:name="Char">
-        <value>57521</value>
+        <value>928</value>
       </prop>
       <prop oor:name="Set">
         <value>Greek</value>
@@ -518,12 +518,12 @@
         <value>true</value>
       </prop>
       <prop oor:name="FontFormatId">
-        <value>Id1</value>
+        <value>Id2</value>
       </prop>
     </node>
     <node oor:name="rho" oor:op="replace">
       <prop oor:name="Char">
-        <value>57543</value>
+        <value>961</value>
       </prop>
       <prop oor:name="Set">
         <value>Greek</value>
@@ -532,12 +532,12 @@
         <value>true</value>
       </prop>
       <prop oor:name="FontFormatId">
-        <value>Id1</value>
+        <value>Id2</value>
       </prop>
     </node>
     <node oor:name="RHO" oor:op="replace">
       <prop oor:name="Char">
-        <value>80</value>
+        <value>929</value>
       </prop>
       <prop oor:name="Set">
         <value>Greek</value>
@@ -551,7 +551,7 @@
     </node>
     <node oor:name="sigma" oor:op="replace">
       <prop oor:name="Char">
-        <value>57544</value>
+        <value>963</value>
       </prop>
       <prop oor:name="Set">
         <value>Greek</value>
@@ -560,12 +560,12 @@
         <value>true</value>
       </prop>
       <prop oor:name="FontFormatId">
-        <value>Id1</value>
+        <value>Id2</value>
       </prop>
     </node>
     <node oor:name="SIGMA" oor:op="replace">
       <prop oor:name="Char">
-        <value>57522</value>
+        <value>931</value>
       </prop>
       <prop oor:name="Set">
         <value>Greek</value>
@@ -574,12 +574,12 @@
         <value>true</value>
       </prop>
       <prop oor:name="FontFormatId">
-        <value>Id1</value>
+        <value>Id2</value>
       </prop>
     </node>
     <node oor:name="tau" oor:op="replace">
       <prop oor:name="Char">
-        <value>57545</value>
+        <value>964</value>
       </prop>
       <prop oor:name="Set">
         <value>Greek</value>
@@ -588,12 +588,12 @@
         <value>true</value>
       </prop>
       <prop oor:name="FontFormatId">
-        <value>Id1</value>
+        <value>Id2</value>
       </prop>
     </node>
     <node oor:name="TAU" oor:op="replace">
       <prop oor:name="Char">
-        <value>84</value>
+        <value>932</value>
       </prop>
       <prop oor:name="Set">
         <value>Greek</value>
@@ -607,7 +607,7 @@
     </node>
     <node oor:name="upsilon" oor:op="replace">
       <prop oor:name="Char">
-        <value>57546</value>
+        <value>965</value>
       </prop>
       <prop oor:name="Set">
         <value>Greek</value>
@@ -616,12 +616,12 @@
         <value>true</value>
       </prop>
       <prop oor:name="FontFormatId">
-        <value>Id1</value>
+        <value>Id2</value>
       </prop>
     </node>
     <node oor:name="UPSILON" oor:op="replace">
       <prop oor:name="Char">
-        <value>57523</value>
+        <value>933</value>
       </prop>
       <prop oor:name="Set">
         <value>Greek</value>
@@ -630,12 +630,12 @@
         <value>true</value>
       </prop>
       <prop oor:name="FontFormatId">
-        <value>Id1</value>
+        <value>Id2</value>
       </prop>
     </node>
     <node oor:name="phi" oor:op="replace">
       <prop oor:name="Char">
-        <value>57547</value>
+        <value>981</value>
       </prop>
       <prop oor:name="Set">
         <value>Greek</value>
@@ -644,12 +644,12 @@
         <value>true</value>
       </prop>
       <prop oor:name="FontFormatId">
-        <value>Id1</value>
+        <value>Id2</value>
       </prop>
     </node>
     <node oor:name="PHI" oor:op="replace">
       <prop oor:name="Char">
-        <value>57524</value>
+        <value>934</value>
       </prop>
       <prop oor:name="Set">
         <value>Greek</value>
@@ -658,12 +658,12 @@
         <value>true</value>
       </prop>
       <prop oor:name="FontFormatId">
-        <value>Id1</value>
+        <value>Id2</value>
       </prop>
     </node>
     <node oor:name="chi" oor:op="replace">
       <prop oor:name="Char">
-        <value>57548</value>
+        <value>967</value>
       </prop>
       <prop oor:name="Set">
         <value>Greek</value>
@@ -672,12 +672,12 @@
         <value>true</value>
       </prop>
       <prop oor:name="FontFormatId">
-        <value>Id1</value>
+        <value>Id2</value>
       </prop>
     </node>
     <node oor:name="CHI" oor:op="replace">
       <prop oor:name="Char">
-        <value>88</value>
+        <value>935</value>
       </prop>
       <prop oor:name="Set">
         <value>Greek</value>
@@ -691,7 +691,7 @@
     </node>
     <node oor:name="psi" oor:op="replace">
       <prop oor:name="Char">
-        <value>57549</value>
+        <value>968</value>
       </prop>
       <prop oor:name="Set">
         <value>Greek</value>
@@ -700,12 +700,12 @@
         <value>true</value>
       </prop>
       <prop oor:name="FontFormatId">
-        <value>Id1</value>
+        <value>Id2</value>
       </prop>
     </node>
     <node oor:name="PSI" oor:op="replace">
       <prop oor:name="Char">
-        <value>57525</value>
+        <value>936</value>
       </prop>
       <prop oor:name="Set">
         <value>Greek</value>
@@ -714,12 +714,12 @@
         <value>true</value>
       </prop>
       <prop oor:name="FontFormatId">
-        <value>Id1</value>
+        <value>Id2</value>
       </prop>
     </node>
     <node oor:name="omega" oor:op="replace">
       <prop oor:name="Char">
-        <value>57550</value>
+        <value>969</value>
       </prop>
       <prop oor:name="Set">
         <value>Greek</value>
@@ -728,12 +728,12 @@
         <value>true</value>
       </prop>
       <prop oor:name="FontFormatId">
-        <value>Id1</value>
+        <value>Id2</value>
       </prop>
     </node>
     <node oor:name="OMEGA" oor:op="replace">
       <prop oor:name="Char">
-        <value>57526</value>
+        <value>937</value>
       </prop>
       <prop oor:name="Set">
         <value>Greek</value>
@@ -742,12 +742,12 @@
         <value>true</value>
       </prop>
       <prop oor:name="FontFormatId">
-        <value>Id1</value>
+        <value>Id2</value>
       </prop>
     </node>
     <node oor:name="varepsilon" oor:op="replace">
       <prop oor:name="Char">
-        <value>57551</value>
+        <value>949</value>
       </prop>
       <prop oor:name="Set">
         <value>Greek</value>
@@ -756,12 +756,12 @@
         <value>true</value>
       </prop>
       <prop oor:name="FontFormatId">
-        <value>Id1</value>
+        <value>Id2</value>
       </prop>
     </node>
     <node oor:name="vartheta" oor:op="replace">
       <prop oor:name="Char">
-        <value>57552</value>
+        <value>977</value>
       </prop>
       <prop oor:name="Set">
         <value>Greek</value>
@@ -770,12 +770,12 @@
         <value>true</value>
       </prop>
       <prop oor:name="FontFormatId">
-        <value>Id1</value>
+        <value>Id2</value>
       </prop>
     </node>
     <node oor:name="varpi" oor:op="replace">
       <prop oor:name="Char">
-        <value>57553</value>
+        <value>982</value>
       </prop>
       <prop oor:name="Set">
         <value>Greek</value>
@@ -784,7 +784,7 @@
         <value>true</value>
       </prop>
       <prop oor:name="FontFormatId">
-        <value>Id1</value>
+        <value>Id2</value>
       </prop>
     </node>
     <node oor:name="varrho" oor:op="replace">
@@ -798,12 +798,12 @@
         <value>true</value>
       </prop>
       <prop oor:name="FontFormatId">
-        <value>Id1</value>
+        <value>Id2</value>
       </prop>
     </node>
     <node oor:name="varsigma" oor:op="replace">
       <prop oor:name="Char">
-        <value>57555</value>
+        <value>962</value>
       </prop>
       <prop oor:name="Set">
         <value>Greek</value>
@@ -812,12 +812,12 @@
         <value>true</value>
       </prop>
       <prop oor:name="FontFormatId">
-        <value>Id1</value>
+        <value>Id2</value>
       </prop>
     </node>
     <node oor:name="varphi" oor:op="replace">
       <prop oor:name="Char">
-        <value>57556</value>
+        <value>966</value>
       </prop>
       <prop oor:name="Set">
         <value>Greek</value>
@@ -826,7 +826,7 @@
         <value>true</value>
       </prop>
       <prop oor:name="FontFormatId">
-        <value>Id1</value>
+        <value>Id2</value>
       </prop>
     </node>
     <node oor:name="element" oor:op="replace">
@@ -915,7 +915,7 @@
     </node>
     <node oor:name="tendto" oor:op="replace">
       <prop oor:name="Char">
-        <value>57484</value>
+        <value>8594</value>
       </prop>
       <prop oor:name="Set">
         <value>Special</value>
@@ -985,7 +985,7 @@
     </node>
     <node oor:name="perthousand" oor:op="replace">
       <prop oor:name="Char">
-        <value>57472</value>
+        <value>8240</value>
       </prop>
       <prop oor:name="Set">
         <value>Special</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 0ba86ef6b1..fa0611e070 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -77,14 +77,6 @@
                     <value xml:lang="en-US">Foote~r</value>
                 </prop>
             </node>
-            <node oor:name=".uno:PreviewPrintOptions" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Print options page view</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
             <node oor:name=".uno:PreviewZoom" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
                     <value xml:lang="en-US">Preview Zoom</value>
@@ -911,7 +903,7 @@
             </node>
             <node oor:name=".uno:PrintPagePreView" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Print page view</value>
+                    <value xml:lang="en-US">Print document</value>
                 </prop>
                 <prop oor:name="Properties" oor:type="xs:int">
                     <value>1</value>
diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu b/officecfg/registry/data/org/openoffice/VCL.xcu
index ef84c557b7..de55a82165 100644
--- a/officecfg/registry/data/org/openoffice/VCL.xcu
+++ b/officecfg/registry/data/org/openoffice/VCL.xcu
@@ -52,6 +52,14 @@
         <value>false</value>
       </prop>
     </node>
+    <node oor:name="PrintDialog" oor:op="replace">
+        <prop oor:name="Collate" oor:op="replace" oor:type="xs:string">
+            <value>true</value>
+        </prop>
+        <prop oor:name="CollateBox" oor:op="replace" oor:type="xs:string">
+            <value>Default</value>
+        </prop>
+    </node>
   </node>
   <node oor:name="DefaultFonts">
     <node oor:name="en" oor:op="replace">
diff --git a/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs b/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs
index cb684017c7..3755945df3 100644
--- a/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs
@@ -38,9 +38,9 @@
 		<info>
 			<author>OJ</author>
 		</info>
-		<group oor:name="DatabaseNameSetting">
+		<group oor:name="DatabaseDocumentRegistration">
 			<info>
-				<desc>Describes how to establish a database connection and how to filter and layout the database data.</desc>
+				<desc>describes a single database document registration.</desc>
 			</info>
 			<prop oor:name="Name" oor:type="xs:string">
 				<info>
@@ -310,9 +310,9 @@
           </set>
         </group>
 
-		<set oor:name="RegisteredNames" oor:node-type="DatabaseNameSetting">
+		<set oor:name="RegisteredNames" oor:node-type="DatabaseDocumentRegistration">
 			<info>
-				<desc>Specifies all names which are registered.</desc>
+				<desc>Specifies the database documents registered within OpenOffice.org, for quick access by a programmatic name.</desc>
 			</info>
 		</set>
 
diff --git a/scripting/source/dlgprov/dlgevtatt.cxx b/scripting/source/dlgprov/dlgevtatt.cxx
index 2284884e36..60d53d1562 100644
--- a/scripting/source/dlgprov/dlgevtatt.cxx
+++ b/scripting/source/dlgprov/dlgevtatt.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,14 +32,13 @@
 #include "precompiled_scripting.hxx"
 #include "dlgevtatt.hxx"
 
-#ifndef SCRIPTING_DLGPROV_HXX
 #include "dlgprov.hxx"
-#endif
+
 #include <sfx2/sfx.hrc>
 #include <sfx2/app.hxx>
-#ifndef _MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
-#endif 
+#include <tools/diagnose_ex.h>
+
 #include <com/sun/star/awt/XControl.hpp>
 #include <com/sun/star/awt/XDialogEventHandler.hpp>
 #include <com/sun/star/awt/XContainerWindowEventHandler.hpp>
@@ -53,6 +52,7 @@
 #include <com/sun/star/reflection/XIdlMethod.hpp>
 #include <com/sun/star/beans/MethodConcept.hpp>
 #include <com/sun/star/beans/XMaterialHolder.hpp>
+
 #ifdef FAKE_VBA_EVENT_SUPPORT
 #include <ooo/vba/XVBAToOOEventDescGen.hpp>
 #endif
@@ -98,7 +98,7 @@ namespace dlgprov
         virtual void firing_impl( const script::ScriptEvent& aScriptEvent, uno::Any* pRet );
 
     public:
-        DialogUnoScriptListenerImpl( const Reference< XComponentContext >& rxContext,            
+        DialogUnoScriptListenerImpl( const Reference< XComponentContext >& rxContext,
             const Reference< frame::XModel >& rxModel,
             const Reference< awt::XControl >& rxControl,
             const Reference< XInterface >& rxHandler,
@@ -133,10 +133,13 @@ namespace dlgprov
             try
             {
                 xProps->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name") ) ) >>= msDialogCodeName;
-            } 
-            catch ( Exception&  ) {}
+            }
+            catch( const Exception& )
+            {
+                DBG_UNHANDLED_EXCEPTION();
+            }
         }
-            
+
     }
 
     void DialogVBAScriptListenerImpl::firing_impl( const script::ScriptEvent& aScriptEvent, uno::Any* )
@@ -149,7 +152,10 @@ namespace dlgprov
             {
                 mxListener->firing( aScriptEventCopy );
             }
-            catch( Exception& ) {}
+            catch( const Exception& )
+            {
+                DBG_UNHANDLED_EXCEPTION();
+            }
         }
     }
 #endif
@@ -184,13 +190,13 @@ namespace dlgprov
     }
 
     // -----------------------------------------------------------------------------
-    Reference< script::XScriptListener > 
+    Reference< script::XScriptListener >
     DialogEventsAttacherImpl::getScriptListenerForKey( const rtl::OUString& sKey ) throw ( RuntimeException )
     {
         ListenerHash::iterator it = listernersForTypes.find( sKey );
         if ( it == listernersForTypes.end() )
             throw RuntimeException(); // more text info here please
-        return it->second; 
+        return it->second;
     }
 #ifdef FAKE_VBA_EVENT_SUPPORT
     Reference< XScriptEventsSupplier > DialogEventsAttacherImpl::getFakeVbaEventsSupplier( const Reference< XControl >& xControl )
@@ -202,7 +208,7 @@ namespace dlgprov
             Reference< ooo::vba::XVBAToOOEventDescGen > xVBAToOOEvtDesc( xSMgr->createInstanceWithContext( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.VBAToOOEventDesc" ) ), m_xContext ), UNO_QUERY );
             if ( xVBAToOOEvtDesc.is() )
                 xEventsSupplier.set( xVBAToOOEvtDesc->getEventSupplier( xControl ), UNO_QUERY );
-            
+
         }
         return xEventsSupplier;
     }
@@ -221,46 +227,38 @@ namespace dlgprov
                 Sequence< ::rtl::OUString > aNames = xEventCont->getElementNames();
                 const ::rtl::OUString* pNames = aNames.getConstArray();
                 sal_Int32 nNameCount = aNames.getLength();
-    
+
                 for ( sal_Int32 j = 0; j < nNameCount; ++j )
                 {
                     ScriptEventDescriptor aDesc;
-    
+
                     Any aElement = xEventCont->getByName( pNames[ j ] );
                     aElement >>= aDesc;
                     rtl::OUString sKey = aDesc.ScriptType;
                     if ( aDesc.ScriptType.equals( rtl::OUString::createFromAscii("Script" ) ) || aDesc.ScriptType.equals( rtl::OUString::createFromAscii("UNO" ) ) )
                     {
                         sal_Int32 nIndex = aDesc.ScriptCode.indexOf( ':' );
-                        sKey = aDesc.ScriptCode.copy( 0, nIndex );	
+                        sKey = aDesc.ScriptCode.copy( 0, nIndex );
                     }
                     Reference< XAllListener > xAllListener =
                         new DialogAllListenerImpl( getScriptListenerForKey( sKey ), aDesc.ScriptType, aDesc.ScriptCode );
-    
+
                     // try first to attach event to the ControlModel
                     bool bSuccess = false;
                     try
                     {
-                        Reference< XEventListener > xListener_ = m_xEventAttacher->attachSingleEventListener( 
-                            xControlModel, xAllListener, Helper, aDesc.ListenerType, 
+                        Reference< XEventListener > xListener_ = m_xEventAttacher->attachSingleEventListener(
+                            xControlModel, xAllListener, Helper, aDesc.ListenerType,
                             aDesc.AddListenerParam, aDesc.EventMethod );
-    
+
                         if ( xListener_.is() )
                             bSuccess = true;
                     }
-                    catch ( IllegalArgumentException& ) 
-                    {
-                    }
-                    catch ( IntrospectionException& ) 
-                    {
-                    }
-                    catch ( CannotCreateAdapterException& ) 
+                    catch ( const Exception& )
                     {
+                        DBG_UNHANDLED_EXCEPTION();
                     }
-                    catch ( ServiceNotRegisteredException& ) 
-                    {
-                    }
-    
+
                     try
                     {
                         // if we had no success, try to attach to the control
@@ -271,17 +269,9 @@ namespace dlgprov
                                 aDesc.AddListenerParam, aDesc.EventMethod );
                         }
                     }
-                    catch( IllegalArgumentException& ) 
-                    {
-                    }
-                    catch( IntrospectionException& ) 
-                    {
-                    }
-                    catch( CannotCreateAdapterException& ) 
-                    {
-                    }
-                    catch( ServiceNotRegisteredException& ) 
+                    catch ( const Exception& )
                     {
+                        DBG_UNHANDLED_EXCEPTION();
                     }
                 }
             }
@@ -294,8 +284,8 @@ namespace dlgprov
 
     void SAL_CALL DialogEventsAttacherImpl::attachEvents( const Sequence< Reference< XInterface > >& Objects,
         const com::sun::star::uno::Reference<com::sun::star::script::XScriptListener>&,
-        const Any& Helper ) 
-        throw (IllegalArgumentException, IntrospectionException, CannotCreateAdapterException, 
+        const Any& Helper )
+        throw (IllegalArgumentException, IntrospectionException, CannotCreateAdapterException,
                ServiceNotRegisteredException, RuntimeException)
     {
         // get EventAttacher
@@ -349,7 +339,7 @@ namespace dlgprov
     // DialogAllListenerImpl
     // =============================================================================
 
-    DialogAllListenerImpl::DialogAllListenerImpl( const Reference< XScriptListener >& rxListener, 
+    DialogAllListenerImpl::DialogAllListenerImpl( const Reference< XScriptListener >& rxListener,
         const ::rtl::OUString& rScriptType, const ::rtl::OUString& rScriptCode )
         :m_xScriptListener( rxListener )
         ,m_sScriptType( rScriptType )
@@ -406,7 +396,7 @@ namespace dlgprov
 
     // -----------------------------------------------------------------------------
 
-    Any DialogAllListenerImpl::approveFiring( const AllEventObject& Event ) 
+    Any DialogAllListenerImpl::approveFiring( const AllEventObject& Event )
         throw ( reflection::InvocationTargetException, RuntimeException )
     {
         ::osl::MutexGuard aGuard( getMutex() );
@@ -421,7 +411,7 @@ namespace dlgprov
     // DialogScriptListenerImpl
     // =============================================================================
 
-    DialogUnoScriptListenerImpl::DialogUnoScriptListenerImpl( const Reference< XComponentContext >& rxContext, 
+    DialogUnoScriptListenerImpl::DialogUnoScriptListenerImpl( const Reference< XComponentContext >& rxContext,
             const Reference< ::com::sun::star::frame::XModel >& rxModel,
             const Reference< ::com::sun::star::awt::XControl >& rxControl,
             const Reference< ::com::sun::star::uno::XInterface >& rxHandler,
@@ -443,7 +433,7 @@ namespace dlgprov
 
     // -----------------------------------------------------------------------------
     void DialogSFScriptListenerImpl::firing_impl( const ScriptEvent& aScriptEvent, Any* pRet )
-    {            
+    {
         try
         {
             Reference< provider::XScriptProvider > xScriptProvider;
@@ -461,7 +451,7 @@ namespace dlgprov
                 {
                     Reference< provider::XScriptProviderFactory > xFactory(
                         m_xContext->getValueByName(
-                        ::rtl::OUString::createFromAscii( "/singletons/com.sun.star.script.provider.theMasterScriptProviderFactory" ) ), 
+                        ::rtl::OUString::createFromAscii( "/singletons/com.sun.star.script.provider.theMasterScriptProviderFactory" ) ),
                         UNO_QUERY );
                     OSL_ENSURE( xFactory.is(), "SFURL_firing_impl: failed to get master script provider factory" );
                     if ( xFactory.is() )
@@ -476,7 +466,7 @@ namespace dlgprov
             OSL_ENSURE( xScriptProvider.is(), "DialogScriptListenerImpl::firing_impl: failed to get script provider" );
 
             if ( xScriptProvider.is() )
-            {                    
+            {
                 Reference< provider::XScript > xScript = xScriptProvider->getScript( aScriptEvent.ScriptCode );
                 OSL_ENSURE( xScript.is(), "DialogScriptListenerImpl::firing_impl: failed to get script" );
 
@@ -487,7 +477,7 @@ namespace dlgprov
                     Sequence< Any > aOutParams;
 
                     // get arguments for script
-                    aInParams = aScriptEvent.Arguments; 
+                    aInParams = aScriptEvent.Arguments;
 
                     Any aResult = xScript->invoke( aInParams, aOutParamsIndex, aOutParams );
                     if ( pRet )
@@ -495,38 +485,32 @@ namespace dlgprov
                 }
             }
         }
-        catch ( RuntimeException& e )
-        {
-            OSL_TRACE( "DialogScriptListenerImpl::firing_impl: caught RuntimeException reason %s",
-                ::rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_ASCII_US ).pData->buffer );
-        }
-        catch ( Exception& e )
+        catch ( const Exception& )
         {
-            OSL_TRACE( "DialogScriptListenerImpl::firing_impl: caught Exception reason %s",
-                ::rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_ASCII_US ).pData->buffer );
+            DBG_UNHANDLED_EXCEPTION();
         }
     }
 
     void DialogLegacyScriptListenerImpl::firing_impl( const ScriptEvent& aScriptEvent, Any* pRet )
-    {            
+    {
         ::rtl::OUString sScriptURL;
         ::rtl::OUString sScriptCode( aScriptEvent.ScriptCode );
 
-    if ( aScriptEvent.ScriptType.compareToAscii( "StarBasic" ) == 0 )
-    {
-        // StarBasic script: convert ScriptCode to scriptURL
-        sal_Int32 nIndex = sScriptCode.indexOf( ':' );
-        if ( nIndex >= 0 && nIndex < sScriptCode.getLength() )
+        if ( aScriptEvent.ScriptType.compareToAscii( "StarBasic" ) == 0 )
         {
-            sScriptURL = ::rtl::OUString::createFromAscii( "vnd.sun.star.script:" );
-            sScriptURL += sScriptCode.copy( nIndex + 1 );
-            sScriptURL += ::rtl::OUString::createFromAscii( "?language=Basic&location=" );
-            sScriptURL += sScriptCode.copy( 0, nIndex );
+            // StarBasic script: convert ScriptCode to scriptURL
+            sal_Int32 nIndex = sScriptCode.indexOf( ':' );
+            if ( nIndex >= 0 && nIndex < sScriptCode.getLength() )
+            {
+                sScriptURL = ::rtl::OUString::createFromAscii( "vnd.sun.star.script:" );
+                sScriptURL += sScriptCode.copy( nIndex + 1 );
+                sScriptURL += ::rtl::OUString::createFromAscii( "?language=Basic&location=" );
+                sScriptURL += sScriptCode.copy( 0, nIndex );
+            }
+            ScriptEvent aSFScriptEvent( aScriptEvent );
+            aSFScriptEvent.ScriptCode = sScriptURL;
+            DialogSFScriptListenerImpl::firing_impl( aSFScriptEvent, pRet );
         }
-        ScriptEvent aSFScriptEvent( aScriptEvent );
-        aSFScriptEvent.ScriptCode = sScriptURL;
-        DialogSFScriptListenerImpl::firing_impl( aSFScriptEvent, pRet );
-    }
     }
 
     void DialogUnoScriptListenerImpl::firing_impl( const ScriptEvent& aScriptEvent, Any* pRet )
@@ -603,12 +587,10 @@ namespace dlgprov
                     bHandled = true;
                 }
             }
-            catch( com::sun::star::lang::IllegalArgumentException& )
-            {}
-            catch( com::sun::star::lang::NoSuchMethodException& )
-            {}
-            catch( com::sun::star::reflection::InvocationTargetException& )
-            {}
+            catch( const Exception& )
+            {
+                DBG_UNHANDLED_EXCEPTION();
+            }
         }
 
         if( bHandled )
@@ -634,7 +616,7 @@ namespace dlgprov
                 aOUFinal += aQuoteChar;
                 aOUFinal += aOURes.copy( nIndex + 2 );
 
-                ErrorBox( NULL, WinBits( WB_OK ), aOUFinal ).Execute(); 
+                ErrorBox( NULL, WinBits( WB_OK ), aOUFinal ).Execute();
             }
         }
     }
@@ -660,7 +642,7 @@ namespace dlgprov
 
     // -----------------------------------------------------------------------------
 
-    Any DialogScriptListenerImpl::approveFiring( const ScriptEvent& aScriptEvent ) 
+    Any DialogScriptListenerImpl::approveFiring( const ScriptEvent& aScriptEvent )
         throw ( reflection::InvocationTargetException, RuntimeException )
     {
         ::osl::MutexGuard aGuard( getMutex() );
diff --git a/sfx2/inc/sfx2/event.hxx b/sfx2/inc/sfx2/event.hxx
index 217e5910c1..267b94ccc2 100644
--- a/sfx2/inc/sfx2/event.hxx
+++ b/sfx2/inc/sfx2/event.hxx
@@ -102,30 +102,21 @@ class PrintDialog;
 class Printer;
 class SfxPrintingHint : public SfxHint
 {
-    PrintDialog*		pDialog;
-    Printer*			pPrinter;
     sal_Int32			nWhich;
     com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue > aOpts;
 public:
                         TYPEINFO();
-                        SfxPrintingHint( sal_Int32 nEvent, PrintDialog* pDlg, Printer* pPrt, const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& rOpts )
-                            : pDialog( pDlg )
-                            , pPrinter( pPrt )
-                            , nWhich( nEvent )
+                        SfxPrintingHint( sal_Int32 nEvent, const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& rOpts )
+                            : nWhich( nEvent )
                             , aOpts( rOpts )
                         {}
 
-                        SfxPrintingHint( sal_Int32 nEvent, PrintDialog* pDlg, Printer* pPrt )
-                            : pDialog( pDlg )
-                            , pPrinter( pPrt )
-                            , nWhich( nEvent )
+                        SfxPrintingHint( sal_Int32 nEvent )
+                            : nWhich( nEvent )
                         {}
 
-
-    Printer*  			GetPrinter() const { return pPrinter; }
-    PrintDialog*		GetPrintDialog() const { return pDialog; }
     sal_Int32			GetWhich() const { return nWhich; }
-    const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& GetAdditionalOptions() { return aOpts; }
+    const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& GetOptions() { return aOpts; }
 };
 
 #endif
diff --git a/sfx2/inc/sfx2/objsh.hxx b/sfx2/inc/sfx2/objsh.hxx
index db004fa9e3..0a1b5869f1 100644
--- a/sfx2/inc/sfx2/objsh.hxx
+++ b/sfx2/inc/sfx2/objsh.hxx
@@ -593,7 +593,7 @@ public:
                                         sal_uInt16 nIdx2 = INDEX_IGNORE,
                                         sal_uInt16 nIdx3 = INDEX_IGNORE);
 
-    virtual sal_Bool 			Print( Printer &rPrt,
+    sal_Bool 			        Print( Printer &rPrt,
                                        sal_uInt16 nIdx1,
                                        sal_uInt16 nIdx2 = INDEX_IGNORE,
                                        sal_uInt16 nIdx3 = INDEX_IGNORE,
diff --git a/sfx2/inc/sfx2/prnmon.hxx b/sfx2/inc/sfx2/prnmon.hxx
index 73419aa59b..c98e70b8c7 100644
--- a/sfx2/inc/sfx2/prnmon.hxx
+++ b/sfx2/inc/sfx2/prnmon.hxx
@@ -33,17 +33,13 @@
 #include "sal/config.h"
 #include "sfx2/dllapi.h"
 
-#ifndef _BUTTON_HXX //autogen
 #include <vcl/button.hxx>
-#endif
-#ifndef _DIALOG_HXX //autogen
 #include <vcl/dialog.hxx>
-#endif
 #include <sfx2/printer.hxx>
-#include <sfx2/progress.hxx>
+//#include <sfx2/progress.hxx>
 
 class SfxViewShell;
-class SfxProgress;
+//class SfxProgress;
 struct SfxPrintProgress_Impl;
 
 // ------------------------------------------------------------------------
@@ -51,7 +47,7 @@ struct SfxPrintProgress_Impl;
 #define PAGE_MAX    9999        //max. Anzahl der Seiten die gedruckt werden
 
 //--------------------------------------------------------------------
-
+/*
 class SFX2_DLLPUBLIC SfxPrintProgress: public SfxProgress
 {
     SfxPrintProgress_Impl*  pImp;
@@ -78,7 +74,7 @@ public:
     void					SetCancelHdl( const Link& aCancelHdl );
     BOOL					IsAborted() const;
 };
-
+*/
 // ------------------------------------------------------------------------
 
 struct SfxPrintOptDlg_Impl;
diff --git a/sfx2/inc/sfx2/sfxbasecontroller.hxx b/sfx2/inc/sfx2/sfxbasecontroller.hxx
index 6fc721d38b..b0e09eb4e8 100644
--- a/sfx2/inc/sfx2/sfxbasecontroller.hxx
+++ b/sfx2/inc/sfx2/sfxbasecontroller.hxx
@@ -493,7 +493,9 @@ public:
     virtual void SAL_CALL removeTitleChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XTitleChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
     
 //#if 0 // _SOLAR__PRIVATE
-    SAL_DLLPRIVATE SfxViewShell* GetViewShell_Impl() const;
+    // FIXME: TL needs this in sw/source/ui/uno/unotxdoc.cxx now;
+    // either the _Impl name should vanish or there should be an "official" API
+    SfxViewShell* GetViewShell_Impl() const;
     SAL_DLLPRIVATE BOOL HandleEvent_Impl( NotifyEvent& rEvent );
     SAL_DLLPRIVATE BOOL HasKeyListeners_Impl();
     SAL_DLLPRIVATE BOOL HasMouseClickListeners_Impl();
diff --git a/sfx2/inc/sfx2/sfxsids.hrc b/sfx2/inc/sfx2/sfxsids.hrc
index 6ce92380ee..525916f8d3 100644
--- a/sfx2/inc/sfx2/sfxsids.hrc
+++ b/sfx2/inc/sfx2/sfxsids.hrc
@@ -873,7 +873,7 @@
 #define SID_HELP_PI                         (SID_SFX_START + 962)
 #define SID_BASIC_ENABLED					(SID_SFX_START + 964)
 #define SID_EXPORT_DIALOG					(SID_SFX_START + 965)
-#define SID_IMPORT_DIALOG					(SID_SFX_START + 966)

+#define SID_IMPORT_DIALOG					(SID_SFX_START + 966)
 
 #define SID_BASICBREAK						(SID_SFX_START +1521)
 
diff --git a/sfx2/inc/sfx2/viewfrm.hxx b/sfx2/inc/sfx2/viewfrm.hxx
index 89bd00fc5d..e993d3e5a2 100644
--- a/sfx2/inc/sfx2/viewfrm.hxx
+++ b/sfx2/inc/sfx2/viewfrm.hxx
@@ -212,7 +212,7 @@ public:
                                         const Point &rPos, const Size &rSize );
     void					Hide();
     void					Show();
-    BOOL                    IsVisible_Impl() const;
+    BOOL                    IsVisible() const;
     void					ToTop();
     void					Enable( BOOL bEnable );
     virtual BOOL            Close();
diff --git a/sfx2/inc/sfx2/viewsh.hxx b/sfx2/inc/sfx2/viewsh.hxx
index 696be7b565..980a60fb84 100644
--- a/sfx2/inc/sfx2/viewsh.hxx
+++ b/sfx2/inc/sfx2/viewsh.hxx
@@ -35,6 +35,7 @@
 #include "sal/types.h"
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
 #include <com/sun/star/frame/XController.hpp>
+#include <com/sun/star/view/XRenderable.hpp>
 #include <com/sun/star/uno/Reference.h>
 #include <svl/lstner.hxx>
 #include <com/sun/star/ui/XContextMenuInterceptor.hpp>
@@ -43,6 +44,7 @@
 #include "shell.hxx"
 #include <tools/gen.hxx>
 #include <tools/errcode.hxx>
+#include <vcl/jobset.hxx>
 class SfxBaseController;
 class Size;
 class Fraction;
@@ -269,6 +271,7 @@ public:
     virtual PrintDialog*        CreatePrintDialog( Window *pParent );
     void						LockPrinter( BOOL bLock = TRUE );
     BOOL						IsPrinterLocked() const;
+    virtual JobSetup			GetJobSetup() const;
 
     // Workingset
     virtual void                WriteUserData( String&, BOOL bBrowse = FALSE );
@@ -288,6 +291,11 @@ public:
     /** forwards the current document, as returned by ->GetCurrentDocument, to SfxObjectShell::SetWorkingDocument
     */
     void                        SetCurrentDocument() const;
+    
+    /** get an XRenderable instance that can render this docuement
+    */
+    virtual com::sun::star::uno::Reference< com::sun::star::view::XRenderable > GetRenderable();
+        
 
     virtual void				MarginChanged();
     const Size&					GetMargin() const;
@@ -305,6 +313,7 @@ public:
     BOOL                        TryContextMenuInterception( Menu& rIn, const ::rtl::OUString& rMenuIdentifier, Menu*& rpOut, ::com::sun::star::ui::ContextMenuExecuteEvent aEvent );
 
     void						SetAdditionalPrintOptions( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& );
+    void						ExecPrint( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >&, sal_Bool, sal_Bool );
 
     void						AddRemoveClipboardListener( const com::sun::star::uno::Reference < com::sun::star::datatransfer::clipboard::XClipboardListener>&, BOOL );
 
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index e6e0c4bdac..4a14c6c88b 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -216,7 +216,7 @@ SfxObjectShellRef SfxApplication::DocAlreadyLoaded
         SfxTopViewFrame *pFrame;
         for( pFrame = (SfxTopViewFrame*)
                  SfxViewFrame::GetFirst( xDoc, TYPE(SfxTopViewFrame) );
-             pFrame && !pFrame->IsVisible_Impl();
+             pFrame && !pFrame->IsVisible();
              pFrame = (SfxTopViewFrame*)
                  SfxViewFrame::GetNext( *pFrame, xDoc, TYPE(SfxTopViewFrame) ) ) ;
         if ( pFrame )
diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx
index bfd280c786..42f22050d1 100644
--- a/sfx2/source/control/shell.cxx
+++ b/sfx2/source/control/shell.cxx
@@ -1260,7 +1260,7 @@ long DispatcherUpdate_Impl( void*, void* pArg )
 void SfxShell::UIFeatureChanged()
 {
     SfxViewFrame *pFrame = GetFrame();
-    if ( pFrame && pFrame->IsVisible_Impl() )
+    if ( pFrame && pFrame->IsVisible() )
     {
         // Auch dann Update erzwingen, wenn Dispatcher schon geupdated ist,
         // sonst bleibt evtl. irgendwas in den gebunkerten Tools stecken.
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index cad9014c0a..850878c42f 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -801,7 +801,9 @@ IMPL_LINK( FileDialogHelper_Impl, TimeOutHdl_Impl, Timer*, EMPTYARG )
 
             aData << aBmp;
 
-            Sequence < sal_Int8 > aBuffer( (sal_Int8*) aData.GetData(), aData.GetSize() );
+            const Sequence < sal_Int8 > aBuffer(
+                static_cast< const sal_Int8* >(aData.GetData()),
+                aData.GetEndOfData() );
 
             aAny <<= aBuffer;
         }
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index c8253f687e..f1f2e6cee8 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -62,6 +62,7 @@
 #include <unotools/useroptions.hxx>
 #include <unotools/localfilehelper.hxx>
 #include <vcl/virdev.hxx>
+#include <vcl/oldprintadaptor.hxx>
 
 #include <sfx2/app.hxx>
 #include "sfxresid.hxx"
@@ -1031,26 +1032,18 @@ BOOL SfxObjectShell::Print
             if ( !pStyle )
                 return TRUE;
 
-            if ( !rPrt.StartJob(String(SfxResId(STR_STYLES))) )
-            {
-                delete pIter;
-                return FALSE;
-            }
-            if ( !rPrt.StartPage() )
-            {
-                delete pIter;
-                return FALSE;
-            }
-            Reference< task::XStatusIndicator > xStatusIndicator;
-            xStatusIndicator = SFX_APP()->GetStatusIndicator();
-            if ( xStatusIndicator.is() )
-                xStatusIndicator->start( String(SfxResId(STR_PRINT_STYLES)), nStyles );
+            // pepare adaptor for old style StartPage/EndPage printing
+            boost::shared_ptr< Printer > pPrinter( new Printer( rPrt.GetJobSetup() ) );
+            vcl::OldStylePrintAdaptor* pAdaptor = new vcl::OldStylePrintAdaptor( pPrinter );
+            boost::shared_ptr< vcl::PrinterController > pController( pAdaptor );
 
-            rPrt.SetMapMode(MapMode(MAP_10TH_MM));
+            pAdaptor->StartPage();
+            
+            pPrinter->SetMapMode(MapMode(MAP_10TH_MM));
             Font aFont( DEFINE_CONST_UNICODE( "Arial" ), Size(0, 64));   // 18pt
             aFont.SetWeight(WEIGHT_BOLD);
-            rPrt.SetFont(aFont);
-            const Size aPageSize(rPrt.GetOutputSize());
+            pPrinter->SetFont(aFont);
+            const Size aPageSize(pPrinter->GetOutputSize());
             const USHORT nXIndent = 200;
             USHORT nYIndent = 200;
             Point aOutPos(nXIndent, nYIndent);
@@ -1059,68 +1052,66 @@ BOOL SfxObjectShell::Print
                 aHeader += *pObjectName;
             else
                 aHeader += GetTitle();
-            long nTextHeight( rPrt.GetTextHeight() );
-            rPrt.DrawText(aOutPos, aHeader);
+            long nTextHeight( pPrinter->GetTextHeight() );
+            pPrinter->DrawText(aOutPos, aHeader);
             aOutPos.Y() += nTextHeight;
             aOutPos.Y() += nTextHeight/2;
             aFont.SetSize(Size(0, 35)); // 10pt
             nStyles = 1;
             while(pStyle)
             {
-                if ( xStatusIndicator.is() )
-                    xStatusIndicator->setValue( nStyles++ );
-                // Ausgabe des Vorlagennamens
+                // print template name
                 String aStr(pStyle->GetName());
                 aFont.SetWeight(WEIGHT_BOLD);
-                rPrt.SetFont(aFont);
-                nTextHeight = rPrt.GetTextHeight();
-                // Seitenwechsel
+                pPrinter->SetFont(aFont);
+                nTextHeight = pPrinter->GetTextHeight();
+                // check for new page
                 if ( aOutPos.Y() + nTextHeight*2 >
                     aPageSize.Height() - (long) nYIndent )
                 {
-                    rPrt.EndPage();
-                    rPrt.StartPage();
+                    pAdaptor->EndPage();
+                    pAdaptor->StartPage();
                     aOutPos.Y() = nYIndent;
                 }
-                rPrt.DrawText(aOutPos, aStr);
+                pPrinter->DrawText(aOutPos, aStr);
                 aOutPos.Y() += nTextHeight;
 
-                // Ausgabe der Vorlagenbeschreibung
+                // print template description
                 aFont.SetWeight(WEIGHT_NORMAL);
-                rPrt.SetFont(aFont);
+                pPrinter->SetFont(aFont);
                 aStr = pStyle->GetDescription();
                 const char cDelim = ' ';
                 USHORT nStart = 0, nIdx = 0;
 
-                nTextHeight = rPrt.GetTextHeight();
-                // wie viele Worte passen auf eine Zeile
+                nTextHeight = pPrinter->GetTextHeight();
+                // break text into lines
                 while(nIdx < aStr.Len())
                 {
                     USHORT	nOld = nIdx;
                     long nTextWidth;
                     nIdx = aStr.Search(cDelim, nStart);
-                    nTextWidth = rPrt.GetTextWidth(aStr, nStart, nIdx-nStart);
+                    nTextWidth = pPrinter->GetTextWidth(aStr, nStart, nIdx-nStart);
                     while(nIdx != STRING_NOTFOUND &&
                           aOutPos.X() + nTextWidth <
                           aPageSize.Width() - (long) nXIndent)
                     {
                         nOld = nIdx;
                         nIdx = aStr.Search(cDelim, nIdx+1);
-                        nTextWidth = rPrt.GetTextWidth(aStr, nStart, nIdx-nStart);
+                        nTextWidth = pPrinter->GetTextWidth(aStr, nStart, nIdx-nStart);
                     }
                     String aTmp(aStr, nStart, nIdx == STRING_NOTFOUND?
                                 STRING_LEN :
                                 nOld-nStart);
                     if ( aTmp.Len() )
                     {
-                        nStart = nOld+1;    // wegen trailing space
+                        nStart = nOld+1;    // trailing space
                     }
                     else
                     {
                         USHORT nChar = 1;
                         while(
                             nStart + nChar < aStr.Len() &&
-                            aOutPos.X() + rPrt.GetTextWidth(
+                            aOutPos.X() + pPrinter->GetTextWidth(
                                 aStr, nStart, nChar) <
                             aPageSize.Width() - nXIndent)
                             ++nChar;
@@ -1131,19 +1122,19 @@ BOOL SfxObjectShell::Print
                     if ( aOutPos.Y() + nTextHeight*2 >
                         aPageSize.Height() - nYIndent )
                     {
-                        rPrt.EndPage();
-                        rPrt.StartPage();
+                        pAdaptor->EndPage();
+                        pAdaptor->StartPage();
                         aOutPos.Y() = nYIndent;
                     }
-                    rPrt.DrawText(aOutPos, aTmp);
-                    aOutPos.Y() += rPrt.GetTextHeight();
+                    pPrinter->DrawText(aOutPos, aTmp);
+                    aOutPos.Y() += pPrinter->GetTextHeight();
                 }
                 pStyle = pIter->Next();
             }
-            rPrt.EndPage();
-            rPrt.EndJob();
-            if ( xStatusIndicator.is() )
-                xStatusIndicator->end();
+            pAdaptor->EndPage();
+            
+            Printer::PrintJob( pController, rPrt.GetJobSetup() );
+
             delete pIter;
             break;
         }
diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx
index 957c245fb3..4eb1ca3416 100755
--- a/sfx2/source/doc/printhelper.cxx
+++ b/sfx2/source/doc/printhelper.cxx
@@ -42,6 +42,7 @@
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/lang/EventObject.hpp>
+#include <com/sun/star/view/DuplexMode.hpp>
 
 #include <svl/lstner.hxx>
 #include <svl/stritem.hxx>
@@ -148,8 +149,9 @@ Reference< ::com::sun::star::view::XPrintable > SAL_CALL SfxPrintJob_Impl::getPr
 
 void SAL_CALL SfxPrintJob_Impl::cancelJob() throw (RuntimeException)
 {
+    // FIXME: how to cancel PrintJob via API?!
     if( m_pData->m_pObjectShell.Is() )
-        m_pData->m_pObjectShell->Broadcast( SfxPrintingHint( -2, NULL, NULL ) );
+        m_pData->m_pObjectShell->Broadcast( SfxPrintingHint( -2 ) );
 }
 
 SfxPrintHelper::SfxPrintHelper()
@@ -590,7 +592,7 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >&
     if ( !pView )
         return;
 
-    SfxAllItemSet aArgs( pView->GetPool() );
+//	SfxAllItemSet aArgs( pView->GetPool() );
     sal_Bool bMonitor = sal_False;
     // We need this information at the end of this method, if we start the vcl printer
     // by executing the slot. Because if it is a ucb relevant URL we must wait for
@@ -601,7 +603,10 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >&
     String sUcbUrl;
     ::utl::TempFile* pUCBPrintTempFile = NULL;
 
-    sal_Bool bWaitUntilEnd = sal_False;
+    uno::Sequence < beans::PropertyValue > aCheckedArgs( rOptions.getLength() );
+    sal_Int32 nProps = 0;
+    sal_Bool  bWaitUntilEnd = sal_False;
+    sal_Int16 nDuplexMode = ::com::sun::star::view::DuplexMode::UNKNOWN;
     for ( int n = 0; n < rOptions.getLength(); ++n )
     {
         // get Property-Value from options
@@ -634,10 +639,15 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >&
                 // converted its not an URL nor a system path. Then we can't accept
                 // this parameter and have to throw an exception.
                 ::rtl::OUString sSystemPath(sTemp);
-                ::rtl::OUString sFileURL          ;
+                ::rtl::OUString sFileURL;
                 if (::osl::FileBase::getFileURLFromSystemPath(sSystemPath,sFileURL)!=::osl::FileBase::E_None)
                     throw ::com::sun::star::lang::IllegalArgumentException();
-                aArgs.Put( SfxStringItem(SID_FILE_NAME,sTemp) );
+                aCheckedArgs[nProps].Name = rProp.Name;
+                aCheckedArgs[nProps++].Value <<= sFileURL;
+                // and append the local filename
+                aCheckedArgs.realloc( aCheckedArgs.getLength()+1 );
+                aCheckedArgs[nProps].Name = rtl::OUString::createFromAscii("LocalFileName");
+                aCheckedArgs[nProps++].Value <<= ::rtl::OUString( sTemp );
             }
             else
             // It's a valid URL. but now we must know, if it is a local one or not.
@@ -648,7 +658,12 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >&
                 // And we have to use the system notation of the incoming URL.
                 // But it into the descriptor and let the slot be executed at
                 // the end of this method.
-                aArgs.Put( SfxStringItem(SID_FILE_NAME,sPath) );
+                aCheckedArgs[nProps].Name = rProp.Name;
+                aCheckedArgs[nProps++].Value <<= sTemp;
+                // and append the local filename
+                aCheckedArgs.realloc( aCheckedArgs.getLength()+1 );
+                aCheckedArgs[nProps].Name = rtl::OUString::createFromAscii("LocalFileName");
+                aCheckedArgs[nProps++].Value <<= ::rtl::OUString( sPath );
             }
             else
             {
@@ -663,7 +678,10 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >&
                 // a slot ...
                 pUCBPrintTempFile = new ::utl::TempFile();
                 pUCBPrintTempFile->EnableKillingFile();
-                aArgs.Put( SfxStringItem(SID_FILE_NAME,pUCBPrintTempFile->GetFileName()) );
+
+                //FIXME: does it work?
+                aCheckedArgs[nProps].Name = rtl::OUString::createFromAscii("LocalFileName");
+                aCheckedArgs[nProps++].Value <<= ::rtl::OUString( pUCBPrintTempFile->GetFileName() );
                 sUcbUrl = sURL;
             }
         }
@@ -674,25 +692,22 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >&
             sal_Int32 nCopies = 0;
             if ( ( rProp.Value >>= nCopies ) == sal_False )
                 throw ::com::sun::star::lang::IllegalArgumentException();
-            aArgs.Put( SfxInt16Item( SID_PRINT_COPIES, (USHORT) nCopies ) );
+
+            aCheckedArgs[nProps].Name = rProp.Name;
+            aCheckedArgs[nProps++].Value <<= nCopies;
         }
 
         // Collate-Property
-        else if ( rProp.Name.compareToAscii( "Collate" ) == 0 )
+        // Sort-Property (deprecated)
+        else if ( rProp.Name.compareToAscii( "Collate" ) == 0 ||
+                ( rProp.Name.compareToAscii( "Sort" ) == 0 ) )
         {
             sal_Bool bTemp = sal_Bool();
             if ( rProp.Value >>= bTemp )
-                aArgs.Put( SfxBoolItem( SID_PRINT_COLLATE, bTemp ) );
-            else
-                throw ::com::sun::star::lang::IllegalArgumentException();
-        }
-
-        // Sort-Property
-        else if ( rProp.Name.compareToAscii( "Sort" ) == 0 )
-        {
-            sal_Bool bTemp = sal_Bool();
-            if( rProp.Value >>= bTemp )
-                aArgs.Put( SfxBoolItem( SID_PRINT_SORT, bTemp ) );
+            {
+                aCheckedArgs[nProps].Name = rtl::OUString::createFromAscii("Collate");
+                aCheckedArgs[nProps++].Value <<= bTemp;
+            }
             else
                 throw ::com::sun::star::lang::IllegalArgumentException();
         }
@@ -702,7 +717,10 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >&
         {
             OUSTRING sTemp;
             if( rProp.Value >>= sTemp )
-                aArgs.Put( SfxStringItem( SID_PRINT_PAGES, String( sTemp ) ) );
+            {
+                aCheckedArgs[nProps].Name = rProp.Name;
+                aCheckedArgs[nProps++].Value <<= sTemp;
+            }
             else
                 throw ::com::sun::star::lang::IllegalArgumentException();
         }
@@ -712,26 +730,36 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >&
         {
             if( !(rProp.Value >>= bMonitor) )
                 throw ::com::sun::star::lang::IllegalArgumentException();
+            aCheckedArgs[nProps].Name = rProp.Name;
+            aCheckedArgs[nProps++].Value <<= bMonitor;
         }
 
-        // MonitorVisible
+        // Wait
         else if ( rProp.Name.compareToAscii( "Wait" ) == 0 )
         {
             if ( !(rProp.Value >>= bWaitUntilEnd) )
                 throw ::com::sun::star::lang::IllegalArgumentException();
+            aCheckedArgs[nProps].Name = rProp.Name;
+            aCheckedArgs[nProps++].Value <<= bWaitUntilEnd;
+        }
+
+        else if ( rProp.Name.compareToAscii( "DuplexMode" ) == 0 )
+        {
+            if ( !(rProp.Value >>= nDuplexMode ) )
+                throw ::com::sun::star::lang::IllegalArgumentException();
+            aCheckedArgs[nProps].Name = rProp.Name;
+            aCheckedArgs[nProps++].Value <<= nDuplexMode;
         }
     }
 
+    if ( nProps != aCheckedArgs.getLength() )
+        aCheckedArgs.realloc(nProps);
+
     // Execute the print request every time.
     // It doesn'tmatter if it is a real printer used or we print to a local file
     // nor if we print to a temp file and move it afterwards by using the ucb.
     // That will be handled later. see pUCBPrintFile below!
-    aArgs.Put( SfxBoolItem( SID_SILENT, !bMonitor ) );
-    if ( bWaitUntilEnd )
-        aArgs.Put( SfxBoolItem( SID_ASYNCHRON, sal_False ) );
-    SfxRequest aReq( SID_PRINTDOC, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_API, pView->GetPool() );
-    aReq.SetArgs( aArgs );
-    pView->ExecuteSlot( aReq );
+    pView->ExecPrint( aCheckedArgs, sal_True, sal_False );
 
     // Ok - may be execution before has finished (or started!) printing.
     // And may it was a printing to a file.
@@ -764,11 +792,11 @@ void IMPL_PrintListener_DataContainer::Notify( SfxBroadcaster& rBC, const SfxHin
         SfxPrintingHint* pPrintHint = PTR_CAST( SfxPrintingHint, &rHint );
         if ( pPrintHint )
         {
-            if ( pPrintHint->GetWhich() == -1 )     // -1 : Initialisation of PrintOptions
+            if ( pPrintHint->GetWhich() == com::sun::star::view::PrintableState_JOB_STARTED )
             {
                 if ( !m_xPrintJob.is() )
                     m_xPrintJob = new SfxPrintJob_Impl( this );
-
+/*
                 PrintDialog* pDlg = pPrintHint->GetPrintDialog();
                 Printer* pPrinter = pPrintHint->GetPrinter();
                 ::rtl::OUString aPrintFile ( ( pPrinter && pPrinter->IsPrintFileEnabled() ) ? pPrinter->GetPrintFile() : String() );
@@ -805,7 +833,10 @@ void IMPL_PrintListener_DataContainer::Notify( SfxBroadcaster& rBC, const SfxHin
                     m_aPrintOptions[nArgs-1].Name = DEFINE_CONST_UNICODE("FileName");
                     m_aPrintOptions[nArgs-1].Value <<= aPrintFile;
                 }
+*/
+                m_aPrintOptions = pPrintHint->GetOptions();
             }
+/*
             else if ( pPrintHint->GetWhich() == -3 )    // -3 : AdditionalPrintOptions
             {
                     uno::Sequence < beans::PropertyValue >& lOldOpts = m_aPrintOptions;
@@ -839,6 +870,7 @@ void IMPL_PrintListener_DataContainer::Notify( SfxBroadcaster& rBC, const SfxHin
                         // at least one new options has overwritten an old one, so we allocated too much
                         lOldOpts.realloc(  nTotal );
             }
+*/
             else if ( pPrintHint->GetWhich() != -2 )    // -2 : CancelPrintJob
             {
                 view::PrintJobEvent aEvent;
diff --git a/sfx2/source/view/makefile.mk b/sfx2/source/view/makefile.mk
index 98d34215e0..cad1205272 100644
--- a/sfx2/source/view/makefile.mk
+++ b/sfx2/source/view/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -54,7 +54,6 @@ SLOFILES =	\
         $(SLO)$/frmload.obj \
         $(SLO)$/frame.obj \
         $(SLO)$/printer.obj \
-        $(SLO)$/prnmon.obj \
         $(SLO)$/viewprn.obj \
         $(SLO)$/viewfac.obj \
         $(SLO)$/orgmgr.obj \
diff --git a/sfx2/source/view/printer.cxx b/sfx2/source/view/printer.cxx
index e8007b6792..95242562c5 100644
--- a/sfx2/source/view/printer.cxx
+++ b/sfx2/source/view/printer.cxx
@@ -546,14 +546,17 @@ SfxPrintOptionsDialog::SfxPrintOptionsDialog( Window *pParent,
     // TabPage einh"angen
     pPage = pViewSh->CreatePrintOptionsPage( this, *pOptions );
     DBG_ASSERT( pPage, "CreatePrintOptions != SFX_VIEW_HAS_PRINTOPTIONS" );
-    pPage->Reset( *pOptions );
-    SetHelpId( pPage->GetHelpId() );
-    pPage->Show();
+    if( pPage )
+    {
+        pPage->Reset( *pOptions );
+        SetHelpId( pPage->GetHelpId() );
+        pPage->Show();
+    }
 
     // Dialoggr"o\se bestimmen
     Size a6Sz = LogicToPixel( Size( 6, 6 ), MAP_APPFONT );
     Size aBtnSz = LogicToPixel( Size( 50, 14 ), MAP_APPFONT );
-    Size aOutSz( pPage->GetSizePixel() );
+    Size aOutSz( pPage ? pPage->GetSizePixel() : Size() );
     aOutSz.Height() += 6;
     long nWidth = aBtnSz.Width();
     nWidth += a6Sz.Width();
@@ -589,6 +592,9 @@ SfxPrintOptionsDialog::~SfxPrintOptionsDialog()
 
 short SfxPrintOptionsDialog::Execute()
 {
+    if( ! pPage )
+        return RET_CANCEL;
+    
     short nRet = ModalDialog::Execute();
     if ( nRet == RET_OK )
         pPage->FillItemSet( *pOptions );
diff --git a/sfx2/source/view/prnmon.cxx b/sfx2/source/view/prnmon.cxx
index b840c40a25..ac6968858d 100644
--- a/sfx2/source/view/prnmon.cxx
+++ b/sfx2/source/view/prnmon.cxx
@@ -274,10 +274,12 @@ SfxPrintProgress::SfxPrintProgress( SfxViewShell* pViewSh, FASTBOOL bShow )
                  String(SfxResId(STR_PRINTING)), 1, FALSE ),
     pImp( new SfxPrintProgress_Impl( pViewSh, pViewSh->GetPrinter() ) )
 {
+    #if 0
     pImp->pPrinter->SetEndPrintHdl( LINK( this, SfxPrintProgress, EndPrintNotify ) );
     pImp->pPrinter->SetErrorHdl( LINK( this, SfxPrintProgress, PrintErrorNotify ) );
     pImp->pPrinter->SetStartPrintHdl( LINK( this, SfxPrintProgress, StartPrintNotify ) );
     pImp->bCallbacks = TRUE;
+    #endif
 
     SfxObjectShell* pDoc = pViewSh->GetObjectShell();
     SFX_ITEMSET_ARG( pDoc->GetMedium()->GetItemSet(), pItem, SfxBoolItem, SID_HIDDEN, FALSE );
@@ -307,7 +309,7 @@ SfxPrintProgress::~SfxPrintProgress()
     // ggf. Callbacks entfermen
     if ( pImp->bCallbacks )
     {
-        pImp->pPrinter->SetEndPrintHdl( Link() );
+        // pImp->pPrinter->SetEndPrintHdl( Link() );
         pImp->pPrinter->SetErrorHdl( Link() );
         pImp->bCallbacks = FALSE;
     }
@@ -410,7 +412,7 @@ IMPL_LINK( SfxPrintProgress, EndPrintNotify, void *, EMPTYARG )
     //! if( pMDI->IsPrinterChanged() ) pMDI->Changed( 0L );
 
     // Callbacks rausnehmen
-    pImp->pPrinter->SetEndPrintHdl( Link() );
+    // pImp->pPrinter->SetEndPrintHdl( Link() );
     pImp->pPrinter->SetErrorHdl( Link() );
     pImp->bCallbacks = FALSE;
 
diff --git a/sfx2/source/view/topfrm.cxx b/sfx2/source/view/topfrm.cxx
index 5d03bb3e61..4797c02f45 100644
--- a/sfx2/source/view/topfrm.cxx
+++ b/sfx2/source/view/topfrm.cxx
@@ -370,7 +370,7 @@ void SfxTopViewWin_Impl::StateChanged( StateChangedType nStateChange )
     if ( nStateChange == STATE_CHANGE_INITSHOW )
     {
         SfxObjectShell* pDoc = pFrame->GetObjectShell();
-        if ( pDoc && !pFrame->IsVisible_Impl() )
+        if ( pDoc && !pFrame->IsVisible() )
             pFrame->Show();
 
         pFrame->Resize();
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 577c9a8b07..745a805f43 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -1331,7 +1331,7 @@ String SfxViewFrame::UpdateTitle()
 
     // Name des SbxObjects
     String aSbxName = pObjSh->SfxShell::GetName();
-    if ( IsVisible_Impl() )
+    if ( IsVisible() )
     {
         aSbxName += ':';
         aSbxName += String::CreateFromInt32(pImp->nDocViewNo);
@@ -1801,7 +1801,7 @@ sal_uInt16 SfxViewFrame::Count(TypeId aType)
     {
         SfxViewFrame *pFrame = rFrames[i];
         if ( ( !aType || pFrame->IsA(aType) ) &&
-             pFrame->IsVisible_Impl() )
+             pFrame->IsVisible() )
             ++nFound;
     }
     return nFound;
@@ -1825,7 +1825,7 @@ SfxViewFrame* SfxViewFrame::GetFirst
         SfxViewFrame *pFrame = rFrames.GetObject(nPos);
         if ( ( !pDoc || pDoc == pFrame->GetObjectShell() ) &&
              ( !aType || pFrame->IsA(aType) ) &&
-             ( !bOnlyIfVisible || pFrame->IsVisible_Impl()) )
+             ( !bOnlyIfVisible || pFrame->IsVisible()) )
             return pFrame;
     }
 
@@ -1857,7 +1857,7 @@ SfxViewFrame* SfxViewFrame::GetNext
         SfxViewFrame *pFrame = rFrames.GetObject(nPos);
         if ( ( !pDoc || pDoc == pFrame->GetObjectShell() ) &&
              ( !aType || pFrame->IsA(aType) ) &&
-             ( !bOnlyIfVisible || pFrame->IsVisible_Impl()) )
+             ( !bOnlyIfVisible || pFrame->IsVisible()) )
             return pFrame;
     }
     return 0;
@@ -1870,7 +1870,7 @@ void SfxViewFrame::CloseHiddenFrames_Impl()
     for ( sal_uInt16 nPos=0; nPos<rFrames.Count(); )
     {
         SfxViewFrame *pFrame = rFrames.GetObject(nPos);
-        if ( !pFrame->IsVisible_Impl() )
+        if ( !pFrame->IsVisible() )
             pFrame->DoClose();
         else
             nPos++;
@@ -2142,7 +2142,7 @@ void SfxViewFrame::Show()
 }
 
 //--------------------------------------------------------------------
-sal_Bool SfxViewFrame::IsVisible_Impl() const
+sal_Bool SfxViewFrame::IsVisible() const
 {
     //Window *pWin = pImp->bInCtor ? 0 : &GetWindow();
     //return GetFrame()->HasComponent() || pImp->bObjLocked || ( pWin && pWin->IsVisible() );
@@ -2172,7 +2172,7 @@ void SfxViewFrame::MakeActive_Impl( BOOL bGrabFocus )
 {
     if ( GetViewShell() && !GetFrame()->IsClosing_Impl() )
     {
-        if ( IsVisible_Impl() )
+        if ( IsVisible() )
         {
             if ( GetViewShell() )
             {
diff --git a/sfx2/source/view/viewimp.hxx b/sfx2/source/view/viewimp.hxx
index 6b0c77071c..df00d40fbf 100644
--- a/sfx2/source/view/viewimp.hxx
+++ b/sfx2/source/view/viewimp.hxx
@@ -58,6 +58,7 @@ typedef SfxShell* SfxShellPtr_Impl;
 SV_DECL_PTRARR( SfxShellArr_Impl, SfxShellPtr_Impl, 4, 4 )
 
 // struct SfxViewShell_Impl ----------------------------------------------
+#if 0
 class SfxAsyncPrintExec_Impl : public SfxListener
 {
     SfxViewShell*					pView;
@@ -72,6 +73,7 @@ public:
 
     void							AddRequest( SfxRequest& rReq );
 };
+#endif
 
 class SfxClipboardChangeListener;
 
@@ -98,7 +100,7 @@ struct SfxViewShell_Impl
     USHORT						nFamily;
     SfxBaseController*          pController;
     ::svt::AcceleratorExecute*  pAccExec;
-    SfxAsyncPrintExec_Impl*		pPrinterCommandQueue;
+//	SfxAsyncPrintExec_Impl*		pPrinterCommandQueue;
     com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue > aPrintOpts;
     ::rtl::Reference< SfxClipboardChangeListener > xClipboardListener;
 
diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index b9cb144f27..8a0a8e8ef9 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,16 +33,12 @@
 
 #include <com/sun/star/document/XDocumentProperties.hpp>
 #include <com/sun/star/view/PrintableState.hpp>
+#include "com/sun/star/view/XRenderable.hpp"
+
 #include <svl/itempool.hxx>
-#ifndef _MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
-#endif
-#ifndef _SV_PRINTDLG_HXX //autogen
 #include <svtools/printdlg.hxx>
-#endif
-#ifndef _SV_PRNSETUP_HXX //autogen
 #include <svtools/prnsetup.hxx>
-#endif
 #include <svl/flagitem.hxx>
 #include <svl/stritem.hxx>
 #include <svl/intitem.hxx>
@@ -51,9 +47,9 @@
 #include <unotools/useroptions.hxx>
 #include <unotools/printwarningoptions.hxx>
 #include <tools/datetime.hxx>
-
+#include <sfx2/bindings.hxx>
+#include <sfx2/objface.hxx>
 #include <sfx2/viewsh.hxx>
-#include <sfx2/dispatch.hxx>
 #include "viewimp.hxx"
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/prnmon.hxx>
@@ -65,50 +61,282 @@
 #include <sfx2/docfile.hxx>
 #include <sfx2/docfilt.hxx>
 
+#include "toolkit/awt/vclxdevice.hxx"
+
 #include "view.hrc"
 #include "helpid.hrc"
 
+using namespace com::sun::star;
+using namespace com::sun::star::uno;
+
 TYPEINIT1(SfxPrintingHint, SfxHint);
 
 // -----------------------------------------------------------------------
+class SfxPrinterController : public vcl::PrinterController, public SfxListener
+{
+    Any                                     maCompleteSelection;
+    Any                                     maSelection;
+    Reference< view::XRenderable >          mxRenderable;
+    mutable Printer*                        mpLastPrinter;
+    mutable Reference<awt::XDevice>         mxDevice;
+    SfxViewShell*							mpViewShell;
+    SfxObjectShell*							mpObjectShell;
+    sal_Bool		m_bOrigStatus;
+    sal_Bool		m_bNeedsChange;
+    sal_Bool		m_bApi;
+    util::DateTime	m_aLastPrinted;
+    ::rtl::OUString	m_aLastPrintedBy;
+
+    Sequence< beans::PropertyValue > getMergedOptions() const;
+    const Any& getSelectionObject() const;
+public:
+    SfxPrinterController( const Any& i_rComplete,
+                          const Any& i_rSelection,
+                          const Any& i_rViewProp,
+                          const Reference< view::XRenderable >& i_xRender,
+                          sal_Bool i_bApi, sal_Bool i_bDirect,
+                          SfxViewShell* pView,
+                          const uno::Sequence< beans::PropertyValue >& rProps
+                        );
+    
+    virtual ~SfxPrinterController();
+    virtual void Notify( SfxBroadcaster&, const SfxHint& );
+    
+    virtual int  getPageCount() const;
+    virtual Sequence< beans::PropertyValue > getPageParameters( int i_nPage ) const;
+    virtual void printPage( int i_nPage ) const;
+    virtual void jobStarted();
+    virtual void jobFinished( com::sun::star::view::PrintableState );
+};
 
-void SfxAsyncPrintExec_Impl::AddRequest( SfxRequest& rReq )
+SfxPrinterController::SfxPrinterController( const Any& i_rComplete,
+                                            const Any& i_rSelection,
+                                            const Any& i_rViewProp,
+                                            const Reference< view::XRenderable >& i_xRender,
+                                            sal_Bool i_bApi, sal_Bool i_bDirect,
+                                            SfxViewShell* pView,
+                                            const uno::Sequence< beans::PropertyValue >& rProps
+                                          )
+    : maCompleteSelection( i_rComplete )
+    , maSelection( i_rSelection )
+    , mxRenderable( i_xRender )
+    , mpLastPrinter( NULL )
+    , mpViewShell( pView )
+    , mpObjectShell(0)
+    , m_bOrigStatus( sal_False )
+    , m_bNeedsChange( sal_False )
+    , m_bApi(i_bApi)
 {
-    if ( rReq.GetArgs() )
+    if ( mpViewShell )
     {
-        // only queue API requests
-        if ( aReqs.empty() )
-            StartListening( *pView->GetObjectShell() );
+        StartListening( *mpViewShell );
+        mpObjectShell = mpViewShell->GetObjectShell();
+        StartListening( *mpObjectShell );
+        m_bOrigStatus = mpObjectShell->IsEnableSetModified();
+
+        // check configuration: shall update of printing information in DocInfo set the document to "modified"?
+        if ( m_bOrigStatus && !SvtPrintWarningOptions().IsModifyDocumentOnPrintingAllowed() )
+        {
+            mpObjectShell->EnableSetModified( sal_False );
+            m_bNeedsChange = sal_True;
+        }
+
+        // refresh document info
+        uno::Reference<document::XDocumentProperties> xDocProps(mpObjectShell->getDocProperties());
+        m_aLastPrintedBy = xDocProps->getPrintedBy();
+        m_aLastPrinted = xDocProps->getPrintDate();
+
+        xDocProps->setPrintedBy( mpObjectShell->IsUseUserData()
+            ? ::rtl::OUString( SvtUserOptions().GetFullName() )
+            : ::rtl::OUString() );
+        ::DateTime now;
 
-        aReqs.push( new SfxRequest( rReq ) );
+        xDocProps->setPrintDate( util::DateTime(
+            now.Get100Sec(), now.GetSec(), now.GetMin(), now.GetHour(),
+            now.GetDay(), now.GetMonth(), now.GetYear() ) );
     }
+    
+    // initialize extra ui options
+    if( mxRenderable.is() )
+    {
+        for (sal_Int32 nProp=0; nProp<rProps.getLength(); nProp++)
+            setValue( rProps[nProp].Name, rProps[nProp].Value );
+
+        Sequence< beans::PropertyValue > aRenderOptions( 3 );
+        aRenderOptions[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ExtraPrintUIOptions" ) );
+        aRenderOptions[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "View" ) );
+        aRenderOptions[1].Value = i_rViewProp;
+        aRenderOptions[2].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsPrinter" ) );
+        aRenderOptions[2].Value <<= sal_True;
+        Sequence< beans::PropertyValue > aRenderParms( mxRenderable->getRenderer( 0 , getSelectionObject(), aRenderOptions ) );
+        int nProps = aRenderParms.getLength();
+        for( int i = 0; i < nProps; i++ )
+        {
+            if( aRenderParms[i].Name.equalsAscii( "ExtraPrintUIOptions" ) )
+            {
+                Sequence< beans::PropertyValue > aUIProps;
+                aRenderParms[i].Value >>= aUIProps;
+                setUIOptions( aUIProps );
+                break;
+            }
+        }
+    }
+
+    // set some job parameters
+    setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsApi" ) ), makeAny( i_bApi ) );
+    setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsDirect" ) ), makeAny( i_bDirect ) );
+    setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsPrinter" ) ), makeAny( sal_True ) );
+    setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "View" ) ), i_rViewProp );
 }
 
-void SfxAsyncPrintExec_Impl::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
+void SfxPrinterController::Notify( SfxBroadcaster& , const SfxHint& rHint )
+{ 
+    if ( rHint.IsA(TYPE(SfxSimpleHint)) )
+    {
+        if ( ((SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING )
+        {
+            EndListening(*mpViewShell);
+            EndListening(*mpObjectShell);
+            mpViewShell = 0;
+            mpObjectShell = 0;
+        }
+    }
+}
+
+SfxPrinterController::~SfxPrinterController()
+{
+}
+
+const Any& SfxPrinterController::getSelectionObject() const
 {
-    if ( &rBC == pView->GetObjectShell() )
+    sal_Int32 nChoice = 0;
+    sal_Bool bSel = sal_False;
+    const beans::PropertyValue* pVal = getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintContent" ) ) );
+    if( pVal )
+        pVal->Value >>= nChoice;
+    pVal = getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintSelectionOnly" ) ) );
+    if( pVal )
+        pVal->Value >>= bSel;
+    return (nChoice > 1 || bSel) ? maSelection : maCompleteSelection;
+}
+
+Sequence< beans::PropertyValue > SfxPrinterController::getMergedOptions() const
+{
+    boost::shared_ptr<Printer> pPrinter( getPrinter() );
+    if( pPrinter.get() != mpLastPrinter )
     {
-        SfxPrintingHint* pPrintHint = PTR_CAST( SfxPrintingHint, &rHint );
-        if ( pPrintHint && pPrintHint->GetWhich() == com::sun::star::view::PrintableState_JOB_COMPLETED )
+        mpLastPrinter = pPrinter.get();
+        VCLXDevice* pXDevice = new VCLXDevice();
+        pXDevice->SetOutputDevice( mpLastPrinter );
+        mxDevice = Reference< awt::XDevice >( pXDevice );
+    }
+    
+    Sequence< beans::PropertyValue > aRenderOptions( 1 );
+    aRenderOptions[ 0 ].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "RenderDevice" ) );
+    aRenderOptions[ 0 ].Value <<= mxDevice;
+
+    aRenderOptions = getJobProperties( aRenderOptions );
+    return aRenderOptions;
+}
+
+int SfxPrinterController::getPageCount() const
+{
+    int nPages = 0;
+    boost::shared_ptr<Printer> pPrinter( getPrinter() );
+    if( mxRenderable.is() && pPrinter )
+    {
+        Sequence< beans::PropertyValue > aJobOptions( getMergedOptions() );
+        nPages = mxRenderable->getRendererCount( getSelectionObject(), aJobOptions );
+    }
+    return nPages;
+}
+
+Sequence< beans::PropertyValue > SfxPrinterController::getPageParameters( int i_nPage ) const
+{
+    boost::shared_ptr<Printer> pPrinter( getPrinter() );
+    Sequence< beans::PropertyValue > aResult;
+    
+    if( mxRenderable.is() && pPrinter )
+    {
+        Sequence< beans::PropertyValue > aJobOptions( getMergedOptions() );
+        aResult = mxRenderable->getRenderer( i_nPage, getSelectionObject(), aJobOptions );
+    }
+    return aResult;
+}
+
+void SfxPrinterController::printPage( int i_nPage ) const
+{
+    boost::shared_ptr<Printer> pPrinter( getPrinter() );
+    if( mxRenderable.is() && pPrinter )
+    {
+        Sequence< beans::PropertyValue > aJobOptions( getMergedOptions() );
+        try
+        {
+            mxRenderable->render( i_nPage, getSelectionObject(), aJobOptions );
+        }
+        catch( lang::IllegalArgumentException& )
         {
-            while ( aReqs.front() )
+            // don't care enough about nonexistant page here
+            // to provoke a crash
+        }
+    }
+}
+
+void SfxPrinterController::jobStarted()
+{
+    if ( mpObjectShell )
+    {
+        // FIXME: how to get all print options incl. AdditionalOptions easily?
+        uno::Sequence < beans::PropertyValue > aOpts;
+        mpObjectShell->Broadcast( SfxPrintingHint( view::PrintableState_JOB_STARTED, aOpts ) );
+    }
+}
+
+void SfxPrinterController::jobFinished( com::sun::star::view::PrintableState nState )
+{
+    if ( mpObjectShell )
+    {
+        mpObjectShell->Broadcast( SfxPrintingHint( nState ) );
+        switch ( nState )
+        {
+            case view::PrintableState_JOB_FAILED :
             {
-                SfxRequest* pReq = aReqs.front();
-                aReqs.pop();
-                pView->GetViewFrame()->GetDispatcher()->Execute( pReq->GetSlot(), SFX_CALLMODE_ASYNCHRON, *pReq->GetArgs() );
-                USHORT nSlot = pReq->GetSlot();
-                delete pReq;
-                if ( nSlot == SID_PRINTDOC || nSlot == SID_PRINTDOCDIRECT )
-                    // print jobs must be executed before the next command can be dispatched
-                    break;
+                // "real" problem (not simply printing cancelled by user)
+                String aMsg( SfxResId( STR_NOSTARTPRINTER ) );
+                if ( !m_bApi )
+                    ErrorBox( mpViewShell->GetWindow(), WB_OK | WB_DEF_OK,  aMsg ).Execute();
+                // intentionally no break
+            }
+            case view::PrintableState_JOB_ABORTED :
+            {
+                // printing not succesful, reset DocInfo
+                uno::Reference<document::XDocumentProperties> xDocProps(mpObjectShell->getDocProperties());
+                xDocProps->setPrintedBy(m_aLastPrintedBy);
+                xDocProps->setPrintDate(m_aLastPrinted);
+                break;
             }
 
-            if ( aReqs.empty() )
-                EndListening( *pView->GetObjectShell() );
+            case view::PrintableState_JOB_SPOOLED :
+            case view::PrintableState_JOB_COMPLETED :
+            {
+                SfxBindings& rBind = mpViewShell->GetViewFrame()->GetBindings();
+                rBind.Invalidate( SID_PRINTDOC );
+                rBind.Invalidate( SID_PRINTDOCDIRECT );
+                rBind.Invalidate( SID_SETUPPRINTER );
+                break;
+            }
+
+            default:
+                break;
         }
+
+        if ( m_bNeedsChange )
+            mpObjectShell->EnableSetModified( m_bOrigStatus );
     }
 }
 
+// -----------------------------------------------------------------------
+
 void DisableRanges( PrintDialog& rDlg, SfxPrinter* pPrinter )
 
 /*      [Beschreibung]
@@ -391,68 +619,137 @@ SfxPrinter* SfxViewShell::SetPrinter_Impl( SfxPrinter *pNewPrinter )
 #pragma optimize ( "", off )
 #endif
 
-class SfxPrintGuard_Impl
+void SfxViewShell::ExecPrint( const uno::Sequence < beans::PropertyValue >& rProps, sal_Bool bIsAPI, sal_Bool bIsDirect )
 {
-    SfxObjectShell* m_pObjectShell;
-    sal_Bool		m_bOrigStatus;
-    sal_Bool		m_bNeedsChange;
-
-public:
-    SfxPrintGuard_Impl( SfxObjectShell* pObjectShell )
-    : m_pObjectShell( pObjectShell )
-    , m_bOrigStatus( sal_False )
-    , m_bNeedsChange( sal_False )
-    {
-        if ( m_pObjectShell )
-        {
-            m_bOrigStatus = m_pObjectShell->IsEnableSetModified();
-
-            // check configuration: shall update of printing information in DocInfo set the document to "modified"?
-            if ( m_bOrigStatus && !SvtPrintWarningOptions().IsModifyDocumentOnPrintingAllowed() )
-            {
-                m_pObjectShell->EnableSetModified( sal_False );
-                m_bNeedsChange = sal_True;
-            }
-        }
-    }
-
-    ~SfxPrintGuard_Impl()
-    {
-        if ( m_pObjectShell && m_bNeedsChange )
-            m_pObjectShell->EnableSetModified( m_bOrigStatus );
-    }
-};
+    // get the current selection; our controller should know it
+    Reference< frame::XController > xController( GetController() );
+    Reference< view::XSelectionSupplier > xSupplier( xController, UNO_QUERY );
+    
+    Any aSelection;
+    if( xSupplier.is() )
+        aSelection = xSupplier->getSelection();
+    else
+        aSelection <<= GetObjectShell()->GetModel();
+    Any aComplete( makeAny( GetObjectShell()->GetModel() ) );
+    Any aViewProp( makeAny( xController ) );
+    
+    boost::shared_ptr<vcl::PrinterController> pController( new SfxPrinterController( aComplete,
+                                                                               aSelection,
+                                                                               aViewProp,
+                                                                               GetRenderable(),
+                                                                               bIsAPI,
+                                                                               bIsDirect,
+                                                                               this,
+                                                                               rProps
+                                                                               ) );
+    SfxObjectShell *pObjShell = GetObjectShell();
+    pController->setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "JobName" ) ),
+                        makeAny( rtl::OUString( pObjShell->GetTitle(0) ) ) );
+
+    // FIXME: job setup
+    SfxPrinter* pDocPrt = GetPrinter(FALSE);
+    JobSetup aJobSetup = pDocPrt ? pDocPrt->GetJobSetup() : GetJobSetup();
+    if( bIsDirect )
+        aJobSetup.SetValue( String( RTL_CONSTASCII_USTRINGPARAM( "IsQuickJob" ) ),
+                            String( RTL_CONSTASCII_USTRINGPARAM( "true" ) ) );
+
+    Printer::PrintJob( pController, aJobSetup );
+}
 
 void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq )
 {
-    USHORT                  nCopies=1;
+    // USHORT                  nCopies=1;
     USHORT                  nDialogRet = RET_CANCEL;
-    BOOL                    bCollate=TRUE;
+    // BOOL                    bCollate=FALSE;
     SfxPrinter*             pPrinter = 0;
     PrintDialog*            pPrintDlg = 0;
     SfxDialogExecutor_Impl* pExecutor = 0;
     bool                    bSilent = false;
     BOOL bIsAPI = rReq.GetArgs() && rReq.GetArgs()->Count();
-
-    if ( bIsAPI && GetPrinter( FALSE ) && GetPrinter( FALSE )->IsPrinting() )
+    if ( bIsAPI )
     {
-        pImp->pPrinterCommandQueue->AddRequest( rReq );
-        return;
+        SFX_REQUEST_ARG(rReq, pSilentItem, SfxBoolItem, SID_SILENT, FALSE);
+        bSilent = pSilentItem && pSilentItem->GetValue();
     }
 
+    //FIXME: how to transport "bPrintOnHelp"?
+
+    // no help button in dialogs if called from the help window
+    // (pressing help button would exchange the current page inside the help document that is going to be printed!)
+    String aHelpFilterName( DEFINE_CONST_UNICODE("writer_web_HTML_help") );
+    SfxMedium* pMedium = GetViewFrame()->GetObjectShell()->GetMedium();
+    const SfxFilter* pFilter = pMedium ? pMedium->GetFilter() : NULL;
+    sal_Bool bPrintOnHelp = ( pFilter && pFilter->GetFilterName() == aHelpFilterName );
+
     const USHORT nId = rReq.GetSlot();
     switch( nId )
     {
         // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
         case SID_PRINTDOC:
-        case SID_SETUPPRINTER:
-        case SID_PRINTER_NAME :
+        case SID_PRINTDOCDIRECT:
         {
-            // quiet mode (AppEvent, API call)
-            SFX_REQUEST_ARG(rReq, pSilentItem, SfxBoolItem, SID_SILENT, FALSE);
-            bSilent = pSilentItem && pSilentItem->GetValue();
+            SfxObjectShell* pDoc = GetObjectShell();
+            bool bDetectHidden = ( !bSilent && pDoc );
+            if ( bDetectHidden && pDoc->QueryHiddenInformation( WhenPrinting, NULL ) != RET_YES )
+                break;
+
+            SFX_REQUEST_ARG(rReq, pSelectItem, SfxBoolItem, SID_SELECTION, FALSE);
+            sal_Bool bSelection = pSelectItem && pSelectItem->GetValue();
+            if( pSelectItem && rReq.GetArgs()->Count() == 1 )
+                bIsAPI = FALSE;
+
+            uno::Sequence < beans::PropertyValue > aProps;
+            if ( bIsAPI )
+            {
+                // supported properties:
+                // String PrinterName 
+                // String FileName
+                // Int16 From 
+                // Int16 To 
+                // In16 Copies
+                // String RangeText
+                // bool Selection 
+                // bool Asynchron
+                // bool Collate 
+                // bool Silent
+                TransformItems( nId, *rReq.GetArgs(), aProps, GetInterface()->GetSlot(nId) );
+                for ( sal_Int32 nProp=0; nProp<aProps.getLength(); nProp++ )
+                {
+                    if ( aProps[nProp].Name.equalsAscii("Copies") )
+                        aProps[nProp]. Name = rtl::OUString::createFromAscii("CopyCount");
+                    else if ( aProps[nProp].Name.equalsAscii("RangeText") )
+                        aProps[nProp]. Name = rtl::OUString::createFromAscii("Pages");
+                    if ( aProps[nProp].Name.equalsAscii("Asynchron") )
+                    {
+                        aProps[nProp]. Name = rtl::OUString::createFromAscii("Wait");
+                        sal_Bool bAsynchron = sal_False;
+                        aProps[nProp].Value >>= bAsynchron;
+                        aProps[nProp].Value <<= (sal_Bool) (!bAsynchron);
+                    }
+                    if ( aProps[nProp].Name.equalsAscii("Silent") )
+                    {
+                        aProps[nProp]. Name = rtl::OUString::createFromAscii("MonitorVisible");
+                        sal_Bool bPrintSilent = sal_False;
+                        aProps[nProp].Value >>= bPrintSilent;
+                        aProps[nProp].Value <<= (sal_Bool) (!bPrintSilent);
+                    }
+                }
+            }
+            sal_Int32 nLen = aProps.getLength();
+            aProps.realloc( nLen + 1 );
+            aProps[nLen].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintSelectionOnly" ) );
+            aProps[nLen].Value = makeAny( bSelection );
+            
+            ExecPrint( aProps, bIsAPI, (nId == SID_PRINTDOCDIRECT) );
+
+            // FIXME: Recording
+            rReq.Done();
+            break;
+        }
 
+        case SID_SETUPPRINTER :
+        case SID_PRINTER_NAME : // only for recorded macros
+        {
             // get printer and printer settings from the document
             SfxPrinter *pDocPrinter = GetPrinter(TRUE);
 
@@ -473,7 +770,7 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq )
                 // just set a recorded printer name
                 if ( pPrinter )
                     SetPrinter( pPrinter, SFX_PRINTER_PRINTER  );
-                return;
+                break;
             }
 
             // no PrinterName parameter in ItemSet or the PrinterName points to an unknown printer
@@ -487,7 +784,7 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq )
                 if ( bSilent )
                 {
                     rReq.SetReturnValue(SfxBoolItem(0,FALSE));
-                    return;
+                    break;
                 }
                 else
                     ErrorBox( NULL, WB_OK | WB_DEF_OK, String( SfxResId( STR_NODEFPRINTER ) ) ).Execute();
@@ -497,112 +794,57 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq )
             {
                 // printer is not available, but standard printer should not be used
                 rReq.SetReturnValue(SfxBoolItem(0,FALSE));
-                return;
+                break;
             }
 
+            // FIXME: printer isn't used for printing anymore!
             if( pPrinter->IsPrinting() )
             {
                 // if printer is busy, abort printing
                 if ( !bSilent )
                     InfoBox( NULL, String( SfxResId( STR_ERROR_PRINTER_BUSY ) ) ).Execute();
                 rReq.SetReturnValue(SfxBoolItem(0,FALSE));
-                return;
+                break;
             }
 
-            // the print dialog shouldn't use a help button if it is called from the help window
-            // (pressing help button would exchange the current page inside the help document that is going to be printed!)
-            String aHelpFilterName( DEFINE_CONST_UNICODE("writer_web_HTML_help") );
-            SfxMedium* pMedium = GetViewFrame()->GetObjectShell()->GetMedium();
-            const SfxFilter* pFilter = pMedium ? pMedium->GetFilter() : NULL;
-            sal_Bool bPrintOnHelp = ( pFilter && pFilter->GetFilterName() == aHelpFilterName );
-
-            SfxObjectShell* pDoc = NULL;
-            if ( SID_PRINTDOC == nId )
-                pDoc = GetObjectShell();
-
-            // Let the document stay nonmodified during the printing if the configuration says to do so
-            SfxPrintGuard_Impl aGuard( pDoc );
-
             // if no arguments are given, retrieve them from a dialog
             if ( !bIsAPI )
             {
                 // PrinterDialog needs a temporary printer
                 SfxPrinter* pDlgPrinter = pPrinter->Clone();
                 nDialogRet = 0;
-                if ( SID_PRINTDOC == nId )
+                
+                // execute PrinterSetupDialog
+                PrinterSetupDialog* pPrintSetupDlg = new PrinterSetupDialog( GetWindow() );
+
+                if ( pImp->bHasPrintOptions )
                 {
-                    bool bDetectHidden = ( !bSilent && !bPrintOnHelp && pDoc );
-                    if ( !bDetectHidden
-                        || pDoc->QueryHiddenInformation( WhenPrinting, NULL ) == RET_YES )
-                    {
-                        // execute PrintDialog
-                        pPrintDlg = CreatePrintDialog( NULL );
-                        if ( bPrintOnHelp )
-                            pPrintDlg->DisableHelp();
-
-                        if ( pImp->bHasPrintOptions )
-                        {
-                            // additional controls for dialog
-                            pExecutor = new SfxDialogExecutor_Impl( this, pPrintDlg );
-                            if ( bPrintOnHelp )
-                                pExecutor->DisableHelp();
-                            pPrintDlg->SetOptionsHdl( pExecutor->GetLink() );
-                            pPrintDlg->ShowOptionsButton();
-                        }
-
-                        // set printer on dialog and execute
-                        pPrintDlg->SetPrinter( pDlgPrinter );
-                        ::DisableRanges( *pPrintDlg, pDlgPrinter );
-                        nDialogRet = pPrintDlg->Execute();
-                        if ( pExecutor && pExecutor->GetOptions() )
-                        {
-                            if ( nDialogRet == RET_OK )
-                                // remark: have to be recorded if possible!
-                                pDlgPrinter->SetOptions( *pExecutor->GetOptions() );
-                            else
-                            {
-                                pPrinter->SetOptions( *pExecutor->GetOptions() );
-                                SetPrinter( pPrinter, SFX_PRINTER_OPTIONS );
-                            }
-                        }
-
-                        DELETEZ( pExecutor );
-                    }
+                    // additional controls for dialog
+                    pExecutor = new SfxDialogExecutor_Impl( this, pPrintSetupDlg );
+                    if ( bPrintOnHelp )
+                        pExecutor->DisableHelp();
+                    pPrintSetupDlg->SetOptionsHdl( pExecutor->GetLink() );
                 }
-                else
-                {
-                    // execute PrinterSetupDialog
-                    PrinterSetupDialog* pPrintSetupDlg = new PrinterSetupDialog( GetWindow() );
 
-                    if ( pImp->bHasPrintOptions )
-                    {
-                        // additional controls for dialog
-                        pExecutor = new SfxDialogExecutor_Impl( this, pPrintSetupDlg );
-                        if ( bPrintOnHelp )
-                            pExecutor->DisableHelp();
-                        pPrintSetupDlg->SetOptionsHdl( pExecutor->GetLink() );
-                    }
+                pPrintSetupDlg->SetPrinter( pDlgPrinter );
+                nDialogRet = pPrintSetupDlg->Execute();
 
-                    pPrintSetupDlg->SetPrinter( pDlgPrinter );
-                    nDialogRet = pPrintSetupDlg->Execute();
-
-                    if ( pExecutor && pExecutor->GetOptions() )
+                if ( pExecutor && pExecutor->GetOptions() )
+                {
+                    if ( nDialogRet == RET_OK )
+                        // remark: have to be recorded if possible!
+                        pDlgPrinter->SetOptions( *pExecutor->GetOptions() );
+                    else
                     {
-                        if ( nDialogRet == RET_OK )
-                            // remark: have to be recorded if possible!
-                            pDlgPrinter->SetOptions( *pExecutor->GetOptions() );
-                        else
-                        {
-                            pPrinter->SetOptions( *pExecutor->GetOptions() );
-                            SetPrinter( pPrinter, SFX_PRINTER_OPTIONS );
-                        }
+                        pPrinter->SetOptions( *pExecutor->GetOptions() );
+                        SetPrinter( pPrinter, SFX_PRINTER_OPTIONS );
                     }
+                }
 
-                    DELETEZ( pPrintSetupDlg );
+                DELETEZ( pPrintSetupDlg );
 
-                    // no recording of PrinterSetup except printer name (is printer dependent)
-                    rReq.Ignore();
-                }
+                // no recording of PrinterSetup except printer name (is printer dependent)
+                rReq.Ignore();
 
                 if ( nDialogRet == RET_OK )
                 {
@@ -623,14 +865,6 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq )
                     /* Now lets reset the Dialog printer, since its freed */
                     if (pPrintDlg)
                         pPrintDlg->SetPrinter (pPrinter);
-
-                    if ( SID_PRINTDOC == nId )
-                    {
-                        nCopies  = pPrintDlg->GetCopyCount();
-                        bCollate = pPrintDlg->IsCollateChecked();
-                    }
-                    else
-                        break;
                 }
                 else
                 {
@@ -641,226 +875,11 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq )
                     rReq.Ignore();
                     if ( SID_PRINTDOC == nId )
                         rReq.SetReturnValue(SfxBoolItem(0,FALSE));
-                    break;
-                }
-
-                // recording
-                rReq.AppendItem( SfxBoolItem( SID_PRINT_COLLATE, bCollate ) );
-                rReq.AppendItem( SfxInt16Item( SID_PRINT_COPIES, (INT16) pPrintDlg->GetCopyCount() ) );
-                if ( pPrinter->IsPrintFileEnabled() )
-                    rReq.AppendItem( SfxStringItem( SID_FILE_NAME, pPrinter->GetPrintFile() ) );
-                if ( pPrintDlg->IsRangeChecked(PRINTDIALOG_SELECTION) )
-                    rReq.AppendItem( SfxBoolItem( SID_SELECTION, TRUE ) );
-                else if ( pPrintDlg->IsRangeChecked(PRINTDIALOG_RANGE) )
-                    rReq.AppendItem( SfxStringItem( SID_PRINT_PAGES, pPrintDlg->GetRangeText() ) );
-                else if ( pPrintDlg->IsRangeChecked(PRINTDIALOG_FROMTO) )
-                {
-                    // currently this doesn't seem to work -> return values of dialog are always 0
-                    // seems to be encoded as range string like "1-3"
-                    rReq.AppendItem( SfxInt16Item( SID_PRINT_FIRST_PAGE, (INT16) pPrintDlg->GetFirstPage() ) );
-                    rReq.AppendItem( SfxInt16Item( SID_PRINT_LAST_PAGE, (INT16) pPrintDlg->GetLastPage() ) );
                 }
             }
-            else if ( rReq.GetArgs() )
-            {
-                if ( SID_PRINTDOC != nId )
-                {
-                    DBG_ERROR("Wrong slotid!");
-                    break;
-                }
-
-                // PrinterDialog is used to transfer information on printing
-                pPrintDlg = CreatePrintDialog( GetWindow() );
-                if ( bPrintOnHelp )
-                    pPrintDlg->DisableHelp();
-                pPrintDlg->SetPrinter( pPrinter );
-                ::DisableRanges( *pPrintDlg, pPrinter );
-
-                // PrintToFile requested?
-                SFX_REQUEST_ARG(rReq, pFileItem, SfxStringItem, SID_FILE_NAME, FALSE);
-                if ( pFileItem )
-                {
-                    pPrinter->EnablePrintFile(TRUE);
-                    pPrinter->SetPrintFile( pFileItem->GetValue() );
-                }
-
-                // Collate
-                SFX_REQUEST_ARG(rReq, pCollateItem, SfxBoolItem, SID_PRINT_COLLATE, FALSE);
-                if ( pCollateItem )
-                {
-                    bCollate = pCollateItem->GetValue();
-                    pPrintDlg->CheckCollate( bCollate );
-                }
-
-                // Selection
-                SFX_REQUEST_ARG(rReq, pSelectItem, SfxBoolItem, SID_SELECTION, FALSE);
-
-                // Pages (as String)
-                SFX_REQUEST_ARG(rReq, pPagesItem, SfxStringItem, SID_PRINT_PAGES, FALSE);
-
-                // FirstPage
-                SFX_REQUEST_ARG(rReq, pFirstPgItem, SfxInt16Item, SID_PRINT_FIRST_PAGE, FALSE);
-                USHORT nFrom = 1;
-                if ( pFirstPgItem )
-                    nFrom = pFirstPgItem->GetValue();
-
-                // LastPage
-                SFX_REQUEST_ARG(rReq, pLastPgItem, SfxInt16Item, SID_PRINT_LAST_PAGE, FALSE);
-                USHORT nTo = 9999;
-                if ( pLastPgItem )
-                    nTo = pLastPgItem->GetValue();
-
-                // CopyCount
-                SFX_REQUEST_ARG(rReq, pCopyItem, SfxInt16Item, SID_PRINT_COPIES, FALSE);
-                if ( pCopyItem )
-                {
-                    nCopies = pCopyItem->GetValue();
-                    pPrintDlg->SetCopyCount( nCopies );
-                }
-
-                // does the view support ranges?
-                if ( pSelectItem && pSelectItem->GetValue() )
-                {
-                    // print selection only
-                    pPrintDlg->CheckRange(PRINTDIALOG_SELECTION);
-                }
-                else if ( pPagesItem )
-                {
-                    // get range text from parameter
-                    // enable ranges
-                    pPrintDlg->CheckRange(PRINTDIALOG_RANGE);
-                    pPrintDlg->SetRangeText( pPagesItem->GetValue() );
-                }
-                else if ( pPrintDlg->IsRangeEnabled(PRINTDIALOG_RANGE) )
-                {
-                    // enable ranges
-                    // construct range text from page range
-                    pPrintDlg->CheckRange(PRINTDIALOG_RANGE);
-                    String aRange = String::CreateFromInt32( nFrom );
-                    aRange += '-';
-                    aRange += String::CreateFromInt32( nTo );
-                    pPrintDlg->SetRangeText( aRange );
-                }
-                else
-                {
-                    // print page rage
-                    pPrintDlg->CheckRange(PRINTDIALOG_FROMTO);
-                    pPrintDlg->SetFirstPage( nFrom );
-                    pPrintDlg->SetLastPage( nTo );
-                }
-            }
-
-            // intentionally no break for SID_PRINTDOC
-            // printing now proceeds like SID_PRINTDOCDIRECT
-        }
-
-        // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-        case SID_PRINTDOCDIRECT:
-        {
-            if ( SID_PRINTDOCDIRECT == nId )
-            {
-                SfxObjectShell* pDoc = GetObjectShell();
-                bool bDetectHidden = ( !bSilent && pDoc );
-                if ( bDetectHidden && pDoc->QueryHiddenInformation( WhenPrinting, NULL ) != RET_YES )
-                    return;
-
-                // if no printer was selected before
-                if ( !pPrinter )
-                    pPrinter = GetPrinter(TRUE);
-
-                if( !pPrinter->IsValid() )
-                {
-                    // redirect slot to call the print dialog if the document's printer is not valid!
-                    rReq.SetSlot( SID_PRINTDOC );
-                    ExecPrint_Impl( rReq );
-                    return;
-                }
-
-                if( pPrinter->IsOriginal() && pPrinter->GetName() != Printer::GetDefaultPrinterName() )
-                {
-                    // redirect slot to call the print dialog
-                    // if the document's printer is available but not system default
-                    rReq.SetSlot( SID_PRINTDOC );
-                    ExecPrint_Impl( rReq );
-                    return;
-                }
-
-                pPrinter->SetNextJobIsQuick();
-            }
-
-            // if "Collate" was checked, the SfxPrinter must handle the CopyCount itself,
-            // usually this is handled by the printer driver
-            if( bCollate )
-                // set printer to default, handle multiple copies explicitly
-                pPrinter->SetCopyCount( 1 );
-            else
-                pPrinter->SetCopyCount( nCopies );
-
-            // enable background printing
-            pPrinter->SetPageQueueSize( 1 );
-
-            // refresh document info
-            using namespace ::com::sun::star;
-            SfxObjectShell *pObjSh = GetObjectShell();
-            uno::Reference<document::XDocumentProperties> xDocProps(
-                pObjSh->getDocProperties());
-            ::rtl::OUString aLastPrintedBy = xDocProps->getPrintedBy();
-            util::DateTime aLastPrinted = xDocProps->getPrintDate();
-
-            // Let the document stay nonmodified during the printing if the configuration says to do so
-            SfxPrintGuard_Impl aGuard( pObjSh );
-
-            xDocProps->setPrintedBy( GetObjectShell()->IsUseUserData()
-                ? ::rtl::OUString( SvtUserOptions().GetFullName() )
-                : ::rtl::OUString() );
-            ::DateTime now;
-            xDocProps->setPrintDate( util::DateTime(
-                now.Get100Sec(), now.GetSec(), now.GetMin(), now.GetHour(),
-                now.GetDay(), now.GetMonth(), now.GetYear() ) );
-
-            GetObjectShell()->Broadcast( SfxPrintingHint( -1, pPrintDlg, pPrinter ) );
-            ErrCode nError = DoPrint( pPrinter, pPrintDlg, bSilent, bIsAPI );
-            if ( nError == PRINTER_OK )
-            {
-                Invalidate( SID_PRINTDOC );
-                Invalidate( SID_PRINTDOCDIRECT );
-                Invalidate( SID_SETUPPRINTER );
-                rReq.SetReturnValue(SfxBoolItem(0,TRUE));
-
-                SFX_REQUEST_ARG(rReq, pAsyncItem, SfxBoolItem, SID_ASYNCHRON, FALSE);
-                if ( pAsyncItem && !pAsyncItem->GetValue() )
-                {
-                    // synchronous execution wanted - wait for end of printing
-                    while ( pPrinter->IsPrinting())
-                        Application::Yield();
-                }
-
-                rReq.Done();
-            }
-            else
-            {
-                // printing not succesful, reset DocInfo
-                xDocProps->setPrintedBy(aLastPrintedBy);
-                xDocProps->setPrintDate(aLastPrinted);
-
-                if ( nError != PRINTER_ABORT )
-                {
-                    // "real" problem (not simply printing cancelled by user)
-                    String aMsg( SfxResId( STR_NOSTARTPRINTER ) );
-                    if ( !bIsAPI )
-                        ErrorBox( NULL, WB_OK | WB_DEF_OK,  aMsg ).Execute();
-                    rReq.SetReturnValue(SfxBoolItem(0,FALSE));
-                }
-
-                rReq.Ignore();
-            }
-
-            pPrinter->SetNextJobIsQuick( false );
-
-            delete pPrintDlg;
-            break;
         }
+       
+        break;       
     }
 }
 
@@ -871,7 +890,7 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq )
 
 //--------------------------------------------------------------------
 
-PrintDialog* SfxViewShell::CreatePrintDialog( Window* pParent )
+PrintDialog* SfxViewShell::CreatePrintDialog( Window* /*pParent*/ )
 
 /*  [Beschreibung]
 
@@ -881,11 +900,15 @@ PrintDialog* SfxViewShell::CreatePrintDialog( Window* pParent )
 */
 
 {
+    #if 0
     PrintDialog *pDlg = new PrintDialog( pParent, false );
     pDlg->SetFirstPage( 1 );
     pDlg->SetLastPage( 9999 );
     pDlg->EnableCollate();
     return pDlg;
+    #else
+    return NULL;
+    #endif
 }
 
 //--------------------------------------------------------------------
@@ -897,10 +920,11 @@ void SfxViewShell::PreparePrint( PrintDialog * )
 //--------------------------------------------------------------------
 
 
-ErrCode SfxViewShell::DoPrint( SfxPrinter *pPrinter,
-                               PrintDialog *pPrintDlg,
-                               BOOL bSilent, BOOL bIsAPI )
+ErrCode SfxViewShell::DoPrint( SfxPrinter* /*pPrinter*/,
+                               PrintDialog* /*pPrintDlg*/,
+                               BOOL /*bSilent*/, BOOL /*bIsAPI*/ )
 {
+    #if 0
     // Printer-Dialogbox waehrend des Ausdrucks mu\s schon vor
     // StartJob erzeugt werden, da SV bei einem Quit-Event h"angt
     SfxPrintProgress *pProgress = new SfxPrintProgress( this, !bSilent );
@@ -910,11 +934,8 @@ ErrCode SfxViewShell::DoPrint( SfxPrinter *pPrinter,
     else if ( pDocPrinter != pPrinter )
     {
         pProgress->RestoreOnEndPrint( pDocPrinter->Clone() );
-        USHORT nError = SetPrinter( pPrinter, SFX_PRINTER_PRINTER );
-        if ( nError != SFX_PRINTERROR_NONE )
-            return PRINTER_ACCESSDENIED;
+        SetPrinter( pPrinter, SFX_PRINTER_PRINTER );
     }
-
     pProgress->SetWaitMode(FALSE);
 
     // Drucker starten
@@ -935,6 +956,10 @@ ErrCode SfxViewShell::DoPrint( SfxPrinter *pPrinter,
     }
 
     return pPrinter->GetError();
+    #else
+    DBG_ERROR( "DoPrint called, dead code !" );
+    return ERRCODE_IO_NOTSUPPORTED;
+    #endif
 }
 
 //--------------------------------------------------------------------
@@ -990,23 +1015,12 @@ SfxTabPage* SfxViewShell::CreatePrintOptionsPage
     Window*             /*pParent*/,
     const SfxItemSet&   /*rOptions*/
 )
-
-/*  [Beschreibung]
-
-    Diese Factory-Methode wird vom SFx verwendet, um die TabPage mit den
-    Print-Optionen, welche "uber das <SfxItemSet> am <SfxPrinter>
-    transportiert werden, zu erzeugen.
-
-    Abgeleitete Klassen k"onnen diese Methode also "uberladen um die zu
-    ihren SfxPrinter passenden Einstellungen vorzunehmen. Dieses sollte
-    genau die <SfxTabPage> sein, die auch unter Extras/Einstellungen
-    verwendet wird.
-
-    Die Basisimplementierung liefert einen 0-Pointer.
-*/
-
 {
     return 0;
 }
 
+JobSetup SfxViewShell::GetJobSetup() const
+{
+    return JobSetup();
+}
 
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index 6d92dffdc5..63667fba70 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -1261,7 +1261,7 @@ SfxViewShell::SfxViewShell
 {
     DBG_CTOR(SfxViewShell, 0);
 
-    pImp->pPrinterCommandQueue = new SfxAsyncPrintExec_Impl( this );
+    //pImp->pPrinterCommandQueue = new SfxAsyncPrintExec_Impl( this );
     pImp->pController = 0;
     pImp->bIsShowView =
         !(SFX_VIEW_NO_SHOW == (nFlags & SFX_VIEW_NO_SHOW));
@@ -1322,7 +1322,7 @@ SfxViewShell::~SfxViewShell()
         DELETEZ( pImp->pAccExec );
     }
 
-    DELETEZ( pImp->pPrinterCommandQueue );
+    //DELETEZ( pImp->pPrinterCommandQueue );
     DELETEZ( pImp );
     DELETEZ( pIPClientList );
 }
@@ -1578,7 +1578,7 @@ SfxViewShell* SfxViewShell::GetFirst
                 if ( pFrame == pShell->GetViewFrame() )
                 {
                     // only ViewShells with a valid ViewFrame will be returned
-                    if ( ( !bOnlyVisible || pFrame->IsVisible_Impl() ) && ( !pType || pShell->IsA(*pType) ) )
+                    if ( ( !bOnlyVisible || pFrame->IsVisible() ) && ( !pType || pShell->IsA(*pType) ) )
                         return pShell;
                     break;
                 }
@@ -1620,7 +1620,7 @@ SfxViewShell* SfxViewShell::GetNext
                 if ( pFrame == pShell->GetViewFrame() )
                 {
                     // only ViewShells with a valid ViewFrame will be returned
-                    if ( ( !bOnlyVisible || pFrame->IsVisible_Impl() ) && ( !pType || pShell->IsA(*pType) ) )
+                    if ( ( !bOnlyVisible || pFrame->IsVisible() ) && ( !pType || pShell->IsA(*pType) ) )
                         return pShell;
                     break;
                 }
@@ -2211,7 +2211,7 @@ BOOL SfxViewShell::HasMouseClickListeners_Impl()
 void SfxViewShell::SetAdditionalPrintOptions( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& rOpts )
 {
     pImp->aPrintOpts = rOpts;
-     GetObjectShell()->Broadcast( SfxPrintingHint( -3, NULL, NULL, rOpts ) );
+// 	GetObjectShell()->Broadcast( SfxPrintingHint( -3, NULL, NULL, rOpts ) );
 }
 
 BOOL SfxViewShell::Escape()
@@ -2219,6 +2219,19 @@ BOOL SfxViewShell::Escape()
     return GetViewFrame()->GetBindings().Execute( SID_TERMINATE_INPLACEACTIVATION );
 }
 
+Reference< view::XRenderable > SfxViewShell::GetRenderable()
+{
+    Reference< view::XRenderable >xRender;
+    SfxObjectShell* pObj = GetObjectShell();
+    if( pObj )
+    {
+        Reference< frame::XModel > xModel( pObj->GetModel() );
+        if( xModel.is() )
+        xRender = Reference< view::XRenderable >( xModel, UNO_QUERY );
+    }
+    return xRender;
+}
+
 void SfxViewShell::AddRemoveClipboardListener( const uno::Reference < datatransfer::clipboard::XClipboardListener >& rClp, BOOL bAdd )
 {
     try
diff --git a/svx/inc/fmhelp.hrc b/svx/inc/fmhelp.hrc
index 77029029c2..6c07ffd5da 100644
--- a/svx/inc/fmhelp.hrc
+++ b/svx/inc/fmhelp.hrc
@@ -33,6 +33,10 @@
 // include	   -----------------------------------------------------------
 #include <svl/solar.hrc>
 
+// in solar.hrc
+//#define HID_FORMS_START		 		(HID_LIB_START+4000)
+//#define HID_FORMS_END					(HID_LIB_START+4999)
+
 // Help-Ids --------------------------------------------------------------
 #define HID_DLG_DBMSG                           ( HID_FORMS_START +   1)
 #define HID_FORM_NAVIGATOR                      ( HID_FORMS_START +   2)
diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx
index 4c05d19222..fe96105025 100644
--- a/svx/inc/pch/precompiled_svx.hxx
+++ b/svx/inc/pch/precompiled_svx.hxx
@@ -57,7 +57,7 @@
 #include "basic/sbxvar.hxx"
 #include "boost/scoped_ptr.hpp"
 #include "boost/shared_ptr.hpp"
-#include "boost/spirit/core.hpp"
+#include "boost/spirit/include/classic_core.hpp"
 #include "bootstrp/sstring.hxx"
 #include "com/sun/star/accessibility/AccessibleEventId.hpp"
 #include "com/sun/star/accessibility/AccessibleEventObject.hpp"
@@ -263,7 +263,7 @@
 #include "com/sun/star/form/XDatabaseParameterListener.hpp"
 #include "com/sun/star/form/XForm.hpp"
 #include "com/sun/star/form/XFormComponent.hpp"
-#include "com/sun/star/form/XFormController.hpp"
+#include "com/sun/star/form/runtime/XFormController.hpp"
 #include "com/sun/star/form/XFormControllerListener.hpp"
 #include "com/sun/star/form/XFormsSupplier.hpp"
 #include "com/sun/star/form/XFormsSupplier2.hpp"
diff --git a/svx/inc/svx/fmdpage.hxx b/svx/inc/svx/fmdpage.hxx
index eab9b42ce9..64a2b70034 100644
--- a/svx/inc/svx/fmdpage.hxx
+++ b/svx/inc/svx/fmdpage.hxx
@@ -31,11 +31,6 @@
 #define _SVX_FMDPAGE_HXX
 
 #include <com/sun/star/form/XFormsSupplier2.hpp>
-#include <com/sun/star/form/XForm.hpp>
-#include <com/sun/star/form/XImageProducerSupplier.hpp>
-#include <com/sun/star/form/XFormController.hpp>
-#include <com/sun/star/form/XFormComponent.hpp>
-#include <com/sun/star/form/XFormControllerListener.hpp>
 #include <svx/unopage.hxx>
 #include <comphelper/uno3.hxx>
 #include "svx/svxdllapi.h"
diff --git a/svx/inc/svx/fmgridcl.hxx b/svx/inc/svx/fmgridcl.hxx
index 08dd55eb57..54ed0bd5f5 100644
--- a/svx/inc/svx/fmgridcl.hxx
+++ b/svx/inc/svx/fmgridcl.hxx
@@ -31,13 +31,8 @@
 #define _SVX_FMGRIDCL_HXX
 
 #include <com/sun/star/container/XIndexContainer.hpp>
-
-#ifndef _COM_SUN_STAR_FORM_XINDEXCONTAINER_HPP_
-#include <com/sun/star/container/XIndexContainer.hpp>
-#endif
 #include <com/sun/star/container/XNameContainer.hpp>
 
-// alles nur fuer stl
 #include <svx/gridctrl.hxx>
 #include <svtools/transfer.hxx>
 #include "svx/svxdllapi.h"
diff --git a/svx/inc/svx/fmshell.hxx b/svx/inc/svx/fmshell.hxx
index fdcbdd58b6..4caea7cd4c 100644
--- a/svx/inc/svx/fmshell.hxx
+++ b/svx/inc/svx/fmshell.hxx
@@ -58,7 +58,9 @@ class SdrUnoObj;
 
 namespace com { namespace sun { namespace star { namespace form {
     class XForm;
-    class XFormController;
+    namespace runtime {
+        class XFormController;
+    }
 } } } }
 
 //========================================================================
@@ -147,7 +149,7 @@ public:
         const OutputDevice& _rDevice,
         ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _out_rxControl
     ) const;
-    ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormController > GetFormController(
+    ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > GetFormController(
         const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& _rxForm,
         const SdrView& _rView,
         const OutputDevice& _rDevice
diff --git a/svx/inc/svx/fmtools.hxx b/svx/inc/svx/fmtools.hxx
index 3f839d70bf..b5d6f09093 100644
--- a/svx/inc/svx/fmtools.hxx
+++ b/svx/inc/svx/fmtools.hxx
@@ -6,9 +6,6 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmtools.hxx,v $
- * $Revision: 1.27 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -30,6 +27,8 @@
 #ifndef _SVX_FMTOOLS_HXX
 #define _SVX_FMTOOLS_HXX
 
+#include "svx/svxdllapi.h"
+
 #include <com/sun/star/sdb/SQLContext.hpp>
 #include <com/sun/star/sdb/XSQLQueryComposerFactory.hpp>
 #include <com/sun/star/sdbcx/Privilege.hpp>
@@ -48,7 +47,6 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/frame/XDispatchProviderInterception.hpp>
 #include <com/sun/star/frame/XDispatchProviderInterceptor.hpp>
-#include <com/sun/star/frame/XInterceptorInfo.hpp>
 #include <com/sun/star/container/XIndexContainer.hpp>
 #include <com/sun/star/frame/XDispatch.hpp>
 #include <com/sun/star/frame/XStatusListener.hpp>
@@ -66,38 +64,18 @@
 #include <com/sun/star/awt/FontStrikeout.hpp>
 #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <vcl/wintypes.hxx>
-#include <vos/mutex.hxx>
-
-#ifndef _SVSTDARR_ULONGS
-#define _SVSTDARR_ULONGS
-#include <svl/svstdarr.hxx>
-#endif
-#include <sfx2/ctrlitem.hxx>
-#include <tools/link.hxx>
-#include <tools/date.hxx>
-#include <tools/time.hxx>
-#include <tools/datetime.hxx>
-
-//#include "fmprop.hrc"
 #include <com/sun/star/sdbc/XConnection.hpp>
 #include <com/sun/star/io/XObjectInputStream.hpp>
 #include <com/sun/star/io/XObjectOutputStream.hpp>
 #include <com/sun/star/io/XPersistObject.hpp>
 #include <com/sun/star/util/XNumberFormatter.hpp>
 #include <com/sun/star/util/XNumberFormats.hpp>
-#include <cppuhelper/interfacecontainer.h>
-#include <cppuhelper/compbase2.hxx>
-#include <cppuhelper/compbase3.hxx>
+
+#include <vcl/wintypes.hxx>
 #include <cppuhelper/weakref.hxx>
 #include <comphelper/uno3.hxx>
 #include <comphelper/stl_types.hxx>
 #include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/implbase3.hxx>
-#include <cppuhelper/component.hxx>
-
-#include <svx/svxdllapi.h>
 
 #include <set>
 
@@ -114,24 +92,7 @@ SVX_DLLPUBLIC void displayException(const ::com::sun::star::sdb::SQLContext&, Wi
 void displayException(const ::com::sun::star::sdb::SQLErrorEvent&, Window* _pParent = NULL);
 void displayException(const ::com::sun::star::uno::Any&, Window* _pParent = NULL);
 
-#define DATA_MODE   rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DataMode" ) )
-#define FILTER_MODE rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterMode" ) )
-
-// Kopieren von Persistenten Objecten
-::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> cloneUsingProperties(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XPersistObject>& _xObj);
-
-sal_Int32 findPos(const ::rtl::OUString& aStr, const ::com::sun::star::uno::Sequence< ::rtl::OUString>& rList);
-
-// Suchen in einer Indexliste nach einem Element
-sal_Bool  searchElement(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& xCont, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& xElement);
-
 sal_Int32 getElementPos(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& xCont, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& xElement);
-String getFormComponentAccessPath(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _xElement);
-String getFormComponentAccessPath(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _xElement, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _rTopLevelElement);
-::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> getElementFromAccessPath(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xParent, const String& _rRelativePath);
-
-
-::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel> getXModel(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& xIface);
 
 SVX_DLLPUBLIC ::rtl::OUString getLabelName(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& xControlModel);
 
@@ -236,10 +197,8 @@ protected:
     void setAdapter(FmXDisposeMultiplexer* pAdapter);
 };
 
-typedef ::cppu::WeakImplHelper1< ::com::sun::star::lang::XEventListener> FmXDisposeMultiplexer_x;
 //==============================================================================
 
-
 class FmXDisposeMultiplexer :public ::cppu::WeakImplHelper1< ::com::sun::star::lang::XEventListener>
 {
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent>		m_xObject;
@@ -258,119 +217,10 @@ public:
 
 //	==================================================================
 
-//========================================================================
-//= dispatch interception helper classes
-//========================================================================
-
-//------------------------------------------------------------------------
-//- FmDispatchInterceptor
-//------------------------------------------------------------------------
-class FmDispatchInterceptor
-{
-public:
-    FmDispatchInterceptor() { }
-
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch> interceptedQueryDispatch(sal_uInt16 _nId,
-        const ::com::sun::star::util::URL& aURL, const ::rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( ::com::sun::star::uno::RuntimeException ) = 0;
-
-    virtual ::osl::Mutex* getInterceptorMutex() = 0;
-};
-
-//------------------------------------------------------------------------
-//- FmXDispatchInterceptorImpl
-//------------------------------------------------------------------------
-typedef ::cppu::WeakComponentImplHelper3<	::com::sun::star::frame::XDispatchProviderInterceptor
-                                        ,	::com::sun::star::lang::XEventListener
-                                        ,	::com::sun::star::frame::XInterceptorInfo
-                                        >	FmXDispatchInterceptorImpl_BASE;
-
-class FmXDispatchInterceptorImpl : public FmXDispatchInterceptorImpl_BASE
-{
-    ::osl::Mutex					m_aFallback;
-
-    // the component which's dispatches we're intercepting
-    ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XDispatchProviderInterception>
-                    m_xIntercepted;
-    sal_Bool		m_bListening;
-
-    // the real interceptor
-    FmDispatchInterceptor*			m_pMaster;
-
-    // chaining
-    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider>			m_xSlaveDispatcher;
-    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider>			m_xMasterDispatcher;
-
-    // our id
-    sal_Int16						m_nId;
-
-    ::com::sun::star::uno::Sequence< ::rtl::OUString >
-                                    m_aInterceptedURLSchemes;
-
-    virtual ~FmXDispatchInterceptorImpl();
-
-public:
-    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterception> getIntercepted() const { return m_xIntercepted; }
-
-public:
-    FmXDispatchInterceptorImpl(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterception>& _rToIntercept,
-        FmDispatchInterceptor* _pMaster,
-        sal_Int16 _nId,
-        ::com::sun::star::uno::Sequence< ::rtl::OUString > _rInterceptedSchemes /// if not empty, this will be used for getInterceptedURLs
-    );
-
-    // StarOne
-    DECLARE_UNO3_DEFAULTS(FmXDispatchInterceptorImpl, FmXDispatchInterceptorImpl_BASE);
-    //	virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& type) throw ( ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
-    //	::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes(  ) throw(::com::sun::star::uno::RuntimeException);
-
-
-    // ::com::sun::star::frame::XDispatchProvider
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& aURL, const ::rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw(::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches( const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor >& aDescripts ) throw(::com::sun::star::uno::RuntimeException);
-
-    // ::com::sun::star::frame::XDispatchProviderInterceptor
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL getSlaveDispatchProvider(  ) throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setSlaveDispatchProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xNewDispatchProvider ) throw(::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL getMasterDispatchProvider(	) throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setMasterDispatchProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xNewSupplier ) throw(::com::sun::star::uno::RuntimeException);
-
-    // ::com::sun::star::frame::XInterceptorInfo
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getInterceptedURLs(  ) throw(::com::sun::star::uno::RuntimeException);
-
-    // ::com::sun::star::lang::XEventListener
-    virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException);
-
-    // OComponentHelper
-    virtual void SAL_CALL disposing();
-
-protected:
-    void ImplDetach();
-
-    ::osl::Mutex&		getAccessSafety()
-    {
-        if (m_pMaster && m_pMaster->getInterceptorMutex())
-            return *m_pMaster->getInterceptorMutex();
-        return m_aFallback;
-    }
-};
-
-//==================================================================
-// ...
-//==================================================================
-::rtl::OUString 	getServiceNameByControlType(sal_Int16 nType);
-    // get a service name to create a model of the given type (OBJ_FM_...)
 sal_Int16		getControlTypeByObject(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XServiceInfo>& _rxObject);
     // get the object type (OBJ_FM_...) from the services the object supports
 
-void TransferEventScripts(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel>& xModel, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& xControl,
-    const ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor>& rTransferIfAvailable);
-
-sal_Int16	GridView2ModelPos(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& rColumns, sal_Int16 nViewPos);
-
 //==================================================================
-sal_Bool isLoadable(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& xLoad);
 sal_Bool isRowSetAlive(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _rxRowSet);
     // checks if the ::com::sun::star::sdbcx::XColumnsSupplier provided by _rxRowSet supllies any columns
 
diff --git a/svx/inc/svx/fmview.hxx b/svx/inc/svx/fmview.hxx
index c580abae5a..94aa09686e 100644
--- a/svx/inc/svx/fmview.hxx
+++ b/svx/inc/svx/fmview.hxx
@@ -54,7 +54,9 @@ namespace svx {
 class SdrUnoObj;
 namespace com { namespace sun { namespace star { namespace form {
     class XForm;
-    class XFormController;
+    namespace runtime {
+        class XFormController;
+    }
 } } } }
 
 class SVX_DLLPUBLIC FmFormView : public E3dView
@@ -125,7 +127,7 @@ public:
 
     /** returns the form controller for a given form and a given device
     */
-    SVX_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormController >
+    SVX_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController >
             GetFormController( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& _rxForm, const OutputDevice& _rDevice ) const;
 
     // SdrView
diff --git a/svx/inc/svx/gridctrl.hxx b/svx/inc/svx/gridctrl.hxx
index 7d398e390e..0519050011 100644
--- a/svx/inc/svx/gridctrl.hxx
+++ b/svx/inc/svx/gridctrl.hxx
@@ -584,9 +584,10 @@ protected:
     sal_Int32 GetSeekPos() const {return m_nSeekPos;}
     sal_Int32 GetTotalCount() const {return m_nTotalCount;}
 
-    const DbGridRowRef& GetEmptyRow() const {return m_xEmptyRow;}
-    const DbGridRowRef& GetSeekRow() const {return m_xSeekRow;}
-    CursorWrapper* GetSeekCursor() const {return m_pSeekCursor;}
+    const DbGridRowRef& GetEmptyRow() const { return m_xEmptyRow;   }
+    const DbGridRowRef& GetSeekRow() const  { return m_xSeekRow;    }
+    const DbGridRowRef& GetPaintRow() const { return m_xPaintRow;   }
+    CursorWrapper* GetSeekCursor() const    { return m_pSeekCursor; }
 
     void ConnectToFields();
     void DisconnectFromFields();
diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx
index 3216c857da..711800fc25 100644
--- a/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx
+++ b/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx
@@ -99,6 +99,11 @@ namespace sdr { namespace contact {
         */
         virtual void ActionChanged();
 
+        /** to be called when any aspect of the control which requires view updates changed
+        */
+        struct ImplAccess { friend class ViewObjectContactOfUnoControl_Impl; friend class ViewObjectContactOfUnoControl; private: ImplAccess() { } };
+        void onControlChangedOrModified( ImplAccess ) { impl_onControlChangedOrModified(); }
+
     protected:
         ~ViewObjectContactOfUnoControl();
 
@@ -107,6 +112,8 @@ namespace sdr { namespace contact {
 
         // visibility check
         virtual bool isPrimitiveVisible( const DisplayInfo& _rDisplayInfo ) const;
+        /// to be called when any aspect of the control which requires view updates changed
+        void impl_onControlChangedOrModified();
 
     private:
         ViewObjectContactOfUnoControl();                                                    // never implemented
diff --git a/svx/inc/svx/svdograf.hxx b/svx/inc/svx/svdograf.hxx
index 8a81917dfe..0d74a071a0 100644
--- a/svx/inc/svx/svdograf.hxx
+++ b/svx/inc/svx/svdograf.hxx
@@ -144,6 +144,7 @@ public:
     void					SetGraphicObject( const GraphicObject& rGrfObj );
     const GraphicObject&	GetGraphicObject( bool bForceSwapIn = false) const;
 
+    void					NbcSetGraphic(const Graphic& rGrf);
     void					SetGraphic(const Graphic& rGrf);
     const Graphic&			GetGraphic() const;
 
diff --git a/svx/inc/svx/svdpntv.hxx b/svx/inc/svx/svdpntv.hxx
index 4620a13264..8d95725cf0 100644..100755
--- a/svx/inc/svx/svdpntv.hxx
+++ b/svx/inc/svx/svdpntv.hxx
@@ -215,10 +215,11 @@ protected:
     // is this a preview renderer?
     unsigned					mbPreviewRenderer : 1;
 
-    // flags for calc for suppressing OLE, CHART or DRAW objects
+    // flags for calc and sw for suppressing OLE, CHART or DRAW objects
     unsigned                    mbHideOle : 1;
     unsigned                    mbHideChart : 1;
-    unsigned                    mbHideDraw : 1;
+    unsigned                    mbHideDraw : 1;             // hide draw objects other than form controls
+    unsigned                    mbHideFormControl : 1;      // hide form controls only
 
 public:
     // #114898#
@@ -433,13 +434,15 @@ public:
     sal_Bool IsPreviewRenderer() const { return (sal_Bool )mbPreviewRenderer; }
     void SetPreviewRenderer(bool bOn) { if((unsigned)bOn != mbPreviewRenderer) { mbPreviewRenderer=bOn; }}
 
-    // access methods for calc hide object modes
+    // access methods for calc and sw hide object modes
     bool getHideOle() const { return mbHideOle; }
     bool getHideChart() const { return mbHideChart; }
     bool getHideDraw() const { return mbHideDraw; }
+    bool getHideFormControl() const { return mbHideFormControl; }
     void setHideOle(bool bNew) { if(bNew != (bool)mbHideOle) mbHideOle = bNew; }
     void setHideChart(bool bNew) { if(bNew != (bool)mbHideChart) mbHideChart = bNew; }
     void setHideDraw(bool bNew) { if(bNew != (bool)mbHideDraw) mbHideDraw = bNew; }
+    void setHideFormControl(bool bNew) { if(bNew != (bool)mbHideFormControl) mbHideFormControl = bNew; }
 
     void SetGridCoarse(const Size& rSiz) { aGridBig=rSiz; }
     void SetGridFine(const Size& rSiz) { aGridFin=rSiz; if (aGridFin.Height()==0) aGridFin.Height()=aGridFin.Width(); if (bGridVisible) InvalidateAllWin(); } // #40479#
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index 8e016995a0..513094dbf7 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -33,7 +33,7 @@
 
 // include ---------------------------------------------------------------
 #include <sfx2/viewsh.hxx>		// SfxViewShell
-#include <sfx2/printer.hxx>		// SfxPrinter
+#include <sfx2/printer.hxx>		// Printer
 #include <vcl/metric.hxx>
 #include <vcl/svapp.hxx>
 #include <unicode/uchar.h>
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index fc05f258ab..2d21734dfe 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -35,6 +35,7 @@
 #include "fmgridif.hxx"
 #include "fmitems.hxx"
 #include "fmprop.hrc"
+#include "svx/fmtools.hxx"
 #include "fmresids.hrc"
 #include "fmservs.hxx"
 #include "fmurl.hxx"
@@ -435,6 +436,7 @@ IMPL_LINK( FmGridHeader, OnAsyncExecuteDrop, void*, /*NOTINTERESTEDIN*/ )
         // diese Datentypen koennen im Gridcontrol nicht verarbeitet werden
         switch (nDataType)
         {
+            case DataType::BLOB:
             case DataType::LONGVARBINARY:
             case DataType::BINARY:
             case DataType::VARBINARY:
@@ -1724,6 +1726,7 @@ void FmGridControl::InitColumnByField(
         sal_Bool bIllegalType = sal_False;
         switch ( nDataType )
         {
+            case DataType::BLOB:
             case DataType::LONGVARBINARY:
             case DataType::BINARY:
             case DataType::VARBINARY:
@@ -1768,14 +1771,18 @@ void FmGridControl::InitColumnsByFields(const Reference< ::com::sun::star::conta
     Reference< XIndexContainer > xColumns( GetPeer()->getColumns() );
     Reference< XNameAccess > xFieldsAsNames( _rxFields, UNO_QUERY );
 
-    // Einfuegen mu� sich an den Column Positionen orientieren
+    // Einfuegen muss sich an den Column Positionen orientieren
     for (sal_Int32 i = 0; i < xColumns->getCount(); i++)
     {
         DbGridColumn* pCol = GetColumns().GetObject(i);
-        Reference< XPropertySet > xColumnModel;
-        ::cppu::extractInterface( xColumnModel, xColumns->getByIndex( i ) );
+        OSL_ENSURE(pCol,"No grid column!");
+        if ( pCol )
+        {
+            Reference< XPropertySet > xColumnModel;
+            ::cppu::extractInterface( xColumnModel, xColumns->getByIndex( i ) );
 
-        InitColumnByField( pCol, xColumnModel, xFieldsAsNames, _rxFields );
+            InitColumnByField( pCol, xColumnModel, xFieldsAsNames, _rxFields );
+        }
     }
 }
 
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index 713ec5d5d5..57930323c4 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -42,6 +42,7 @@
 #include "svx/fmgridcl.hxx"
 #include "svx/svxids.hrc"
 
+/** === begin UNO includes === **/
 #include <com/sun/star/awt/PosSize.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/form/FormComponentType.hpp>
@@ -52,6 +53,8 @@
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
+#include <com/sun/star/sdbcx/XRowLocate.hpp>
+/** === end UNO includes === **/
 
 #include <comphelper/container.hxx>
 #include <comphelper/enumhelper.hxx>
@@ -66,6 +69,7 @@
 
 using namespace ::svxform;
 using namespace ::com::sun::star::container;
+using namespace ::com::sun::star::sdb;
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::view;
@@ -1118,7 +1122,7 @@ namespace fmgridif
 {
     const ::rtl::OUString getDataModeIdentifier()
     {
-        static ::rtl::OUString s_sDataModeIdentifier = DATA_MODE;
+        static ::rtl::OUString s_sDataModeIdentifier = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DataMode" ) );
         return s_sDataModeIdentifier;
     }
 }
@@ -1390,8 +1394,8 @@ Sequence< Any > SAL_CALL FmXGridPeer::queryFieldData( sal_Int32 nRow, const Type
 
     // don't use GetCurrentRow as this isn't affected by the above SeekRow
     // FS - 30.09.99 - 68644
-    DbGridRowRef aRow = pGrid->GetSeekRow();
-    DBG_ASSERT(aRow.Is(), "FmXGridPeer::queryFieldData : invalid current Row !");
+    DbGridRowRef xPaintRow = pGrid->GetPaintRow();
+    ENSURE_OR_THROW( xPaintRow.Is(), "invalid paint row" );
 
     // die Columns des Controls brauche ich fuer GetFieldText
     DbGridColumns aColumns = pGrid->GetColumns();
@@ -1413,39 +1417,40 @@ Sequence< Any > SAL_CALL FmXGridPeer::queryFieldData( sal_Int32 nRow, const Type
         // don't use GetCurrentFieldValue to determine the field content as this isn't affected by the above SeekRow
         // FS - 30.09.99 - 68644
         pCol = aColumns.GetObject(nModelPos);
-        const DbGridRowRef xRow = pGrid->GetSeekRow();
-        xFieldContent = (xRow.Is() && xRow->HasField(pCol->GetFieldPos())) ? xRow->GetField(pCol->GetFieldPos()).getColumn() : Reference< ::com::sun::star::sdb::XColumn > ();
+        xFieldContent = xPaintRow->HasField( pCol->GetFieldPos() )
+                    ?   xPaintRow->GetField( pCol->GetFieldPos() ).getColumn()
+                    :   Reference< XColumn > ();
+
+        if ( !xFieldContent.is() )
+            continue;
 
-        if (xFieldContent.is())
+        if (bRequestedAsAny)
         {
-            if (bRequestedAsAny)
-            {
-                Reference< XPropertySet >  xFieldSet(xFieldContent, UNO_QUERY);
-                pReturnArray[i] = xFieldSet->getPropertyValue(FM_PROP_VALUE);
-            }
-            else
+            Reference< XPropertySet >  xFieldSet(xFieldContent, UNO_QUERY);
+            pReturnArray[i] = xFieldSet->getPropertyValue(FM_PROP_VALUE);
+        }
+        else
+        {
+            switch (xType.getTypeClass())
             {
-                switch (xType.getTypeClass())
+                // Strings werden direkt ueber das GetFieldText abgehandelt
+                case TypeClass_STRING			:
                 {
-                    // Strings werden direkt ueber das GetFieldText abgehandelt
-                    case TypeClass_STRING			:
-                    {
-                        String sText = aColumns.GetObject(nModelPos)->GetCellText(aRow, pGrid->getNumberFormatter());
-                        pReturnArray[i] <<= ::rtl::OUString(sText);
-                    }
-                    break;
-                    // alles andere wird an der DatabaseVariant erfragt
-                    case TypeClass_FLOAT			: pReturnArray[i] <<= xFieldContent->getFloat(); break;
-                    case TypeClass_DOUBLE		: pReturnArray[i] <<= xFieldContent->getDouble(); break;
-                    case TypeClass_SHORT			: pReturnArray[i] <<= (sal_Int16)xFieldContent->getShort(); break;
-                    case TypeClass_LONG			: pReturnArray[i] <<= (sal_Int32)xFieldContent->getLong(); break;
-                    case TypeClass_UNSIGNED_SHORT: pReturnArray[i] <<= (sal_uInt16)xFieldContent->getShort(); break;
-                    case TypeClass_UNSIGNED_LONG	: pReturnArray[i] <<= (sal_uInt32)xFieldContent->getLong(); break;
-                    case TypeClass_BOOLEAN		: ::comphelper::setBOOL(pReturnArray[i],xFieldContent->getBoolean()); break;
-                    default:
-                    {
-                        throw IllegalArgumentException();
-                    }
+                    String sText = aColumns.GetObject(nModelPos)->GetCellText( xPaintRow, pGrid->getNumberFormatter() );
+                    pReturnArray[i] <<= ::rtl::OUString(sText);
+                }
+                break;
+                // alles andere wird an der DatabaseVariant erfragt
+                case TypeClass_FLOAT			: pReturnArray[i] <<= xFieldContent->getFloat(); break;
+                case TypeClass_DOUBLE		    : pReturnArray[i] <<= xFieldContent->getDouble(); break;
+                case TypeClass_SHORT			: pReturnArray[i] <<= (sal_Int16)xFieldContent->getShort(); break;
+                case TypeClass_LONG			    : pReturnArray[i] <<= (sal_Int32)xFieldContent->getLong(); break;
+                case TypeClass_UNSIGNED_SHORT   : pReturnArray[i] <<= (sal_uInt16)xFieldContent->getShort(); break;
+                case TypeClass_UNSIGNED_LONG	: pReturnArray[i] <<= (sal_uInt32)xFieldContent->getLong(); break;
+                case TypeClass_BOOLEAN		    : ::comphelper::setBOOL(pReturnArray[i],xFieldContent->getBoolean()); break;
+                default:
+                {
+                    throw IllegalArgumentException();
                 }
             }
         }
@@ -1724,6 +1729,8 @@ void FmXGridPeer::removeColumnListeners(const Reference< XPropertySet >& xCol)
 //------------------------------------------------------------------------------
 void FmXGridPeer::setColumns(const Reference< XIndexContainer >& Columns) throw( RuntimeException )
 {
+    ::vos::OGuard aGuard( Application::GetSolarMutex() );
+
     FmGridControl* pGrid = static_cast< FmGridControl* >( GetWindow() );
 
     if (m_xColumns.is())
@@ -2457,7 +2464,7 @@ void FmXGridPeer::setMode(const ::rtl::OUString& Mode) throw( NoSupportException
     m_aMode = Mode;
 
     FmGridControl* pGrid = (FmGridControl*) GetWindow();
-    if (Mode == FILTER_MODE)
+    if ( Mode == ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterMode" ) ) )
         pGrid->SetFilterMode(sal_True);
     else
     {
@@ -2480,8 +2487,8 @@ void FmXGridPeer::setMode(const ::rtl::OUString& Mode) throw( NoSupportException
     {
         aModes.realloc(2);
         ::rtl::OUString* pModes = aModes.getArray();
-        pModes[0] = DATA_MODE;
-        pModes[1] = FILTER_MODE;
+        pModes[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DataMode" ) );
+        pModes[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterMode" ) );
     }
     return aModes;
 }
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 61ca01628c..2ab178f3ef 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -679,7 +679,15 @@ sal_Bool DbCellControl::Commit()
     // lock the listening for value property changes
     lockValueProperty();
     // commit the content of the control into the model's value property
-    sal_Bool bReturn = commitControl();
+    sal_Bool bReturn = sal_False;
+    try
+    {
+        bReturn = commitControl();
+    }
+    catch( const Exception& )
+    {
+        DBG_UNHANDLED_EXCEPTION();
+    }
     // unlock the listening for value property changes
     unlockValueProperty();
     // outta here
diff --git a/svx/source/fmcomp/gridcols.cxx b/svx/source/fmcomp/gridcols.cxx
index f954068d4d..339cf12cbb 100644
--- a/svx/source/fmcomp/gridcols.cxx
+++ b/svx/source/fmcomp/gridcols.cxx
@@ -35,6 +35,7 @@
 #include <comphelper/types.hxx>
 #include "fmservs.hxx"
 #include "svx/fmtools.hxx"
+using namespace ::com::sun::star::uno;
 
 //------------------------------------------------------------------------------
 const ::comphelper::StringSequence& getColumnTypes()
@@ -57,6 +58,36 @@ const ::comphelper::StringSequence& getColumnTypes()
     return aColumnTypes;
 }
 
+//------------------------------------------------------------------
+// Vergleichen von PropertyInfo
+extern "C" int
+#if defined( WNT )
+ __cdecl
+#endif
+#if defined( ICC ) && defined( OS2 )
+_Optlink
+#endif
+    NameCompare(const void* pFirst, const void* pSecond)
+{
+    return ((::rtl::OUString*)pFirst)->compareTo(*(::rtl::OUString*)pSecond);
+}
+
+namespace
+{
+    //------------------------------------------------------------------------------
+    sal_Int32 lcl_findPos(const ::rtl::OUString& aStr, const Sequence< ::rtl::OUString>& rList)
+    {
+        const ::rtl::OUString* pStrList = rList.getConstArray();
+        ::rtl::OUString* pResult = (::rtl::OUString*) bsearch(&aStr, (void*)pStrList, rList.getLength(), sizeof(::rtl::OUString),
+            &NameCompare);
+
+        if (pResult)
+            return (pResult - pStrList);
+        else
+            return -1;
+    }
+}
+
 //------------------------------------------------------------------------------
 sal_Int32 getColumnTypeByModelName(const ::rtl::OUString& aModelName)
 {
@@ -79,7 +110,7 @@ sal_Int32 getColumnTypeByModelName(const ::rtl::OUString& aModelName)
             : aModelName.copy(aCompatibleModelPrefix.getLength());
 
         const ::comphelper::StringSequence& rColumnTypes = getColumnTypes();
-        nTypeId = findPos(aColumnType, rColumnTypes);
+        nTypeId = lcl_findPos(aColumnType, rColumnTypes);
     }
     return nTypeId;
 }
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 14b1ce554c..26e5d496bf 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -874,7 +874,7 @@ void DbGridRow::SetState(CursorWrapper* pCur, sal_Bool bPaintCursor)
         }
         catch(SQLException&)
         {
-            OSL_ENSURE(0,"SQLException catched while getting the bookmark");
+            DBG_UNHANDLED_EXCEPTION();
             m_aBookmark = Any();
             m_eStatus = GRS_INVALID;
             m_bIsNew = sal_False;
@@ -1787,30 +1787,32 @@ void DbGridControl::ColumnMoved(sal_uInt16 nId)
 sal_Bool DbGridControl::SeekRow(long nRow)
 {
     // in filter mode or in insert only mode we don't have any cursor!
-    if (SeekCursor(nRow))
+    if ( !SeekCursor( nRow ) )
+        return sal_False;
+
+    if ( IsFilterMode() )
     {
-        if (m_pSeekCursor)
-        {
-            // on the current position we have to take the current row for display as we want
-            // to have the most recent values for display
-            if ((nRow == m_nCurrentPos) && getDisplaySynchron())
-                m_xPaintRow = m_xCurrentRow;
-            // seek to the empty insert row
-            else if (IsInsertionRow(nRow))
-                m_xPaintRow = m_xEmptyRow;
-            else
-            {
-                m_xSeekRow->SetState(m_pSeekCursor, sal_True);
-                m_xPaintRow = m_xSeekRow;
-            }
-        }
-        else if (IsFilterMode())
-        {
-            DBG_ASSERT(IsFilterRow(nRow), "DbGridControl::SeekRow(): No filter row, wrong mode");
+        DBG_ASSERT( IsFilterRow( nRow ), "DbGridControl::SeekRow(): No filter row, wrong mode" );
+        m_xPaintRow = m_xEmptyRow;
+    }
+    else
+    {
+        // on the current position we have to take the current row for display as we want
+        // to have the most recent values for display
+        if ( ( nRow == m_nCurrentPos ) && getDisplaySynchron() )
+            m_xPaintRow = m_xCurrentRow;
+        // seek to the empty insert row
+        else if ( IsInsertionRow( nRow ) )
             m_xPaintRow = m_xEmptyRow;
+        else
+        {
+            m_xSeekRow->SetState( m_pSeekCursor, sal_True );
+            m_xPaintRow = m_xSeekRow;
         }
-        DbGridControl_Base::SeekRow(nRow);
     }
+
+    DbGridControl_Base::SeekRow(nRow);
+
     return m_nSeekPos >= 0;
 }
 //------------------------------------------------------------------------------
@@ -2382,7 +2384,7 @@ sal_Bool DbGridControl::SeekCursor(long nRow, sal_Bool bAbsolute)
         // da der letzte Datensatz bereits erreicht wurde!
         if (nRow == m_nCurrentPos)
         {
-            // auf die aktuelle Zeile bewegt, dann mu� kein abgleich gemacht werden, wenn
+            // auf die aktuelle Zeile bewegt, dann muß kein abgleich gemacht werden, wenn
             // gerade ein Datensatz eingefuegt wird
             m_nSeekPos = nRow;
         }
diff --git a/svx/source/form/confirmdelete.cxx b/svx/source/form/confirmdelete.cxx
deleted file mode 100644
index 1a7604e94a..0000000000
--- a/svx/source/form/confirmdelete.cxx
+++ /dev/null
@@ -1,138 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: confirmdelete.cxx,v $
- * $Revision: 1.10 $
- *
- * 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 "confirmdelete.hxx"
-#include <svx/dialmgr.hxx>
-#ifndef _SVX_FMHELP_HRC
-#include "fmhelp.hrc"
-#endif
-#ifndef _SVX_FMRESIDS_HRC
-#include "fmresids.hrc"
-#endif
-#include <unotools/configmgr.hxx>
-#include <vcl/msgbox.hxx>
-
-//........................................................................
-namespace svxform
-{
-//........................................................................
-
-#define BORDER_HEIGHT	6 // default distance control-dialog
-#define BORDER_WIDTH	6 // default distance control-dialog
-
-    using namespace ::com::sun::star::uno;
-
-    //====================================================================
-    //= class ConfirmDeleteDialog
-    //====================================================================
-    //------------------------------------------------------------------------------
-    ConfirmDeleteDialog::ConfirmDeleteDialog(Window* pParent, const String& _rTitle)
-              :ButtonDialog(pParent, WB_HORZ | WB_STDDIALOG)
-              ,m_aInfoImage	(this)
-              ,m_aTitle		(this, WB_WORDBREAK | WB_LEFT)
-              ,m_aMessage	(this, WB_WORDBREAK | WB_LEFT)
-    {
-        String sMessage(SVX_RES(RID_STR_DELETECONFIRM));
-
-        // Changed as per BugID 79541 Branding/Configuration
-        Any aProductName = ::utl::ConfigManager::GetDirectConfigProperty(::utl::ConfigManager::PRODUCTNAME);
-        ::rtl::OUString sProductName;
-        aProductName >>= sProductName;
-
-        String aTitle = sProductName;
-        aProductName = ::utl::ConfigManager::GetDirectConfigProperty(::utl::ConfigManager::PRODUCTVERSION);
-        aProductName >>= sProductName;
-        aTitle.AppendAscii(" ");
-        aTitle += String(sProductName);
-        SetText(aTitle);
-
-        SetHelpId(HID_DLG_DBMSG);
-        SetSizePixel(LogicToPixel(Size(220, 30),MAP_APPFONT));
-
-        m_aInfoImage.SetPosSizePixel(LogicToPixel(Point(6, 6),MAP_APPFONT),
-                                   LogicToPixel(Size(20, 20),MAP_APPFONT));
-        m_aInfoImage.Show();
-
-        m_aTitle.SetPosSizePixel(LogicToPixel(Point(45, 6),MAP_APPFONT),
-                                 LogicToPixel(Size(169, 20),MAP_APPFONT));
-
-        Font  aFont = m_aTitle.GetFont();
-        aFont.SetWeight(WEIGHT_SEMIBOLD);
-        m_aTitle.SetFont(aFont);
-        m_aTitle.Show();
-
-        m_aMessage.SetPosSizePixel(LogicToPixel(Point(45, 29),MAP_APPFONT),
-                                   LogicToPixel(Size(169, 1),MAP_APPFONT));
-        m_aMessage.Show();
-
-        // Image festlegen
-        m_aInfoImage.SetImage(WarningBox::GetStandardImage());
-
-        // Title setzen
-        m_aTitle.SetText(_rTitle);
-
-        // Ermitteln der Hoehe des Textfeldes und des Dialogs
-        Size aBorderSize = LogicToPixel(Size(BORDER_WIDTH, BORDER_HEIGHT),MAP_APPFONT);
-        Rectangle aDlgRect(GetPosPixel(),GetSizePixel());
-        Rectangle aMessageRect(m_aMessage.GetPosPixel(),m_aMessage.GetSizePixel());
-        Rectangle aTextRect =
-            GetTextRect(aMessageRect, sMessage, TEXT_DRAW_WORDBREAK | TEXT_DRAW_MULTILINE | TEXT_DRAW_LEFT);
-
-        long nHText	= aTextRect.Bottom() > aMessageRect.Bottom() ? aTextRect.Bottom() - aMessageRect.Bottom() : 0;
-
-        aDlgRect.Bottom() += nHText + 2 * aBorderSize.Height();
-        aMessageRect.Bottom() += nHText;
-
-        // Dialog anpassen
-        SetSizePixel(aDlgRect.GetSize());
-        SetPageSizePixel(aDlgRect.GetSize());
-
-        // Message Text anpassen und setzen
-        m_aMessage.SetSizePixel(aMessageRect.GetSize());
-        m_aMessage.SetText(sMessage);
-
-        // Buttons anlegen
-        AddButton(BUTTON_YES, BUTTONID_YES, 0);
-        AddButton(BUTTON_NO, BUTTONID_NO, BUTTONDIALOG_DEFBUTTON | BUTTONDIALOG_FOCUSBUTTON);
-    }
-
-    //------------------------------------------------------------------------------
-    ConfirmDeleteDialog::~ConfirmDeleteDialog()
-    {
-    }
-
-//........................................................................
-}	// namespace svxform
-//........................................................................
-
-
-
diff --git a/svx/source/form/delayedevent.cxx b/svx/source/form/delayedevent.cxx
index af986d5c54..4fca59484f 100644
--- a/svx/source/form/delayedevent.cxx
+++ b/svx/source/form/delayedevent.cxx
@@ -5,10 +5,6 @@
 *
 * OpenOffice.org - a multi-platform office productivity suite
 *
-* $RCSfile: delayedevent.cxx,v $
-*
-* $Revision: 1.1.2.1 $
-*
 * This file is part of OpenOffice.org.
 *
 * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index c37eb0d5c4..8af92d75cb 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -30,50 +30,41 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#ifndef _SVX_FMRESIDS_HRC
-#include "fmresids.hrc"
-#endif
-#include "fmctrler.hxx"
-#include "filtnav.hxx"
-#include <com/sun/star/util/XNumberFormatter.hpp>
-#include <com/sun/star/form/XFormController.hpp>
-#include <fmexch.hxx>
-#include "fmitems.hxx"
 
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
 
-#ifndef _SVX_FMPROP_HRC
+#include "filtnav.hxx"
+#include "fmexch.hxx"
+#include "fmhelp.hrc"
+#include "fmitems.hxx"
 #include "fmprop.hrc"
-#endif
+#include "fmresids.hrc"
+#include "gridcell.hxx"
 
-#ifndef _SVX_FMHELP_HRC
-#include "fmhelp.hrc"
-#endif
-#include <svx/dialmgr.hxx>
-#include <sfx2/dispatch.hxx>
-#include <sfx2/objsh.hxx>
-#include <sfx2/objitem.hxx>
-#include <sfx2/request.hxx>
-#include <tools/shl.hxx>
+/** === begin UNO includes === **/
+#include <com/sun/star/form/runtime/XFormController.hpp>
+#include <com/sun/star/lang/XUnoTunnel.hpp>
+#include <com/sun/star/util/XNumberFormatter.hpp>
+/** === end UNO includes === **/
 
-#ifndef _WRKWIN_HXX //autogen
-#include <vcl/wrkwin.hxx>
-#endif
-#include <svx/fmshell.hxx>
-#include <fmshimp.hxx>
-#include <fmservs.hxx>
+#include <comphelper/processfactory.hxx>
 #include <svx/fmtools.hxx>
-#include <cppuhelper/implbase1.hxx>
 #include <comphelper/property.hxx>
+#include <comphelper/sequence.hxx>
 #include <comphelper/uno3.hxx>
 #include <connectivity/dbtools.hxx>
-#include <comphelper/processfactory.hxx>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
-#include <comphelper/sequence.hxx>
-#include "gridcell.hxx"
+#include <cppuhelper/implbase1.hxx>
+#include <fmservs.hxx>
+#include <fmshimp.hxx>
 #include <rtl/logfile.hxx>
+#include <sfx2/dispatch.hxx>
+#include <sfx2/objitem.hxx>
+#include <sfx2/objsh.hxx>
+#include <sfx2/request.hxx>
+#include <svx/dialmgr.hxx>
+#include <svx/fmshell.hxx>
+#include <svx/svxids.hrc>
+#include <tools/shl.hxx>
+#include <vcl/wrkwin.hxx>
 
 #include <functional>
 
@@ -85,11 +76,6 @@
 #define DROP_ACTION_TIMER_TICK_BASE 		10
     // das ist die Basis, mit der beide Angaben multipliziert werden (in ms)
 
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::sdbc;
-using namespace ::com::sun::star::sdb;
-using namespace ::com::sun::star::beans;
 using namespace ::svxform;
 using namespace ::connectivity::simple;
 using namespace ::connectivity;
@@ -100,6 +86,37 @@ namespace svxform
 {
 //........................................................................
 
+    /** === begin UNO using === **/
+    using ::com::sun::star::uno::Reference;
+    using ::com::sun::star::lang::XMultiServiceFactory;
+    using ::com::sun::star::awt::TextEvent;
+    using ::com::sun::star::container::XIndexAccess;
+    using ::com::sun::star::uno::UNO_QUERY;
+    using ::com::sun::star::beans::XPropertySet;
+    using ::com::sun::star::form::runtime::XFormController;
+    using ::com::sun::star::form::runtime::XFilterController;
+    using ::com::sun::star::form::runtime::XFilterControllerListener;
+    using ::com::sun::star::form::runtime::FilterEvent;
+    using ::com::sun::star::lang::EventObject;
+    using ::com::sun::star::uno::RuntimeException;
+    using ::com::sun::star::form::XForm;
+    using ::com::sun::star::container::XChild;
+    using ::com::sun::star::awt::XControl;
+    using ::com::sun::star::sdbc::XConnection;
+    using ::com::sun::star::util::XNumberFormatsSupplier;
+    using ::com::sun::star::beans::XPropertySet;
+    using ::com::sun::star::util::XNumberFormatter;
+    using ::com::sun::star::sdbc::XRowSet;
+    using ::com::sun::star::lang::Locale;
+    using ::com::sun::star::sdb::SQLContext;
+    using ::com::sun::star::uno::XInterface;
+    using ::com::sun::star::uno::UNO_QUERY_THROW;
+    using ::com::sun::star::uno::UNO_SET_THROW;
+    using ::com::sun::star::uno::Exception;
+    using ::com::sun::star::awt::XTextComponent;
+    using ::com::sun::star::uno::Sequence;
+    /** === end UNO using === **/
+
 //========================================================================
 OFilterItemExchange::OFilterItemExchange()
 {
@@ -141,8 +158,8 @@ TYPEINIT1(FmParentData, FmFilterData);
 //------------------------------------------------------------------------
 FmParentData::~FmParentData()
 {
-    for (::std::vector<FmFilterData*>::const_iterator i = m_aChilds.begin();
-         i != m_aChilds.end(); i++)
+    for (::std::vector<FmFilterData*>::const_iterator i = m_aChildren.begin();
+         i != m_aChildren.end(); i++)
         delete (*i);
 }
 
@@ -168,16 +185,17 @@ Image FmFormItem::GetImage( BmpColorMode _eMode ) const
 //========================================================================
 TYPEINIT1(FmFilterItems, FmParentData);
 //------------------------------------------------------------------------
-FmFilterItem* FmFilterItems::Find(const Reference< ::com::sun::star::awt::XTextComponent > & _xText) const
+FmFilterItem* FmFilterItems::Find( const ::sal_Int32 _nFilterComponentIndex ) const
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterItems::Find" );
-    for (::std::vector<FmFilterData*>::const_iterator i = m_aChilds.begin();
-         i != m_aChilds.end(); ++i)
+    for (   ::std::vector< FmFilterData* >::const_iterator i = m_aChildren.begin();
+            i != m_aChildren.end();
+            ++i
+        )
     {
-        FmFilterItem* pCond = PTR_CAST(FmFilterItem, *i);
-        DBG_ASSERT(pCond, "Wrong element in container");
-        if (_xText == pCond->GetTextComponent())
-            return pCond;
+        FmFilterItem* pCondition = PTR_CAST( FmFilterItem, *i );
+        DBG_ASSERT( pCondition, "FmFilterItems::Find: Wrong element in container!" );
+        if ( _nFilterComponentIndex == pCondition->GetComponentIndex() )
+            return pCondition;
     }
     return NULL;
 }
@@ -185,7 +203,6 @@ FmFilterItem* FmFilterItems::Find(const Reference< ::com::sun::star::awt::XTextC
 //------------------------------------------------------------------------
 Image FmFilterItems::GetImage( BmpColorMode _eMode ) const
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterItems::GetImage" );
     static Image aImage;
     static Image aImage_HC;
 
@@ -203,16 +220,15 @@ Image FmFilterItems::GetImage( BmpColorMode _eMode ) const
 //========================================================================
 TYPEINIT1(FmFilterItem, FmFilterData);
 //------------------------------------------------------------------------
-FmFilterItem::FmFilterItem(const Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory,
-                           FmFilterItems* pParent,
-                     const ::rtl::OUString& aFieldName,
-                     const ::rtl::OUString& aText,
-                     const Reference< ::com::sun::star::awt::XTextComponent > & _xText)
+FmFilterItem::FmFilterItem( const Reference< XMultiServiceFactory >& _rxFactory,
+                            FmFilterItems* pParent,
+                            const ::rtl::OUString& aFieldName,
+                            const ::rtl::OUString& aText,
+                            const sal_Int32 _nComponentIndex )
           :FmFilterData(_rxFactory,pParent, aText)
           ,m_aFieldName(aFieldName)
-          ,m_xText(_xText)
+          ,m_nComponentIndex( _nComponentIndex )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterItems::FmFilterItem" );
 }
 
 //------------------------------------------------------------------------
@@ -262,17 +278,6 @@ public:
 TYPEINIT1( FmFilterInsertedHint, FmFilterHint );
 
 //========================================================================
-class FmFilterReplacedHint : public FmFilterHint
-{
-public:
-    TYPEINFO();
-    FmFilterReplacedHint(FmFilterData* pData)
-        :FmFilterHint(pData){}
-
-};
-TYPEINIT1( FmFilterReplacedHint, FmFilterHint );
-
-//========================================================================
 class FmFilterRemovedHint : public FmFilterHint
 {
 public:
@@ -315,243 +320,240 @@ TYPEINIT1( FmFilterCurrentChangedHint, SfxHint );
 //========================================================================
 // class FmFilterAdapter, Listener an den FilterControls
 //========================================================================
-class FmFilterAdapter : public ::cppu::WeakImplHelper1< ::com::sun::star::awt::XTextListener >
+class FmFilterAdapter : public ::cppu::WeakImplHelper1< XFilterControllerListener >
 {
-    FmFilterControls		m_aFilterControls;
-    FmFilterModel*			m_pModel;
+    FmFilterModel*			    m_pModel;
+    Reference< XIndexAccess >   m_xControllers;
 
 public:
-    FmFilterAdapter(FmFilterModel* pModel, const Reference< ::com::sun::star::container::XIndexAccess >& xControllers);
+    FmFilterAdapter(FmFilterModel* pModel, const Reference< XIndexAccess >& xControllers);
 
-// ::com::sun::star::lang::XEventListener
-    virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw( RuntimeException );
+// XEventListener
+    virtual void SAL_CALL disposing(const EventObject& Source) throw( RuntimeException );
 
-// ::com::sun::star::awt::XTextListener
-    virtual void SAL_CALL textChanged(const ::com::sun::star::awt::TextEvent& e) throw( ::com::sun::star::uno::RuntimeException );
+// XFilterControllerListener
+    virtual void SAL_CALL predicateExpressionChanged( const FilterEvent& _Event ) throw (RuntimeException);
+    virtual void SAL_CALL disjunctiveTermRemoved( const FilterEvent& _Event ) throw (RuntimeException);
+    virtual void SAL_CALL disjunctiveTermAdded( const FilterEvent& _Event ) throw (RuntimeException);
 
 // helpers
     void dispose() throw( RuntimeException );
 
-    void InsertElements(const Reference< ::com::sun::star::container::XIndexAccess >& xControllers);
-    void RemoveElement(const Reference< ::com::sun::star::awt::XTextComponent > & xText);
+    void AddOrRemoveListener( const Reference< XIndexAccess >& _rxControllers, const bool _bAdd );
 
-    Reference< ::com::sun::star::beans::XPropertySet > getField(const Reference< ::com::sun::star::awt::XTextComponent > & xText) const;
     void setText(sal_Int32 nPos,
         const FmFilterItem* pFilterItem,
         const ::rtl::OUString& rText);
-    void DeleteItemsByText(::std::vector<FmFilterData*>& rItems, const Reference< ::com::sun::star::awt::XTextComponent > & xText);
-    Reference< ::com::sun::star::form::XForm > findForm(const Reference< ::com::sun::star::container::XChild >& xChild);
 };
 
 //------------------------------------------------------------------------
-FmFilterAdapter::FmFilterAdapter(FmFilterModel* pModel, const Reference< ::com::sun::star::container::XIndexAccess >& xControllers)
-                 :m_pModel(pModel)
+FmFilterAdapter::FmFilterAdapter(FmFilterModel* pModel, const Reference< XIndexAccess >& xControllers)
+    :m_pModel( pModel )
+    ,m_xControllers( xControllers )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterAdapter::FmFilterAdapter" );
-    InsertElements(xControllers);
-
-    // listen on all controls as text listener
-    for (FmFilterControls::const_iterator iter = m_aFilterControls.begin();
-        iter != m_aFilterControls.end(); iter++)
-        (*iter).first->addTextListener(this);
+    AddOrRemoveListener( m_xControllers, true );
 }
 
 //------------------------------------------------------------------------
 void FmFilterAdapter::dispose() throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterAdapter::dispose" );
-    // clear the filter control map
-    for (FmFilterControls::const_iterator iter = m_aFilterControls.begin();
-         iter != m_aFilterControls.end(); iter++)
-         (*iter).first->removeTextListener(this);
-
-    m_aFilterControls.clear();
+    AddOrRemoveListener( m_xControllers, false );
 }
 
-//------------------------------------------------------------------------------
-// delete all items relate to the control
-void FmFilterAdapter::DeleteItemsByText(::std::vector<FmFilterData*>& _rItems,
-                                        const Reference< ::com::sun::star::awt::XTextComponent > & xText)
+//------------------------------------------------------------------------
+void FmFilterAdapter::AddOrRemoveListener( const Reference< XIndexAccess >& _rxControllers, const bool _bAdd )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterAdapter::DeleteItemsByText" );
-    for (::std::vector<FmFilterData*>::reverse_iterator i = _rItems.rbegin();
-        // link problems with operator ==
-        i.base() != _rItems.rend().base(); i++)
+    for (sal_Int32 i = 0, nLen = _rxControllers->getCount(); i < nLen; ++i)
     {
-        FmFilterItems* pFilterItems = PTR_CAST(FmFilterItems, *i);
-        if (pFilterItems)
-        {
-            FmFilterItem* pFilterItem = pFilterItems->Find(xText);
-            if (pFilterItem)
-            {
-                // remove the condition
-                ::std::vector<FmFilterData*>& rItems = pFilterItems->GetChilds();
-                ::std::vector<FmFilterData*>::iterator j = ::std::find(rItems.begin(), rItems.end(), pFilterItem);
-                if (j != rItems.end())
-                    m_pModel->Remove(j, pFilterItem);
-            }
-            continue;
-        }
-        FmFormItem* pFormItem = PTR_CAST(FmFormItem, *i);
-        if (pFormItem)
-            DeleteItemsByText(pFormItem->GetChilds(), xText);
+        Reference< XIndexAccess > xElement( _rxControllers->getByIndex(i), UNO_QUERY );
+
+        // step down
+        AddOrRemoveListener( xElement, _bAdd );
+
+        // handle this particular controller
+        Reference< XFilterController > xController( xElement, UNO_QUERY );
+        OSL_ENSURE( xController.is(), "FmFilterAdapter::InsertElements: no XFilterController, cannot sync data!" );
+        if ( xController.is() )
+            if ( _bAdd )
+                xController->addFilterControllerListener( this );
+            else
+                xController->removeFilterControllerListener( this );
     }
 }
 
 //------------------------------------------------------------------------
-void FmFilterAdapter::InsertElements(const Reference< ::com::sun::star::container::XIndexAccess >& xControllers)
+void FmFilterAdapter::setText(sal_Int32 nRowPos,
+                              const FmFilterItem* pFilterItem,
+                              const ::rtl::OUString& rText)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterAdapter::InsertElements" );
-    for (sal_Int32 i = 0, nLen = xControllers->getCount(); i < nLen; ++i)
-    {
-        Reference< ::com::sun::star::container::XIndexAccess > xElement;
-        xControllers->getByIndex(i) >>= xElement;
+    FmFormItem* pFormItem = PTR_CAST( FmFormItem, pFilterItem->GetParent()->GetParent() );
 
-        // Insert the Elements of the controller
-        InsertElements(xElement);
+    try
+    {
+        Reference< XFilterController > xController( pFormItem->GetController(), UNO_QUERY_THROW );
+        xController->setPredicateExpression( pFilterItem->GetComponentIndex(), nRowPos, rText );
+    }
+    catch( const Exception& )
+    {
+        DBG_UNHANDLED_EXCEPTION();
+    }
+}
 
-        // store the filter controls
-        FmXFormController* pController = FmXFormController::getImplementation( xElement.get() );
-        DBG_ASSERT( pController, "FmFilterAdapter::InsertElements: no controller!" );
 
-        const FmFilterControls& rControls = pController->getFilterControls();
-        for (FmFilterControls::const_iterator iter = rControls.begin(); iter != rControls.end(); ++iter )
-            m_aFilterControls.insert(*iter);
-    }
+// XEventListener
+//------------------------------------------------------------------------
+void SAL_CALL FmFilterAdapter::disposing(const EventObject& /*e*/) throw( RuntimeException )
+{
 }
 
-//------------------------------------------------------------------------------
-void FmFilterAdapter::RemoveElement(const Reference< ::com::sun::star::awt::XTextComponent > & xText)
+//------------------------------------------------------------------------
+namespace
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterAdapter::RemoveElement" );
-    if (xText.is())
+    ::rtl::OUString lcl_getLabelName_nothrow( const Reference< XControl >& _rxControl )
     {
-        // alle Level durchlaufen und eintraege entfernen
-        if (m_pModel)
-            DeleteItemsByText(m_pModel->GetChilds(), xText);
+        ::rtl::OUString sLabelName;
+        try
+        {
+            Reference< XControl > xControl( _rxControl, UNO_SET_THROW );
+            Reference< XPropertySet > xModel( xControl->getModel(), UNO_QUERY_THROW );
+            sLabelName = getLabelName( xModel );
+        }
+        catch( const Exception& )
+        {
+            DBG_UNHANDLED_EXCEPTION();
+        }
+        return sLabelName;
+    }
 
-        FmFilterControls::iterator iter = m_aFilterControls.find(xText);
-        if (iter != m_aFilterControls.end())
-            m_aFilterControls.erase(iter);
+    Reference< XPropertySet > lcl_getBoundField_nothrow( const Reference< XControl >& _rxControl )
+    {
+        Reference< XPropertySet > xField;
+        try
+        {
+            Reference< XControl > xControl( _rxControl, UNO_SET_THROW );
+            Reference< XPropertySet > xModelProps( xControl->getModel(), UNO_QUERY_THROW );
+            xField.set( xModelProps->getPropertyValue( FM_PROP_BOUNDFIELD ), UNO_QUERY_THROW );
+        }
+        catch( const Exception& )
+        {
+            DBG_UNHANDLED_EXCEPTION();
+        }
+        return xField;
     }
 }
 
+// XFilterControllerListener
 //------------------------------------------------------------------------
-Reference< ::com::sun::star::beans::XPropertySet >	FmFilterAdapter::getField(const Reference< ::com::sun::star::awt::XTextComponent > & xText) const
+void FmFilterAdapter::predicateExpressionChanged( const FilterEvent& _Event ) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterAdapter::getField" );
-    Reference< ::com::sun::star::beans::XPropertySet >	xField;
-    FmFilterControls::const_iterator i = m_aFilterControls.find(xText);
-    if (i != m_aFilterControls.end())
-        xField = (*i).second;
+    ::vos::OGuard aGuard( Application::GetSolarMutex() );
 
-    return xField;
-}
+    if ( !m_pModel )
+        return;
 
-//------------------------------------------------------------------------
-void FmFilterAdapter::setText(sal_Int32 nRowPos,
-                              const FmFilterItem* pFilterItem,
-                              const ::rtl::OUString& rText)
-{
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterAdapter::setText" );
-    // set the text for the text component
-    Reference< ::com::sun::star::awt::XTextComponent > xText(pFilterItem->GetTextComponent());
-    xText->setText(rText);
+    // the controller which sent the event
+    Reference< XFormController > xController( _Event.Source, UNO_QUERY_THROW );
+    Reference< XFilterController > xFilterController( _Event.Source, UNO_QUERY_THROW );
+    Reference< XForm > xForm( xController->getModel(), UNO_QUERY_THROW );
 
-    // get the controller of the text component and its filter rows
-    FmFormItem* pFormItem = PTR_CAST(FmFormItem,pFilterItem->GetParent()->GetParent());
-    FmXFormController* pController = FmXFormController::getImplementation( pFormItem->GetController().get() );
-    DBG_ASSERT( pController, "FmFilterAdapter::setText: no controller!" );
-    FmFilterRows& rRows = pController->getFilterRows();
+    FmFormItem* pFormItem = m_pModel->Find( m_pModel->m_aChildren, xForm );
+    OSL_ENSURE( pFormItem, "FmFilterAdapter::predicateExpressionChanged: don't know this form!" );
+    if ( !pFormItem )
+        return;
 
-    DBG_ASSERT(nRowPos < (sal_Int32)rRows.size(), "wrong row pos");
-    // Suchen der aktuellen Row
-    FmFilterRow& rRow = rRows[nRowPos];
+    const sal_Int32 nActiveTerm( xFilterController->getActiveTerm() );
 
-    // do we have a new filter
-    if (rText.getLength())
-        rRow[xText] = rText;
-    else
+    FmFilterItems* pFilter = PTR_CAST( FmFilterItems, pFormItem->GetChildren()[ nActiveTerm ] );
+    FmFilterItem* pFilterItem = pFilter->Find( _Event.FilterComponent );
+    if ( pFilterItem )
     {
-        // do we have the control in the row
-        FmFilterRow::iterator iter = rRow.find(xText);
-        // erase the entry out of the row
-        if (iter != rRow.end())
-            rRow.erase(iter);
+        if ( _Event.PredicateExpression.getLength())
+        {
+            pFilterItem->SetText( _Event.PredicateExpression );
+            // UI benachrichtigen
+            FmFilterTextChangedHint aChangeHint(pFilterItem);
+            m_pModel->Broadcast( aChangeHint );
+        }
+        else
+        {
+            // no text anymore so remove the condition
+            m_pModel->Remove(pFilterItem);
+        }
     }
-}
+    else
+    {
+        // searching the component by field name
+        ::rtl::OUString aFieldName( lcl_getLabelName_nothrow( xFilterController->getFilterComponent( _Event.FilterComponent ) ) );
 
+        pFilterItem = new FmFilterItem( m_pModel->getORB(), pFilter, aFieldName, _Event.PredicateExpression, _Event.FilterComponent );
+        m_pModel->Insert(pFilter->GetChildren().end(), pFilterItem);
+    }
 
-// ::com::sun::star::lang::XEventListener
-//------------------------------------------------------------------------
-void SAL_CALL FmFilterAdapter::disposing(const ::com::sun::star::lang::EventObject& e) throw( RuntimeException )
-{
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterAdapter::disposing" );
-    Reference< ::com::sun::star::awt::XTextComponent >	xText(e.Source,UNO_QUERY);
-    if (xText.is())
-        RemoveElement(xText);
+    // ensure there's one empty term in the filter, just in case the active term was previously empty
+    m_pModel->EnsureEmptyFilterRows( *pFormItem );
 }
 
-// XTextListener
 //------------------------------------------------------------------------
-Reference< ::com::sun::star::form::XForm > FmFilterAdapter::findForm(const Reference< ::com::sun::star::container::XChild >& xChild)
+void SAL_CALL FmFilterAdapter::disjunctiveTermRemoved( const FilterEvent& _Event ) throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterAdapter::findForm" );
-    Reference< ::com::sun::star::form::XForm > xForm;
-    if (xChild.is())
+    ::vos::OGuard aGuard( Application::GetSolarMutex() );
+
+    Reference< XFormController > xController( _Event.Source, UNO_QUERY_THROW );
+    Reference< XFilterController > xFilterController( _Event.Source, UNO_QUERY_THROW );
+    Reference< XForm > xForm( xController->getModel(), UNO_QUERY_THROW );
+
+    FmFormItem* pFormItem = m_pModel->Find( m_pModel->m_aChildren, xForm );
+    OSL_ENSURE( pFormItem, "FmFilterAdapter::disjunctiveTermRemoved: don't know this form!" );
+    if ( !pFormItem )
+        return;
+
+    ::std::vector< FmFilterData* >& rTermItems = pFormItem->GetChildren();
+    const bool bValidIndex = ( _Event.DisjunctiveTerm >= 0 ) && ( (size_t)_Event.DisjunctiveTerm < rTermItems.size() );
+    OSL_ENSURE( bValidIndex, "FmFilterAdapter::disjunctiveTermRemoved: invalid term index!" );
+    if ( !bValidIndex )
+        return;
+
+    // if the first term was removed, then the to-be first term needs its text updated
+    if ( _Event.DisjunctiveTerm == 0 )
     {
-        xForm = Reference< ::com::sun::star::form::XForm >(xChild->getParent(), UNO_QUERY);
-        if (!xForm.is())
-            xForm = findForm(Reference< ::com::sun::star::container::XChild >(xChild->getParent(), UNO_QUERY));
+        rTermItems[1]->SetText( String( SVX_RES( RID_STR_FILTER_FILTER_FOR ) ) );
+        FmFilterTextChangedHint aChangeHint( rTermItems[1] );
+        m_pModel->Broadcast( aChangeHint );
     }
-    return xForm;
+
+    // finally remove the entry from the model
+    m_pModel->Remove( rTermItems.begin() + _Event.DisjunctiveTerm );
+
+    // ensure there's one empty term in the filter, just in case the currently removed one was the last empty one
+    m_pModel->EnsureEmptyFilterRows( *pFormItem );
 }
 
-// XTextListener
 //------------------------------------------------------------------------
-void FmFilterAdapter::textChanged(const ::com::sun::star::awt::TextEvent& e) throw( ::com::sun::star::uno::RuntimeException )
+void SAL_CALL FmFilterAdapter::disjunctiveTermAdded( const FilterEvent& _Event ) throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterAdapter::textChanged" );
-    // Find the according formitem in the
-    Reference< ::com::sun::star::awt::XControl > xControl(e.Source, UNO_QUERY);
-    if (!m_pModel || !xControl.is())
-        return;
+    ::vos::OGuard aGuard( Application::GetSolarMutex() );
+
+    Reference< XFormController > xController( _Event.Source, UNO_QUERY_THROW );
+    Reference< XFilterController > xFilterController( _Event.Source, UNO_QUERY_THROW );
+    Reference< XForm > xForm( xController->getModel(), UNO_QUERY_THROW );
 
-    Reference< ::com::sun::star::form::XForm > xForm(findForm(Reference< ::com::sun::star::container::XChild >(xControl->getModel(), UNO_QUERY)));
-    if (!xForm.is())
+    FmFormItem* pFormItem = m_pModel->Find( m_pModel->m_aChildren, xForm );
+    OSL_ENSURE( pFormItem, "FmFilterAdapter::disjunctiveTermAdded: don't know this form!" );
+    if ( !pFormItem )
         return;
 
-    FmFormItem* pFormItem = m_pModel->Find(m_pModel->m_aChilds, xForm);
-    if (pFormItem)
+    const sal_Int32 nInsertPos = _Event.DisjunctiveTerm;
+    bool bValidIndex = ( nInsertPos >= 0 ) && ( (size_t)nInsertPos <= pFormItem->GetChildren().size() );
+    if ( !bValidIndex )
     {
-        Reference< ::com::sun::star::awt::XTextComponent > xText(e.Source, UNO_QUERY);
-        FmFilterItems* pFilter = PTR_CAST(FmFilterItems, pFormItem->GetChilds()[pFormItem->GetCurrentPosition()]);
-        FmFilterItem* pFilterItem = pFilter->Find(xText);
-        if (pFilterItem)
-        {
-            if (xText->getText().getLength())
-            {
-                pFilterItem->SetText(xText->getText());
-                // UI benachrichtigen
-                FmFilterTextChangedHint aChangeHint(pFilterItem);
-                m_pModel->Broadcast( aChangeHint );
-            }
-            else
-            {
-                // no text anymore so remove the condition
-                m_pModel->Remove(pFilterItem);
-            }
-        }
-        else
-        {
-            // searching the component by field name
-            ::rtl::OUString aFieldName = getLabelName(Reference< ::com::sun::star::beans::XPropertySet > (Reference< ::com::sun::star::awt::XControl > (xText, UNO_QUERY)->getModel(),UNO_QUERY));
-
-            pFilterItem = new FmFilterItem(m_pModel->getORB(),pFilter, aFieldName, xText->getText(), xText);
-            m_pModel->Insert(pFilter->GetChilds().end(), pFilterItem);
-        }
-        m_pModel->CheckIntegrity(pFormItem);
+        OSL_ENSURE( false, "FmFilterAdapter::disjunctiveTermAdded: invalid index!" );
+        return;
     }
+
+    const ::std::vector< FmFilterData* >::iterator insertPos = pFormItem->GetChildren().begin() + nInsertPos;
+
+    FmFilterItems* pFilterItems = new FmFilterItems( m_pModel->getORB(), pFormItem, String( SVX_RES( RID_STR_FILTER_FILTER_OR ) ) );
+    m_pModel->Insert( insertPos, pFilterItems );
 }
 
 //========================================================================
@@ -559,14 +561,13 @@ void FmFilterAdapter::textChanged(const ::com::sun::star::awt::TextEvent& e) thr
 //========================================================================
 TYPEINIT1(FmFilterModel, FmParentData);
 //------------------------------------------------------------------------
-FmFilterModel::FmFilterModel(const Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory)
+FmFilterModel::FmFilterModel(const Reference< XMultiServiceFactory >& _rxFactory)
               :FmParentData(_rxFactory,NULL, ::rtl::OUString())
               ,OSQLParserClient(_rxFactory)
               ,m_xORB(_rxFactory)
               ,m_pAdapter(NULL)
               ,m_pCurrentItems(NULL)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterModel::FmFilterModel" );
 }
 
 //------------------------------------------------------------------------
@@ -578,7 +579,6 @@ FmFilterModel::~FmFilterModel()
 //------------------------------------------------------------------------
 void FmFilterModel::Clear()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterModel::Clear" );
     // notify
     FilterClearingHint aClearedHint;
     Broadcast( aClearedHint );
@@ -595,18 +595,17 @@ void FmFilterModel::Clear()
     m_xController	 = NULL;
     m_xControllers	 = NULL;
 
-    for (::std::vector<FmFilterData*>::const_iterator i = m_aChilds.begin();
-         i != m_aChilds.end(); i++)
+    for (::std::vector<FmFilterData*>::const_iterator i = m_aChildren.begin();
+         i != m_aChildren.end(); i++)
         delete (*i);
 
-    m_aChilds.clear();
+    m_aChildren.clear();
 }
 
 //------------------------------------------------------------------------
-void FmFilterModel::Update(const Reference< ::com::sun::star::container::XIndexAccess > & xControllers, const Reference< ::com::sun::star::form::XFormController > & xCurrent)
+void FmFilterModel::Update(const Reference< XIndexAccess > & xControllers, const Reference< XFormController > & xCurrent)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterModel::Update" );
-    if ((::com::sun::star::form::XFormController*) xCurrent.get() == (::com::sun::star::form::XFormController*) m_xController.get())
+    if ( xCurrent == m_xController )
         return;
 
     if (!xControllers.is())
@@ -616,7 +615,7 @@ void FmFilterModel::Update(const Reference< ::com::sun::star::container::XIndexA
     }
 
     // there is only a new current controller
-    if ((::com::sun::star::container::XIndexAccess*)m_xControllers.get() != (::com::sun::star::container::XIndexAccess*)xControllers.get())
+    if ( m_xControllers != xControllers )
     {
         Clear();
 
@@ -630,77 +629,95 @@ void FmFilterModel::Update(const Reference< ::com::sun::star::container::XIndexA
         m_pAdapter->acquire();
 
         SetCurrentController(xCurrent);
-        CheckIntegrity(this);
+        EnsureEmptyFilterRows( *this );
     }
     else
         SetCurrentController(xCurrent);
 }
 
 //------------------------------------------------------------------------
-void FmFilterModel::Update(const Reference< ::com::sun::star::container::XIndexAccess > & xControllers, FmParentData* pParent)
+void FmFilterModel::Update(const Reference< XIndexAccess > & xControllers, FmParentData* pParent)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterModel::Update" );
-    sal_Int32 nCount = xControllers->getCount();
-    for (sal_Int32 i = 0; i < nCount; i++)
+    try
     {
-        Reference< ::com::sun::star::form::XFormController >  xController;
-        xControllers->getByIndex(i) >>= xController;
-        Reference< ::com::sun::star::beans::XPropertySet >	xModelAsSet(xController->getModel(), UNO_QUERY);
-        ::rtl::OUString aName = ::comphelper::getString(xModelAsSet->getPropertyValue(FM_PROP_NAME));
+        sal_Int32 nCount = xControllers->getCount();
+        for ( sal_Int32 i = 0; i < nCount; ++i )
+        {
+            Reference< XFormController > xController( xControllers->getByIndex(i), UNO_QUERY_THROW );
 
-        // Insert a new ::com::sun::star::form
-        FmFormItem* pFormItem = new FmFormItem(m_xORB,pParent, xController, aName);
-        Insert(pParent->GetChilds().end(), pFormItem);
+            Reference< XPropertySet > xFormProperties( xController->getModel(), UNO_QUERY_THROW );
+            ::rtl::OUString aName;
+            OSL_VERIFY( xFormProperties->getPropertyValue( FM_PROP_NAME ) >>= aName );
 
-        // And now insert the filters for the form
-        FmXFormController* pController = FmXFormController::getImplementation( pFormItem->GetController().get() );
-        DBG_ASSERT( pController, "FmFilterAdapter::Update: no controller!" );
+            // Insert a new item for the form
+            FmFormItem* pFormItem = new FmFormItem( m_xORB, pParent, xController, aName );
+            Insert( pParent->GetChildren().end(), pFormItem );
 
-        INT32 nPos = pController->getCurrentFilterPosition();
-        pFormItem->SetCurrentPosition(nPos);
+            Reference< XFilterController > xFilterController( pFormItem->GetFilterController(), UNO_SET_THROW );
 
-        String aTitle(SVX_RES(RID_STR_FILTER_FILTER_FOR));
-        const FmFilterRows& rRows = pController->getFilterRows();
-        for (FmFilterRows::const_iterator iter = rRows.begin(); iter != rRows.end(); ++iter)
-        {
-            const FmFilterRow& rRow = *iter;
-            // now add the filter rows
-            // One Row always exists
+            // insert the existing filters for the form
+            String aTitle( SVX_RES( RID_STR_FILTER_FILTER_FOR ) );
 
-            FmFilterItems* pFilterItems = new FmFilterItems(m_xORB,pFormItem, aTitle);
-            Insert(pFormItem->GetChilds().end(), pFilterItems);
-            for (FmFilterRow::const_iterator iter1 = rRow.begin(); iter1 != rRow.end(); ++iter1)
+            Sequence< Sequence< ::rtl::OUString > > aExpressions = xFilterController->getPredicateExpressions();
+            for (   const Sequence< ::rtl::OUString >* pConjunctionTerm = aExpressions.getConstArray();
+                    pConjunctionTerm != aExpressions.getConstArray() + aExpressions.getLength();
+                    ++pConjunctionTerm
+                )
             {
-                // insert new and conditons
-                ::rtl::OUString aFieldName = getLabelName(Reference< ::com::sun::star::beans::XPropertySet > (Reference< ::com::sun::star::awt::XControl > ((*iter1).first, UNO_QUERY)->getModel(),UNO_QUERY));
-                FmFilterItem* pANDCondition = new FmFilterItem(m_xORB,pFilterItems, aFieldName, (*iter1).second, (*iter1).first);
-                Insert(pFilterItems->GetChilds().end(), pANDCondition);
+                // we always display one row, even if there's no term to be displayed
+                FmFilterItems* pFilterItems = new FmFilterItems( m_xORB, pFormItem, aTitle );
+                Insert( pFormItem->GetChildren().end(), pFilterItems );
+
+                const Sequence< ::rtl::OUString >& rDisjunction( *pConjunctionTerm );
+                for (   const ::rtl::OUString* pDisjunctiveTerm = rDisjunction.getConstArray();
+                        pDisjunctiveTerm != rDisjunction.getConstArray() + rDisjunction.getLength();
+                        ++pDisjunctiveTerm
+                    )
+                {
+                    if ( pDisjunctiveTerm->getLength() == 0 )
+                        // no condition for this particular component in this particular conjunction term
+                        continue;
+
+                    const sal_Int32 nComponentIndex = pDisjunctiveTerm - rDisjunction.getConstArray();
+
+                    // determine the display name of the control
+                    const Reference< XControl > xFilterControl( xFilterController->getFilterComponent( nComponentIndex ) );
+                    const ::rtl::OUString sDisplayName( lcl_getLabelName_nothrow( xFilterControl ) );
+
+                    // insert a new entry
+                    FmFilterItem* pANDCondition = new FmFilterItem( m_xORB, pFilterItems, sDisplayName, *pDisjunctiveTerm, nComponentIndex );
+                    Insert( pFilterItems->GetChildren().end(), pANDCondition );
+                }
+
+                // title for the next conditions
+                aTitle = SVX_RES( RID_STR_FILTER_FILTER_OR );
             }
-            // title for the next conditions
-            aTitle = SVX_RES(RID_STR_FILTER_FILTER_OR);
-        }
 
-        // now add dependent controllers
-        Reference< ::com::sun::star::container::XIndexAccess >	xControllerAsIndex(xController, UNO_QUERY);
-        Update(xControllerAsIndex, pFormItem);
+            // now add dependent controllers
+            Reference< XIndexAccess > xControllerAsIndex( xController, UNO_QUERY );
+            Update( xControllerAsIndex, pFormItem );
+        }
+    }
+    catch( const Exception& )
+    {
+        DBG_UNHANDLED_EXCEPTION();
     }
 }
 
 //------------------------------------------------------------------------
-FmFormItem* FmFilterModel::Find(const ::std::vector<FmFilterData*>& rItems, const Reference< ::com::sun::star::form::XFormController > & xController) const
+FmFormItem* FmFilterModel::Find(const ::std::vector<FmFilterData*>& rItems, const Reference< XFormController > & xController) const
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterModel::Find" );
     for (::std::vector<FmFilterData*>::const_iterator i = rItems.begin();
          i != rItems.end(); i++)
     {
         FmFormItem* pForm = PTR_CAST(FmFormItem,*i);
         if (pForm)
         {
-            if ((::com::sun::star::form::XFormController*)xController.get() == (::com::sun::star::form::XFormController*)pForm->GetController().get())
+            if ( xController == pForm->GetController() )
                 return pForm;
             else
             {
-                pForm = Find(pForm->GetChilds(), xController);
+                pForm = Find(pForm->GetChildren(), xController);
                 if (pForm)
                     return pForm;
             }
@@ -710,9 +727,8 @@ FmFormItem* FmFilterModel::Find(const ::std::vector<FmFilterData*>& rItems, cons
 }
 
 //------------------------------------------------------------------------
-FmFormItem* FmFilterModel::Find(const ::std::vector<FmFilterData*>& rItems, const Reference< ::com::sun::star::form::XForm >& xForm) const
+FmFormItem* FmFilterModel::Find(const ::std::vector<FmFilterData*>& rItems, const Reference< XForm >& xForm) const
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterModel::Find" );
     for (::std::vector<FmFilterData*>::const_iterator i = rItems.begin();
          i != rItems.end(); i++)
     {
@@ -723,7 +739,7 @@ FmFormItem* FmFilterModel::Find(const ::std::vector<FmFilterData*>& rItems, cons
                 return pForm;
             else
             {
-                pForm = Find(pForm->GetChilds(), xForm);
+                pForm = Find(pForm->GetChildren(), xForm);
                 if (pForm)
                     return pForm;
             }
@@ -733,58 +749,64 @@ FmFormItem* FmFilterModel::Find(const ::std::vector<FmFilterData*>& rItems, cons
 }
 
 //------------------------------------------------------------------------
-void FmFilterModel::SetCurrentController(const Reference< ::com::sun::star::form::XFormController > & xCurrent)
+void FmFilterModel::SetCurrentController(const Reference< XFormController > & xCurrent)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterModel::SetCurrentController" );
-    if ((::com::sun::star::form::XFormController*) xCurrent.get() == (::com::sun::star::form::XFormController*) m_xController.get())
+    if ( xCurrent == m_xController )
         return;
 
     m_xController = xCurrent;
 
-    FmFormItem* pItem = Find(m_aChilds, xCurrent);
-    if (pItem)
+    FmFormItem* pItem = Find( m_aChildren, xCurrent );
+    if ( !pItem )
+        return;
+
+    try
     {
-        if ( (USHORT)pItem->GetChilds().size() > pItem->GetCurrentPosition() )
-            SetCurrentItems( static_cast< FmFilterItems* >( pItem->GetChilds()[ pItem->GetCurrentPosition() ] ) );
+        Reference< XFilterController > xFilterController( m_xController, UNO_QUERY_THROW );
+        const sal_Int32 nActiveTerm( xFilterController->getActiveTerm() );
+        if ( pItem->GetChildren().size() > (size_t)nActiveTerm )
+        {
+            SetCurrentItems( static_cast< FmFilterItems* >( pItem->GetChildren()[ nActiveTerm ] ) );
+        }
+    }
+    catch( const Exception& )
+    {
+        DBG_UNHANDLED_EXCEPTION();
     }
 }
 
 //------------------------------------------------------------------------
-void FmFilterModel::AppendFilterItems(FmFormItem* pFormItem)
+void FmFilterModel::AppendFilterItems( FmFormItem& _rFormItem )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterModel::AppendFilterItems" );
-    DBG_ASSERT(pFormItem, "AppendFilterItems(): no form item present");
-
-    FmFilterItems* pFilterItems = new FmFilterItems(m_xORB,pFormItem, ::rtl::OUString(String(SVX_RES(RID_STR_FILTER_FILTER_OR))));
     // insert the condition behind the last filter items
     ::std::vector<FmFilterData*>::reverse_iterator iter;
-    for (iter = pFormItem->GetChilds().rbegin();
-        // link problems with operator ==
-        iter.base() != pFormItem->GetChilds().rend().base(); iter++)
+    for (   iter = _rFormItem.GetChildren().rbegin();
+            iter != _rFormItem.GetChildren().rend();
+            ++iter
+        )
     {
         if ((*iter)->ISA(FmFilterItems))
             break;
     }
-    sal_Int32 nInsertPos = iter.base() - pFormItem->GetChilds().rend().base();
-    ::std::vector<FmFilterData*>::iterator i = pFormItem->GetChilds().begin() + nInsertPos;
-
-    Insert(i, pFilterItems);
 
-    // do we need a new row
-    FmXFormController* pController = FmXFormController::getImplementation( pFormItem->GetController().get() );
-    DBG_ASSERT( pController, "FmFilterAdapter::AppendFilterItems: no controller!" );
-    FmFilterRows& rRows = pController->getFilterRows();
-
-    // determine the filter position
-    if (nInsertPos >= (sal_Int32)rRows.size())
-        rRows.push_back(FmFilterRow());
+    sal_Int32 nInsertPos = iter.base() - _rFormItem.GetChildren().begin();
+    // delegate this to the FilterController, it will notify us, which will let us update our model
+    try
+    {
+        Reference< XFilterController > xFilterController( _rFormItem.GetFilterController(), UNO_SET_THROW );
+        if ( nInsertPos >= xFilterController->getDisjunctiveTerms() )
+            xFilterController->appendEmptyDisjunctiveTerm();
+    }
+    catch( const Exception& )
+    {
+        DBG_UNHANDLED_EXCEPTION();
+    }
 }
 
 //------------------------------------------------------------------------
 void FmFilterModel::Insert(const ::std::vector<FmFilterData*>::iterator& rPos, FmFilterData* pData)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterModel::Insert" );
-    ::std::vector<FmFilterData*>& rItems = pData->GetParent()->GetChilds();
+    ::std::vector<FmFilterData*>& rItems = pData->GetParent()->GetChildren();
     sal_Int32 nPos = rPos == rItems.end() ? LIST_APPEND : rPos - rItems.begin();
     rItems.insert(rPos, pData);
 
@@ -796,9 +818,8 @@ void FmFilterModel::Insert(const ::std::vector<FmFilterData*>::iterator& rPos, F
 //------------------------------------------------------------------------
 void FmFilterModel::Remove(FmFilterData* pData)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterModel::Remove" );
     FmParentData* pParent = pData->GetParent();
-    ::std::vector<FmFilterData*>& rItems = pParent->GetChilds();
+    ::std::vector<FmFilterData*>& rItems = pParent->GetChildren();
 
     // erase the item from the model
     ::std::vector<FmFilterData*>::iterator i = ::std::find(rItems.begin(), rItems.end(), pData);
@@ -808,80 +829,32 @@ void FmFilterModel::Remove(FmFilterData* pData)
     if (pData->ISA(FmFilterItems))
     {
         FmFormItem* pFormItem = (FmFormItem*)pParent;
-        FmXFormController* pController = FmXFormController::getImplementation( pFormItem->GetController().get() );
-        DBG_ASSERT( pController, "FmFilterAdapter::Remove: no controller!" );
-        FmFilterRows& rRows = pController->getFilterRows();
 
-        // how many entries do we have
-        // it's the last row than we just empty it
-        if (nPos == (sal_Int32)(rRows.size() - 1))
-        {
-            // remove all childs and stay current
-            ::std::vector<FmFilterData*>& rChilds = ((FmFilterItems*)pData)->GetChilds();
-            while (!rChilds.empty())
-            {
-                ::std::vector<FmFilterData*>::iterator j = rChilds.end();
-                j--;
-
-                // we stay on the level so delete each item explizit to clean the controls
-                sal_Int32 nParentPos = j - rChilds.begin();
-                // EmptyText removes the filter
-                FmFilterItem* pFilterItem = PTR_CAST(FmFilterItem, *j);
-                m_pAdapter->setText(nParentPos, pFilterItem, ::rtl::OUString());
-                Remove(j, pFilterItem);
-            }
-        }
-        else // delete the row
+        try
         {
-            // if the row is on the current position we have to away from that position.
-            // than we can delete it
-            if (nPos == pFormItem->GetCurrentPosition())
-            {
-                ::std::vector<FmFilterData*>::iterator j = i;
-
-                // give a new current postion
-                if (nPos < (sal_Int32)(rRows.size() - 1))
-                    // set it to the next row
-                    ++j;
-                else
-                    // set it to the previous row
-                    --j;
+            Reference< XFilterController > xFilterController( pFormItem->GetFilterController(), UNO_SET_THROW );
 
-                // if necessary we have the formItem for the current controller
-                // than we have to adjust the data displayed in the form
-                pFormItem->SetCurrentPosition(j - rItems.begin());
-                pController->setCurrentFilterPosition(j - rItems.begin());
-
-                // Keep the view consistent and force and new painting
-                FmFilterTextChangedHint aChangeHint(*j);
-                Broadcast( aChangeHint );
-            }
-
-            // now delete the entry
-            // before deleting we have to shift the current position of the form if necessary
-            if (nPos < pFormItem->GetCurrentPosition())
+            bool bEmptyLastTerm = ( ( nPos == 0 ) && xFilterController->getDisjunctiveTerms() == 1 );
+            if ( bEmptyLastTerm )
             {
-                pFormItem->SetCurrentPosition(pFormItem->GetCurrentPosition() - 1);
-                pController->decrementCurrentFilterPosition();
-
-                // is it the first row, than the nex row has to recieve a different name
-                if (nPos == 0)
+                // remove all children (by setting an empty predicate expression)
+                ::std::vector< FmFilterData* >& rChildren = ((FmFilterItems*)pData)->GetChildren();
+                while ( !rChildren.empty() )
                 {
-                    // ensure that the text labels are consistent
-                    rItems[1]->SetText(String(SVX_RES(RID_STR_FILTER_FILTER_FOR)));
-                    FmFilterTextChangedHint aChangeHint(rItems[1]);
-                    Broadcast( aChangeHint );
+                    ::std::vector< FmFilterData* >::iterator removePos = rChildren.end() - 1;
+                    FmFilterItem* pFilterItem = PTR_CAST( FmFilterItem, *removePos );
+                    m_pAdapter->setText( nPos, pFilterItem, ::rtl::OUString() );
+                    Remove( removePos );
                 }
             }
-
-            // delete it
-            rRows.erase(rRows.begin() + nPos);
-
-            // and keep the controller consistent
-            DBG_ASSERT(rRows.size() != 0, "wrong row size");
-
-            // and remove it from the model
-            Remove(i, pData);
+            else
+            {
+                xFilterController->removeDisjunctiveTerm( nPos );
+            }
+        }
+        catch( const Exception& )
+        {
+            DBG_UNHANDLED_EXCEPTION();
         }
     }
     else // FormItems can not be deleted
@@ -894,26 +867,26 @@ void FmFilterModel::Remove(FmFilterData* pData)
         else
         {
             // find the position of the father within his father
-            ::std::vector<FmFilterData*>& rParentParentItems = pData->GetParent()->GetParent()->GetChilds();
+            ::std::vector<FmFilterData*>& rParentParentItems = pData->GetParent()->GetParent()->GetChildren();
             ::std::vector<FmFilterData*>::iterator j = ::std::find(rParentParentItems.begin(), rParentParentItems.end(), pFilterItem->GetParent());
             DBG_ASSERT(j != rParentParentItems.end(), "FmFilterModel::Remove(): unknown Item");
             sal_Int32 nParentPos = j - rParentParentItems.begin();
 
             // EmptyText removes the filter
             m_pAdapter->setText(nParentPos, pFilterItem, ::rtl::OUString());
-            Remove(i, pData);
+            Remove( i );
         }
     }
 }
 
 //------------------------------------------------------------------------
-void FmFilterModel::Remove(const ::std::vector<FmFilterData*>::iterator& rPos, FmFilterData* pData)
+void FmFilterModel::Remove( const ::std::vector<FmFilterData*>::iterator& rPos )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterModel::Remove" );
-    ::std::vector<FmFilterData*>& rItems = pData->GetParent()->GetChilds();
-    rItems.erase(rPos);
+    // remove from parent's child list
+    FmFilterData* pData = *rPos;
+    pData->GetParent()->GetChildren().erase( rPos );
 
-    // UI benachrichtigen
+    // notify the view, this will remove the actual SvLBoxEntry
     FmFilterRemovedHint aRemoveHint( pData );
     Broadcast( aRemoveHint );
 
@@ -923,46 +896,58 @@ void FmFilterModel::Remove(const ::std::vector<FmFilterData*>::iterator& rPos, F
 //------------------------------------------------------------------------
 sal_Bool FmFilterModel::ValidateText(FmFilterItem* pItem, UniString& rText, UniString& rErrorMsg) const
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterModel::ValidateText" );
-    // check the input
-    Reference< XPropertySet >	xField(m_pAdapter->getField(pItem->GetTextComponent()));
-
-    OStaticDataAccessTools aStaticTools;
-    Reference< XConnection > xConnection(aStaticTools.getRowSetConnection(Reference< XRowSet > (m_xController->getModel(), UNO_QUERY)));
-    Reference< ::com::sun::star::util::XNumberFormatsSupplier >  xFormatSupplier = aStaticTools.getNumberFormats(xConnection, sal_True);
-
-    Reference< ::com::sun::star::util::XNumberFormatter >  xFormatter(m_xORB->createInstance(FM_NUMBER_FORMATTER), UNO_QUERY);
-    xFormatter->attachNumberFormatsSupplier(xFormatSupplier);
-
-    ::rtl::OUString aErr, aTxt(rText);
-    ::rtl::Reference< ISQLParseNode > xParseNode = predicateTree(aErr, aTxt, xFormatter, xField);
-    rErrorMsg = aErr;
-    rText = aTxt;
-    if (xParseNode.is())
+    FmFormItem* pFormItem = PTR_CAST( FmFormItem, pItem->GetParent()->GetParent() );
+    try
     {
-        ::rtl::OUString aPreparedText;
-        ::com::sun::star::lang::Locale aAppLocale = Application::GetSettings().GetUILocale();
-        xParseNode->parseNodeToPredicateStr(
-            aPreparedText, xConnection, xFormatter, xField, aAppLocale, '.', getParseContext() );
-        rText = aPreparedText;
-        return sal_True;
+        Reference< XFormController > xFormController( pFormItem->GetController() );
+        // obtain the connection of the form belonging to the controller
+        OStaticDataAccessTools aStaticTools;
+        Reference< XRowSet > xRowSet( xFormController->getModel(), UNO_QUERY_THROW );
+        Reference< XConnection > xConnection( aStaticTools.getRowSetConnection( xRowSet ) );
+
+        // obtain a number formatter for this connection
+        // TODO: shouldn't this be cached?
+        Reference< XNumberFormatsSupplier > xFormatSupplier = aStaticTools.getNumberFormats( xConnection, sal_True );
+        Reference< XNumberFormatter > xFormatter( m_xORB->createInstance( FM_NUMBER_FORMATTER ), UNO_QUERY );
+        xFormatter->attachNumberFormatsSupplier( xFormatSupplier );
+
+        // get the field (database column) which the item is responsible for
+        Reference< XFilterController > xFilterController( xFormController, UNO_QUERY_THROW );
+        Reference< XPropertySet > xField( lcl_getBoundField_nothrow( xFilterController->getFilterComponent( pItem->GetComponentIndex() ) ), UNO_SET_THROW );
+
+        // parse the given text as filter predicate
+        ::rtl::OUString aErr, aTxt( rText );
+        ::rtl::Reference< ISQLParseNode > xParseNode = predicateTree( aErr, aTxt, xFormatter, xField );
+        rErrorMsg = aErr;
+        rText = aTxt;
+        if ( xParseNode.is() )
+        {
+            ::rtl::OUString aPreparedText;
+            Locale aAppLocale = Application::GetSettings().GetUILocale();
+            xParseNode->parseNodeToPredicateStr(
+                aPreparedText, xConnection, xFormatter, xField, aAppLocale, '.', getParseContext() );
+            rText = aPreparedText;
+            return sal_True;
+        }
     }
-    else
-        return sal_False;
+    catch( const Exception& )
+    {
+        DBG_UNHANDLED_EXCEPTION();
+    }
+
+    return sal_False;
 }
 
 //------------------------------------------------------------------------
 void FmFilterModel::Append(FmFilterItems* pItems, FmFilterItem* pFilterItem)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterModel::Append" );
-    Insert(pItems->GetChilds().end(), pFilterItem);
+    Insert(pItems->GetChildren().end(), pFilterItem);
 }
 
 //------------------------------------------------------------------------
 void FmFilterModel::SetTextForItem(FmFilterItem* pItem, const ::rtl::OUString& rText)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterModel::SetTextForItem" );
-    ::std::vector<FmFilterData*>& rItems = pItem->GetParent()->GetParent()->GetChilds();
+    ::std::vector<FmFilterData*>& rItems = pItem->GetParent()->GetParent()->GetChildren();
     ::std::vector<FmFilterData*>::iterator i = ::std::find(rItems.begin(), rItems.end(), pItem->GetParent());
     sal_Int32 nParentPos = i - rItems.begin();
 
@@ -982,7 +967,6 @@ void FmFilterModel::SetTextForItem(FmFilterItem* pItem, const ::rtl::OUString& r
 //------------------------------------------------------------------------
 void FmFilterModel::SetCurrentItems(FmFilterItems* pCurrent)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterModel::SetCurrentItems" );
     if (m_pCurrentItems == pCurrent)
         return;
 
@@ -990,21 +974,26 @@ void FmFilterModel::SetCurrentItems(FmFilterItems* pCurrent)
     if (pCurrent)
     {
         FmFormItem* pFormItem = (FmFormItem*)pCurrent->GetParent();
-        ::std::vector<FmFilterData*>& rItems = pFormItem->GetChilds();
+        ::std::vector<FmFilterData*>& rItems = pFormItem->GetChildren();
         ::std::vector<FmFilterData*>::const_iterator i = ::std::find(rItems.begin(), rItems.end(), pCurrent);
 
         if (i != rItems.end())
         {
             // determine the filter position
             sal_Int32 nPos = i - rItems.begin();
-            FmXFormController* pController = FmXFormController::getImplementation( pFormItem->GetController().get() );
-            DBG_ASSERT( pController, "FmFilterAdapter::SetCurrentItems: no controller!" );
-            pController->setCurrentFilterPosition(nPos);
-            pFormItem->SetCurrentPosition(nPos);
+            try
+            {
+                Reference< XFilterController > xFilterController( pFormItem->GetFilterController(), UNO_SET_THROW );
+                xFilterController->setActiveTerm( nPos );
+            }
+            catch( const Exception& )
+            {
+                DBG_UNHANDLED_EXCEPTION();
+            }
 
-            if ((::com::sun::star::form::XFormController*)m_xController.get() != (::com::sun::star::form::XFormController*)pFormItem->GetController().get())
+            if ( m_xController != pFormItem->GetController() )
                 // calls SetCurrentItems again
-                SetCurrentController(pFormItem->GetController());
+                SetCurrentController( pFormItem->GetController() );
             else
                 m_pCurrentItems = pCurrent;
         }
@@ -1021,33 +1010,39 @@ void FmFilterModel::SetCurrentItems(FmFilterItems* pCurrent)
 }
 
 //------------------------------------------------------------------------
-void FmFilterModel::CheckIntegrity(FmParentData* pItem)
+void FmFilterModel::EnsureEmptyFilterRows( FmParentData& _rItem )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterModel::CheckIntegrity" );
     // checks whether for each form there's one free level for input
+    ::std::vector< FmFilterData* >& rChildren = _rItem.GetChildren();
+    sal_Bool bAppendLevel = _rItem.ISA( FmFormItem );
 
-    ::std::vector<FmFilterData*>& rItems = pItem->GetChilds();
-    sal_Bool bAppendLevel = sal_False;
-
-    for (::std::vector<FmFilterData*>::iterator i = rItems.begin();
-         i != rItems.end(); i++)
+    for (   ::std::vector<FmFilterData*>::iterator i = rChildren.begin();
+            i != rChildren.end();
+            ++i
+        )
     {
         FmFilterItems* pItems = PTR_CAST(FmFilterItems, *i);
-        if (pItems)
+        if ( pItems && pItems->GetChildren().empty() )
         {
-            bAppendLevel = !pItems->GetChilds().empty();
-            continue;
+            bAppendLevel = sal_False;
+            break;
         }
 
         FmFormItem* pFormItem = PTR_CAST(FmFormItem, *i);
         if (pFormItem)
         {
-            CheckIntegrity(pFormItem);
+            EnsureEmptyFilterRows( *pFormItem );
             continue;
         }
     }
-    if (bAppendLevel)
-        AppendFilterItems((FmFormItem*)pItem);
+
+    if ( bAppendLevel )
+    {
+        FmFormItem* pFormItem = PTR_CAST( FmFormItem, &_rItem );
+        OSL_ENSURE( pFormItem, "FmFilterModel::EnsureEmptyFilterRows: no FmFormItem, but a FmFilterItems child?" );
+        if ( pFormItem )
+            AppendFilterItems( *pFormItem );
+    }
 }
 
 //========================================================================
@@ -1069,25 +1064,31 @@ void FmFilterItemsString::Paint(const Point& rPos, SvLBox& rDev, sal_uInt16 /*nF
 {
     FmFilterItems* pRow = (FmFilterItems*)pEntry->GetUserData();
     FmFormItem* pForm = (FmFormItem*)pRow->GetParent();
+
     // current filter is significant painted
-    if (pForm->GetChilds()[pForm->GetCurrentPosition()] == pRow)
+    const bool bIsCurrentFilter = pForm->GetChildren()[ pForm->GetFilterController()->getActiveTerm() ] == pRow;
+    if ( bIsCurrentFilter )
     {
-        Color aLineColor(rDev.GetLineColor());
-        Rectangle aRect(rPos, GetSize(&rDev, pEntry ));
-        Point aFirst(rPos.X(), aRect.Bottom() - 6);
-        Point aSecond(aFirst.X() + 2, aFirst.Y() + 3);
+        rDev.Push( PUSH_LINECOLOR );
+
+        rDev.SetLineColor( rDev.GetTextColor() );
+
+        Rectangle aRect( rPos, GetSize( &rDev, pEntry ) );
+        Point aFirst( rPos.X(), aRect.Bottom() - 6 );
+        Point aSecond(aFirst .X() + 2, aFirst.Y() + 3 );
 
-        rDev.SetLineColor(rDev.GetTextColor());
-        rDev.DrawLine(aFirst, aSecond);
+        rDev.DrawLine( aFirst, aSecond );
 
         aFirst = aSecond;
         aFirst.X() += 1;
         aSecond.X() += 6;
         aSecond.Y() -= 5;
 
-        rDev.DrawLine(aFirst, aSecond);
-        rDev.SetLineColor( aLineColor );
+        rDev.DrawLine( aFirst, aSecond );
+
+        rDev.Pop();
     }
+
     rDev.DrawText( Point(rPos.X() + nxDBmp, rPos.Y()), GetText() );
 }
 
@@ -1168,7 +1169,6 @@ FmFilterNavigator::FmFilterNavigator( Window* pParent )
                   ,m_aTimerCounter( 0 )
                   ,m_aDropActionType( DA_SCROLLUP )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterNavigator::FmFilterNavigator" );
     SetHelpId( HID_FILTER_NAVIGATOR );
 
     {
@@ -1211,14 +1211,12 @@ FmFilterNavigator::~FmFilterNavigator()
 //------------------------------------------------------------------------
 void FmFilterNavigator::Clear()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterNavigator::Clear" );
     m_pModel->Clear();
 }
 
 //------------------------------------------------------------------------
-void FmFilterNavigator::UpdateContent(const Reference< ::com::sun::star::container::XIndexAccess > & xControllers, const Reference< ::com::sun::star::form::XFormController > & xCurrent)
+void FmFilterNavigator::UpdateContent(const Reference< XIndexAccess > & xControllers, const Reference< XFormController > & xCurrent)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterNavigator::UpdateContent" );
     if (xCurrent == m_pModel->GetCurrentController())
         return;
 
@@ -1246,7 +1244,6 @@ void FmFilterNavigator::UpdateContent(const Reference< ::com::sun::star::contain
 //------------------------------------------------------------------------
 sal_Bool FmFilterNavigator::EditingEntry( SvLBoxEntry* pEntry, Selection& rSelection )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterNavigator::EditingEntry" );
     m_pEditingCurrently = pEntry;
     if (!SvTreeListBox::EditingEntry( pEntry, rSelection ))
         return sal_False;
@@ -1257,7 +1254,6 @@ sal_Bool FmFilterNavigator::EditingEntry( SvLBoxEntry* pEntry, Selection& rSelec
 //------------------------------------------------------------------------
 sal_Bool FmFilterNavigator::EditedEntry( SvLBoxEntry* pEntry, const XubString& rNewText )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterNavigator::EditedEntry" );
     DBG_ASSERT(pEntry == m_pEditingCurrently, "FmFilterNavigator::EditedEntry: suspicious entry!");
     m_pEditingCurrently = NULL;
 
@@ -1293,7 +1289,6 @@ sal_Bool FmFilterNavigator::EditedEntry( SvLBoxEntry* pEntry, const XubString& r
         else
         {
             // display the error and return sal_False
-
             SQLContext aError;
             aError.Message = String(SVX_RES(RID_STR_SYNTAXERROR));
             aError.Details = aErrorMsg;
@@ -1350,7 +1345,6 @@ IMPL_LINK( FmFilterNavigator, OnDropActionTimer, void*, EMPTYARG )
 //------------------------------------------------------------------------
 sal_Int8 FmFilterNavigator::AcceptDrop( const AcceptDropEvent& rEvt )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterNavigator::AcceptDrop" );
     Point aDropPos = rEvt.maPosPixel;
 
     // kuemmern wir uns erst mal um moeglich DropActions (Scrollen und Aufklappen)
@@ -1378,7 +1372,7 @@ sal_Int8 FmFilterNavigator::AcceptDrop( const AcceptDropEvent& rEvt )
                 bNeedTrigger = sal_True;
             }
             else
-            {	// auf einem Entry mit Childs, der nicht aufgeklappt ist ?
+            {	// is it an entry whith children, and not yet expanded?
                 SvLBoxEntry* pDropppedOn = GetEntry(aDropPos);
                 if (pDropppedOn && (GetChildCount(pDropppedOn) > 0) && !IsExpanded(pDropppedOn))
                 {
@@ -1457,7 +1451,6 @@ namespace
 //------------------------------------------------------------------------
 sal_Int8 FmFilterNavigator::ExecuteDrop( const ExecuteDropEvent& rEvt )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterNavigator::ExecuteDrop" );
     // ware schlecht, wenn nach dem Droppen noch gescrollt wird ...
     if (m_aDropActionTimer.IsActive())
         m_aDropActionTimer.Stop();
@@ -1491,7 +1484,6 @@ void FmFilterNavigator::InitEntry(SvLBoxEntry* pEntry,
                                   const Image& rImg2,
                                                                   SvLBoxButtonKind eButtonKind)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterNavigator::InitEntry" );
     SvTreeListBox::InitEntry( pEntry, rStr, rImg1, rImg2, eButtonKind );
     SvLBoxString* pString = NULL;
 
@@ -1507,7 +1499,6 @@ void FmFilterNavigator::InitEntry(SvLBoxEntry* pEntry,
 //------------------------------------------------------------------------
 sal_Bool FmFilterNavigator::Select( SvLBoxEntry* pEntry, sal_Bool bSelect )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterNavigator::Select" );
     if (bSelect == IsSelected(pEntry))	// das passiert manchmal, ich glaube, die Basisklasse geht zu sehr auf Nummer sicher ;)
         return sal_True;
 
@@ -1543,7 +1534,6 @@ sal_Bool FmFilterNavigator::Select( SvLBoxEntry* pEntry, sal_Bool bSelect )
 //------------------------------------------------------------------------
 void FmFilterNavigator::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterNavigator::Notify" );
     if (rHint.ISA(FmFilterInsertedHint))
     {
         FmFilterInsertedHint* pHint = (FmFilterInsertedHint*)&rHint;
@@ -1577,7 +1567,6 @@ void FmFilterNavigator::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
 //------------------------------------------------------------------------
 SvLBoxEntry* FmFilterNavigator::FindEntry(const FmFilterData* pItem) const
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterNavigator::FindEntry" );
     SvLBoxEntry* pEntry = NULL;
     if (pItem)
     {
@@ -1594,23 +1583,23 @@ SvLBoxEntry* FmFilterNavigator::FindEntry(const FmFilterData* pItem) const
 //------------------------------------------------------------------------
 void FmFilterNavigator::Insert(FmFilterData* pItem, sal_Int32 nPos)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterNavigator::Insert" );
     const FmParentData* pParent = pItem->GetParent() ? pItem->GetParent() : GetFilterModel();
 
     // insert the item
-    SvLBoxEntry* pParentEntry = FindEntry(pParent);
+    SvLBoxEntry* pParentEntry = FindEntry( pParent );
     SvLBoxEntry* pNewEntry = InsertEntry(pItem->GetText(), pItem->GetImage(), pItem->GetImage(), pParentEntry, sal_False, nPos, pItem );
     if ( pNewEntry )
     {
         SetExpandedEntryBmp( pNewEntry, pItem->GetImage( BMP_COLOR_HIGHCONTRAST ), BMP_COLOR_HIGHCONTRAST );
         SetCollapsedEntryBmp( pNewEntry, pItem->GetImage( BMP_COLOR_HIGHCONTRAST ), BMP_COLOR_HIGHCONTRAST );
     }
+    if ( pParentEntry )
+        Expand( pParentEntry );
 }
 
 //------------------------------------------------------------------------
 void FmFilterNavigator::Remove(FmFilterData* pItem)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterNavigator::Remove" );
     // der Entry zu den Daten
     SvLBoxEntry* pEntry = FindEntry(pItem);
 
@@ -1624,7 +1613,6 @@ void FmFilterNavigator::Remove(FmFilterData* pItem)
 // -----------------------------------------------------------------------------
 FmFormItem* FmFilterNavigator::getSelectedFilterItems(::std::vector<FmFilterItem*>& _rItemList)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterNavigator::getSelectedFilterItems" );
     // be sure that the data is only used within only one form!
     FmFormItem* pFirstItem = NULL;
 
@@ -1659,35 +1647,37 @@ FmFormItem* FmFilterNavigator::getSelectedFilterItems(::std::vector<FmFilterItem
 // -----------------------------------------------------------------------------
 void FmFilterNavigator::insertFilterItem(const ::std::vector<FmFilterItem*>& _rFilterList,FmFilterItems* _pTargetItems,sal_Bool _bCopy)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterNavigator::insertFilterItem" );
     ::std::vector<FmFilterItem*>::const_iterator aEnd = _rFilterList.end();
-    for (::std::vector<FmFilterItem*>::const_iterator i = _rFilterList.begin(); i != aEnd; ++i)
+    for (   ::std::vector< FmFilterItem* >::const_iterator i = _rFilterList.begin();
+            i != aEnd;
+            ++i
+        )
     {
-        if ((*i)->GetParent() == _pTargetItems)
+        FmFilterItem* pLookupItem( *i );
+        if ( pLookupItem->GetParent() == _pTargetItems )
             continue;
-        else
+
+        FmFilterItem* pFilterItem = _pTargetItems->Find( pLookupItem->GetComponentIndex() );
+        String aText = pLookupItem->GetText();
+        if ( !pFilterItem )
         {
-            FmFilterItem* pFilterItem = _pTargetItems->Find((*i)->GetTextComponent());
-            String aText = (*i)->GetText();
-            if ( !pFilterItem )
-            {
-                pFilterItem = new FmFilterItem(m_pModel->getORB(),_pTargetItems, (*i)->GetFieldName(), aText, (*i)->GetTextComponent());
-                m_pModel->Append(_pTargetItems, pFilterItem);
-            }
+            pFilterItem = new FmFilterItem( m_pModel->getORB(), _pTargetItems, pLookupItem->GetFieldName(), aText, pLookupItem->GetComponentIndex() );
+            m_pModel->Append( _pTargetItems, pFilterItem );
+        }
 
-            if ( !_bCopy )
-                m_pModel->Remove(*i);
+        if ( !_bCopy )
+            m_pModel->Remove( pLookupItem );
 
-            // now set the text for the new dragged item
-            m_pModel->SetTextForItem(pFilterItem, aText);
-        }
+        // now set the text for the new dragged item
+        m_pModel->SetTextForItem( pFilterItem, aText );
     }
-    m_pModel->CheckIntegrity((FmFormItem*)_pTargetItems->GetParent());
+
+    m_pModel->EnsureEmptyFilterRows( *_pTargetItems->GetParent() );
 }
+
 //------------------------------------------------------------------------------
 void FmFilterNavigator::StartDrag( sal_Int8 /*_nAction*/, const Point& /*_rPosPixel*/ )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterNavigator::StartDrag" );
     EndSelection();
 
     // be sure that the data is only used within a only one form!
@@ -1705,7 +1695,6 @@ void FmFilterNavigator::StartDrag( sal_Int8 /*_nAction*/, const Point& /*_rPosPi
 //------------------------------------------------------------------------------
 void FmFilterNavigator::Command( const CommandEvent& rEvt )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterNavigator::Command" );
     sal_Bool bHandled = sal_False;
     switch (rEvt.GetCommand())
     {
@@ -1750,8 +1739,8 @@ void FmFilterNavigator::Command( const CommandEvent& rEvt )
             {
                 // don't delete the only empty row of a form
                 FmFilterItems* pFilterItems = PTR_CAST(FmFilterItems, aSelectList[0]);
-                if (pFilterItems && pFilterItems->GetChilds().empty()
-                    && pFilterItems->GetParent()->GetChilds().size() == 1)
+                if (pFilterItems && pFilterItems->GetChildren().empty()
+                    && pFilterItems->GetParent()->GetChildren().size() == 1)
                     aSelectList.clear();
             }
 
@@ -1808,7 +1797,6 @@ void FmFilterNavigator::Command( const CommandEvent& rEvt )
 // -----------------------------------------------------------------------------
 SvLBoxEntry* FmFilterNavigator::getNextEntry(SvLBoxEntry* _pStartWith)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterNavigator::getNextEntry" );
     SvLBoxEntry* pEntry = _pStartWith ? _pStartWith : LastSelected();
     pEntry = Next(pEntry);
     // we need the next filter entry
@@ -1819,7 +1807,6 @@ SvLBoxEntry* FmFilterNavigator::getNextEntry(SvLBoxEntry* _pStartWith)
 // -----------------------------------------------------------------------------
 SvLBoxEntry* FmFilterNavigator::getPrevEntry(SvLBoxEntry* _pStartWith)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterNavigator::getPrevEntry" );
     SvLBoxEntry* pEntry = _pStartWith ? _pStartWith : FirstSelected();
     pEntry = Prev(pEntry);
     // check if the previous entry is a filter, if so get the next prev
@@ -1835,81 +1822,90 @@ SvLBoxEntry* FmFilterNavigator::getPrevEntry(SvLBoxEntry* _pStartWith)
 //------------------------------------------------------------------------
 void FmFilterNavigator::KeyInput(const KeyEvent& rKEvt)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterNavigator::KeyInput" );
     const KeyCode&  rKeyCode = rKEvt.GetKeyCode();
-    if (	rKeyCode.IsMod1() 
-        &&	rKeyCode.IsMod2()
-        && !rKeyCode.IsShift()
-        && ( rKeyCode.GetCode() == KEY_UP || rKeyCode.GetCode() == KEY_DOWN )
-        )
+
+    switch ( rKeyCode.GetCode() )
+    {
+    case KEY_UP:
+    case KEY_DOWN:
     {
+        if ( !rKeyCode.IsMod1() || !rKeyCode.IsMod2() || rKeyCode.IsShift() )
+            break;
+
         ::std::vector<FmFilterItem*> aItemList;
-        if ( getSelectedFilterItems(aItemList) )
-        {
-            ::std::mem_fun1_t<SvLBoxEntry*,FmFilterNavigator,SvLBoxEntry*> aGetEntry = ::std::mem_fun(&FmFilterNavigator::getNextEntry);
-            if ( rKeyCode.GetCode() == KEY_UP )
-                aGetEntry = ::std::mem_fun(&FmFilterNavigator::getPrevEntry);
+        if ( !getSelectedFilterItems( aItemList ) )
+            break;
 
-            SvLBoxEntry* pTarget = aGetEntry(this,NULL);
+        ::std::mem_fun1_t<SvLBoxEntry*,FmFilterNavigator,SvLBoxEntry*> getter = ::std::mem_fun(&FmFilterNavigator::getNextEntry);
+        if ( rKeyCode.GetCode() == KEY_UP )
+            getter = ::std::mem_fun(&FmFilterNavigator::getPrevEntry);
 
-            if ( pTarget )
+        SvLBoxEntry* pTarget = getter( this, NULL );
+        if ( !pTarget )
+            break;
+
+        FmFilterItems* pTargetItems = getTargetItems( pTarget );
+        if ( !pTargetItems )
+            break;
+
+        ::std::vector<FmFilterItem*>::const_iterator aEnd = aItemList.end();
+        sal_Bool bNextTargetItem = sal_True;
+        while ( bNextTargetItem )
+        {
+            ::std::vector<FmFilterItem*>::const_iterator i = aItemList.begin();
+            for (; i != aEnd; ++i)
             {
-                FmFilterItems* pTargetItems = getTargetItems(pTarget);
-                if ( pTargetItems )
+                if ( (*i)->GetParent() == pTargetItems )
                 {
-                    ::std::vector<FmFilterItem*>::const_iterator aEnd = aItemList.end();
-                    sal_Bool bNextTargetItem = sal_True;
-                    while ( bNextTargetItem )
-                    {
-                        ::std::vector<FmFilterItem*>::const_iterator i = aItemList.begin();
-                        for (; i != aEnd; ++i)
-                        {
-                            if ( (*i)->GetParent() == pTargetItems )
-                            {
-                                pTarget = aGetEntry(this,pTarget);
-                                if ( !pTarget )
-                                    return;
-                                pTargetItems = getTargetItems(pTarget);
-                                break;
-                            }
-                            else
-                            {
-                                FmFilterItem* pFilterItem = pTargetItems->Find((*i)->GetTextComponent());
-                                // we found the text component so jump above
-                                if ( pFilterItem )
-                                {
-                                    pTarget = aGetEntry(this,pTarget);
-                                    if ( !pTarget )
-                                        return;
-                                    pTargetItems = getTargetItems(pTarget);
-                                    break;
-                                }
-                            }
-                        }
-                        bNextTargetItem = i != aEnd && pTargetItems;
-                    }
-                    if ( pTargetItems )
-                    {
-                        insertFilterItem(aItemList,pTargetItems);
+                    pTarget = getter(this,pTarget);
+                    if ( !pTarget )
                         return;
+                    pTargetItems = getTargetItems( pTarget );
+                    break;
+                }
+                else
+                {
+                    FmFilterItem* pFilterItem = pTargetItems->Find( (*i)->GetComponentIndex() );
+                    // we found the text component so jump above
+                    if ( pFilterItem )
+                    {
+                        pTarget = getter( this, pTarget );
+                        if ( !pTarget )
+                            return;
+
+                        pTargetItems = getTargetItems( pTarget );
+                        break;
                     }
                 }
             }
+            bNextTargetItem = i != aEnd && pTargetItems;
+        }
+
+        if ( pTargetItems )
+        {
+            insertFilterItem( aItemList, pTargetItems );
+            return;
         }
     }
-    else if (rKeyCode.GetCode() == KEY_DELETE && !rKeyCode.GetModifier())
+    break;
+
+    case KEY_DELETE:
     {
-        if (!IsSelected(First()) || GetEntryCount() > 1)
+        if ( rKeyCode.GetModifier() )
+            break;
+
+        if ( !IsSelected( First() ) || GetEntryCount() > 1 )
             DeleteSelection();
         return;
     }
+    }
+
     SvTreeListBox::KeyInput(rKEvt);
 }
 
 //------------------------------------------------------------------------------
 void FmFilterNavigator::DeleteSelection()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterNavigator::DeleteSelection" );
     // to avoid the deletion of an entry twice (e.g. deletion of a parent and afterward
     // the deletion of it's child, i have to shrink the selecton list
     ::std::vector<SvLBoxEntry*> aEntryList;
@@ -1935,9 +1931,6 @@ void FmFilterNavigator::DeleteSelection()
     {
         m_pModel->Remove((FmFilterData*)(*i)->GetUserData());
     }
-
-    // now check if we need to insert new items
-    m_pModel->CheckIntegrity(m_pModel);
 }
 // -----------------------------------------------------------------------------
 
@@ -1949,7 +1942,6 @@ FmFilterNavigatorWin::FmFilterNavigatorWin( SfxBindings* _pBindings, SfxChildWin
                      :SfxDockingWindow( _pBindings, _pMgr, _pParent, WinBits(WB_STDMODELESS|WB_SIZEABLE|WB_ROLLABLE|WB_3DLOOK|WB_DOCKABLE) )
                      ,SfxControllerItem( SID_FM_FILTER_NAVIGATOR_CONTROL, *_pBindings )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterNavigatorWin::FmFilterNavigatorWin" );
     SetHelpId( HID_FILTER_NAVIGATOR_WIN );
 
     m_pNavigator = new FmFilterNavigator( this );
@@ -1967,22 +1959,21 @@ FmFilterNavigatorWin::~FmFilterNavigatorWin()
 //-----------------------------------------------------------------------
 void FmFilterNavigatorWin::UpdateContent(FmFormShell* pFormShell)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterNavigatorWin::UpdateContent" );
     if (!pFormShell)
         m_pNavigator->UpdateContent( NULL, NULL );
     else
     {
-        Reference< ::com::sun::star::form::XFormController >  xController(pFormShell->GetImpl()->getActiveInternalController());
-        Reference< ::com::sun::star::container::XIndexAccess >	xContainer;
+        Reference< XFormController >  xController(pFormShell->GetImpl()->getActiveInternalController());
+        Reference< XIndexAccess >	xContainer;
         if (xController.is())
         {
-            Reference< ::com::sun::star::container::XChild >  xChild(xController, UNO_QUERY);
+            Reference< XChild >  xChild(xController, UNO_QUERY);
             for (Reference< XInterface >  xParent(xChild->getParent());
                  xParent.is();
                  xParent = xChild.is() ? xChild->getParent() : Reference< XInterface > ())
             {
-                xContainer = Reference< ::com::sun::star::container::XIndexAccess > (xParent, UNO_QUERY);
-                xChild = Reference< ::com::sun::star::container::XChild > (xParent, UNO_QUERY);
+                xContainer = Reference< XIndexAccess > (xParent, UNO_QUERY);
+                xChild = Reference< XChild > (xParent, UNO_QUERY);
             }
         }
         m_pNavigator->UpdateContent(xContainer, xController);
@@ -1992,7 +1983,6 @@ void FmFilterNavigatorWin::UpdateContent(FmFormShell* pFormShell)
 //-----------------------------------------------------------------------
 void FmFilterNavigatorWin::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterNavigatorWin::StateChanged" );
     if( !pState  || SID_FM_FILTER_NAVIGATOR_CONTROL != nSID )
         return;
 
@@ -2008,7 +1998,6 @@ void FmFilterNavigatorWin::StateChanged( sal_uInt16 nSID, SfxItemState eState, c
 //-----------------------------------------------------------------------
 sal_Bool FmFilterNavigatorWin::Close()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterNavigatorWin::Close" );
     if ( m_pNavigator && m_pNavigator->IsEditingActive() )
         m_pNavigator->EndEditing();
 
@@ -2023,7 +2012,6 @@ sal_Bool FmFilterNavigatorWin::Close()
 //-----------------------------------------------------------------------
 void FmFilterNavigatorWin::FillInfo( SfxChildWinInfo& rInfo ) const
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterNavigatorWin::FillInfo" );
     SfxDockingWindow::FillInfo( rInfo );
     rInfo.bVisible = sal_False;
 }
@@ -2031,7 +2019,6 @@ void FmFilterNavigatorWin::FillInfo( SfxChildWinInfo& rInfo ) const
 //-----------------------------------------------------------------------
 Size FmFilterNavigatorWin::CalcDockingSize( SfxChildAlignment eAlign )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterNavigatorWin::CalcDockingSize" );
     if ( ( eAlign == SFX_ALIGN_TOP ) || ( eAlign == SFX_ALIGN_BOTTOM ) )
         return Size();
 
@@ -2041,7 +2028,6 @@ Size FmFilterNavigatorWin::CalcDockingSize( SfxChildAlignment eAlign )
 //-----------------------------------------------------------------------
 SfxChildAlignment FmFilterNavigatorWin::CheckAlignment( SfxChildAlignment eActAlign, SfxChildAlignment eAlign )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterNavigatorWin::CheckAlignment" );
     switch (eAlign)
     {
         case SFX_ALIGN_LEFT:
@@ -2058,7 +2044,6 @@ SfxChildAlignment FmFilterNavigatorWin::CheckAlignment( SfxChildAlignment eActAl
 //------------------------------------------------------------------------
 void FmFilterNavigatorWin::Resize()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterNavigatorWin::Resize" );
     SfxDockingWindow::Resize();
 
     Size aLogOutputSize = PixelToLogic( GetOutputSizePixel(), MAP_APPFONT );
@@ -2074,7 +2059,6 @@ void FmFilterNavigatorWin::Resize()
 // -----------------------------------------------------------------------------
 void FmFilterNavigatorWin::GetFocus()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFilterNavigatorWin::GetFocus" );
     // oj #97405#
     if ( m_pNavigator )
         m_pNavigator->GrabFocus();
diff --git a/svx/source/form/fmcontrolbordermanager.cxx b/svx/source/form/fmcontrolbordermanager.cxx
index 17bd103463..5c63976628 100644
--- a/svx/source/form/fmcontrolbordermanager.cxx
+++ b/svx/source/form/fmcontrolbordermanager.cxx
@@ -6,9 +6,6 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmcontrolbordermanager.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/form/fmcontrollayout.cxx b/svx/source/form/fmcontrollayout.cxx
index bc11294a31..f0d21e2a2c 100644
--- a/svx/source/form/fmcontrollayout.cxx
+++ b/svx/source/form/fmcontrollayout.cxx
@@ -6,9 +6,6 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmcontrollayout.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx
index 106f081418..78811de36d 100644
--- a/svx/source/form/fmobj.cxx
+++ b/svx/source/form/fmobj.cxx
@@ -30,35 +30,35 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include <tools/resmgr.hxx>
-#include <tools/diagnose_ex.h>
 #include "fmobj.hxx"
 #include "fmprop.hrc"
 #include "fmvwimp.hxx"
-#include <svx/editeng.hxx>
-#include <svx/svdovirt.hxx>
+#include "fmpgeimp.hxx"
+#include "fmresids.hrc"
+#include "svx/fmview.hxx"
+#include "svx/fmglob.hxx"
+#include "svx/fmpage.hxx"
+#include "svx/editeng.hxx"
+#include "svx/svdovirt.hxx"
+#include "svx/fmmodel.hxx"
+#include "svx/dialmgr.hxx"
 
 /** === begin UNO includes === **/
 #include <com/sun/star/awt/XDevice.hpp>
 #include <com/sun/star/script/XEventAttacherManager.hpp>
 #include <com/sun/star/io/XPersistObject.hpp>
 #include <com/sun/star/awt/XControlContainer.hpp>
+#include <com/sun/star/util/XCloneable.hpp>
 /** === end UNO includes === **/
-#include <svx/fmmodel.hxx>
 #include "svx/fmtools.hxx"
-#include <tools/shl.hxx>
-#include <svx/dialmgr.hxx>
-
-#include "fmresids.hrc"
-#include <svx/fmview.hxx>
-#include <svx/fmglob.hxx>
 
-#include "fmpgeimp.hxx"
-#include <svx/fmpage.hxx>
+#include <tools/shl.hxx>
 #include <comphelper/property.hxx>
 #include <comphelper/processfactory.hxx>
 #include <toolkit/awt/vclxdevice.hxx>
 #include <vcl/svapp.hxx>
+#include <tools/resmgr.hxx>
+#include <tools/diagnose_ex.h>
 
 using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::uno;
@@ -437,10 +437,48 @@ void FmFormObj::operator= (const SdrObject& rObj)
 }
 
 //------------------------------------------------------------------
+namespace
+{
+    String lcl_getFormComponentAccessPath(const Reference< XInterface >& _xElement, Reference< XInterface >& _rTopLevelElement)
+    {
+        Reference< ::com::sun::star::form::XFormComponent> xChild(_xElement, UNO_QUERY);
+        Reference< ::com::sun::star::container::XIndexAccess> xParent;
+        if (xChild.is())
+            xParent = Reference< ::com::sun::star::container::XIndexAccess>(xChild->getParent(), UNO_QUERY);
+
+        // while the current content is a form
+        String sReturn;
+        String sCurrentIndex;
+        while (xChild.is())
+        {
+            // get the content's relative pos within it's parent container
+            sal_Int32 nPos = getElementPos(xParent, xChild);
+
+            // prepend this current relaive pos
+            sCurrentIndex = String::CreateFromInt32(nPos);
+            if (sReturn.Len() != 0)
+            {
+                sCurrentIndex += '\\';
+                sCurrentIndex += sReturn;
+            }
+
+            sReturn = sCurrentIndex;
+
+            // travel up
+            if (::comphelper::query_interface((Reference< XInterface >)xParent,xChild))
+                xParent = Reference< ::com::sun::star::container::XIndexAccess>(xChild->getParent(), UNO_QUERY);
+        }
+
+        _rTopLevelElement = xParent;
+        return sReturn;
+    }
+}
+
+//------------------------------------------------------------------
 Reference< XInterface >  FmFormObj::ensureModelEnv(const Reference< XInterface > & _rSourceContainer, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >  _rTopLevelDestContainer)
 {
     Reference< XInterface >  xTopLevelSouce;
-    String sAccessPath = getFormComponentAccessPath(_rSourceContainer, xTopLevelSouce);
+    String sAccessPath = lcl_getFormComponentAccessPath(_rSourceContainer, xTopLevelSouce);
     if (!xTopLevelSouce.is())
         // somthing went wrong, maybe _rSourceContainer isn't part of a valid forms hierarchy
         return Reference< XInterface > ();
@@ -547,8 +585,8 @@ Reference< XInterface >  FmFormObj::ensureModelEnv(const Reference< XInterface >
                     DBG_ASSERT(xSourcePersist.is(), "FmFormObj::ensureModelEnv : invalid form (no persist object) !");
 
                     // create and insert (into the destination) a clone of the form
-                    xCurrentDestForm = Reference< XPropertySet > (cloneUsingProperties(xSourcePersist), UNO_QUERY);
-                    DBG_ASSERT(xCurrentDestForm.is(), "FmFormObj::ensureModelEnv : invalid cloned form !");
+                    Reference< XCloneable > xCloneable( xSourcePersist, UNO_QUERY_THROW );
+                    xCurrentDestForm.set( xCloneable->createClone(), UNO_QUERY_THROW );
 
                     DBG_ASSERT(nCurrentDestIndex == xDestContainer->getCount(), "FmFormObj::ensureModelEnv : something went wrong with the numbers !");
                     xDestContainer->insertByIndex(nCurrentDestIndex, makeAny(xCurrentDestForm));
diff --git a/svx/source/form/fmservs.cxx b/svx/source/form/fmservs.cxx
index d41886c844..c1f738fea6 100644
--- a/svx/source/form/fmservs.cxx
+++ b/svx/source/form/fmservs.cxx
@@ -49,7 +49,8 @@
 
 
     DECL_SERVICE( FmXGridControl )
-    DECL_SERVICE( FmXFormController )
+    DECL_SERVICE( FormController )
+    DECL_SERVICE( LegacyFormController )
 
 
 // ------------------------------------------------------------------------
@@ -91,7 +92,8 @@ namespace svxform
 
         // ------------------------------------------------------------------------
         // FormController
-        REGISTER_SERVICE(FmXFormController, FM_FORM_CONTROLLER);
+        REGISTER_SERVICE( FormController, FM_FORM_CONTROLLER );
+        REGISTER_SERVICE( LegacyFormController, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.FormController" ) ) );
 
         // ------------------------------------------------------------------------
         // FormController
@@ -102,9 +104,6 @@ namespace svxform
         REGISTER_SERVICE(FmXGridControl, FM_CONTROL_GRID);	// compatibility
         REGISTER_SERVICE(FmXGridControl, FM_CONTROL_GRIDCONTROL);
         REGISTER_SERVICE(FmXGridControl, FM_SUN_CONTROL_GRIDCONTROL);
-
-        
     };
 
-
 }	// namespace svxform
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index 00ffaeef47..83df202699 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -685,7 +685,7 @@ void FmFormShell::Execute(SfxRequest &rReq)
         case SID_FM_FILTER_NAVIGATOR:
         case SID_FM_SHOW_DATANAVIGATOR :
         {
-            GetViewShell()->GetViewFrame()->ChildWindowExecute(rReq);
+            GetViewShell()->GetViewFrame()->ChildWindowExecute( rReq );
             rReq.Done();
         }	break;
         case SID_FM_SHOW_FMEXPLORER:
@@ -827,7 +827,7 @@ void FmFormShell::Execute(SfxRequest &rReq)
                         bReopenNavigator = sal_True;
                     }
 
-                Reference< XFormController >  xController( GetImpl()->getActiveController() );
+                Reference< runtime::XFormController >  xController( GetImpl()->getActiveController() );
 
                 if	(	GetViewShell()->GetViewFrame()->HasChildWindow( SID_FM_FILTER_NAVIGATOR )
                         // closing the window was denied, for instance because of a invalid criterion
@@ -857,6 +857,11 @@ void FmFormShell::Execute(SfxRequest &rReq)
         {
             GetImpl()->startFiltering();
             rReq.Done();
+
+            // initially open the filter navigator, the whole form based filter is pretty useless without it
+            SfxBoolItem aIdentifierItem( SID_FM_FILTER_NAVIGATOR, TRUE );
+            GetViewShell()->GetViewFrame()->GetDispatcher()->Execute( SID_FM_FILTER_NAVIGATOR, SFX_CALLMODE_ASYNCHRON,
+                &aIdentifierItem, NULL );
         }	break;
     }
 }
@@ -1400,7 +1405,7 @@ SdrUnoObj* FmFormShell::GetFormControl( const Reference< XControlModel >& _rxMod
 }
 
 //------------------------------------------------------------------------
-Reference< XFormController > FmFormShell::GetFormController( const Reference< XForm >& _rxForm, const SdrView& _rView, const OutputDevice& _rDevice ) const
+Reference< runtime::XFormController > FmFormShell::GetFormController( const Reference< XForm >& _rxForm, const SdrView& _rView, const OutputDevice& _rDevice ) const
 {
     const FmFormView* pFormView = dynamic_cast< const FmFormView* >( &_rView );
     if ( !pFormView )
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 4b0c10e81d..00f498448b 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -30,89 +30,88 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include "gridcols.hxx"
-#include <svx/obj3d.hxx>
-#include "fmvwimp.hxx"
-#include "fmshimp.hxx"
-#include "fmtextcontrolshell.hxx"
-#include <svx/svdpagv.hxx>
-#include <svx/fmpage.hxx>
-#include <svx/dialmgr.hxx>
-#ifndef _SVX_FMRESIDS_HRC
-#include "fmresids.hrc"
-#endif
+
 #include "fmitems.hxx"
 #include "fmobj.hxx"
-#include "formtoolbars.hxx"
-#include <svx/fmglob.hxx>
-#include "svditer.hxx"
-#include "fmservs.hxx"
 #include "fmpgeimp.hxx"
 #include "svx/fmtools.hxx"
-#ifndef _SVX_FMPROP_HRC
 #include "fmprop.hrc"
-#endif
-#include <svx/fmshell.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include <svx/fmmodel.hxx>
+#include "fmresids.hrc"
+#include "fmservs.hxx"
+#include "fmshimp.hxx"
+#include "fmtextcontrolshell.hxx"
 #include "fmundo.hxx"
 #include "fmurl.hxx"
-#include "formcontrolling.hxx"
-#include <svx/svxdlg.hxx>
-#include <svx/dialogs.hrc>
-#include <com/sun/star/frame/FrameSearchFlag.hpp>
-#include <com/sun/star/form/XLoadable.hpp>
-#include <com/sun/star/container/XNamed.hpp>
+#include "fmvwimp.hxx"
+#include "formtoolbars.hxx"
+#include "gridcols.hxx"
+#include "svditer.hxx"
+#include "svx/dialmgr.hxx"
+#include "svx/dialogs.hrc"
+#include "svx/fmglob.hxx"
+#include "svx/fmmodel.hxx"
+#include "svx/fmpage.hxx"
+#include "svx/fmshell.hxx"
+#include "svx/obj3d.hxx"
+#include "svx/sdrpagewindow.hxx"
+#include "svx/svdpagv.hxx"
+#include "svx/svxdlg.hxx"
+#include "svx/svxids.hrc"
+
+/** === begin UNO includes === **/
+#include <com/sun/star/awt/XCheckBox.hpp>
+#include <com/sun/star/awt/XListBox.hpp>
+#include <com/sun/star/awt/XTextComponent.hpp>
+#include <com/sun/star/beans/NamedValue.hpp>
+#include <com/sun/star/beans/PropertyAttribute.hpp>
+#include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/container/XContainer.hpp>
 #include <com/sun/star/container/XEnumeration.hpp>
-#include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/container/XEnumerationAccess.hpp>
-#include <com/sun/star/frame/FrameSearchFlag.hpp>
-#include <com/sun/star/awt/XTextComponent.hpp>
-#include <com/sun/star/awt/XListBox.hpp>
-#include <com/sun/star/awt/XCheckBox.hpp>
-#include <com/sun/star/form/XBoundComponent.hpp>
+#include <com/sun/star/container/XIndexAccess.hpp>
+#include <com/sun/star/container/XNamed.hpp>
 #include <com/sun/star/form/ListSourceType.hpp>
-#include <com/sun/star/view/XSelectionSupplier.hpp>
-#include <com/sun/star/script/XEventAttacherManager.hpp>
+#include <com/sun/star/form/XBoundComponent.hpp>
 #include <com/sun/star/form/XBoundControl.hpp>
-#include <com/sun/star/form/XReset.hpp>
 #include <com/sun/star/form/XGrid.hpp>
 #include <com/sun/star/form/XGridPeer.hpp>
-#include <com/sun/star/util/XNumberFormatter.hpp>
-#include <com/sun/star/util/XModeSelector.hpp>
-#include <com/sun/star/util/XModifyBroadcaster.hpp>
-#include <com/sun/star/util/XCancellable.hpp>
-#include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <com/sun/star/beans/XPropertyState.hpp>
+#include <com/sun/star/form/XLoadable.hpp>
+#include <com/sun/star/form/XReset.hpp>
 #include <com/sun/star/form/binding/XBindableValue.hpp>
-#include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/form/binding/XListEntrySink.hpp>
+#include <com/sun/star/frame/FrameSearchFlag.hpp>
+#include <com/sun/star/script/XEventAttacherManager.hpp>
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
+#include <com/sun/star/util/XCancellable.hpp>
+#include <com/sun/star/util/XModeSelector.hpp>
+#include <com/sun/star/util/XModifyBroadcaster.hpp>
+#include <com/sun/star/util/XNumberFormatter.hpp>
+#include <com/sun/star/view/XSelectionSupplier.hpp>
+#include <com/sun/star/beans/XIntrospection.hpp>
+/** === end UNO includes === **/
+
+#include <comphelper/extract.hxx>
+#include <comphelper/processfactory.hxx>
+#include <comphelper/property.hxx>
+#include <comphelper/stl_types.hxx>
+#include <connectivity/dbtools.hxx>
+#include <cppuhelper/servicefactory.hxx>
 #include <osl/mutex.hxx>
-#include <sfx2/viewsh.hxx>
-#include <sfx2/viewfrm.hxx>
-#include <sfx2/frame.hxx>
-#include <vcl/waitobj.hxx>
-#include <tools/shl.hxx>
-#include <tools/diagnose_ex.h>
-#include <vcl/msgbox.hxx>
+#include <rtl/logfile.hxx>
 #include <sfx2/dispatch.hxx>
-#include <sfx2/objsh.hxx>
 #include <sfx2/docfile.hxx>
+#include <sfx2/frame.hxx>
+#include <sfx2/objsh.hxx>
+#include <sfx2/viewfrm.hxx>
+#include <sfx2/viewsh.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <tools/color.hxx>
+#include <tools/diagnose_ex.h>
+#include <tools/shl.hxx>
 #include <tools/urlobj.hxx>
-#include <comphelper/property.hxx>
-#include <connectivity/dbtools.hxx>
-#include <comphelper/stl_types.hxx>
-#include <comphelper/processfactory.hxx>
-#include <cppuhelper/servicefactory.hxx>
-#include <comphelper/extract.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
-#include <svx/sdrpagewindow.hxx>
-#include <rtl/logfile.hxx>
+#include <vcl/msgbox.hxx>
+#include <vcl/waitobj.hxx>
+#include <vos/mutex.hxx>
 
 #include <algorithm>
 #include <functional>
@@ -281,6 +280,7 @@ using namespace ::com::sun::star::view;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::util;
 using namespace ::com::sun::star::frame;
+using namespace ::com::sun::star::script;
 using namespace ::svxform;
 using namespace ::svx;
 
@@ -289,7 +289,7 @@ using namespace ::svx;
 //==============================================================================
 namespace
 {
-    //....................................................................
+    //..........................................................................
     void collectInterfacesFromMarkList( const SdrMarkList& _rMarkList, InterfaceBag& /* [out] */ _rInterfaces )
     {
         _rInterfaces.clear();
@@ -327,6 +327,198 @@ namespace
         }
     }
 
+    //..........................................................................
+    sal_Int16 GridView2ModelPos(const Reference< XIndexAccess>& rColumns, sal_Int16 nViewPos)
+    {
+        try
+        {
+            if (rColumns.is())
+            {
+                // loop through all columns
+                sal_Int16 i;
+                Reference< XPropertySet> xCur;
+                for (i=0; i<rColumns->getCount(); ++i)
+                {
+                    rColumns->getByIndex(i) >>= xCur;
+                    if (!::comphelper::getBOOL(xCur->getPropertyValue(FM_PROP_HIDDEN)))
+                    {
+                        // for every visible col : if nViewPos is greater zero, decrement it, else we
+                        // have found the model position
+                        if (!nViewPos)
+                            break;
+                        else
+                            --nViewPos;
+                    }
+                }
+                if (i<rColumns->getCount())
+                    return i;
+            }
+        }
+        catch(const Exception&)
+        {
+            DBG_UNHANDLED_EXCEPTION();
+        }
+        return (sal_Int16)-1;
+    }
+
+    //..........................................................................
+    Sequence< ::rtl::OUString> getEventMethods(const Type& type)
+    {
+        typelib_InterfaceTypeDescription *pType=0;
+        type.getDescription( (typelib_TypeDescription**)&pType);
+
+        if(!pType)
+            return Sequence< ::rtl::OUString>();
+
+        Sequence< ::rtl::OUString> aNames(pType->nMembers);
+        ::rtl::OUString* pNames = aNames.getArray();
+        for(sal_Int32 i=0;i<pType->nMembers;i++,++pNames)
+        {
+            // the decription reference
+            typelib_TypeDescriptionReference* pMemberDescriptionReference = pType->ppMembers[i];
+            // the description for the reference
+            typelib_TypeDescription* pMemberDescription = NULL;
+            typelib_typedescriptionreference_getDescription(&pMemberDescription, pMemberDescriptionReference);
+            if (pMemberDescription)
+            {
+                typelib_InterfaceMemberTypeDescription* pRealMemberDescription =
+                    reinterpret_cast<typelib_InterfaceMemberTypeDescription*>(pMemberDescription);
+                *pNames = pRealMemberDescription->pMemberName;
+            }
+        }
+        typelib_typedescription_release( (typelib_TypeDescription *)pType );
+        return aNames;
+    }
+
+    //..........................................................................
+    void TransferEventScripts(const Reference< XControlModel>& xModel, const Reference< XControl>& xControl,
+        const Sequence< ScriptEventDescriptor>& rTransferIfAvailable)
+    {
+        // first check if we have a XEventAttacherManager for the model
+        Reference< XChild> xModelChild(xModel, UNO_QUERY);
+        if (!xModelChild.is())
+            return; // nothing to do
+
+        Reference< XEventAttacherManager> xEventManager(xModelChild->getParent(), UNO_QUERY);
+        if (!xEventManager.is())
+            return; // nothing to do
+
+        if (!rTransferIfAvailable.getLength())
+            return; // nothing to do
+
+        // check for the index of the model within it's parent
+        Reference< XIndexAccess> xParentIndex(xModelChild->getParent(), UNO_QUERY);
+        if (!xParentIndex.is())
+            return; // nothing to do
+        sal_Int32 nIndex = getElementPos(xParentIndex, xModel);
+        if (nIndex<0 || nIndex>=xParentIndex->getCount())
+            return; // nothing to do
+
+        // then we need informations about the listeners supported by the control and the model
+        Sequence< Type> aModelListeners;
+        Sequence< Type> aControlListeners;
+
+        Reference< XIntrospection> xModelIntrospection(::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString::createFromAscii("com.sun.star.beans.Introspection")), UNO_QUERY);
+        Reference< XIntrospection> xControlIntrospection(::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString::createFromAscii("com.sun.star.beans.Introspection")), UNO_QUERY);
+
+        if (xModelIntrospection.is() && xModel.is())
+        {
+            Any aModel(makeAny(xModel));
+            aModelListeners = xModelIntrospection->inspect(aModel)->getSupportedListeners();
+        }
+
+        if (xControlIntrospection.is() && xControl.is())
+        {
+            Any aControl(makeAny(xControl));
+            aControlListeners = xControlIntrospection->inspect(aControl)->getSupportedListeners();
+        }
+
+        sal_Int32 nMaxNewLen = aModelListeners.getLength() + aControlListeners.getLength();
+        if (!nMaxNewLen)
+            return; // the model and the listener don't support any listeners (or we were unable to retrieve these infos)
+
+        Sequence< ScriptEventDescriptor>	aTransferable(nMaxNewLen);
+        ScriptEventDescriptor* pTransferable = aTransferable.getArray();
+
+        const ScriptEventDescriptor* pCurrent = rTransferIfAvailable.getConstArray();
+        sal_Int32 i,j,k;
+        for (i=0; i<rTransferIfAvailable.getLength(); ++i, ++pCurrent)
+        {
+            // search the model/control idl classes for the event described by pCurrent
+            for (	Sequence< Type>* pCurrentArray = &aModelListeners;
+                    pCurrentArray;
+                    pCurrentArray = (pCurrentArray == &aModelListeners) ? &aControlListeners : NULL
+                )
+            {
+                const Type* pCurrentListeners = pCurrentArray->getConstArray();
+                for (j=0; j<pCurrentArray->getLength(); ++j, ++pCurrentListeners)
+                {
+                    UniString aListener = (*pCurrentListeners).getTypeName();
+                    xub_StrLen nTokens = aListener.GetTokenCount('.');
+                    if (nTokens)
+                        aListener = aListener.GetToken(nTokens - 1, '.');
+
+                    if (aListener == pCurrent->ListenerType.getStr())
+                        // the current ScriptEventDescriptor doesn't match the current listeners class
+                        continue;
+
+                    // now check the methods
+                    Sequence< ::rtl::OUString> aMethodsNames = getEventMethods(*pCurrentListeners);
+                    const ::rtl::OUString* pMethodsNames = aMethodsNames.getConstArray();
+                    for (k=0; k<aMethodsNames.getLength(); ++k, ++pMethodsNames)
+                    {
+                        if ((*pMethodsNames).compareTo(pCurrent->EventMethod) != COMPARE_EQUAL)
+                            // the current ScriptEventDescriptor doesn't match the current listeners current method
+                            continue;
+
+                        // we can transfer the script event : the model (control) supports it
+                        *pTransferable = *pCurrent;
+                        ++pTransferable;
+                        break;
+                    }
+                    if (k<aMethodsNames.getLength())
+                        break;
+                }
+            }
+        }
+
+        sal_Int32 nRealNewLen = pTransferable - aTransferable.getArray();
+        aTransferable.realloc(nRealNewLen);
+
+        xEventManager->registerScriptEvents(nIndex, aTransferable);
+    }
+
+    //------------------------------------------------------------------------------
+    ::rtl::OUString getServiceNameByControlType(sal_Int16 nType)
+    {
+        switch (nType)
+        {
+            case OBJ_FM_EDIT			: return FM_COMPONENT_TEXTFIELD;
+            case OBJ_FM_BUTTON			: return FM_COMPONENT_COMMANDBUTTON;
+            case OBJ_FM_FIXEDTEXT		: return FM_COMPONENT_FIXEDTEXT;
+            case OBJ_FM_LISTBOX 		: return FM_COMPONENT_LISTBOX;
+            case OBJ_FM_CHECKBOX		: return FM_COMPONENT_CHECKBOX;
+            case OBJ_FM_RADIOBUTTON 	: return FM_COMPONENT_RADIOBUTTON;
+            case OBJ_FM_GROUPBOX		: return FM_COMPONENT_GROUPBOX;
+            case OBJ_FM_COMBOBOX		: return FM_COMPONENT_COMBOBOX;
+            case OBJ_FM_GRID			: return FM_COMPONENT_GRIDCONTROL;
+            case OBJ_FM_IMAGEBUTTON 	: return FM_COMPONENT_IMAGEBUTTON;
+            case OBJ_FM_FILECONTROL 	: return FM_COMPONENT_FILECONTROL;
+            case OBJ_FM_DATEFIELD		: return FM_COMPONENT_DATEFIELD;
+            case OBJ_FM_TIMEFIELD		: return FM_COMPONENT_TIMEFIELD;
+            case OBJ_FM_NUMERICFIELD	: return FM_COMPONENT_NUMERICFIELD;
+            case OBJ_FM_CURRENCYFIELD	: return FM_COMPONENT_CURRENCYFIELD;
+            case OBJ_FM_PATTERNFIELD	: return FM_COMPONENT_PATTERNFIELD;
+            case OBJ_FM_HIDDEN			: return FM_COMPONENT_HIDDENCONTROL;
+            case OBJ_FM_IMAGECONTROL	: return FM_COMPONENT_IMAGECONTROL;
+            case OBJ_FM_FORMATTEDFIELD	: return FM_COMPONENT_FORMATTEDFIELD;
+            case OBJ_FM_SCROLLBAR       : return FM_SUN_COMPONENT_SCROLLBAR;
+            case OBJ_FM_SPINBUTTON      : return FM_SUN_COMPONENT_SPINBUTTON;
+            case OBJ_FM_NAVIGATIONBAR   : return FM_SUN_COMPONENT_NAVIGATIONBAR;
+        }
+        return ::rtl::OUString();
+    }
+
 }
 
 //------------------------------------------------------------------------------
@@ -504,7 +696,6 @@ FmXFormShell::FmXFormShell( FmFormShell& _rShell, SfxViewFrame* _pViewFrame )
         ,m_pTextShell( new ::svx::FmTextControlShell( _pViewFrame ) )
         ,m_aActiveControllerFeatures( ::comphelper::getProcessServiceFactory(), this )
         ,m_aNavControllerFeatures( ::comphelper::getProcessServiceFactory(), this )
-        ,m_pExternalViewInterceptor( NULL )
         ,m_eDocumentType( eUnknownDocumentType )
         ,m_nLockSlotInvalidation( 0 )
         ,m_bHadPropertyBrowserInDesignMode( sal_False )
@@ -675,7 +866,8 @@ void SAL_CALL FmXFormShell::disposing(const EventObject& e) throw( RuntimeExcept
 
     if (e.Source == m_xExternalViewController)
     {
-        Reference< XFormController> xFormController(m_xExternalViewController, UNO_QUERY);
+        Reference< runtime::XFormController > xFormController( m_xExternalViewController, UNO_QUERY );
+        OSL_ENSURE( xFormController.is(), "FmXFormShell::disposing: invalid external view controller!" );
         if (xFormController.is())
             xFormController->removeActivateListener((XFormControllerListener*)this);
 
@@ -765,7 +957,7 @@ void SAL_CALL FmXFormShell::formActivated(const EventObject& rEvent) throw( Runt
     if ( impl_checkDisposed() )
         return;
 
-    Reference< XFormController > xController( rEvent.Source, UNO_QUERY_THROW );
+    Reference< runtime::XFormController > xController( rEvent.Source, UNO_QUERY_THROW );
     m_pTextShell->formActivated( xController );
     setActiveController( xController );
 }
@@ -777,7 +969,7 @@ void SAL_CALL FmXFormShell::formDeactivated(const EventObject& rEvent) throw( Ru
     if ( impl_checkDisposed() )
         return;
 
-    Reference< XFormController > xController( rEvent.Source, UNO_QUERY_THROW );
+    Reference< runtime::XFormController > xController( rEvent.Source, UNO_QUERY_THROW );
     m_pTextShell->formDeactivated( xController );
 }
 
@@ -798,14 +990,6 @@ void FmXFormShell::disposing()
         // are still uncommitted changes, the user explicitly wanted this.
         // 2002-11-11 - 104702 - fs@openoffice.org
 
-    // dispose our interceptor helpers
-    if (m_pExternalViewInterceptor)
-    {
-        m_pExternalViewInterceptor->dispose();
-        m_pExternalViewInterceptor->release();
-        m_pExternalViewInterceptor = NULL;
-    }
-
     m_pTextShell->dispose();
 
     m_xAttachedFrame = NULL;
@@ -1703,7 +1887,7 @@ Reference< XResultSet> FmXFormShell::getInternalForm(const Reference< XResultSet
     if ( impl_checkDisposed() )
         return NULL;
 
-    Reference< XFormController> xExternalCtrlr(m_xExternalViewController, UNO_QUERY);
+    Reference< runtime::XFormController> xExternalCtrlr(m_xExternalViewController, UNO_QUERY);
     if (xExternalCtrlr.is() && (_xForm == xExternalCtrlr->getModel()))
     {
         DBG_ASSERT(m_xExternalDisplayedForm.is(), "FmXFormShell::getInternalForm : invalid external form !");
@@ -1719,7 +1903,7 @@ Reference< XForm> FmXFormShell::getInternalForm(const Reference< XForm>& _xForm)
     if ( impl_checkDisposed() )
         return NULL;
 
-    Reference< XFormController> xExternalCtrlr(m_xExternalViewController, UNO_QUERY);
+    Reference< runtime::XFormController > xExternalCtrlr(m_xExternalViewController, UNO_QUERY);
     if (xExternalCtrlr.is() && (_xForm == xExternalCtrlr->getModel()))
     {
         DBG_ASSERT(m_xExternalDisplayedForm.is(), "FmXFormShell::getInternalForm : invalid external form !");
@@ -1808,7 +1992,7 @@ void FmXFormShell::impl_switchActiveControllerListening( const bool _bListen )
 }
 
 //------------------------------------------------------------------------------
-void FmXFormShell::setActiveController( const Reference< XFormController>& xController, sal_Bool _bNoSaveOldContent )
+void FmXFormShell::setActiveController( const Reference< runtime::XFormController >& xController, sal_Bool _bNoSaveOldContent )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::setActiveController" );
     if ( impl_checkDisposed() )
@@ -2103,11 +2287,11 @@ void FmXFormShell::startListening()
                     {
                         // suchen des Controllers, ueber den eine Navigation moeglich ist
                         Reference< XChild> xChild(m_xActiveController, UNO_QUERY);
-                        Reference< XFormController> xParent;
+                        Reference< runtime::XFormController > xParent;
                         while (xChild.is())
                         {
                             xChild = Reference< XChild>(xChild->getParent(), UNO_QUERY);
-                            xParent  = Reference< XFormController>(xChild, UNO_QUERY);
+                            xParent  = Reference< runtime::XFormController >(xChild, UNO_QUERY);
                             Reference< XPropertySet> xParentSet;
                             if (xParent.is())
                                 xParentSet = Reference< XPropertySet>(xParent->getModel(), UNO_QUERY);
@@ -2936,31 +3120,39 @@ void FmXFormShell::startFiltering()
     FmWinRecList::iterator i = pXView->findWindow(xContainer);
     if (i != pXView->getWindowList().end())
     {
-        const ::std::vector< Reference< XFormController> >& rControllerList = (*i)->GetList();
-        for (::std::vector< Reference< XFormController> >::const_iterator j = rControllerList.begin();
+        const ::std::vector< Reference< runtime::XFormController> >& rControllerList = (*i)->GetList();
+        for (::std::vector< Reference< runtime::XFormController> >::const_iterator j = rControllerList.begin();
              j != rControllerList.end(); ++j)
         {
             Reference< XModeSelector> xModeSelector(*j, UNO_QUERY);
             if (xModeSelector.is())
-                xModeSelector->setMode(FILTER_MODE);
+                xModeSelector->setMode( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterMode" ) ) );
         }
     }
 
     m_bFilterMode = sal_True;
 
     m_pShell->UIFeatureChanged();
-    m_pShell->GetViewShell()->GetViewFrame()->GetBindings().InvalidateShell(*m_pShell);
+    SfxViewFrame* pViewFrame = m_pShell->GetViewShell()->GetViewFrame();
+    pViewFrame->GetBindings().InvalidateShell( *m_pShell );
+
+    if  (   pViewFrame->KnowsChildWindow( SID_FM_FILTER_NAVIGATOR )
+        &&  !pViewFrame->HasChildWindow( SID_FM_FILTER_NAVIGATOR )
+        )
+    {
+        pViewFrame->ToggleChildWindow( SID_FM_FILTER_NAVIGATOR );
+    }
 }
 
 //------------------------------------------------------------------------------
-void saveFilter(const Reference< XFormController>& _rxController)
+void saveFilter(const Reference< runtime::XFormController >& _rxController)
 {
     Reference< XPropertySet> xFormAsSet(_rxController->getModel(), UNO_QUERY);
     Reference< XPropertySet> xControllerAsSet(_rxController, UNO_QUERY);
     Reference< XIndexAccess> xControllerAsIndex(_rxController, UNO_QUERY);
 
     // call the subcontroller
-    Reference< XFormController> xController;
+    Reference< runtime::XFormController > xController;
     for (sal_Int32 i = 0, nCount = xControllerAsIndex->getCount(); i < nCount; ++i)
     {
         xControllerAsIndex->getByIndex(i) >>= xController;
@@ -2995,7 +3187,7 @@ void FmXFormShell::stopFiltering(sal_Bool bSave)
     Reference< XControlContainer> xContainer;
     if (getActiveController() == m_xExternalViewController)
     {
-        DBG_ASSERT(m_xExtViewTriggerController.is(), "FmXFormShell::startFiltering : inconsistent : active external controller, but noone triggered this !");
+        DBG_ASSERT(m_xExtViewTriggerController.is(), "FmXFormShell::stopFiltering : inconsistent : active external controller, but noone triggered this !");
         xContainer = m_xExtViewTriggerController->getContainer();
     }
     else
@@ -3004,13 +3196,13 @@ void FmXFormShell::stopFiltering(sal_Bool bSave)
     FmWinRecList::iterator i = pXView->findWindow(xContainer);
     if (i != pXView->getWindowList().end())
     {
-        const ::std::vector< Reference< XFormController> >& rControllerList = (*i)->GetList();
+        const ::std::vector< Reference< runtime::XFormController > >& rControllerList = (*i)->GetList();
         ::std::vector < ::rtl::OUString >	aOriginalFilters;
         ::std::vector < sal_Bool >			aOriginalApplyFlags;
 
         if (bSave)
         {
-            for (::std::vector< Reference< XFormController> > ::const_iterator j = rControllerList.begin();
+            for (::std::vector< Reference< runtime::XFormController > > ::const_iterator j = rControllerList.begin();
                  j != rControllerList.end(); ++j)
             {
                 if (bSave)
@@ -3035,18 +3227,18 @@ void FmXFormShell::stopFiltering(sal_Bool bSave)
                 saveFilter(*j);
             }
         }
-        for (::std::vector< Reference< XFormController> > ::const_iterator j = rControllerList.begin();
+        for (::std::vector< Reference< runtime::XFormController > > ::const_iterator j = rControllerList.begin();
              j != rControllerList.end(); ++j)
         {
 
             Reference< XModeSelector> xModeSelector(*j, UNO_QUERY);
             if (xModeSelector.is())
-                xModeSelector->setMode(DATA_MODE);
+                xModeSelector->setMode( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DataMode" ) ) );
         }
         if (bSave)	// execute the filter
         {
-            const ::std::vector< Reference< XFormController> > & rControllers = (*i)->GetList();
-            for (::std::vector< Reference< XFormController> > ::const_iterator j = rControllers.begin();
+            const ::std::vector< Reference< runtime::XFormController > > & rControllers = (*i)->GetList();
+            for (::std::vector< Reference< runtime::XFormController > > ::const_iterator j = rControllers.begin();
                  j != rControllers.end(); ++j)
             {
                 Reference< XLoadable> xReload((*j)->getModel(), UNO_QUERY);
@@ -3087,13 +3279,13 @@ void FmXFormShell::stopFiltering(sal_Bool bSave)
 }
 
 //------------------------------------------------------------------------------
-void clearFilter(const Reference< XFormController>& _rxController)
+void clearFilter(const Reference< runtime::XFormController >& _rxController)
 {
     Reference< XPropertySet> xControllerAsSet(_rxController, UNO_QUERY);
     Reference< XIndexAccess> xControllerAsIndex(_rxController, UNO_QUERY);
 
     // call the subcontroller
-    Reference< XFormController> xController;
+    Reference< runtime::XFormController > xController;
     for (sal_Int32 i = 0, nCount = xControllerAsIndex->getCount();
          i < nCount; i++)
     {
@@ -3132,7 +3324,7 @@ void FmXFormShell::clearFilter()
     Reference< XControlContainer> xContainer;
     if (getActiveController() == m_xExternalViewController)
     {
-        DBG_ASSERT(m_xExtViewTriggerController.is(), "FmXFormShell::startFiltering : inconsistent : active external controller, but noone triggered this !");
+        DBG_ASSERT(m_xExtViewTriggerController.is(), "FmXFormShell::clearFilter : inconsistent : active external controller, but noone triggered this !");
         xContainer = m_xExtViewTriggerController->getContainer();
     }
     else
@@ -3141,8 +3333,8 @@ void FmXFormShell::clearFilter()
     FmWinRecList::iterator i = pXView->findWindow(xContainer);
     if (i != pXView->getWindowList().end())
     {
-        const ::std::vector< Reference< XFormController> > & rControllerList = (*i)->GetList();
-        for (::std::vector< Reference< XFormController> > ::const_iterator j = rControllerList.begin();
+        const ::std::vector< Reference< runtime::XFormController > > & rControllerList = (*i)->GetList();
+        for (::std::vector< Reference< runtime::XFormController > > ::const_iterator j = rControllerList.begin();
              j != rControllerList.end(); ++j)
         {
             ::clearFilter(*j);
@@ -3253,7 +3445,7 @@ void FmXFormShell::restoreControlLocks()
 }
 
 //------------------------------------------------------------------------------
-void FmXFormShell::DoAsyncCursorAction(const Reference< XFormController>& _xController, CURSOR_ACTION _eWhat)
+void FmXFormShell::DoAsyncCursorAction(const Reference< runtime::XFormController >& _xController, CURSOR_ACTION _eWhat)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::DoAsyncCursorAction" );
     if ( impl_checkDisposed() )
@@ -3329,7 +3521,7 @@ sal_Bool FmXFormShell::HasPendingCursorAction(const Reference< XResultSet>& _xFo
 }
 
 //------------------------------------------------------------------------------
-sal_Bool FmXFormShell::HasPendingCursorAction(const Reference< XFormController>& xController) const
+sal_Bool FmXFormShell::HasPendingCursorAction(const Reference< runtime::XFormController >& xController) const
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::HasPendingCursorAction" );
     if ( impl_checkDisposed() )
@@ -3471,7 +3663,7 @@ void FmXFormShell::CreateExternalView()
     ::rtl::OUString sFrameName = ::rtl::OUString::createFromAscii("_beamer");
     sal_Int32 nSearchFlags = ::com::sun::star::frame::FrameSearchFlag::CHILDREN | ::com::sun::star::frame::FrameSearchFlag::CREATE;
 
-    Reference< XFormController> xCurrentNavController( getNavController());
+    Reference< runtime::XFormController > xCurrentNavController( getNavController());
         // the creation of the "partwindow" may cause a deactivate of the document which will result in our nav controller to be set to NULL
 
     // _first_ check if we have any valid fields we can use for the grid view
@@ -3538,12 +3730,12 @@ void FmXFormShell::CreateExternalView()
         {
             if ( m_xExternalViewController == getActiveController() )
             {
-                Reference< XFormController > xAsFormController( m_xExternalViewController, UNO_QUERY );
+                Reference< runtime::XFormController > xAsFormController( m_xExternalViewController, UNO_QUERY );
                 ControllerFeatures aHelper( ::comphelper::getProcessServiceFactory(), xAsFormController, NULL );
                 aHelper->commitCurrentControl();
             }
 
-            Reference< XFormController> xNewController(m_xExtViewTriggerController);
+            Reference< runtime::XFormController > xNewController(m_xExtViewTriggerController);
             CloseExternalFormViewer();
             setActiveController(xNewController);
             return;
@@ -3557,28 +3749,8 @@ void FmXFormShell::CreateExternalView()
             xClear->dispatch(aClearURL, Sequence< PropertyValue>());
     }
 
-    // interception of slots of the external view
-    if (m_pExternalViewInterceptor)
-    {	// already intercepting ...
-        if (m_pExternalViewInterceptor->getIntercepted() != xExternalViewFrame)
-        {	// ... but another frame -> create a new interceptor
-            m_pExternalViewInterceptor->dispose();
-            m_pExternalViewInterceptor->release();
-            m_pExternalViewInterceptor = NULL;
-        }
-    }
-
-    if (!m_pExternalViewInterceptor)
-    {
-        Reference< ::com::sun::star::frame::XDispatchProviderInterception> xSupplier(xExternalViewFrame, UNO_QUERY);
-        ::rtl::OUString sInterceptorScheme = FMURL_FORMSLOTS_PREFIX;
-        sInterceptorScheme += ::rtl::OUString::createFromAscii("*");
-//		m_pExternalViewInterceptor = new FmXDispatchInterceptorImpl(xSupplier, this, 1, Sequence< ::rtl::OUString >(&sInterceptorScheme, 1));
-//		m_pExternalViewInterceptor->acquire();
-        // TODO: re-implement this in a easier way than before: We need an interceptor at the xSupplier, which
-        // forwards all queryDispatch requests to the FormController instance for which this "external view"
-        // was triggered
-    }
+    // TODO: We need an interceptor at the xSupplier, which forwards all queryDispatch requests to the FormController
+    // instance for which this "external view" was triggered
 
     // get the dispatch interface of the frame so we can communicate (interceptable) with the controller
     Reference< ::com::sun::star::frame::XDispatchProvider> xCommLink(xExternalViewFrame, UNO_QUERY);
@@ -3876,7 +4048,8 @@ void FmXFormShell::CreateExternalView()
 
             // we want to know modifications done in the external view
             // if the external controller is a XFormController we can use all our default handlings for it
-            Reference< XFormController> xFormController(m_xExternalViewController, UNO_QUERY);
+            Reference< runtime::XFormController > xFormController( m_xExternalViewController, UNO_QUERY );
+            OSL_ENSURE( xFormController.is(), "FmXFormShell::CreateExternalView:: invalid external view controller!" );
             if (xFormController.is())
                 xFormController->addActivateListener((XFormControllerListener*)this);
         }
@@ -4162,6 +4335,44 @@ IMPL_LINK( FmXFormShell, OnLoadForms, FmFormPage*, /*_pPage*/ )
     return 0L;
 }
 
+//------------------------------------------------------------------------------
+namespace
+{
+    sal_Bool lcl_isLoadable( const Reference< XInterface >& _rxLoadable )
+    {
+        // determines whether a form should be loaded or not
+        // if there is no datasource or connection there is no reason to load a form
+        Reference< XPropertySet > xSet( _rxLoadable, UNO_QUERY );
+        if ( !xSet.is() )
+            return sal_False;
+        try
+        {
+            Reference< XConnection > xConn;
+            if ( OStaticDataAccessTools().isEmbeddedInDatabase( _rxLoadable.get(), xConn ) )
+                return sal_True;
+
+            // is there already a active connection
+            xSet->getPropertyValue(FM_PROP_ACTIVE_CONNECTION) >>= xConn;
+            if ( xConn.is() )
+                return sal_True;
+
+            ::rtl::OUString sPropertyValue;
+            OSL_VERIFY( xSet->getPropertyValue( FM_PROP_DATASOURCE ) >>= sPropertyValue );
+            if ( sPropertyValue.getLength() )
+                return sal_True;
+
+            OSL_VERIFY( xSet->getPropertyValue( FM_PROP_URL ) >>= sPropertyValue );
+            if ( sPropertyValue.getLength() )
+                return sal_True;
+        }
+        catch(const Exception&)
+        {
+            DBG_UNHANDLED_EXCEPTION();
+        }
+        return sal_False;
+    }
+}
+
 //------------------------------------------------------------------------
 void FmXFormShell::loadForms( FmFormPage* _pPage, const sal_uInt16 _nBehaviour /* FORMS_LOAD | FORMS_SYNC */ )
 {
@@ -4206,7 +4417,7 @@ void FmXFormShell::loadForms( FmFormPage* _pPage, const sal_uInt16 _nBehaviour /
                 {
                     if ( 0 == ( _nBehaviour & FORMS_UNLOAD ) )
                     {
-                        if ( ::isLoadable( xForm ) && !xForm->isLoaded() )
+                        if ( lcl_isLoadable( xForm ) && !xForm->isLoaded() )
                             xForm->load();
                     }
                     else
diff --git a/svx/source/form/fmstring.src b/svx/source/form/fmstring.src
index e8867d1ef0..8290693f23 100644
--- a/svx/source/form/fmstring.src
+++ b/svx/source/form/fmstring.src
@@ -130,7 +130,7 @@ String RID_STR_DELETECONFIRM_RECORDS
 };
 String RID_STR_DELETECONFIRM
 {
-    Text [ en-US ] = "If you click Yes, you won't be able to undo this operation!\nDo you want to continue anyway?";
+    Text [ en-US ] = "If you click Yes, you won't be able to undo this operation.\nDo you want to continue anyway?";
 };
 
 String RID_ERR_NO_ELEMENT
diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx
index 2506e05cca..e864ba4207 100644
--- a/svx/source/form/fmtextcontrolshell.cxx
+++ b/svx/source/form/fmtextcontrolshell.cxx
@@ -89,6 +89,7 @@ namespace svx
     using namespace ::com::sun::star::uno;
     using namespace ::com::sun::star::awt;
     using namespace ::com::sun::star::form;
+    using namespace ::com::sun::star::form::runtime;
     using namespace ::com::sun::star::lang;
     using namespace ::com::sun::star::frame;
     using namespace ::com::sun::star::util;
diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx
index 84ebf215b1..5395267b3a 100644
--- a/svx/source/form/fmtools.cxx
+++ b/svx/source/form/fmtools.cxx
@@ -30,83 +30,74 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/io/XPersistObject.hpp>
-#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
-#include <com/sun/star/sdb/XCompletedConnection.hpp>
-#include <com/sun/star/sdbcx/Privilege.hpp>
-#include <com/sun/star/lang/Locale.hpp>
+
+#include "fmprop.hrc"
+#include "fmservs.hxx"
 #include "svx/fmtools.hxx"
 #include "svx/dbtoolsclient.hxx"
-#include "fmservs.hxx"
-#include <svx/fmglob.hxx>
-#include <vcl/stdtext.hxx>
-#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ 
-#include <toolkit/unohlp.hxx>
-#endif
+#include "svx/fmglob.hxx"
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <wchar.h>
-#include <com/sun/star/uno/XNamingService.hpp>
-#include <com/sun/star/sdbc/XDataSource.hpp>
+/** === begin UNO includes === **/
+#include <com/sun/star/awt/LineEndFormat.hpp>
+#include <com/sun/star/beans/PropertyAttribute.hpp>
+#include <com/sun/star/beans/XIntrospection.hpp>
+#include <com/sun/star/container/XChild.hpp>
+#include <com/sun/star/form/XForm.hpp>
+#include <com/sun/star/form/XFormComponent.hpp>
+#include <com/sun/star/form/XGridColumnFactory.hpp>
+#include <com/sun/star/io/XActiveDataSink.hpp>
+#include <com/sun/star/io/XActiveDataSource.hpp>
+#include <com/sun/star/io/XObjectInputStream.hpp>
+#include <com/sun/star/io/XObjectOutputStream.hpp>
+#include <com/sun/star/io/XPersistObject.hpp>
+#include <com/sun/star/lang/Locale.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/sdb/CommandType.hpp>
-#include <com/sun/star/sdb/XQueriesSupplier.hpp>
+#include <com/sun/star/sdb/ErrorCondition.hpp>
 #include <com/sun/star/sdb/SQLContext.hpp>
-#include <com/sun/star/sdbcx/XTablesSupplier.hpp>
+#include <com/sun/star/sdb/XCompletedConnection.hpp>
+#include <com/sun/star/sdb/XQueriesSupplier.hpp>
 #include <com/sun/star/sdb/XResultSetAccess.hpp>
-#include <com/sun/star/sdb/ErrorCondition.hpp>
 #include <com/sun/star/sdbc/DataType.hpp>
-#include <com/sun/star/util/NumberFormat.hpp>
-#include <com/sun/star/io/XActiveDataSink.hpp>
-#include <com/sun/star/io/XActiveDataSource.hpp>
-#include <com/sun/star/script/XEventAttacherManager.hpp>
-#include <com/sun/star/form/XForm.hpp>
-#include <com/sun/star/form/XFormComponent.hpp>
-#include <com/sun/star/util/XNumberFormatter.hpp>
-#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
+#include <com/sun/star/sdbc/XDataSource.hpp>
+#include <com/sun/star/sdbcx/Privilege.hpp>
+#include <com/sun/star/sdbcx/XTablesSupplier.hpp>
+#include <com/sun/star/task/XInteractionHandler.hpp>
+#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
+#include <com/sun/star/uno/XNamingService.hpp>
 #include <com/sun/star/util/Language.hpp>
-#include <com/sun/star/util/XNumberFormats.hpp>
-#include <com/sun/star/util/XNumberFormatTypes.hpp>
+#include <com/sun/star/util/NumberFormat.hpp>
 #include <com/sun/star/util/XCloneable.hpp>
-#include <com/sun/star/io/XObjectInputStream.hpp>
-#include <com/sun/star/io/XObjectOutputStream.hpp>
-#include <com/sun/star/reflection/XIdlClass.hpp>
-#include <com/sun/star/reflection/XIdlMethod.hpp>
-#include <com/sun/star/beans/XIntrospection.hpp>
-#include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <com/sun/star/container/XChild.hpp>
-#include <com/sun/star/task/XInteractionHandler.hpp>
-#include <com/sun/star/awt/LineEndFormat.hpp>
-#include <com/sun/star/form/XGridColumnFactory.hpp>
-
+#include <com/sun/star/util/XNumberFormatTypes.hpp>
+#include <com/sun/star/util/XNumberFormats.hpp>
+#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
+#include <com/sun/star/util/XNumberFormatter.hpp>
+/** === end UNO includes === **/
 
-#include <tools/debug.hxx>
-#include <tools/string.hxx>
 #include <basic/sbxvar.hxx>
-#include <rtl/math.hxx>
-#include <vcl/svapp.hxx>
-
-#ifndef _SVX_FMPROP_HRC
-#include "fmprop.hrc"
-#endif
-#include <sfx2/bindings.hxx>
-#include <svl/eitem.hxx>
-#include <svl/stritem.hxx>
-#include <cppuhelper/servicefactory.hxx>
-#include <comphelper/types.hxx>
-#include <comphelper/property.hxx>
 #include <comphelper/container.hxx>
-#include <connectivity/dbtools.hxx>
+#include <comphelper/extract.hxx>
 #include <comphelper/processfactory.hxx>
+#include <comphelper/property.hxx>
 #include <comphelper/sequence.hxx>
-#include <comphelper/extract.hxx>
+#include <comphelper/types.hxx>
 #include <comphelper/uno3.hxx>
 #include <connectivity/dbexception.hxx>
-#include <comphelper/extract.hxx>
+#include <connectivity/dbtools.hxx>
+#include <cppuhelper/servicefactory.hxx>
 #include <cppuhelper/typeprovider.hxx>
-#include <algorithm>
 #include <rtl/logfile.hxx>
+#include <rtl/math.hxx>
+#include <sfx2/bindings.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
+#include <toolkit/unohlp.hxx>
+#include <tools/debug.hxx>
+#include <tools/string.hxx>
+#include <vcl/stdtext.hxx>
+#include <vcl/svapp.hxx>
+
+#include <algorithm>
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::util;
@@ -204,106 +195,8 @@ void displayException(const ::com::sun::star::sdb::SQLErrorEvent& _rEvent, Windo
 }
 
 //------------------------------------------------------------------------------
-Reference< XInterface > cloneUsingProperties(const Reference< ::com::sun::star::io::XPersistObject>& _xObj)
-{
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "fmtools::cloneUsingProperties" );
-    if (!_xObj.is())
-        return Reference< XInterface >();
-
-    // create a new object
-    ::rtl::OUString aObjectService = _xObj->getServiceName();
-    Reference< ::com::sun::star::beans::XPropertySet> xDestSet(::comphelper::getProcessServiceFactory()->createInstance(aObjectService), UNO_QUERY);
-    if (!xDestSet.is())
-    {
-        DBG_ERROR("cloneUsingProperties : could not instantiate an object of the given type !");
-        return Reference< XInterface >();
-    }
-    // transfer properties
-    Reference< XPropertySet > xSourceSet(_xObj, UNO_QUERY);
-    Reference< XPropertySetInfo > xSourceInfo( xSourceSet->getPropertySetInfo());
-    Sequence< Property> aSourceProperties = xSourceInfo->getProperties();
-    Reference< XPropertySetInfo > xDestInfo( xDestSet->getPropertySetInfo());
-    Sequence< Property> aDestProperties = xDestInfo->getProperties();
-    int nDestLen = aDestProperties.getLength();
-
-    Property* pSourceProps = aSourceProperties.getArray();
-    Property* pSourceEnd = pSourceProps + aSourceProperties.getLength();
-    Property* pDestProps = aDestProperties.getArray();
-
-    for (; pSourceProps != pSourceEnd; ++pSourceProps)
-    {
-        ::com::sun::star::beans::Property* pResult = ::std::lower_bound(
-                pDestProps,
-                pDestProps + nDestLen,
-                pSourceProps->Name,
-                ::comphelper::PropertyStringLessFunctor()
-            );
-
-        if	(	( pResult != pDestProps + nDestLen )
-            &&	( pResult->Name == pSourceProps->Name )
-            &&	( pResult->Attributes == pSourceProps->Attributes )
-            &&	( (pResult->Attributes &  PropertyAttribute::READONLY ) == 0 )
-            &&	( pResult->Type.equals( pSourceProps->Type ) )
-            )
-        {	// Attribute/type are the same and the prop isn't readonly
-            try
-            {
-                xDestSet->setPropertyValue(pResult->Name, xSourceSet->getPropertyValue(pResult->Name));
-            }
-            catch(IllegalArgumentException e)
-            {
-                (void)e;
-#ifdef DBG_UTIL
-                ::rtl::OString sMessage("cloneUsingProperties : could not transfer the value for property \"");
-                sMessage = sMessage + ::rtl::OString(pResult->Name.getStr(), pResult->Name.getLength(), RTL_TEXTENCODING_ASCII_US);
-                sMessage = sMessage + '\"';
-                DBG_ERROR(sMessage);
-#endif
-            }
-
-        }
-    }
-
-    return xDestSet.get();
-}
-
-//------------------------------------------------------------------------------
-sal_Bool searchElement(const Reference< ::com::sun::star::container::XIndexAccess>& xCont, const Reference< XInterface >& xElement)
-{
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "fmtools::searchElement" );
-    if (!xCont.is() || !xElement.is())
-        return sal_False;
-
-    sal_Int32 nCount = xCont->getCount();
-    Reference< XInterface > xComp;
-    for (sal_Int32 i = 0; i < nCount; i++)
-    {
-        try
-        {
-            xCont->getByIndex(i) >>= xComp;
-            if (xComp.is())
-            {
-                if ( xElement == xComp )
-                    return sal_True;
-                else
-                {
-                    Reference< ::com::sun::star::container::XIndexAccess> xCont2(xComp, UNO_QUERY);
-                    if (xCont2.is() && searchElement(xCont2, xElement))
-                        return sal_True;
-                }
-            }
-        }
-        catch(Exception&)
-        {
-        }
-    }
-    return sal_False;
-}
-
-//------------------------------------------------------------------------------
 sal_Int32 getElementPos(const Reference< ::com::sun::star::container::XIndexAccess>& xCont, const Reference< XInterface >& xElement)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "fmtools::getElementPos" );
     sal_Int32 nIndex = -1;
     if (!xCont.is())
         return nIndex;
@@ -336,127 +229,6 @@ sal_Int32 getElementPos(const Reference< ::com::sun::star::container::XIndexAcce
 }
 
 //------------------------------------------------------------------
-String getFormComponentAccessPath(const Reference< XInterface >& _xElement, Reference< XInterface >& _rTopLevelElement)
-{
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "fmtools::getFormComponentAccessPath" );
-    Reference< ::com::sun::star::form::XFormComponent> xChild(_xElement, UNO_QUERY);
-    Reference< ::com::sun::star::container::XIndexAccess> xParent;
-    if (xChild.is())
-        xParent = Reference< ::com::sun::star::container::XIndexAccess>(xChild->getParent(), UNO_QUERY);
-
-    // while the current content is a form
-    String sReturn;
-    String sCurrentIndex;
-    while (xChild.is())
-    {
-        // get the content's relative pos within it's parent container
-        sal_Int32 nPos = getElementPos(xParent, xChild);
-
-        // prepend this current relaive pos
-        sCurrentIndex = String::CreateFromInt32(nPos);
-        if (sReturn.Len() != 0)
-        {
-            sCurrentIndex += '\\';
-            sCurrentIndex += sReturn;
-        }
-
-        sReturn = sCurrentIndex;
-
-        // travel up
-        if (::comphelper::query_interface((Reference< XInterface >)xParent,xChild))
-            xParent = Reference< ::com::sun::star::container::XIndexAccess>(xChild->getParent(), UNO_QUERY);
-    }
-
-    _rTopLevelElement = xParent;
-    return sReturn;
-}
-
-//------------------------------------------------------------------
-String getFormComponentAccessPath(const Reference< XInterface >& _xElement)
-{
-    Reference< XInterface > xDummy;
-    return getFormComponentAccessPath(_xElement, xDummy);
-}
-
-//------------------------------------------------------------------------------
-Reference< XInterface > getElementFromAccessPath(const Reference< ::com::sun::star::container::XIndexAccess>& _xParent, const String& _rRelativePath)
-{
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "fmtools::getElementFromAccessPath" );
-    if (!_xParent.is())
-        return Reference< XInterface >();
-    Reference< ::com::sun::star::container::XIndexAccess> xContainer(_xParent);
-    Reference< XInterface > xElement( _xParent);
-
-    String sPath(_rRelativePath);
-    while (sPath.Len() && xContainer.is())
-    {
-        xub_StrLen nSepPos = sPath.Search((sal_Unicode)'\\');
-
-        String sIndex(sPath.Copy(0, (nSepPos == STRING_NOTFOUND) ? sPath.Len() : nSepPos));
-        //	DBG_ASSERT(sIndex.IsNumeric(), "getElementFromAccessPath : invalid path !");
-
-        sPath = sPath.Copy((nSepPos == STRING_NOTFOUND) ? sPath.Len() : nSepPos+1);
-
-        ::cppu::extractInterface(xElement, xContainer->getByIndex(sIndex.ToInt32()));
-        xContainer = Reference< ::com::sun::star::container::XIndexAccess>::query(xElement);
-    }
-
-    if (sPath.Len() != 0)
-        // the loop terminated because an element wasn't a container, but we stil have a path -> the path is invalid
-        xElement = NULL;
-
-    return xElement;
-}
-
-//------------------------------------------------------------------
-// Vergleichen von PropertyInfo
-extern "C" int
-#if defined( WNT )
- __cdecl
-#endif
-#if defined( ICC ) && defined( OS2 )
-_Optlink
-#endif
-    NameCompare(const void* pFirst, const void* pSecond)
-{
-    return ((::rtl::OUString*)pFirst)->compareTo(*(::rtl::OUString*)pSecond);
-}
-
-//------------------------------------------------------------------------------
-sal_Int32 findPos(const ::rtl::OUString& aStr, const Sequence< ::rtl::OUString>& rList)
-{
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "fmtools::findPos" );
-    const ::rtl::OUString* pStrList = rList.getConstArray();
-    ::rtl::OUString* pResult = (::rtl::OUString*) bsearch(&aStr, (void*)pStrList, rList.getLength(), sizeof(::rtl::OUString),
-        &NameCompare);
-
-    if (pResult)
-        return (pResult - pStrList);
-    else
-        return -1;
-}
-
-//------------------------------------------------------------------
-Reference< ::com::sun::star::frame::XModel> getXModel(const Reference< XInterface >& xIface)
-{
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "fmtools::getXModel" );
-    Reference< ::com::sun::star::frame::XModel> xModel(xIface, UNO_QUERY);
-    if (xModel.is())
-        return xModel;
-    else
-    {
-        Reference< ::com::sun::star::container::XChild> xChild(xIface, UNO_QUERY);
-        if (xChild.is())
-        {
-            Reference< XInterface > xParent( xChild->getParent());
-            return getXModel(xParent);
-        }
-        else
-            return NULL;
-    }
-}
-
-//------------------------------------------------------------------
 ::rtl::OUString getLabelName(const Reference< ::com::sun::star::beans::XPropertySet>& xControlModel)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "fmtools::getLabelName" );
@@ -690,412 +462,6 @@ sal_Int16 getControlTypeByObject(const Reference< ::com::sun::star::lang::XServi
 }
 
 //------------------------------------------------------------------------------
-::rtl::OUString getServiceNameByControlType(sal_Int16 nType)
-{
-    switch (nType)
-    {
-        case OBJ_FM_EDIT			: return FM_COMPONENT_TEXTFIELD;
-        case OBJ_FM_BUTTON			: return FM_COMPONENT_COMMANDBUTTON;
-        case OBJ_FM_FIXEDTEXT		: return FM_COMPONENT_FIXEDTEXT;
-        case OBJ_FM_LISTBOX 		: return FM_COMPONENT_LISTBOX;
-        case OBJ_FM_CHECKBOX		: return FM_COMPONENT_CHECKBOX;
-        case OBJ_FM_RADIOBUTTON 	: return FM_COMPONENT_RADIOBUTTON;
-        case OBJ_FM_GROUPBOX		: return FM_COMPONENT_GROUPBOX;
-        case OBJ_FM_COMBOBOX		: return FM_COMPONENT_COMBOBOX;
-        case OBJ_FM_GRID			: return FM_COMPONENT_GRIDCONTROL;
-        case OBJ_FM_IMAGEBUTTON 	: return FM_COMPONENT_IMAGEBUTTON;
-        case OBJ_FM_FILECONTROL 	: return FM_COMPONENT_FILECONTROL;
-        case OBJ_FM_DATEFIELD		: return FM_COMPONENT_DATEFIELD;
-        case OBJ_FM_TIMEFIELD		: return FM_COMPONENT_TIMEFIELD;
-        case OBJ_FM_NUMERICFIELD	: return FM_COMPONENT_NUMERICFIELD;
-        case OBJ_FM_CURRENCYFIELD	: return FM_COMPONENT_CURRENCYFIELD;
-        case OBJ_FM_PATTERNFIELD	: return FM_COMPONENT_PATTERNFIELD;
-        case OBJ_FM_HIDDEN			: return FM_COMPONENT_HIDDENCONTROL;
-        case OBJ_FM_IMAGECONTROL	: return FM_COMPONENT_IMAGECONTROL;
-        case OBJ_FM_FORMATTEDFIELD	: return FM_COMPONENT_FORMATTEDFIELD;
-        case OBJ_FM_SCROLLBAR       : return FM_SUN_COMPONENT_SCROLLBAR;
-        case OBJ_FM_SPINBUTTON      : return FM_SUN_COMPONENT_SPINBUTTON;
-        case OBJ_FM_NAVIGATIONBAR   : return FM_SUN_COMPONENT_NAVIGATIONBAR;
-    }
-    return ::rtl::OUString();
-}
-//------------------------------------------------------------------------------
-Sequence< ::rtl::OUString> getEventMethods(const Type& type)
-{
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "fmtools::getEventMethods" );
-    typelib_InterfaceTypeDescription *pType=0;
-    type.getDescription( (typelib_TypeDescription**)&pType);
-
-    if(!pType)
-        return Sequence< ::rtl::OUString>();
-
-    Sequence< ::rtl::OUString> aNames(pType->nMembers);
-    ::rtl::OUString* pNames = aNames.getArray();
-    for(sal_Int32 i=0;i<pType->nMembers;i++,++pNames)
-    {
-        // the decription reference
-        typelib_TypeDescriptionReference* pMemberDescriptionReference = pType->ppMembers[i];
-        // the description for the reference
-        typelib_TypeDescription* pMemberDescription = NULL;
-        typelib_typedescriptionreference_getDescription(&pMemberDescription, pMemberDescriptionReference);
-        if (pMemberDescription)
-        {
-            typelib_InterfaceMemberTypeDescription* pRealMemberDescription =
-                reinterpret_cast<typelib_InterfaceMemberTypeDescription*>(pMemberDescription);
-            *pNames = pRealMemberDescription->pMemberName;
-        }
-    }
-    typelib_typedescription_release( (typelib_TypeDescription *)pType );
-    return aNames;
-}
-
-
-//------------------------------------------------------------------------------
-void TransferEventScripts(const Reference< ::com::sun::star::awt::XControlModel>& xModel, const Reference< ::com::sun::star::awt::XControl>& xControl,
-    const Sequence< ::com::sun::star::script::ScriptEventDescriptor>& rTransferIfAvailable)
-{
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "fmtools::TransferEventScripts" );
-    // first check if we have a XEventAttacherManager for the model
-    Reference< ::com::sun::star::container::XChild> xModelChild(xModel, UNO_QUERY);
-    if (!xModelChild.is())
-        return; // nothing to do
-
-    Reference< ::com::sun::star::script::XEventAttacherManager> xEventManager(xModelChild->getParent(), UNO_QUERY);
-    if (!xEventManager.is())
-        return; // nothing to do
-
-    if (!rTransferIfAvailable.getLength())
-        return; // nothing to do
-
-    // check for the index of the model within it's parent
-    Reference< ::com::sun::star::container::XIndexAccess> xParentIndex(xModelChild->getParent(), UNO_QUERY);
-    if (!xParentIndex.is())
-        return; // nothing to do
-    sal_Int32 nIndex = getElementPos(xParentIndex, xModel);
-    if (nIndex<0 || nIndex>=xParentIndex->getCount())
-        return; // nothing to do
-
-    // then we need informations about the listeners supported by the control and the model
-    Sequence< Type> aModelListeners;
-    Sequence< Type> aControlListeners;
-
-    Reference< ::com::sun::star::beans::XIntrospection> xModelIntrospection(::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString::createFromAscii("com.sun.star.beans.Introspection")), UNO_QUERY);
-    Reference< ::com::sun::star::beans::XIntrospection> xControlIntrospection(::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString::createFromAscii("com.sun.star.beans.Introspection")), UNO_QUERY);
-
-    if (xModelIntrospection.is() && xModel.is())
-    {
-        Any aModel(makeAny(xModel));
-        aModelListeners = xModelIntrospection->inspect(aModel)->getSupportedListeners();
-    }
-
-    if (xControlIntrospection.is() && xControl.is())
-    {
-        Any aControl(makeAny(xControl));
-        aControlListeners = xControlIntrospection->inspect(aControl)->getSupportedListeners();
-    }
-
-    sal_Int32 nMaxNewLen = aModelListeners.getLength() + aControlListeners.getLength();
-    if (!nMaxNewLen)
-        return; // the model and the listener don't support any listeners (or we were unable to retrieve these infos)
-
-    Sequence< ::com::sun::star::script::ScriptEventDescriptor>	aTransferable(nMaxNewLen);
-    ::com::sun::star::script::ScriptEventDescriptor* pTransferable = aTransferable.getArray();
-
-    const ::com::sun::star::script::ScriptEventDescriptor* pCurrent = rTransferIfAvailable.getConstArray();
-    sal_Int32 i,j,k;
-    for (i=0; i<rTransferIfAvailable.getLength(); ++i, ++pCurrent)
-    {
-        // search the model/control idl classes for the event described by pCurrent
-        for (	Sequence< Type>* pCurrentArray = &aModelListeners;
-                pCurrentArray;
-                pCurrentArray = (pCurrentArray == &aModelListeners) ? &aControlListeners : NULL
-            )
-        {
-            const Type* pCurrentListeners = pCurrentArray->getConstArray();
-            for (j=0; j<pCurrentArray->getLength(); ++j, ++pCurrentListeners)
-            {
-                UniString aListener = (*pCurrentListeners).getTypeName();
-                xub_StrLen nTokens = aListener.GetTokenCount('.');
-                if (nTokens)
-                    aListener = aListener.GetToken(nTokens - 1, '.');
-
-                if (aListener == pCurrent->ListenerType.getStr())
-                    // the current ::com::sun::star::script::ScriptEventDescriptor doesn't match the current listeners class
-                    continue;
-
-                // now check the methods
-                Sequence< ::rtl::OUString> aMethodsNames = getEventMethods(*pCurrentListeners);
-                const ::rtl::OUString* pMethodsNames = aMethodsNames.getConstArray();
-                for (k=0; k<aMethodsNames.getLength(); ++k, ++pMethodsNames)
-                {
-                    if ((*pMethodsNames).compareTo(pCurrent->EventMethod) != COMPARE_EQUAL)
-                        // the current ::com::sun::star::script::ScriptEventDescriptor doesn't match the current listeners current method
-                        continue;
-
-                    // we can transfer the script event : the model (control) supports it
-                    *pTransferable = *pCurrent;
-                    ++pTransferable;
-                    break;
-                }
-                if (k<aMethodsNames.getLength())
-                    break;
-            }
-        }
-    }
-
-    sal_Int32 nRealNewLen = pTransferable - aTransferable.getArray();
-    aTransferable.realloc(nRealNewLen);
-
-    xEventManager->registerScriptEvents(nIndex, aTransferable);
-}
-
-//------------------------------------------------------------------------------
-sal_Int16	GridView2ModelPos(const Reference< ::com::sun::star::container::XIndexAccess>& rColumns, sal_Int16 nViewPos)
-{
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "fmtools::GridView2ModelPos" );
-    try
-    {
-        if (rColumns.is())
-        {
-            // loop through all columns
-            sal_Int16 i;
-            Reference< ::com::sun::star::beans::XPropertySet> xCur;
-            for (i=0; i<rColumns->getCount(); ++i)
-            {
-                rColumns->getByIndex(i) >>= xCur;
-                if (!::comphelper::getBOOL(xCur->getPropertyValue(FM_PROP_HIDDEN)))
-                {
-                    // for every visible col : if nViewPos is greater zero, decrement it, else we
-                    // have found the model position
-                    if (!nViewPos)
-                        break;
-                    else
-                        --nViewPos;
-                }
-            }
-            if (i<rColumns->getCount())
-                return i;
-        }
-    }
-    catch(const Exception&)
-    {
-        DBG_ERROR("GridView2ModelPos Exception occured!");
-    }
-    return (sal_Int16)-1;
-}
-
-//========================================================================
-//= FmXDispatchInterceptorImpl
-//========================================================================
-
-DBG_NAME(FmXDispatchInterceptorImpl);
-//------------------------------------------------------------------------
-FmXDispatchInterceptorImpl::FmXDispatchInterceptorImpl(
-            const Reference< XDispatchProviderInterception >& _rxToIntercept, FmDispatchInterceptor* _pMaster,
-            sal_Int16 _nId, Sequence< ::rtl::OUString > _rInterceptedSchemes)
-    :FmXDispatchInterceptorImpl_BASE(_pMaster && _pMaster->getInterceptorMutex() ? *_pMaster->getInterceptorMutex() : m_aFallback)
-    ,m_xIntercepted(_rxToIntercept)
-    ,m_bListening(sal_False)
-    ,m_pMaster(_pMaster)
-    ,m_nId(_nId)
-    ,m_aInterceptedURLSchemes(_rInterceptedSchemes)
-{
-    DBG_CTOR(FmXDispatchInterceptorImpl,NULL);
-
-    ::osl::MutexGuard aGuard(getAccessSafety());
-    ::comphelper::increment(m_refCount);
-    if (_rxToIntercept.is())
-    {
-        _rxToIntercept->registerDispatchProviderInterceptor((::com::sun::star::frame::XDispatchProviderInterceptor*)this);
-        // this should make us the top-level dispatch-provider for the component, via a call to our
-        // setDispatchProvider we should have got an fallback for requests we (i.e. our master) cannot fullfill
-        Reference< ::com::sun::star::lang::XComponent> xInterceptedComponent(_rxToIntercept, UNO_QUERY);
-        if (xInterceptedComponent.is())
-        {
-            xInterceptedComponent->addEventListener(this);
-            m_bListening = sal_True;
-        }
-    }
-    ::comphelper::decrement(m_refCount);
-}
-
-//------------------------------------------------------------------------
-FmXDispatchInterceptorImpl::~FmXDispatchInterceptorImpl()
-{
-    if (!rBHelper.bDisposed)
-        dispose();
-
-    DBG_DTOR(FmXDispatchInterceptorImpl,NULL);
-}
-
-//------------------------------------------------------------------------------
-Sequence< sal_Int8 > SAL_CALL FmXDispatchInterceptorImpl::getImplementationId() throw(RuntimeException)
-{
-    static ::cppu::OImplementationId* pId = 0;
-    if (! pId)
-    {
-        ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-        if (! pId)
-        {
-            static ::cppu::OImplementationId aId;
-            pId = &aId;
-        }
-    }
-    return pId->getImplementationId();
-}
-
-//------------------------------------------------------------------------------
-Reference< ::com::sun::star::frame::XDispatch > SAL_CALL FmXDispatchInterceptorImpl::queryDispatch( const URL& aURL, const ::rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw(RuntimeException)
-{
-    ::osl::MutexGuard aGuard(getAccessSafety());
-    Reference< ::com::sun::star::frame::XDispatch> xResult;
-    // ask our 'real' interceptor
-    if (m_pMaster)
-        xResult = m_pMaster->interceptedQueryDispatch(m_nId, aURL, aTargetFrameName, nSearchFlags);
-
-    // ask our slave provider
-    if (!xResult.is() && m_xSlaveDispatcher.is())
-        xResult = m_xSlaveDispatcher->queryDispatch(aURL, aTargetFrameName, nSearchFlags);
-
-    return xResult;
-}
-
-//------------------------------------------------------------------------------
-Sequence< Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL
-FmXDispatchInterceptorImpl::queryDispatches( const Sequence< ::com::sun::star::frame::DispatchDescriptor >& aDescripts ) throw(RuntimeException)
-{
-    ::osl::MutexGuard aGuard(getAccessSafety());
-    Sequence< Reference< ::com::sun::star::frame::XDispatch> > aReturn(aDescripts.getLength());
-    Reference< ::com::sun::star::frame::XDispatch>* pReturn = aReturn.getArray();
-    const ::com::sun::star::frame::DispatchDescriptor* pDescripts = aDescripts.getConstArray();
-    for (sal_Int16 i=0; i<aDescripts.getLength(); ++i, ++pReturn, ++pDescripts)
-    {
-        *pReturn = queryDispatch(pDescripts->FeatureURL, pDescripts->FrameName, pDescripts->SearchFlags);
-    }
-    return aReturn;
-}
-
-//------------------------------------------------------------------------------
-Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL FmXDispatchInterceptorImpl::getSlaveDispatchProvider(	) throw(RuntimeException)
-{
-    ::osl::MutexGuard aGuard(getAccessSafety());
-    return m_xSlaveDispatcher;
-}
-
-//------------------------------------------------------------------------------
-void SAL_CALL FmXDispatchInterceptorImpl::setSlaveDispatchProvider(const Reference< ::com::sun::star::frame::XDispatchProvider>& xNewDispatchProvider) throw( RuntimeException )
-{
-    ::osl::MutexGuard aGuard(getAccessSafety());
-    m_xSlaveDispatcher = xNewDispatchProvider;
-}
-
-//------------------------------------------------------------------------------
-Reference< ::com::sun::star::frame::XDispatchProvider> SAL_CALL FmXDispatchInterceptorImpl::getMasterDispatchProvider(void) throw( RuntimeException )
-{
-    ::osl::MutexGuard aGuard(getAccessSafety());
-    return m_xMasterDispatcher;
-}
-
-//------------------------------------------------------------------------------
-void SAL_CALL FmXDispatchInterceptorImpl::setMasterDispatchProvider(const Reference< ::com::sun::star::frame::XDispatchProvider>& xNewSupplier) throw( RuntimeException )
-{
-    ::osl::MutexGuard aGuard(getAccessSafety());
-    m_xMasterDispatcher = xNewSupplier;
-}
-
-//------------------------------------------------------------------------------
-Sequence< ::rtl::OUString > SAL_CALL FmXDispatchInterceptorImpl::getInterceptedURLs(  ) throw(RuntimeException)
-{
-    return m_aInterceptedURLSchemes;
-}
-
-//------------------------------------------------------------------------------
-void SAL_CALL FmXDispatchInterceptorImpl::disposing(const ::com::sun::star::lang::EventObject& Source) throw( ::com::sun::star::uno::RuntimeException )
-{
-    if (m_bListening)
-    {
-        Reference< XDispatchProviderInterception > xIntercepted(m_xIntercepted.get(), UNO_QUERY);
-        if (Source.Source == xIntercepted)
-            ImplDetach();
-    }
-}
-
-//------------------------------------------------------------------------------
-void FmXDispatchInterceptorImpl::ImplDetach()
-{
-    ::osl::MutexGuard aGuard(getAccessSafety());
-    OSL_ENSURE(m_bListening, "FmXDispatchInterceptorImpl::ImplDetach: invalid call!");
-
-    // deregister ourself from the interception component
-    Reference< XDispatchProviderInterception > xIntercepted(m_xIntercepted.get(), UNO_QUERY);
-    if (xIntercepted.is())
-        xIntercepted->releaseDispatchProviderInterceptor(static_cast<XDispatchProviderInterceptor*>(this));
-
-//	m_xIntercepted = Reference< XDispatchProviderInterception >();
-        // Don't reset m_xIntercepted: It may be needed by our owner to check for which object we were
-        // responsible. As we hold the object with a weak reference only, this should be no problem.
-        // 88936 - 23.07.2001 - frank.schoenheit@sun.com
-    m_pMaster = NULL;
-    m_bListening = sal_False;
-}
-
-//------------------------------------------------------------------------------
-void FmXDispatchInterceptorImpl::disposing()
-{
-    // remove ourself as event listener from the interception component
-    if (m_bListening)
-    {
-        Reference< ::com::sun::star::lang::XComponent> xInterceptedComponent(m_xIntercepted.get(), UNO_QUERY);
-        if (xInterceptedComponent.is())
-            xInterceptedComponent->removeEventListener(static_cast<XEventListener*>(this));
-
-        // detach from the interception component
-        ImplDetach();
-    }
-}
-
-//==============================================================================
-//==============================================================================
-
-//------------------------------------------------------------------------------
-sal_Bool isLoadable( const Reference< XInterface >& _rxLoadable )
-{
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "fmtools::isLoadable" );
-    // determines whether a form should be loaded or not
-    // if there is no datasource or connection there is no reason to load a form
-    Reference< XPropertySet > xSet( _rxLoadable, UNO_QUERY );
-    if ( xSet.is() )
-    {
-        try
-        {
-            Reference< XConnection > xConn;
-            if ( OStaticDataAccessTools().isEmbeddedInDatabase( _rxLoadable.get(), xConn ) )
-                return sal_True;
-
-            // is there already a active connection
-            xSet->getPropertyValue(FM_PROP_ACTIVE_CONNECTION) >>= xConn;
-            if ( xConn.is() )
-                return sal_True;
-
-            ::rtl::OUString sPropertyValue;
-            OSL_VERIFY( xSet->getPropertyValue( FM_PROP_DATASOURCE ) >>= sPropertyValue );
-            if ( sPropertyValue.getLength() )
-                return sal_True;
-
-            OSL_VERIFY( xSet->getPropertyValue( FM_PROP_URL ) >>= sPropertyValue );
-            if ( sPropertyValue.getLength() )
-                return sal_True;
-        }
-        catch(Exception&)
-        {
-            DBG_ERROR( "isLoadable: caught an exception!" );
-        }
-
-    }
-    return sal_False;
-}
-
-//------------------------------------------------------------------------------
 void setConnection(const Reference< ::com::sun::star::sdbc::XRowSet>& _rxRowSet, const Reference< ::com::sun::star::sdbc::XConnection>& _rxConn)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "fmtools::setConnection" );
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index 67fcd479e4..709656dc1b 100644
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -30,12 +30,22 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
+
 #include "fmundo.hxx"
+#include "fmpgeimp.hxx"
+#include "svx/dbtoolsclient.hxx"
+#include "svditer.hxx"
+#include "fmobj.hxx"
+#include "fmprop.hrc"
+#include "fmresids.hrc"
+#include "svx/fmglob.hxx"
+#include "svx/dialmgr.hxx"
+#include "svx/fmmodel.hxx"
+#include "svx/fmpage.hxx"
 
 /** === begin UNO includes === **/
 #include <com/sun/star/util/XModifyBroadcaster.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <com/sun/star/form/XFormController.hpp>
 #include <com/sun/star/container/XContainer.hpp>
 #include <com/sun/star/container/XContainerListener.hpp>
 #include <com/sun/star/script/XEventAttacherManager.hpp>
@@ -44,18 +54,8 @@
 #include <com/sun/star/reflection/XInterfaceMethodTypeDescription.hpp>
 /** === end UNO includes === **/
 
-#ifndef _FM_FMMODEL_HXX
-#include <svx/fmmodel.hxx>
-#endif
 #include "svx/fmtools.hxx"
-#include <svx/fmpage.hxx>
-#ifndef _SVX_FMRESIDS_HRC
-#include "fmresids.hrc"
-#endif
 #include <rtl/logfile.hxx>
-#include <svx/dialmgr.hxx>
-#include "fmpgeimp.hxx"
-#include "svx/dbtoolsclient.hxx"
 #include <svl/macitem.hxx>
 #include <tools/shl.hxx>
 #include <tools/diagnose_ex.h>
@@ -64,13 +64,8 @@
 #include <sfx2/app.hxx>
 #include <sfx2/sfx.hrc>
 #include <sfx2/event.hxx>
-#include "svditer.hxx"
-#include "fmobj.hxx"
 #include <osl/mutex.hxx>
-#include <svx/fmglob.hxx>
-#ifndef _SVX_FMPROP_HRC
-#include "fmprop.hrc"
-#endif
+#include <vos/mutex.hxx>
 #include <comphelper/property.hxx>
 #include <comphelper/uno3.hxx>
 #include <comphelper/stl_types.hxx>
@@ -301,6 +296,42 @@ void FmXUndoEnvironment::Inserted(SdrObject* pObj)
 }
 
 //------------------------------------------------------------------------------
+namespace
+{
+    sal_Bool lcl_searchElement(const Reference< XIndexAccess>& xCont, const Reference< XInterface >& xElement)
+    {
+        if (!xCont.is() || !xElement.is())
+            return sal_False;
+
+        sal_Int32 nCount = xCont->getCount();
+        Reference< XInterface > xComp;
+        for (sal_Int32 i = 0; i < nCount; i++)
+        {
+            try
+            {
+                xCont->getByIndex(i) >>= xComp;
+                if (xComp.is())
+                {
+                    if ( xElement == xComp )
+                        return sal_True;
+                    else
+                    {
+                        Reference< XIndexAccess> xCont2(xComp, UNO_QUERY);
+                        if (xCont2.is() && lcl_searchElement(xCont2, xElement))
+                            return sal_True;
+                    }
+                }
+            }
+            catch(const Exception&)
+            {
+                DBG_UNHANDLED_EXCEPTION();
+            }
+        }
+        return sal_False;
+    }
+}
+
+//------------------------------------------------------------------------------
 void FmXUndoEnvironment::Inserted(FmFormObj* pObj)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXUndoEnvironment::Inserted" );
@@ -326,7 +357,7 @@ void FmXUndoEnvironment::Inserted(FmFormObj* pObj)
                 Reference< XIndexContainer > xNewParent;
                 Reference< XForm >           xForm;
                 sal_Int32 nPos = -1;
-                if ( searchElement( xForms, xObjectParent ) )
+                if ( lcl_searchElement( xForms, xObjectParent ) )
                 {
                     // the form which was the parent of the object when it was removed is still
                     // part of the form component hierachy of the current page
diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx
index fe907447e2..5911ed4ca9 100644
--- a/svx/source/form/fmview.cxx
+++ b/svx/source/form/fmview.cxx
@@ -626,7 +626,7 @@ void FmFormView::createControlLabelPair( OutputDevice* _pOutDev, sal_Int32 _nXOf
     );
 }
 // -----------------------------------------------------------------------------
-Reference< XFormController > FmFormView::GetFormController( const Reference< XForm >& _rxForm, const OutputDevice& _rDevice ) const
+Reference< runtime::XFormController > FmFormView::GetFormController( const Reference< XForm >& _rxForm, const OutputDevice& _rDevice ) const
 {
     return pImpl->getFormController( _rxForm, _rDevice );
 }
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index 3f08ba47e0..c8d008f08e 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -31,7 +31,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-#include "fmctrler.hxx"
 #include "fmdocumentclassification.hxx"
 #include "fmobj.hxx"
 #include "fmpgeimp.hxx"
@@ -84,68 +83,88 @@
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
 #include <com/sun/star/sdbc/XPreparedStatement.hpp>
 #include <com/sun/star/sdb/XQueriesSupplier.hpp>
+#include <com/sun/star/container/XContainer.hpp>
 /** === end UNO includes === **/
 
 #include <comphelper/enumhelper.hxx>
 #include <comphelper/extract.hxx>
+#include <comphelper/namedvaluecollection.hxx>
 #include <comphelper/numbers.hxx>
 #include <comphelper/property.hxx>
+#include <cppuhelper/exc_hlp.hxx>
 #include <unotools/moduleoptions.hxx>
 #include <tools/diagnose_ex.h>
 #include <vcl/msgbox.hxx>
 #include <vcl/stdtext.hxx>
+#include <vos/mutex.hxx>
 #include <rtl/logfile.hxx>
 
 #include <algorithm>
 
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::sdbcx;
-using namespace ::com::sun::star::sdbc;
-using namespace ::com::sun::star::sdb;
-using namespace ::com::sun::star::container;
-using namespace ::com::sun::star::form;
-using namespace ::com::sun::star::awt;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::util;
-using namespace ::com::sun::star::script;
-using namespace ::com::sun::star::style;
-using namespace ::com::sun::star::task;
-using namespace ::com::sun::star::ui::dialogs;
 using namespace ::comphelper;
-using namespace ::svxform;
 using namespace ::svx;
-using com::sun::star::style::VerticalAlignment_MIDDLE;
-using ::com::sun::star::form::binding::XValueBinding;
-using ::com::sun::star::form::binding::XBindableValue;
-
-namespace svxform
-{
-    //========================================================================
-    class OAutoDispose
-    {
-    protected:
-        Reference< XComponent >	m_xComp;
-
-    public:
-        OAutoDispose( const Reference< XInterface > _rxObject );
-        ~OAutoDispose();
-    };
+using namespace ::svxform;
 
-    //------------------------------------------------------------------------
-    OAutoDispose::OAutoDispose( const Reference< XInterface > _rxObject )
-        :m_xComp(_rxObject, UNO_QUERY)
-    {
-    }
-
-    //------------------------------------------------------------------------
-    OAutoDispose::~OAutoDispose()
-    {
-        if (m_xComp.is())
-            m_xComp->dispose();
-    }
-}
+    using namespace ::com::sun::star;
+    /** === begin UNO using === **/
+    using ::com::sun::star::uno::Exception;
+    using ::com::sun::star::uno::RuntimeException;
+    using ::com::sun::star::uno::XInterface;
+    using ::com::sun::star::uno::Sequence;
+    using ::com::sun::star::uno::UNO_QUERY;
+    using ::com::sun::star::uno::UNO_QUERY_THROW;
+    using ::com::sun::star::uno::UNO_SET_THROW;
+    using ::com::sun::star::uno::Type;
+    using ::com::sun::star::uno::Reference;
+    using ::com::sun::star::uno::Any;
+    using ::com::sun::star::uno::makeAny;
+    using ::com::sun::star::style::VerticalAlignment_MIDDLE;
+    using ::com::sun::star::form::FormButtonType_SUBMIT;
+    using ::com::sun::star::form::binding::XValueBinding;
+    using ::com::sun::star::form::binding::XBindableValue;
+    using ::com::sun::star::lang::XComponent;
+    using ::com::sun::star::container::XIndexAccess;
+    using ::com::sun::star::form::XForm;
+    using ::com::sun::star::form::runtime::XFormController;
+    using ::com::sun::star::script::XEventAttacherManager;
+    using ::com::sun::star::awt::XTabControllerModel;
+    using ::com::sun::star::container::XChild;
+    using ::com::sun::star::container::XEnumeration;
+    using ::com::sun::star::task::XInteractionHandler;
+    using ::com::sun::star::lang::XInitialization;
+    using ::com::sun::star::awt::XTabController;
+    using ::com::sun::star::lang::XUnoTunnel;
+    using ::com::sun::star::awt::XControlContainer;
+    using ::com::sun::star::awt::XControl;
+    using ::com::sun::star::form::XFormComponent;
+    using ::com::sun::star::form::XForm;
+    using ::com::sun::star::lang::IndexOutOfBoundsException;
+    using ::com::sun::star::lang::WrappedTargetException;
+    using ::com::sun::star::container::XContainer;
+    using ::com::sun::star::container::ContainerEvent;
+    using ::com::sun::star::lang::EventObject;
+    using ::com::sun::star::beans::NamedValue;
+    using ::com::sun::star::sdb::SQLErrorEvent;
+    using ::com::sun::star::sdbc::XRowSet;
+    using ::com::sun::star::beans::XPropertySet;
+    using ::com::sun::star::container::XElementAccess;
+    using ::com::sun::star::awt::XWindow;
+    using ::com::sun::star::awt::FocusEvent;
+    using ::com::sun::star::ui::dialogs::XExecutableDialog;
+    using ::com::sun::star::sdbc::XDataSource;
+    using ::com::sun::star::container::XIndexContainer;
+    using ::com::sun::star::sdbc::XConnection;
+    using ::com::sun::star::container::XNameAccess;
+    using ::com::sun::star::sdb::SQLContext;
+    using ::com::sun::star::sdbc::SQLWarning;
+    using ::com::sun::star::sdbc::SQLException;
+    using ::com::sun::star::util::XNumberFormatsSupplier;
+    using ::com::sun::star::util::XNumberFormats;
+    using ::com::sun::star::beans::XPropertySetInfo;
+    /** === end UNO using === **/
+    namespace FormComponentType = ::com::sun::star::form::FormComponentType;
+    namespace CommandType = ::com::sun::star::sdb::CommandType;
+    namespace DataType = ::com::sun::star::sdbc::DataType;
 
 //------------------------------------------------------------------------------
 class FmXFormView::ObjectRemoveListener : public SfxListener
@@ -181,7 +200,7 @@ FmXPageViewWinRec::FmXPageViewWinRec( const ::comphelper::ComponentContext& _rCo
             {
                 Reference< XForm > xForm( xForms->getByIndex(i), UNO_QUERY );
                 if ( xForm.is() )
-                    setController( xForm );
+                    setController( xForm, NULL );
             }
         }
         catch( const Exception& )
@@ -207,7 +226,7 @@ void FmXPageViewWinRec::dispose()
     {
         try
         {
-            Reference< XFormController > xController( *i, UNO_SET_THROW );
+            Reference< XFormController > xController( *i, UNO_QUERY_THROW );
 
             // detaching the events
             Reference< XChild > xControllerModel( xController->getModel(), UNO_QUERY );
@@ -276,6 +295,21 @@ Any SAL_CALL FmXPageViewWinRec::getByIndex(sal_Int32 nIndex) throw( IndexOutOfBo
 }
 
 //------------------------------------------------------------------------
+void SAL_CALL FmXPageViewWinRec::makeVisible( const Reference< XControl >& _Control ) throw (RuntimeException)
+{
+    ::vos::OGuard aSolarGuard(Application::GetSolarMutex());
+
+    Reference< XWindow >  xWindow( _Control, UNO_QUERY );
+    if ( xWindow.is() && m_pViewImpl->getView() && m_pWindow )
+    {
+        awt::Rectangle aRect = xWindow->getPosSize();
+        ::Rectangle aNewRect( aRect.X, aRect.Y, aRect.X + aRect.Width, aRect.Y + aRect.Height );
+        aNewRect = m_pWindow->PixelToLogic( aNewRect );
+        m_pViewImpl->getView()->MakeVisible( aNewRect, *m_pWindow );
+    }
+}
+
+//------------------------------------------------------------------------
 Reference< XFormController >  getControllerSearchChilds( const Reference< XIndexAccess > & xIndex, const Reference< XTabControllerModel > & xModel)
 {
     if (xIndex.is() && xIndex->getCount())
@@ -319,9 +353,8 @@ Reference< XFormController >  FmXPageViewWinRec::getController( const Reference<
 }
 
 //------------------------------------------------------------------------
-void FmXPageViewWinRec::setController(const Reference< XForm > & xForm,  FmXFormController* _pParent )
+void FmXPageViewWinRec::setController(const Reference< XForm > & xForm, const Reference< XFormController >& _rxParentController )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXPageViewWinRec::setController" );
     DBG_ASSERT( xForm.is(), "FmXPageViewWinRec::setController: there should be a form!" );
     Reference< XIndexAccess >  xFormCps(xForm, UNO_QUERY);
     if (!xFormCps.is())
@@ -330,58 +363,52 @@ void FmXPageViewWinRec::setController(const Reference< XForm > & xForm,  FmXForm
     Reference< XTabControllerModel >  xTabOrder(xForm, UNO_QUERY);
 
     // create a form controller
-    FmXFormController* pController = new FmXFormController( m_aContext.getLegacyServiceFactory(), m_pViewImpl->getView(), m_pWindow );
-    Reference< XFormController > xController( pController );
+    Reference< XFormController > xController( m_aContext.createComponent( FM_FORM_CONTROLLER ), UNO_QUERY );
+    if ( !xController.is() )
+    {
+        ShowServiceNotAvailableError( m_pWindow, FM_FORM_CONTROLLER, sal_True );
+        return;
+    }
 
     Reference< XInteractionHandler > xHandler;
-    if ( _pParent )
-        xHandler = _pParent->getInteractionHandler();
+    if ( _rxParentController.is() )
+        xHandler = _rxParentController->getInteractionHandler();
     else
     {
         // TODO: should we create a default handler? Not really necessary, since the
         // FormController itself has a default fallback
     }
     if ( xHandler.is() )
-    {
-        Reference< XInitialization > xInitController( xController, UNO_QUERY );
-        DBG_ASSERT( xInitController.is(), "FmXPageViewWinRec::setController: can't initialize the controller!" );
-        if ( xInitController.is() )
-        {
-            Sequence< Any > aInitArgs( 1 );
-            aInitArgs[ 0 ] <<= NamedValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "InteractionHandler" ) ), makeAny( xHandler ) );
-            xInitController->initialize( aInitArgs );
-        }
-    }
+        xController->setInteractionHandler( xHandler );
 
-    pController->setModel(xTabOrder);
-    pController->setContainer( m_xControlContainer );
-    pController->activateTabOrder();
-    pController->addActivateListener(m_pViewImpl);
+    xController->setContext( this );
 
-    if ( _pParent )
-        _pParent->addChild(pController);
+    xController->setModel( xTabOrder );
+    xController->setContainer( m_xControlContainer );
+    xController->activateTabOrder();
+    xController->addActivateListener( m_pViewImpl );
+
+    if ( _rxParentController.is() )
+        _rxParentController->addChildController( xController );
     else
     {
-        //	Reference< XFormController >  xController(pController);
         m_aControllerList.push_back(xController);
 
-        pController->setParent(*this);
+        xController->setParent( *this );
 
         // attaching the events
-        Reference< XEventAttacherManager >  xEventManager(xForm->getParent(), UNO_QUERY);
+        Reference< XEventAttacherManager > xEventManager( xForm->getParent(), UNO_QUERY );
         Reference< XInterface >  xIfc(xController, UNO_QUERY);
         xEventManager->attach(m_aControllerList.size() - 1, xIfc, makeAny(xController) );
     }
 
-
-
     // jetzt die Subforms durchgehen
     sal_uInt32 nLength = xFormCps->getCount();
     Reference< XForm >  xSubForm;
     for (sal_uInt32 i = 0; i < nLength; i++)
     {
         if ( xFormCps->getByIndex(i) >>= xSubForm )
-            setController(xSubForm, pController);
+            setController( xSubForm, xController );
     }
 }
 
@@ -406,18 +433,12 @@ void FmXPageViewWinRec::updateTabOrder( const Reference< XForm >& _rxForm )
             // if it's a sub form, then we must ensure there exist TabControllers
             // for all its ancestors, too
             Reference< XForm > xParentForm( _rxForm->getParent(), UNO_QUERY );
-            FmXFormController* pFormController = NULL;
             // there is a parent form -> look for the respective controller
+            Reference< XFormController > xParentController;
             if ( xParentForm.is() )
-                xTabCtrl = Reference< XTabController >( getController( xParentForm ), UNO_QUERY );
+                xParentController.set( getController( xParentForm ), UNO_QUERY );
 
-            if ( xTabCtrl.is() )
-            {
-                Reference< XUnoTunnel > xTunnel( xTabCtrl, UNO_QUERY_THROW );
-                pFormController = reinterpret_cast< FmXFormController* >( xTunnel->getSomething( FmXFormController::getUnoTunnelImplementationId() ) );
-            }
-
-            setController( _rxForm, pFormController );
+            setController( _rxForm, xParentController );
         }
     }
     catch( const Exception& )
@@ -1068,20 +1089,14 @@ IMPL_LINK( FmXFormView, OnStartControlWizard, void*, /**/ )
     if ( pWizardAsciiName )
     {
         // build the argument list
-        Sequence< Any > aWizardArgs(1);
-        // the object affected
-        aWizardArgs[0] = makeAny( PropertyValue(
-            ::rtl::OUString::createFromAscii("ObjectModel"),
-            0,
-            makeAny( m_xLastCreatedControlModel ),
-            PropertyState_DIRECT_VALUE
-        ) );
+        ::comphelper::NamedValueCollection aWizardArgs;
+        aWizardArgs.put( "ObjectModel", m_xLastCreatedControlModel );
 
         // create the wizard object
         Reference< XExecutableDialog > xWizard;
         try
         {
-            m_aContext.createComponentWithArguments( pWizardAsciiName, aWizardArgs, xWizard );
+            m_aContext.createComponentWithArguments( pWizardAsciiName, aWizardArgs.getWrappedPropertyValues(), xWizard );
         }
         catch( const Exception& )
         {
@@ -1187,9 +1202,10 @@ SdrObject* FmXFormView::implCreateFieldControl( const ::svx::ODataAccessDescript
                 m_aContext.getLegacyServiceFactory()
             ) );
     }
-    catch(const SQLContext& e) { aError.Reason <<= e; }
-    catch(const SQLWarning& e) { aError.Reason <<= e; }
-    catch(const SQLException& e) { aError.Reason <<= e; }
+    catch ( const SQLException& )
+    {
+        aError.Reason = ::cppu::getCaughtException();
+    }
     catch( const Exception& ) { /* will be asserted below */ }
     if (aError.Reason.hasValue())
     {
@@ -1217,14 +1233,11 @@ SdrObject* FmXFormView::implCreateFieldControl( const ::svx::ODataAccessDescript
 
         if (xFields.is() && xFields->hasByName(sFieldName))
             xFields->getByName(sFieldName) >>= xField;
-
-        Reference< XNumberFormatsSupplier >  xSupplier = aDBATools.getNumberFormats(xConnection, sal_False);
-        if (!xSupplier.is() || !xField.is())
+        if ( !xField.is() )
             return NULL;
 
-        Reference< XNumberFormats >  xNumberFormats(xSupplier->getNumberFormats());
-        if (!xNumberFormats.is())
-            return NULL;
+        Reference< XNumberFormatsSupplier > xSupplier( aDBATools.getNumberFormats( xConnection, sal_False ), UNO_SET_THROW );
+        Reference< XNumberFormats >  xNumberFormats( xSupplier->getNumberFormats(), UNO_SET_THROW );
 
         ::rtl::OUString sLabelPostfix;
 
@@ -1275,10 +1288,12 @@ SdrObject* FmXFormView::implCreateFieldControl( const ::svx::ODataAccessDescript
         else
             switch (nDataType)
             {
+                case DataType::BLOB:
                 case DataType::LONGVARBINARY:
                     nOBJID = OBJ_FM_IMAGECONTROL;
                     break;
                 case DataType::LONGVARCHAR:
+                case DataType::CLOB:
                     nOBJID = OBJ_FM_EDIT;
                     break;
                 case DataType::BINARY:
@@ -1610,7 +1625,9 @@ bool FmXFormView::createControlLabelPair( const ::comphelper::ComponentContext&
         aControlSize = aDefSize;
         break;
     case DataType::LONGVARCHAR:
+    case DataType::CLOB:
     case DataType::LONGVARBINARY:
+    case DataType::BLOB:
         aControlSize = aDefImageSize;
         break;
     }
@@ -1643,7 +1660,7 @@ bool FmXFormView::createControlLabelPair( const ::comphelper::ComponentContext&
         }
     }
 
-    if ( nDataType == DataType::LONGVARCHAR && xControlPropInfo->hasPropertyByName( FM_PROP_MULTILINE ) )
+    if ( (nDataType == DataType::LONGVARCHAR || nDataType == DataType::CLOB) && xControlPropInfo->hasPropertyByName( FM_PROP_MULTILINE ) )
     {
         xControlSet->setPropertyValue( FM_PROP_MULTILINE, makeAny( sal_Bool( sal_True ) ) );
     }
diff --git a/svx/source/form/formcontrolfactory.cxx b/svx/source/form/formcontrolfactory.cxx
index 451354e905..4ac70bd3dc 100644
--- a/svx/source/form/formcontrolfactory.cxx
+++ b/svx/source/form/formcontrolfactory.cxx
@@ -432,7 +432,8 @@ namespace svxform
                 case FormComponentType::COMBOBOX:
                 {
                     sal_Bool bDropDown = !_rControlBoundRect.IsEmpty() && ( _rControlBoundRect.GetWidth() >= 3 * _rControlBoundRect.GetHeight() );
-                    _rxControlModel->setPropertyValue( FM_PROP_DROPDOWN, makeAny( (sal_Bool)bDropDown ) );
+                    if ( xPSI->hasPropertyByName( FM_PROP_DROPDOWN ) )
+                        _rxControlModel->setPropertyValue( FM_PROP_DROPDOWN, makeAny( (sal_Bool)bDropDown ) );
                     _rxControlModel->setPropertyValue( FM_PROP_LINECOUNT, makeAny( sal_Int16( 20 ) ) );
                 }
                 break;
diff --git a/svx/source/form/fmctrler.cxx b/svx/source/form/formcontroller.cxx
index 21b905566d..1714fba726 100644
--- a/svx/source/form/fmctrler.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -6,9 +6,6 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmctrler.cxx,v $
- * $Revision: 1.71 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -31,24 +28,18 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-#include "confirmdelete.hxx"
 #include "fmcontrolbordermanager.hxx"
 #include "fmcontrollayout.hxx"
-#include "fmctrler.hxx"
-#include "fmdispatch.hxx"
+#include "formcontroller.hxx"
+#include "formfeaturedispatcher.hxx"
 #include "fmdocumentclassification.hxx"
+#include "formcontrolling.hxx"
 #include "fmprop.hrc"
+#include "svx/dialmgr.hxx"
 #include "fmresids.hrc"
 #include "fmservs.hxx"
-#include "fmshimp.hxx"
 #include "svx/fmtools.hxx"
 #include "fmurl.hxx"
-#include "svx/dialmgr.hxx"
-#include "svx/fmshell.hxx"
-#include "svx/fmview.hxx"
-#include "svx/sdrpagewindow.hxx"
-#include "svx/svdpagv.hxx"
-#include "trace.hxx"
 
 /** === begin UNO includes === **/
 #include <com/sun/star/awt/FocusChangeReason.hpp>
@@ -72,6 +63,13 @@
 #include <com/sun/star/sdb/XInteractionSupplyParameters.hpp>
 #include <com/sun/star/sdbc/ColumnValue.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
+#include <com/sun/star/form/runtime/FormOperations.hpp>
+#include <com/sun/star/form/runtime/FormFeature.hpp>
+#include <com/sun/star/container/XContainer.hpp>
+#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
+#include <com/sun/star/util/XNumberFormatter.hpp>
+#include <com/sun/star/sdb/SQLContext.hpp>
+#include <com/sun/star/sdb/XColumn.hpp>
 /** === end UNO includes === **/
 
 #include <comphelper/enumhelper.hxx>
@@ -84,9 +82,6 @@
 #include <comphelper/uno3.hxx>
 #include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/typeprovider.hxx>
-#include <sfx2/bindings.hxx>
-#include <sfx2/viewfrm.hxx>
-#include <sfx2/viewsh.hxx>
 #include <toolkit/controls/unocontrol.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <tools/debug.hxx>
@@ -94,32 +89,126 @@
 #include <tools/shl.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/svapp.hxx>
+#include <vos/mutex.hxx>
 #include <rtl/logfile.hxx>
 
 #include <algorithm>
 #include <functional>
 
 using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::awt;
-using namespace ::com::sun::star::sdb;
-using namespace ::com::sun::star::sdbc;
-using namespace ::com::sun::star::sdbcx;
-using namespace ::com::sun::star::task;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::util;
-using namespace ::com::sun::star::form;
-using namespace ::com::sun::star::form::validation;
-using namespace ::com::sun::star::form::runtime;
-using namespace ::com::sun::star::frame;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::script;
-using namespace ::com::sun::star::container;
 using namespace ::comphelper;
 using namespace ::connectivity;
-using namespace ::svxform;
 using namespace ::connectivity::simple;
 
+//------------------------------------------------------------------
+::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL
+    FormController_NewInstance_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & _rxORB )
+{
+    return *( new ::svxform::FormController( _rxORB ) );
+}
+
+namespace svxform
+{
+
+    /** === begin UNO using === **/
+    using ::com::sun::star::sdb::XColumn;
+    using ::com::sun::star::awt::XControl;
+    using ::com::sun::star::awt::XTabController;
+    using ::com::sun::star::awt::XToolkit;
+    using ::com::sun::star::awt::XWindowPeer;
+    using ::com::sun::star::form::XGrid;
+    using ::com::sun::star::beans::XPropertySet;
+    using ::com::sun::star::uno::UNO_SET_THROW;
+    using ::com::sun::star::uno::UNO_QUERY_THROW;
+    using ::com::sun::star::container::XIndexAccess;
+    using ::com::sun::star::uno::Exception;
+    using ::com::sun::star::uno::XInterface;
+    using ::com::sun::star::uno::UNO_QUERY;
+    using ::com::sun::star::uno::Sequence;
+    using ::com::sun::star::uno::Reference;
+    using ::com::sun::star::beans::XPropertySetInfo;
+    using ::com::sun::star::beans::PropertyValue;
+    using ::com::sun::star::uno::RuntimeException;
+    using ::com::sun::star::lang::IndexOutOfBoundsException;
+    using ::com::sun::star::sdb::XInteractionSupplyParameters;
+    using ::com::sun::star::awt::XTextComponent;
+    using ::com::sun::star::awt::XTextListener;
+    using ::com::sun::star::uno::Any;
+    using ::com::sun::star::frame::XDispatch;
+    using ::com::sun::star::lang::XMultiServiceFactory;
+    using ::com::sun::star::uno::XAggregation;
+    using ::com::sun::star::uno::Type;
+    using ::com::sun::star::lang::IllegalArgumentException;
+    using ::com::sun::star::sdbc::XConnection;
+    using ::com::sun::star::sdbc::XRowSet;
+    using ::com::sun::star::sdbc::XDatabaseMetaData;
+    using ::com::sun::star::util::XNumberFormatsSupplier;
+    using ::com::sun::star::util::XNumberFormatter;
+    using ::com::sun::star::sdbcx::XColumnsSupplier;
+    using ::com::sun::star::container::XNameAccess;
+    using ::com::sun::star::lang::EventObject;
+    using ::com::sun::star::beans::Property;
+    using ::com::sun::star::container::XEnumeration;
+    using ::com::sun::star::form::XFormComponent;
+    using ::com::sun::star::form::runtime::XFormOperations;
+    using ::com::sun::star::form::runtime::FilterEvent;
+    using ::com::sun::star::form::runtime::XFilterControllerListener;
+    using ::com::sun::star::awt::XControlContainer;
+    using ::com::sun::star::container::XIdentifierReplace;
+    using ::com::sun::star::lang::WrappedTargetException;
+    using ::com::sun::star::form::XFormControllerListener;
+    using ::com::sun::star::awt::XWindow;
+    using ::com::sun::star::sdbc::XResultSet;
+    using ::com::sun::star::awt::XControlModel;
+    using ::com::sun::star::awt::XTabControllerModel;
+    using ::com::sun::star::beans::PropertyChangeEvent;
+    using ::com::sun::star::form::validation::XValidatableFormComponent;
+    using ::com::sun::star::form::XLoadable;
+    using ::com::sun::star::script::XEventAttacherManager;
+    using ::com::sun::star::form::XBoundControl;
+    using ::com::sun::star::beans::XPropertyChangeListener;
+    using ::com::sun::star::awt::TextEvent;
+    using ::com::sun::star::form::XBoundComponent;
+    using ::com::sun::star::awt::XCheckBox;
+    using ::com::sun::star::awt::XComboBox;
+    using ::com::sun::star::awt::XListBox;
+    using ::com::sun::star::awt::ItemEvent;
+    using ::com::sun::star::util::XModifyListener;
+    using ::com::sun::star::form::XReset;
+    using ::com::sun::star::frame::XDispatchProviderInterception;
+    using ::com::sun::star::form::XGridControl;
+    using ::com::sun::star::awt::XVclWindowPeer;
+    using ::com::sun::star::form::validation::XValidator;
+    using ::com::sun::star::awt::FocusEvent;
+    using ::com::sun::star::sdb::SQLContext;
+    using ::com::sun::star::container::XChild;
+    using ::com::sun::star::form::TabulatorCycle_RECORDS;
+    using ::com::sun::star::container::ContainerEvent;
+    using ::com::sun::star::lang::DisposedException;
+    using ::com::sun::star::lang::Locale;
+    using ::com::sun::star::beans::NamedValue;
+    using ::com::sun::star::lang::NoSupportException;
+    using ::com::sun::star::sdb::RowChangeEvent;
+    using ::com::sun::star::frame::XStatusListener;
+    using ::com::sun::star::frame::XDispatchProviderInterceptor;
+    using ::com::sun::star::sdb::SQLErrorEvent;
+    using ::com::sun::star::form::DatabaseParameterEvent;
+    using ::com::sun::star::sdb::ParametersRequest;
+    using ::com::sun::star::task::XInteractionRequest;
+    using ::com::sun::star::util::URL;
+    using ::com::sun::star::frame::FeatureStateEvent;
+    using ::com::sun::star::form::runtime::XFormControllerContext;
+    using ::com::sun::star::task::XInteractionHandler;
+    using ::com::sun::star::form::runtime::FormOperations;
+    using ::com::sun::star::container::XContainer;
+    using ::com::sun::star::sdbc::SQLWarning;
+    /** === end UNO using === **/
+    namespace ColumnValue = ::com::sun::star::sdbc::ColumnValue;
+    namespace PropertyAttribute = ::com::sun::star::beans::PropertyAttribute;
+    namespace FocusChangeReason = ::com::sun::star::awt::FocusChangeReason;
+    namespace RowChangeAction = ::com::sun::star::sdb::RowChangeAction;
+    namespace FormFeature = ::com::sun::star::form::runtime::FormFeature;
+
 //==============================================================================
 // ColumnInfo
 //==============================================================================
@@ -184,7 +273,6 @@ ColumnInfoCache::ColumnInfoCache( const Reference< XColumnsSupplier >& _rxColSup
     :m_aColumns()
     ,m_bControlsInitialized( false )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "ColumnInfoCache::ColumnInfoCache" );
     try
     {
         m_aColumns.clear();
@@ -242,7 +330,6 @@ namespace
 //------------------------------------------------------------------------------
 void ColumnInfoCache::deinitializeControls()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "ColumnInfoCache::deinitializeControls" );
     for (   ColumnInfos::iterator col = m_aColumns.begin();
             col != m_aColumns.end();
             ++col
@@ -255,7 +342,6 @@ void ColumnInfoCache::deinitializeControls()
 //------------------------------------------------------------------------------
 void ColumnInfoCache::initializeControls( const Sequence< Reference< XControl > >& _rControls )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "ColumnInfoCache::initializeControls" );
     try
     {
         // for every of our known columns, find the controls which are bound to this column
@@ -338,7 +424,6 @@ void ColumnInfoCache::initializeControls( const Sequence< Reference< XControl >
 //------------------------------------------------------------------------------
 const ColumnInfo& ColumnInfoCache::getColumnInfo( size_t _pos )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "ColumnInfoCache::getColumnInfo" );
     if ( _pos >= m_aColumns.size() )
         throw IndexOutOfBoundsException();
 
@@ -424,7 +509,7 @@ void FmXAutoControl::ImplSetPeerProperty( const ::rtl::OUString& rPropName, cons
 }
 
 //------------------------------------------------------------------------------
-IMPL_LINK( FmXFormController, OnActivateTabOrder, void*, /*EMPTYTAG*/ )
+IMPL_LINK( FormController, OnActivateTabOrder, void*, /*EMPTYTAG*/ )
 {
     activateTabOrder();
     return 1;
@@ -441,10 +526,10 @@ struct UpdateAllListeners : public ::std::unary_function< Reference< XDispatch >
     }
 };
 //..............................................................................
-IMPL_LINK( FmXFormController, OnInvalidateFeatures, void*, /*_pNotInterestedInThisParam*/ )
+IMPL_LINK( FormController, OnInvalidateFeatures, void*, /*_pNotInterestedInThisParam*/ )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
-    for ( ::std::set< sal_Int32 >::const_iterator aLoop = m_aInvalidFeatures.begin();
+    for ( ::std::set< sal_Int16 >::const_iterator aLoop = m_aInvalidFeatures.begin();
           aLoop != m_aInvalidFeatures.end();
           ++aLoop
         )
@@ -462,48 +547,28 @@ IMPL_LINK( FmXFormController, OnInvalidateFeatures, void*, /*_pNotInterestedInTh
 
 /*************************************************************************/
 
+DBG_NAME( FormController )
 //------------------------------------------------------------------
-Reference< XInterface > SAL_CALL
-    FmXFormController_NewInstance_Impl(const Reference< XMultiServiceFactory > & _rxORB)
-{
-    return *(new FmXFormController(_rxORB));
-}
-
-//------------------------------------------------------------------
-namespace fmctrlr
-{
-    const ::rtl::OUString& getDataModeIdentifier()
-    {
-        static ::rtl::OUString s_sDataModeIdentifier = DATA_MODE;
-        return s_sDataModeIdentifier;
-    }
-}
-using namespace fmctrlr;
-
-DBG_NAME( FmXFormController )
-//------------------------------------------------------------------
-FmXFormController::FmXFormController(const Reference< XMultiServiceFactory > & _rxORB,
-                                     FmFormView* _pView, Window* _pWindow )
-                  :FmXFormController_BASE( m_aMutex )
-                  ,OPropertySetHelper( FmXFormController_BASE::rBHelper )
-                  ,OSQLParserClient(_rxORB)
-                  ,m_xORB(_rxORB)
+FormController::FormController(const Reference< XMultiServiceFactory > & _rxORB )
+                  :FormController_BASE( m_aMutex )
+                  ,OPropertySetHelper( FormController_BASE::rBHelper )
+                  ,OSQLParserClient( _rxORB )
+                  ,m_aContext( _rxORB )
                   ,m_aActivateListeners(m_aMutex)
                   ,m_aModifyListeners(m_aMutex)
                   ,m_aErrorListeners(m_aMutex)
                   ,m_aDeleteListeners(m_aMutex)
                   ,m_aRowSetApproveListeners(m_aMutex)
                   ,m_aParameterListeners(m_aMutex)
-                  ,m_pView(_pView)
-                  ,m_pWindow(_pWindow)
+                  ,m_aFilterListeners(m_aMutex)
                   ,m_pControlBorderManager( new ::svxform::ControlBorderManager )
-                  ,m_aControllerFeatures( _rxORB, this )
-                  ,m_aMode(getDataModeIdentifier())
-                  ,m_aLoadEvent( LINK( this, FmXFormController, OnLoad ) )
-                  ,m_aToggleEvent( LINK( this, FmXFormController, OnToggleAutoFields ) )
-                  ,m_aActivationEvent( LINK( this, FmXFormController, OnActivated ) )
-                  ,m_aDeactivationEvent( LINK( this, FmXFormController, OnDeactivated ) )
-                  ,m_nCurrentFilterPosition(0)
+                  ,m_xFormOperations()
+                  ,m_aMode( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DataMode" ) ) )
+                  ,m_aLoadEvent( LINK( this, FormController, OnLoad ) )
+                  ,m_aToggleEvent( LINK( this, FormController, OnToggleAutoFields ) )
+                  ,m_aActivationEvent( LINK( this, FormController, OnActivated ) )
+                  ,m_aDeactivationEvent( LINK( this, FormController, OnDeactivated ) )
+                  ,m_nCurrentFilterPosition(-1)
                   ,m_bCurrentRecordModified(sal_False)
                   ,m_bCurrentRecordNew(sal_False)
                   ,m_bLocked(sal_False)
@@ -519,17 +584,16 @@ FmXFormController::FmXFormController(const Reference< XMultiServiceFactory > & _
                   ,m_bDetachEvents(sal_True)
                   ,m_bAttemptedHandlerCreation( false )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::FmXFormController" );
-    DBG_CTOR( FmXFormController, NULL );
+    DBG_CTOR( FormController, NULL );
 
     ::comphelper::increment(m_refCount);
     {
         {
             m_xAggregate = Reference< XAggregation >(
-                m_xORB->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.awt.TabController" ) ),
+                m_aContext.createComponent( "com.sun.star.awt.TabController" ),
                 UNO_QUERY
             );
-            DBG_ASSERT( m_xAggregate.is(), "FmXFormController::FmXFormController : could not create my aggregate !" );
+            DBG_ASSERT( m_xAggregate.is(), "FormController::FormController : could not create my aggregate !" );
             m_xTabController = Reference< XTabController >( m_xAggregate, UNO_QUERY );
         }
 
@@ -539,14 +603,14 @@ FmXFormController::FmXFormController(const Reference< XMultiServiceFactory > & _
     ::comphelper::decrement(m_refCount);
 
     m_aTabActivationTimer.SetTimeout( 500 );
-    m_aTabActivationTimer.SetTimeoutHdl( LINK( this, FmXFormController, OnActivateTabOrder ) );
+    m_aTabActivationTimer.SetTimeoutHdl( LINK( this, FormController, OnActivateTabOrder ) );
 
     m_aFeatureInvalidationTimer.SetTimeout( 200 );
-    m_aFeatureInvalidationTimer.SetTimeoutHdl( LINK( this, FmXFormController, OnInvalidateFeatures ) );
+    m_aFeatureInvalidationTimer.SetTimeoutHdl( LINK( this, FormController, OnInvalidateFeatures ) );
 }
 
 //------------------------------------------------------------------
-FmXFormController::~FmXFormController()
+FormController::~FormController()
 {
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -565,6 +629,10 @@ FmXFormController::~FmXFormController()
 
     disposeAllFeaturesAndDispatchers();
 
+    if ( m_xFormOperations.is() )
+        m_xFormOperations->dispose();
+    m_xFormOperations.clear();
+
     // Freigeben der Aggregation
     if ( m_xAggregate.is() )
     {
@@ -574,28 +642,25 @@ FmXFormController::~FmXFormController()
 
     DELETEZ( m_pControlBorderManager );
 
-    DBG_DTOR( FmXFormController, NULL );
+    DBG_DTOR( FormController, NULL );
 }
 
 // -----------------------------------------------------------------------------
-void SAL_CALL FmXFormController::acquire() throw ()
+void SAL_CALL FormController::acquire() throw ()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::acquire" );
-    FmXFormController_BASE::acquire();
+    FormController_BASE::acquire();
 }
 
 // -----------------------------------------------------------------------------
-void SAL_CALL FmXFormController::release() throw ()
+void SAL_CALL FormController::release() throw ()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::release" );
-    FmXFormController_BASE::release();
+    FormController_BASE::release();
 }
 
 //------------------------------------------------------------------
-Any SAL_CALL FmXFormController::queryInterface( const Type& _rType ) throw(RuntimeException)
+Any SAL_CALL FormController::queryInterface( const Type& _rType ) throw(RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::queryInterface" );
-    Any aRet = FmXFormController_BASE::queryInterface( _rType );
+    Any aRet = FormController_BASE::queryInterface( _rType );
     if ( !aRet.hasValue() )
         aRet = OPropertySetHelper::queryInterface( _rType );
     if ( !aRet.hasValue() )
@@ -604,9 +669,8 @@ Any SAL_CALL FmXFormController::queryInterface( const Type& _rType ) throw(Runti
 }
 
 //------------------------------------------------------------------------------
-Sequence< sal_Int8 > SAL_CALL FmXFormController::getImplementationId() throw( RuntimeException )
+Sequence< sal_Int8 > SAL_CALL FormController::getImplementationId() throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::getImplementationId" );
     static ::cppu::OImplementationId* pId = NULL;
     if  ( !pId )
     {
@@ -621,56 +685,18 @@ Sequence< sal_Int8 > SAL_CALL FmXFormController::getImplementationId() throw( Ru
 }
 
 //------------------------------------------------------------------------------
-Sequence< Type > SAL_CALL FmXFormController::getTypes(  ) throw(RuntimeException)
+Sequence< Type > SAL_CALL FormController::getTypes(  ) throw(RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::getTypes" );
     return comphelper::concatSequences(
-        FmXFormController_BASE::getTypes(),
+        FormController_BASE::getTypes(),
         ::cppu::OPropertySetHelper::getTypes()
     );
 }
 
-// -----------------------------------------------------------------------------
-// XUnoTunnel
-Sequence< sal_Int8 > FmXFormController::getUnoTunnelImplementationId()
-{
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::getUnoTunnelImplementationId" );
-    static ::cppu::OImplementationId * pId = NULL;
-    if ( !pId )
-    {
-        ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-        if ( !pId )
-        {
-            static ::cppu::OImplementationId aId;
-            pId = &aId;
-        }
-    }
-    return pId->getImplementationId();
-}
-//------------------------------------------------------------------------------
-FmXFormController* FmXFormController::getImplementation( const Reference< XInterface >& _rxComponent )
-{
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::getImplementation" );
-    Reference< XUnoTunnel > xTunnel( _rxComponent, UNO_QUERY );
-    if ( xTunnel.is() )
-        return reinterpret_cast< FmXFormController* >( xTunnel->getSomething( getUnoTunnelImplementationId() ) );
-    return NULL;
-}
-//------------------------------------------------------------------------------
-sal_Int64 SAL_CALL FmXFormController::getSomething(Sequence<sal_Int8> const& rId)throw( RuntimeException )
-{
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::getSomething" );
-    if (rId.getLength() == 16 && 0 == rtl_compareMemory(getUnoTunnelImplementationId().getConstArray(),  rId.getConstArray(), 16 ) )
-        return reinterpret_cast< sal_Int64 >( this );
-
-    return sal_Int64();
-}
-
 // XServiceInfo
 //------------------------------------------------------------------------------
-sal_Bool SAL_CALL FmXFormController::supportsService(const ::rtl::OUString& ServiceName) throw( RuntimeException )
+sal_Bool SAL_CALL FormController::supportsService(const ::rtl::OUString& ServiceName) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::supportsService" );
     Sequence< ::rtl::OUString> aSNL(getSupportedServiceNames());
     const ::rtl::OUString * pArray = aSNL.getConstArray();
     for( sal_Int32 i = 0; i < aSNL.getLength(); i++ )
@@ -680,16 +706,14 @@ sal_Bool SAL_CALL FmXFormController::supportsService(const ::rtl::OUString& Serv
 }
 
 //------------------------------------------------------------------------------
-::rtl::OUString SAL_CALL FmXFormController::getImplementationName() throw( RuntimeException )
+::rtl::OUString SAL_CALL FormController::getImplementationName() throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::getImplementationName" );
-    return ::rtl::OUString::createFromAscii("com.sun.star.form.FmXFormController");
+    return ::rtl::OUString::createFromAscii( "org.openoffice.comp.svx.FormController" );
 }
 
 //------------------------------------------------------------------------------
-Sequence< ::rtl::OUString> SAL_CALL FmXFormController::getSupportedServiceNames(void) throw( RuntimeException )
+Sequence< ::rtl::OUString> SAL_CALL FormController::getSupportedServiceNames(void) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::getSupportedServiceNames" );
     // service names which are supported only, but cannot be used to created an
     // instance at a service factory
     Sequence< ::rtl::OUString > aNonCreatableServiceNames( 1 );
@@ -701,94 +725,107 @@ Sequence< ::rtl::OUString> SAL_CALL FmXFormController::getSupportedServiceNames(
 }
 
 //------------------------------------------------------------------------------
-sal_Bool SAL_CALL FmXFormController::approveReset(const EventObject& /*rEvent*/) throw( RuntimeException )
+sal_Bool SAL_CALL FormController::approveReset(const EventObject& /*rEvent*/) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::approveReset" );
     return sal_True;
 }
 
 //------------------------------------------------------------------------------
-void SAL_CALL FmXFormController::resetted(const EventObject& rEvent) throw( RuntimeException )
+void SAL_CALL FormController::resetted(const EventObject& rEvent) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::resetted" );
     ::osl::MutexGuard aGuard(m_aMutex);
     if (getCurrentControl().is() &&  (getCurrentControl()->getModel() == rEvent.Source))
         m_bModified = sal_False;
 }
 
 //------------------------------------------------------------------------------
-Sequence< ::rtl::OUString> FmXFormController::getSupportedServiceNames_Static(void)
+Sequence< ::rtl::OUString> FormController::getSupportedServiceNames_Static(void)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::getSupportedServiceNames_Static" );
     static Sequence< ::rtl::OUString> aServices;
     if (!aServices.getLength())
     {
         aServices.realloc(2);
-        aServices.getArray()[0] = ::rtl::OUString::createFromAscii("com.sun.star.form.FormController");
+        aServices.getArray()[0] = FM_FORM_CONTROLLER;
         aServices.getArray()[1] = ::rtl::OUString::createFromAscii("com.sun.star.awt.control.TabController");
     }
     return aServices;
 }
 
-//------------------------------------------------------------------------------
-void FmXFormController::setCurrentFilterPosition( sal_Int32 nPos )
+// -----------------------------------------------------------------------------
+namespace
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::setCurrentFilterPosition" );
-    DBG_ASSERT(nPos < (sal_Int32)m_aFilters.size(), "Invalid Position");
-
-    if (nPos != m_nCurrentFilterPosition)
+    struct ResetComponentText : public ::std::unary_function< Reference< XTextComponent >, void >
     {
-        m_nCurrentFilterPosition = nPos;
+        void operator()( const Reference< XTextComponent >& _rxText )
+        {
+            _rxText->setText( ::rtl::OUString() );
+        }
+    };
 
-        // reset the text for all controls
-        for (FmFilterControls::const_iterator iter = m_aFilterControls.begin();
-             iter != m_aFilterControls.end(); iter++)
-                 (*iter).first->setText(rtl::OUString());
+    struct RemoveComponentTextListener : public ::std::unary_function< Reference< XTextComponent >, void >
+    {
+        RemoveComponentTextListener( const Reference< XTextListener >& _rxListener )
+            :m_xListener( _rxListener )
+        {
+        }
 
-        if ( nPos != -1 )
+        void operator()( const Reference< XTextComponent >& _rxText )
         {
-            impl_setTextOnAllFilter_throw();
+            _rxText->removeTextListener( m_xListener );
         }
-    }
+
+    private:
+        Reference< XTextListener >  m_xListener;
+    };
 }
+
 // -----------------------------------------------------------------------------
-void FmXFormController::impl_setTextOnAllFilter_throw()
+void FormController::impl_setTextOnAllFilter_throw()
 {
+    // reset the text for all controls
+    ::std::for_each( m_aFilterComponents.begin(), m_aFilterComponents.end(), ResetComponentText() );
+
+    if ( m_aFilterRows.empty() )
+        // nothing to do anymore
+        return;
+
+    if ( m_nCurrentFilterPosition < 0 )
+        return;
+
     // set the text for all filters
-    OSL_ENSURE( ( m_aFilters.size() > (size_t)m_nCurrentFilterPosition ) && ( m_nCurrentFilterPosition >= 0 ),
-        "FmXFormController::setCurrentFilterPosition: m_nCurrentFilterPosition too big" );
+    OSL_ENSURE( m_aFilterRows.size() > (size_t)m_nCurrentFilterPosition,
+        "FormController::impl_setTextOnAllFilter_throw: m_nCurrentFilterPosition too big" );
 
-    if ( ( m_nCurrentFilterPosition >= 0 ) && ( (size_t)m_nCurrentFilterPosition < m_aFilters.size() ) )
+    if ( (size_t)m_nCurrentFilterPosition < m_aFilterRows.size() )
     {
-        FmFilterRow& rRow = m_aFilters[m_nCurrentFilterPosition];
-        for (FmFilterRow::const_iterator iter2 = rRow.begin();
-            iter2 != rRow.end(); iter2++)
+        FmFilterRow& rRow = m_aFilterRows[ m_nCurrentFilterPosition ];
+        for (   FmFilterRow::const_iterator iter2 = rRow.begin();
+                iter2 != rRow.end();
+                ++iter2
+            )
         {
-            (*iter2).first->setText((*iter2).second);
+            iter2->first->setText( iter2->second );
         }
-    } // if ( ( m_nCurrentFilterPosition >= 0 ) && ( (size_t)m_nCurrentFilterPosition < m_aFilters.size() ) )
+    }
 }
 // OPropertySetHelper
 //------------------------------------------------------------------------------
-sal_Bool FmXFormController::convertFastPropertyValue( Any & /*rConvertedValue*/, Any & /*rOldValue*/,
+sal_Bool FormController::convertFastPropertyValue( Any & /*rConvertedValue*/, Any & /*rOldValue*/,
                                             sal_Int32 /*nHandle*/, const Any& /*rValue*/ )
                 throw( IllegalArgumentException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::convertFastPropertyValue" );
     return sal_False;
 }
 
 //------------------------------------------------------------------------------
-void FmXFormController::setFastPropertyValue_NoBroadcast( sal_Int32 /*nHandle*/, const Any& /*rValue*/ )
+void FormController::setFastPropertyValue_NoBroadcast( sal_Int32 /*nHandle*/, const Any& /*rValue*/ )
                          throw( Exception )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::setFastPropertyValue_NoBroadcast" );
 }
 
 //------------------------------------------------------------------------------
-void FmXFormController::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const
+void FormController::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::getFastPropertyValue" );
     switch (nHandle)
     {
         case FM_ATTR_FILTER:
@@ -799,9 +836,8 @@ void FmXFormController::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) c
             if (xConnection.is())
             {
                 Reference< XDatabaseMetaData> xMetaData(xConnection->getMetaData());
-                Reference< XNumberFormatsSupplier> xFormatSupplier( aStaticTools.getNumberFormats(xConnection, sal_True));
-                Reference< XNumberFormatter> xFormatter(m_xORB
-                                ->createInstance(::rtl::OUString::createFromAscii("com.sun.star.util.NumberFormatter")), UNO_QUERY);
+                Reference< XNumberFormatsSupplier> xFormatSupplier( aStaticTools.getNumberFormats( xConnection, sal_True ) );
+                Reference< XNumberFormatter> xFormatter( m_aContext.createComponent( "com.sun.star.util.NumberFormatter" ), UNO_QUERY_THROW );
                 xFormatter->attachNumberFormatsSupplier(xFormatSupplier);
 
                 Reference< XColumnsSupplier> xSupplyCols(m_xModelAsIndex, UNO_QUERY);
@@ -809,40 +845,48 @@ void FmXFormController::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) c
 
                 ::rtl::OUString aQuote( xMetaData->getIdentifierQuoteString() );
 
-                    // now add the filter rows
-                for ( FmFilterRows::const_iterator row = m_aFilters.begin(); row != m_aFilters.end(); ++row )
+                // now add the filter rows
+                try
                 {
-                    const FmFilterRow& rRow = *row;
+                    for ( FmFilterRows::const_iterator row = m_aFilterRows.begin(); row != m_aFilterRows.end(); ++row )
+                    {
+                        const FmFilterRow& rRow = *row;
 
-                    if ( rRow.empty() )
-                        continue;
+                        if ( rRow.empty() )
+                            continue;
 
-                    if ( aFilter.getLength() )
-                        aFilter.appendAscii( " OR " );
+                        if ( aFilter.getLength() )
+                            aFilter.appendAscii( " OR " );
 
-                    aFilter.appendAscii( "( " );
-                    for ( FmFilterRow::const_iterator condition = rRow.begin(); condition != rRow.end(); ++condition )
-                    {
-                        // get the field of the controls map
-                        Reference< XTextComponent > xText = condition->first;
-                        Reference< XPropertySet > xField = m_aFilterControls.find( xText )->second;
-                        DBG_ASSERT( xField.is(), "FmXFormController::getFastPropertyValue: no field found!" );
-                        if ( condition != rRow.begin() )
-                            aFilter.appendAscii( " AND " );
-
-                        ::rtl::OUString sFilterValue( condition->second );
-
-                        ::rtl::OUString sErrorMsg, sCriteria;
-                        ::rtl::Reference< ISQLParseNode > xParseNode = predicateTree( sErrorMsg, sFilterValue, xFormatter, xField );
-                        OSL_ENSURE( xParseNode.is(), "FmXFormController::getFastPropertyValue: could not parse the field value predicate!" );
-                        if ( xParseNode.is() )
+                        aFilter.appendAscii( "( " );
+                        for ( FmFilterRow::const_iterator condition = rRow.begin(); condition != rRow.end(); ++condition )
                         {
-                            // don't use a parse context here, we need it unlocalized
-                            xParseNode->parseNodeToStr( sCriteria, xConnection, NULL );
-                            aFilter.append( sCriteria );
+                            // get the field of the controls map
+                            Reference< XControl > xControl( condition->first, UNO_QUERY_THROW );
+                            Reference< XPropertySet > xModelProps( xControl->getModel(), UNO_QUERY_THROW );
+                            Reference< XPropertySet > xField( xModelProps->getPropertyValue( FM_PROP_BOUNDFIELD ), UNO_QUERY_THROW );
+                            if ( condition != rRow.begin() )
+                                aFilter.appendAscii( " AND " );
+
+                            ::rtl::OUString sFilterValue( condition->second );
+
+                            ::rtl::OUString sErrorMsg, sCriteria;
+                            ::rtl::Reference< ISQLParseNode > xParseNode = predicateTree( sErrorMsg, sFilterValue, xFormatter, xField );
+                            OSL_ENSURE( xParseNode.is(), "FormController::getFastPropertyValue: could not parse the field value predicate!" );
+                            if ( xParseNode.is() )
+                            {
+                                // don't use a parse context here, we need it unlocalized
+                                xParseNode->parseNodeToStr( sCriteria, xConnection, NULL );
+                                aFilter.append( sCriteria );
+                            }
                         }
+                        aFilter.appendAscii( " )" );
                     }
-                    aFilter.appendAscii( " )" );
+                }
+                catch( const Exception& )
+                {
+                    DBG_UNHANDLED_EXCEPTION();
+                    aFilter.setLength(0);
                 }
             }
             rValue <<= aFilter.makeStringAndClear();
@@ -850,15 +894,14 @@ void FmXFormController::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) c
         break;
 
         case FM_ATTR_FORM_OPERATIONS:
-            rValue <<= m_aControllerFeatures->getFormOperations();
+            rValue <<= m_xFormOperations;
             break;
     }
 }
 
 //------------------------------------------------------------------------------
-Reference< XPropertySetInfo >  FmXFormController::getPropertySetInfo() throw( RuntimeException )
+Reference< XPropertySetInfo >  FormController::getPropertySetInfo() throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::getPropertySetInfo" );
     static Reference< XPropertySetInfo >  xInfo( createPropertySetInfo( getInfoHelper() ) );
     return xInfo;
 }
@@ -872,12 +915,11 @@ pDesc[nPos++] = Property(FM_PROP_##varname, FM_ATTR_##varname, ::getCppuType((co
     DECL_PROP_CORE(varname, type) PropertyAttribute::attrib1)
 
 //------------------------------------------------------------------------------
-void FmXFormController::fillProperties(
+void FormController::fillProperties(
         Sequence< Property >& /* [out] */ _rProps,
         Sequence< Property >& /* [out] */ /*_rAggregateProps*/
         ) const
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::fillProperties" );
     _rProps.realloc(2);
     sal_Int32 nPos = 0;
     Property* pDesc = _rProps.getArray();
@@ -886,90 +928,229 @@ void FmXFormController::fillProperties(
 }
 
 //------------------------------------------------------------------------------
-::cppu::IPropertyArrayHelper& FmXFormController::getInfoHelper()
+::cppu::IPropertyArrayHelper& FormController::getInfoHelper()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::getInfoHelper" );
     return *getArrayHelper();
 }
 
+// XFilterController
+//------------------------------------------------------------------------------
+void SAL_CALL FormController::addFilterControllerListener( const Reference< XFilterControllerListener >& _Listener ) throw( RuntimeException )
+{
+    m_aFilterListeners.addInterface( _Listener );
+}
+
+//------------------------------------------------------------------------------
+void SAL_CALL FormController::removeFilterControllerListener( const Reference< XFilterControllerListener >& _Listener ) throw( RuntimeException )
+{
+    m_aFilterListeners.removeInterface( _Listener );
+}
+
+//------------------------------------------------------------------------------
+::sal_Int32 SAL_CALL FormController::getFilterComponents() throw( ::com::sun::star::uno::RuntimeException )
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+    impl_checkDisposed_throw();
+
+    return m_aFilterComponents.size();
+}
+
+//------------------------------------------------------------------------------
+::sal_Int32 SAL_CALL FormController::getDisjunctiveTerms() throw( ::com::sun::star::uno::RuntimeException )
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+    impl_checkDisposed_throw();
+
+    return m_aFilterRows.size();
+}
+
+//------------------------------------------------------------------------------
+void SAL_CALL FormController::setPredicateExpression( ::sal_Int32 _Component, ::sal_Int32 _Term, const ::rtl::OUString& _PredicateExpression ) throw( RuntimeException, IndexOutOfBoundsException )
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+    impl_checkDisposed_throw();
+
+    if ( ( _Component < 0 ) || ( _Component >= getFilterComponents() ) || ( _Term < 0 ) || ( _Term >= getDisjunctiveTerms() ) )
+        throw IndexOutOfBoundsException( ::rtl::OUString(), *this );
+
+    Reference< XTextComponent > xText( m_aFilterComponents[ _Component ] );
+    xText->setText( _PredicateExpression );
+
+    FmFilterRow& rFilterRow = m_aFilterRows[ _Term ];
+    if ( _PredicateExpression.getLength() )
+        rFilterRow[ xText ] = _PredicateExpression;
+    else
+        rFilterRow.erase( xText );
+}
+
+//------------------------------------------------------------------------------
+Reference< XControl > FormController::getFilterComponent( ::sal_Int32 _Component ) throw( RuntimeException, IndexOutOfBoundsException )
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+    impl_checkDisposed_throw();
+
+    if ( ( _Component < 0 ) || ( _Component >= getFilterComponents() ) )
+        throw IndexOutOfBoundsException( ::rtl::OUString(), *this );
+
+    return Reference< XControl >( m_aFilterComponents[ _Component ], UNO_QUERY );
+}
+
+//------------------------------------------------------------------------------
+Sequence< Sequence< ::rtl::OUString > > FormController::getPredicateExpressions() throw( RuntimeException )
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+    impl_checkDisposed_throw();
+
+    Sequence< Sequence< ::rtl::OUString > > aExpressions( m_aFilterRows.size() );
+    sal_Int32 termIndex = 0;
+    for (   FmFilterRows::const_iterator row = m_aFilterRows.begin();
+            row != m_aFilterRows.end();
+            ++row, ++termIndex
+        )
+    {
+        const FmFilterRow& rRow( *row );
+
+        Sequence< ::rtl::OUString > aConjunction( m_aFilterComponents.size() );
+        sal_Int32 componentIndex = 0;
+        for (   FilterComponents::const_iterator comp = m_aFilterComponents.begin();
+                comp != m_aFilterComponents.end();
+                ++comp, ++componentIndex
+            )
+        {
+            FmFilterRow::const_iterator predicate = rRow.find( *comp );
+            if ( predicate != rRow.end() )
+                aConjunction[ componentIndex ] = predicate->second;
+        }
+
+        aExpressions[ termIndex ] = aConjunction;
+    }
+
+    return aExpressions;
+}
+
+//------------------------------------------------------------------------------
+void SAL_CALL FormController::removeDisjunctiveTerm( ::sal_Int32 _Term ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    // SYNCHRONIZED -->
+    ::osl::ClearableMutexGuard aGuard( m_aMutex );
+    impl_checkDisposed_throw();
+
+    if ( ( _Term < 0 ) || ( _Term >= getDisjunctiveTerms() ) )
+        throw IndexOutOfBoundsException( ::rtl::OUString(), *this );
+
+    // if the to-be-deleted row is our current row, we need to shift
+    if ( _Term == m_nCurrentFilterPosition )
+    {
+        if ( m_nCurrentFilterPosition < sal_Int32( m_aFilterRows.size() - 1 ) )
+            ++m_nCurrentFilterPosition;
+        else
+            --m_nCurrentFilterPosition;
+    }
+
+    FmFilterRows::iterator pos = m_aFilterRows.begin() + _Term;
+    m_aFilterRows.erase( pos );
+
+    // adjust m_nCurrentFilterPosition if the removed row preceeded it
+    if ( _Term < m_nCurrentFilterPosition )
+        --m_nCurrentFilterPosition;
+
+    OSL_POSTCOND( ( m_nCurrentFilterPosition < 0 ) == ( m_aFilterRows.empty() ),
+        "FormController::removeDisjunctiveTerm: inconsistency!" );
+
+    // update the texts in the filter controls
+    impl_setTextOnAllFilter_throw();
+
+    FilterEvent aEvent;
+    aEvent.Source = *this;
+    aEvent.DisjunctiveTerm = _Term;
+    aGuard.clear();
+    // <-- SYNCHRONIZED
+
+    m_aFilterListeners.notifyEach( &XFilterControllerListener::disjunctiveTermRemoved, aEvent );
+}
+
+//------------------------------------------------------------------------------
+void SAL_CALL FormController::appendEmptyDisjunctiveTerm() throw (RuntimeException)
+{
+    // SYNCHRONIZED -->
+    ::osl::ClearableMutexGuard aGuard( m_aMutex );
+    impl_checkDisposed_throw();
+
+    impl_appendEmptyFilterRow( aGuard );
+    // <-- SYNCHRONIZED
+}
+
+//------------------------------------------------------------------------------
+::sal_Int32 SAL_CALL FormController::getActiveTerm() throw (RuntimeException)
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+    impl_checkDisposed_throw();
+
+    return m_nCurrentFilterPosition;
+}
+
+//------------------------------------------------------------------------------
+void SAL_CALL FormController::setActiveTerm( ::sal_Int32 _ActiveTerm ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+    impl_checkDisposed_throw();
+
+    if ( ( _ActiveTerm < 0 ) || ( _ActiveTerm >= getDisjunctiveTerms() ) )
+        throw IndexOutOfBoundsException( ::rtl::OUString(), *this );
+
+    if ( _ActiveTerm == getActiveTerm() )
+        return;
+
+    m_nCurrentFilterPosition = _ActiveTerm;
+    impl_setTextOnAllFilter_throw();
+}
+
 // XElementAccess
 //------------------------------------------------------------------------------
-sal_Bool SAL_CALL FmXFormController::hasElements(void) throw( RuntimeException )
+sal_Bool SAL_CALL FormController::hasElements(void) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::hasElements" );
-::osl::MutexGuard aGuard( m_aMutex );
+    ::osl::MutexGuard aGuard( m_aMutex );
     return !m_aChilds.empty();
 }
 
 //------------------------------------------------------------------------------
-Type SAL_CALL  FmXFormController::getElementType(void) throw( RuntimeException )
+Type SAL_CALL  FormController::getElementType(void) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::getElementType" );
     return ::getCppuType((const Reference< XFormController>*)0);
 
 }
 
 // XEnumerationAccess
 //------------------------------------------------------------------------------
-Reference< XEnumeration > SAL_CALL  FmXFormController::createEnumeration(void) throw( RuntimeException )
+Reference< XEnumeration > SAL_CALL  FormController::createEnumeration(void) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::createEnumeration" );
     ::osl::MutexGuard aGuard( m_aMutex );
     return new ::comphelper::OEnumerationByIndex(this);
 }
 
 // XIndexAccess
 //------------------------------------------------------------------------------
-sal_Int32 SAL_CALL FmXFormController::getCount(void) throw( RuntimeException )
+sal_Int32 SAL_CALL FormController::getCount(void) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::getCount" );
     ::osl::MutexGuard aGuard( m_aMutex );
     return m_aChilds.size();
 }
 
 //------------------------------------------------------------------------------
-Any SAL_CALL FmXFormController::getByIndex(sal_Int32 Index) throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException )
+Any SAL_CALL FormController::getByIndex(sal_Int32 Index) throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::getByIndex" );
     ::osl::MutexGuard aGuard( m_aMutex );
     if (Index < 0 ||
         Index >= (sal_Int32)m_aChilds.size())
         throw IndexOutOfBoundsException();
 
-    return makeAny(m_aChilds[Index]);
-    //  , ::getCppuType((const XFormController*)0));
-}
-
-//-----------------------------------------------------------------------------
-void FmXFormController::addChild(FmXFormController* pChild)
-{
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::addChild" );
-    Reference< XFormController >  xController(pChild);
-    m_aChilds.push_back(xController);
-    pChild->setParent(static_cast< XFormController* >(this));
-
-    Reference< XFormComponent >  xForm(pChild->getModel(), UNO_QUERY);
-
-    // search the position of the model within the form
-    sal_uInt32 nPos = m_xModelAsIndex->getCount();
-    Reference< XFormComponent > xTemp;
-    for( ; nPos; )
-    {
-        m_xModelAsIndex->getByIndex(--nPos) >>= xTemp;
-        if ((XFormComponent*)xForm.get() == (XFormComponent*)xTemp.get())
-        {
-            Reference< XInterface >  xIfc(xController, UNO_QUERY);
-            m_xModelAsManager->attach( nPos, xIfc, makeAny( xController) );
-            break;
-        }
-    }
+    return makeAny( m_aChilds[ Index ] );
 }
 
 //  EventListener
 //------------------------------------------------------------------------------
-void SAL_CALL FmXFormController::disposing(const EventObject& e) throw( RuntimeException )
+void SAL_CALL FormController::disposing(const EventObject& e) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::disposing" );
     // Ist der Container disposed worden
     ::osl::MutexGuard aGuard( m_aMutex );
     Reference< XControlContainer >  xContainer(e.Source, UNO_QUERY);
@@ -991,9 +1172,8 @@ void SAL_CALL FmXFormController::disposing(const EventObject& e) throw( RuntimeE
 
 // OComponentHelper
 //-----------------------------------------------------------------------------
-void FmXFormController::disposeAllFeaturesAndDispatchers() SAL_THROW(())
+void FormController::disposeAllFeaturesAndDispatchers() SAL_THROW(())
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::disposeAllFeaturesAndDispatchers" );
     for ( DispatcherContainer::iterator aDispatcher = m_aFeatureDispatchers.begin();
           aDispatcher != m_aFeatureDispatchers.end();
           ++aDispatcher
@@ -1005,18 +1185,16 @@ void FmXFormController::disposeAllFeaturesAndDispatchers() SAL_THROW(())
         }
         catch( const Exception& )
         {
-            OSL_ENSURE( sal_False, "FmXFormController::disposeAllFeaturesAndDispatchers: caught an exception while disposing a dispatcher!" );
+            DBG_UNHANDLED_EXCEPTION();
         }
     }
     m_aFeatureDispatchers.clear();
-    m_aControllerFeatures.dispose();
 }
 
 //-----------------------------------------------------------------------------
-void FmXFormController::disposing(void)
+void FormController::disposing(void)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::disposing" );
-    EventObject aEvt(static_cast< XFormController* >(this));
+    EventObject aEvt( *this );
 
     // if we're still active, simulate a "deactivated" event
     if ( m_xActiveControl.is() )
@@ -1029,13 +1207,14 @@ void FmXFormController::disposing(void)
     m_aDeleteListeners.disposeAndClear(aEvt);
     m_aRowSetApproveListeners.disposeAndClear(aEvt);
     m_aParameterListeners.disposeAndClear(aEvt);
+    m_aFilterListeners.disposeAndClear(aEvt);
 
     removeBoundFieldListener();
     stopFiltering();
 
     m_pControlBorderManager->restoreAll();
     
-    m_aFilters.clear();
+    m_aFilterRows.clear();
 
     ::osl::MutexGuard aGuard( m_aMutex );
     m_xActiveControl = NULL;
@@ -1067,6 +1246,10 @@ void FmXFormController::disposing(void)
 
     disposeAllFeaturesAndDispatchers();
 
+    if ( m_xFormOperations.is() )
+        m_xFormOperations->dispose();
+    m_xFormOperations.clear();
+
     if (m_bDBConnection)
         unload();
 
@@ -1076,7 +1259,6 @@ void FmXFormController::disposing(void)
 
     ::comphelper::disposeComponent( m_xComposer );
 
-    m_xORB              = NULL;
     m_bDBConnection = sal_False;
 }
 
@@ -1096,10 +1278,9 @@ namespace
 }
 
 //------------------------------------------------------------------------------
-void SAL_CALL FmXFormController::propertyChange(const PropertyChangeEvent& evt) throw( RuntimeException )
+void SAL_CALL FormController::propertyChange(const PropertyChangeEvent& evt) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::propertyChange" );
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
+    OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
     if ( evt.PropertyName == FM_PROP_BOUNDFIELD )
     {
         Reference<XPropertySet> xOldBound;
@@ -1164,14 +1345,13 @@ void SAL_CALL FmXFormController::propertyChange(const PropertyChangeEvent& evt)
 }
 
 //------------------------------------------------------------------------------
-bool FmXFormController::replaceControl( const Reference< XControl >& _rxExistentControl, const Reference< XControl >& _rxNewControl )
+bool FormController::replaceControl( const Reference< XControl >& _rxExistentControl, const Reference< XControl >& _rxNewControl )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::replaceControl" );
     bool bSuccess = false;
     try
     {
         Reference< XIdentifierReplace > xContainer( getContainer(), UNO_QUERY );
-        DBG_ASSERT( xContainer.is(), "FmXFormController::replaceControl: yes, it's not required by the service description, but XItentifierReplaces would be nice!" );
+        DBG_ASSERT( xContainer.is(), "FormController::replaceControl: yes, it's not required by the service description, but XItentifierReplaces would be nice!" );
         if ( xContainer.is() )
         {
             // look up the ID of _rxExistentControl
@@ -1184,7 +1364,7 @@ bool FmXFormController::replaceControl( const Reference< XControl >& _rxExistent
                 if ( xCheck == _rxExistentControl )
                     break;
             }
-            DBG_ASSERT( pIdentifiers != pIdentifiersEnd, "FmXFormController::replaceControl: did not find the control in the container!" );
+            DBG_ASSERT( pIdentifiers != pIdentifiersEnd, "FormController::replaceControl: did not find the control in the container!" );
             if ( pIdentifiers != pIdentifiersEnd )
             {
                 bool bReplacedWasActive = ( m_xActiveControl.get() == _rxExistentControl.get() );
@@ -1217,7 +1397,7 @@ bool FmXFormController::replaceControl( const Reference< XControl >& _rxExistent
     }
     catch( const Exception& )
     {
-      OSL_ENSURE( sal_False, "FmXFormController::replaceControl: caught an exception!" );
+        DBG_UNHANDLED_EXCEPTION();
     }
   
     Reference< XControl > xDisposeIt( bSuccess ? _rxExistentControl : _rxNewControl );
@@ -1226,10 +1406,9 @@ bool FmXFormController::replaceControl( const Reference< XControl >& _rxExistent
 }
   
 //------------------------------------------------------------------------------
-void FmXFormController::toggleAutoFields(sal_Bool bAutoFields)
+void FormController::toggleAutoFields(sal_Bool bAutoFields)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::toggleAutoFields" );
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
+    OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
 
 
     Sequence< Reference< XControl > > aControlsCopy( m_aControls );
@@ -1289,7 +1468,7 @@ void FmXFormController::toggleAutoFields(sal_Bool bAutoFields)
                     {
                         ::rtl::OUString sServiceName;
                         OSL_VERIFY( xSet->getPropertyValue( FM_PROP_DEFAULTCONTROL ) >>= sServiceName );
-                        Reference< XControl > xNewControl( m_xORB->createInstance( sServiceName ), UNO_QUERY );
+                        Reference< XControl > xNewControl( m_aContext.createComponent( sServiceName ), UNO_QUERY );
                         replaceControl( xControl, xNewControl );
                     }
                 }
@@ -1300,9 +1479,9 @@ void FmXFormController::toggleAutoFields(sal_Bool bAutoFields)
 }
 
 //------------------------------------------------------------------------------
-IMPL_LINK(FmXFormController, OnToggleAutoFields, void*, EMPTYARG)
+IMPL_LINK(FormController, OnToggleAutoFields, void*, EMPTYARG)
 {
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
+    OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
 
     toggleAutoFields(m_bCurrentRecordNew);
     return 1L;
@@ -1310,35 +1489,52 @@ IMPL_LINK(FmXFormController, OnToggleAutoFields, void*, EMPTYARG)
 
 // XTextListener
 //------------------------------------------------------------------------------
-void SAL_CALL FmXFormController::textChanged(const TextEvent& e) throw( RuntimeException )
+void SAL_CALL FormController::textChanged(const TextEvent& e) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::textChanged" );
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
+    // SYNCHRONIZED -->
+    ::osl::ClearableMutexGuard aGuard( m_aMutex );
+    OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
     if (m_bFiltering)
     {
         Reference< XTextComponent >  xText(e.Source,UNO_QUERY);
         ::rtl::OUString aText = xText->getText();
 
-        // Suchen der aktuellen Row
-        OSL_ENSURE( ( m_aFilters.size() > (size_t)m_nCurrentFilterPosition ) && ( m_nCurrentFilterPosition >= 0 ),
-            "FmXFormController::textChanged: m_nCurrentFilterPosition too big" );
+        if ( m_aFilterRows.empty() )
+            appendEmptyDisjunctiveTerm();
 
-        if ( ( m_nCurrentFilterPosition >= 0 ) && ( (size_t)m_nCurrentFilterPosition < m_aFilters.size() ) )
+        // Suchen der aktuellen Row
+        if ( ( (size_t)m_nCurrentFilterPosition >= m_aFilterRows.size() ) || ( m_nCurrentFilterPosition < 0 ) )
         {
-            FmFilterRow& rRow = m_aFilters[m_nCurrentFilterPosition];
+            OSL_ENSURE( false, "FormController::textChanged: m_nCurrentFilterPosition is wrong!" );
+            return;
+        }
 
-            // do we have a new filter
-            if (aText.getLength())
-                rRow[xText] = aText;
-            else
-            {
-                // do we have the control in the row
-                FmFilterRow::iterator iter = rRow.find(xText);
-                // erase the entry out of the row
-                if (iter != rRow.end())
-                    rRow.erase(iter);
-            }
+        FmFilterRow& rRow = m_aFilterRows[ m_nCurrentFilterPosition ];
+
+        // do we have a new filter
+        if (aText.getLength())
+            rRow[xText] = aText;
+        else
+        {
+            // do we have the control in the row
+            FmFilterRow::iterator iter = rRow.find(xText);
+            // erase the entry out of the row
+            if (iter != rRow.end())
+                rRow.erase(iter);
         }
+
+        // multiplex the event to our FilterControllerListeners
+        FilterEvent aEvent;
+        aEvent.Source = *this;
+        aEvent.FilterComponent = ::std::find( m_aFilterComponents.begin(), m_aFilterComponents.end(), xText ) - m_aFilterComponents.begin();
+        aEvent.DisjunctiveTerm = getActiveTerm();
+        aEvent.PredicateExpression = aText;
+
+        aGuard.clear();
+        // <-- SYNCHRONIZED
+
+        // notify the changed filter expression
+        m_aFilterListeners.notifyEach( &XFilterControllerListener::predicateExpressionChanged, aEvent );
     }
     else
         impl_onModify();
@@ -1346,36 +1542,34 @@ void SAL_CALL FmXFormController::textChanged(const TextEvent& e) throw( RuntimeE
 
 // XItemListener
 //------------------------------------------------------------------------------
-void SAL_CALL FmXFormController::itemStateChanged(const ItemEvent& /*rEvent*/) throw( RuntimeException )
+void SAL_CALL FormController::itemStateChanged(const ItemEvent& /*rEvent*/) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::itemStateChanged" );
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
+    OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
     impl_onModify();
 }
 
 // XModificationBroadcaster
 //------------------------------------------------------------------------------
-void SAL_CALL FmXFormController::addModifyListener(const Reference< XModifyListener > & l) throw( RuntimeException )
+void SAL_CALL FormController::addModifyListener(const Reference< XModifyListener > & l) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::addModifyListener" );
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
+    ::osl::MutexGuard aGuard( m_aMutex );
+    impl_checkDisposed_throw();
     m_aModifyListeners.addInterface( l );
 }
 
 //------------------------------------------------------------------------------
-void FmXFormController::removeModifyListener(const Reference< XModifyListener > & l) throw( RuntimeException )
+void FormController::removeModifyListener(const Reference< XModifyListener > & l) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::removeModifyListener" );
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
+    ::osl::MutexGuard aGuard( m_aMutex );
+    impl_checkDisposed_throw();
     m_aModifyListeners.removeInterface( l );
 }
 
 // XModificationListener
 //------------------------------------------------------------------------------
-void FmXFormController::modified( const EventObject& _rEvent ) throw( RuntimeException )
+void FormController::modified( const EventObject& _rEvent ) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::modified" );
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
+    OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
 
     try
     {
@@ -1400,10 +1594,16 @@ void FmXFormController::modified( const EventObject& _rEvent ) throw( RuntimeExc
 }
 
 //------------------------------------------------------------------------------
-void FmXFormController::impl_onModify()
+void FormController::impl_checkDisposed_throw() const
+{
+    if ( impl_isDisposed_nofail() )
+        throw DisposedException( ::rtl::OUString(), *const_cast< FormController* >( this ) );
+}
+
+//------------------------------------------------------------------------------
+void FormController::impl_onModify()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::onModify" );
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
+    OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
 
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -1416,10 +1616,36 @@ void FmXFormController::impl_onModify()
 }
 
 //------------------------------------------------------------------------------
-sal_Bool FmXFormController::determineLockState() const
+void FormController::impl_addFilterRow( const FmFilterRow& _row )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::determineLockState" );
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
+    m_aFilterRows.push_back( _row );
+
+    if ( m_aFilterRows.size() == 1 )
+    {   // that's the first row ever
+        OSL_ENSURE( m_nCurrentFilterPosition == -1, "FormController::impl_addFilterRow: inconsistency!" );
+        m_nCurrentFilterPosition = 0;
+    }
+}
+
+//------------------------------------------------------------------------------
+void FormController::impl_appendEmptyFilterRow( ::osl::ClearableMutexGuard& _rClearBeforeNotify )
+{
+    // SYNCHRONIZED -->
+    impl_addFilterRow( FmFilterRow() );
+
+    // notify the listeners
+    FilterEvent aEvent;
+    aEvent.Source = *this;
+    aEvent.DisjunctiveTerm = (sal_Int32)m_aFilterRows.size() - 1;
+    _rClearBeforeNotify.clear();
+    // <-- SYNCHRONIZED
+    m_aFilterListeners.notifyEach( &XFilterControllerListener::disjunctiveTermAdded, aEvent );
+}
+
+//------------------------------------------------------------------------------
+sal_Bool FormController::determineLockState() const
+{
+    OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
     // a.) in filter mode we are always locked
     // b.) if we have no valid model or our model (a result set) is not alive -> we're locked
     // c.) if we are inserting everything is OK and we are not locked
@@ -1434,17 +1660,15 @@ sal_Bool FmXFormController::determineLockState() const
 
 //  FocusListener
 //------------------------------------------------------------------------------
-void FmXFormController::focusGained(const FocusEvent& e) throw( RuntimeException )
+void FormController::focusGained(const FocusEvent& e) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::focusGained" );
-    TRACE_RANGE( "FmXFormController::focusGained" );
-
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
-    ::osl::MutexGuard aGuard( m_aMutex );
-    Reference< XControl >  xControl(e.Source, UNO_QUERY);
+    // SYNCHRONIZED -->
+    ::osl::ClearableMutexGuard aGuard( m_aMutex );
+    impl_checkDisposed_throw();
 
     m_pControlBorderManager->focusGained( e.Source );
 
+    Reference< XControl >  xControl(e.Source, UNO_QUERY);
     if (m_bDBConnection)
     {
         // do we need to keep the locking of the commit
@@ -1473,7 +1697,7 @@ void FmXFormController::focusGained(const FocusEvent& e) throw( RuntimeException
 #if (OSL_DEBUG_LEVEL > 1) || defined DBG_UTIL
             Reference< XBoundControl >  xLockingTest(m_xCurrentControl, UNO_QUERY);
             sal_Bool bControlIsLocked = xLockingTest.is() && xLockingTest->getLock();
-            OSL_ENSURE(!bControlIsLocked, "FmXFormController::Gained: I'm modified and the current control is locked ? How this ?");
+            OSL_ENSURE(!bControlIsLocked, "FormController::Gained: I'm modified and the current control is locked ? How this ?");
             // normalerweise sollte ein gelocktes Control nicht modified sein, also muss wohl mein bModified aus einem anderen Kontext
             // gesetzt worden sein, was ich nicht verstehen wuerde ...
 #endif
@@ -1505,22 +1729,33 @@ void FmXFormController::focusGained(const FocusEvent& e) throw( RuntimeException
 
         if (!m_bFiltering && m_bCycle && (e.FocusFlags & FocusChangeReason::AROUND) && m_xCurrentControl.is())
         {
-            if ( e.FocusFlags & FocusChangeReason::FORWARD )
+            SQLErrorEvent aErrorEvent;
+            OSL_ENSURE( m_xFormOperations.is(), "FormController::focusGained: hmm?" );
+                // should have been created in setModel
+            try
             {
-                if ( m_aControllerFeatures->isEnabled( SID_FM_RECORD_NEXT ) )
-                    m_aControllerFeatures->moveRight();
+                if ( e.FocusFlags & FocusChangeReason::FORWARD )
+                {
+                    if ( m_xFormOperations.is() && m_xFormOperations->isEnabled( FormFeature::MoveToNext ) )
+                        m_xFormOperations->execute( FormFeature::MoveToNext );
+                }
+                else // backward
+                {
+                    if ( m_xFormOperations.is() && m_xFormOperations->isEnabled( FormFeature::MoveToPrevious ) )
+                        m_xFormOperations->execute( FormFeature::MoveToPrevious );
+                }
             }
-            else // backward
+            catch ( const Exception& )
             {
-                if ( m_aControllerFeatures->isEnabled( SID_FM_RECORD_PREV ) )
-                    m_aControllerFeatures->moveLeft();
+                // don't handle this any further. That's an ... admissible error.
+                DBG_UNHANDLED_EXCEPTION();
             }
         }
     }
 
     // Immer noch ein und dasselbe Control
-    if	(	(m_xActiveControl.get() == xControl.get())
-        &&	(xControl.get() == m_xCurrentControl.get())
+    if	(	( m_xActiveControl == xControl )
+        &&	( xControl == m_xCurrentControl )
         )
     {
         DBG_ASSERT(m_xCurrentControl.is(), "Kein CurrentControl selektiert");
@@ -1545,25 +1780,24 @@ void FmXFormController::focusGained(const FocusEvent& e) throw( RuntimeException
     }
 
     // invalidate all features which depend on the currently focused control
-    if ( m_bDBConnection && !m_bFiltering && m_pView )
+    if ( m_bDBConnection && !m_bFiltering )
         implInvalidateCurrentControlDependentFeatures();
 
-    if (m_xCurrentControl.is())
-    {
-        // Control erhaelt Focus, dann eventuell in den sichtbaren Bereich
-        Reference< XWindow >  xWindow(xControl, UNO_QUERY);
-        if (xWindow.is() && m_pView && m_pWindow)
-        {
-            ::com::sun::star::awt::Rectangle aRect = xWindow->getPosSize();
-            ::Rectangle aNewRect(aRect.X,aRect.Y,aRect.X+aRect.Width,aRect.Y+aRect.Height);
-            aNewRect = m_pWindow->PixelToLogic(aNewRect);
-            m_pView->MakeVisible( aNewRect, *const_cast< Window* >( m_pWindow ) );
-        }
-    }
+    if ( !m_xCurrentControl.is() )
+        return;
+
+    // Control erhaelt Focus, dann eventuell in den sichtbaren Bereich
+    Reference< XFormControllerContext > xContext( m_xContext );
+    Reference< XControl > xCurrentControl( m_xCurrentControl );
+    aGuard.clear();
+    // <-- SYNCHRONIZED
+
+    if ( xContext.is() )
+        xContext->makeVisible( xCurrentControl );
 }
 
 //------------------------------------------------------------------------------
-IMPL_LINK( FmXFormController, OnActivated, void*, /**/ )
+IMPL_LINK( FormController, OnActivated, void*, /**/ )
 {
     EventObject aEvent;
     aEvent.Source = *this;
@@ -1573,7 +1807,7 @@ IMPL_LINK( FmXFormController, OnActivated, void*, /**/ )
 }
 
 //------------------------------------------------------------------------------
-IMPL_LINK( FmXFormController, OnDeactivated, void*, /**/ )
+IMPL_LINK( FormController, OnDeactivated, void*, /**/ )
 {
     EventObject aEvent;
     aEvent.Source = *this;
@@ -1583,10 +1817,9 @@ IMPL_LINK( FmXFormController, OnDeactivated, void*, /**/ )
 }
 
 //------------------------------------------------------------------------------
-void FmXFormController::focusLost(const FocusEvent& e) throw( RuntimeException )
+void FormController::focusLost(const FocusEvent& e) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::focusLost" );
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
+    OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
 
     m_pControlBorderManager->focusLost( e.Source );
 
@@ -1601,53 +1834,48 @@ void FmXFormController::focusLost(const FocusEvent& e) throw( RuntimeException )
 }
 
 //--------------------------------------------------------------------
-void SAL_CALL FmXFormController::mousePressed( const awt::MouseEvent& /*_rEvent*/ ) throw (RuntimeException)
+void SAL_CALL FormController::mousePressed( const awt::MouseEvent& /*_rEvent*/ ) throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::mousePressed" );
     // not interested in
 }
 
 //--------------------------------------------------------------------
-void SAL_CALL FmXFormController::mouseReleased( const awt::MouseEvent& /*_rEvent*/ ) throw (RuntimeException)
+void SAL_CALL FormController::mouseReleased( const awt::MouseEvent& /*_rEvent*/ ) throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::mouseReleased" );
     // not interested in
 }
 
 //--------------------------------------------------------------------
-void SAL_CALL FmXFormController::mouseEntered( const awt::MouseEvent& _rEvent ) throw (RuntimeException)
+void SAL_CALL FormController::mouseEntered( const awt::MouseEvent& _rEvent ) throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::mouseEntered" );
     m_pControlBorderManager->mouseEntered( _rEvent.Source );
 }
 
 //--------------------------------------------------------------------
-void SAL_CALL FmXFormController::mouseExited( const awt::MouseEvent& _rEvent ) throw (RuntimeException)
+void SAL_CALL FormController::mouseExited( const awt::MouseEvent& _rEvent ) throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::mouseExited" );
     m_pControlBorderManager->mouseExited( _rEvent.Source );
 }
 
 //--------------------------------------------------------------------
-void SAL_CALL FmXFormController::componentValidityChanged( const EventObject& _rSource ) throw (RuntimeException)
+void SAL_CALL FormController::componentValidityChanged( const EventObject& _rSource ) throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::componentValidityChanged" );
     Reference< XControl > xControl( findControl( m_aControls, Reference< XControlModel >( _rSource.Source, UNO_QUERY ), sal_False, sal_False ) );
     Reference< XValidatableFormComponent > xValidatable( _rSource.Source, UNO_QUERY );
 
-    OSL_ENSURE( xControl.is() && xValidatable.is(), "FmXFormController::componentValidityChanged: huh?" );
+    OSL_ENSURE( xControl.is() && xValidatable.is(), "FormController::componentValidityChanged: huh?" );
 
     if ( xControl.is() && xValidatable.is() )
         m_pControlBorderManager->validityChanged( xControl, xValidatable );
 }
 
 //--------------------------------------------------------------------
-void FmXFormController::setModel(const Reference< XTabControllerModel > & Model) throw( RuntimeException )
+void FormController::setModel(const Reference< XTabControllerModel > & Model) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::setModel" );
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
     ::osl::MutexGuard aGuard( m_aMutex );
-    DBG_ASSERT(m_xTabController.is(), "FmXFormController::setModel : invalid aggregate !");
+    impl_checkDisposed_throw();
+
+    DBG_ASSERT(m_xTabController.is(), "FormController::setModel : invalid aggregate !");
 
     try
     {
@@ -1672,10 +1900,15 @@ void FmXFormController::setModel(const Reference< XTabControllerModel > & Model)
             Reference< XDatabaseParameterBroadcaster >  xParamBroadcaster(m_xModelAsIndex, UNO_QUERY);
             if (xParamBroadcaster.is())
                 xParamBroadcaster->removeParameterListener(this);
+
         }
 
         disposeAllFeaturesAndDispatchers();
 
+        if ( m_xFormOperations.is() )
+            m_xFormOperations->dispose();
+        m_xFormOperations.clear();
+
         // set the new model wait for the load event
         if (m_xTabController.is())
             m_xTabController->setModel(Model);
@@ -1691,7 +1924,9 @@ void FmXFormController::setModel(const Reference< XTabControllerModel > & Model)
 
         if (m_xModelAsIndex.is())
         {
-            m_aControllerFeatures.assign( this );
+            // re-create m_xFormOperations
+            m_xFormOperations.set( FormOperations::createWithFormController( m_aContext.getUNOContext(), this ), UNO_SET_THROW );
+            m_xFormOperations->setFeatureInvalidation( this );
 
             // adding load and ui interaction listeners
             Reference< XLoadable >  xForm(Model, UNO_QUERY);
@@ -1743,27 +1978,27 @@ void FmXFormController::setModel(const Reference< XTabControllerModel > & Model)
     }
     catch( const Exception& )
     {
-        OSL_ENSURE( sal_False, "FmXFormController::setModel: caught an exception!" );
+        DBG_UNHANDLED_EXCEPTION();
     }
 }
 
 //------------------------------------------------------------------------------
-Reference< XTabControllerModel >  FmXFormController::getModel() throw( RuntimeException )
+Reference< XTabControllerModel >  FormController::getModel() throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::getModel" );
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
-    DBG_ASSERT(m_xTabController.is(), "FmXFormController::getModel : invalid aggregate !");
+    ::osl::MutexGuard aGuard( m_aMutex );
+    impl_checkDisposed_throw();
+
+    DBG_ASSERT(m_xTabController.is(), "FormController::getModel : invalid aggregate !");
     if (!m_xTabController.is())
         return Reference< XTabControllerModel > ();
     return m_xTabController->getModel();
 }
 
 //------------------------------------------------------------------------------
-void FmXFormController::addToEventAttacher(const Reference< XControl > & xControl)
+void FormController::addToEventAttacher(const Reference< XControl > & xControl)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::addToEventAttacher" );
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
-    OSL_ENSURE( xControl.is(), "FmXFormController::addToEventAttacher: invalid control - how did you reach this?" );
+    OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
+    OSL_ENSURE( xControl.is(), "FormController::addToEventAttacher: invalid control - how did you reach this?" );
     if ( !xControl.is() )
         return; /* throw IllegalArgumentException(); */
 
@@ -1788,11 +2023,10 @@ void FmXFormController::addToEventAttacher(const Reference< XControl > & xContro
 }
 
 //------------------------------------------------------------------------------
-void FmXFormController::removeFromEventAttacher(const Reference< XControl > & xControl)
+void FormController::removeFromEventAttacher(const Reference< XControl > & xControl)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::removeFromEventAttacher" );
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
-    OSL_ENSURE( xControl.is(), "FmXFormController::removeFromEventAttacher: invalid control - how did you reach this?" );
+    OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
+    OSL_ENSURE( xControl.is(), "FormController::removeFromEventAttacher: invalid control - how did you reach this?" );
     if ( !xControl.is() )
         return; /* throw IllegalArgumentException(); */
 
@@ -1817,14 +2051,13 @@ void FmXFormController::removeFromEventAttacher(const Reference< XControl > & xC
 }
 
 //------------------------------------------------------------------------------
-void FmXFormController::setContainer(const Reference< XControlContainer > & xContainer) throw( RuntimeException )
+void FormController::setContainer(const Reference< XControlContainer > & xContainer) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::setContainer" );
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
+    OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
     Reference< XTabControllerModel >  xTabModel(getModel());
     DBG_ASSERT(xTabModel.is() || !xContainer.is(), "No Model defined");
         // if we have a new container we need a model
-    DBG_ASSERT(m_xTabController.is(), "FmXFormController::setContainer : invalid aggregate !");
+    DBG_ASSERT(m_xTabController.is(), "FormController::setContainer : invalid aggregate !");
 
     ::osl::MutexGuard aGuard( m_aMutex );
     Reference< XContainer >  xCurrentContainer;
@@ -1838,11 +2071,8 @@ void FmXFormController::setContainer(const Reference< XControlContainer > & xCon
             m_aTabActivationTimer.Stop();
 
         // clear the filter map
-        for (FmFilterControls::const_iterator iter = m_aFilterControls.begin();
-             iter != m_aFilterControls.end(); ++iter)
-            (*iter).first->removeTextListener(this);
-
-        m_aFilterControls.clear();
+        ::std::for_each( m_aFilterComponents.begin(), m_aFilterComponents.end(), RemoveComponentTextListener( this ) );
+        m_aFilterComponents.clear();
 
         // einsammeln der Controls
         const Reference< XControl >* pControls = m_aControls.getConstArray();
@@ -1906,23 +2136,23 @@ void FmXFormController::setContainer(const Reference< XControlContainer > & xCon
 }
 
 //------------------------------------------------------------------------------
-Reference< XControlContainer >  FmXFormController::getContainer() throw( RuntimeException )
+Reference< XControlContainer >  FormController::getContainer() throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::getContainer" );
     ::osl::MutexGuard aGuard( m_aMutex );
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
-    DBG_ASSERT(m_xTabController.is(), "FmXFormController::getContainer : invalid aggregate !");
+    impl_checkDisposed_throw();
+
+    DBG_ASSERT(m_xTabController.is(), "FormController::getContainer : invalid aggregate !");
     if (!m_xTabController.is())
         return Reference< XControlContainer > ();
     return m_xTabController->getContainer();
 }
 
 //------------------------------------------------------------------------------
-Sequence< Reference< XControl > > FmXFormController::getControls(void) throw( RuntimeException )
+Sequence< Reference< XControl > > FormController::getControls(void) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::getControls" );
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
     ::osl::MutexGuard aGuard( m_aMutex );
+    impl_checkDisposed_throw();
+
     if (!m_bControlsSorted)
     {
         Reference< XTabControllerModel >  xModel = getModel();
@@ -1958,32 +2188,31 @@ Sequence< Reference< XControl > > FmXFormController::getControls(void) throw( Ru
 }
 
 //------------------------------------------------------------------------------
-void FmXFormController::autoTabOrder() throw( RuntimeException )
+void FormController::autoTabOrder() throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::autoTabOrder" );
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
     ::osl::MutexGuard aGuard( m_aMutex );
-    DBG_ASSERT(m_xTabController.is(), "FmXFormController::autoTabOrder : invalid aggregate !");
+    impl_checkDisposed_throw();
+
+    DBG_ASSERT(m_xTabController.is(), "FormController::autoTabOrder : invalid aggregate !");
     if (m_xTabController.is())
         m_xTabController->autoTabOrder();
 }
 
 //------------------------------------------------------------------------------
-void FmXFormController::activateTabOrder() throw( RuntimeException )
+void FormController::activateTabOrder() throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::activateTabOrder" );
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
     ::osl::MutexGuard aGuard( m_aMutex );
-    DBG_ASSERT(m_xTabController.is(), "FmXFormController::activateTabOrder : invalid aggregate !");
+    impl_checkDisposed_throw();
+
+    DBG_ASSERT(m_xTabController.is(), "FormController::activateTabOrder : invalid aggregate !");
     if (m_xTabController.is())
         m_xTabController->activateTabOrder();
 }
 
 //------------------------------------------------------------------------------
-void FmXFormController::setControlLock(const Reference< XControl > & xControl)
+void FormController::setControlLock(const Reference< XControl > & xControl)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::setControlLock" );
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
+    OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
     sal_Bool bLocked = isLocked();
 
     // es wird gelockt
@@ -2022,8 +2251,9 @@ void FmXFormController::setControlLock(const Reference< XControl > & xControl)
                             else
                                 xBound->setLock(bLocked);
                         }
-                        catch(...)
+                        catch( const Exception& )
                         {
+                            DBG_UNHANDLED_EXCEPTION();
                         }
 
                     }
@@ -2034,10 +2264,9 @@ void FmXFormController::setControlLock(const Reference< XControl > & xControl)
 }
 
 //------------------------------------------------------------------------------
-void FmXFormController::setLocks()
+void FormController::setLocks()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::setLocks" );
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
+    OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
     // alle Controls, die mit einer Datenquelle verbunden sind locken/unlocken
     const Reference< XControl >* pControls = m_aControls.getConstArray();
     const Reference< XControl >* pControlsEnd = pControls + m_aControls.getLength();
@@ -2076,10 +2305,9 @@ namespace
 }
 
 //------------------------------------------------------------------------------
-void FmXFormController::startControlModifyListening(const Reference< XControl > & xControl)
+void FormController::startControlModifyListening(const Reference< XControl > & xControl)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::startControlModifyListening" );
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
+    OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
 
     bool bModifyListening = lcl_shouldListenForModifications( xControl, this );
 
@@ -2126,10 +2354,9 @@ void FmXFormController::startControlModifyListening(const Reference< XControl >
 }
 
 //------------------------------------------------------------------------------
-void FmXFormController::stopControlModifyListening(const Reference< XControl > & xControl)
+void FormController::stopControlModifyListening(const Reference< XControl > & xControl)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::stopControlModifyListening" );
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
+    OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
 
     bool bModifyListening = lcl_shouldListenForModifications( xControl, NULL );
 
@@ -2175,10 +2402,9 @@ void FmXFormController::stopControlModifyListening(const Reference< XControl > &
 }
 
 //------------------------------------------------------------------------------
-void FmXFormController::startListening()
+void FormController::startListening()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::startListening" );
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
+    OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
     m_bModified  = sal_False;
 
     // jetzt anmelden bei gebundenen feldern
@@ -2189,10 +2415,9 @@ void FmXFormController::startListening()
 }
 
 //------------------------------------------------------------------------------
-void FmXFormController::stopListening()
+void FormController::stopListening()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::stopListening" );
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
+    OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
     m_bModified  = sal_False;
 
     // jetzt anmelden bei gebundenen feldern
@@ -2204,10 +2429,9 @@ void FmXFormController::stopListening()
 
 
 //------------------------------------------------------------------------------
-Reference< XControl >  FmXFormController::findControl(Sequence< Reference< XControl > >& _rControls, const Reference< XControlModel > & xCtrlModel ,sal_Bool _bRemove,sal_Bool _bOverWrite) const
+Reference< XControl >  FormController::findControl(Sequence< Reference< XControl > >& _rControls, const Reference< XControlModel > & xCtrlModel ,sal_Bool _bRemove,sal_Bool _bOverWrite) const
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::findControl" );
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
+    OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
     DBG_ASSERT( xCtrlModel.is(), "findControl - welches ?!" );
 
     Reference< XControl >* pControls = _rControls.getArray();
@@ -2232,9 +2456,8 @@ Reference< XControl >  FmXFormController::findControl(Sequence< Reference< XCont
 }
 
 //------------------------------------------------------------------------------
-void FmXFormController::implControlInserted( const Reference< XControl>& _rxControl, bool _bAddToEventAttacher )
+void FormController::implControlInserted( const Reference< XControl>& _rxControl, bool _bAddToEventAttacher )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::implControlInserted" );
     Reference< XWindow > xWindow( _rxControl, UNO_QUERY );
     if ( xWindow.is() )
     {
@@ -2272,9 +2495,8 @@ void FmXFormController::implControlInserted( const Reference< XControl>& _rxCont
 }
 
 //------------------------------------------------------------------------------
-void FmXFormController::implControlRemoved( const Reference< XControl>& _rxControl, bool _bRemoveFromEventAttacher )
+void FormController::implControlRemoved( const Reference< XControl>& _rxControl, bool _bRemoveFromEventAttacher )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::implControlRemoved" );
     Reference< XWindow > xWindow( _rxControl, UNO_QUERY );
     if ( xWindow.is() )
     {
@@ -2304,9 +2526,8 @@ void FmXFormController::implControlRemoved( const Reference< XControl>& _rxContr
 }
 
 //------------------------------------------------------------------------------
-void FmXFormController::implSetCurrentControl( const Reference< XControl >& _rxControl )
+void FormController::implSetCurrentControl( const Reference< XControl >& _rxControl )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::implSetCurrentControl" );
     if ( m_xCurrentControl.get() == _rxControl.get() )
         return;
 
@@ -2322,10 +2543,9 @@ void FmXFormController::implSetCurrentControl( const Reference< XControl >& _rxC
 }
 
 //------------------------------------------------------------------------------
-void FmXFormController::insertControl(const Reference< XControl > & xControl)
+void FormController::insertControl(const Reference< XControl > & xControl)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::insertControl" );
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
+    OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
     m_bControlsSorted = sal_False;
     m_aControls.realloc(m_aControls.getLength() + 1);
     m_aControls.getArray()[m_aControls.getLength() - 1] = xControl;
@@ -2343,10 +2563,9 @@ void FmXFormController::insertControl(const Reference< XControl > & xControl)
 }
 
 //------------------------------------------------------------------------------
-void FmXFormController::removeControl(const Reference< XControl > & xControl)
+void FormController::removeControl(const Reference< XControl > & xControl)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::removeControl" );
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
+    OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
     const Reference< XControl >* pControls = m_aControls.getConstArray();
     const Reference< XControl >* pControlsEnd = pControls + m_aControls.getLength();
     while ( pControls != pControlsEnd )
@@ -2358,13 +2577,9 @@ void FmXFormController::removeControl(const Reference< XControl > & xControl)
         }
     }
 
-    if (m_aFilterControls.size())
-    {
-        Reference< XTextComponent >  xText(xControl, UNO_QUERY);
-        FmFilterControls::iterator iter = m_aFilterControls.find(xText);
-        if (iter != m_aFilterControls.end())
-            m_aFilterControls.erase(iter);
-    }
+    FilterComponents::iterator componentPos = ::std::find( m_aFilterComponents.begin(), m_aFilterComponents.end(), xControl );
+    if ( componentPos != m_aFilterComponents.end() )
+        m_aFilterComponents.erase( componentPos );
 
     implControlRemoved( xControl, m_bDetachEvents );
 
@@ -2374,12 +2589,11 @@ void FmXFormController::removeControl(const Reference< XControl > & xControl)
 
 // XLoadListener
 //------------------------------------------------------------------------------
-void FmXFormController::loaded(const EventObject& rEvent) throw( RuntimeException )
+void FormController::loaded(const EventObject& rEvent) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::loaded" );
-    OSL_ENSURE( rEvent.Source == m_xModelAsIndex, "FmXFormController::loaded: where did this come from?" );
+    OSL_ENSURE( rEvent.Source == m_xModelAsIndex, "FormController::loaded: where did this come from?" );
 
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
+    OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
     ::osl::MutexGuard aGuard( m_aMutex );
     Reference< XRowSet >  xForm(rEvent.Source, UNO_QUERY);
     // do we have a connected data source
@@ -2431,9 +2645,8 @@ void FmXFormController::loaded(const EventObject& rEvent) throw( RuntimeExceptio
 }
 
 //------------------------------------------------------------------------------
-void FmXFormController::updateAllDispatchers() const
+void FormController::updateAllDispatchers() const
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::updateAllDispatchers" );
     ::std::for_each(
         m_aFeatureDispatchers.begin(),
         m_aFeatureDispatchers.end(),
@@ -2445,9 +2658,9 @@ void FmXFormController::updateAllDispatchers() const
 }
 
 //------------------------------------------------------------------------------
-IMPL_LINK(FmXFormController, OnLoad, void*, EMPTYARG)
+IMPL_LINK(FormController, OnLoad, void*, EMPTYARG)
 {
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
+    OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
     m_bLocked = determineLockState();
 
     setLocks();
@@ -2463,19 +2676,20 @@ IMPL_LINK(FmXFormController, OnLoad, void*, EMPTYARG)
 }
 
 //------------------------------------------------------------------------------
-void FmXFormController::unloaded(const EventObject& /*rEvent*/) throw( RuntimeException )
+void FormController::unloaded(const EventObject& /*rEvent*/) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::unloaded" );
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
+    ::osl::MutexGuard aGuard( m_aMutex );
+    impl_checkDisposed_throw();
+
     updateAllDispatchers();
 }
 
 //------------------------------------------------------------------------------
-void FmXFormController::reloading(const EventObject& /*aEvent*/) throw( RuntimeException )
+void FormController::reloading(const EventObject& /*aEvent*/) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::reloading" );
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
     ::osl::MutexGuard aGuard( m_aMutex );
+    impl_checkDisposed_throw();
+
     // do the same like in unloading
     // just one exception toggle the auto values
     m_aToggleEvent.CancelPendingCall();
@@ -2483,27 +2697,28 @@ void FmXFormController::reloading(const EventObject& /*aEvent*/) throw( RuntimeE
 }
 
 //------------------------------------------------------------------------------
-void FmXFormController::reloaded(const EventObject& aEvent) throw( RuntimeException )
+void FormController::reloaded(const EventObject& aEvent) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::reloaded" );
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
+    ::osl::MutexGuard aGuard( m_aMutex );
+    impl_checkDisposed_throw();
+
     loaded(aEvent);
 }
 
 //------------------------------------------------------------------------------
-void FmXFormController::unloading(const EventObject& /*aEvent*/) throw( RuntimeException )
+void FormController::unloading(const EventObject& /*aEvent*/) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::unloading" );
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
+    ::osl::MutexGuard aGuard( m_aMutex );
+    impl_checkDisposed_throw();
+
     unload();
 }
 
 //------------------------------------------------------------------------------
-void FmXFormController::unload() throw( RuntimeException )
+void FormController::unload() throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::unload" );
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
     ::osl::MutexGuard aGuard( m_aMutex );
+    impl_checkDisposed_throw();
 
     m_aLoadEvent.CancelPendingCall();
 
@@ -2529,9 +2744,8 @@ void FmXFormController::unload() throw( RuntimeException )
 }
 
 // -----------------------------------------------------------------------------
-void FmXFormController::removeBoundFieldListener()
+void FormController::removeBoundFieldListener()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::removeBoundFieldListener" );
     const Reference< XControl >* pControls = m_aControls.getConstArray();
     const Reference< XControl >* pControlsEnd = pControls + m_aControls.getLength();
     while ( pControls != pControlsEnd )
@@ -2543,9 +2757,8 @@ void FmXFormController::removeBoundFieldListener()
 }
 
 //------------------------------------------------------------------------------
-void FmXFormController::startFormListening( const Reference< XPropertySet >& _rxForm, sal_Bool _bPropertiesOnly )
+void FormController::startFormListening( const Reference< XPropertySet >& _rxForm, sal_Bool _bPropertiesOnly )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::startFormListening" );
     try
     {
         if ( m_bCanInsert || m_bCanUpdate )   // form can be modified
@@ -2573,14 +2786,13 @@ void FmXFormController::startFormListening( const Reference< XPropertySet >& _rx
     }
     catch( const Exception& )
     {
-        OSL_ENSURE( sal_False, "FmXFormController::startFormListening: caught an exception!" );
+        DBG_UNHANDLED_EXCEPTION();
     }
 }
 
 //------------------------------------------------------------------------------
-void FmXFormController::stopFormListening( const Reference< XPropertySet >& _rxForm, sal_Bool _bPropertiesOnly )
+void FormController::stopFormListening( const Reference< XPropertySet >& _rxForm, sal_Bool _bPropertiesOnly )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::stopFormListening" );
     try
     {
         if ( m_bCanInsert || m_bCanUpdate )
@@ -2606,20 +2818,20 @@ void FmXFormController::stopFormListening( const Reference< XPropertySet >& _rxF
     }
     catch( const Exception& )
     {
-        OSL_ENSURE( sal_False, "FmXFormController::stopFormListening: caught an exception!" );
+        DBG_UNHANDLED_EXCEPTION();
     }
 }
 
 // com::sun::star::sdbc::XRowSetListener
 //------------------------------------------------------------------------------
-void FmXFormController::cursorMoved(const EventObject& /*event*/) throw( RuntimeException )
+void FormController::cursorMoved(const EventObject& /*event*/) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::cursorMoved" );
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
+    ::osl::MutexGuard aGuard( m_aMutex );
+    impl_checkDisposed_throw();
+
     // toggle the locking ?
     if (m_bLocked != determineLockState())
     {
-        ::osl::MutexGuard aGuard( m_aMutex );
         m_bLocked = !m_bLocked;
         setLocks();
         if (isListeningForChanges())
@@ -2633,31 +2845,28 @@ void FmXFormController::cursorMoved(const EventObject& /*event*/) throw( Runtime
 }
 
 //------------------------------------------------------------------------------
-void FmXFormController::rowChanged(const EventObject& /*event*/) throw( RuntimeException )
+void FormController::rowChanged(const EventObject& /*event*/) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::rowChanged" );
     // not interested in ...
 }
 //------------------------------------------------------------------------------
-void FmXFormController::rowSetChanged(const EventObject& /*event*/) throw( RuntimeException )
+void FormController::rowSetChanged(const EventObject& /*event*/) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::rowSetChanged" );
     // not interested in ...
 }
 
 
 // XContainerListener
 //------------------------------------------------------------------------------
-void SAL_CALL FmXFormController::elementInserted(const ContainerEvent& evt) throw( RuntimeException )
+void SAL_CALL FormController::elementInserted(const ContainerEvent& evt) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::elementInserted" );
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
-    Reference< XControl >  xControl;
-    evt.Element >>= xControl;
-    if (!xControl.is())
+    ::osl::MutexGuard aGuard( m_aMutex );
+    impl_checkDisposed_throw();
+
+    Reference< XControl > xControl( evt.Element, UNO_QUERY );
+    if ( !xControl.is() )
         return;
 
-    ::osl::MutexGuard aGuard( m_aMutex );
     Reference< XFormComponent >  xModel(xControl->getModel(), UNO_QUERY);
     if (xModel.is() && m_xModelAsIndex == xModel->getParent())
     {
@@ -2686,8 +2895,8 @@ void SAL_CALL FmXFormController::elementInserted(const ContainerEvent& evt) thro
                 if (xText.is() && xField.is() && ::comphelper::hasProperty(FM_PROP_SEARCHABLE, xField) &&
                     ::comphelper::getBOOL(xField->getPropertyValue(FM_PROP_SEARCHABLE)))
                 {
-                    m_aFilterControls[xText] = xField;
-                    xText->addTextListener(this);
+                    m_aFilterComponents.push_back( xText );
+                    xText->addTextListener( this );
                 }
             }
         }
@@ -2695,9 +2904,8 @@ void SAL_CALL FmXFormController::elementInserted(const ContainerEvent& evt) thro
 }
 
 //------------------------------------------------------------------------------
-void SAL_CALL FmXFormController::elementReplaced(const ContainerEvent& evt) throw( RuntimeException )
+void SAL_CALL FormController::elementReplaced(const ContainerEvent& evt) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::elementReplaced" );
     // simulate an elementRemoved
     ContainerEvent aRemoveEvent( evt );
     aRemoveEvent.Element = evt.ReplacedElement;
@@ -2711,11 +2919,10 @@ void SAL_CALL FmXFormController::elementReplaced(const ContainerEvent& evt) thro
 }
 
 //------------------------------------------------------------------------------
-void SAL_CALL FmXFormController::elementRemoved(const ContainerEvent& evt) throw( RuntimeException )
+void SAL_CALL FormController::elementRemoved(const ContainerEvent& evt) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::elementRemoved" );
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
     ::osl::MutexGuard aGuard( m_aMutex );
+    impl_checkDisposed_throw();
 
     Reference< XControl >  xControl;
     evt.Element >>= xControl;
@@ -2731,18 +2938,17 @@ void SAL_CALL FmXFormController::elementRemoved(const ContainerEvent& evt) throw
     // are we in filtermode and a XModeSelector has inserted an element
     else if (m_bFiltering && Reference< XModeSelector > (evt.Source, UNO_QUERY).is())
     {
-        Reference< XTextComponent >  xText(xControl, UNO_QUERY);
-        FmFilterControls::iterator iter = m_aFilterControls.find(xText);
-        if (iter != m_aFilterControls.end())
-            m_aFilterControls.erase(iter);
+        FilterComponents::iterator componentPos = ::std::find(
+            m_aFilterComponents.begin(), m_aFilterComponents.end(), xControl );
+        if ( componentPos != m_aFilterComponents.end() )
+            m_aFilterComponents.erase( componentPos );
     }
 }
 
 //------------------------------------------------------------------------------
-Reference< XControl >  FmXFormController::isInList(const Reference< XWindowPeer > & xPeer) const
+Reference< XControl >  FormController::isInList(const Reference< XWindowPeer > & xPeer) const
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::isInList" );
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
+    OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
     const Reference< XControl >* pControls = m_aControls.getConstArray();
 
     sal_uInt32 nCtrls = m_aControls.getLength();
@@ -2759,58 +2965,134 @@ Reference< XControl >  FmXFormController::isInList(const Reference< XWindowPeer
 }
 
 //------------------------------------------------------------------------------
-void FmXFormController::activateFirst() throw( RuntimeException )
+void FormController::activateFirst() throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::activateFirst" );
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
     ::osl::MutexGuard aGuard( m_aMutex );
-    DBG_ASSERT(m_xTabController.is(), "FmXFormController::activateFirst : invalid aggregate !");
+    impl_checkDisposed_throw();
+
+    DBG_ASSERT(m_xTabController.is(), "FormController::activateFirst : invalid aggregate !");
     if (m_xTabController.is())
         m_xTabController->activateFirst();
 }
 
 //------------------------------------------------------------------------------
-void FmXFormController::activateLast() throw( RuntimeException )
+void FormController::activateLast() throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::activateLast" );
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
     ::osl::MutexGuard aGuard( m_aMutex );
-    DBG_ASSERT(m_xTabController.is(), "FmXFormController::activateLast : invalid aggregate !");
+    impl_checkDisposed_throw();
+
+    DBG_ASSERT(m_xTabController.is(), "FormController::activateLast : invalid aggregate !");
     if (m_xTabController.is())
         m_xTabController->activateLast();
 }
 
 // XFormController
 //------------------------------------------------------------------------------
-Reference< XControl> SAL_CALL FmXFormController::getCurrentControl(void) throw( RuntimeException )
+Reference< XFormOperations > SAL_CALL FormController::getFormOperations() throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::getCurrentControl" );
     ::osl::MutexGuard aGuard( m_aMutex );
+    impl_checkDisposed_throw();
+
+    return m_xFormOperations;
+}
+
+//------------------------------------------------------------------------------
+Reference< XControl> SAL_CALL FormController::getCurrentControl(void) throw( RuntimeException )
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+    impl_checkDisposed_throw();
     return m_xCurrentControl;
 }
 
 //------------------------------------------------------------------------------
-void SAL_CALL FmXFormController::addActivateListener(const Reference< XFormControllerListener > & l) throw( RuntimeException )
+void SAL_CALL FormController::addActivateListener(const Reference< XFormControllerListener > & l) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::addActivateListener" );
     ::osl::MutexGuard aGuard( m_aMutex );
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
+    impl_checkDisposed_throw();
     m_aActivateListeners.addInterface(l);
 }
 //------------------------------------------------------------------------------
-void SAL_CALL FmXFormController::removeActivateListener(const Reference< XFormControllerListener > & l) throw( RuntimeException )
+void SAL_CALL FormController::removeActivateListener(const Reference< XFormControllerListener > & l) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::removeActivateListener" );
     ::osl::MutexGuard aGuard( m_aMutex );
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
+    impl_checkDisposed_throw();
     m_aActivateListeners.removeInterface(l);
 }
 
 //------------------------------------------------------------------------------
-void FmXFormController::setFilter(::std::vector<FmFieldInfo>& rFieldInfos)
+void SAL_CALL FormController::addChildController( const Reference< XFormController >& _ChildController ) throw( RuntimeException, IllegalArgumentException )
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+    impl_checkDisposed_throw();
+
+    if ( !_ChildController.is() )
+        throw IllegalArgumentException( ::rtl::OUString(), *this, 1 );
+        // TODO: (localized) error message
+
+    // the parent of our (to-be-)child must be our own model
+    Reference< XFormComponent > xFormOfChild( _ChildController->getModel(), UNO_QUERY );
+    if ( !xFormOfChild.is() )
+        throw IllegalArgumentException( ::rtl::OUString(), *this, 1 );
+        // TODO: (localized) error message
+
+    if ( xFormOfChild->getParent() != m_xModelAsIndex )
+        throw IllegalArgumentException( ::rtl::OUString(), *this, 1 );
+        // TODO: (localized) error message
+
+    m_aChilds.push_back( _ChildController );
+    _ChildController->setParent( *this );
+
+    // search the position of the model within the form
+    sal_uInt32 nPos = m_xModelAsIndex->getCount();
+    Reference< XFormComponent > xTemp;
+    for( ; nPos; )
+    {
+        m_xModelAsIndex->getByIndex(--nPos) >>= xTemp;
+        if ( xFormOfChild == xTemp )
+        {
+            Reference< XInterface >  xIfc( _ChildController, UNO_QUERY );
+            m_xModelAsManager->attach( nPos, xIfc, makeAny( _ChildController) );
+            break;
+        }
+    }
+}
+
+//------------------------------------------------------------------------------
+Reference< XFormControllerContext > SAL_CALL FormController::getContext() throw (RuntimeException)
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+    impl_checkDisposed_throw();
+    return m_xContext;
+}
+
+//------------------------------------------------------------------------------
+void SAL_CALL FormController::setContext( const Reference< XFormControllerContext >& _context ) throw (RuntimeException)
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+    impl_checkDisposed_throw();
+    m_xContext = _context;
+}
+
+//------------------------------------------------------------------------------
+Reference< XInteractionHandler > SAL_CALL FormController::getInteractionHandler() throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::setFilter" );
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
+    ::osl::MutexGuard aGuard( m_aMutex );
+    impl_checkDisposed_throw();
+    return m_xInteractionHandler;
+}
+
+//------------------------------------------------------------------------------
+void SAL_CALL FormController::setInteractionHandler( const Reference< XInteractionHandler >& _interactionHandler ) throw (RuntimeException)
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+    impl_checkDisposed_throw();
+    m_xInteractionHandler = _interactionHandler;
+}
+
+//------------------------------------------------------------------------------
+void FormController::setFilter(::std::vector<FmFieldInfo>& rFieldInfos)
+{
+    OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
     // create the composer
     Reference< XRowSet > xForm(m_xModelAsIndex, UNO_QUERY);
     Reference< XConnection > xConnection(OStaticDataAccessTools().getRowSetConnection(xForm));
@@ -2865,11 +3147,10 @@ void FmXFormController::setFilter(::std::vector<FmFieldInfo>& rFieldInfos)
         // need to parse criteria localized
         OStaticDataAccessTools aStaticTools;
         Reference< XNumberFormatsSupplier> xFormatSupplier( aStaticTools.getNumberFormats(xConnection, sal_True));
-        Reference< XNumberFormatter> xFormatter(m_xORB
-                        ->createInstance(::rtl::OUString::createFromAscii("com.sun.star.util.NumberFormatter")), UNO_QUERY);
+        Reference< XNumberFormatter> xFormatter( m_aContext.createComponent( "com.sun.star.util.NumberFormatter" ), UNO_QUERY );
         xFormatter->attachNumberFormatsSupplier(xFormatSupplier);
         Locale aAppLocale = Application::GetSettings().GetUILocale();
-        LocaleDataWrapper aLocaleWrapper(m_xORB,aAppLocale);
+        LocaleDataWrapper aLocaleWrapper( m_aContext.getLegacyServiceFactory(), aAppLocale );
 
         // retrieving the filter
         const Sequence < PropertyValue >* pRow = aFilterRows.getConstArray();
@@ -2967,26 +3248,24 @@ void FmXFormController::setFilter(::std::vector<FmFieldInfo>& rFieldInfos)
             if (aRow.empty())
                 continue;
 
-            m_aFilters.push_back(aRow);
+            impl_addFilterRow( aRow );
         }
     }
 
     // now set the filter controls
-    for (::std::vector<FmFieldInfo>::iterator iter = rFieldInfos.begin();
-         iter != rFieldInfos.end(); iter++)
+    for (   ::std::vector<FmFieldInfo>::iterator field = rFieldInfos.begin();
+            field != rFieldInfos.end();
+            ++field
+        )
     {
-        m_aFilterControls[(*iter).xText] = (*iter).xField;
+        m_aFilterComponents.push_back( field->xText );
     }
-
-    // add an empty row
-    m_aFilters.push_back(FmFilterRow());
 }
 
 //------------------------------------------------------------------------------
-void FmXFormController::startFiltering()
+void FormController::startFiltering()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::startFiltering" );
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
+    OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
 
     OStaticDataAccessTools aStaticTools;
     Reference< XConnection >  xConnection( aStaticTools.getRowSetConnection( Reference< XRowSet >( m_xModelAsIndex, UNO_QUERY ) ) );
@@ -3013,8 +3292,7 @@ void FmXFormController::startFiltering()
     // the control we have to activate after replacement
     Reference< XDatabaseMetaData >  xMetaData(xConnection->getMetaData());
     Reference< XNumberFormatsSupplier >  xFormatSupplier = aStaticTools.getNumberFormats(xConnection, sal_True);
-    Reference< XNumberFormatter >  xFormatter(m_xORB
-                        ->createInstance(::rtl::OUString::createFromAscii("com.sun.star.util.NumberFormatter")), UNO_QUERY);
+    Reference< XNumberFormatter >  xFormatter( m_aContext.createComponent( "com.sun.star.util.NumberFormatter" ), UNO_QUERY );
     xFormatter->attachNumberFormatsSupplier(xFormatSupplier);
 
     // structure for storing the field info
@@ -3032,7 +3310,7 @@ void FmXFormController::startFiltering()
             Reference< XModeSelector >  xSelector(xControl, UNO_QUERY);
             if (xSelector.is())
             {
-                xSelector->setMode(FILTER_MODE);
+                xSelector->setMode( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterMode" ) ) );
 
                 // listening for new controls of the selector
                 Reference< XContainer >  xContainer(xSelector, UNO_QUERY);
@@ -3092,13 +3370,10 @@ void FmXFormController::startFiltering()
                     aCreationArgs[ 1 ] <<= NamedValue( ::rtl::OUString::createFromAscii( "NumberFormatter" ), makeAny( xFormatter ) );
                     aCreationArgs[ 2 ] <<= NamedValue( ::rtl::OUString::createFromAscii( "ControlModel" ), makeAny( xModel ) );
                     Reference< XControl > xFilterControl(
-                        m_xORB->createInstanceWithArguments(
-                            ::rtl::OUString::createFromAscii( "com.sun.star.form.control.FilterControl" ),
-                            aCreationArgs
-                        ),
+                        m_aContext.createComponentWithArguments( "com.sun.star.form.control.FilterControl", aCreationArgs ),
                         UNO_QUERY
                     );
-                    DBG_ASSERT( xFilterControl.is(), "FmXFormController::startFiltering: could not create a filter control!" );
+                    DBG_ASSERT( xFilterControl.is(), "FormController::startFiltering: could not create a filter control!" );
 
                     if ( replaceControl( xControl, xFilterControl ) )
                     {
@@ -3132,10 +3407,9 @@ void FmXFormController::startFiltering()
 }
 
 //------------------------------------------------------------------------------
-void FmXFormController::stopFiltering()
+void FormController::stopFiltering()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::stopFiltering" );
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
+    OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
     if ( !m_bFiltering ) // #104693# OJ
     {	// nothing to do
         return;
@@ -3150,17 +3424,10 @@ void FmXFormController::stopFiltering()
     Sequence< Reference< XControl > > aControlsCopy( m_aControls );
     const Reference< XControl > * pControls = aControlsCopy.getConstArray();
     sal_Int32 nControlCount = aControlsCopy.getLength();
-    // SdrPageView* pCurPageView = m_pView->GetSdrPageView();
-
-    // sal_uInt16 nPos = pCurPageView ? pCurPageView->GetWinList().Find((OutputDevice*)m_pView->GetActualOutDev()) : SDRPAGEVIEWWIN_NOTFOUND;
-    // const SdrPageWindow* pWindow = pCurPageView ? pCurPageView->FindPageWindow(*((OutputDevice*)m_pView->GetActualOutDev())) : 0L;
 
     // clear the filter control map
-    for (FmFilterControls::const_iterator iter = m_aFilterControls.begin();
-         iter != m_aFilterControls.end(); iter++)
-         (*iter).first->removeTextListener(this);
-
-    m_aFilterControls.clear();
+    ::std::for_each( m_aFilterComponents.begin(), m_aFilterComponents.end(), RemoveComponentTextListener( this ) );
+    m_aFilterComponents.clear();
 
     for ( sal_Int32 i = nControlCount; i > 0; )
     {
@@ -3173,7 +3440,7 @@ void FmXFormController::stopFiltering()
             Reference< XModeSelector >  xSelector(xControl, UNO_QUERY);
             if (xSelector.is())
             {
-                xSelector->setMode(DATA_MODE);
+                xSelector->setMode( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DataMode" ) ) );
 
                 // listening for new controls of the selector
                 Reference< XContainer >  xContainer(xSelector, UNO_QUERY);
@@ -3197,7 +3464,7 @@ void FmXFormController::stopFiltering()
                 {
                     ::rtl::OUString sServiceName;
                     OSL_VERIFY( xSet->getPropertyValue( FM_PROP_DEFAULTCONTROL ) >>= sServiceName );
-                    Reference< XControl > xNewControl( m_xORB->createInstance( sServiceName ), UNO_QUERY );
+                    Reference< XControl > xNewControl( m_aContext.createComponent( sServiceName ), UNO_QUERY );
                     replaceControl( xControl, xNewControl );
                 }
             }
@@ -3210,8 +3477,8 @@ void FmXFormController::stopFiltering()
 
     m_bDetachEvents = sal_True;
 
-    m_aFilters.clear();
-    m_nCurrentFilterPosition = 0;
+    m_aFilterRows.clear();
+    m_nCurrentFilterPosition = -1;
 
     // release the locks if possible
     // lock all controls which are not used for filtering
@@ -3225,12 +3492,11 @@ void FmXFormController::stopFiltering()
 
 // XModeSelector
 //------------------------------------------------------------------------------
-void FmXFormController::setMode(const ::rtl::OUString& Mode) throw( NoSupportException, RuntimeException )
+void FormController::setMode(const ::rtl::OUString& Mode) throw( NoSupportException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::setMode" );
     ::osl::MutexGuard aGuard( m_aMutex );
+    impl_checkDisposed_throw();
 
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
     if (!supportsMode(Mode))
         throw NoSupportException();
 
@@ -3239,7 +3505,7 @@ void FmXFormController::setMode(const ::rtl::OUString& Mode) throw( NoSupportExc
 
     m_aMode = Mode;
 
-    if (Mode == FILTER_MODE)
+    if ( Mode.equalsAscii( "FilterMode" ) )
         startFiltering();
     else
         stopFiltering();
@@ -3254,35 +3520,37 @@ void FmXFormController::setMode(const ::rtl::OUString& Mode) throw( NoSupportExc
 }
 
 //------------------------------------------------------------------------------
-::rtl::OUString SAL_CALL FmXFormController::getMode(void) throw( RuntimeException )
+::rtl::OUString SAL_CALL FormController::getMode(void) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::getMode" );
-::osl::MutexGuard aGuard( m_aMutex );
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
+    ::osl::MutexGuard aGuard( m_aMutex );
+    impl_checkDisposed_throw();
+
     return m_aMode;
 }
 
 //------------------------------------------------------------------------------
-Sequence< ::rtl::OUString > SAL_CALL FmXFormController::getSupportedModes(void) throw( RuntimeException )
+Sequence< ::rtl::OUString > SAL_CALL FormController::getSupportedModes(void) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::getSupportedModes" );
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
+    ::osl::MutexGuard aGuard( m_aMutex );
+    impl_checkDisposed_throw();
+
     static Sequence< ::rtl::OUString > aModes;
     if (!aModes.getLength())
     {
         aModes.realloc(2);
         ::rtl::OUString* pModes = aModes.getArray();
-        pModes[0] = DATA_MODE;
-        pModes[1] = FILTER_MODE;
+        pModes[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DataMode" ) );
+        pModes[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterMode" ) );
     }
     return aModes;
 }
 
 //------------------------------------------------------------------------------
-sal_Bool SAL_CALL FmXFormController::supportsMode(const ::rtl::OUString& Mode) throw( RuntimeException )
+sal_Bool SAL_CALL FormController::supportsMode(const ::rtl::OUString& Mode) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::supportsMode" );
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
+    ::osl::MutexGuard aGuard( m_aMutex );
+    impl_checkDisposed_throw();
+
     Sequence< ::rtl::OUString > aModes(getSupportedModes());
     const ::rtl::OUString* pModes = aModes.getConstArray();
     for (sal_Int32 i = aModes.getLength(); i > 0; )
@@ -3294,37 +3562,32 @@ sal_Bool SAL_CALL FmXFormController::supportsMode(const ::rtl::OUString& Mode) t
 }
 
 //------------------------------------------------------------------------------
-Window* FmXFormController::getDialogParentWindow()
+Window* FormController::getDialogParentWindow()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::getDialogParentWindow" );
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
-    Window* pParent = m_pWindow;
-    if ( !pParent )
+    OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
+    Window* pParentWindow = NULL;
+    try
     {
-        try
-        {
-            Reference< XControl > xContainerControl( getContainer(), UNO_QUERY_THROW );
-            Reference< XWindowPeer > xContainerPeer( xContainerControl->getPeer(), UNO_QUERY_THROW );
-            pParent = VCLUnoHelper::GetWindow( xContainerPeer );
-        }
-        catch( const Exception& )
-        {
-            OSL_ENSURE( sal_False, "FmXFormController::getDialogParentWindow: caught an exception!" );
-        }
+        Reference< XControl > xContainerControl( getContainer(), UNO_QUERY_THROW );
+        Reference< XWindowPeer > xContainerPeer( xContainerControl->getPeer(), UNO_QUERY_THROW );
+        pParentWindow = VCLUnoHelper::GetWindow( xContainerPeer );
+    }
+    catch( const Exception& )
+    {
+        DBG_UNHANDLED_EXCEPTION();
     }
-    return pParent;
+    return pParentWindow;
 }
 //------------------------------------------------------------------------------
-bool FmXFormController::checkFormComponentValidity( ::rtl::OUString& /* [out] */ _rFirstInvalidityExplanation, Reference< XControlModel >& /* [out] */ _rxFirstInvalidModel ) SAL_THROW(())
+bool FormController::checkFormComponentValidity( ::rtl::OUString& /* [out] */ _rFirstInvalidityExplanation, Reference< XControlModel >& /* [out] */ _rxFirstInvalidModel ) SAL_THROW(())
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::checkFormComponentValidity" );
     try
     {
         Reference< XEnumerationAccess > xControlEnumAcc( getModel(), UNO_QUERY );
         Reference< XEnumeration > xControlEnumeration;
         if ( xControlEnumAcc.is() )
             xControlEnumeration = xControlEnumAcc->createEnumeration();
-        OSL_ENSURE( xControlEnumeration.is(), "FmXFormController::checkFormComponentValidity: cannot enumerate the controls!" );
+        OSL_ENSURE( xControlEnumeration.is(), "FormController::checkFormComponentValidity: cannot enumerate the controls!" );
         if ( !xControlEnumeration.is() )
             // assume all valid
             return true;
@@ -3340,7 +3603,7 @@ bool FmXFormController::checkFormComponentValidity( ::rtl::OUString& /* [out] */
                 continue;
 
             Reference< XValidator > xValidator( xValidatable->getValidator() );
-            OSL_ENSURE( xValidator.is(), "FmXFormController::checkFormComponentValidity: invalid, but no validator?" );
+            OSL_ENSURE( xValidator.is(), "FormController::checkFormComponentValidity: invalid, but no validator?" );
             if ( !xValidator.is() )
                 // this violates the interface definition of css.form.validation.XValidatableFormComponent ...
                 continue;
@@ -3352,15 +3615,14 @@ bool FmXFormController::checkFormComponentValidity( ::rtl::OUString& /* [out] */
     }
     catch( const Exception& )
     {
-        OSL_ENSURE( sal_False, "FmXFormController::checkFormComponentValidity: caught an exception!" );
+        DBG_UNHANDLED_EXCEPTION();
     }
     return true;
 }
 
 //------------------------------------------------------------------------------
-Reference< XControl > FmXFormController::locateControl( const Reference< XControlModel >& _rxModel ) SAL_THROW(())
+Reference< XControl > FormController::locateControl( const Reference< XControlModel >& _rxModel ) SAL_THROW(())
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::locateControl" );
     try
     {
         Sequence< Reference< XControl > > aControls( getControls() );
@@ -3369,18 +3631,18 @@ Reference< XControl > FmXFormController::locateControl( const Reference< XContro
 
         for ( ; pControls != pControlsEnd; ++pControls )
         {
-            OSL_ENSURE( pControls->is(), "FmXFormController::locateControl: NULL-control?" );
+            OSL_ENSURE( pControls->is(), "FormController::locateControl: NULL-control?" );
             if ( pControls->is() )
             {
                 if ( ( *pControls)->getModel() == _rxModel )
                     return *pControls;
             }
         }
-        OSL_ENSURE( sal_False, "FmXFormController::locateControl: did not find a control for this model!" );
+        OSL_ENSURE( sal_False, "FormController::locateControl: did not find a control for this model!" );
     }
     catch( const Exception& )
     {
-        OSL_ENSURE( sal_False, "FmXFormController::locateControl: caught an exception!" );
+        DBG_UNHANDLED_EXCEPTION();
     }
     return NULL;
 }
@@ -3448,12 +3710,11 @@ namespace
 
 // XRowSetApproveListener
 //------------------------------------------------------------------------------
-sal_Bool SAL_CALL FmXFormController::approveRowChange(const RowChangeEvent& _rEvent) throw( RuntimeException )
+sal_Bool SAL_CALL FormController::approveRowChange(const RowChangeEvent& _rEvent) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::approveRowChange" );
     ::osl::ClearableMutexGuard aGuard( m_aMutex );
+    impl_checkDisposed_throw();
 
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
     ::cppu::OInterfaceIteratorHelper aIter(m_aRowSetApproveListeners);
     sal_Bool bValid = sal_True;
     if (aIter.hasMoreElements())
@@ -3486,7 +3747,7 @@ sal_Bool SAL_CALL FmXFormController::approveRowChange(const RowChangeEvent& _rEv
     if ( !lcl_shouldValidateRequiredFields_nothrow( _rEvent.Source ) )
         return sal_True;
 
-    OSL_ENSURE( m_pColumnInfoCache.get(), "FmXFormController::approveRowChange: no column infos!" );
+    OSL_ENSURE( m_pColumnInfoCache.get(), "FormController::approveRowChange: no column infos!" );
     if ( !m_pColumnInfoCache.get() )
         return sal_True;
 
@@ -3537,11 +3798,11 @@ sal_Bool SAL_CALL FmXFormController::approveRowChange(const RowChangeEvent& _rEv
 }
 
 //------------------------------------------------------------------------------
-sal_Bool SAL_CALL FmXFormController::approveCursorMove(const EventObject& event) throw( RuntimeException )
+sal_Bool SAL_CALL FormController::approveCursorMove(const EventObject& event) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::approveCursorMove" );
     ::osl::MutexGuard aGuard( m_aMutex );
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
+    impl_checkDisposed_throw();
+
     ::cppu::OInterfaceIteratorHelper aIter(m_aRowSetApproveListeners);
     if (aIter.hasMoreElements())
     {
@@ -3554,11 +3815,11 @@ sal_Bool SAL_CALL FmXFormController::approveCursorMove(const EventObject& event)
 }
 
 //------------------------------------------------------------------------------
-sal_Bool SAL_CALL FmXFormController::approveRowSetChange(const EventObject& event) throw( RuntimeException )
+sal_Bool SAL_CALL FormController::approveRowSetChange(const EventObject& event) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::approveRowSetChange" );
     ::osl::MutexGuard aGuard( m_aMutex );
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
+    impl_checkDisposed_throw();
+
     ::cppu::OInterfaceIteratorHelper aIter(m_aRowSetApproveListeners);
     if (aIter.hasMoreElements())
     {
@@ -3572,30 +3833,29 @@ sal_Bool SAL_CALL FmXFormController::approveRowSetChange(const EventObject& even
 
 // XRowSetApproveBroadcaster
 //------------------------------------------------------------------------------
-void SAL_CALL FmXFormController::addRowSetApproveListener(const Reference< XRowSetApproveListener > & _rxListener) throw( RuntimeException )
+void SAL_CALL FormController::addRowSetApproveListener(const Reference< XRowSetApproveListener > & _rxListener) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::addRowSetApproveListener" );
     ::osl::MutexGuard aGuard( m_aMutex );
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
+    impl_checkDisposed_throw();
+
     m_aRowSetApproveListeners.addInterface(_rxListener);
 }
 
 //------------------------------------------------------------------------------
-void SAL_CALL FmXFormController::removeRowSetApproveListener(const Reference< XRowSetApproveListener > & _rxListener) throw( RuntimeException )
+void SAL_CALL FormController::removeRowSetApproveListener(const Reference< XRowSetApproveListener > & _rxListener) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::removeRowSetApproveListener" );
     ::osl::MutexGuard aGuard( m_aMutex );
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
+    impl_checkDisposed_throw();
+
     m_aRowSetApproveListeners.removeInterface(_rxListener);
 }
 
 // XErrorListener
 //------------------------------------------------------------------------------
-void SAL_CALL FmXFormController::errorOccured(const SQLErrorEvent& aEvent) throw( RuntimeException )
+void SAL_CALL FormController::errorOccured(const SQLErrorEvent& aEvent) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::errorOccured" );
     ::osl::ClearableMutexGuard aGuard( m_aMutex );
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
+    impl_checkDisposed_throw();
 
     ::cppu::OInterfaceIteratorHelper aIter(m_aErrorListeners);
     if (aIter.hasMoreElements())
@@ -3613,61 +3873,62 @@ void SAL_CALL FmXFormController::errorOccured(const SQLErrorEvent& aEvent) throw
 
 // XErrorBroadcaster
 //------------------------------------------------------------------------------
-void SAL_CALL FmXFormController::addSQLErrorListener(const Reference< XSQLErrorListener > & aListener) throw( RuntimeException )
+void SAL_CALL FormController::addSQLErrorListener(const Reference< XSQLErrorListener > & aListener) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::addSQLErrorListener" );
     ::osl::MutexGuard aGuard( m_aMutex );
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
+    impl_checkDisposed_throw();
+
     m_aErrorListeners.addInterface(aListener);
 }
 
 //------------------------------------------------------------------------------
-void SAL_CALL FmXFormController::removeSQLErrorListener(const Reference< XSQLErrorListener > & aListener) throw( RuntimeException )
+void SAL_CALL FormController::removeSQLErrorListener(const Reference< XSQLErrorListener > & aListener) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::removeSQLErrorListener" );
     ::osl::MutexGuard aGuard( m_aMutex );
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
+    impl_checkDisposed_throw();
+
     m_aErrorListeners.removeInterface(aListener);
 }
 
 // XDatabaseParameterBroadcaster2
 //------------------------------------------------------------------------------
-void SAL_CALL FmXFormController::addDatabaseParameterListener(const Reference< XDatabaseParameterListener > & aListener) throw( RuntimeException )
+void SAL_CALL FormController::addDatabaseParameterListener(const Reference< XDatabaseParameterListener > & aListener) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::addDatabaseParameterListener" );
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
+    ::osl::MutexGuard aGuard( m_aMutex );
+    impl_checkDisposed_throw();
+
     m_aParameterListeners.addInterface(aListener);
 }
 
 //------------------------------------------------------------------------------
-void SAL_CALL FmXFormController::removeDatabaseParameterListener(const Reference< XDatabaseParameterListener > & aListener) throw( RuntimeException )
+void SAL_CALL FormController::removeDatabaseParameterListener(const Reference< XDatabaseParameterListener > & aListener) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::removeDatabaseParameterListener" );
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
+    ::osl::MutexGuard aGuard( m_aMutex );
+    impl_checkDisposed_throw();
+
     m_aParameterListeners.removeInterface(aListener);
 }
 
 // XDatabaseParameterBroadcaster
 //------------------------------------------------------------------------------
-void SAL_CALL FmXFormController::addParameterListener(const Reference< XDatabaseParameterListener > & aListener) throw( RuntimeException )
+void SAL_CALL FormController::addParameterListener(const Reference< XDatabaseParameterListener > & aListener) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::addParameterListener" );
-    FmXFormController::addDatabaseParameterListener( aListener );
+    FormController::addDatabaseParameterListener( aListener );
 }
 
 //------------------------------------------------------------------------------
-void SAL_CALL FmXFormController::removeParameterListener(const Reference< XDatabaseParameterListener > & aListener) throw( RuntimeException )
+void SAL_CALL FormController::removeParameterListener(const Reference< XDatabaseParameterListener > & aListener) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::removeParameterListener" );
-    FmXFormController::removeDatabaseParameterListener( aListener );
+    FormController::removeDatabaseParameterListener( aListener );
 }
 
 // XDatabaseParameterListener
 //------------------------------------------------------------------------------
-sal_Bool SAL_CALL FmXFormController::approveParameter(const DatabaseParameterEvent& aEvent) throw( RuntimeException )
+sal_Bool SAL_CALL FormController::approveParameter(const DatabaseParameterEvent& aEvent) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::approveParameter" );
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
+    ::vos::OGuard aSolarGuard(Application::GetSolarMutex());
+    ::osl::MutexGuard aGuard( m_aMutex );
+    impl_checkDisposed_throw();
 
     ::cppu::OInterfaceIteratorHelper aIter(m_aParameterListeners);
     if (aIter.hasMoreElements())
@@ -3698,10 +3959,7 @@ sal_Bool SAL_CALL FmXFormController::approveParameter(const DatabaseParameterEve
             pParamRequest->addContinuation(pAbort);
 
             // handle the request
-            {
-                ::vos::OGuard aGuard(Application::GetSolarMutex());
-                m_xInteractionHandler->handle(xParamRequest);
-            }
+            m_xInteractionHandler->handle(xParamRequest);
 
             if (!pParamValues->wasSelected())
                 // canceled
@@ -3711,7 +3969,7 @@ sal_Bool SAL_CALL FmXFormController::approveParameter(const DatabaseParameterEve
             Sequence< PropertyValue > aFinalValues = pParamValues->getValues();
             if (aFinalValues.getLength() != aRequest.Parameters->getCount())
             {
-                DBG_ERROR("FmXFormController::approveParameter: the InteractionHandler returned nonsense!");
+                DBG_ERROR("FormController::approveParameter: the InteractionHandler returned nonsense!");
                 return sal_False;
             }
             const PropertyValue* pFinalValues = aFinalValues.getConstArray();
@@ -3724,19 +3982,19 @@ sal_Bool SAL_CALL FmXFormController::approveParameter(const DatabaseParameterEve
 #ifdef DBG_UTIL
                     ::rtl::OUString sName;
                     xParam->getPropertyValue(FM_PROP_NAME) >>= sName;
-                    DBG_ASSERT(sName.equals(pFinalValues->Name), "FmXFormController::approveParameter: suspicious value names!");
+                    DBG_ASSERT(sName.equals(pFinalValues->Name), "FormController::approveParameter: suspicious value names!");
 #endif
                     try { xParam->setPropertyValue(FM_PROP_VALUE, pFinalValues->Value); }
                     catch(Exception&)
                     {
-                        DBG_ERROR("FmXFormController::approveParameter: setting one of the properties failed!");
+                        DBG_ERROR("FormController::approveParameter: setting one of the properties failed!");
                     }
                 }
             }
         }
         catch(Exception&)
         {
-            DBG_ERROR("FmXFormController::approveParameter: caught an Exception (tried to let the InteractionHandler handle it)!");
+            DBG_UNHANDLED_EXCEPTION();
         }
     }
     return sal_True;
@@ -3744,27 +4002,29 @@ sal_Bool SAL_CALL FmXFormController::approveParameter(const DatabaseParameterEve
 
 // XConfirmDeleteBroadcaster
 //------------------------------------------------------------------------------
-void SAL_CALL FmXFormController::addConfirmDeleteListener(const Reference< XConfirmDeleteListener > & aListener) throw( RuntimeException )
+void SAL_CALL FormController::addConfirmDeleteListener(const Reference< XConfirmDeleteListener > & aListener) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::addConfirmDeleteListener" );
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
+    ::osl::MutexGuard aGuard( m_aMutex );
+    impl_checkDisposed_throw();
+
     m_aDeleteListeners.addInterface(aListener);
 }
 
 //------------------------------------------------------------------------------
-void SAL_CALL FmXFormController::removeConfirmDeleteListener(const Reference< XConfirmDeleteListener > & aListener) throw( RuntimeException )
+void SAL_CALL FormController::removeConfirmDeleteListener(const Reference< XConfirmDeleteListener > & aListener) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::removeConfirmDeleteListener" );
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
+    ::osl::MutexGuard aGuard( m_aMutex );
+    impl_checkDisposed_throw();
+
     m_aDeleteListeners.removeInterface(aListener);
 }
 
 // XConfirmDeleteListener
 //------------------------------------------------------------------------------
-sal_Bool SAL_CALL FmXFormController::confirmDelete(const RowChangeEvent& aEvent) throw( RuntimeException )
+sal_Bool SAL_CALL FormController::confirmDelete(const RowChangeEvent& aEvent) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::confirmDelete" );
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
+    ::osl::MutexGuard aGuard( m_aMutex );
+    impl_checkDisposed_throw();
 
     ::cppu::OInterfaceIteratorHelper aIter(m_aDeleteListeners);
     if (aIter.hasMoreElements())
@@ -3773,32 +4033,62 @@ sal_Bool SAL_CALL FmXFormController::confirmDelete(const RowChangeEvent& aEvent)
         aEvt.Source = *this;
         return ((XConfirmDeleteListener*)aIter.next())->confirmDelete(aEvt);
     }
+    // default handling: instantiate an interaction handler and let it handle the request
+
+    String sTitle;
+    sal_Int32 nLength = aEvent.Rows;
+    if ( nLength > 1 )
+    {
+        sTitle = SVX_RES( RID_STR_DELETECONFIRM_RECORDS );
+        sTitle.SearchAndReplace( '#', String::CreateFromInt32( nLength ) );
+    }
     else
+        sTitle = SVX_RES( RID_STR_DELETECONFIRM_RECORD );
+
+    try
     {
-        // default handling
-        UniString aTitle;
-        sal_Int32 nLength = aEvent.Rows;
-        if (nLength > 1)
-        {
-            aTitle = SVX_RES(RID_STR_DELETECONFIRM_RECORDS);
-            aTitle.SearchAndReplace('#', String::CreateFromInt32(nLength));
-        }
-        else
-            aTitle = SVX_RES(RID_STR_DELETECONFIRM_RECORD);
+        if ( !ensureInteractionHandler() )
+            return sal_False;
+
+        // two continuations allowed: Yes and No
+        OInteractionApprove* pApprove = new OInteractionApprove;
+        OInteractionDisapprove* pDisapprove = new OInteractionDisapprove;
 
-        ConfirmDeleteDialog aDlg(getDialogParentWindow(), aTitle);
-        return RET_YES == aDlg.Execute();
+        // the request
+        SQLWarning aWarning;
+        aWarning.Message = sTitle;
+        SQLWarning aDetails;
+        aDetails.Message = String( SVX_RES( RID_STR_DELETECONFIRM ) );
+        aWarning.NextException <<= aDetails;
+
+        OInteractionRequest* pRequest = new OInteractionRequest( makeAny( aWarning ) );
+        Reference< XInteractionRequest > xRequest( pRequest );
+
+        // some knittings
+        pRequest->addContinuation( pApprove );
+        pRequest->addContinuation( pDisapprove );
+
+        // handle the request
+        m_xInteractionHandler->handle( xRequest );
+
+        if ( pApprove->wasSelected() )
+            return sal_True;
+    }
+    catch( const Exception& )
+    {
+        DBG_UNHANDLED_EXCEPTION();
     }
+
+    return sal_False;
 }
 
 //------------------------------------------------------------------------------
-void FmXFormController::invalidateFeatures( const ::std::vector< sal_Int32 >& _rFeatures )
+void SAL_CALL FormController::invalidateFeatures( const Sequence< ::sal_Int16 >& _Features ) throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::invalidateFeatures" );
     ::osl::MutexGuard aGuard( m_aMutex );
     // for now, just copy the ids of the features, because ....
-    ::std::copy( _rFeatures.begin(), _rFeatures.end(),
-        ::std::insert_iterator< ::std::set< sal_Int32 > >( m_aInvalidFeatures, m_aInvalidFeatures.begin() )
+    ::std::copy( _Features.getConstArray(), _Features.getConstArray() + _Features.getLength(),
+        ::std::insert_iterator< ::std::set< sal_Int16 > >( m_aInvalidFeatures, m_aInvalidFeatures.begin() )
     );
 
     // ... we will do the real invalidation asynchronously
@@ -3807,13 +4097,30 @@ void FmXFormController::invalidateFeatures( const ::std::vector< sal_Int32 >& _r
 }
 
 //------------------------------------------------------------------------------
+void SAL_CALL FormController::invalidateAllFeatures(  ) throw (RuntimeException)
+{
+    ::osl::ClearableMutexGuard aGuard( m_aMutex );
+
+    Sequence< sal_Int16 > aInterceptedFeatures( m_aFeatureDispatchers.size() );
+    ::std::transform(
+        m_aFeatureDispatchers.begin(),
+        m_aFeatureDispatchers.end(),
+        aInterceptedFeatures.getArray(),
+        ::std::select1st< DispatcherContainer::value_type >()
+    );
+
+    aGuard.clear();
+    if ( aInterceptedFeatures.getLength() )
+        invalidateFeatures( aInterceptedFeatures );
+}
+
+//------------------------------------------------------------------------------
 Reference< XDispatch >
-FmXFormController::interceptedQueryDispatch(sal_uInt16 /*_nId*/, const URL& aURL,
+FormController::interceptedQueryDispatch( const URL& aURL,
                                             const ::rtl::OUString& /*aTargetFrameName*/, sal_Int32 /*nSearchFlags*/)
                                             throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::interceptedQueryDispatch" );
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
+    OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
     Reference< XDispatch >  xReturn;
     // dispatches handled by ourself
     if  (   ( aURL.Complete == FMURL_CONFIRM_DELETION )
@@ -3824,22 +4131,23 @@ FmXFormController::interceptedQueryDispatch(sal_uInt16 /*_nId*/, const URL& aURL
         xReturn = static_cast< XDispatch* >( this );
 
     // dispatches of FormSlot-URLs we have to translate
-    if ( !xReturn.is() && m_aControllerFeatures.isAssigned() )
+    if ( !xReturn.is() && m_xFormOperations.is() )
     {
         // find the slot id which corresponds to the URL
-        sal_Int32 nFeatureId = ::svx::FeatureSlotTranslation::getControllerFeatureSlotIdForURL( aURL.Main );
-        if ( nFeatureId > 0 )
+        sal_Int32 nFeatureSlotId = ::svx::FeatureSlotTranslation::getControllerFeatureSlotIdForURL( aURL.Main );
+        sal_Int16 nFormFeature = ( nFeatureSlotId != -1 ) ? ::svx::FeatureSlotTranslation::getFormFeatureForSlotId( nFeatureSlotId ) : -1;
+        if ( nFormFeature > 0 )
         {
             // get the dispatcher for this feature, create if necessary
-            DispatcherContainer::const_iterator aDispatcherPos = m_aFeatureDispatchers.find( nFeatureId );
+            DispatcherContainer::const_iterator aDispatcherPos = m_aFeatureDispatchers.find( nFormFeature );
             if ( aDispatcherPos == m_aFeatureDispatchers.end() )
             {
                 aDispatcherPos = m_aFeatureDispatchers.insert(
-                    DispatcherContainer::value_type( nFeatureId, new ::svx::OSingleFeatureDispatcher( aURL, nFeatureId, *m_aControllerFeatures, m_aMutex ) )
+                    DispatcherContainer::value_type( nFormFeature, new ::svx::OSingleFeatureDispatcher( aURL, nFormFeature, m_xFormOperations, m_aMutex ) )
                 ).first;
             }
 
-            OSL_ENSURE( aDispatcherPos->second.is(), "FmXFormController::interceptedQueryDispatch: should have a dispatcher by now!" );
+            OSL_ENSURE( aDispatcherPos->second.is(), "FormController::interceptedQueryDispatch: should have a dispatcher by now!" );
             return aDispatcherPos->second;
         }
     }
@@ -3849,12 +4157,11 @@ FmXFormController::interceptedQueryDispatch(sal_uInt16 /*_nId*/, const URL& aURL
 }
 
 //------------------------------------------------------------------------------
-void SAL_CALL FmXFormController::dispatch( const URL& _rURL, const Sequence< PropertyValue >& _rArgs ) throw (RuntimeException)
+void SAL_CALL FormController::dispatch( const URL& _rURL, const Sequence< PropertyValue >& _rArgs ) throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::dispatch" );
     if ( _rArgs.getLength() != 1 )
     {
-        DBG_ERROR( "FmXFormController::dispatch: no arguments -> no dispatch!" );
+        DBG_ERROR( "FormController::dispatch: no arguments -> no dispatch!" );
         return;
     }
 
@@ -3869,18 +4176,17 @@ void SAL_CALL FmXFormController::dispatch( const URL& _rURL, const Sequence< Pro
 
     if  ( _rURL.Complete == FMURL_CONFIRM_DELETION )
     {
-        DBG_ERROR( "FmXFormController::dispatch: How do you expect me to return something via this call?" );
+        DBG_ERROR( "FormController::dispatch: How do you expect me to return something via this call?" );
             // confirmDelete has a return value - dispatch hasn't
         return;
     }
 
-    DBG_ERROR( "FmXFormController::dispatch: unknown URL!" );
+    DBG_ERROR( "FormController::dispatch: unknown URL!" );
 }
 
 //------------------------------------------------------------------------------
-void SAL_CALL FmXFormController::addStatusListener( const Reference< XStatusListener >& _rxListener, const URL& _rURL ) throw (RuntimeException)
+void SAL_CALL FormController::addStatusListener( const Reference< XStatusListener >& _rxListener, const URL& _rURL ) throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::addStatusListener" );
     if (_rURL.Complete == FMURL_CONFIRM_DELETION)
     {
         if (_rxListener.is())
@@ -3893,23 +4199,33 @@ void SAL_CALL FmXFormController::addStatusListener( const Reference< XStatusList
         }
     }
     else
-        OSL_ENSURE(sal_False, "FmXFormController::addStatusListener: invalid (unsupported) URL!");
+        OSL_ENSURE(sal_False, "FormController::addStatusListener: invalid (unsupported) URL!");
+}
+
+//------------------------------------------------------------------------------
+Reference< XInterface > SAL_CALL FormController::getParent() throw( RuntimeException )
+{
+    return m_xParent;
+}
+
+//------------------------------------------------------------------------------
+void SAL_CALL FormController::setParent( const Reference< XInterface >& Parent) throw( NoSupportException, RuntimeException )
+{
+    m_xParent = Parent;
 }
 
 //------------------------------------------------------------------------------
-void SAL_CALL FmXFormController::removeStatusListener( const Reference< XStatusListener >& /*_rxListener*/, const URL& _rURL ) throw (RuntimeException)
+void SAL_CALL FormController::removeStatusListener( const Reference< XStatusListener >& /*_rxListener*/, const URL& _rURL ) throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::removeStatusListener" );
     (void)_rURL;
-    OSL_ENSURE(_rURL.Complete == FMURL_CONFIRM_DELETION, "FmXFormController::removeStatusListener: invalid (unsupported) URL!");
+    OSL_ENSURE(_rURL.Complete == FMURL_CONFIRM_DELETION, "FormController::removeStatusListener: invalid (unsupported) URL!");
     // we never really added the listener, so we don't need to remove it
 }
 
 //------------------------------------------------------------------------------
-Reference< XDispatchProviderInterceptor >  FmXFormController::createInterceptor(const Reference< XDispatchProviderInterception > & _xInterception)
+Reference< XDispatchProviderInterceptor >  FormController::createInterceptor(const Reference< XDispatchProviderInterception > & _xInterception)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::createInterceptor" );
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
+    OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
 #ifdef DBG_UTIL
     // check if we already have a interceptor for the given object
     for (   ConstInterceptorsIterator aIter = m_aControlDispatchInterceptors.begin();
@@ -3918,49 +4234,43 @@ Reference< XDispatchProviderInterceptor >  FmXFormController::createInterceptor(
         )
     {
         if ((*aIter)->getIntercepted() == _xInterception)
-            DBG_ERROR("FmXFormController::createInterceptor : we already do intercept this objects dispatches !");
+            DBG_ERROR("FormController::createInterceptor : we already do intercept this objects dispatches !");
     }
 #endif
 
-    ::rtl::OUString sInterceptorScheme(RTL_CONSTASCII_USTRINGPARAM("*"));
-    FmXDispatchInterceptorImpl* pInterceptor = new FmXDispatchInterceptorImpl(_xInterception, this, 0, Sequence< ::rtl::OUString >(&sInterceptorScheme, 1));
+    DispatchInterceptionMultiplexer* pInterceptor = new DispatchInterceptionMultiplexer( _xInterception, this );
     pInterceptor->acquire();
-    m_aControlDispatchInterceptors.insert(m_aControlDispatchInterceptors.end(), pInterceptor);
+    m_aControlDispatchInterceptors.insert( m_aControlDispatchInterceptors.end(), pInterceptor );
 
-    return (XDispatchProviderInterceptor*)pInterceptor;
+    return pInterceptor;
 }
 
 //------------------------------------------------------------------------------
-bool FmXFormController::ensureInteractionHandler()
+bool FormController::ensureInteractionHandler()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::ensureInteractionHandler" );
     if ( m_xInteractionHandler.is() )
         return true;
     if ( m_bAttemptedHandlerCreation )
         return false;
     m_bAttemptedHandlerCreation = true;
-    if ( !m_xORB.is() )
-        return false;
 
-    m_xInteractionHandler.set( m_xORB->createInstance( SRV_SDB_INTERACTION_HANDLER ), UNO_QUERY );
-    OSL_ENSURE( m_xInteractionHandler.is(), "FmXFormController::ensureInteractionHandler: could not create an interaction handler!" );
+    m_xInteractionHandler.set( m_aContext.createComponent( (::rtl::OUString)SRV_SDB_INTERACTION_HANDLER ), UNO_QUERY );
+    OSL_ENSURE( m_xInteractionHandler.is(), "FormController::ensureInteractionHandler: could not create an interaction handler!" );
     return m_xInteractionHandler.is();
 }
 
 //------------------------------------------------------------------------------
-void SAL_CALL FmXFormController::handle( const Reference< XInteractionRequest >& _rRequest ) throw (RuntimeException)
+void SAL_CALL FormController::handle( const Reference< XInteractionRequest >& _rRequest ) throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::handle" );
     if ( !ensureInteractionHandler() )
         return;
     m_xInteractionHandler->handle( _rRequest );
 }
 
 //------------------------------------------------------------------------------
-void FmXFormController::deleteInterceptor(const Reference< XDispatchProviderInterception > & _xInterception)
+void FormController::deleteInterceptor(const Reference< XDispatchProviderInterception > & _xInterception)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::deleteInterceptor" );
-    OSL_ENSURE( !impl_isDisposed_nofail(), "FmXFormController: already disposed!" );
+    OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
     // search the interceptor responsible for the given object
     InterceptorsIterator aIter;
     for (   aIter = m_aControlDispatchInterceptors.begin();
@@ -3977,7 +4287,7 @@ void FmXFormController::deleteInterceptor(const Reference< XDispatchProviderInte
     }
 
     // log off the interception from it's interception object
-    FmXDispatchInterceptorImpl* pInterceptorImpl = *aIter;
+    DispatchInterceptionMultiplexer* pInterceptorImpl = *aIter;
     pInterceptorImpl->dispose();
     pInterceptorImpl->release();
 
@@ -3986,35 +4296,22 @@ void FmXFormController::deleteInterceptor(const Reference< XDispatchProviderInte
 }
 
 //--------------------------------------------------------------------
-void SAL_CALL FmXFormController::initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException)
+void FormController::implInvalidateCurrentControlDependentFeatures()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::initialize" );
-    DBG_ASSERT( !m_xInteractionHandler.is(), "FmXFormController::initialize: already initialized!" );
-        // currently, we only initialize our interaction handler here, so it's sufficient to assert this
+    Sequence< sal_Int16 > aCurrentControlDependentFeatures(4);
 
-    ::comphelper::NamedValueCollection aArgs( aArguments );
-    m_xInteractionHandler = aArgs.getOrDefault( "InteractionHandler", m_xInteractionHandler );
-}
-
-//--------------------------------------------------------------------
-void FmXFormController::implInvalidateCurrentControlDependentFeatures()
-{
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::implInvalidateCurrentControlDependentFeatures" );
-    ::std::vector< sal_Int32 > aCurrentControlDependentFeatures;
-
-    aCurrentControlDependentFeatures.push_back( SID_FM_SORTUP );
-    aCurrentControlDependentFeatures.push_back( SID_FM_SORTDOWN );
-    aCurrentControlDependentFeatures.push_back( SID_FM_AUTOFILTER );
-    aCurrentControlDependentFeatures.push_back( SID_FM_REFRESH_FORM_CONTROL );
+    aCurrentControlDependentFeatures[0] = FormFeature::SortAscending;
+    aCurrentControlDependentFeatures[1] = FormFeature::SortDescending;
+    aCurrentControlDependentFeatures[2] = FormFeature::AutoFilter;
+    aCurrentControlDependentFeatures[3] = FormFeature::RefreshCurrentControl;
 
-    if ( m_pView && m_pView->GetFormShell() && m_pView->GetFormShell()->GetImpl() )
-        m_pView->GetFormShell()->GetImpl()->invalidateFeatures( aCurrentControlDependentFeatures );
     invalidateFeatures( aCurrentControlDependentFeatures );
 }
 
 //--------------------------------------------------------------------
-void SAL_CALL FmXFormController::columnChanged( const EventObject& /*_event*/ ) throw (RuntimeException)
+void SAL_CALL FormController::columnChanged( const EventObject& /*_event*/ ) throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormController::columnChanged" );
     implInvalidateCurrentControlDependentFeatures();
 }
+
+}   // namespace svxform
diff --git a/svx/source/form/formcontrolling.cxx b/svx/source/form/formcontrolling.cxx
index 63c42d4e9d..76dbe7771b 100644
--- a/svx/source/form/formcontrolling.cxx
+++ b/svx/source/form/formcontrolling.cxx
@@ -33,7 +33,7 @@
 
 #include "formcontrolling.hxx"
 #include "fmurl.hxx"
-#include <svx/svxids.hrc>
+#include "svx/svxids.hrc"
 #include "fmprop.hrc"
 #include "svx/fmtools.hxx"
 
@@ -60,7 +60,7 @@ namespace svx
     /** === begin UNO using === **/
     using ::com::sun::star::uno::Reference;
     using ::com::sun::star::lang::XMultiServiceFactory;
-    using ::com::sun::star::form::XFormController;
+    using ::com::sun::star::form::runtime::XFormController;
     using ::com::sun::star::form::XForm;
     using ::com::sun::star::form::runtime::FormOperations;
     using ::com::sun::star::uno::Exception;
diff --git a/svx/source/form/formdispatchinterceptor.cxx b/svx/source/form/formdispatchinterceptor.cxx
new file mode 100644
index 0000000000..4f7a0d9a8d
--- /dev/null
+++ b/svx/source/form/formdispatchinterceptor.cxx
@@ -0,0 +1,213 @@
+/*************************************************************************
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+* 
+* Copyright 2009 by Sun Microsystems, Inc.
+*
+* 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 "formdispatchinterceptor.hxx"
+
+/** === begin UNO includes === **/
+/** === end UNO includes === **/
+
+#include <tools/debug.hxx>
+
+//........................................................................
+namespace svxform
+{
+//........................................................................
+
+    /** === begin UNO using === **/
+    using ::com::sun::star::uno::Reference;
+    using ::com::sun::star::uno::XInterface;
+    using ::com::sun::star::uno::UNO_QUERY;
+    using ::com::sun::star::uno::UNO_QUERY_THROW;
+    using ::com::sun::star::uno::UNO_SET_THROW;
+    using ::com::sun::star::uno::Exception;
+    using ::com::sun::star::uno::RuntimeException;
+    using ::com::sun::star::uno::Any;
+    using ::com::sun::star::uno::makeAny;
+    using ::com::sun::star::uno::Sequence;
+    using ::com::sun::star::uno::Type;
+    using ::com::sun::star::frame::XDispatchProviderInterception;
+    using ::com::sun::star::frame::XDispatchProviderInterceptor;
+    using ::com::sun::star::lang::XComponent;
+    using ::com::sun::star::util::URL;
+    using ::com::sun::star::frame::XDispatch;
+    using ::com::sun::star::frame::DispatchDescriptor;
+    using ::com::sun::star::frame::XDispatchProvider;
+    using ::com::sun::star::lang::EventObject;
+    /** === end UNO using === **/
+
+    //========================================================================
+    //= DispatchInterceptionMultiplexer
+    //========================================================================
+
+    DBG_NAME(DispatchInterceptionMultiplexer)
+    //------------------------------------------------------------------------
+    DispatchInterceptionMultiplexer::DispatchInterceptionMultiplexer(
+                const Reference< XDispatchProviderInterception >& _rxToIntercept, DispatchInterceptor* _pMaster )
+        :DispatchInterceptionMultiplexer_BASE(_pMaster && _pMaster->getInterceptorMutex() ? *_pMaster->getInterceptorMutex() : m_aFallback)
+        ,m_aFallback()
+        ,m_pMutex( _pMaster && _pMaster->getInterceptorMutex() ? _pMaster->getInterceptorMutex() : &m_aFallback )
+        ,m_xIntercepted(_rxToIntercept)
+        ,m_bListening(sal_False)
+        ,m_pMaster(_pMaster)
+    {
+        DBG_CTOR(DispatchInterceptionMultiplexer,NULL);
+
+        ::osl::MutexGuard aGuard( *m_pMutex );
+        ::comphelper::increment(m_refCount);
+        if (_rxToIntercept.is())
+        {
+            _rxToIntercept->registerDispatchProviderInterceptor((XDispatchProviderInterceptor*)this);
+            // this should make us the top-level dispatch-provider for the component, via a call to our
+            // setDispatchProvider we should have got an fallback for requests we (i.e. our master) cannot fullfill
+            Reference< XComponent> xInterceptedComponent(_rxToIntercept, UNO_QUERY);
+            if (xInterceptedComponent.is())
+            {
+                xInterceptedComponent->addEventListener(this);
+                m_bListening = sal_True;
+            }
+        }
+        ::comphelper::decrement(m_refCount);
+    }
+
+    //------------------------------------------------------------------------
+    DispatchInterceptionMultiplexer::~DispatchInterceptionMultiplexer()
+    {
+        if (!rBHelper.bDisposed)
+            dispose();
+
+        DBG_DTOR(DispatchInterceptionMultiplexer,NULL);
+    }
+
+    //------------------------------------------------------------------------------
+    Reference< XDispatch > SAL_CALL DispatchInterceptionMultiplexer::queryDispatch( const URL& aURL, const ::rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw(RuntimeException)
+    {
+        ::osl::MutexGuard aGuard( *m_pMutex );
+        Reference< XDispatch> xResult;
+        // ask our 'real' interceptor
+        if (m_pMaster)
+            xResult = m_pMaster->interceptedQueryDispatch( aURL, aTargetFrameName, nSearchFlags);
+
+        // ask our slave provider
+        if (!xResult.is() && m_xSlaveDispatcher.is())
+            xResult = m_xSlaveDispatcher->queryDispatch(aURL, aTargetFrameName, nSearchFlags);
+
+        return xResult;
+    }
+
+    //------------------------------------------------------------------------------
+    Sequence< Reference< XDispatch > > SAL_CALL
+    DispatchInterceptionMultiplexer::queryDispatches( const Sequence< DispatchDescriptor >& aDescripts ) throw(RuntimeException)
+    {
+        ::osl::MutexGuard aGuard( *m_pMutex );
+        Sequence< Reference< XDispatch> > aReturn(aDescripts.getLength());
+        Reference< XDispatch>* pReturn = aReturn.getArray();
+        const DispatchDescriptor* pDescripts = aDescripts.getConstArray();
+        for (sal_Int16 i=0; i<aDescripts.getLength(); ++i, ++pReturn, ++pDescripts)
+        {
+            *pReturn = queryDispatch(pDescripts->FeatureURL, pDescripts->FrameName, pDescripts->SearchFlags);
+        }
+        return aReturn;
+    }
+
+    //------------------------------------------------------------------------------
+    Reference< XDispatchProvider > SAL_CALL DispatchInterceptionMultiplexer::getSlaveDispatchProvider(	) throw(RuntimeException)
+    {
+        ::osl::MutexGuard aGuard( *m_pMutex );
+        return m_xSlaveDispatcher;
+    }
+
+    //------------------------------------------------------------------------------
+    void SAL_CALL DispatchInterceptionMultiplexer::setSlaveDispatchProvider(const Reference< XDispatchProvider>& xNewDispatchProvider) throw( RuntimeException )
+    {
+        ::osl::MutexGuard aGuard( *m_pMutex );
+        m_xSlaveDispatcher = xNewDispatchProvider;
+    }
+
+    //------------------------------------------------------------------------------
+    Reference< XDispatchProvider> SAL_CALL DispatchInterceptionMultiplexer::getMasterDispatchProvider(void) throw( RuntimeException )
+    {
+        ::osl::MutexGuard aGuard( *m_pMutex );
+        return m_xMasterDispatcher;
+    }
+
+    //------------------------------------------------------------------------------
+    void SAL_CALL DispatchInterceptionMultiplexer::setMasterDispatchProvider(const Reference< XDispatchProvider>& xNewSupplier) throw( RuntimeException )
+    {
+        ::osl::MutexGuard aGuard( *m_pMutex );
+        m_xMasterDispatcher = xNewSupplier;
+    }
+
+    //------------------------------------------------------------------------------
+    void SAL_CALL DispatchInterceptionMultiplexer::disposing(const EventObject& Source) throw( RuntimeException )
+    {
+        if (m_bListening)
+        {
+            Reference< XDispatchProviderInterception > xIntercepted(m_xIntercepted.get(), UNO_QUERY);
+            if (Source.Source == xIntercepted)
+                ImplDetach();
+        }
+    }
+
+    //------------------------------------------------------------------------------
+    void DispatchInterceptionMultiplexer::ImplDetach()
+    {
+        ::osl::MutexGuard aGuard( *m_pMutex );
+        OSL_ENSURE(m_bListening, "DispatchInterceptionMultiplexer::ImplDetach: invalid call!");
+
+        // deregister ourself from the interception component
+        Reference< XDispatchProviderInterception > xIntercepted(m_xIntercepted.get(), UNO_QUERY);
+        if (xIntercepted.is())
+            xIntercepted->releaseDispatchProviderInterceptor(static_cast<XDispatchProviderInterceptor*>(this));
+
+    //	m_xIntercepted = Reference< XDispatchProviderInterception >();
+            // Don't reset m_xIntercepted: It may be needed by our owner to check for which object we were
+            // responsible. As we hold the object with a weak reference only, this should be no problem.
+            // 88936 - 23.07.2001 - frank.schoenheit@sun.com
+        m_pMaster = NULL;
+        m_pMutex = &m_aFallback;
+        m_bListening = sal_False;
+    }
+
+    //------------------------------------------------------------------------------
+    void DispatchInterceptionMultiplexer::disposing()
+    {
+        // remove ourself as event listener from the interception component
+        if (m_bListening)
+        {
+            Reference< XComponent> xInterceptedComponent(m_xIntercepted.get(), UNO_QUERY);
+            if (xInterceptedComponent.is())
+                xInterceptedComponent->removeEventListener(static_cast<XEventListener*>(this));
+
+            // detach from the interception component
+            ImplDetach();
+        }
+    }
+
+//........................................................................
+} // namespace svxform
+//........................................................................
diff --git a/svx/source/form/fmdispatch.cxx b/svx/source/form/formfeaturedispatcher.cxx
index 5037be5d87..993c27bc5d 100644
--- a/svx/source/form/fmdispatch.cxx
+++ b/svx/source/form/formfeaturedispatcher.cxx
@@ -6,9 +6,6 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmdispatch.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -30,8 +27,11 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include "fmdispatch.hxx"
-#include "formcontrolling.hxx"
+
+#include "formfeaturedispatcher.hxx"
+
+#include <comphelper/namedvaluecollection.hxx>
+#include <tools/diagnose_ex.h>
 
 //........................................................................
 namespace svx
@@ -49,13 +49,13 @@ namespace svx
     //= OSingleFeatureDispatcher
     //====================================================================
     //--------------------------------------------------------------------
-    OSingleFeatureDispatcher::OSingleFeatureDispatcher( const URL& _rFeatureURL, sal_Int32 _nFeatureId,
-            const FormControllerHelper& _rController, ::osl::Mutex& _rMutex )
+    OSingleFeatureDispatcher::OSingleFeatureDispatcher( const URL& _rFeatureURL, const sal_Int16 _nFormFeature,
+            const Reference< XFormOperations >& _rxFormOperations, ::osl::Mutex& _rMutex )
         :m_rMutex( _rMutex )
         ,m_aStatusListeners( _rMutex )
-        ,m_rController( _rController )
+        ,m_xFormOperations( _rxFormOperations )
         ,m_aFeatureURL( _rFeatureURL )
-        ,m_nFeatureId( _nFeatureId )
+        ,m_nFormFeature( _nFormFeature )
         ,m_bLastKnownEnabled( sal_False )
         ,m_bDisposed( sal_False )
     {
@@ -82,10 +82,9 @@ namespace svx
     //--------------------------------------------------------------------
     void OSingleFeatureDispatcher::getUnoState( FeatureStateEvent& /* [out] */ _rState ) const
     {
-        FeatureState aState;
         _rState.Source = *const_cast< OSingleFeatureDispatcher* >( this );
 
-        m_rController.getState( m_nFeatureId, aState );
+        FeatureState aState( m_xFormOperations->getState( m_nFormFeature ) );
 
         _rState.FeatureURL = m_aFeatureURL;
         _rState.IsEnabled = aState.Enabled;
@@ -161,21 +160,34 @@ namespace svx
         OSL_ENSURE( _rURL.Complete == m_aFeatureURL.Complete, "OSingleFeatureDispatcher::dispatch: not responsible for this URL!" );
         (void)_rURL;
 
-        if ( m_rController.isEnabled( m_nFeatureId ) )
-        {
-            // release our mutex before executing the slot?
-            sal_Int32 nFeatureId( m_nFeatureId );
-            aGuard.clear();
+        if ( !m_xFormOperations->isEnabled( m_nFormFeature ) )
+            return;
 
+        // release our mutex before executing the command
+        sal_Int16 nFormFeature( m_nFormFeature );
+        Reference< XFormOperations > xFormOperations( m_xFormOperations );
+        aGuard.clear();
+
+        try
+        {
             if ( !_rArguments.getLength() )
             {
-                m_rController.execute( nFeatureId );
+                xFormOperations->execute( nFormFeature );
             }
             else
             {   // at the moment we only support one parameter
-                m_rController.execute( nFeatureId, _rArguments[0].Name, _rArguments[0].Value );
+                ::comphelper::NamedValueCollection aArgs( _rArguments );
+                xFormOperations->executeWithArguments( nFormFeature, aArgs.getNamedValues() );
             }
         }
+        catch( const RuntimeException& )
+        {
+            throw;
+        }
+        catch( const Exception& )
+        {
+            DBG_UNHANDLED_EXCEPTION();
+        }
     }
 
     //--------------------------------------------------------------------
diff --git a/svx/source/form/legacyformcontroller.cxx b/svx/source/form/legacyformcontroller.cxx
new file mode 100644
index 0000000000..ec65a2bfd9
--- /dev/null
+++ b/svx/source/form/legacyformcontroller.cxx
@@ -0,0 +1,225 @@
+/*************************************************************************
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+* 
+* Copyright 2009 by Sun Microsystems, Inc.
+*
+* 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 "fmservs.hxx"
+
+/** === begin UNO includes === **/
+#include <com/sun/star/form/XFormController.hpp>
+#include <com/sun/star/form/runtime/XFormController.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+/** === end UNO includes === **/
+
+#include <cppuhelper/implbase2.hxx>
+
+//........................................................................
+namespace svxform
+{
+//........................................................................
+
+    /** === begin UNO using === **/
+    using ::com::sun::star::uno::Reference;
+    using ::com::sun::star::uno::XInterface;
+    using ::com::sun::star::uno::UNO_QUERY;
+    using ::com::sun::star::uno::UNO_QUERY_THROW;
+    using ::com::sun::star::uno::UNO_SET_THROW;
+    using ::com::sun::star::uno::Exception;
+    using ::com::sun::star::uno::RuntimeException;
+    using ::com::sun::star::uno::Any;
+    using ::com::sun::star::uno::makeAny;
+    using ::com::sun::star::uno::Sequence;
+    using ::com::sun::star::uno::Type;
+    using ::com::sun::star::lang::XMultiServiceFactory;
+    using ::com::sun::star::awt::XControl;
+    using ::com::sun::star::awt::XTabControllerModel;
+    using ::com::sun::star::awt::XControlContainer;
+    using ::com::sun::star::lang::XServiceInfo;
+    /** === end UNO using === **/
+
+    using namespace ::com::sun::star;
+
+    //====================================================================
+    //= LegacyFormController
+    //====================================================================
+    typedef ::cppu::WeakImplHelper2 <   form::XFormController
+                                    ,   XServiceInfo
+                                    >   LegacyFormController_Base;
+    /** is an implementation of the legacy form controller service, namely css.form.FormController, supporting the
+        css.form.XFormController interface.
+
+        This legacy API is superseded by css.form.runtime.(X)FormController, and though we migrated all OOo-internal
+        usage of this old API, their might be clients external to OOo still using it (though this is rather unlikely).
+    */
+    class LegacyFormController : public LegacyFormController_Base
+    {
+    public:
+        static Reference< XInterface > Create( const Reference< XMultiServiceFactory >& _rxFactory )
+        {
+            return *( new LegacyFormController( _rxFactory ) );
+        }
+
+    protected:
+        LegacyFormController( const Reference< XMultiServiceFactory >& _rxFactory )
+            :m_xDelegator( _rxFactory->createInstance( FM_FORM_CONTROLLER ), UNO_QUERY_THROW )
+        {
+        }
+
+        // form::XFormController
+        virtual Reference< XControl > SAL_CALL getCurrentControl(  ) throw (RuntimeException);
+        virtual void SAL_CALL addActivateListener( const Reference< form::XFormControllerListener >& l ) throw (RuntimeException);
+        virtual void SAL_CALL removeActivateListener( const Reference< form::XFormControllerListener >& l ) throw (RuntimeException);
+
+        // awt::XTabController
+        virtual void SAL_CALL setModel( const Reference< XTabControllerModel >& Model ) throw (RuntimeException);
+        virtual Reference< XTabControllerModel > SAL_CALL getModel(  ) throw (RuntimeException);
+        virtual void SAL_CALL setContainer( const Reference< XControlContainer >& Container ) throw (RuntimeException);
+        virtual Reference< XControlContainer > SAL_CALL getContainer(  ) throw (RuntimeException);
+        virtual Sequence< Reference< XControl > > SAL_CALL getControls(  ) throw (RuntimeException);
+        virtual void SAL_CALL autoTabOrder(  ) throw (RuntimeException);
+        virtual void SAL_CALL activateTabOrder(  ) throw (RuntimeException);
+        virtual void SAL_CALL activateFirst(  ) throw (RuntimeException);
+        virtual void SAL_CALL activateLast(  ) throw (RuntimeException);
+
+        // XServiceInfo
+        virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw (RuntimeException);
+        virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (RuntimeException);
+        virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw (RuntimeException);
+
+    private:
+        const Reference< form::runtime::XFormController >   m_xDelegator;
+    };
+
+    //--------------------------------------------------------------------
+    Reference< XControl > SAL_CALL LegacyFormController::getCurrentControl(  ) throw (RuntimeException)
+    {
+        return m_xDelegator->getCurrentControl();
+    }
+    
+    //--------------------------------------------------------------------
+    void SAL_CALL LegacyFormController::addActivateListener( const Reference< form::XFormControllerListener >& _listener ) throw (RuntimeException)
+    {
+        m_xDelegator->addActivateListener( _listener );
+    }
+    
+    //--------------------------------------------------------------------
+    void SAL_CALL LegacyFormController::removeActivateListener( const Reference< form::XFormControllerListener >& _listener ) throw (RuntimeException)
+    {
+        m_xDelegator->removeActivateListener( _listener );
+    }
+    
+    //--------------------------------------------------------------------
+    void SAL_CALL LegacyFormController::setModel( const Reference< XTabControllerModel >& _model ) throw (RuntimeException)
+    {
+        m_xDelegator->setModel( _model );
+    }
+    
+    //--------------------------------------------------------------------
+    Reference< XTabControllerModel > SAL_CALL LegacyFormController::getModel(  ) throw (RuntimeException)
+    {
+        return m_xDelegator->getModel();
+    }
+    
+    //--------------------------------------------------------------------
+    void SAL_CALL LegacyFormController::setContainer( const Reference< XControlContainer >& _container ) throw (RuntimeException)
+    {
+        m_xDelegator->setContainer( _container );
+    }
+    
+    //--------------------------------------------------------------------
+    Reference< XControlContainer > SAL_CALL LegacyFormController::getContainer(  ) throw (RuntimeException)
+    {
+        return m_xDelegator->getContainer();
+    }
+    
+    //--------------------------------------------------------------------
+    Sequence< Reference< XControl > > SAL_CALL LegacyFormController::getControls(  ) throw (RuntimeException)
+    {
+        return m_xDelegator->getControls();
+    }
+    
+    //--------------------------------------------------------------------
+    void SAL_CALL LegacyFormController::autoTabOrder(  ) throw (RuntimeException)
+    {
+        m_xDelegator->autoTabOrder();
+    }
+    
+    //--------------------------------------------------------------------
+    void SAL_CALL LegacyFormController::activateTabOrder(  ) throw (RuntimeException)
+    {
+        m_xDelegator->activateTabOrder();
+    }
+    
+    //--------------------------------------------------------------------
+    void SAL_CALL LegacyFormController::activateFirst(  ) throw (RuntimeException)
+    {
+        m_xDelegator->activateFirst();
+    }
+    
+    //--------------------------------------------------------------------
+    void SAL_CALL LegacyFormController::activateLast(  ) throw (RuntimeException)
+    {
+        m_xDelegator->activateLast();
+    }
+
+    //--------------------------------------------------------------------
+    ::rtl::OUString SAL_CALL LegacyFormController::getImplementationName(  ) throw (RuntimeException)
+    {
+        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.comp.svx.LegacyFormController" ) );
+    }
+    
+    //--------------------------------------------------------------------
+    ::sal_Bool SAL_CALL LegacyFormController::supportsService( const ::rtl::OUString& _serviceName ) throw (RuntimeException)
+    {
+        Sequence< ::rtl::OUString > aServices( getSupportedServiceNames() );
+        const ::rtl::OUString* pServices = aServices.getConstArray();
+        for ( sal_Int32 i = 0; i < aServices.getLength(); ++i, ++pServices )
+            if( pServices->equals( _serviceName ) )
+                return sal_True;
+        return sal_False;
+    }
+    
+    //--------------------------------------------------------------------
+    Sequence< ::rtl::OUString > SAL_CALL LegacyFormController::getSupportedServiceNames(  ) throw (RuntimeException)
+    {
+        Sequence< ::rtl::OUString > aServices(2);
+        aServices.getArray()[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.FormController" ) );
+        aServices.getArray()[1] = ::rtl::OUString::createFromAscii("com.sun.star.awt.control.TabController");
+        return aServices;
+    }
+
+//........................................................................
+} // namespace svxform
+//........................................................................
+
+//------------------------------------------------------------------
+::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL
+    LegacyFormController_NewInstance_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & _rxORB )
+{
+    return ::svxform::LegacyFormController::Create( _rxORB );
+}
+
diff --git a/svx/source/form/makefile.mk b/svx/source/form/makefile.mk
index e5d8e15903..1ea5a3f71e 100644
--- a/svx/source/form/makefile.mk
+++ b/svx/source/form/makefile.mk
@@ -63,7 +63,6 @@ LIB1OBJFILES= \
     $(SLO)$/fmtextcontrolshell.obj \
     $(SLO)$/ParseContext.obj			\
     $(SLO)$/typeconversionclient.obj    \
-    $(SLO)$/confirmdelete.obj      \
     $(SLO)$/dbtoolsclient.obj      \
     $(SLO)$/sqlparserclient.obj      \
     $(SLO)$/dataaccessdescriptor.obj      \
@@ -73,7 +72,7 @@ LIB1OBJFILES= \
     $(SLO)$/navigatortree.obj      \
     $(SLO)$/navigatortreemodel.obj      \
     $(SLO)$/fmexpl.obj      \
-    $(SLO)$/fmctrler.obj    \
+    $(SLO)$/formcontroller.obj    \
     $(SLO)$/fmpgeimp.obj	\
     $(SLO)$/fmvwimp.obj     \
     $(SLO)$/fmdpage.obj		\
@@ -89,14 +88,16 @@ LIB1OBJFILES= \
     $(SLO)$/fmview.obj		\
     $(SLO)$/sdbdatacolumn.obj \
     $(SLO)$/formcontrolling.obj \
-    $(SLO)$/fmdispatch.obj  \
+    $(SLO)$/formfeaturedispatcher.obj  \
+    $(SLO)$/formdispatchinterceptor.obj  \
     $(SLO)$/datanavi.obj \
     $(SLO)$/xfm_addcondition.obj \
     $(SLO)$/datalistener.obj \
     $(SLO)$/fmscriptingenv.obj \
     $(SLO)$/stringlistresource.obj \
     $(SLO)$/delayedevent.obj \
-    $(SLO)$/formcontrolfactory.obj
+    $(SLO)$/formcontrolfactory.obj \
+    $(SLO)$/legacyformcontroller.obj
 
 LIB2TARGET= $(SLB)$/$(TARGET).lib
 LIB2OBJFILES= \
diff --git a/svx/source/inc/confirmdelete.hxx b/svx/source/inc/confirmdelete.hxx
deleted file mode 100644
index c20a2907f3..0000000000
--- a/svx/source/inc/confirmdelete.hxx
+++ /dev/null
@@ -1,62 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: confirmdelete.hxx,v $
- * $Revision: 1.4 $
- *
- * 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_FORM_CONFIRMDELETE_HXX
-#define SVX_FORM_CONFIRMDELETE_HXX
-
-#include <vcl/btndlg.hxx>
-#include <vcl/fixed.hxx>
-
-//........................................................................
-namespace svxform
-{
-//........................................................................
-
-    //====================================================================
-    //= class ConfirmDeleteDialog
-    //====================================================================
-    class ConfirmDeleteDialog : public ButtonDialog
-    {
-        FixedImage	m_aInfoImage;
-        FixedText	m_aTitle;
-        FixedText	m_aMessage;
-
-    public:
-        ConfirmDeleteDialog(Window* pParent, const String& _rTitle);
-        ~ConfirmDeleteDialog();
-    };
-
-//........................................................................
-}	// namespace svxform
-//........................................................................
-
-#endif // SVX_FORM_CONFIRMDELETE_HXX
-
-
diff --git a/svx/source/inc/delayedevent.hxx b/svx/source/inc/delayedevent.hxx
index be0e5ad4b0..8ca5d85da9 100644
--- a/svx/source/inc/delayedevent.hxx
+++ b/svx/source/inc/delayedevent.hxx
@@ -5,10 +5,6 @@
 *
 * OpenOffice.org - a multi-platform office productivity suite
 *
-* $RCSfile: delayedevent.hxx,v $
-*
-* $Revision: 1.1.2.1 $
-*
 * This file is part of OpenOffice.org.
 *
 * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx
index 4ace0ac295..4501a75e63 100644
--- a/svx/source/inc/filtnav.hxx
+++ b/svx/source/inc/filtnav.hxx
@@ -30,10 +30,12 @@
 #ifndef _SVX_FILTNAV_HXX
 #define _SVX_FILTNAV_HXX
 
-#include <com/sun/star/awt/XTextComponent.hpp>
 #include <com/sun/star/form/XForm.hpp>
+#include <com/sun/star/form/runtime/XFormController.hpp>
+#include <com/sun/star/form/runtime/XFilterController.hpp>
 #include <svl/lstner.hxx>
 #include <svl/brdcst.hxx>
+
 #include <vcl/window.hxx>
 #include <sfx2/childwin.hxx>
 #include <svl/poolitem.hxx>
@@ -93,8 +95,7 @@ public:
 class FmParentData : public FmFilterData
 {
 protected:
-    ::std::vector<FmFilterData*> m_aChilds;
-    
+    ::std::vector< FmFilterData* >  m_aChildren;
 
 public:
     TYPEINFO();
@@ -103,28 +104,34 @@ public:
     {}
     virtual ~FmParentData();
 
-    ::std::vector<FmFilterData*>& GetChilds() {return m_aChilds;}
+    ::std::vector< FmFilterData* >& GetChildren() { return m_aChildren; }
 };
 
 //========================================================================
 // Item representing the forms and subforms
 class FmFormItem : public FmParentData
 {
-    ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormController > 	m_xController;
-    sal_Int32			m_nCurrent;
+    ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController >    m_xController;
+    ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFilterController >  m_xFilterController;
 
 public:
     TYPEINFO();
-    FmFormItem(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory):FmParentData(_rxFactory,NULL, ::rtl::OUString()){}
-    FmFormItem(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory,FmParentData* _pParent,
-                 const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormController > & _xController,
-                 const ::rtl::OUString& _rText):FmParentData(_rxFactory,_pParent, _rText)
-                                     ,m_xController(_xController)
-                                     ,m_nCurrent(0){}
-
-    const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormController > & GetController(){return m_xController;}
-    void SetCurrentPosition(sal_Int32 nCurrent){m_nCurrent = nCurrent;}
-    sal_Int32 GetCurrentPosition() const {return m_nCurrent;}
+
+    FmFormItem(  const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory,FmParentData* _pParent,
+                 const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > & _xController,
+                 const ::rtl::OUString& _rText)
+        :FmParentData( _rxFactory, _pParent, _rText )
+        ,m_xController( _xController )
+        ,m_xFilterController( _xController, ::com::sun::star::uno::UNO_QUERY_THROW )
+    {
+    }
+
+    inline const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController >&
+        GetController() { return m_xController; }
+
+    inline const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFilterController >&
+        GetFilterController() { return m_xFilterController; }
+
     virtual Image GetImage( BmpColorMode _eMode = BMP_COLOR_NORMAL ) const;
 };
 
@@ -136,26 +143,28 @@ public:
     FmFilterItems(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory):FmParentData(_rxFactory,NULL, ::rtl::OUString()){}
     FmFilterItems(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory,FmFormItem* pParent, const ::rtl::OUString& rText ):FmParentData(_rxFactory,pParent, rText){}
 
-    FmFilterItem* Find(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent > & xText) const;	
+    FmFilterItem* Find( const ::sal_Int32 _nFilterComponentIndex ) const;	
     virtual Image GetImage( BmpColorMode _eMode = BMP_COLOR_NORMAL ) const;
 };
 
 //========================================================================
 class FmFilterItem : public FmFilterData
 {
-    ::rtl::OUString	m_aFieldName;
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent > m_xText;
+    ::rtl::OUString     m_aFieldName;
+    const sal_Int32     m_nComponentIndex;
 
 public:
     TYPEINFO();
-    FmFilterItem(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory,
-                FmFilterItems* pParent,
-              const ::rtl::OUString& aFieldName,
-              const ::rtl::OUString& aCondition,
-              const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent > & xText);
+    FmFilterItem(
+        const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory,
+        FmFilterItems* pParent,
+        const ::rtl::OUString& aFieldName,
+        const ::rtl::OUString& aCondition,
+        const sal_Int32 _nComponentIndex
+    );
 
     const ::rtl::OUString& GetFieldName() const {return m_aFieldName;}
-    const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent > & GetTextComponent() const {return m_xText;}
+    sal_Int32 GetComponentIndex() const { return m_nComponentIndex; }
 
     virtual Image GetImage( BmpColorMode _eMode = BMP_COLOR_NORMAL ) const;
 };
@@ -167,9 +176,9 @@ class FmFilterModel : public FmParentData
 {
     friend class FmFilterAdapter;	
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > 		m_xControllers;
-    ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormController > 		m_xController;
-    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >	m_xORB;
+    ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >           m_xControllers;
+    ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController >    m_xController;
+    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >        m_xORB;
     FmFilterAdapter*		m_pAdapter;
     FmFilterItems*			m_pCurrentItems;
 
@@ -178,7 +187,7 @@ public:
     FmFilterModel(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory);
     virtual ~FmFilterModel();
 
-    void Update(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > & xControllers, const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormController > & xCurrent);
+    void Update(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > & xControllers, const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > & xCurrent);
     void Clear();
     sal_Bool ValidateText(FmFilterItem* pItem, UniString& rText, UniString& rErrorMsg) const;
     void Append(FmFilterItems* pItems, FmFilterItem* pFilterItem);
@@ -190,17 +199,17 @@ public:
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getORB() const { return m_xORB; }
 
     const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > & GetControllers() const {return m_xControllers;}
-    const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormController > & GetCurrentController() const {return m_xController;}
-    void SetCurrentController(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormController > & xController);
+    const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > & GetCurrentController() const {return m_xController;}
+    void SetCurrentController(const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > & xController);
 
     void Remove(FmFilterData* pFilterItem);
-    void AppendFilterItems(FmFormItem* pItem);
-    void CheckIntegrity(FmParentData* pItem);
+    void AppendFilterItems( FmFormItem& _rItem );
+    void EnsureEmptyFilterRows( FmParentData& _rItem );
 
 protected:
     void Insert(const ::std::vector<FmFilterData*>::iterator& rPos, FmFilterData* pFilterItem);
-    void Remove(const ::std::vector<FmFilterData*>::iterator& rPos, FmFilterData* pFilterItem);
-    FmFormItem* Find(const ::std::vector<FmFilterData*>& rItems, const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormController > & xController) const;
+    void Remove( const ::std::vector<FmFilterData*>::iterator& rPos );
+    FmFormItem* Find(const ::std::vector<FmFilterData*>& rItems, const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > & xController) const;
     FmFormItem* Find(const ::std::vector<FmFilterData*>& rItems, const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& xForm) const;
     void Update(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > & xControllers, FmParentData* pParent);
 };
@@ -267,7 +276,10 @@ public:
     FmFilterNavigator( Window* pParent );
     virtual ~FmFilterNavigator();
 
-    void UpdateContent(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > & xControllers, const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormController > & xCurrent);
+    void UpdateContent(
+            const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > & xControllers,
+            const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > & xCurrent
+        );
     const FmFilterModel* GetFilterModel() const {return m_pModel;}
 
 protected:
diff --git a/svx/source/inc/fmPropBrw.hxx b/svx/source/inc/fmPropBrw.hxx
index 6208cecd1d..c18885b093 100644
--- a/svx/source/inc/fmPropBrw.hxx
+++ b/svx/source/inc/fmPropBrw.hxx
@@ -37,6 +37,7 @@
 #include <com/sun/star/inspection/XObjectInspectorModel.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 /** === end UNO includes === **/
+
 #include <sfx2/basedlgs.hxx>
 #include <sfx2/ctrlitem.hxx>
 #include <sfx2/childwin.hxx>
diff --git a/svx/source/inc/fmcontrolbordermanager.hxx b/svx/source/inc/fmcontrolbordermanager.hxx
index 51c426b487..7447041c57 100644
--- a/svx/source/inc/fmcontrolbordermanager.hxx
+++ b/svx/source/inc/fmcontrolbordermanager.hxx
@@ -6,9 +6,6 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmcontrolbordermanager.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -132,7 +129,7 @@ namespace svxform
     //====================================================================
     /** manages the dynamic border color for form controls
 
-        Used by the <type>FmXFormController</type>, this class manages the dynamic changes in the
+        Used by the <type>FormController</type>, this class manages the dynamic changes in the
         border color of form controls. For this a set of events have to be forwarded to the manager
         instance, which then will switch the border color depending on the mouse and focus status
         of the controls.
diff --git a/svx/source/inc/fmcontrollayout.hxx b/svx/source/inc/fmcontrollayout.hxx
index d7bdf85c4e..fe4bd3cc8c 100644
--- a/svx/source/inc/fmcontrollayout.hxx
+++ b/svx/source/inc/fmcontrollayout.hxx
@@ -6,9 +6,6 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmcontrollayout.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/inc/fmctrler.hxx b/svx/source/inc/fmctrler.hxx
deleted file mode 100644
index 2c266ff2d0..0000000000
--- a/svx/source/inc/fmctrler.hxx
+++ /dev/null
@@ -1,617 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: fmctrler.hxx,v $
- * $Revision: 1.24 $
- *
- * 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_FMCTRLER_HXX
-#define _SVX_FMCTRLER_HXX
-
-#include "svx/fmtools.hxx"
-#include "formcontrolling.hxx"
-#include "sqlparserclient.hxx"
-#include "delayedevent.hxx"
-
-/** === begin UNO includes === **/
-#include <com/sun/star/awt/XControl.hpp>
-#include <com/sun/star/awt/XControlContainer.hpp>
-#include <com/sun/star/awt/XControlModel.hpp>
-#include <com/sun/star/awt/XFocusListener.hpp>
-#include <com/sun/star/awt/XItemListener.hpp>
-#include <com/sun/star/awt/XMouseListener.hpp>
-#include <com/sun/star/awt/XTabController.hpp>
-#include <com/sun/star/awt/XTabControllerModel.hpp>
-#include <com/sun/star/awt/XTextComponent.hpp>
-#include <com/sun/star/awt/XTextListener.hpp>
-#include <com/sun/star/beans/PropertyChangeEvent.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/beans/XPropertyChangeListener.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/beans/XPropertySetInfo.hpp>
-#include <com/sun/star/container/ContainerEvent.hpp>
-#include <com/sun/star/container/XChild.hpp>
-#include <com/sun/star/container/XContainer.hpp>
-#include <com/sun/star/container/XContainerListener.hpp>
-#include <com/sun/star/container/XEnumerationAccess.hpp>
-#include <com/sun/star/container/XIndexContainer.hpp>
-#include <com/sun/star/form/DatabaseDeleteEvent.hpp>
-#include <com/sun/star/form/DatabaseParameterEvent.hpp>
-#include <com/sun/star/form/ErrorEvent.hpp>
-#include <com/sun/star/form/validation/XFormComponentValidityListener.hpp>
-#include <com/sun/star/form/XConfirmDeleteBroadcaster.hpp>
-#include <com/sun/star/form/XConfirmDeleteListener.hpp>
-#include <com/sun/star/form/XDatabaseParameterBroadcaster2.hpp>
-#include <com/sun/star/form/XDatabaseParameterListener.hpp>
-#include <com/sun/star/form/XFormController.hpp>
-#include <com/sun/star/form/XFormControllerListener.hpp>
-#include <com/sun/star/form/XGridControlListener.hpp>
-#include <com/sun/star/form/XLoadListener.hpp>
-#include <com/sun/star/form/XResetListener.hpp>
-#include <com/sun/star/frame/DispatchDescriptor.hpp>
-#include <com/sun/star/frame/XDispatch.hpp>
-#include <com/sun/star/frame/XDispatchProvider.hpp>
-#include <com/sun/star/frame/XDispatchProviderInterception.hpp>
-#include <com/sun/star/frame/XDispatchProviderInterceptor.hpp>
-#include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
-#include <com/sun/star/script/XEventAttacherManager.hpp>
-#include <com/sun/star/sdb/XRowSetApproveBroadcaster.hpp>
-#include <com/sun/star/sdb/XRowSetApproveListener.hpp>
-#include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp>
-#include <com/sun/star/sdb/XSQLErrorBroadcaster.hpp>
-#include <com/sun/star/sdb/XSQLErrorListener.hpp>
-#include <com/sun/star/sdbc/XRowSetListener.hpp>
-#include <com/sun/star/task/XInteractionHandler.hpp>
-#include <com/sun/star/util/XModeSelector.hpp>
-#include <com/sun/star/util/XModifyBroadcaster.hpp>
-#include <com/sun/star/util/XModifyListener.hpp>
-/** === end UNO includes === **/
-
-#include <comphelper/broadcasthelper.hxx>
-#include <comphelper/proparrhlp.hxx>
-#include <comphelper/stl_types.hxx>
-#include <connectivity/sqlparse.hxx>
-#include <cppuhelper/propshlp.hxx>
-#include <tools/debug.hxx>
-#include <vcl/timer.hxx>
-
-#if ! defined(INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_31)
-#define INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_31
-#define COMPHELPER_IMPLBASE_INTERFACE_NUMBER 31
-#include <comphelper/implbase_var.hxx>
-#endif
-
-struct FmXTextComponentLess : public ::std::binary_function< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent >, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent> , sal_Bool>
-{
-    sal_Bool operator() (const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent >& x, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent >& y) const
-    {
-        return reinterpret_cast<sal_Int64>(x.get()) < reinterpret_cast<sal_Int64>(y.get());
-    }
-};
-
-typedef ::std::map< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent >, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >, FmXTextComponentLess> FmFilterControls;
-typedef ::std::map< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent >, ::rtl::OUString, FmXTextComponentLess> FmFilterRow;
-typedef ::std::vector< FmFilterRow > FmFilterRows;
-typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormController > > FmFormControllers;
-
-struct FmFieldInfo;
-class FmFormView;
-class Window;
-
-namespace svxform
-{
-    class ControlBorderManager;
-}
-
-typedef ::comphelper::WeakComponentImplHelper31 <   ::com::sun::star::form::XFormController
-                                                ,   ::com::sun::star::container::XChild
-                                                ,   ::com::sun::star::container::XIndexAccess
-                                                ,   ::com::sun::star::container::XEnumerationAccess
-                                                ,   ::com::sun::star::awt::XFocusListener
-                                                ,   ::com::sun::star::form::XLoadListener
-                                                ,   ::com::sun::star::beans::XPropertyChangeListener
-                                                ,   ::com::sun::star::awt::XTextListener
-                                                ,   ::com::sun::star::awt::XItemListener
-                                                ,   ::com::sun::star::container::XContainerListener
-                                                ,   ::com::sun::star::util::XModifyListener
-                                                ,   ::com::sun::star::util::XModifyBroadcaster
-                                                ,   ::com::sun::star::util::XModeSelector
-                                                ,   ::com::sun::star::form::XConfirmDeleteListener
-                                                ,   ::com::sun::star::form::XConfirmDeleteBroadcaster
-                                                ,   ::com::sun::star::sdb::XSQLErrorListener
-                                                ,   ::com::sun::star::sdb::XSQLErrorBroadcaster
-                                                ,   ::com::sun::star::sdbc::XRowSetListener
-                                                ,   ::com::sun::star::sdb::XRowSetApproveListener
-                                                ,   ::com::sun::star::sdb::XRowSetApproveBroadcaster
-                                                ,   ::com::sun::star::form::XDatabaseParameterListener
-                                                ,   ::com::sun::star::form::XDatabaseParameterBroadcaster
-                                                ,   ::com::sun::star::lang::XServiceInfo
-                                                ,   ::com::sun::star::form::XResetListener
-                                                ,   ::com::sun::star::lang::XUnoTunnel
-                                                ,   ::com::sun::star::frame::XDispatch
-                                                ,   ::com::sun::star::awt::XMouseListener
-                                                ,   ::com::sun::star::form::validation::XFormComponentValidityListener
-                                                ,   ::com::sun::star::task::XInteractionHandler
-                                                ,   ::com::sun::star::lang::XInitialization
-                                                ,   ::com::sun::star::form::XGridControlListener
-                                                >   FmXFormController_BASE;
-
-//==================================================================
-// FmXFormController
-//==================================================================
-class ColumnInfoCache;
-class SAL_DLLPRIVATE FmXFormController  :public ::comphelper::OBaseMutex
-                                        ,public FmXFormController_BASE
-                                        ,public ::cppu::OPropertySetHelper
-                                        ,public FmDispatchInterceptor
-                                        ,public ::comphelper::OAggregationArrayUsageHelper< FmXFormController >
-                                        ,public ::svxform::OSQLParserClient
-                                        ,public ::svx::IControllerFeatureInvalidation
-{
-    typedef ::std::map  <   sal_Int32,
-                            ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >
-                        >   DispatcherContainer;
-
-    friend class FmXPageViewWinRec;
-
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation>				m_xAggregate;
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabController>			m_xTabController;
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>					m_xActiveControl, m_xCurrentControl;
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>		m_xModelAsIndex;
-    ::com::sun::star::uno::Reference< ::com::sun::star::script::XEventAttacherManager>	m_xModelAsManager;
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>				m_xParent;
-    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >	m_xORB;
-    // Composer used for checking filter conditions
-    ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer >   m_xComposer;
-    ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >         m_xInteractionHandler;
-
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl> >	m_aControls;
-    ::cppu::OInterfaceContainerHelper
-                                m_aActivateListeners,
-                                m_aModifyListeners,
-                                m_aErrorListeners,
-                                m_aDeleteListeners,
-                                m_aRowSetApproveListeners,
-                                m_aParameterListeners;
-
-    FmFormControllers			m_aChilds;
-    FmFilterControls			m_aFilterControls;
-    FmFilterRows				m_aFilters;
-
-    Timer						m_aTabActivationTimer;
-    Timer                       m_aFeatureInvalidationTimer;
-
-    FmFormView*					m_pView;
-    Window*                     m_pWindow;
-    ::svxform::ControlBorderManager*
-                                m_pControlBorderManager;
-
-    ::svx::ControllerFeatures   m_aControllerFeatures;
-    DispatcherContainer         m_aFeatureDispatchers;
-    ::std::set< sal_Int32 >     m_aInvalidFeatures;     // for asynchronous feature invalidation
-
-    ::rtl::OUString				m_aMode;
-
-    ::svxform::DelayedEvent     m_aLoadEvent;
-    ::svxform::DelayedEvent     m_aToggleEvent;
-    ::svxform::DelayedEvent     m_aActivationEvent;
-    ::svxform::DelayedEvent     m_aDeactivationEvent;
-
-    ::std::auto_ptr< ColumnInfoCache >
-                                m_pColumnInfoCache;
-
-    sal_Int32					m_nCurrentFilterPosition;	// current level for filtering (or-criteria)
-
-    sal_Bool					m_bCurrentRecordModified    : 1;
-    sal_Bool					m_bCurrentRecordNew         : 1;
-    sal_Bool					m_bLocked			        : 1;
-    sal_Bool					m_bDBConnection	            : 1;	// Focuslistener nur fuer Datenbankformulare
-    sal_Bool					m_bCycle			        : 1;
-    sal_Bool					m_bCanInsert		        : 1;
-    sal_Bool					m_bCanUpdate		        : 1;
-    sal_Bool					m_bCommitLock	            : 1;	// lock the committing of controls see focusGained
-    sal_Bool					m_bModified		            : 1;	// ist der Inhalt eines Controls modifiziert ?
-    sal_Bool					m_bControlsSorted           : 1;
-    sal_Bool					m_bFiltering                : 1;
-    sal_Bool					m_bAttachEvents             : 1;
-    sal_Bool					m_bDetachEvents             : 1;
-    sal_Bool                    m_bAttemptedHandlerCreation : 1;
-
-    // as we want to intercept dispatches of _all_ controls we're responsible for, and an object implementing
-    // the ::com::sun::star::frame::XDispatchProviderInterceptor interface can intercept only _one_ objects dispatches, we need a helper class
-    DECLARE_STL_VECTOR(FmXDispatchInterceptorImpl*, Interceptors);
-    Interceptors	m_aControlDispatchInterceptors;
-
-public:
-    inline const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >&
-        getInteractionHandler() const
-    {
-        const_cast< FmXFormController* >( this )->ensureInteractionHandler();
-        return m_xInteractionHandler;
-    }
-
-public:
-    FmXFormController(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & _rxORB,
-                      FmFormView* _pView = NULL, Window* _pWindow = NULL );
-    ~FmXFormController();
-
-// XInterface
-    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& type) throw ( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL acquire() throw ();
-    virtual void SAL_CALL release() throw ();
-
-// XTypeProvider
-    virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes(  ) throw(::com::sun::star::uno::RuntimeException);
-
-// XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException);
-    static ::com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId();
-    SVX_DLLPUBLIC static FmXFormController* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxComponent );
-
-// XDispatch
-    virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& _rURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rArgs ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL addStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& _rxListener, const ::com::sun::star::util::URL& _rURL ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removeStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& _rxListener, const ::com::sun::star::util::URL& _rURL ) throw (::com::sun::star::uno::RuntimeException);
-
-// ::com::sun::star::container::XChild
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> SAL_CALL getParent(void) throw( ::com::sun::star::uno::RuntimeException ) {return m_xParent;}
-    virtual void SAL_CALL setParent(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& Parent) throw( ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException )
-    {m_xParent = Parent;}
-
-// ::com::sun::star::lang::XEventListener
-    virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw( ::com::sun::star::uno::RuntimeException );
-
-// OComponentHelper
-    virtual void SAL_CALL disposing();
-
-// OPropertySetHelper
-    virtual sal_Bool SAL_CALL convertFastPropertyValue( ::com::sun::star::uno::Any & rConvertedValue, ::com::sun::star::uno::Any & rOldValue,
-                                            sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue )
-                throw( ::com::sun::star::lang::IllegalArgumentException );
-
-    virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw( ::com::sun::star::uno::Exception );
-    virtual void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const;
-
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper();
-
-    using OPropertySetHelper::getFastPropertyValue;
-
-// XElementAccess
-    virtual ::com::sun::star::uno::Type SAL_CALL getElementType(void) throw( ::com::sun::star::uno::RuntimeException );
-    virtual sal_Bool SAL_CALL hasElements(void) throw( ::com::sun::star::uno::RuntimeException );
-
-// ::com::sun::star::container::XEnumerationAccess
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration> SAL_CALL createEnumeration(void) throw( ::com::sun::star::uno::RuntimeException );
-
-// ::com::sun::star::container::XContainerListener
-    virtual void SAL_CALL elementInserted(const ::com::sun::star::container::ContainerEvent& rEvent) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL elementReplaced(const ::com::sun::star::container::ContainerEvent& rEvent) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL elementRemoved(const ::com::sun::star::container::ContainerEvent& rEvent) throw( ::com::sun::star::uno::RuntimeException );
-
-// XLoadListener
-    virtual void SAL_CALL loaded(const ::com::sun::star::lang::EventObject& rEvent) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL unloaded(const ::com::sun::star::lang::EventObject& rEvent) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL unloading(const ::com::sun::star::lang::EventObject& aEvent) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL reloading(const ::com::sun::star::lang::EventObject& aEvent) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL reloaded(const ::com::sun::star::lang::EventObject& aEvent) throw( ::com::sun::star::uno::RuntimeException );
-
-// XModeSelector
-    virtual void SAL_CALL setMode(const ::rtl::OUString& Mode) throw( ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException );
-    virtual ::rtl::OUString SAL_CALL getMode(void) throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedModes(void) throw( ::com::sun::star::uno::RuntimeException );
-    virtual sal_Bool SAL_CALL supportsMode(const ::rtl::OUString& Mode) throw( ::com::sun::star::uno::RuntimeException );
-
-// ::com::sun::star::container::XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 Index) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
-
-// XModifyBroadcaster
-    virtual void SAL_CALL addModifyListener(const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener>& l) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL removeModifyListener(const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener>& l) throw( ::com::sun::star::uno::RuntimeException );
-
-// XFocusListener
-    virtual void SAL_CALL focusGained(const  ::com::sun::star::awt::FocusEvent& e) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL focusLost(const  ::com::sun::star::awt::FocusEvent& e) throw( ::com::sun::star::uno::RuntimeException );
-
-// XMouseListener
-    virtual void SAL_CALL mousePressed( const ::com::sun::star::awt::MouseEvent& _rEvent ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL mouseReleased( const ::com::sun::star::awt::MouseEvent& _rEvent ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL mouseEntered( const ::com::sun::star::awt::MouseEvent& _rEvent ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL mouseExited( const ::com::sun::star::awt::MouseEvent& _rEvent ) throw (::com::sun::star::uno::RuntimeException);
-
-// XFormComponentValidityListener
-    virtual void SAL_CALL componentValidityChanged( const ::com::sun::star::lang::EventObject& _rSource ) throw (::com::sun::star::uno::RuntimeException);
-
-// XInteractionHandler
-    virtual void SAL_CALL handle( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& Request ) throw (::com::sun::star::uno::RuntimeException);
-
-// XInitialization
-    virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
-
-// XGridControlListener
-    virtual void SAL_CALL columnChanged( const ::com::sun::star::lang::EventObject& _event ) throw (::com::sun::star::uno::RuntimeException);
-
-// ::com::sun::star::beans::XPropertyChangeListener -> aenderung der stati
-    virtual void SAL_CALL propertyChange(const  ::com::sun::star::beans::PropertyChangeEvent& evt) throw( ::com::sun::star::uno::RuntimeException );
-
-// XTextListener		   -> modify setzen
-    virtual void SAL_CALL textChanged(const  ::com::sun::star::awt::TextEvent& rEvent) throw( ::com::sun::star::uno::RuntimeException );
-
-// XItemListener			-> modify setzen
-    virtual void SAL_CALL itemStateChanged(const  ::com::sun::star::awt::ItemEvent& rEvent) throw( ::com::sun::star::uno::RuntimeException );
-
-// XModifyListener   -> modify setzen
-    virtual void SAL_CALL modified(const ::com::sun::star::lang::EventObject& rEvent) throw( ::com::sun::star::uno::RuntimeException );
-
-// XFormController
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl> SAL_CALL getCurrentControl(void) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL addActivateListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormControllerListener>& l) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL removeActivateListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormControllerListener>& l) throw( ::com::sun::star::uno::RuntimeException );
-
-// XTabController
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl> > SAL_CALL getControls(void) throw( ::com::sun::star::uno::RuntimeException );
-
-    virtual void SAL_CALL setModel(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabControllerModel>& Model) throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabControllerModel> SAL_CALL getModel() throw( ::com::sun::star::uno::RuntimeException );
-
-    virtual void SAL_CALL setContainer(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer>& Container) throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer> SAL_CALL getContainer() throw( ::com::sun::star::uno::RuntimeException );
-
-    virtual void SAL_CALL autoTabOrder() throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL activateTabOrder() throw( ::com::sun::star::uno::RuntimeException );
-
-    virtual void SAL_CALL activateFirst() throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL activateLast() throw( ::com::sun::star::uno::RuntimeException );
-
-// com::sun::star::sdbc::XRowSetListener
-    virtual void SAL_CALL cursorMoved(const ::com::sun::star::lang::EventObject& event) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL rowChanged(const ::com::sun::star::lang::EventObject& event) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL rowSetChanged(const ::com::sun::star::lang::EventObject& event) throw( ::com::sun::star::uno::RuntimeException );
-
-// XRowSetApproveListener
-    virtual sal_Bool SAL_CALL approveCursorMove(const ::com::sun::star::lang::EventObject& event) throw( ::com::sun::star::uno::RuntimeException );
-    virtual sal_Bool SAL_CALL approveRowChange(const  ::com::sun::star::sdb::RowChangeEvent& event) throw( ::com::sun::star::uno::RuntimeException );
-    virtual sal_Bool SAL_CALL approveRowSetChange(const ::com::sun::star::lang::EventObject& event) throw( ::com::sun::star::uno::RuntimeException );
-
-// XRowSetApproveBroadcaster
-    virtual void SAL_CALL addRowSetApproveListener(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XRowSetApproveListener>& listener) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL removeRowSetApproveListener(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XRowSetApproveListener>& listener) throw( ::com::sun::star::uno::RuntimeException );
-
-// XSQLErrorBroadcaster
-    virtual void SAL_CALL errorOccured(const ::com::sun::star::sdb::SQLErrorEvent& aEvent) throw( ::com::sun::star::uno::RuntimeException );
-
-// XSQLErrorListener
-    virtual void SAL_CALL addSQLErrorListener(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSQLErrorListener>& _rListener) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL removeSQLErrorListener(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSQLErrorListener>& _rListener) throw( ::com::sun::star::uno::RuntimeException );
-
-// XDatabaseParameterBroadcaster2
-    virtual void SAL_CALL addDatabaseParameterListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XDatabaseParameterListener>& aListener) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL removeDatabaseParameterListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XDatabaseParameterListener>& aListener) throw( ::com::sun::star::uno::RuntimeException );
-
-// XDatabaseParameterBroadcaster
-    virtual void SAL_CALL addParameterListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XDatabaseParameterListener>& aListener) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL removeParameterListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XDatabaseParameterListener>& aListener) throw( ::com::sun::star::uno::RuntimeException );
-
-// XDatabaseParameterListener
-    virtual sal_Bool SAL_CALL approveParameter(const ::com::sun::star::form::DatabaseParameterEvent& aEvent) throw( ::com::sun::star::uno::RuntimeException );
-
-// XConfirmDeleteBroadcaster
-    virtual void SAL_CALL addConfirmDeleteListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XConfirmDeleteListener>& aListener) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL removeConfirmDeleteListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XConfirmDeleteListener>& aListener) throw( ::com::sun::star::uno::RuntimeException );
-
-// XConfirmDeleteListener
-    virtual sal_Bool SAL_CALL confirmDelete(const  ::com::sun::star::sdb::RowChangeEvent& aEvent) throw( ::com::sun::star::uno::RuntimeException );
-
-// XServiceInfo
-    virtual sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw(::com::sun::star::uno::RuntimeException);
-    virtual ::rtl::OUString	SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString >	SAL_CALL getSupportedServiceNames(void) throw(::com::sun::star::uno::RuntimeException);
-
-// XResetListener
-    virtual sal_Bool SAL_CALL approveReset(const ::com::sun::star::lang::EventObject& rEvent) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL resetted(const ::com::sun::star::lang::EventObject& rEvent) throw( ::com::sun::star::uno::RuntimeException );
-
-// method for registration
-    static  ::com::sun::star::uno::Sequence< ::rtl::OUString >	getSupportedServiceNames_Static(void);
-
-    // comphelper::OPropertyArrayUsageHelper
-    virtual void fillProperties(
-        ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rProps,
-        ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rAggregateProps
-        ) const;
-
-// access to the controls for filtering
-    const FmFilterControls& getFilterControls() const {return m_aFilterControls;}
-
-// access to the current filter rows
-    const FmFilterRows& getFilterRows() const {return m_aFilters;}
-    FmFilterRows& getFilterRows() {return m_aFilters;}
-
-    // just decr. the positions no notifications for the view
-    void decrementCurrentFilterPosition()
-    {
-        DBG_ASSERT(m_nCurrentFilterPosition, "Invalid Position");
-        --m_nCurrentFilterPosition;
-    }
-
-    SVX_DLLPUBLIC void setCurrentFilterPosition(sal_Int32 nPos);
-    sal_Int32 getCurrentFilterPosition() const {return m_nCurrentFilterPosition;}
-
-protected:
-    // FmDispatchInterceptor
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch>
-    interceptedQueryDispatch(sal_uInt16 _nId,const ::com::sun::star::util::URL& aURL,
-                            const ::rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags)
-                            throw( ::com::sun::star::uno::RuntimeException );
-
-    // IControllerFeatureInvalidation
-    virtual void invalidateFeatures( const ::std::vector< sal_Int32 >& _rFeatures );
-
-    virtual ::osl::Mutex* getInterceptorMutex() { return &m_aMutex; }
-
-    /// update all our dispatchers
-    void    updateAllDispatchers() const;
-
-    /** disposes all dispatchers in m_aFeatureDispatchers, empties m_aFeatureDispatchers,
-        and disposes m_aControllerFeatures
-    */
-    void    disposeAllFeaturesAndDispatchers() SAL_THROW(());
-
-    void startFiltering();
-    void stopFiltering();
-    void setFilter(::std::vector<FmFieldInfo>&);
-    void startListening();
-    void stopListening();
-
-    /** ensures that we have an interaction handler, if possible
-
-        If an interaction handler was provided at creation time (<member>initialize</member>), this
-        one will be used. Else, an attempt is made to create an <type scope="com::sun::star::sdb">InteractionHandler</type>
-        is made.
-
-        @return <TRUE/>
-            if and only if <member>m_xInteractionHandler</member> is valid when the method returns
-    */
-    bool ensureInteractionHandler();
-
-    /** replaces one of our controls with another one
-
-        Upon successful replacing, the old control will be disposed. Also, internal members pointing
-        to the current or active control will be adjusted. Yet more, if the replaced control was
-        the active control, the new control will be made active.
-
-        @param _rxExistentControl
-            The control to replace. Must be one of the controls in our ControlContainer.
-        @param _rxNewControl
-            The control which should replace the existent control.
-        @return
-            <TRUE/> if and only if the control was successfully replaced
-    */
-    bool    replaceControl(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _rxExistentControl,
-        const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _rxNewControl
-    );
-
-    // we're listening at all bound controls for modifications
-    void startControlModifyListening(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& xControl);
-    void stopControlModifyListening(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& xControl);
-
-    void setLocks();
-    void setControlLock(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& xControl);
-    void addToEventAttacher(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& xControl);
-    void removeFromEventAttacher(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& xControl);
-    void toggleAutoFields(sal_Bool bAutoFields);
-    void unload() throw( ::com::sun::star::uno::RuntimeException );
-    void removeBoundFieldListener();
-
-    void startFormListening( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxForm, sal_Bool _bPropertiesOnly  );
-    void stopFormListening( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxForm, sal_Bool _bPropertiesOnly );
-
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl> findControl( ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl> >& rCtrls, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel>& rxCtrlModel, sal_Bool _bRemove, sal_Bool _bOverWrite ) const;
-
-    void insertControl(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& xControl);
-    void removeControl(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& xControl);
-
-    /// called when a new control is to be handled by the controller
-    void implControlInserted( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& _rxControl, bool _bAddToEventAttacher );
-    /// called when a control is not to be handled by the controller anymore
-    void implControlRemoved( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& _rxControl, bool _bRemoveFromEventAttacher );
-
-    /** sets m_xCurrentControl, plus does administrative tasks depending on it
-    */
-    void    implSetCurrentControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _rxControl );
-
-    /** invalidates the FormFeatures which depend on the current control
-    */
-    void    implInvalidateCurrentControlDependentFeatures();
-
-    bool    impl_isDisposed_nofail() const { return FmXFormController_BASE::rBHelper.bDisposed; }
-
-    void    impl_onModify();
-
-    sal_Bool isLocked() const {return m_bLocked;}
-    sal_Bool determineLockState() const;
-
-    Window* getDialogParentWindow();
-        // returns m_pWindow or - if m_pWindow is NULL - the window of the currently set container
-
-    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterceptor>	createInterceptor(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterception>& _xInterception);
-        // create a new interceptor, register it on the given object
-    void							deleteInterceptor(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterception>& _xInterception);
-        // if createInterceptor was called for the given object the according interceptor will be removed
-        // from the objects interceptor chain and released
-
-    /** checks all form controls belonging to our form for validity
-
-        If a form control supports the XValidatableFormComponent interface, this is used to determine
-        the validity of the control. If the interface is not supported, the control is supposed to be
-        valid.
-
-        @param _rFirstInvalidityExplanation
-            if the method returns <FALSE/> (i.e. if there is an invalid control), this string contains
-            the explanation for the invalidity, as obtained from the validator.
-
-        @param _rxFirstInvalidModel
-            if the method returns <FALSE/> (i.e. if there is an invalid control), this contains
-            the control model
-
-        @return
-            <TRUE/> if and only if all controls belonging to our form are valid
-    */
-    bool    checkFormComponentValidity(
-                ::rtl::OUString& /* [out] */ _rFirstInvalidityExplanation,
-                ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& /* [out] */ _rxFirstInvalidModel
-            ) SAL_THROW(());
-
-    /** locates the control which belongs to a given model
-    */
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >
-            locateControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& _rxModel ) SAL_THROW(());
-
-    // set the text for all filters
-    void impl_setTextOnAllFilter_throw();
-
-    // in filter mode we do not listen for changes
-    sal_Bool isListeningForChanges() const {return m_bDBConnection && !m_bFiltering && !isLocked();}
-    void addChild(FmXFormController* pChild);
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl> isInList(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer>& xPeer) const;
-
-    DECL_LINK( OnActivateTabOrder, void* );
-    DECL_LINK( OnInvalidateFeatures, void* );
-    DECL_LINK( OnLoad, void* );
-    DECL_LINK( OnToggleAutoFields, void* );
-    DECL_LINK( OnActivated, void* );
-    DECL_LINK( OnDeactivated, void* );
-};
-
-
-#endif	// _SVX_FMCTRLER_HXX
-
diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx
index 029b519049..93a329d032 100644
--- a/svx/source/inc/fmexpl.hxx
+++ b/svx/source/inc/fmexpl.hxx
@@ -39,12 +39,17 @@
 #include <sfx2/dockwin.hxx>
 #include <sfx2/ctrlitem.hxx>
 #include <vcl/image.hxx>
+
+/** === begin UNO includes === **/
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/form/XForm.hpp>
 #include <com/sun/star/form/XFormComponent.hpp>
 #include <com/sun/star/beans/PropertyChangeEvent.hpp>
 #include <com/sun/star/container/XContainerListener.hpp>
 #include <com/sun/star/container/XContainer.hpp>
+#include <com/sun/star/beans/XPropertyChangeListener.hpp>
+#include <com/sun/star/container/XIndexContainer.hpp>
+/** === end UNO includes === **/
 
 #include <svtools/svtreebx.hxx>
 
@@ -57,7 +62,6 @@
 #include <svx/fmview.hxx>
 
 #include "fmexch.hxx"
-#include "svx/fmtools.hxx"
 
 class SdrObjListIter;
 class FmFormShell;
diff --git a/svx/source/inc/fmservs.hxx b/svx/source/inc/fmservs.hxx
index 165630eab8..a9b7e6d0d7 100644
--- a/svx/source/inc/fmservs.hxx
+++ b/svx/source/inc/fmservs.hxx
@@ -57,7 +57,7 @@
 #define FM_COMPONENT_IMAGECONTROL       rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.ImageControl" ) )
 #define FM_CONTROL_GRID                 rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.control.Grid" ) )
 #define FM_CONTROL_GRIDCONTROL          rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.control.GridControl" ) )
-#define FM_FORM_CONTROLLER              rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.FormController" ) )
+#define FM_FORM_CONTROLLER              rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.runtime.FormController" ) )
 #define SRV_SDB_CONNECTION              rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.Connection" ) )
 #define SRV_SDB_INTERACTION_HANDLER     rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.InteractionHandler" ) )
 #define FM_SUN_COMPONENT_FORM           rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.Form" ) )
diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx
index 5ca209bbff..563b0308a4 100644
--- a/svx/source/inc/fmshimp.hxx
+++ b/svx/source/inc/fmshimp.hxx
@@ -40,7 +40,7 @@
 #include <com/sun/star/awt/XControlContainer.hpp>
 #include <com/sun/star/util/XModifyListener.hpp>
 #include <com/sun/star/form/XForm.hpp>
-#include <com/sun/star/form/XFormController.hpp>
+#include <com/sun/star/form/runtime/XFormController.hpp>
 #include <com/sun/star/form/XFormComponent.hpp>
 #include <com/sun/star/form/NavigationBarMode.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
@@ -243,9 +243,9 @@ class SAL_DLLPRIVATE FmXFormShell   :public FmXFormShell_BASE
 
     // aktuelle Form, Controller
     // nur im alive mode verfuegbar
-    ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormController>	m_xActiveController;
-    ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormController>	m_xNavigationController;
-    ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm>			m_xActiveForm;
+    ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController >    m_xActiveController;
+    ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController >    m_xNavigationController;
+    ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >                       m_xActiveForm;
 
     // Aktueller container einer Page
     // nur im designmode verfuegbar
@@ -266,11 +266,9 @@ class SAL_DLLPRIVATE FmXFormShell   :public FmXFormShell_BASE
      // the frame we live in
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame>				m_xAttachedFrame;
     // Administration of external form views (see the SID_FM_VIEW_AS_GRID-slot)
-    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController>			m_xExternalViewController;		// the controller for the external form view
-    ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormController>		m_xExtViewTriggerController;	// the nav controller at the time the external display was triggered
-    ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>			m_xExternalDisplayedForm;		// the form which the external view is based on
-
-    FmXDispatchInterceptorImpl*		m_pExternalViewInterceptor;
+    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >                m_xExternalViewController;		// the controller for the external form view
+    ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController >    m_xExtViewTriggerController;	// the nav controller at the time the external display was triggered
+    ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >                  m_xExternalDisplayedForm;		// the form which the external view is based on
 
     mutable ::svxform::DocumentType
                     m_eDocumentType;        /// the type of document we're living in
@@ -399,11 +397,11 @@ protected:
 
 public:
     // methode fuer nicht designmode (alive mode)
-    void setActiveController( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormController>& _xController, sal_Bool _bNoSaveOldContent = sal_False );
-    const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormController>& getActiveController() const {return m_xActiveController;}
-    const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormController>& getActiveInternalController() const { return m_xActiveController == m_xExternalViewController ? m_xExtViewTriggerController : m_xActiveController; }
+    void setActiveController( const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController>& _xController, sal_Bool _bNoSaveOldContent = sal_False );
+    const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController>& getActiveController() const {return m_xActiveController;}
+    const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController>& getActiveInternalController() const { return m_xActiveController == m_xExternalViewController ? m_xExtViewTriggerController : m_xActiveController; }
     const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm>& getActiveForm() const {return m_xActiveForm;}
-    const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormController>& getNavController() const {return m_xNavigationController;}
+    const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController>& getNavController() const {return m_xNavigationController;}
 
     inline const ::svx::ControllerFeatures& getActiveControllerFeatures() const
         { return m_aActiveControllerFeatures; }
@@ -569,13 +567,13 @@ private:
 
 public:
     enum CURSOR_ACTION { CA_MOVE_TO_LAST, CA_MOVE_ABSOLUTE };
-    void DoAsyncCursorAction(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormController>& _xController, CURSOR_ACTION _eWhat);
+    void DoAsyncCursorAction(const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController>& _xController, CURSOR_ACTION _eWhat);
     void DoAsyncCursorAction(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& _xForm, CURSOR_ACTION _eWhat);
 
     sal_Bool HasAnyPendingCursorAction() const;
     void CancelAnyPendingCursorAction();
 
-    sal_Bool HasPendingCursorAction(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormController>& _xController) const;
+    sal_Bool HasPendingCursorAction(const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController>& _xController) const;
     sal_Bool HasPendingCursorAction(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& _xForm) const;
 
     /** execute the given form slot
diff --git a/svx/source/inc/fmsrcimp.hxx b/svx/source/inc/fmsrcimp.hxx
index 10ff63fd28..9d55f5c5f9 100644
--- a/svx/source/inc/fmsrcimp.hxx
+++ b/svx/source/inc/fmsrcimp.hxx
@@ -32,18 +32,27 @@
 #define _FMSRCIMP_HXX
 
 #include <svx/fmtools.hxx>
-#include <vos/thread.hxx>
-#include <osl/mutex.hxx>
-#include <com/sun/star/awt/XTextComponent.hpp>
+#include "svx/svxdllapi.h"
+
+/** === begin UNO includes === **/
 #include <com/sun/star/awt/XCheckBox.hpp>
 #include <com/sun/star/awt/XListBox.hpp>
+#include <com/sun/star/awt/XTextComponent.hpp>
 #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
 #include <com/sun/star/util/XNumberFormatter.hpp>
+/** === end UNO includes === **/
+
 #include <comphelper/stl_types.hxx>
 #include <cppuhelper/implbase1.hxx>
+#include <osl/mutex.hxx>
 #include <unotools/charclass.hxx>
 #include <unotools/collatorwrapper.hxx>
-#include "svx/svxdllapi.h"
+#include <vos/thread.hxx>
+
+#ifndef _SVSTDARR_ULONGS
+#define _SVSTDARR_ULONGS
+#include <svl/svstdarr.hxx>
+#endif
 
 // ===================================================================================================
 // Hilfsstrukturen
diff --git a/svx/source/inc/fmtextcontrolshell.hxx b/svx/source/inc/fmtextcontrolshell.hxx
index 88dd00f1a5..f82f06fe1d 100644
--- a/svx/source/inc/fmtextcontrolshell.hxx
+++ b/svx/source/inc/fmtextcontrolshell.hxx
@@ -36,7 +36,7 @@
 #include <com/sun/star/frame/XStatusListener.hpp>
 #include <com/sun/star/awt/XFocusListener.hpp>
 #include <com/sun/star/awt/XMouseListener.hpp>
-#include <com/sun/star/form/XFormController.hpp>
+#include <com/sun/star/form/runtime/XFormController.hpp>
 #include <com/sun/star/awt/XControl.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
 /** === end UNO includes === **/
@@ -92,10 +92,10 @@ namespace svx
                              ,public IContextRequestObserver
     {
     private:
-        ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > m_xURLTransformer;
-        ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >         m_xActiveControl;
-        ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent >   m_xActiveTextComponent;
-        ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormController > m_xActiveController;
+        ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer >             m_xURLTransformer;
+        ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >                     m_xActiveControl;
+        ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent >               m_xActiveTextComponent;
+        ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController >    m_xActiveController;
 #ifndef DONT_REMEMBER_LAST_CONTROL
         // without this define, m_xActiveControl remembers the *last* active control, even
         // if it, in the meantime, already lost the focus
@@ -144,10 +144,10 @@ namespace svx
 
         /** to be called when a form in our document has been activated
         */
-        void    formActivated( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormController >& _rxController );
+        void    formActivated( const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController >& _rxController );
         /** to be called when a form in our document has been deactivated
         */
-        void    formDeactivated( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormController >& _rxController );
+        void    formDeactivated( const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController >& _rxController );
 
         /** notifies the instance that the design mode has changed
         */
@@ -205,7 +205,7 @@ namespace svx
         @precond
             we don't have an active controller currently
         */
-        void    startControllerListening( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormController >& _rxController );
+        void    startControllerListening( const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController >& _rxController );
         /** stops listening at the active controller
         @precond
             we have an active controller currently
diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx
index 64a8ef4849..52dbb111ef 100644
--- a/svx/source/inc/fmvwimp.hxx
+++ b/svx/source/inc/fmvwimp.hxx
@@ -37,7 +37,8 @@
 #include <com/sun/star/form/XForm.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/container/XEnumeration.hpp>
-#include <com/sun/star/form/XFormController.hpp>
+#include <com/sun/star/form/runtime/XFormController.hpp>
+#include <com/sun/star/form/runtime/XFormControllerContext.hpp>
 #include <com/sun/star/container/XContainerListener.hpp>
 #include <com/sun/star/container/ContainerEvent.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -49,7 +50,7 @@
 #include <comphelper/stl_types.hxx>
 #include <tools/link.hxx>
 #include <tools/string.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase2.hxx>
 #include <cppuhelper/implbase3.hxx>
 #include <comphelper/uno3.hxx>
 #include <comphelper/componentcontext.hxx>
@@ -73,7 +74,6 @@ FORWARD_DECLARE_INTERFACE(awt,XWindow)
 FORWARD_DECLARE_INTERFACE(beans,XPropertySet)
 FORWARD_DECLARE_INTERFACE(util,XNumberFormats)
 
-class FmXFormController;
 class FmXFormView;
 
 namespace svx {
@@ -84,41 +84,49 @@ namespace svx {
 //==================================================================
 // FmXPageViewWinRec
 //==================================================================
-class FmXPageViewWinRec : public ::cppu::WeakImplHelper1< ::com::sun::star::container::XIndexAccess>
+typedef ::cppu::WeakImplHelper2 <   ::com::sun::star::container::XIndexAccess
+                                ,   ::com::sun::star::form::runtime::XFormControllerContext
+                                >   FmXPageViewWinRec_Base;
+
+class FmXPageViewWinRec : public FmXPageViewWinRec_Base
 {
     friend class FmXFormView;
 
-    ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormController > >	m_aControllerList;
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >                    m_xControlContainer;
-    ::comphelper::ComponentContext                                                                  m_aContext;
+    ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > >   m_aControllerList;
+    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >                            m_xControlContainer;
+    ::comphelper::ComponentContext                                                                          m_aContext;
     FmXFormView*				m_pViewImpl;
     Window*						m_pWindow;
 
+protected:
+    ~FmXPageViewWinRec();
+
 public:
     FmXPageViewWinRec(	const ::comphelper::ComponentContext& _rContext,
         const SdrPageWindow&, FmXFormView* pView);
         //const SdrPageViewWinRec*, FmXFormView* pView);
-    ~FmXPageViewWinRec();
-
-// UNO Anbindung
 
-// ::com::sun::star::container::XElementAccess
+    // XElementAccess
     virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException);
     virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException);
 
-// ::com::sun::star::container::XEnumerationAccess
+    // XEnumerationAccess
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration >  SAL_CALL createEnumeration() throw(::com::sun::star::uno::RuntimeException);
 
-// ::com::sun::star::container::XIndexAccess
+    // XIndexAccess
     virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 _Index) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
-    const ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormController > >& GetList() {return m_aControllerList;}
+    // XFormControllerContext
+    virtual void SAL_CALL makeVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _Control ) throw (::com::sun::star::uno::RuntimeException);
+
+    const ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > >& GetList() {return m_aControllerList;}
 
 protected:
-    ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormController >  getController( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& xForm ) const;
-    void setController(	const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& xForm,
-                        FmXFormController* pParent = NULL);
+    ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController >  getController( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& xForm ) const;
+    void setController(
+            const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& xForm,
+            const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController >& _rxParentController );
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >  getControlContainer() const { return m_xControlContainer; }
     void updateTabOrder( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& _rxForm );
     void dispose();
@@ -213,7 +221,7 @@ public:
     FmWinRecList::const_iterator findWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& _rxCC ) const;
     const FmWinRecList& getWindowList() const {return m_aWinList;}
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormController >
+    ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController >
             getFormController( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& _rxForm, const OutputDevice& _rDevice ) const;
 
     // activation handling
diff --git a/svx/source/inc/formcontroller.hxx b/svx/source/inc/formcontroller.hxx
new file mode 100644
index 0000000000..d06b5358ef
--- /dev/null
+++ b/svx/source/inc/formcontroller.hxx
@@ -0,0 +1,592 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * 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_FMCTRLER_HXX
+#define _SVX_FMCTRLER_HXX
+
+#include "delayedevent.hxx"
+#include "formdispatchinterceptor.hxx"
+#include "sqlparserclient.hxx"
+
+/** === begin UNO includes === **/
+#include <com/sun/star/awt/XControl.hpp>
+#include <com/sun/star/awt/XControlModel.hpp>
+#include <com/sun/star/awt/XFocusListener.hpp>
+#include <com/sun/star/awt/XItemListener.hpp>
+#include <com/sun/star/awt/XMouseListener.hpp>
+#include <com/sun/star/awt/XTabController.hpp>
+#include <com/sun/star/awt/XTextComponent.hpp>
+#include <com/sun/star/container/XContainerListener.hpp>
+#include <com/sun/star/container/XEnumerationAccess.hpp>
+#include <com/sun/star/container/XIndexContainer.hpp>
+#include <com/sun/star/form/DatabaseDeleteEvent.hpp>
+#include <com/sun/star/form/DatabaseParameterEvent.hpp>
+#include <com/sun/star/form/ErrorEvent.hpp>
+#include <com/sun/star/form/validation/XFormComponentValidityListener.hpp>
+#include <com/sun/star/form/XConfirmDeleteBroadcaster.hpp>
+#include <com/sun/star/form/XConfirmDeleteListener.hpp>
+#include <com/sun/star/form/XDatabaseParameterBroadcaster2.hpp>
+#include <com/sun/star/form/XDatabaseParameterListener.hpp>
+#include <com/sun/star/form/runtime/XFormController.hpp>
+#include <com/sun/star/form/runtime/XFilterController.hpp>
+#include <com/sun/star/form/XFormControllerListener.hpp>
+#include <com/sun/star/form/XGridControlListener.hpp>
+#include <com/sun/star/form/XLoadListener.hpp>
+#include <com/sun/star/form/XResetListener.hpp>
+#include <com/sun/star/frame/DispatchDescriptor.hpp>
+#include <com/sun/star/frame/XDispatch.hpp>
+#include <com/sun/star/frame/XDispatchProvider.hpp>
+#include <com/sun/star/frame/XDispatchProviderInterception.hpp>
+#include <com/sun/star/frame/XDispatchProviderInterceptor.hpp>
+#include <com/sun/star/frame/XModel.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/script/XEventAttacherManager.hpp>
+#include <com/sun/star/sdb/XRowSetApproveBroadcaster.hpp>
+#include <com/sun/star/sdb/XRowSetApproveListener.hpp>
+#include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp>
+#include <com/sun/star/sdb/XSQLErrorBroadcaster.hpp>
+#include <com/sun/star/sdb/XSQLErrorListener.hpp>
+#include <com/sun/star/sdbc/XRowSetListener.hpp>
+#include <com/sun/star/task/XInteractionHandler.hpp>
+#include <com/sun/star/util/XModeSelector.hpp>
+#include <com/sun/star/util/XModifyBroadcaster.hpp>
+#include <com/sun/star/util/XModifyListener.hpp>
+/** === end UNO includes === **/
+
+#include <comphelper/broadcasthelper.hxx>
+#include <comphelper/componentcontext.hxx>
+#include <comphelper/proparrhlp.hxx>
+#include <comphelper/stl_types.hxx>
+#include <connectivity/sqlparse.hxx>
+#include <cppuhelper/propshlp.hxx>
+#include <tools/debug.hxx>
+#include <vcl/timer.hxx>
+
+#if ! defined(INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_22)
+#define INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_22
+#define COMPHELPER_IMPLBASE_INTERFACE_NUMBER 22
+#include <comphelper/implbase_var.hxx>
+#endif
+
+struct FmXTextComponentLess : public ::std::binary_function< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent >, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent> , sal_Bool>
+{
+    sal_Bool operator() (const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent >& x, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent >& y) const
+    {
+        return reinterpret_cast<sal_Int64>(x.get()) < reinterpret_cast<sal_Int64>(y.get());
+    }
+};
+
+typedef ::std::map< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent >, ::rtl::OUString, FmXTextComponentLess> FmFilterRow;
+typedef ::std::vector< FmFilterRow > FmFilterRows;
+typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > > FmFormControllers;
+
+class FmFormView;
+class Window;
+
+namespace svxform
+{
+    typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent > >    FilterComponents;
+    class ControlBorderManager;
+    struct FmFieldInfo;
+
+    typedef ::comphelper::WeakComponentImplHelper22 <   ::com::sun::star::form::runtime::XFormController
+                                                    ,   ::com::sun::star::form::runtime::XFilterController
+                                                    ,   ::com::sun::star::awt::XFocusListener
+                                                    ,   ::com::sun::star::form::XLoadListener
+                                                    ,   ::com::sun::star::beans::XPropertyChangeListener
+                                                    ,   ::com::sun::star::awt::XTextListener
+                                                    ,   ::com::sun::star::awt::XItemListener
+                                                    ,   ::com::sun::star::container::XContainerListener
+                                                    ,   ::com::sun::star::util::XModifyListener
+                                                    ,   ::com::sun::star::form::XConfirmDeleteListener
+                                                    ,   ::com::sun::star::sdb::XSQLErrorListener
+                                                    ,   ::com::sun::star::sdbc::XRowSetListener
+                                                    ,   ::com::sun::star::sdb::XRowSetApproveListener
+                                                    ,   ::com::sun::star::form::XDatabaseParameterListener
+                                                    ,   ::com::sun::star::lang::XServiceInfo
+                                                    ,   ::com::sun::star::form::XResetListener
+                                                    ,   ::com::sun::star::frame::XDispatch
+                                                    ,   ::com::sun::star::awt::XMouseListener
+                                                    ,   ::com::sun::star::form::validation::XFormComponentValidityListener
+                                                    ,   ::com::sun::star::task::XInteractionHandler
+                                                    ,   ::com::sun::star::form::XGridControlListener
+                                                    ,   ::com::sun::star::form::runtime::XFeatureInvalidation
+                                                    >   FormController_BASE;
+
+    //==================================================================
+    // FormController
+    //==================================================================
+    class ColumnInfoCache;
+    class SAL_DLLPRIVATE FormController :public ::comphelper::OBaseMutex
+                                        ,public FormController_BASE
+                                        ,public ::cppu::OPropertySetHelper
+                                        ,public DispatchInterceptor
+                                        ,public ::comphelper::OAggregationArrayUsageHelper< FormController >
+                                        ,public ::svxform::OSQLParserClient
+    {
+        typedef ::std::map  <   sal_Int16,
+                                ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >
+                            >   DispatcherContainer;
+
+        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation>				m_xAggregate;
+        ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabController>			m_xTabController;
+        ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>					m_xActiveControl, m_xCurrentControl;
+        ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>		m_xModelAsIndex;
+        ::com::sun::star::uno::Reference< ::com::sun::star::script::XEventAttacherManager>	m_xModelAsManager;
+        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>				m_xParent;
+        ::comphelper::ComponentContext                                                      m_aContext;
+        // Composer used for checking filter conditions
+        ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer >       m_xComposer;
+        ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >             m_xInteractionHandler;
+        ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormControllerContext > m_xContext;
+
+        ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl> >	m_aControls;
+        ::cppu::OInterfaceContainerHelper
+                                    m_aActivateListeners,
+                                    m_aModifyListeners,
+                                    m_aErrorListeners,
+                                    m_aDeleteListeners,
+                                    m_aRowSetApproveListeners,
+                                    m_aParameterListeners,
+                                    m_aFilterListeners;
+
+        FmFormControllers			m_aChilds;
+        FilterComponents            m_aFilterComponents;
+        FmFilterRows                m_aFilterRows;
+
+        Timer						m_aTabActivationTimer;
+        Timer                       m_aFeatureInvalidationTimer;
+
+        ::svxform::ControlBorderManager*
+                                    m_pControlBorderManager;
+
+        ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormOperations >
+                                    m_xFormOperations;
+        DispatcherContainer         m_aFeatureDispatchers;
+        ::std::set< sal_Int16 >     m_aInvalidFeatures;     // for asynchronous feature invalidation
+
+        ::rtl::OUString				m_aMode;
+
+        ::svxform::DelayedEvent     m_aLoadEvent;
+        ::svxform::DelayedEvent     m_aToggleEvent;
+        ::svxform::DelayedEvent     m_aActivationEvent;
+        ::svxform::DelayedEvent     m_aDeactivationEvent;
+
+        ::std::auto_ptr< ColumnInfoCache >
+                                    m_pColumnInfoCache;
+
+        sal_Int32					m_nCurrentFilterPosition;	// current level for filtering (or-criteria)
+
+        sal_Bool					m_bCurrentRecordModified    : 1;
+        sal_Bool					m_bCurrentRecordNew         : 1;
+        sal_Bool					m_bLocked			        : 1;
+        sal_Bool					m_bDBConnection	            : 1;	// Focuslistener nur fuer Datenbankformulare
+        sal_Bool					m_bCycle			        : 1;
+        sal_Bool					m_bCanInsert		        : 1;
+        sal_Bool					m_bCanUpdate		        : 1;
+        sal_Bool					m_bCommitLock	            : 1;	// lock the committing of controls see focusGained
+        sal_Bool					m_bModified		            : 1;	// ist der Inhalt eines Controls modifiziert ?
+        sal_Bool					m_bControlsSorted           : 1;
+        sal_Bool					m_bFiltering                : 1;
+        sal_Bool					m_bAttachEvents             : 1;
+        sal_Bool					m_bDetachEvents             : 1;
+        sal_Bool                    m_bAttemptedHandlerCreation : 1;
+
+        // as we want to intercept dispatches of _all_ controls we're responsible for, and an object implementing
+        // the ::com::sun::star::frame::XDispatchProviderInterceptor interface can intercept only _one_ objects dispatches, we need a helper class
+        DECLARE_STL_VECTOR(DispatchInterceptionMultiplexer*, Interceptors);
+        Interceptors	m_aControlDispatchInterceptors;
+
+    public:
+        FormController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & _rxORB );
+
+    protected:
+        ~FormController();
+
+    // XInterface
+        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& type) throw ( ::com::sun::star::uno::RuntimeException );
+        virtual void SAL_CALL acquire() throw ();
+        virtual void SAL_CALL release() throw ();
+
+    // XTypeProvider
+        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes(  ) throw(::com::sun::star::uno::RuntimeException);
+
+    // XDispatch
+        virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& _rURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rArgs ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL addStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& _rxListener, const ::com::sun::star::util::URL& _rURL ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL removeStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& _rxListener, const ::com::sun::star::util::URL& _rURL ) throw (::com::sun::star::uno::RuntimeException);
+
+    // ::com::sun::star::container::XChild
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> SAL_CALL getParent(void) throw( ::com::sun::star::uno::RuntimeException );
+        virtual void SAL_CALL setParent(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& Parent) throw( ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException );
+
+    // ::com::sun::star::lang::XEventListener
+        virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw( ::com::sun::star::uno::RuntimeException );
+
+    // OComponentHelper
+        virtual void SAL_CALL disposing();
+
+    // OPropertySetHelper
+        virtual sal_Bool SAL_CALL convertFastPropertyValue( ::com::sun::star::uno::Any & rConvertedValue, ::com::sun::star::uno::Any & rOldValue,
+                                                sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue )
+                    throw( ::com::sun::star::lang::IllegalArgumentException );
+
+        virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw( ::com::sun::star::uno::Exception );
+        virtual void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const;
+
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw( ::com::sun::star::uno::RuntimeException );
+        virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper();
+
+        using OPropertySetHelper::getFastPropertyValue;
+
+        // XFilterController
+        virtual ::sal_Int32 SAL_CALL getFilterComponents() throw (::com::sun::star::uno::RuntimeException);
+        virtual ::sal_Int32 SAL_CALL getDisjunctiveTerms() throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL addFilterControllerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFilterControllerListener >& _Listener ) throw( ::com::sun::star::uno::RuntimeException );
+        virtual void SAL_CALL removeFilterControllerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFilterControllerListener >& _Listener ) throw( ::com::sun::star::uno::RuntimeException );
+        virtual void SAL_CALL setPredicateExpression( ::sal_Int32 _Component, ::sal_Int32 _Term, const ::rtl::OUString& _PredicateExpression ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > SAL_CALL getFilterComponent( ::sal_Int32 _Component ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > > SAL_CALL getPredicateExpressions() throw( ::com::sun::star::uno::RuntimeException );
+        virtual void SAL_CALL removeDisjunctiveTerm( ::sal_Int32 _Term ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL appendEmptyDisjunctiveTerm() throw (::com::sun::star::uno::RuntimeException);
+        virtual ::sal_Int32 SAL_CALL getActiveTerm() throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL setActiveTerm( ::sal_Int32 _ActiveTerm ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+
+    // XElementAccess
+        virtual ::com::sun::star::uno::Type SAL_CALL getElementType(void) throw( ::com::sun::star::uno::RuntimeException );
+        virtual sal_Bool SAL_CALL hasElements(void) throw( ::com::sun::star::uno::RuntimeException );
+
+    // ::com::sun::star::container::XEnumerationAccess
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration> SAL_CALL createEnumeration(void) throw( ::com::sun::star::uno::RuntimeException );
+
+    // ::com::sun::star::container::XContainerListener
+        virtual void SAL_CALL elementInserted(const ::com::sun::star::container::ContainerEvent& rEvent) throw( ::com::sun::star::uno::RuntimeException );
+        virtual void SAL_CALL elementReplaced(const ::com::sun::star::container::ContainerEvent& rEvent) throw( ::com::sun::star::uno::RuntimeException );
+        virtual void SAL_CALL elementRemoved(const ::com::sun::star::container::ContainerEvent& rEvent) throw( ::com::sun::star::uno::RuntimeException );
+
+    // XLoadListener
+        virtual void SAL_CALL loaded(const ::com::sun::star::lang::EventObject& rEvent) throw( ::com::sun::star::uno::RuntimeException );
+        virtual void SAL_CALL unloaded(const ::com::sun::star::lang::EventObject& rEvent) throw( ::com::sun::star::uno::RuntimeException );
+        virtual void SAL_CALL unloading(const ::com::sun::star::lang::EventObject& aEvent) throw( ::com::sun::star::uno::RuntimeException );
+        virtual void SAL_CALL reloading(const ::com::sun::star::lang::EventObject& aEvent) throw( ::com::sun::star::uno::RuntimeException );
+        virtual void SAL_CALL reloaded(const ::com::sun::star::lang::EventObject& aEvent) throw( ::com::sun::star::uno::RuntimeException );
+
+    // XModeSelector
+        virtual void SAL_CALL setMode(const ::rtl::OUString& Mode) throw( ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException );
+        virtual ::rtl::OUString SAL_CALL getMode(void) throw( ::com::sun::star::uno::RuntimeException );
+        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedModes(void) throw( ::com::sun::star::uno::RuntimeException );
+        virtual sal_Bool SAL_CALL supportsMode(const ::rtl::OUString& Mode) throw( ::com::sun::star::uno::RuntimeException );
+
+    // ::com::sun::star::container::XIndexAccess
+        virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException );
+        virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 Index) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
+
+    // XModifyBroadcaster
+        virtual void SAL_CALL addModifyListener(const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener>& l) throw( ::com::sun::star::uno::RuntimeException );
+        virtual void SAL_CALL removeModifyListener(const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener>& l) throw( ::com::sun::star::uno::RuntimeException );
+
+    // XFocusListener
+        virtual void SAL_CALL focusGained(const  ::com::sun::star::awt::FocusEvent& e) throw( ::com::sun::star::uno::RuntimeException );
+        virtual void SAL_CALL focusLost(const  ::com::sun::star::awt::FocusEvent& e) throw( ::com::sun::star::uno::RuntimeException );
+
+    // XMouseListener
+        virtual void SAL_CALL mousePressed( const ::com::sun::star::awt::MouseEvent& _rEvent ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL mouseReleased( const ::com::sun::star::awt::MouseEvent& _rEvent ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL mouseEntered( const ::com::sun::star::awt::MouseEvent& _rEvent ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL mouseExited( const ::com::sun::star::awt::MouseEvent& _rEvent ) throw (::com::sun::star::uno::RuntimeException);
+
+    // XFormComponentValidityListener
+        virtual void SAL_CALL componentValidityChanged( const ::com::sun::star::lang::EventObject& _rSource ) throw (::com::sun::star::uno::RuntimeException);
+
+    // XInteractionHandler
+        virtual void SAL_CALL handle( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& Request ) throw (::com::sun::star::uno::RuntimeException);
+
+    // XGridControlListener
+        virtual void SAL_CALL columnChanged( const ::com::sun::star::lang::EventObject& _event ) throw (::com::sun::star::uno::RuntimeException);
+
+    // ::com::sun::star::beans::XPropertyChangeListener -> aenderung der stati
+        virtual void SAL_CALL propertyChange(const  ::com::sun::star::beans::PropertyChangeEvent& evt) throw( ::com::sun::star::uno::RuntimeException );
+
+    // XTextListener		   -> modify setzen
+        virtual void SAL_CALL textChanged(const  ::com::sun::star::awt::TextEvent& rEvent) throw( ::com::sun::star::uno::RuntimeException );
+
+    // XItemListener			-> modify setzen
+        virtual void SAL_CALL itemStateChanged(const  ::com::sun::star::awt::ItemEvent& rEvent) throw( ::com::sun::star::uno::RuntimeException );
+
+    // XModifyListener   -> modify setzen
+        virtual void SAL_CALL modified(const ::com::sun::star::lang::EventObject& rEvent) throw( ::com::sun::star::uno::RuntimeException );
+
+    // XFormController
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormOperations > SAL_CALL getFormOperations() throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl> SAL_CALL getCurrentControl(void) throw( ::com::sun::star::uno::RuntimeException );
+        virtual void SAL_CALL addActivateListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormControllerListener>& l) throw( ::com::sun::star::uno::RuntimeException );
+        virtual void SAL_CALL removeActivateListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormControllerListener>& l) throw( ::com::sun::star::uno::RuntimeException );
+        virtual void SAL_CALL addChildController( const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController >& _ChildController ) throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException );
+
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormControllerContext > SAL_CALL getContext() throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL setContext( const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormControllerContext >& _context ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler > SAL_CALL getInteractionHandler() throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL setInteractionHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& _interactionHandler ) throw (::com::sun::star::uno::RuntimeException);
+
+    // XTabController
+        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl> > SAL_CALL getControls(void) throw( ::com::sun::star::uno::RuntimeException );
+
+        virtual void SAL_CALL setModel(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabControllerModel>& Model) throw( ::com::sun::star::uno::RuntimeException );
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabControllerModel> SAL_CALL getModel() throw( ::com::sun::star::uno::RuntimeException );
+
+        virtual void SAL_CALL setContainer(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer>& Container) throw( ::com::sun::star::uno::RuntimeException );
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer> SAL_CALL getContainer() throw( ::com::sun::star::uno::RuntimeException );
+
+        virtual void SAL_CALL autoTabOrder() throw( ::com::sun::star::uno::RuntimeException );
+        virtual void SAL_CALL activateTabOrder() throw( ::com::sun::star::uno::RuntimeException );
+
+        virtual void SAL_CALL activateFirst() throw( ::com::sun::star::uno::RuntimeException );
+        virtual void SAL_CALL activateLast() throw( ::com::sun::star::uno::RuntimeException );
+
+    // com::sun::star::sdbc::XRowSetListener
+        virtual void SAL_CALL cursorMoved(const ::com::sun::star::lang::EventObject& event) throw( ::com::sun::star::uno::RuntimeException );
+        virtual void SAL_CALL rowChanged(const ::com::sun::star::lang::EventObject& event) throw( ::com::sun::star::uno::RuntimeException );
+        virtual void SAL_CALL rowSetChanged(const ::com::sun::star::lang::EventObject& event) throw( ::com::sun::star::uno::RuntimeException );
+
+    // XRowSetApproveListener
+        virtual sal_Bool SAL_CALL approveCursorMove(const ::com::sun::star::lang::EventObject& event) throw( ::com::sun::star::uno::RuntimeException );
+        virtual sal_Bool SAL_CALL approveRowChange(const  ::com::sun::star::sdb::RowChangeEvent& event) throw( ::com::sun::star::uno::RuntimeException );
+        virtual sal_Bool SAL_CALL approveRowSetChange(const ::com::sun::star::lang::EventObject& event) throw( ::com::sun::star::uno::RuntimeException );
+
+    // XRowSetApproveBroadcaster
+        virtual void SAL_CALL addRowSetApproveListener(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XRowSetApproveListener>& listener) throw( ::com::sun::star::uno::RuntimeException );
+        virtual void SAL_CALL removeRowSetApproveListener(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XRowSetApproveListener>& listener) throw( ::com::sun::star::uno::RuntimeException );
+
+    // XSQLErrorBroadcaster
+        virtual void SAL_CALL errorOccured(const ::com::sun::star::sdb::SQLErrorEvent& aEvent) throw( ::com::sun::star::uno::RuntimeException );
+
+    // XSQLErrorListener
+        virtual void SAL_CALL addSQLErrorListener(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSQLErrorListener>& _rListener) throw( ::com::sun::star::uno::RuntimeException );
+        virtual void SAL_CALL removeSQLErrorListener(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSQLErrorListener>& _rListener) throw( ::com::sun::star::uno::RuntimeException );
+
+    // XDatabaseParameterBroadcaster2
+        virtual void SAL_CALL addDatabaseParameterListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XDatabaseParameterListener>& aListener) throw( ::com::sun::star::uno::RuntimeException );
+        virtual void SAL_CALL removeDatabaseParameterListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XDatabaseParameterListener>& aListener) throw( ::com::sun::star::uno::RuntimeException );
+
+    // XDatabaseParameterBroadcaster
+        virtual void SAL_CALL addParameterListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XDatabaseParameterListener>& aListener) throw( ::com::sun::star::uno::RuntimeException );
+        virtual void SAL_CALL removeParameterListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XDatabaseParameterListener>& aListener) throw( ::com::sun::star::uno::RuntimeException );
+
+    // XDatabaseParameterListener
+        virtual sal_Bool SAL_CALL approveParameter(const ::com::sun::star::form::DatabaseParameterEvent& aEvent) throw( ::com::sun::star::uno::RuntimeException );
+
+    // XConfirmDeleteBroadcaster
+        virtual void SAL_CALL addConfirmDeleteListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XConfirmDeleteListener>& aListener) throw( ::com::sun::star::uno::RuntimeException );
+        virtual void SAL_CALL removeConfirmDeleteListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XConfirmDeleteListener>& aListener) throw( ::com::sun::star::uno::RuntimeException );
+
+    // XConfirmDeleteListener
+        virtual sal_Bool SAL_CALL confirmDelete(const  ::com::sun::star::sdb::RowChangeEvent& aEvent) throw( ::com::sun::star::uno::RuntimeException );
+
+    // XServiceInfo
+        virtual sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw(::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString	SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString >	SAL_CALL getSupportedServiceNames(void) throw(::com::sun::star::uno::RuntimeException);
+
+    // XResetListener
+        virtual sal_Bool SAL_CALL approveReset(const ::com::sun::star::lang::EventObject& rEvent) throw( ::com::sun::star::uno::RuntimeException );
+        virtual void SAL_CALL resetted(const ::com::sun::star::lang::EventObject& rEvent) throw( ::com::sun::star::uno::RuntimeException );
+
+        // XFeatureInvalidation
+        virtual void SAL_CALL invalidateFeatures( const ::com::sun::star::uno::Sequence< ::sal_Int16 >& Features ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL invalidateAllFeatures(  ) throw (::com::sun::star::uno::RuntimeException);
+
+// method for registration
+        static  ::com::sun::star::uno::Sequence< ::rtl::OUString >	getSupportedServiceNames_Static(void);
+
+        // comphelper::OPropertyArrayUsageHelper
+        virtual void fillProperties(
+            ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rProps,
+            ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rAggregateProps
+            ) const;
+
+    protected:
+        // DispatchInterceptor
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch>
+            interceptedQueryDispatch(
+                    const ::com::sun::star::util::URL& aURL,
+                    const ::rtl::OUString& aTargetFrameName,
+                    sal_Int32 nSearchFlags
+                )   throw( ::com::sun::star::uno::RuntimeException );
+
+        virtual ::osl::Mutex* getInterceptorMutex() { return &m_aMutex; }
+
+        /// update all our dispatchers
+        void    updateAllDispatchers() const;
+
+        /** disposes all dispatchers in m_aFeatureDispatchers, and empties m_aFeatureDispatchers
+        */
+        void    disposeAllFeaturesAndDispatchers() SAL_THROW(());
+
+        void startFiltering();
+        void stopFiltering();
+        void setFilter(::std::vector<FmFieldInfo>&);
+        void startListening();
+        void stopListening();
+
+        /** ensures that we have an interaction handler, if possible
+
+            If an interaction handler was provided at creation time (<member>initialize</member>), this
+            one will be used. Else, an attempt is made to create an <type scope="com::sun::star::sdb">InteractionHandler</type>
+            is made.
+
+            @return <TRUE/>
+                if and only if <member>m_xInteractionHandler</member> is valid when the method returns
+        */
+        bool ensureInteractionHandler();
+
+        /** replaces one of our controls with another one
+
+            Upon successful replacing, the old control will be disposed. Also, internal members pointing
+            to the current or active control will be adjusted. Yet more, if the replaced control was
+            the active control, the new control will be made active.
+
+            @param _rxExistentControl
+                The control to replace. Must be one of the controls in our ControlContainer.
+            @param _rxNewControl
+                The control which should replace the existent control.
+            @return
+                <TRUE/> if and only if the control was successfully replaced
+        */
+        bool    replaceControl(
+            const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _rxExistentControl,
+            const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _rxNewControl
+        );
+
+        // we're listening at all bound controls for modifications
+        void startControlModifyListening(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& xControl);
+        void stopControlModifyListening(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& xControl);
+
+        void setLocks();
+        void setControlLock(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& xControl);
+        void addToEventAttacher(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& xControl);
+        void removeFromEventAttacher(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& xControl);
+        void toggleAutoFields(sal_Bool bAutoFields);
+        void unload() throw( ::com::sun::star::uno::RuntimeException );
+        void removeBoundFieldListener();
+
+        void startFormListening( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxForm, sal_Bool _bPropertiesOnly  );
+        void stopFormListening( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxForm, sal_Bool _bPropertiesOnly );
+
+        ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl> findControl( ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl> >& rCtrls, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel>& rxCtrlModel, sal_Bool _bRemove, sal_Bool _bOverWrite ) const;
+
+        void insertControl(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& xControl);
+        void removeControl(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& xControl);
+
+        /// called when a new control is to be handled by the controller
+        void implControlInserted( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& _rxControl, bool _bAddToEventAttacher );
+        /// called when a control is not to be handled by the controller anymore
+        void implControlRemoved( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& _rxControl, bool _bRemoveFromEventAttacher );
+
+        /** sets m_xCurrentControl, plus does administrative tasks depending on it
+        */
+        void    implSetCurrentControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _rxControl );
+
+        /** invalidates the FormFeatures which depend on the current control
+        */
+        void    implInvalidateCurrentControlDependentFeatures();
+
+        bool    impl_isDisposed_nofail() const { return FormController_BASE::rBHelper.bDisposed; }
+        void    impl_checkDisposed_throw() const;
+
+        void    impl_onModify();
+
+        /** adds the given filter row to m_aFilterRows, setting m_nCurrentFilterPosition to 0 if the newly added
+            row is the first one.
+
+            @precond
+                our mutex is locked
+        */
+        void    impl_addFilterRow( const FmFilterRow& _row );
+
+        /** adds an empty filter row to m_aFilterRows, and notifies our listeners
+        */
+        void    impl_appendEmptyFilterRow( ::osl::ClearableMutexGuard& _rClearBeforeNotify );
+
+        sal_Bool isLocked() const {return m_bLocked;}
+        sal_Bool determineLockState() const;
+
+        Window* getDialogParentWindow();
+            // returns the window which should be used as parent window for dialogs
+
+        ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterceptor>	createInterceptor(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterception>& _xInterception);
+            // create a new interceptor, register it on the given object
+        void							deleteInterceptor(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterception>& _xInterception);
+            // if createInterceptor was called for the given object the according interceptor will be removed
+            // from the objects interceptor chain and released
+
+        /** checks all form controls belonging to our form for validity
+
+            If a form control supports the XValidatableFormComponent interface, this is used to determine
+            the validity of the control. If the interface is not supported, the control is supposed to be
+            valid.
+
+            @param _rFirstInvalidityExplanation
+                if the method returns <FALSE/> (i.e. if there is an invalid control), this string contains
+                the explanation for the invalidity, as obtained from the validator.
+
+            @param _rxFirstInvalidModel
+                if the method returns <FALSE/> (i.e. if there is an invalid control), this contains
+                the control model
+
+            @return
+                <TRUE/> if and only if all controls belonging to our form are valid
+        */
+        bool    checkFormComponentValidity(
+                    ::rtl::OUString& /* [out] */ _rFirstInvalidityExplanation,
+                    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& /* [out] */ _rxFirstInvalidModel
+                ) SAL_THROW(());
+
+        /** locates the control which belongs to a given model
+        */
+        ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >
+                locateControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& _rxModel ) SAL_THROW(());
+
+        // set the text for all filters
+        void impl_setTextOnAllFilter_throw();
+
+        // in filter mode we do not listen for changes
+        sal_Bool isListeningForChanges() const {return m_bDBConnection && !m_bFiltering && !isLocked();}
+        ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl> isInList(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer>& xPeer) const;
+
+        DECL_LINK( OnActivateTabOrder, void* );
+        DECL_LINK( OnInvalidateFeatures, void* );
+        DECL_LINK( OnLoad, void* );
+        DECL_LINK( OnToggleAutoFields, void* );
+        DECL_LINK( OnActivated, void* );
+        DECL_LINK( OnDeactivated, void* );
+    };
+
+}   // namespace svxform
+
+#endif	// _SVX_FMCTRLER_HXX
+
diff --git a/svx/source/inc/formcontrolling.hxx b/svx/source/inc/formcontrolling.hxx
index eb99d80fd0..836ffc578f 100644
--- a/svx/source/inc/formcontrolling.hxx
+++ b/svx/source/inc/formcontrolling.hxx
@@ -6,9 +6,6 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: formcontrolling.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -31,7 +28,7 @@
 #ifndef SVX_FORMCONTROLLING_HXX
 #define SVX_FORMCONTROLLING_HXX
 
-#include <com/sun/star/form/XFormController.hpp>
+#include <com/sun/star/form/runtime/XFormController.hpp>
 #include <com/sun/star/form/XForm.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/form/runtime/FeatureState.hpp>
@@ -117,7 +114,7 @@ namespace svx
             IControllerFeatureInvalidation* _pInvalidationCallback
         );
 
-        /** constructs the instance from a <type scope="com::sun::star::form">XFormController<type> instance
+        /** constructs the instance from a <type scope="com::sun::star::form::runtime">XFormController<type> instance
 
             @param _rxORB
                 a multi service factory for creating various needed components
@@ -131,7 +128,7 @@ namespace svx
         */
         ControllerFeatures( 
             const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormController >& _rxController,
+            const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController >& _rxController,
             IControllerFeatureInvalidation* _pInvalidationCallback
         );
 
@@ -163,7 +160,7 @@ namespace svx
         /** assign to a controller
         */
         void assign(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormController >& _rxController
+            const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController >& _rxController
         );
 
         /** assign to a controller
@@ -206,7 +203,7 @@ namespace svx
         ::com::sun::star::uno::Any      m_aOperationError;
 
     public:
-        /** constructs the helper from a <type scope="com::sun::star::form">XFormController<type> instance
+        /** constructs the helper from a <type scope="com::sun::star::form::runtime">XFormController<type> instance
 
             @param _rContext
                 the context the component lives in
@@ -218,7 +215,7 @@ namespace svx
         */
         FormControllerHelper(
             const ::comphelper::ComponentContext& _rContext,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormController >& _rxController,
+            const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController >& _rxController,
             IControllerFeatureInvalidation* _pInvalidationCallback
         );
 
diff --git a/svx/source/inc/formdispatchinterceptor.hxx b/svx/source/inc/formdispatchinterceptor.hxx
new file mode 100644
index 0000000000..21a74fdeaa
--- /dev/null
+++ b/svx/source/inc/formdispatchinterceptor.hxx
@@ -0,0 +1,118 @@
+/*************************************************************************
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+* 
+* Copyright 2009 by Sun Microsystems, Inc.
+*
+* 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_FORMDISPATCHINTERCEPTOR_HXX
+#define SVX_FORMDISPATCHINTERCEPTOR_HXX
+
+/** === begin UNO includes === **/
+#include <com/sun/star/frame/XDispatchProviderInterceptor.hpp>
+#include <com/sun/star/frame/XDispatchProviderInterception.hpp>
+/** === end UNO includes === **/
+
+#include <cppuhelper/compbase2.hxx>
+#include <comphelper/uno3.hxx>
+
+//........................................................................
+namespace svxform
+{
+//........................................................................
+
+    //====================================================================
+    //= DispatchInterceptor
+    //====================================================================
+    class DispatchInterceptor
+    {
+    public:
+        DispatchInterceptor() { }
+
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch> interceptedQueryDispatch(
+            const ::com::sun::star::util::URL& aURL, const ::rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( ::com::sun::star::uno::RuntimeException ) = 0;
+
+        virtual ::osl::Mutex* getInterceptorMutex() = 0;
+    };
+
+    //====================================================================
+    //= 
+    //====================================================================
+    typedef ::cppu::WeakComponentImplHelper2<	::com::sun::star::frame::XDispatchProviderInterceptor
+                                            ,	::com::sun::star::lang::XEventListener
+                                            >	DispatchInterceptionMultiplexer_BASE;
+
+    class DispatchInterceptionMultiplexer : public DispatchInterceptionMultiplexer_BASE
+    {
+        ::osl::Mutex	m_aFallback;
+        ::osl::Mutex*   m_pMutex;
+
+        // the component which's dispatches we're intercepting
+        ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XDispatchProviderInterception >
+                        m_xIntercepted;
+        sal_Bool		m_bListening;
+
+        // the real interceptor
+        DispatchInterceptor*			m_pMaster;
+
+        // chaining
+        ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider>			m_xSlaveDispatcher;
+        ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider>			m_xMasterDispatcher;
+
+        virtual ~DispatchInterceptionMultiplexer();
+
+    public:
+        ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterception> getIntercepted() const { return m_xIntercepted; }
+
+    public:
+        DispatchInterceptionMultiplexer(
+            const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterception>& _rToIntercept,
+            DispatchInterceptor* _pMaster
+        );
+
+        // UNO
+        DECLARE_UNO3_DEFAULTS(DispatchInterceptionMultiplexer, DispatchInterceptionMultiplexer_BASE);
+
+        // ::com::sun::star::frame::XDispatchProvider
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& aURL, const ::rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw(::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches( const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor >& aDescripts ) throw(::com::sun::star::uno::RuntimeException);
+
+        // ::com::sun::star::frame::XDispatchProviderInterceptor
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL getSlaveDispatchProvider(  ) throw(::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL setSlaveDispatchProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xNewDispatchProvider ) throw(::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL getMasterDispatchProvider(	) throw(::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL setMasterDispatchProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xNewSupplier ) throw(::com::sun::star::uno::RuntimeException);
+
+        // ::com::sun::star::lang::XEventListener
+        virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException);
+
+        // OComponentHelper
+        virtual void SAL_CALL disposing();
+
+    protected:
+        void ImplDetach();
+    };
+
+//........................................................................
+} // namespace svxform
+//........................................................................
+
+#endif // SVX_FORMDISPATCHINTERCEPTOR_HXX
diff --git a/svx/source/inc/fmdispatch.hxx b/svx/source/inc/formfeaturedispatcher.hxx
index 760ae30573..b41f316d98 100644
--- a/svx/source/inc/fmdispatch.hxx
+++ b/svx/source/inc/formfeaturedispatcher.hxx
@@ -6,9 +6,6 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmdispatch.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -31,19 +28,20 @@
 #ifndef SVX_FMDISPATCH_HXX
 #define SVX_FMDISPATCH_HXX
 
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/interfacecontainer.hxx>
+/** === begin UNO includes === **/
 #include <com/sun/star/frame/XDispatch.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
+#include <com/sun/star/form/runtime/XFormOperations.hpp>
+/** === end UNO includes === **/
 
+#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/interfacecontainer.hxx>
 
 //........................................................................
 namespace svx
 {
 //........................................................................
 
-    class FormControllerHelper;
-
     //====================================================================
     //= OSingleFeatureDispatcher
     //====================================================================
@@ -55,10 +53,11 @@ namespace svx
     private:
         ::osl::Mutex&                       m_rMutex;
         ::cppu::OInterfaceContainerHelper   m_aStatusListeners;
-        const FormControllerHelper&         m_rController;
+        ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormOperations >
+                                            m_xFormOperations;
         const ::com::sun::star::util::URL   m_aFeatureURL;
         ::com::sun::star::uno::Any          m_aLastKnownState;
-        const sal_Int32                     m_nFeatureId;
+        const sal_Int16                     m_nFormFeature;
         sal_Bool                            m_bLastKnownEnabled;
         sal_Bool                            m_bDisposed;
 
@@ -80,9 +79,9 @@ namespace svx
         */
         OSingleFeatureDispatcher(
             const ::com::sun::star::util::URL& _rFeatureURL,
-            sal_Int32 _nFeatureId,
-            const FormControllerHelper& _rController,
-                  ::osl::Mutex& _rMutex
+            const sal_Int16 _nFormFeature,
+            const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormOperations >& _rxFormOperations,
+            ::osl::Mutex& _rMutex
         );
 
         /** disposes the dispatcher instance
diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx
index d708ffa737..db54b3780f 100644
--- a/svx/source/inc/gridcell.hxx
+++ b/svx/source/inc/gridcell.hxx
@@ -35,7 +35,6 @@
 
 #include "sqlparserclient.hxx"
 #include "typeconversionclient.hxx"
-#include "svx/fmtools.hxx"
 
 /** === begin UNO includes === **/
 #include <com/sun/star/sdb/XColumn.hpp>
@@ -51,6 +50,7 @@
 #include <com/sun/star/beans/XFastPropertySet.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/form/XChangeBroadcaster.hpp>
+#include <com/sun/star/awt/XWindow.hpp>
 /** === end UNO includes === **/
 
 #include <comphelper/propmultiplex.hxx>
diff --git a/svx/source/inc/tabwin.hxx b/svx/source/inc/tabwin.hxx
index 6316799a57..c2616ec995 100644
--- a/svx/source/inc/tabwin.hxx
+++ b/svx/source/inc/tabwin.hxx
@@ -37,9 +37,6 @@
 #include <sfx2/ctrlitem.hxx>
 #include <com/sun/star/form/XForm.hpp>
 
-//#ifndef _SVX_FMTOOLS_HXX
-//#include "svx/fmtools.hxx"
-//#endif
 #include <comphelper/propmultiplex.hxx>
 #include <svtools/transfer.hxx>
 #include "svx/dbtoolsclient.hxx"
diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx
index 21b544a91d..fbffa0b23a 100644..100755
--- a/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx
@@ -40,6 +40,8 @@
 #include <svx/svdoole2.hxx>
 #include <svx/svdview.hxx>
 
+#include "fmobj.hxx"
+
 //////////////////////////////////////////////////////////////////////////////
 
 namespace sdr
@@ -91,8 +93,9 @@ namespace sdr
                 const bool bHideOle(rSdrView.getHideOle());
                 const bool bHideChart(rSdrView.getHideChart());
                 const bool bHideDraw(rSdrView.getHideDraw());
+                const bool bHideFormControl(rSdrView.getHideFormControl());
 
-                if(bHideOle || bHideChart || bHideDraw)
+                if(bHideOle || bHideChart || bHideDraw || bHideFormControl)
                 {
                     if(OBJ_OLE2 == rObject.GetObjIdentifier())
                     {
@@ -123,8 +126,13 @@ namespace sdr
                     }
                     else
                     {
+                        const bool bIsFormControl = dynamic_cast< const FmFormObj * >( &rObject ) != 0;
+                        if(bIsFormControl && bHideFormControl)
+                        {
+                            return false;
+                        }
                         // any other draw object
-                        if(bHideDraw)
+                        if(!bIsFormControl && bHideDraw)
                         {
                             return false;
                         }
diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
index 9bcb4ce6b7..6dbb1298a0 100644
--- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
@@ -303,8 +303,8 @@ namespace sdr { namespace contact {
         // no check whether we're valid, this is the responsibility of the caller
 
         // Argh. Why does XView have a setZoom only, but not a getZoom?
-        Window* pWindow = VCLUnoHelper::GetWindow( m_xControlWindow );
-        OSL_ENSURE( pWindow, "ControlHolder::setZoom: no implementation access!" );
+        Window* pWindow = VCLUnoHelper::GetWindow( m_xControl->getPeer() );
+        OSL_ENSURE( pWindow, "ControlHolder::getZoom: no implementation access!" );
 
         ::basegfx::B2DVector aZoom( 1, 1 );
         if ( pWindow )
@@ -351,6 +351,12 @@ namespace sdr { namespace contact {
         if ( !_rControl.is() )
             return;
 
+    #if OSL_DEBUG_LEVEL > 0
+        ::basegfx::B2DTuple aViewScale, aViewTranslate;
+        double nViewRotate(0), nViewShearX(0);
+        _rViewTransformation.decompose( aViewScale, aViewTranslate, nViewRotate, nViewShearX );
+    #endif
+
         // transform the logic bound rect, using the view transformation, to pixel coordinates
         ::basegfx::B2DPoint aTopLeft( _rLogicBoundingRect.Left(), _rLogicBoundingRect.Top() );
         aTopLeft *= _rViewTransformation;
@@ -615,7 +621,7 @@ namespace sdr { namespace contact {
 
             Failure of this method will be reported via an assertion in a non-product version.
         */
-        bool    ensureControl();
+        bool    ensureControl( const basegfx::B2DHomMatrix* _pInitialViewTransformationOrNULL );
 
         /** returns our XControl, if it already has been created
 
@@ -652,20 +658,14 @@ namespace sdr { namespace contact {
         */
         bool    isControlVisible() const { return impl_isControlVisible_nofail(); }
 
-        /** determines whether the instance belongs to a given OutputDevice
-            @precond
-                The instance knows the device it belongs to, or can determine it.
-                If this is not the case, you will notice an assertion, and the method will
-                return false.
-        */
-        bool    belongsToDevice( const OutputDevice* _pDevice ) const;
-
         /// creates an XControl for the given device and SdrUnoObj
         static bool
                 createControlForDevice(
                     IPageViewAccess& _rPageView,
                     const OutputDevice& _rDevice,
                     const SdrUnoObj& _rUnoObject,
+                    const basegfx::B2DHomMatrix& _rInitialViewTransformation,
+                    const basegfx::B2DHomMatrix& _rInitialZoomNormalization,
                     ControlHolder& _out_rControl
                 );
 
@@ -840,7 +840,11 @@ namespace sdr { namespace contact {
 
         /** ensures that we have a control for the given PageView/OutputDevice
         */
-        bool impl_ensureControl_nothrow( IPageViewAccess& _rPageView, const OutputDevice& _rDevice );
+        bool impl_ensureControl_nothrow(
+                IPageViewAccess& _rPageView,
+                const OutputDevice& _rDevice,
+                const basegfx::B2DHomMatrix& _rInitialViewTransformation
+             );
 
         /** retrieves the device which a PageView belongs to, starting from its ObjectContactOfPageView
 
@@ -1026,8 +1030,8 @@ namespace sdr { namespace contact {
     //--------------------------------------------------------------------
     void ViewObjectContactOfUnoControl_Impl::positionAndZoomControl( const basegfx::B2DHomMatrix& _rViewTransformation ) const
     {
-        OSL_PRECOND( ( m_pOutputDeviceForWindow != NULL ) && m_aControl.is(), "ViewObjectContactOfUnoControl_Impl::positionAndZoomControl: no output device or no control!" );
-        if ( ( m_pOutputDeviceForWindow == NULL ) || !m_aControl.is() )
+        OSL_PRECOND( m_aControl.is(), "ViewObjectContactOfUnoControl_Impl::positionAndZoomControl: no output device or no control!" );
+        if ( !m_aControl.is() )
             return;
 
         try
@@ -1047,7 +1051,7 @@ namespace sdr { namespace contact {
     }
 
     //--------------------------------------------------------------------
-    bool ViewObjectContactOfUnoControl_Impl::ensureControl()
+    bool ViewObjectContactOfUnoControl_Impl::ensureControl( const basegfx::B2DHomMatrix* _pInitialViewTransformationOrNULL )
     {
         OSL_PRECOND( !impl_isDisposed_nofail(), "ViewObjectContactOfUnoControl_Impl::ensureControl: already disposed()" );
         if ( impl_isDisposed_nofail() )
@@ -1057,16 +1061,20 @@ namespace sdr { namespace contact {
         if ( pPageViewContact )
         {
             SdrPageViewAccess aPVAccess( pPageViewContact->GetPageWindow().GetPageView() );
+            const OutputDevice& rDevice( impl_getPageViewOutputDevice_nothrow( *pPageViewContact ) );
             return impl_ensureControl_nothrow(
                 aPVAccess,
-                impl_getPageViewOutputDevice_nothrow( *pPageViewContact )
+                rDevice,
+                _pInitialViewTransformationOrNULL ? *_pInitialViewTransformationOrNULL : rDevice.GetViewTransformation()
             );
         }
 
         DummyPageViewAccess aNoPageView;
+        const OutputDevice& rDevice( impl_getOutputDevice_throw() );
         return impl_ensureControl_nothrow(
             aNoPageView,
-            impl_getOutputDevice_throw()
+            rDevice,
+            _pInitialViewTransformationOrNULL ? *_pInitialViewTransformationOrNULL : rDevice.GetViewTransformation()
         );
     }
 
@@ -1109,7 +1117,8 @@ namespace sdr { namespace contact {
     }
 
     //--------------------------------------------------------------------
-    bool ViewObjectContactOfUnoControl_Impl::impl_ensureControl_nothrow( IPageViewAccess& _rPageView, const OutputDevice& _rDevice )
+    bool ViewObjectContactOfUnoControl_Impl::impl_ensureControl_nothrow( IPageViewAccess& _rPageView, const OutputDevice& _rDevice,
+        const basegfx::B2DHomMatrix& _rInitialViewTransformation )
     {
         if ( m_bCreatingControl )
         {
@@ -1153,7 +1162,7 @@ namespace sdr { namespace contact {
             return false;
 
         ControlHolder aControl;
-        if ( !createControlForDevice( _rPageView, _rDevice, *pUnoObject, aControl ) )
+        if ( !createControlForDevice( _rPageView, _rDevice, *pUnoObject, _rInitialViewTransformation, m_aZoomLevelNormalization, aControl ) )
             return false;
 
         m_pOutputDeviceForWindow = &_rDevice;
@@ -1188,7 +1197,8 @@ namespace sdr { namespace contact {
 
     //--------------------------------------------------------------------
     bool ViewObjectContactOfUnoControl_Impl::createControlForDevice( IPageViewAccess& _rPageView,
-        const OutputDevice& _rDevice, const SdrUnoObj& _rUnoObject, ControlHolder& _out_rControl )
+        const OutputDevice& _rDevice, const SdrUnoObj& _rUnoObject, const basegfx::B2DHomMatrix& _rInitialViewTransformation,
+        const basegfx::B2DHomMatrix& _rInitialZoomNormalization, ControlHolder& _out_rControl )
     {
         _out_rControl.clear();
 
@@ -1212,8 +1222,8 @@ namespace sdr { namespace contact {
             UnoControlContactHelper::adjustControlGeometry_throw(
                 _out_rControl,
                 _rUnoObject.GetLogicRect(),
-                _rDevice.GetViewTransformation(),
-                _rDevice.GetInverseViewTransformation()
+                _rInitialViewTransformation,
+                _rInitialZoomNormalization
             );
 
             // #107049# set design mode before peer is created,
@@ -1532,31 +1542,33 @@ namespace sdr { namespace contact {
         VOCGuard aGuard( *this );
         DBG_ASSERT( Event.Source == m_xContainer, "ViewObjectContactOfUnoControl_Impl::elementReplaced: where did this come from?" );
 
-        if ( m_aControl == Event.ReplacedElement )
-        {
-            Reference< XControl > xNewControl( Event.Element, UNO_QUERY );
-            DBG_ASSERT( xNewControl.is(), "ViewObjectContactOfUnoControl_Impl::elementReplaced: invalid new control!" );
-            if ( !xNewControl.is() )
-                return;
+        if ( ! ( m_aControl == Event.ReplacedElement ) )
+            return;
 
-            ENSURE_OR_THROW( m_pOutputDeviceForWindow, "calling this without /me having an output device should be impossible." );
+        Reference< XControl > xNewControl( Event.Element, UNO_QUERY );
+        DBG_ASSERT( xNewControl.is(), "ViewObjectContactOfUnoControl_Impl::elementReplaced: invalid new control!" );
+        if ( !xNewControl.is() )
+            return;
 
-            DBG_ASSERT( xNewControl->getModel() == m_aControl.getModel(), "ViewObjectContactOfUnoControl_Impl::elementReplaced: another model at the new control?" );
-            // another model should - in the drawing layer - also imply another SdrUnoObj, which
-            // should also result in new ViewContact, and thus in new ViewObjectContacts
+        ENSURE_OR_THROW( m_pOutputDeviceForWindow, "calling this without /me having an output device should be impossible." );
 
-            impl_switchControlListening_nothrow( false );
+        DBG_ASSERT( xNewControl->getModel() == m_aControl.getModel(), "ViewObjectContactOfUnoControl_Impl::elementReplaced: another model at the new control?" );
+        // another model should - in the drawing layer - also imply another SdrUnoObj, which
+        // should also result in new ViewContact, and thus in new ViewObjectContacts
 
-            ControlHolder aNewControl( xNewControl );
-            aNewControl.setZoom( m_aControl.getZoom() );
-            aNewControl.setPosSize( m_aControl.getPosSize() );
-            aNewControl.setDesignMode( impl_isControlDesignMode_nothrow() );
+        impl_switchControlListening_nothrow( false );
 
-            m_aControl = xNewControl;
-            m_bControlIsVisible = m_aControl.isVisible();
+        ControlHolder aNewControl( xNewControl );
+        aNewControl.setZoom( m_aControl.getZoom() );
+        aNewControl.setPosSize( m_aControl.getPosSize() );
+        aNewControl.setDesignMode( impl_isControlDesignMode_nothrow() );
 
-            impl_switchControlListening_nothrow( true );
-        }
+        m_aControl = xNewControl;
+        m_bControlIsVisible = m_aControl.isVisible();
+
+        impl_switchControlListening_nothrow( true );
+
+        m_pAntiImpl->onControlChangedOrModified( ViewObjectContactOfUnoControl::ImplAccess() );
     }
 
     //--------------------------------------------------------------------
@@ -1656,7 +1668,7 @@ namespace sdr { namespace contact {
     #endif
         // force control here to make it a VCL ChildWindow. Will be fetched
         // and used below by getExistentControl()
-        m_pVOCImpl->ensureControl();
+        m_pVOCImpl->ensureControl( &_rViewInformation.getObjectToViewTransformation() );
         impl_positionAndZoomControl( _rViewInformation );
 
         // get needed data
@@ -1715,7 +1727,7 @@ namespace sdr { namespace contact {
     Reference< XControl > ViewObjectContactOfUnoControl::getControl()
     {
         VOCGuard aGuard( *m_pImpl );
-        m_pImpl->ensureControl();
+        m_pImpl->ensureControl( NULL );
         return m_pImpl->getExistentControl().getControl();
     }
 
@@ -1726,7 +1738,8 @@ namespace sdr { namespace contact {
         ControlHolder aControl;
 
         InvisibleControlViewAccess aSimulatePageView( _inout_ControlContainer );
-        OSL_VERIFY( ViewObjectContactOfUnoControl_Impl::createControlForDevice( aSimulatePageView, _rWindow, _rUnoObject, aControl ) );
+        OSL_VERIFY( ViewObjectContactOfUnoControl_Impl::createControlForDevice( aSimulatePageView, _rWindow, _rUnoObject,
+            _rWindow.GetViewTransformation(), _rWindow.GetInverseViewTransformation(), aControl ) );
         return aControl.getControl();
     }
 
@@ -1819,14 +1832,7 @@ namespace sdr { namespace contact {
     //--------------------------------------------------------------------
     void ViewObjectContactOfUnoControl::propertyChange()
     {
-        // graphical invalidate at all views
-        ActionChanged();
-
-        // #i93318# flush Primitive2DSequence to force recreation with updated XControlModel
-        // since e.g. background color has changed and existing decompositions are possibly no
-        // longer valid. Unfortunately this is not detected from ControlPrimitive2D::operator==
-        // since it only has a uno reference to the XControlModel
-        flushPrimitive2DSequence();
+        impl_onControlChangedOrModified();
     }
 
     //--------------------------------------------------------------------
@@ -1854,6 +1860,19 @@ namespace sdr { namespace contact {
         }
     }
 
+    //--------------------------------------------------------------------
+    void ViewObjectContactOfUnoControl::impl_onControlChangedOrModified()
+    {
+        // graphical invalidate at all views
+        ActionChanged();
+
+        // #i93318# flush Primitive2DSequence to force recreation with updated XControlModel
+        // since e.g. background color has changed and existing decompositions are possibly no
+        // longer valid. Unfortunately this is not detected from ControlPrimitive2D::operator==
+        // since it only has a uno reference to the XControlModel
+        flushPrimitive2DSequence();
+    }
+
     //====================================================================
     //= UnoControlPrintOrPreviewContact
     //====================================================================
diff --git a/svx/source/src/app.src b/svx/source/src/app.src
index 3c2574e095..6c1a3c1fdb 100644
--- a/svx/source/src/app.src
+++ b/svx/source/src/app.src
@@ -47,26 +47,9 @@ ErrorBox RID_ERRBOX_MODULENOTINSTALLED
         SID_HLINKBAR_SEARCH; \
         SID_HLINKBAR_TARGET; \
         SID_HYPERLINK_DIALOG; \
-        SID_FM_RECORD_ABSOLUTE; \
-        SID_FM_RECORD_FIRST; \
-        SID_FM_RECORD_PREV; \
-        SID_FM_RECORD_NEXT; \
-        SID_FM_RECORD_LAST; \
-        SID_FM_RECORD_SAVE; \
-        SID_FM_RECORD_UNDO; \
-        SID_FM_RECORD_NEW; \
-        SID_FM_RECORD_DELETE; \
-        SID_FM_REFRESH; \
-        SID_FM_SORTUP; \
-        SID_FM_SORTDOWN; \
-        SID_FM_ORDERCRIT; \
-        SID_FM_AUTOFILTER; \
-        SID_FM_FILTERCRIT; \
-        SID_FM_FORM_FILTERED; \
-        SID_FM_REMOVE_FILTER_SORT; \
     };\
     IdCount = {\
-        21;\
+        4;\
     };
 
 ImageList RID_DEFAULTIMAGELIST_SC
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 8d150e506c..f31a663311 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -133,14 +133,8 @@ void SdrGraphicLink::DataChanged( const String& rMimeType,
         Graphic aGraphic;
         if( SvxLinkManager::GetGraphicFromAny( rMimeType, rValue, aGraphic ))
         {
-            GraphicType eOldGraphicType = pGrafObj->GetGraphicType();  // kein Hereinswappen
-            const sal_Bool bIsChanged = pModel->IsChanged();
-
-            pGrafObj->SetGraphic( aGraphic );
-            if( GRAPHIC_NONE != eOldGraphicType )
-                pGrafObj->SetChanged();
-            else
-                pModel->SetChanged( bIsChanged );
+               pGrafObj->NbcSetGraphic( aGraphic );
+            pGrafObj->ActionChanged();
         }
         else if( SotExchange::GetFormatIdFromMimeType( rMimeType ) !=
                     SvxLinkManager::RegisterStatusInfoId() )
@@ -303,11 +297,16 @@ const GraphicObject& SdrGrafObj::GetGraphicObject(bool bForceSwapIn) const
 
 // -----------------------------------------------------------------------------
 
-void SdrGrafObj::SetGraphic( const Graphic& rGrf )
+void SdrGrafObj::NbcSetGraphic( const Graphic& rGrf )
 {
     pGraphic->SetGraphic( rGrf );
     pGraphic->SetUserData();
     mbIsPreview = sal_False;
+}
+
+void SdrGrafObj::SetGraphic( const Graphic& rGrf )
+{
+    NbcSetGraphic(rGrf);
     SetChanged();
     BroadcastObjectChange();
 }
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index dd8a8e2175..b90d70671a 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1749,7 +1749,8 @@ void SdrTextObj::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const b
     // break up matrix
     basegfx::B2DTuple aScale;
     basegfx::B2DTuple aTranslate;
-    double fRotate, fShearX;
+    double fRotate(0.0);
+    double fShearX(0.0);
     rMatrix.decompose(aScale, aTranslate, fRotate, fShearX);
 
     // #i75086# Old DrawingLayer (GeoStat and geometry) does not support holding negative scalings
diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
index f77dc8dc54..eabcdf7632 100644..100755
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -275,7 +275,8 @@ SdrPaintView::SdrPaintView(SdrModel* pModel1, OutputDevice* pOut)
     mbPagePaintingAllowed(true),
     mbHideOle(false),
     mbHideChart(false),
-    mbHideDraw(false)
+    mbHideDraw(false),
+    mbHideFormControl(false)
 {
     DBG_CTOR(SdrPaintView,NULL);
     pMod=pModel1;
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index 00d09251cd..b52302c9dc 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -2575,7 +2575,7 @@ basegfx::B2DPolyPolygon SdrTableObj::getSpecialDragPoly(const SdrDragStat& rDrag
     basegfx::B2DPolyPolygon aRetval;
     const SdrHdl* pHdl = rDrag.GetHdl();
 
-    if(HDL_USER == pHdl->GetKind())
+    if( pHdl && (HDL_USER == pHdl->GetKind()) )
     {
         const TableEdgeHdl* pEdgeHdl = dynamic_cast< const TableEdgeHdl* >( pHdl );
 
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index 6a81a453aa..24939e20db 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -1820,7 +1820,9 @@ bool SvxGraphicObject::getPropertyValueImpl( const ::rtl::OUString& rName, const
             SvMemoryStream aDestStrm( 65535, 65535 );
 
             ConvertGDIMetaFileToWMF( rGraphic.GetGDIMetaFile(), aDestStrm, NULL, sal_False );
-            uno::Sequence<sal_Int8> aSeq((sal_Int8*)aDestStrm.GetData(), aDestStrm.GetSize());
+            const uno::Sequence<sal_Int8> aSeq(
+                static_cast< const sal_Int8* >(aDestStrm.GetData()),
+                aDestStrm.GetEndOfData());
             rValue <<= aSeq;
         }
         break;
diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx
index 96c2caec15..977a11442e 100644
--- a/svx/source/unodraw/unoshap4.cxx
+++ b/svx/source/unodraw/unoshap4.cxx
@@ -315,7 +315,9 @@ bool SvxOle2Shape::getPropertyValueImpl( const ::rtl::OUString& rName, const Sfx
                     }
                     SvMemoryStream aDestStrm( 65535, 65535 );
                     ConvertGDIMetaFileToWMF( aMtf, aDestStrm, NULL, sal_False );
-                    uno::Sequence<sal_Int8> aSeq((sal_Int8*)aDestStrm.GetData(), aDestStrm.GetSize());
+                    const uno::Sequence<sal_Int8> aSeq(
+                        static_cast< const sal_Int8* >(aDestStrm.GetData()),
+                        aDestStrm.GetEndOfData());
                     rValue <<= aSeq;
                 }
             }
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 3cebabe9de..3a33807362 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -681,7 +681,9 @@ uno::Any SvxShape::GetBitmap( sal_Bool bMetaFile /* = sal_False */ ) const throw
     {
         SvMemoryStream aDestStrm( 65535, 65535 );
         ConvertGDIMetaFileToWMF( aMtf, aDestStrm, NULL, sal_False );
-        uno::Sequence<sal_Int8> aSeq((sal_Int8*)aDestStrm.GetData(), aDestStrm.GetSize());
+        const uno::Sequence<sal_Int8> aSeq(
+            static_cast< const sal_Int8* >(aDestStrm.GetData()),
+            aDestStrm.GetEndOfData());
         aAny.setValue( &aSeq, ::getCppuType((const uno::Sequence< sal_Int8 >*)0) );
     }
     else
@@ -3122,7 +3124,9 @@ bool SvxShape::getPropertyValueImpl( const ::rtl::OUString&, const SfxItemProper
                     }
                     SvMemoryStream aDestStrm( 65535, 65535 );
                     ConvertGDIMetaFileToWMF( aMtf, aDestStrm, NULL, sal_False );
-                    uno::Sequence<sal_Int8> aSeq((sal_Int8*)aDestStrm.GetData(), aDestStrm.GetSize());
+                    const uno::Sequence<sal_Int8> aSeq(
+                        static_cast< const sal_Int8* >(aDestStrm.GetData()),
+                        aDestStrm.GetEndOfData());
                     rValue <<= aSeq;
                 }
             }