CWS-TOOLING: integrate CWS dba33fooo/DEV300_m81

20 files changed, 373 insertions, 429 deletions

diff --git a/cui/source/options/dbregisterednamesconfig.cxx b/cui/source/options/dbregisterednamesconfig.cxx
index e67987378..be8e30a65 100644
--- a/cui/source/options/dbregisterednamesconfig.cxx
+++ b/cui/source/options/dbregisterednamesconfig.cxx
@@ -38,8 +38,9 @@
 #include <comphelper/processfactory.hxx>
 #include <svl/eitem.hxx>
 #include <svl/itemset.hxx>
-#include <tools/diagnose_ex.h>
+#include <unotools/pathoptions.hxx>
 #include <unotools/confignode.hxx>
+#include <tools/diagnose_ex.h>
 
 //........................................................................
 namespace svx
diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx
index 90afc61d9..afb90df82 100644
--- a/extensions/source/dbpilots/gridwizard.cxx
+++ b/extensions/source/dbpilots/gridwizard.cxx
@@ -33,6 +33,7 @@
 #include <comphelper/stl_types.hxx>
 #include <tools/string.hxx>
 #include <com/sun/star/form/XGridColumnFactory.hpp>
+#include <com/sun/star/awt/MouseWheelBehavior.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <tools/debug.hxx>
 #include "dbptools.hxx"
@@ -52,6 +53,7 @@ namespace dbp
     using namespace ::com::sun::star::sdbc;
     using namespace ::com::sun::star::container;
     using namespace ::com::sun::star::form;
+    using namespace ::com::sun::star::awt;
     using namespace ::svt;
 
     //=====================================================================
@@ -111,6 +113,7 @@ namespace dbp
         static const ::rtl::OUString s_sDataFieldProperty	= ::rtl::OUString::createFromAscii("DataField");
         static const ::rtl::OUString s_sLabelProperty		= ::rtl::OUString::createFromAscii("Label");
         static const ::rtl::OUString s_sWidthProperty		= ::rtl::OUString::createFromAscii("Width");
+        static const ::rtl::OUString s_sMouseWheelBehavior  = ::rtl::OUString::createFromAscii("MouseWheelBehavior");
         static const ::rtl::OUString s_sEmptyString;
 
         // collect "descriptors" for the to-be-created (grid)columns
@@ -202,23 +205,24 @@ namespace dbp
                 // create a (grid)column for the (resultset)column
                 try
                 {
-                    Reference< XPropertySet > xColumn = xColumnFactory->createColumn(*pColumnServiceName);
+                    Reference< XPropertySet > xColumn( xColumnFactory->createColumn(*pColumnServiceName), UNO_SET_THROW );
+                    Reference< XPropertySetInfo > xColumnPSI( xColumn->getPropertySetInfo(), UNO_SET_THROW );
 
                     ::rtl::OUString sColumnName(*pColumnServiceName);
                     disambiguateName(xExistenceChecker, sColumnName);
 
-                    if (xColumn.is())
-                    {
-                        // the data field the column should be bound to
-                        xColumn->setPropertyValue(s_sDataFieldProperty, makeAny(*pFormFieldName));
-                        // the label
-                        xColumn->setPropertyValue(s_sLabelProperty, makeAny(::rtl::OUString(*pFormFieldName) += *pColumnLabelPostfix));
-                        // the width (<void/> => column will be auto-sized)
-                        xColumn->setPropertyValue(s_sWidthProperty, Any());
-
-                        // insert the column
-                        xColumnContainer->insertByName(sColumnName, makeAny(xColumn));
-                    }
+                    // the data field the column should be bound to
+                    xColumn->setPropertyValue(s_sDataFieldProperty, makeAny(*pFormFieldName));
+                    // the label
+                    xColumn->setPropertyValue(s_sLabelProperty, makeAny(::rtl::OUString(*pFormFieldName) += *pColumnLabelPostfix));
+                    // the width (<void/> => column will be auto-sized)
+                    xColumn->setPropertyValue(s_sWidthProperty, Any());
+
+                    if ( xColumnPSI->hasPropertyByName( s_sMouseWheelBehavior ) )
+                        xColumn->setPropertyValue( s_sMouseWheelBehavior, makeAny( MouseWheelBehavior::SCROLL_DISABLED ) );
+
+                    // insert the column
+                    xColumnContainer->insertByName(sColumnName, makeAny(xColumn));
                 }
                 catch(Exception&)
                 {
diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx
index 5f2d7fd2d..253315f4e 100644
--- a/extensions/source/propctrlr/eventhandler.cxx
+++ b/extensions/source/propctrlr/eventhandler.cxx
@@ -594,7 +594,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_ENSURE( false, "EventHandler::EventHandler: caught an exception while classifying the component!" );
+            DBG_UNHANDLED_EXCEPTION();
         }
     }
 
@@ -825,7 +825,7 @@ namespace pcr
             }
             catch( const Exception& )
             {
-                DBG_ERROR( "EventHandler::getSupportedProperties: caught an exception !" );
+                DBG_UNHANDLED_EXCEPTION();
             }
         }
 
@@ -1048,7 +1048,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_ENSURE( false, "EventHandler::impl_getFormComponentScriptEvents_nothrow: caught an exception!" );
+            DBG_UNHANDLED_EXCEPTION();
         }
     }
 
@@ -1080,7 +1080,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_ENSURE( false, "EventHandler::impl_getCopmonentListenerTypes_nothrow: caught an exception!" );
+            DBG_UNHANDLED_EXCEPTION();
         }
     }
 
@@ -1105,7 +1105,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_ENSURE( false, "EventHandler::impl_getDialogElementScriptEvents_nothrow: caught an exception!" );
+            DBG_UNHANDLED_EXCEPTION();
         }
     }
 
@@ -1120,7 +1120,7 @@ namespace pcr
         {
             Reference< XTabControllerModel > xComponentAsTCModel( m_xComponent, UNO_QUERY_THROW );
             Reference< XFormController > xController(
-                m_aContext.createComponent( (const rtl::OUString&)SERVICE_FORMCONTROLLER ), UNO_QUERY_THROW );
+                m_aContext.createComponent( "com.sun.star.form.runtime.FormController" ), UNO_QUERY_THROW );
             xController->setModel( xComponentAsTCModel );
 
             xReturn = xController;
@@ -1212,7 +1212,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_ENSURE( false, "EventHandler::impl_setFormComponentScriptEvent_nothrow: caught an exception!" );
+            DBG_UNHANDLED_EXCEPTION();
         }
     }
 
diff --git a/extensions/source/propctrlr/pcrstrings.hxx b/extensions/source/propctrlr/pcrstrings.hxx
index f775993c3..97d5e58dc 100644
--- a/extensions/source/propctrlr/pcrstrings.hxx
+++ b/extensions/source/propctrlr/pcrstrings.hxx
@@ -38,9 +38,6 @@ namespace pcr
     // properties
     PCR_CONSTASCII_STRING( PROPERTY_TABBINGMODEL,           "TabbingModel" );
 
-    // services
-    PCR_CONSTASCII_STRING( SERVICE_FORMCONTROLLER,			"com.sun.star.form.FormController" );
-
 //............................................................................
 } // namespace pcr
 //............................................................................
diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx
index 210de6977..b019207e2 100644
--- a/forms/source/component/ComboBox.cxx
+++ b/forms/source/component/ComboBox.cxx
@@ -532,26 +532,11 @@ void OComboBoxModel::loadData( bool _bForce )
                 else
                 {
                     // otherwise look for the alias
-                    Reference<XSQLQueryComposerFactory> xFactory(xConnection, UNO_QUERY);
-                    if (!xFactory.is())
-                        break;
-
-                    Reference<XSQLQueryComposer> xComposer = xFactory->createQueryComposer();
-                    try
-                    {
-                        Reference<XPropertySet> xFormAsSet(xForm, UNO_QUERY);
-                        ::rtl::OUString aStatement;
-                        xFormAsSet->getPropertyValue(PROPERTY_ACTIVECOMMAND) >>= aStatement;
-                        xComposer->setQuery(aStatement);
-                    }
-                    catch(Exception&)
-                    {
-                        disposeComponent(xComposer);
-                        break;
-                    }
+                    Reference<XPropertySet> xFormProp(xForm,UNO_QUERY);
+                    Reference< XColumnsSupplier > xSupplyFields;
+                    xFormProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SingleSelectQueryComposer"))) >>= xSupplyFields;
 
                     // search the field
-                    Reference< XColumnsSupplier > xSupplyFields(xComposer, UNO_QUERY);
                     DBG_ASSERT(xSupplyFields.is(), "OComboBoxModel::loadData : invalid query composer !");
 
                     Reference< XNameAccess > xFieldNames = xSupplyFields->getColumns();
@@ -562,8 +547,6 @@ void OComboBoxModel::loadData( bool _bForce )
                         if (hasProperty(PROPERTY_FIELDSOURCE, xComposerFieldAsSet))
                             xComposerFieldAsSet->getPropertyValue(PROPERTY_FIELDSOURCE) >>= aFieldName;
                     }
-
-                    disposeComponent(xComposer);
                 }
 
                 if (!aFieldName.getLength())
diff --git a/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx
index 528bffa86..12ea4e5a0 100644
--- a/forms/source/component/Filter.cxx
+++ b/forms/source/component/Filter.cxx
@@ -397,17 +397,10 @@ namespace frm
             const Reference< XPropertySet > xFormProps( xForm, UNO_QUERY_THROW );
 
             // create a query composer
-            const Reference< XConnection > xConnection( ::dbtools::getConnection( xForm ), UNO_SET_THROW );
-            const Reference< XSQLQueryComposerFactory >  xFactory( xConnection, UNO_QUERY_THROW );
-            const Reference< XSQLQueryComposer > xComposer( xFactory->createQueryComposer(), UNO_SET_THROW );
-
-            // set the statement on the composer
-            ::rtl::OUString	sStatement;
-            xFormProps->getPropertyValue( PROPERTY_ACTIVECOMMAND ) >>= sStatement;
-            xComposer->setQuery( sStatement );
+            Reference< XColumnsSupplier > xSuppColumns;
+            xFormProps->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SingleSelectQueryComposer"))) >>= xSuppColumns;
 
-            // the field we're bound to
-            const Reference< XColumnsSupplier > xSuppColumns( xComposer, UNO_QUERY_THROW );
+            const Reference< XConnection > xConnection( ::dbtools::getConnection( xForm ), UNO_SET_THROW );
             const Reference< XNameAccess > xFieldNames( xSuppColumns->getColumns(), UNO_SET_THROW );
             if ( !xFieldNames->hasByName( sFieldName ) )
                 return;
@@ -417,7 +410,7 @@ namespace frm
             xComposerFieldProps->getPropertyValue( PROPERTY_TABLENAME ) >>= sTableName;
 
             // obtain the table of the field
-            const Reference< XTablesSupplier > xSuppTables( xComposer, UNO_QUERY_THROW );
+            const Reference< XTablesSupplier > xSuppTables( xSuppColumns, UNO_QUERY_THROW );
             const Reference< XNameAccess > xTablesNames( xSuppTables->getTables(), UNO_SET_THROW );
             const Reference< XNamed > xNamedTable( xTablesNames->getByName( sTableName ), UNO_QUERY_THROW );
             sTableName = xNamedTable->getName();
diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx
index ac7363003..e8fd2f991 100644
--- a/forms/source/component/FormattedField.cxx
+++ b/forms/source/component/FormattedField.cxx
@@ -580,7 +580,7 @@ void OFormattedModel::_propertyChanged( const com::sun::star::beans::PropertyCha
 
                     // as m_aSaveValue (which is used by commitControlValueToDbColumn) is format dependent we have
                     // to recalc it, which is done by translateDbColumnToControlValue
-                    if ( m_xColumn.is() && m_xAggregateFastSet.is() && !m_xCursor->isBeforeFirst() && !m_xCursor->isAfterLast())
+                    if ( m_xColumn.is() && m_xAggregateFastSet.is()  && !m_xCursor->isBeforeFirst() && !m_xCursor->isAfterLast())
                     {
                         setControlValue( translateDbColumnToControlValue(), eOther );
                     }
diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx
index 23a679ba1..38ea86f2a 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -700,25 +700,10 @@ namespace frm
                         else
                         {
                             // otherwise look for the alias
-                            Reference<XSQLQueryComposerFactory> xFactory(xConnection, UNO_QUERY);
-                            if (!xFactory.is())
-                                break;
-
-                            Reference<XSQLQueryComposer> xComposer = xFactory->createQueryComposer();
-                            try
-                            {
-                                ::rtl::OUString aStatement;
-                                xFormProps->getPropertyValue( PROPERTY_ACTIVECOMMAND ) >>= aStatement;
-                                xComposer->setQuery( aStatement );
-                            }
-                            catch(Exception&)
-                            {
-                                disposeComponent(xComposer);
-                                break;
-                            }
+                            Reference< XColumnsSupplier > xSupplyFields;
+                            xFormProps->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SingleSelectQueryComposer"))) >>= xSupplyFields;
 
                             // search the field
-                            Reference<XColumnsSupplier> xSupplyFields(xComposer, UNO_QUERY);
                             DBG_ASSERT(xSupplyFields.is(), "OListBoxModel::loadData : invalid query composer !");
 
                             Reference<XNameAccess> xFieldNames = xSupplyFields->getColumns();
@@ -729,7 +714,6 @@ namespace frm
                                 if (hasProperty(PROPERTY_FIELDSOURCE, xComposerFieldAsSet))
                                     xComposerFieldAsSet->getPropertyValue(PROPERTY_FIELDSOURCE) >>= aFieldName;
                             }
-                            disposeComponent(xComposer);
                         }
                     }
                     if (!aFieldName.getLength())
diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx
index 09f1d452a..770ee6da7 100644
--- a/forms/source/runtime/formoperations.cxx
+++ b/forms/source/runtime/formoperations.cxx
@@ -48,6 +48,8 @@
 #include <com/sun/star/form/XConfirmDeleteListener.hpp>
 #include <com/sun/star/sdb/RowChangeEvent.hpp>
 #include <com/sun/star/sdb/RowChangeAction.hpp>
+#include <com/sun/star/sdb/SQLFilterOperator.hpp>
+#include <com/sun/star/sdbc/DataType.hpp>
 #include <com/sun/star/form/XReset.hpp>
 #include <com/sun/star/beans/XMultiPropertySet.hpp>
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
@@ -94,6 +96,7 @@ namespace frm
     using ::com::sun::star::form::runtime::FeatureState;
     using ::com::sun::star::lang::IllegalArgumentException;
     using ::com::sun::star::sdbc::SQLException;
+    using namespace ::com::sun::star::sdbc;
     using ::com::sun::star::form::XForm;
     using ::com::sun::star::ucb::AlreadyInitializedException;
     using ::com::sun::star::util::XModifyBroadcaster;
@@ -112,6 +115,7 @@ namespace frm
     using ::com::sun::star::sdbcx::XRowLocate;
     using ::com::sun::star::form::XConfirmDeleteListener;
     using ::com::sun::star::sdb::RowChangeEvent;
+    using namespace ::com::sun::star::sdb;
     using ::com::sun::star::form::XReset;
     using ::com::sun::star::beans::XMultiPropertySet;
     using ::com::sun::star::uno::makeAny;
@@ -1684,7 +1688,23 @@ namespace frm
     void FormOperations::impl_appendFilterByColumn_throw( const void* _pActionParam ) const
     {
         const param_appendFilterByColumn* pParam = static_cast< const param_appendFilterByColumn* >( _pActionParam );
-        m_xParser->appendFilterByColumn( pParam->xField, sal_True );
+        sal_Int32 nOp = SQLFilterOperator::EQUAL;
+        if ( pParam->xField.is() )
+        {
+            sal_Int32 nType = 0;
+            pParam->xField->getPropertyValue(PROPERTY_FIELDTYPE) >>= nType;
+            switch(nType)
+            {
+                case DataType::VARCHAR:
+                case DataType::CHAR:
+                case DataType::LONGVARCHAR:
+                    nOp = SQLFilterOperator::LIKE;
+                    break;
+                default:
+                    nOp = SQLFilterOperator::EQUAL;
+            }
+        }
+        m_xParser->appendFilterByColumn( pParam->xField, sal_True,nOp );
     }
 
     //------------------------------------------------------------------------------
diff --git a/wizards/com/sun/star/wizards/common/NumberFormatter.java b/wizards/com/sun/star/wizards/common/NumberFormatter.java
index 8b8b16447..dc20c4619 100644
--- a/wizards/com/sun/star/wizards/common/NumberFormatter.java
+++ b/wizards/com/sun/star/wizards/common/NumberFormatter.java
@@ -201,6 +201,7 @@ public class NumberFormatter
             Locale oLocale = (Locale) Helper.getUnoPropertyValue(xNumberFormat, "Locale");
             int NewFormatKey = defineNumberFormat(FormatString, oLocale);
             XPropertySet xPSet = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, _xFormatObject);
+            xPSet.setPropertyValue("FormatsSupplier", _oNumberFormatter.xNumberFormatter.getNumberFormatsSupplier());
             if (xPSet.getPropertySetInfo().hasPropertyByName("NumberFormat"))
             {
                 xPSet.setPropertyValue("NumberFormat", new Integer(NewFormatKey));
diff --git a/wizards/com/sun/star/wizards/db/DBMetaData.java b/wizards/com/sun/star/wizards/db/DBMetaData.java
index a9eb40cb4..cff3736b9 100644
--- a/wizards/com/sun/star/wizards/db/DBMetaData.java
+++ b/wizards/com/sun/star/wizards/db/DBMetaData.java
@@ -108,7 +108,6 @@ public class DBMetaData
     public com.sun.star.sdb.tools.XConnectionTools ConnectionTools;
     public com.sun.star.lang.XMultiServiceFactory xMSF;
     public XComponent xConnectionComponent;
-    public SQLQueryComposer oSQLQueryComposer;
 
     private XNameAccess m_xTableNames;
     private XInteractionHandler oInteractionHandler;
@@ -1117,7 +1116,6 @@ public class DBMetaData
         ConnectionTools = null;
         xMSF = null;
         xConnectionComponent = null;
-        oSQLQueryComposer = null;
         CommandObjects = null;
     }
 }
diff --git a/wizards/com/sun/star/wizards/db/QueryMetaData.java b/wizards/com/sun/star/wizards/db/QueryMetaData.java
index b4109a46d..a15fe42ae 100644
--- a/wizards/com/sun/star/wizards/db/QueryMetaData.java
+++ b/wizards/com/sun/star/wizards/db/QueryMetaData.java
@@ -36,6 +36,7 @@ import com.sun.star.wizards.common.*;
 public class QueryMetaData extends CommandMetaData
 {
 
+    private SQLQueryComposer oSQLQueryComposer = null;
     FieldColumn CurFieldColumn;
     public String Command;
     // Vector CommandNamesV;
@@ -290,4 +291,10 @@ public class QueryMetaData extends CommandMetaData
         }
         return iAggregate;
     }
+    public SQLQueryComposer getSQLQueryComposer()
+    {
+        if ( oSQLQueryComposer == null )
+            oSQLQueryComposer = new SQLQueryComposer(this);
+        return oSQLQueryComposer;
+    }
 }
diff --git a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
index bce717000..a80623e27 100644
--- a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
+++ b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
@@ -60,7 +60,7 @@ public class SQLQueryComposer
     // String m_sFromClause;
     public XSingleSelectQueryAnalyzer m_xQueryAnalyzer;
     Vector composedCommandNames = new Vector(1);
-    public XSingleSelectQueryComposer m_xQueryComposer;
+    private XSingleSelectQueryComposer m_xQueryComposer;
     XMultiServiceFactory xMSF;
     boolean bincludeGrouping = true;
 
@@ -160,10 +160,8 @@ public class SQLQueryComposer
         {
             for (int i = 0; i < CurDBMetaData.getFilterConditions().length; i++)
             {
-                String sCurFieldName = CurDBMetaData.getFilterConditions()[i][0].Name;
                 m_xQueryComposer.setStructuredFilter(CurDBMetaData.getFilterConditions());
             }
-            String s = m_xQueryAnalyzer.getQuery();
         }
         catch (Exception exception)
         {
@@ -270,9 +268,10 @@ public class SQLQueryComposer
         return m_xQueryAnalyzer.getQuery();
     }
 
-    private String getFromClause()
+    public String getFromClause()
     {
         String sFromClause = "FROM";
+        composedCommandNames.clear();
         String[] sCommandNames = CurDBMetaData.getIncludedCommandNames();
         for (int i = 0; i < sCommandNames.length; i++)
         {
@@ -291,20 +290,27 @@ public class SQLQueryComposer
 
     public boolean setQueryCommand(XWindow _xParentWindow, boolean _bincludeGrouping, boolean _baddAliasFieldNames)
     {
+        return setQueryCommand(_xParentWindow,_bincludeGrouping, _baddAliasFieldNames,true);
+    }
+    public boolean setQueryCommand(XWindow _xParentWindow, boolean _bincludeGrouping, boolean _baddAliasFieldNames, boolean addQuery)
+    {
         try
         {
             String s;
             bincludeGrouping = _bincludeGrouping;
-            String sFromClause = getFromClause();
-            String sSelectClause = getSelectClause(_baddAliasFieldNames);
-            String queryclause = sSelectClause + " " + sFromClause;
-            m_xQueryAnalyzer.setQuery(queryclause);
-            if (CurDBMetaData.getFilterConditions() != null)
+            if ( addQuery )
             {
-                if (CurDBMetaData.getFilterConditions().length > 0)
+                String sFromClause = getFromClause();
+                String sSelectClause = getSelectClause(_baddAliasFieldNames);
+                String queryclause = sSelectClause + " " + sFromClause;
+                m_xQueryAnalyzer.setQuery(queryclause);
+                if (CurDBMetaData.getFilterConditions() != null)
                 {
-                    CurDBMetaData.setFilterConditions(replaceConditionsByAlias(CurDBMetaData.getFilterConditions()));
-                    m_xQueryComposer.setStructuredFilter(CurDBMetaData.getFilterConditions());
+                    if (CurDBMetaData.getFilterConditions().length > 0)
+                    {
+                        CurDBMetaData.setFilterConditions(replaceConditionsByAlias(CurDBMetaData.getFilterConditions()));
+                        m_xQueryComposer.setStructuredFilter(CurDBMetaData.getFilterConditions());
+                    }
                 }
             }
             s = m_xQueryAnalyzer.getQuery();
@@ -333,6 +339,8 @@ public class SQLQueryComposer
     {
         FieldColumn CurFieldColumn = CurDBMetaData.getFieldColumnByDisplayName(_fieldname);
         CommandName curComposedCommandName = getComposedCommandByDisplayName(CurFieldColumn.getCommandName());
+        if ( curComposedCommandName == null )
+            return _fieldname;
         String curAliasName = curComposedCommandName.getAliasName();
         return quoteName(curAliasName) + "." + quoteName(CurFieldColumn.getFieldName());
     }
@@ -418,4 +426,8 @@ public class SQLQueryComposer
             typeexception.printStackTrace(System.out);
         }
     }
+    public XSingleSelectQueryComposer getQueryComposer()
+    {
+        return m_xQueryComposer;
+    }
 }
diff --git a/wizards/com/sun/star/wizards/document/Control.java b/wizards/com/sun/star/wizards/document/Control.java
index 3fd06a187..ca5168d00 100644
--- a/wizards/com/sun/star/wizards/document/Control.java
+++ b/wizards/com/sun/star/wizards/document/Control.java
@@ -33,6 +33,7 @@ import com.sun.star.awt.XControlModel;
 import com.sun.star.awt.XLayoutConstrains;
 import com.sun.star.awt.XWindowPeer;
 import com.sun.star.beans.XPropertySet;
+import com.sun.star.beans.XPropertySetInfo;
 import com.sun.star.container.XNameAccess;
 import com.sun.star.container.XNameContainer;
 import com.sun.star.container.XNamed;
@@ -97,8 +98,13 @@ public class Control extends Shape
             icontroltype = _icontroltype;
             sServiceName = oFormHandler.sModelServices[getControlType()];
             Object oControlModel = oFormHandler.xMSFDoc.createInstance(sServiceName);
-            xControlModel = (XControlModel) UnoRuntime.queryInterface(XControlModel.class, oControlModel);
-            xPropertySet = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, oControlModel);
+            xControlModel = UnoRuntime.queryInterface( XControlModel.class, oControlModel );
+            xPropertySet = UnoRuntime.queryInterface( XPropertySet.class, oControlModel );
+
+            XPropertySetInfo xPSI = xPropertySet.getPropertySetInfo();
+            if ( xPSI.hasPropertyByName( "MouseWheelBehavior" ) )
+                xPropertySet.setPropertyValue( "MouseWheelBehavior", new Short( com.sun.star.awt.MouseWheelBehavior.SCROLL_DISABLED ) );
+
             insertControlInContainer(_FieldName);
             xControlShape.setControl(xControlModel);
             if (_xGroupShapes == null)
@@ -110,7 +116,7 @@ public class Control extends Shape
                 _xGroupShapes.add(xShape);
             }
             xControl = oFormHandler.xControlAccess.getControl(xControlModel);
-            xControlPropertySet = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, xControl);
+            xControlPropertySet = UnoRuntime.queryInterface( XPropertySet.class, xControl );
             xWindowPeer = xControl.getPeer();
         }
         catch (Exception e)
diff --git a/wizards/com/sun/star/wizards/document/DatabaseControl.java b/wizards/com/sun/star/wizards/document/DatabaseControl.java
index eabbbc775..c0dff49dc 100644
--- a/wizards/com/sun/star/wizards/document/DatabaseControl.java
+++ b/wizards/com/sun/star/wizards/document/DatabaseControl.java
@@ -29,6 +29,7 @@ package com.sun.star.wizards.document;
 
 import com.sun.star.awt.Point;
 import com.sun.star.beans.XPropertySet;
+import com.sun.star.beans.XPropertySetInfo;
 import com.sun.star.container.XNameContainer;
 import com.sun.star.drawing.XShapes;
 import com.sun.star.sdbc.DataType;
@@ -92,6 +93,11 @@ public class DatabaseControl extends Control
             xPropColumn.setPropertyValue("DataField", sFieldName);
             xPropColumn.setPropertyValue("Label", _columntitle);
             xPropColumn.setPropertyValue("Width", new Integer(0));  // Width of column is adjusted to Columname
+
+            XPropertySetInfo xPSI = xPropColumn.getPropertySetInfo();
+            if ( xPSI.hasPropertyByName( "MouseWheelBehavior" ) )
+                xPropColumn.setPropertyValue( "MouseWheelBehavior", new Short( com.sun.star.awt.MouseWheelBehavior.SCROLL_DISABLED ) );
+
             setNumericLimits();
             _oGridControl.xNameContainer.insertByName(sFieldName, xPropColumn);
         }
diff --git a/wizards/com/sun/star/wizards/document/GridControl.java b/wizards/com/sun/star/wizards/document/GridControl.java
index 638a4ef0d..8243e6a92 100644
--- a/wizards/com/sun/star/wizards/document/GridControl.java
+++ b/wizards/com/sun/star/wizards/document/GridControl.java
@@ -60,15 +60,15 @@ public class GridControl extends Shape
         {
             fieldcolumns = _fieldcolumns;
             Object oGridModel = oFormHandler.xMSFDoc.createInstance(oFormHandler.sModelServices[FormHandler.SOGRIDCONTROL]);
-            xNameContainer = (XNameContainer) UnoRuntime.queryInterface(XNameContainer.class, oGridModel);
-            xNameAccess = (XNameAccess) UnoRuntime.queryInterface(XNameAccess.class, oGridModel);
+            xNameContainer = UnoRuntime.queryInterface( XNameContainer.class, oGridModel );
+            xNameAccess = UnoRuntime.queryInterface( XNameAccess.class, oGridModel );
             _xFormName.insertByName(_sname, oGridModel);
-            xControlModel = (XControlModel) UnoRuntime.queryInterface(XControlModel.class, oGridModel);
+            xControlModel = UnoRuntime.queryInterface( XControlModel.class, oGridModel );
             xControlShape.setControl(xControlModel);
-            xPropertySet = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, oGridModel);
+            xPropertySet = UnoRuntime.queryInterface( XPropertySet.class, oGridModel );
             oFormHandler.xDrawPage.add(xShape);
-            xGridColumnFactory = (XGridColumnFactory) UnoRuntime.queryInterface(XGridColumnFactory.class, oGridModel);
-            xComponent = (XComponent) UnoRuntime.queryInterface(XComponent.class, oGridModel);
+            xGridColumnFactory = UnoRuntime.queryInterface( XGridColumnFactory.class, oGridModel );
+            xComponent = UnoRuntime.queryInterface( XComponent.class, oGridModel );
 
 //      Helper.setUnoPropertyValue(oGridModel, "Name", _sname);
             for (int i = 0; i < fieldcolumns.length; i++)
diff --git a/wizards/com/sun/star/wizards/query/Finalizer.java b/wizards/com/sun/star/wizards/query/Finalizer.java
index 989d54e1b..592c3e64a 100644
--- a/wizards/com/sun/star/wizards/query/Finalizer.java
+++ b/wizards/com/sun/star/wizards/query/Finalizer.java
@@ -169,10 +169,9 @@ public class Finalizer
 
     public String finish()
     {
-        CurDBMetaData.oSQLQueryComposer = new SQLQueryComposer(CurDBMetaData);
         String queryName = getTitle();
-        if  (   CurDBMetaData.oSQLQueryComposer.setQueryCommand( m_queryWizard.xWindow, true, true )
-            &&  CurDBMetaData.createQuery( CurDBMetaData.oSQLQueryComposer, queryName )
+        if  (   CurDBMetaData.getSQLQueryComposer().setQueryCommand( m_queryWizard.xWindow, true, true )
+            &&  CurDBMetaData.createQuery( CurDBMetaData.getSQLQueryComposer(), queryName )
             )
             return queryName;
 
diff --git a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
index 0edc4eb31..3219ea8f9 100644
--- a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
+++ b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
@@ -256,13 +256,12 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme
 
                     if ((getRecordParser().getCommandType() == CommandType.QUERY) && (getRecordParser().Command.equals("")))
                     {
-                        getRecordParser().oSQLQueryComposer = new SQLQueryComposer(getRecordParser());
                         DBMetaData.CommandObject oCommand = getRecordParser().getQueryByName(sQueryName);
                         if (getRecordParser().hasEscapeProcessing(oCommand.getPropertySet()))
                         {
                             getRecordParser().Command = (String) oCommand.getPropertySet().getPropertyValue("Command");
-                            getRecordParser().oSQLQueryComposer.m_xQueryAnalyzer.setQuery(getRecordParser().Command);
-                            getRecordParser().oSQLQueryComposer.prependSortingCriteria();
+                            getRecordParser().getSQLQueryComposer().m_xQueryAnalyzer.setQuery(getRecordParser().Command);
+                            getRecordParser().getSQLQueryComposer().prependSortingCriteria();
                         }
                         else
                         {
diff --git a/wizards/com/sun/star/wizards/report/ReportWizard.java b/wizards/com/sun/star/wizards/report/ReportWizard.java
index 6420c32a3..dd545a147 100644
--- a/wizards/com/sun/star/wizards/report/ReportWizard.java
+++ b/wizards/com/sun/star/wizards/report/ReportWizard.java
@@ -268,10 +268,10 @@ public class ReportWizard extends DatabaseObjectWizard implements XTextListener,
         boolean bQueryCreated = false;
         if (this.CurDBCommandFieldSelection.getSelectedCommandType() == CommandType.TABLE)
         {
-            bQueryCreated = m_reportDocument.getRecordParser().oSQLQueryComposer.setQueryCommand(this.xWindow, false, false);
+            bQueryCreated = m_reportDocument.getRecordParser().getSQLQueryComposer().setQueryCommand(this.xWindow, false, false);
 
             m_reportDocument.setCommandType(CommandType.COMMAND);
-            String sQuery = m_reportDocument.getRecordParser().oSQLQueryComposer.getQuery();
+            String sQuery = m_reportDocument.getRecordParser().getSQLQueryComposer().getQuery();
             m_reportDocument.setCommand(sQuery);
         }
         else
@@ -286,11 +286,11 @@ public class ReportWizard extends DatabaseObjectWizard implements XTextListener,
                 {
                     // String sCommand = (String) oCommand.xPropertySet.getPropertyValue("Command");
                     bQueryCreated = (!sCommand.equals(""));
-                    m_reportDocument.getRecordParser().oSQLQueryComposer.m_xQueryAnalyzer.setQuery(sCommand);
-                    m_reportDocument.getRecordParser().oSQLQueryComposer.prependSortingCriteria();
+                    m_reportDocument.getRecordParser().getSQLQueryComposer().m_xQueryAnalyzer.setQuery(sCommand);
+                    m_reportDocument.getRecordParser().getSQLQueryComposer().prependSortingCriteria();
 // TODO: check with query
                     m_reportDocument.setCommandType(CommandType.COMMAND);
-                    m_reportDocument.setCommand(m_reportDocument.getRecordParser().oSQLQueryComposer.getQuery());
+                    m_reportDocument.setCommand(m_reportDocument.getRecordParser().getSQLQueryComposer().getQuery());
                     bQueryCreated = true;
                 }
                 else
@@ -479,7 +479,6 @@ public static XLogger getLogger()
 
             if ( m_reportDocument.getRecordParser().getConnection( m_wizardContext ) )
             {
-                m_reportDocument.getRecordParser().oSQLQueryComposer = new SQLQueryComposer(m_reportDocument.getRecordParser());
                 buildSteps();
 
                 m_reportDocument.checkInvariants();
diff --git a/wizards/com/sun/star/wizards/ui/FilterComponent.java b/wizards/com/sun/star/wizards/ui/FilterComponent.java
index 11d517a06..25c0f8dc2 100644
--- a/wizards/com/sun/star/wizards/ui/FilterComponent.java
+++ b/wizards/com/sun/star/wizards/ui/FilterComponent.java
@@ -33,13 +33,19 @@ import com.sun.star.awt.VclWindowPeerAttribute;
 import com.sun.star.awt.XControl;
 import com.sun.star.awt.XListBox;
 import com.sun.star.awt.XRadioButton;
+import com.sun.star.beans.PropertyAttribute;
 import com.sun.star.beans.PropertyValue;
+import com.sun.star.beans.XPropertyContainer;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.lang.EventObject;
 import com.sun.star.lang.IllegalArgumentException;
 import com.sun.star.lang.XMultiServiceFactory;
+import com.sun.star.lib.uno.helper.PropertySet;
 import com.sun.star.sdbc.DataType;
+import com.sun.star.uno.Any;
 import com.sun.star.uno.AnyConverter;
+import com.sun.star.uno.Exception;
+import com.sun.star.uno.Type;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 import com.sun.star.wizards.common.NumberFormatter;
@@ -48,6 +54,8 @@ import com.sun.star.wizards.common.JavaTools;
 import com.sun.star.wizards.common.Properties;
 import com.sun.star.wizards.db.FieldColumn;
 import com.sun.star.wizards.db.QueryMetaData;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 public class FilterComponent
 {
@@ -112,10 +120,10 @@ public class FilterComponent
     final int SO_SECONDBOOLFIELDNAME = 256 + 2;
     final int SO_THIRDBOOLFIELDNAME = 256 + 3;
     final int SO_FOURTHBOOLFIELDNAME = 256 + 4;
-    int SO_BOOLEANLIST[] = {
+    int SO_BOOLEANLIST[] =
+    {
         SO_FIRSTBOOLFIELDNAME, SO_SECONDBOOLFIELDNAME, SO_THIRDBOOLFIELDNAME, SO_FOURTHBOOLFIELDNAME
     };
-
     final int SO_OPTQUERYMODE = 5;
     int SOI_MATCHALL = 0;
     int SOI_MATCHANY = 1;
@@ -127,25 +135,23 @@ public class FilterComponent
 
         public void itemStateChanged(com.sun.star.awt.ItemEvent EventObject)
         {
-            try
+            int iKey = CurUnoDialog.getControlKey(EventObject.Source, CurUnoDialog.ControlList);
+            String sControlName = "";
+            switch (iKey)
             {
-                int iKey = CurUnoDialog.getControlKey(EventObject.Source, CurUnoDialog.ControlList);
-                String sControlName = "";
-                switch (iKey)
-                {
-                    //              case SOOPTQUERYMODE:
-                    //                  getfilterstate();
-                    case SO_FIRSTFIELDNAME:
-                    case SO_SECONDFIELDNAME:
-                    case SO_THIRDFIELDNAME:
-                    case SO_FOURTHFIELDNAME:
-                        sControlName = getControlName(EventObject.Source);
-                        String sControlNameSuffix = sIncSuffix + "_" + getIndexNumber(sControlName);
-                        XListBox xCurFieldListBox = (XListBox) UnoRuntime.queryInterface(XListBox.class, CurUnoDialog.xDlgContainer.getControl(sControlName));
-                        String CurDisplayFieldName = xCurFieldListBox.getSelectedItem();
-                        FieldColumn CurFieldColumn = new FieldColumn(oQueryMetaData, CurDisplayFieldName);
-                        
-                        String sControlNameTextValue = "txtValue" + sControlNameSuffix;
+                //              case SOOPTQUERYMODE:
+                //                  getfilterstate();
+                case SO_FIRSTFIELDNAME:
+                case SO_SECONDFIELDNAME:
+                case SO_THIRDFIELDNAME:
+                case SO_FOURTHFIELDNAME:
+                    sControlName = getControlName(EventObject.Source);
+                    String sControlNameSuffix = sIncSuffix + "_" + getIndexNumber(sControlName);
+                    XListBox xCurFieldListBox = (XListBox) UnoRuntime.queryInterface(XListBox.class, CurUnoDialog.xDlgContainer.getControl(sControlName));
+                    String CurDisplayFieldName = xCurFieldListBox.getSelectedItem();
+                    FieldColumn CurFieldColumn = new FieldColumn(oQueryMetaData, CurDisplayFieldName);
+
+                    String sControlNameTextValue = "txtValue" + sControlNameSuffix;
 //                        String sControlNameBooleanList = "lstBoolean" + sControlNameSuffix;
 //                        if (aFieldColumn.FieldType == DataType.BOOLEAN)
 //                        {
@@ -158,41 +164,36 @@ public class FilterComponent
 //                            CurUnoDialog.setControlVisible(sControlNameTextValue, true);
 //                            CurUnoDialog.setControlVisible(sControlNameBooleanList, false);
 
-                            XControl xValueControl = CurUnoDialog.xDlgContainer.getControl(sControlNameTextValue);
-                            XInterface xValueModel = (XInterface) UnoDialog.getModel(xValueControl);
-                            Helper.setUnoPropertyValue(xValueModel, "TreatAsNumber", Boolean.valueOf(CurFieldColumn.isNumberFormat()));
-                            final NumberFormatter aNumberFormatter = oQueryMetaData.getNumberFormatter();
-                            aNumberFormatter.setNumberFormat(xValueModel, CurFieldColumn.getDBFormatKey(), aNumberFormatter);
+                    XControl xValueControl = CurUnoDialog.xDlgContainer.getControl(sControlNameTextValue);
+                    XInterface xValueModel = (XInterface) UnoDialog.getModel(xValueControl);
+                    Helper.setUnoPropertyValue(xValueModel, "TreatAsNumber", Boolean.valueOf(CurFieldColumn.isNumberFormat()));
+                    final NumberFormatter aNumberFormatter = oQueryMetaData.getNumberFormatter();
+                    aNumberFormatter.setNumberFormat(xValueModel, CurFieldColumn.getDBFormatKey(), aNumberFormatter);
 //                         }
-                        
-                        break;
-                    case SO_FIRSTCONDITION:
-                    case SO_SECONDCONDITION:
-                    case SO_THIRDCONDITION:
-                    case SO_FOURTHCONDITION:
-                        sControlName = getControlName(EventObject.Source);
-                        break;
-                    case SOOPTORMODE:
-                    case SOOPTANDMODE:
-                        // getfilterstate();
-                        return;
-                        
+
+                    break;
+                case SO_FIRSTCONDITION:
+                case SO_SECONDCONDITION:
+                case SO_THIRDCONDITION:
+                case SO_FOURTHCONDITION:
+                    sControlName = getControlName(EventObject.Source);
+                    break;
+                case SOOPTORMODE:
+                case SOOPTANDMODE:
+                    // getfilterstate();
+                    return;
+
                 case SO_FIRSTBOOLFIELDNAME:
                 case SO_SECONDBOOLFIELDNAME:
                 case SO_THIRDBOOLFIELDNAME:
                 case SO_FOURTHBOOLFIELDNAME:
-                        sControlName = getControlName(EventObject.Source);
+                    sControlName = getControlName(EventObject.Source);
                     break;
 
-                    default:
-                        break;
-                }
-                togglefollowingControlRow(sControlName);
-            }
-            catch (Exception exception)
-            {
-                exception.printStackTrace(System.out);
+                default:
+                    break;
             }
+            togglefollowingControlRow(sControlName);
         }
 
         public void disposing(com.sun.star.lang.EventObject eventObject)
@@ -205,15 +206,8 @@ public class FilterComponent
 
         public void textChanged(TextEvent EventObject)
         {
-            try
-            {
-                String sName = getControlName(EventObject.Source);
-                togglefollowingControlRow(sName);
-            }
-            catch (Exception exception)
-            {
-                exception.printStackTrace(System.out);
-            }
+            String sName = getControlName(EventObject.Source);
+            togglefollowingControlRow(sName);
         }
 
         public void disposing(EventObject EventObject)
@@ -245,10 +239,10 @@ public class FilterComponent
     }
 
     public static String getIndexNumber(String _sStr)
-        {
-            String sLastNumber = _sStr.substring(_sStr.length() - 1, _sStr.length());
-            return sLastNumber;
-        }
+    {
+        String sLastNumber = _sStr.substring(_sStr.length() - 1, _sStr.length());
+        return sLastNumber;
+    }
 
     /**
      * Enable the next ControlRow if the Condition is complete in the current line
@@ -290,102 +284,67 @@ public class FilterComponent
         int nFilterCount = getFilterCount();
         if (nFilterCount > 0)
         {
-            if (this.getfilterstate() == this.SOI_MATCHALL)
-            {
-                filterconditions = new PropertyValue[1][nFilterCount];
-            }
-            else
-            {
-                filterconditions = new PropertyValue[nFilterCount][1];
-            }
-            int a = 0;
-            for (int i = 0; i < RowCount; i++)
+            try
             {
-                ControlRow CurControlRow = oControlRows[i];
-                if (CurControlRow.isEnabled())
+                final String serviceName = "com.sun.star.beans.PropertyBag";
+                final XPropertyContainer column = (XPropertyContainer) UnoRuntime.queryInterface(XPropertyContainer.class, oQueryMetaData.xMSF.createInstance(serviceName));
+                
+                column.addProperty("Type", PropertyAttribute.BOUND, DataType.VARCHAR);
+                column.addProperty("Name", PropertyAttribute.BOUND, "");
+                final XPropertySet columnSet = UnoRuntime.queryInterface(XPropertySet.class, column);
+
+                if ( oQueryMetaData.getSQLQueryComposer().getQuery().length() == 0)
+                {
+                    final String fromClause = oQueryMetaData.getSQLQueryComposer().getFromClause();
+                    StringBuffer sql = new StringBuffer();
+                    sql.append(oQueryMetaData.getSQLQueryComposer().getSelectClause(true));
+                    sql.append(' ');
+                    sql.append(fromClause);
+                    oQueryMetaData.getSQLQueryComposer().getQueryComposer().setElementaryQuery(sql.toString());
+                }
+                int a = 0;
+                for (int i = 0; i < RowCount; i++)
                 {
-                    if (CurControlRow.isConditionComplete())
+                    ControlRow CurControlRow = oControlRows[i];
+                    if (CurControlRow.isEnabled())
                     {
-                        Object aValue;
-                        String sFieldName = CurControlRow.getSelectedFieldName();
-                        int nOperator = (int) CurControlRow.getSelectedOperator();
-                        FieldColumn aFieldColumn = oQueryMetaData.getFieldColumnByDisplayName(sFieldName);
-                        if (aFieldColumn.getStandardFormatKey() == oQueryMetaData.getNumberFormatter().getTextFormatKey())
-                        {
-                            aValue = "'" + CurControlRow.getValue() + "'";
-                        }
-//// TODO the following code is bound to be deprecated as soon as the query composer is able to handle date/time values as numbers
-                        else if ((aFieldColumn.getStandardFormatKey() == oQueryMetaData.getNumberFormatter().getDateFormatKey()) ||
-                                (aFieldColumn.getStandardFormatKey() == oQueryMetaData.getNumberFormatter().getDateTimeFormatKey()))
-                        {
-                            String sDate = CurControlRow.getDateTimeString(true);
-                            aValue = "{D '" + sDate + "' }";  // FormatsSupplier
-                        }
-                        else if (aFieldColumn.getStandardFormatKey() == oQueryMetaData.getNumberFormatter().getTimeFormatKey())
-                        {
-                            String sTime = CurControlRow.getDateTimeString(true);
-                            aValue = "'{T '" + sTime + "' }";
-                        }
-                        else
-                        {
-                            aValue = CurControlRow.getValue();
-                            // if void
-                            if (! AnyConverter.isVoid(aValue))
-                            {
-                                switch (aFieldColumn.getFieldType())
-                                {
-                                    case DataType.TINYINT:
-                                    case DataType.BIGINT:
-                                    case DataType.INTEGER:
-                                    case DataType.SMALLINT:
-                                        if ( AnyConverter.isDouble(aValue) )
-                                            aValue = String.valueOf(((Double) aValue).intValue());
-                                        break;
-                                    case DataType.BIT:
-                                    case DataType.BOOLEAN:
-                                        // curValue = CurControlRow.getText(); // wrong! (creates something like 'WAHR'/'FALSCH' if german locale is used.
-
-                                        // double dblvalue = ((Double) curValue).doubleValue();
-                                        //curValue = new Boolean(dblvalue == 1.0); // wrong! we need a string, not a boolean value
-
-                                        // converts the '1.0'/'0.0' (EffectiveValue) to a 'boolean' String like 'true'/'false'
-                                        if ( AnyConverter.isDouble(aValue) )
-                                            aValue = String.valueOf(((Double) aValue).intValue() == 1);
-                                        break;
-                                    default:
-                                        aValue = String.valueOf(aValue);
-                                        break;
-                                }
-                            }
-                        }
-                        
-                        PropertyValue oPropertyValue = Properties.createProperty(sFieldName, aValue, nOperator);
-                        if (getfilterstate()/*this.ifilterstate*/ == this.SOI_MATCHALL)
+                        if (CurControlRow.isConditionComplete())
                         {
-                            if (i == 0)
+                            String sFieldName = CurControlRow.getSelectedFieldName();
+                            int nOperator = (int) CurControlRow.getSelectedOperator();
+                            FieldColumn aFieldColumn = oQueryMetaData.getFieldColumnByDisplayName(sFieldName);
+                            columnSet.setPropertyValue("Name", aFieldColumn.getFieldName());
+                            columnSet.setPropertyValue("Type", aFieldColumn.getXColumnPropertySet().getPropertyValue("Type"));
+                            Object value = CurControlRow.getValue();
+                            switch(aFieldColumn.getFieldType())
                             {
-                                filterconditions[0] = new PropertyValue[nFilterCount];
+                                case DataType.TIMESTAMP:
+                                case DataType.DATE:
+                                    value = ((Double)value) - oQueryMetaData.getNullDateCorrection();
+                                    break;
                             }
-                            filterconditions[0][a] = oPropertyValue;
+                            column.addProperty("Value", PropertyAttribute.MAYBEVOID, value);
+                            columnSet.setPropertyValue("Value", value);
+                            oQueryMetaData.getSQLQueryComposer().getQueryComposer().appendFilterByColumn(columnSet, getfilterstate() == this.SOI_MATCHALL,nOperator);
                         }
-                        else
-                        {
-                            filterconditions[a][0] = oPropertyValue;
-                        }
-                        a++;
                     }
                 }
+                filterconditions = oQueryMetaData.getSQLQueryComposer().getQueryComposer().getStructuredFilter();
+                int[] iduplicate = JavaTools.getDuplicateFieldIndex(filterconditions);
+                if (iduplicate[0] != -1)
+                {
+                    PropertyValue aduplicatecondition = filterconditions[iduplicate[0]][iduplicate[1]];
+                    String smsgDuplicateCondition = getDisplayCondition(sDuplicateCondition, aduplicatecondition, null);
+                    CurUnoDialog.showMessageBox("WarningBox", VclWindowPeerAttribute.OK, smsgDuplicateCondition);
+                    CurUnoDialog.vetoableChange(new java.beans.PropertyChangeEvent(CurUnoDialog, "Steps", Integer.valueOf(1), Integer.valueOf(2)));
+                    return new PropertyValue[][]
+                            {
+                            };
+                }
             }
-            int[] iduplicate = JavaTools.getDuplicateFieldIndex(filterconditions);
-            if (iduplicate[0] != -1)
+            catch (Exception ex)
             {
-                PropertyValue aduplicatecondition = filterconditions[iduplicate[0]][iduplicate[1]];
-                String smsgDuplicateCondition = getDisplayCondition(sDuplicateCondition, aduplicatecondition, null);
-                CurUnoDialog.showMessageBox("WarningBox", VclWindowPeerAttribute.OK, smsgDuplicateCondition);
-                CurUnoDialog.vetoableChange(new java.beans.PropertyChangeEvent(CurUnoDialog, "Steps", Integer.valueOf(1), Integer.valueOf(2)));
-                return new PropertyValue[][]
-                        {
-                        };
+                Logger.getLogger(FilterComponent.class.getName()).log(Level.SEVERE, null, ex);
             }
         }
         else
@@ -413,8 +372,10 @@ public class FilterComponent
             String soperator = sLogicOperators[_filtercondition.Handle - 1];
             sreturn = JavaTools.replaceSubString(sreturn, soperator, "<LOGICOPERATOR>");
             String sDisplayValue = "";
-            if ( !AnyConverter.isVoid(_filtercondition.Value) )
+            if (!AnyConverter.isVoid(_filtercondition.Value))
+            {
                 sDisplayValue = AnyConverter.toString(_filtercondition.Value);
+            }
             sreturn = JavaTools.replaceSubString(sreturn, sDisplayValue, "<VALUE>");
             return sreturn;
         }
@@ -443,24 +404,17 @@ public class FilterComponent
 
     private void addfiltercondition(int _index, String _curFieldName, Object _curValue, int _curOperator)
     {
-        try
+        String ValString = String.valueOf(_curValue);
+        PropertyValue oPropertyValue = Properties.createProperty(_curFieldName, ValString, _curOperator);
+        getfilterstate();
+        if (getfilterstate() == this.SOI_MATCHALL)
         {
-            String ValString = String.valueOf(_curValue);
-            PropertyValue oPropertyValue = Properties.createProperty(_curFieldName, ValString, _curOperator);
-            getfilterstate();
-            if (getfilterstate() == this.SOI_MATCHALL)
+            if (_index == 0)
             {
-                if (_index == 0)
-                {
-                    filterconditions[0] = new PropertyValue[getFilterCount()];
-                }
-                filterconditions[0][_index] = new PropertyValue();
-                filterconditions[0][_index] = oPropertyValue;
+                filterconditions[0] = new PropertyValue[getFilterCount()];
             }
-        }
-        catch (Exception exception)
-        {
-            exception.printStackTrace(System.out);
+            filterconditions[0][_index] = new PropertyValue();
+            filterconditions[0][_index] = oPropertyValue;
         }
     }
 
@@ -475,8 +429,8 @@ public class FilterComponent
             }
         }
         return a;
-    // FilterCount = a;
-    // return FilterCount;
+        // FilterCount = a;
+        // return FilterCount;
     }
 
     /** Creates a new instance of FilterComponent
@@ -492,95 +446,88 @@ public class FilterComponent
      */
     public FilterComponent(WizardDialog CurUnoDialog, XMultiServiceFactory _xMSF, int iStep, int iPosX, int iPosY, int iWidth, int FilterCount, QueryMetaData _oQueryMetaData, int _firstHelpID)
     {
-        try
-        {
-            this.curHelpID = _firstHelpID;
-            this.xMSF = _xMSF;
-            this.IStep = Integer.valueOf(iStep);
-
-            curtabindex = UnoDialog.setInitialTabindex(iStep);
-            this.CurUnoDialog = CurUnoDialog;
-            this.RowCount = FilterCount;
-            this.oQueryMetaData = _oQueryMetaData;
-            boolean bEnabled;
-            sIncSuffix = com.sun.star.wizards.common.Desktop.getIncrementSuffix(CurUnoDialog.getDlgNameAccess(), "optMatchAll");
-            // iStartPosX = iPosX;
-            // iStartPosY = iPosY;
-
-            String soptMatchAll = CurUnoDialog.m_oResource.getResText(BaseID + 9);
-            String soptMatchAny = CurUnoDialog.m_oResource.getResText(BaseID + 10);
-            slblFieldNames = CurUnoDialog.m_oResource.getResText(BaseID + 17);
-            slblOperators = CurUnoDialog.m_oResource.getResText(BaseID + 24);
-            slblValue = CurUnoDialog.m_oResource.getResText(BaseID + 25);
-            sLogicOperators = CurUnoDialog.m_oResource.getResArray(BaseID + 26, 10 /* 7 */); // =, <>, <, >, <=, >=, like, !like, is null, !is null
-            sBooleanValues = CurUnoDialog.m_oResource.getResArray(BaseID + 36, 2); // true, false
-
-            sDuplicateCondition = CurUnoDialog.m_oResource.getResText(BaseID + 89);
-
-            // create Radiobuttons
-            // * match all
-            // * match one
-            optMatchAll = CurUnoDialog.insertRadioButton("optMatchAll" + sIncSuffix, SOOPTANDMODE, new ItemListenerImpl(),
-                    new String[]
-                    {
-                        "Height",
-                        "HelpURL",
-                        "Label",
-                        "PositionX",
-                        "PositionY",
-                        "State",
-                        "Step",
-                        "TabIndex",
-                        "Width"
-                    },
-                    new Object[]
-                    {
-                        Integer.valueOf(9),
-                        "HID:" + curHelpID++,
-                        soptMatchAll,
-                        Integer.valueOf(iPosX),
-                        Integer.valueOf(iPosY),
-                        Short.valueOf((short) 1),
-                        IStep,
-                        Short.valueOf(curtabindex++),
-                        Integer.valueOf(203)
-                    });
-            optMatchAny = CurUnoDialog.insertRadioButton("optMatchAny" + sIncSuffix, SOOPTORMODE, new ItemListenerImpl(),
-                    new String[]
-                    {
-                        "Height",
-                        "HelpURL",
-                        "Label",
-                        "PositionX",
-                        "PositionY",
-                        "Step",
-                        "TabIndex",
-                        "Width"
-                    },
-                    new Object[]
-                    {
-                        Integer.valueOf(9),
-                        "HID:" + curHelpID++,
-                        soptMatchAny,
-                        Integer.valueOf(iPosX),
-                        Integer.valueOf(iPosY + 12),
-                        IStep,
-                        Short.valueOf(curtabindex++),
-                        Integer.valueOf(203)
-                    });
-            getfilterstate();
-
-            oControlRows = new ControlRow[FilterCount];
-            for (int i = 0; i < FilterCount; i++)
-            {
-                bEnabled = (i == 0);
-                oControlRows[i] = new ControlRow(iPosX, iPosY + 20, i, bEnabled, (this.curHelpID + (i * 3)));
-                iPosY += 43;
-            }
-        }
-        catch (Exception exception)
+        this.curHelpID = _firstHelpID;
+        this.xMSF = _xMSF;
+        this.IStep = Integer.valueOf(iStep);
+
+        curtabindex = UnoDialog.setInitialTabindex(iStep);
+        this.CurUnoDialog = CurUnoDialog;
+        this.RowCount = FilterCount;
+        this.oQueryMetaData = _oQueryMetaData;
+        boolean bEnabled;
+        sIncSuffix = com.sun.star.wizards.common.Desktop.getIncrementSuffix(CurUnoDialog.getDlgNameAccess(), "optMatchAll");
+        // iStartPosX = iPosX;
+        // iStartPosY = iPosY;
+
+        String soptMatchAll = CurUnoDialog.m_oResource.getResText(BaseID + 9);
+        String soptMatchAny = CurUnoDialog.m_oResource.getResText(BaseID + 10);
+        slblFieldNames = CurUnoDialog.m_oResource.getResText(BaseID + 17);
+        slblOperators = CurUnoDialog.m_oResource.getResText(BaseID + 24);
+        slblValue = CurUnoDialog.m_oResource.getResText(BaseID + 25);
+        sLogicOperators = CurUnoDialog.m_oResource.getResArray(BaseID + 26, 10 /* 7 */); // =, <>, <, >, <=, >=, like, !like, is null, !is null
+        sBooleanValues = CurUnoDialog.m_oResource.getResArray(BaseID + 36, 2); // true, false
+
+        sDuplicateCondition = CurUnoDialog.m_oResource.getResText(BaseID + 89);
+
+        // create Radiobuttons
+        // * match all
+        // * match one
+        optMatchAll = CurUnoDialog.insertRadioButton("optMatchAll" + sIncSuffix, SOOPTANDMODE, new ItemListenerImpl(),
+                new String[]
+                {
+                    "Height",
+                    "HelpURL",
+                    "Label",
+                    "PositionX",
+                    "PositionY",
+                    "State",
+                    "Step",
+                    "TabIndex",
+                    "Width"
+                },
+                new Object[]
+                {
+                    Integer.valueOf(9),
+                    "HID:" + curHelpID++,
+                    soptMatchAll,
+                    Integer.valueOf(iPosX),
+                    Integer.valueOf(iPosY),
+                    Short.valueOf((short) 1),
+                    IStep,
+                    Short.valueOf(curtabindex++),
+                    Integer.valueOf(203)
+                });
+        optMatchAny = CurUnoDialog.insertRadioButton("optMatchAny" + sIncSuffix, SOOPTORMODE, new ItemListenerImpl(),
+                new String[]
+                {
+                    "Height",
+                    "HelpURL",
+                    "Label",
+                    "PositionX",
+                    "PositionY",
+                    "Step",
+                    "TabIndex",
+                    "Width"
+                },
+                new Object[]
+                {
+                    Integer.valueOf(9),
+                    "HID:" + curHelpID++,
+                    soptMatchAny,
+                    Integer.valueOf(iPosX),
+                    Integer.valueOf(iPosY + 12),
+                    IStep,
+                    Short.valueOf(curtabindex++),
+                    Integer.valueOf(203)
+                });
+        getfilterstate();
+
+        oControlRows = new ControlRow[FilterCount];
+        for (int i = 0; i < FilterCount; i++)
         {
-            exception.printStackTrace(System.out);
+            bEnabled = (i == 0);
+            oControlRows[i] = new ControlRow(iPosX, iPosY + 20, i, bEnabled, (this.curHelpID + (i * 3)));
+            iPosY += 43;
         }
     }
 
@@ -636,29 +583,21 @@ public class FilterComponent
 
     public void addNumberFormats()
     {
-        try
-        {
-            iDateFormat = oQueryMetaData.getNumberFormatter().defineNumberFormat("YYYY-MM-DD");
-            iTimeFormat = oQueryMetaData.getNumberFormatter().defineNumberFormat("HH:MM:SS");
-            iDateTimeFormat = oQueryMetaData.getNumberFormatter().defineNumberFormat("YYYY-MM-DD HH:MM:SS");
-        }
-        catch (Exception e)
-        {
-            e.printStackTrace(System.out);
-        }
+        iDateFormat = oQueryMetaData.getNumberFormatter().defineNumberFormat("YYYY-MM-DD");
+        iTimeFormat = oQueryMetaData.getNumberFormatter().defineNumberFormat("HH:MM:SS");
+        iDateTimeFormat = oQueryMetaData.getNumberFormatter().defineNumberFormat("YYYY-MM-DD HH:MM:SS");
     }
 
     // -------------------------------------------------------------------------
     // 
     // 
     // -------------------------------------------------------------------------
-
     class ControlRow
     {
+
         private final static int SOLSTFIELDNAME = 3;
         private final static int SOLSTOPERATOR = 4;
         private final static int SOTXTVALUE = 5;
-
         protected XInterface[] ControlElements = new XInterface[6];
         private boolean m_bEnabled;
         String[] FieldNames;
@@ -775,7 +714,7 @@ public class FilterComponent
                             Boolean.TRUE,
                             Integer.valueOf(13),
                             "HID:" + _firstRowHelpID++,
-                            Short.valueOf(UnoDialog.getListBoxLineCount() /* 7 */) ,
+                            Short.valueOf(UnoDialog.getListBoxLineCount() /* 7 */),
                             Integer.valueOf(nPosX1),
                             Integer.valueOf(iCompPosY + 23),
                             IStep,
@@ -805,7 +744,7 @@ public class FilterComponent
                             Boolean.TRUE,
                             Integer.valueOf(13),
                             "HID:" + _firstRowHelpID++,
-                            Short.valueOf((short) sLogicOperators.length /* 7 */ ),
+                            Short.valueOf((short) sLogicOperators.length /* 7 */),
                             Integer.valueOf(nPosX2),
                             Integer.valueOf(iCompPosY + 23),
                             IStep,
@@ -880,8 +819,9 @@ public class FilterComponent
                 {
                     int nSelOperator = getSelectedOperator();
                     // short[] SelOperator = (short[]) AnyConverter.toArray(Helper.getUnoPropertyValue(UnoDialog.getModel(ControlElements[SOLSTOPERATOR]), "SelectedItems"));
-                    if (nSelOperator == com.sun.star.sdb.SQLFilterOperator.SQLNULL ||   /* is null */
-                        nSelOperator == com.sun.star.sdb.SQLFilterOperator.NOT_SQLNULL) /* is not null */
+                    if (nSelOperator == com.sun.star.sdb.SQLFilterOperator.SQLNULL
+                            || /* is null */ nSelOperator == com.sun.star.sdb.SQLFilterOperator.NOT_SQLNULL) /* is not null */
+
                     {
                         // disable value field
                         Helper.setUnoPropertyValue(UnoDialog.getModel(ControlElements[2]), "Enabled", Boolean.FALSE);
@@ -943,13 +883,27 @@ public class FilterComponent
                     {
                         sValue = JavaTools.replaceSubString(sValue, "", "{D '");
                         sValue = JavaTools.replaceSubString(sValue, "", "' }");
-                        oQueryMetaData.getNumberFormatter().convertStringToNumber(iDateFormat, sValue);
+                        try
+                        {
+                            oQueryMetaData.getNumberFormatter().convertStringToNumber(iDateFormat, sValue);
+                        }
+                        catch (java.lang.Exception ex)
+                        {
+                            Logger.getLogger(FilterComponent.class.getName()).log(Level.SEVERE, null, ex);
+                        }
                     }
                     else if (sValue.indexOf("{T '") > -1)
                     {
                         sValue = JavaTools.replaceSubString(sValue, "", "{T '");
                         sValue = JavaTools.replaceSubString(sValue, "", "' }");
-                        oQueryMetaData.getNumberFormatter().convertStringToNumber(iTimeFormat, sValue);
+                        try
+                        {
+                            oQueryMetaData.getNumberFormatter().convertStringToNumber(iTimeFormat, sValue);
+                        }
+                        catch (java.lang.Exception ex)
+                        {
+                            Logger.getLogger(FilterComponent.class.getName()).log(Level.SEVERE, null, ex);
+                        }
                     }
                 }
                 else if (AnyConverter.isBoolean(_filtercondition.Value))
@@ -1001,7 +955,9 @@ public class FilterComponent
             m_bEnabled = _bEnabled;
             if (isEnabled())
             {
-                short[] iselected = new short[] {};
+                short[] iselected = new short[]
+                {
+                };
                 try
                 {
                     iselected = (short[]) AnyConverter.toArray(Helper.getUnoPropertyValue(UnoDialog.getModel(ControlElements[SOLSTOPERATOR]), "SelectedItems"));
@@ -1012,7 +968,10 @@ public class FilterComponent
                 }
                 if ((iselected.length) == 0)
                 {
-                    Helper.setUnoPropertyValue(UnoDialog.getModel(ControlElements[SOLSTOPERATOR]), "SelectedItems", new short[] { 0 });
+                    Helper.setUnoPropertyValue(UnoDialog.getModel(ControlElements[SOLSTOPERATOR]), "SelectedItems", new short[]
+                            {
+                                0
+                            });
                 }
             }
             else if (!isConditionComplete())
@@ -1044,28 +1003,28 @@ public class FilterComponent
                 short[] SelFields = (short[]) AnyConverter.toArray(Helper.getUnoPropertyValue(UnoDialog.getModel(ControlElements[SOLSTOPERATOR]), "SelectedItems"));
                 switch (SelFields[0])
                 {
-                case 0:
-                    return com.sun.star.sdb.SQLFilterOperator.EQUAL;
-                case 1:
-                    return com.sun.star.sdb.SQLFilterOperator.NOT_EQUAL;
-                case 2:
-                    return com.sun.star.sdb.SQLFilterOperator.LESS;
-                case 3:
-                    return com.sun.star.sdb.SQLFilterOperator.GREATER;
-                case 4:
-                    return com.sun.star.sdb.SQLFilterOperator.LESS_EQUAL;
-                case 5:
-                    return com.sun.star.sdb.SQLFilterOperator.GREATER_EQUAL;
-                case 6:
-                    return com.sun.star.sdb.SQLFilterOperator.LIKE;
-                case 7:
-                    return com.sun.star.sdb.SQLFilterOperator.NOT_LIKE;
-                case 8:
-                    return com.sun.star.sdb.SQLFilterOperator.SQLNULL;
-                case 9:
-                    return com.sun.star.sdb.SQLFilterOperator.NOT_SQLNULL;
-                default:
-                    return -1;
+                    case 0:
+                        return com.sun.star.sdb.SQLFilterOperator.EQUAL;
+                    case 1:
+                        return com.sun.star.sdb.SQLFilterOperator.NOT_EQUAL;
+                    case 2:
+                        return com.sun.star.sdb.SQLFilterOperator.LESS;
+                    case 3:
+                        return com.sun.star.sdb.SQLFilterOperator.GREATER;
+                    case 4:
+                        return com.sun.star.sdb.SQLFilterOperator.LESS_EQUAL;
+                    case 5:
+                        return com.sun.star.sdb.SQLFilterOperator.GREATER_EQUAL;
+                    case 6:
+                        return com.sun.star.sdb.SQLFilterOperator.LIKE;
+                    case 7:
+                        return com.sun.star.sdb.SQLFilterOperator.NOT_LIKE;
+                    case 8:
+                        return com.sun.star.sdb.SQLFilterOperator.SQLNULL;
+                    case 9:
+                        return com.sun.star.sdb.SQLFilterOperator.NOT_SQLNULL;
+                    default:
+                        return -1;
                 }
             }
             catch (Exception exception)
@@ -1078,43 +1037,19 @@ public class FilterComponent
         // TODO make a difference between Text and Numbers
         protected Object getValue()
         {
-            try
-            {
-                return (Helper.getUnoPropertyValue(UnoDialog.getModel(ControlElements[SOTXTVALUE]), "EffectiveValue"));
-            }
-            catch (Exception exception)
-            {
-                exception.printStackTrace(System.out);
-            }
-            return null;
+            return (Helper.getUnoPropertyValue(UnoDialog.getModel(ControlElements[SOTXTVALUE]), "EffectiveValue"));
         }
 
         protected Object getText()
         {
-            try
-            {
-                return (Helper.getUnoPropertyValue(UnoDialog.getModel(ControlElements[SOTXTVALUE]), "Text"));
-            }
-            catch (Exception exception)
-            {
-                exception.printStackTrace(System.out);
-            }
-            return null;
+            return (Helper.getUnoPropertyValue(UnoDialog.getModel(ControlElements[SOTXTVALUE]), "Text"));
         }
 
         protected String getDateTimeString(boolean bgetDate)
         {
-            try
-            {
                 double dblValue = ((Double) getValue()).doubleValue();
                 NumberFormatter oNumberFormatter = oQueryMetaData.getNumberFormatter();
                 return oNumberFormatter.convertNumberToString(iDateTimeFormat, dblValue);
-            }
-            catch (Exception exception)
-            {
-                exception.printStackTrace(System.out);
-                return null;
-            }
         }
     }
 }