convert query filter dialog to .ui

Change-Id: I53cbe7e73ad68d478f9dece990c3b87ce55f5f34

9 files changed, 568 insertions, 501 deletions

diff --git a/dbaccess/AllLangResTarget_dbu.mk b/dbaccess/AllLangResTarget_dbu.mk
index 8a34f8d24be4..6840629bc336 100644
--- a/dbaccess/AllLangResTarget_dbu.mk
+++ b/dbaccess/AllLangResTarget_dbu.mk
@@ -50,7 +50,6 @@ $(eval $(call gb_SrsTarget_add_files,dbaccess/dbu,\
     dbaccess/source/ui/dlg/dsselect.src \
     dbaccess/source/ui/dlg/indexdialog.src \
     dbaccess/source/ui/dlg/paramdialog.src \
-    dbaccess/source/ui/dlg/queryfilter.src \
     dbaccess/source/ui/dlg/RelationDlg.src \
     dbaccess/source/ui/dlg/sqlmessage.src \
     dbaccess/source/ui/dlg/textconnectionsettings.src \
diff --git a/dbaccess/UIConfig_dbaccess.mk b/dbaccess/UIConfig_dbaccess.mk
index 76d01766f2fa..d8f71c8b216b 100644
--- a/dbaccess/UIConfig_dbaccess.mk
+++ b/dbaccess/UIConfig_dbaccess.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
     dbaccess/uiconfig/ui/generalpagedialog \
     dbaccess/uiconfig/ui/generalpagewizard \
     dbaccess/uiconfig/ui/generatedvaluespage \
+    dbaccess/uiconfig/ui/queryfilterdialog \
     dbaccess/uiconfig/ui/querypropertiesdialog  \
     dbaccess/uiconfig/ui/rowheightdialog \
     dbaccess/uiconfig/ui/specialsettingspage \
diff --git a/dbaccess/inc/dbaccess_helpid.hrc b/dbaccess/inc/dbaccess_helpid.hrc
index 48042278bf58..84de27157bf0 100644
--- a/dbaccess/inc/dbaccess_helpid.hrc
+++ b/dbaccess/inc/dbaccess_helpid.hrc
@@ -22,8 +22,6 @@
 
 #define HID_DSADMIN_CHARSET                               "DBACCESS_HID_DSADMIN_CHARSET"
 
-#define HID_DLG_FILTERCRIT                                "DBACCESS_HID_DLG_FILTERCRIT"
-
 #define HID_DATABROWSE_HEADER                             "DBACCESS_HID_DATABROWSE_HEADER"
 #define HID_CTL_TABBROWSER                                "DBACCESS_HID_CTL_TABBROWSER"
 #define UID_DATABROWSE_DATAWINDOW                         "DBACCESS_UID_DATABROWSE_DATAWINDOW"
diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx b/dbaccess/source/ui/dlg/queryfilter.cxx
index 3b55949e99cf..65bab4691e30 100644
--- a/dbaccess/source/ui/dlg/queryfilter.cxx
+++ b/dbaccess/source/ui/dlg/queryfilter.cxx
@@ -35,7 +35,6 @@
 #include <osl/diagnose.h>
 #include <connectivity/sqliterator.hxx>
 #include <connectivity/dbtools.hxx>
-#include "queryfilter.hrc"
 #include "dbustrings.hrc"
 #include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp>
 
@@ -69,132 +68,126 @@ DlgFilterCrit::DlgFilterCrit(Window * pParent,
                              const Reference< XSingleSelectQueryComposer >& _rxComposer,
                              const Reference< XNameAccess>& _rxCols
                              )
-    :ModalDialog( pParent, ModuleRes( DLG_FILTERCRIT ) )
-    ,aLB_WHEREFIELD1    ( this, ModuleRes( LB_WHEREFIELD1 ) )
-    ,aLB_WHERECOMP1     ( this, ModuleRes( LB_WHERECOMP1 ) )
-    ,aET_WHEREVALUE1    ( this, ModuleRes( ET_WHEREVALUE1 ) )
-    ,aLB_WHERECOND2     ( this, ModuleRes( LB_WHERECOND2 ) )
-    ,aLB_WHEREFIELD2    ( this, ModuleRes( LB_WHEREFIELD2 ) )
-    ,aLB_WHERECOMP2     ( this, ModuleRes( LB_WHERECOMP2 ) )
-    ,aET_WHEREVALUE2    ( this, ModuleRes( ET_WHEREVALUE2 ) )
-    ,aLB_WHERECOND3     ( this, ModuleRes( LB_WHERECOND3 ) )
-    ,aLB_WHEREFIELD3    ( this, ModuleRes( LB_WHEREFIELD3 ) )
-    ,aLB_WHERECOMP3     ( this, ModuleRes( LB_WHERECOMP3 ) )
-    ,aET_WHEREVALUE3    ( this, ModuleRes( ET_WHEREVALUE3 ) )
-    ,aFT_WHEREFIELD     ( this, ModuleRes( FT_WHEREFIELD ) )
-    ,aFT_WHERECOMP      ( this, ModuleRes( FT_WHERECOMP ) )
-    ,aFT_WHEREVALUE     ( this, ModuleRes( FT_WHEREVALUE ) )
-    ,aFT_WHEREOPER      ( this, ModuleRes( FT_WHEREOPER ) )
-    ,aFL_FIELDS         ( this, ModuleRes( FL_FIELDS ) )
-    ,aBT_OK             ( this, ModuleRes( BT_OK ) )
-    ,aBT_CANCEL         ( this, ModuleRes( BT_CANCEL ) )
-    ,aBT_HELP           ( this, ModuleRes( BT_HELP ) )
-    ,aSTR_NOENTRY       ( ModuleRes( STR_NOENTRY ) )
-    ,aSTR_COMPARE_OPERATORS( ModuleRes( STR_COMPARE_OPERATORS ) )
+    : ModalDialog(pParent, "QueryFilterDialog",
+        "dbaccess/ui/queryfilterdialog.ui")
+
     ,m_xQueryComposer(_rxComposer)
     ,m_xColumns( _rxCols )
     ,m_xConnection( _rxConnection )
     ,m_xMetaData( _rxConnection->getMetaData() )
     ,m_aPredicateInput( rxContext, _rxConnection, getParseContext() )
 {
-    // Write the String for noEntry into the ListBoxes of the field names
-    aLB_WHEREFIELD1.InsertEntry( aSTR_NOENTRY );
-    aLB_WHEREFIELD2.InsertEntry( aSTR_NOENTRY );
-    aLB_WHEREFIELD3.InsertEntry( aSTR_NOENTRY );
-
-    try
-    {
-        // ... also write it into the remaining fields
-        Sequence< OUString> aNames = m_xColumns->getElementNames();
-        const OUString* pIter = aNames.getConstArray();
-        const OUString* pEnd   = pIter + aNames.getLength();
-        Reference<XPropertySet> xColumn;
-        for(;pIter != pEnd;++pIter)
+    get(m_pLB_WHEREFIELD1, "field1");
+    get(m_pLB_WHERECOMP1, "cond1");
+    get(m_pET_WHEREVALUE1, "value1");
+
+    get(m_pLB_WHERECOND2, "op2");
+    get(m_pLB_WHEREFIELD2, "field2");
+    get(m_pLB_WHERECOMP2, "cond2");
+    get(m_pET_WHEREVALUE2, "value2");
+
+    get(m_pLB_WHERECOND3, "op3");
+    get(m_pLB_WHEREFIELD3, "field3");
+    get(m_pLB_WHERECOMP3, "cond3");
+    get(m_pET_WHEREVALUE3, "value3");
+
+    //set all condition preferred width to max width
+    //if all entries exist
+    Size aSize(m_pLB_WHERECOMP1->get_preferred_size());
+    m_pLB_WHERECOMP1->set_width_request(aSize.Width());
+    m_pLB_WHERECOMP2->set_width_request(aSize.Width());
+    m_pLB_WHERECOMP3->set_width_request(aSize.Width());
+    sal_uInt16 nEntryCount =  m_pLB_WHERECOMP1->GetEntryCount();
+    for (sal_uInt16 i = 0; i < nEntryCount; ++i)
+    {
+        if (i > 0)
+            m_aSTR_COMPARE_OPERATORS += ";";
+        m_aSTR_COMPARE_OPERATORS += m_pLB_WHERECOMP1->GetEntry(i);
+    }
+    m_pLB_WHERECOMP1->Clear();
+
+    // ... also write it into the remaining fields
+    Sequence< OUString> aNames = m_xColumns->getElementNames();
+    const OUString* pIter = aNames.getConstArray();
+    const OUString* pEnd   = pIter + aNames.getLength();
+    Reference<XPropertySet> xColumn;
+    for(;pIter != pEnd;++pIter)
+    {
+        try
         {
-            try
-            {
-                xColumn.set( m_xColumns->getByName( *pIter ), UNO_QUERY_THROW );
-
-                sal_Int32 nDataType( 0 );
-                OSL_VERIFY( xColumn->getPropertyValue( PROPERTY_TYPE ) >>= nDataType );
-                sal_Int32 eColumnSearch = ::dbtools::getSearchColumnFlag( m_xConnection, nDataType );
-                if ( eColumnSearch == ColumnSearch::NONE )
-                    continue;
-
-                sal_Bool bIsSearchable( sal_True );
-                OSL_VERIFY( xColumn->getPropertyValue( PROPERTY_ISSEARCHABLE ) >>= bIsSearchable );
-                if ( !bIsSearchable )
-                    continue;
-            }
-            catch( const Exception& )
-            {
-                DBG_UNHANDLED_EXCEPTION();
-            }
-            aLB_WHEREFIELD1.InsertEntry( *pIter );
-            aLB_WHEREFIELD2.InsertEntry( *pIter );
-            aLB_WHEREFIELD3.InsertEntry( *pIter );
+            xColumn.set( m_xColumns->getByName( *pIter ), UNO_QUERY_THROW );
+
+            sal_Int32 nDataType( 0 );
+            OSL_VERIFY( xColumn->getPropertyValue( PROPERTY_TYPE ) >>= nDataType );
+            sal_Int32 eColumnSearch = ::dbtools::getSearchColumnFlag( m_xConnection, nDataType );
+            if ( eColumnSearch == ColumnSearch::NONE )
+                continue;
+
+            sal_Bool bIsSearchable( sal_True );
+            OSL_VERIFY( xColumn->getPropertyValue( PROPERTY_ISSEARCHABLE ) >>= bIsSearchable );
+            if ( !bIsSearchable )
+                continue;
         }
+        catch( const Exception& )
+        {
+            DBG_UNHANDLED_EXCEPTION();
+        }
+        m_pLB_WHEREFIELD1->InsertEntry( *pIter );
+        m_pLB_WHEREFIELD2->InsertEntry( *pIter );
+        m_pLB_WHEREFIELD3->InsertEntry( *pIter );
+    }
 
-        Reference<XNameAccess> xSelectColumns = Reference<XColumnsSupplier>(m_xQueryComposer,UNO_QUERY)->getColumns();
-        aNames = xSelectColumns->getElementNames();
-        pIter = aNames.getConstArray();
-        pEnd   = pIter + aNames.getLength();
-        for(;pIter != pEnd;++pIter)
+    Reference<XNameAccess> xSelectColumns = Reference<XColumnsSupplier>(m_xQueryComposer,UNO_QUERY)->getColumns();
+    aNames = xSelectColumns->getElementNames();
+    pIter = aNames.getConstArray();
+    pEnd   = pIter + aNames.getLength();
+    for(;pIter != pEnd;++pIter)
+    {
+        // don't insert a column name twice
+        if ( !m_xColumns->hasByName(*pIter) )
         {
-            // don't insert a column name twice
-            if ( !m_xColumns->hasByName(*pIter) )
+            xColumn.set(xSelectColumns->getByName(*pIter),UNO_QUERY);
+            OSL_ENSURE(xColumn.is(),"DlgFilterCrit::DlgFilterCrit: Column is null!");
+            sal_Int32 nDataType(0);
+            xColumn->getPropertyValue(PROPERTY_TYPE) >>= nDataType;
+            sal_Int32 eColumnSearch = dbtools::getSearchColumnFlag(m_xConnection,nDataType);
+            // TODO
+            // !pColumn->IsFunction()
+            if(eColumnSearch != ColumnSearch::NONE)
             {
-                xColumn.set(xSelectColumns->getByName(*pIter),UNO_QUERY);
-                OSL_ENSURE(xColumn.is(),"DlgFilterCrit::DlgFilterCrit: Column is null!");
-                sal_Int32 nDataType(0);
-                xColumn->getPropertyValue(PROPERTY_TYPE) >>= nDataType;
-                sal_Int32 eColumnSearch = dbtools::getSearchColumnFlag(m_xConnection,nDataType);
-                // TODO
-                // !pColumn->IsFunction()
-                if(eColumnSearch != ColumnSearch::NONE)
-                {
-                    aLB_WHEREFIELD1.InsertEntry( *pIter );
-                    aLB_WHEREFIELD2.InsertEntry( *pIter );
-                    aLB_WHEREFIELD3.InsertEntry( *pIter );
-                }
+                m_pLB_WHEREFIELD1->InsertEntry( *pIter );
+                m_pLB_WHEREFIELD2->InsertEntry( *pIter );
+                m_pLB_WHEREFIELD3->InsertEntry( *pIter );
             }
         }
-        // initialize the listboxes with noEntry
-        aLB_WHEREFIELD1.SelectEntryPos(0);
-        aLB_WHEREFIELD2.SelectEntryPos(0);
-        aLB_WHEREFIELD3.SelectEntryPos(0);
-
-        // insert the criteria into the dialog
-        Sequence<Sequence<PropertyValue > > aValues = m_xQueryComposer->getStructuredFilter();
-        fillLines(aValues);
-        aValues = m_xQueryComposer->getStructuredHavingClause();
-        fillLines(aValues);
-
-    }
-    catch(const Exception&)
-    {
-        FreeResource();
-        throw;
     }
+    // initialize the listboxes with noEntry
+    m_pLB_WHEREFIELD1->SelectEntryPos(0);
+    m_pLB_WHEREFIELD2->SelectEntryPos(0);
+    m_pLB_WHEREFIELD3->SelectEntryPos(0);
 
-    EnableLines();
+    // insert the criteria into the dialog
+    Sequence<Sequence<PropertyValue > > aValues = m_xQueryComposer->getStructuredFilter();
+    fillLines(aValues);
+    aValues = m_xQueryComposer->getStructuredHavingClause();
+    fillLines(aValues);
 
-    aLB_WHEREFIELD1.SetSelectHdl(LINK(this,DlgFilterCrit,ListSelectHdl));
-    aLB_WHEREFIELD2.SetSelectHdl(LINK(this,DlgFilterCrit,ListSelectHdl));
-    aLB_WHEREFIELD3.SetSelectHdl(LINK(this,DlgFilterCrit,ListSelectHdl));
+    EnableLines();
 
-    aLB_WHERECOMP1.SetSelectHdl(LINK(this,DlgFilterCrit,ListSelectCompHdl));
-    aLB_WHERECOMP2.SetSelectHdl(LINK(this,DlgFilterCrit,ListSelectCompHdl));
-    aLB_WHERECOMP3.SetSelectHdl(LINK(this,DlgFilterCrit,ListSelectCompHdl));
+    m_pLB_WHEREFIELD1->SetSelectHdl(LINK(this,DlgFilterCrit,ListSelectHdl));
+    m_pLB_WHEREFIELD2->SetSelectHdl(LINK(this,DlgFilterCrit,ListSelectHdl));
+    m_pLB_WHEREFIELD3->SetSelectHdl(LINK(this,DlgFilterCrit,ListSelectHdl));
 
-    aET_WHEREVALUE1.SetLoseFocusHdl( LINK( this, DlgFilterCrit, PredicateLoseFocus ) );
-    aET_WHEREVALUE2.SetLoseFocusHdl( LINK( this, DlgFilterCrit, PredicateLoseFocus ) );
-    aET_WHEREVALUE3.SetLoseFocusHdl( LINK( this, DlgFilterCrit, PredicateLoseFocus ) );
+    m_pLB_WHERECOMP1->SetSelectHdl(LINK(this,DlgFilterCrit,ListSelectCompHdl));
+    m_pLB_WHERECOMP2->SetSelectHdl(LINK(this,DlgFilterCrit,ListSelectCompHdl));
+    m_pLB_WHERECOMP3->SetSelectHdl(LINK(this,DlgFilterCrit,ListSelectCompHdl));
 
-    if ( aET_WHEREVALUE1.IsEnabled() )
-        aET_WHEREVALUE1.GrabFocus();
+    m_pET_WHEREVALUE1->SetLoseFocusHdl( LINK( this, DlgFilterCrit, PredicateLoseFocus ) );
+    m_pET_WHEREVALUE2->SetLoseFocusHdl( LINK( this, DlgFilterCrit, PredicateLoseFocus ) );
+    m_pET_WHEREVALUE3->SetLoseFocusHdl( LINK( this, DlgFilterCrit, PredicateLoseFocus ) );
 
-    FreeResource();
+    if ( m_pET_WHEREVALUE1->IsEnabled() )
+        m_pET_WHEREVALUE1->GrabFocus();
 }
 
 DlgFilterCrit::~DlgFilterCrit()
@@ -207,8 +200,8 @@ DlgFilterCrit::~DlgFilterCrit()
 sal_Int32 DlgFilterCrit::GetOSQLPredicateType( const OUString& _rSelectedPredicate ) const
 {
     sal_Int32 nPredicateIndex = -1;
-    for ( sal_Int32 i=0; i < comphelper::string::getTokenCount(aSTR_COMPARE_OPERATORS, ';'); ++i)
-        if ( aSTR_COMPARE_OPERATORS.getToken(i, ';') == _rSelectedPredicate )
+    for ( sal_Int32 i=0; i < comphelper::string::getTokenCount(m_aSTR_COMPARE_OPERATORS, ';'); ++i)
+        if ( m_aSTR_COMPARE_OPERATORS.getToken(i, ';') == _rSelectedPredicate )
         {
             nPredicateIndex = i;
             break;
@@ -422,17 +415,17 @@ Reference< XPropertySet > DlgFilterCrit::getMatchingColumn( const Edit& _rValueI
 {
     // the name
     OUString sField;
-    if ( &_rValueInput == &aET_WHEREVALUE1 )
+    if ( &_rValueInput == m_pET_WHEREVALUE1 )
     {
-        sField = aLB_WHEREFIELD1.GetSelectEntry();
+        sField = m_pLB_WHEREFIELD1->GetSelectEntry();
     }
-    else if ( &_rValueInput == &aET_WHEREVALUE2 )
+    else if ( &_rValueInput == m_pET_WHEREVALUE2 )
     {
-        sField = aLB_WHEREFIELD2.GetSelectEntry();
+        sField = m_pLB_WHEREFIELD2->GetSelectEntry();
     }
-    else if ( &_rValueInput == &aET_WHEREVALUE3 )
+    else if ( &_rValueInput == m_pET_WHEREVALUE3 )
     {
-        sField = aLB_WHEREFIELD3.GetSelectEntry();
+        sField = m_pLB_WHEREFIELD3->GetSelectEntry();
     }
     else {
         OSL_FAIL( "DlgFilterCrit::getMatchingColumn: invalid event source!" );
@@ -516,23 +509,23 @@ void DlgFilterCrit::SetLine( sal_uInt16 nIdx,const PropertyValue& _rItem,sal_Boo
     switch( nIdx )
     {
         case 0:
-            pColumnListControl = &aLB_WHEREFIELD1;
-            pPredicateListControl = &aLB_WHERECOMP1;
-            pPredicateValueControl = &aET_WHEREVALUE1;
+            pColumnListControl = m_pLB_WHEREFIELD1;
+            pPredicateListControl = m_pLB_WHERECOMP1;
+            pPredicateValueControl = m_pET_WHEREVALUE1;
             break;
         case 1:
-            aLB_WHERECOND2.SelectEntryPos( _bOr ? 1 : 0 );
+            m_pLB_WHERECOND2->SelectEntryPos( _bOr ? 1 : 0 );
 
-            pColumnListControl = &aLB_WHEREFIELD2;
-            pPredicateListControl = &aLB_WHERECOMP2;
-            pPredicateValueControl = &aET_WHEREVALUE2;
+            pColumnListControl = m_pLB_WHEREFIELD2;
+            pPredicateListControl = m_pLB_WHERECOMP2;
+            pPredicateValueControl = m_pET_WHEREVALUE2;
             break;
         case 2:
-            aLB_WHERECOND3.SelectEntryPos( _bOr ? 1 : 0 );
+            m_pLB_WHERECOND3->SelectEntryPos( _bOr ? 1 : 0 );
 
-            pColumnListControl = &aLB_WHEREFIELD3;
-            pPredicateListControl = &aLB_WHERECOMP3;
-            pPredicateValueControl = &aET_WHEREVALUE3;
+            pColumnListControl = m_pLB_WHEREFIELD3;
+            pPredicateListControl = m_pLB_WHERECOMP3;
+            pPredicateValueControl = m_pET_WHEREVALUE3;
             break;
     }
 
@@ -576,123 +569,123 @@ void DlgFilterCrit::SelectField( ListBox& rBox, const OUString& rField )
 void DlgFilterCrit::EnableLines()
 {
     // enabling/disabling of whole lines
-    if( LbPos(aLB_WHEREFIELD1) == 0 )
+    if( LbPos(*m_pLB_WHEREFIELD1) == 0 )
     {
-        aLB_WHEREFIELD2.Disable();
-        aLB_WHERECOND2.Disable();
-        aLB_WHERECOMP2.Disable();
-        aET_WHEREVALUE2.Disable();
+        m_pLB_WHEREFIELD2->Disable();
+        m_pLB_WHERECOND2->Disable();
+        m_pLB_WHERECOMP2->Disable();
+        m_pET_WHEREVALUE2->Disable();
 
-        aLB_WHEREFIELD3.Disable();
-        aLB_WHERECOND3.Disable();
-        aLB_WHERECOMP3.Disable();
-        aET_WHEREVALUE3.Disable();
+        m_pLB_WHEREFIELD3->Disable();
+        m_pLB_WHERECOND3->Disable();
+        m_pLB_WHERECOMP3->Disable();
+        m_pET_WHEREVALUE3->Disable();
     }
     else
     {
-        aLB_WHEREFIELD2.Enable();
-        aLB_WHERECOND2.Enable();
-        aLB_WHERECOMP2.Enable();
-        aET_WHEREVALUE2.Enable();
+        m_pLB_WHEREFIELD2->Enable();
+        m_pLB_WHERECOND2->Enable();
+        m_pLB_WHERECOMP2->Enable();
+        m_pET_WHEREVALUE2->Enable();
 
-        aLB_WHEREFIELD3.Enable();
-        aLB_WHERECOND3.Enable();
-        aLB_WHERECOMP3.Enable();
-        aET_WHEREVALUE3.Enable();
+        m_pLB_WHEREFIELD3->Enable();
+        m_pLB_WHERECOND3->Enable();
+        m_pLB_WHERECOMP3->Enable();
+        m_pET_WHEREVALUE3->Enable();
     }
 
-    if( LbPos(aLB_WHEREFIELD2) == 0 )
+    if( LbPos(*m_pLB_WHEREFIELD2) == 0 )
     {
-        aLB_WHEREFIELD3.Disable();
-        aLB_WHERECOND3.Disable();
-        aLB_WHERECOMP3.Disable();
-        aET_WHEREVALUE3.Disable();
+        m_pLB_WHEREFIELD3->Disable();
+        m_pLB_WHERECOND3->Disable();
+        m_pLB_WHERECOMP3->Disable();
+        m_pET_WHEREVALUE3->Disable();
     }
     else
     {
-        aLB_WHEREFIELD3.Enable();
-        aLB_WHERECOND3.Enable();
-        aLB_WHERECOMP3.Enable();
-        aET_WHEREVALUE3.Enable();
+        m_pLB_WHEREFIELD3->Enable();
+        m_pLB_WHERECOND3->Enable();
+        m_pLB_WHERECOMP3->Enable();
+        m_pET_WHEREVALUE3->Enable();
     }
 
     // comparison field equal to NOENTRY
-    if( LbPos(aLB_WHEREFIELD1) == 0 )
+    if( LbPos(*m_pLB_WHEREFIELD1) == 0 )
     {
-        aLB_WHERECOMP1.Disable();
-        aET_WHEREVALUE1.Disable();
+        m_pLB_WHERECOMP1->Disable();
+        m_pET_WHEREVALUE1->Disable();
     }
     else
     {
-        aLB_WHEREFIELD1.Enable();
-        aLB_WHERECOMP1.Enable();
-        aET_WHEREVALUE1.Enable();
+        m_pLB_WHEREFIELD1->Enable();
+        m_pLB_WHERECOMP1->Enable();
+        m_pET_WHEREVALUE1->Enable();
     }
 
-    if( LbPos(aLB_WHEREFIELD2) == 0 )
+    if( LbPos(*m_pLB_WHEREFIELD2) == 0 )
     {
-        aLB_WHERECOND2.Disable();
-        aLB_WHERECOMP2.Disable();
-        aET_WHEREVALUE2.Disable();
+        m_pLB_WHERECOND2->Disable();
+        m_pLB_WHERECOMP2->Disable();
+        m_pET_WHEREVALUE2->Disable();
     }
     else
     {
-        aLB_WHERECOND2.Enable();
-        aLB_WHEREFIELD2.Enable();
-        aLB_WHERECOMP2.Enable();
-        aET_WHEREVALUE2.Enable();
+        m_pLB_WHERECOND2->Enable();
+        m_pLB_WHEREFIELD2->Enable();
+        m_pLB_WHERECOMP2->Enable();
+        m_pET_WHEREVALUE2->Enable();
     }
 
-    if( LbPos(aLB_WHEREFIELD3) == 0 )
+    if( LbPos(*m_pLB_WHEREFIELD3) == 0 )
     {
-        aLB_WHERECOND3.Disable();
-        aLB_WHERECOMP3.Disable();
-        aET_WHEREVALUE3.Disable();
+        m_pLB_WHERECOND3->Disable();
+        m_pLB_WHERECOMP3->Disable();
+        m_pET_WHEREVALUE3->Disable();
     }
     else
     {
-        aLB_WHERECOND3.Enable();
-        aLB_WHERECOND3.Enable();
-        aLB_WHEREFIELD3.Enable();
-        aLB_WHERECOMP3.Enable();
-        aET_WHEREVALUE3.Enable();
+        m_pLB_WHERECOND3->Enable();
+        m_pLB_WHERECOND3->Enable();
+        m_pLB_WHEREFIELD3->Enable();
+        m_pLB_WHERECOMP3->Enable();
+        m_pET_WHEREVALUE3->Enable();
     }
 
     // comparison operator equal to ISNULL or ISNOTNULL
-    if(aLB_WHERECOMP1.GetEntryCount() > 2 &&
-        ((LbPos(aLB_WHERECOMP1) == aLB_WHERECOMP1.GetEntryCount()-1) ||
-         (LbPos(aLB_WHERECOMP1) == aLB_WHERECOMP1.GetEntryCount()-2)) )
-        aET_WHEREVALUE1.Disable();
-
-    if(aLB_WHERECOMP2.GetEntryCount() > 2 &&
-        ((LbPos(aLB_WHERECOMP2) == aLB_WHERECOMP2.GetEntryCount()-1) ||
-         (LbPos(aLB_WHERECOMP2) == aLB_WHERECOMP2.GetEntryCount()-2)) )
-        aET_WHEREVALUE2.Disable();
-
-    if(aLB_WHERECOMP3.GetEntryCount() > 2 &&
-        ((LbPos(aLB_WHERECOMP3) == aLB_WHERECOMP3.GetEntryCount()-1) ||
-         (LbPos(aLB_WHERECOMP3) == aLB_WHERECOMP3.GetEntryCount()-2)) )
-        aET_WHEREVALUE3.Disable();
+    if(m_pLB_WHERECOMP1->GetEntryCount() > 2 &&
+        ((LbPos(*m_pLB_WHERECOMP1) == m_pLB_WHERECOMP1->GetEntryCount()-1) ||
+         (LbPos(*m_pLB_WHERECOMP1) == m_pLB_WHERECOMP1->GetEntryCount()-2)) )
+        m_pET_WHEREVALUE1->Disable();
+
+    if(m_pLB_WHERECOMP2->GetEntryCount() > 2 &&
+        ((LbPos(*m_pLB_WHERECOMP2) == m_pLB_WHERECOMP2->GetEntryCount()-1) ||
+         (LbPos(*m_pLB_WHERECOMP2) == m_pLB_WHERECOMP2->GetEntryCount()-2)) )
+        m_pET_WHEREVALUE2->Disable();
+
+    if(m_pLB_WHERECOMP3->GetEntryCount() > 2 &&
+        ((LbPos(*m_pLB_WHERECOMP3) == m_pLB_WHERECOMP3->GetEntryCount()-1) ||
+         (LbPos(*m_pLB_WHERECOMP3) == m_pLB_WHERECOMP3->GetEntryCount()-2)) )
+        m_pET_WHEREVALUE3->Disable();
 }
 
 IMPL_LINK( DlgFilterCrit, ListSelectHdl, ListBox *, pListBox )
 {
     OUString aName;
     ListBox* pComp;
-    if(pListBox == &aLB_WHEREFIELD1)
+    if(pListBox == m_pLB_WHEREFIELD1)
     {
-        aName = LbText(aLB_WHEREFIELD1);
-        pComp = &aLB_WHERECOMP1;
+        aName = LbText(*m_pLB_WHEREFIELD1);
+        pComp = m_pLB_WHERECOMP1;
     }
-    else if(pListBox == &aLB_WHEREFIELD2)
+    else if(pListBox == m_pLB_WHEREFIELD2)
     {
-        aName = LbText(aLB_WHEREFIELD2);
-        pComp = &aLB_WHERECOMP2;
+        aName = LbText(*m_pLB_WHEREFIELD2);
+        pComp = m_pLB_WHERECOMP2;
     }
     else
     {
-        aName = LbText(aLB_WHEREFIELD3);
-        pComp = &aLB_WHERECOMP3;
+        aName = LbText(*m_pLB_WHEREFIELD3);
+        pComp = m_pLB_WHERECOMP3;
     }
 
     pComp->Clear();
@@ -706,21 +699,21 @@ IMPL_LINK( DlgFilterCrit, ListSelectHdl, ListBox *, pListBox )
 
         if(eColumnSearch  == ColumnSearch::FULL)
         {
-            for(sal_Int32 i=0;i < comphelper::string::getTokenCount(aSTR_COMPARE_OPERATORS, ';');i++)
-                pComp->InsertEntry(aSTR_COMPARE_OPERATORS.getToken(i, ';'));
+            for(sal_Int32 i=0;i < comphelper::string::getTokenCount(m_aSTR_COMPARE_OPERATORS, ';');i++)
+                pComp->InsertEntry(m_aSTR_COMPARE_OPERATORS.getToken(i, ';'));
         }
         else if(eColumnSearch == ColumnSearch::CHAR)
         {
             for(sal_Int32 i=6; i<10; i++)
-                pComp->InsertEntry(aSTR_COMPARE_OPERATORS.getToken(i, ';'));
+                pComp->InsertEntry(m_aSTR_COMPARE_OPERATORS.getToken(i, ';'));
         }
         else if(eColumnSearch == ColumnSearch::BASIC)
         {
             sal_Int32 i;
             for( i = 0; i < 6; i++ )
-                pComp->InsertEntry(aSTR_COMPARE_OPERATORS.getToken(i, ';'));
-            for(i=8; i < comphelper::string::getTokenCount(aSTR_COMPARE_OPERATORS, ';'); ++i)
-                pComp->InsertEntry(aSTR_COMPARE_OPERATORS.getToken(i, ';'));
+                pComp->InsertEntry(m_aSTR_COMPARE_OPERATORS.getToken(i, ';'));
+            for(i=8; i < comphelper::string::getTokenCount(m_aSTR_COMPARE_OPERATORS, ';'); ++i)
+                pComp->InsertEntry(m_aSTR_COMPARE_OPERATORS.getToken(i, ';'));
         }
         else
         {
@@ -747,10 +740,10 @@ void DlgFilterCrit::BuildWherePart()
     aFilter.realloc(1);
     aHaving.realloc(1);
 
-    if( LbPos(aLB_WHEREFIELD1) != 0 )
+    if( LbPos(*m_pLB_WHEREFIELD1) != 0 )
     {
         PropertyValue aValue;
-        if ( getCondition(aLB_WHEREFIELD1,aLB_WHERECOMP1,aET_WHEREVALUE1,aValue) )
+        if ( getCondition(*m_pLB_WHEREFIELD1,*m_pLB_WHERECOMP1,*m_pET_WHEREVALUE1,aValue) )
         {
             aHaving[0].realloc(1);
             aHaving[0][0] = aValue;
@@ -762,14 +755,14 @@ void DlgFilterCrit::BuildWherePart()
         }
     }
 
-    if( LbPos(aLB_WHEREFIELD2) != 0 )
+    if( LbPos(*m_pLB_WHEREFIELD2) != 0 )
     {
         PropertyValue aValue;
         Sequence<Sequence<PropertyValue> >& _rValues = aFilter;
-        if ( getCondition(aLB_WHEREFIELD2,aLB_WHERECOMP2,aET_WHEREVALUE2,aValue) )
+        if ( getCondition(*m_pLB_WHEREFIELD2,*m_pLB_WHERECOMP2,*m_pET_WHEREVALUE2,aValue) )
             _rValues = aHaving;
         PropertyValue* pPos = NULL;
-        if ( aLB_WHERECOND2.GetSelectEntryPos() )
+        if ( m_pLB_WHERECOND2->GetSelectEntryPos() )
         {
             sal_Int32 nPos = _rValues.getLength();
             _rValues.realloc( nPos + 1);
@@ -786,14 +779,14 @@ void DlgFilterCrit::BuildWherePart()
         *pPos = aValue;
     }
 
-    if( LbPos(aLB_WHEREFIELD3) != 0 )
+    if( LbPos(*m_pLB_WHEREFIELD3) != 0 )
     {
         PropertyValue aValue;
         Sequence<Sequence<PropertyValue> >& _rValues = aFilter;
-        if ( getCondition(aLB_WHEREFIELD3,aLB_WHERECOMP3,aET_WHEREVALUE3,aValue) )
+        if ( getCondition(*m_pLB_WHEREFIELD3,*m_pLB_WHERECOMP3,*m_pET_WHEREVALUE3,aValue) )
             _rValues = aHaving;
         PropertyValue* pPos = NULL;
-        if ( aLB_WHERECOND3.GetSelectEntryPos() )
+        if ( m_pLB_WHERECOND3->GetSelectEntryPos() )
         {
             sal_Int32 nPos = _rValues.getLength();
             _rValues.realloc( nPos + 1);
diff --git a/dbaccess/source/ui/dlg/queryfilter.hrc b/dbaccess/source/ui/dlg/queryfilter.hrc
deleted file mode 100644
index 7206e23ea68d..000000000000
--- a/dbaccess/source/ui/dlg/queryfilter.hrc
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef DBAUI_QUERYFILTER_HRC
-#define DBAUI_QUERYFILTER_HRC
-
-#include "dbu_dlg.hrc"
-
-#define FT_WHEREFIELD   1
-#define FT_WHERECOMP    2
-#define FT_WHEREVALUE   3
-#define FT_WHEREOPER    4
-
-#define LB_WHEREFIELD1  1
-#define LB_WHERECOMP1   2
-#define LB_WHEREFIELD2  3
-#define LB_WHERECOMP2   4
-#define LB_WHEREFIELD3  5
-#define LB_WHERECOMP3   6
-#define LB_WHERECOND2   7
-#define LB_WHERECOND3   8
-
-#define FL_FIELDS               1
-
-#define ET_WHEREVALUE1  1
-#define ET_WHEREVALUE2  2
-#define ET_WHEREVALUE3  3
-
-#define STR_NOENTRY     1
-#define STR_COMPARE_OPERATORS 4
-
-#define BT_OK           1
-#define BT_CANCEL       2
-#define BT_HELP         3
-
-#endif // DBAUI_QUERYFILTER_HRC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/dlg/queryfilter.src b/dbaccess/source/ui/dlg/queryfilter.src
deleted file mode 100644
index 07278f3e58fd..000000000000
--- a/dbaccess/source/ui/dlg/queryfilter.src
+++ /dev/null
@@ -1,212 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "queryfilter.hrc"
-#include "dbaccess_helpid.hrc"
-
-ModalDialog DLG_FILTERCRIT
-{
-    OutputSize = TRUE ;
-    Hide = TRUE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( 303 , 76 ) ;
-    /* These strings are equal to the toolbox bubble helptext from MID_SBA_QRY_FILTERCRIT in toolbox.hrc */
-    Text [ en-US ] ="Standard Filter";
-
-    Moveable = TRUE ;
-    Closeable = TRUE ;
-    HelpId = HID_DLG_FILTERCRIT ;
-    ListBox LB_WHEREFIELD1
-    {
-        HelpID = "dbaccess:ListBox:DLG_FILTERCRIT:LB_WHEREFIELD1";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 60 , 25 ) ;
-        Size = MAP_APPFONT ( 60 , 90 ) ;
-        TabStop = TRUE ;
-        DropDown = TRUE ;
-    };
-    ListBox LB_WHERECOMP1
-    {
-        HelpID = "dbaccess:ListBox:DLG_FILTERCRIT:LB_WHERECOMP1";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 124 , 25 ) ;
-        Size = MAP_APPFONT ( 49 , 72 ) ;
-        TabStop = TRUE ;
-        DDExtraWidth = TRUE ;
-        DropDown = TRUE ;
-        CurPos = 0 ;
-    };
-    Edit ET_WHEREVALUE1
-    {
-        HelpID = "dbaccess:Edit:DLG_FILTERCRIT:ET_WHEREVALUE1";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 177 , 25 ) ;
-        Size = MAP_APPFONT ( 60 , 12 ) ;
-        TabStop = TRUE ;
-    };
-    ListBox LB_WHERECOND2
-    {
-        HelpID = "dbaccess:ListBox:DLG_FILTERCRIT:LB_WHERECOND2";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 15 , 41 ) ;
-        Size = MAP_APPFONT ( 41 , 36 ) ;
-        TabStop = TRUE ;
-        DropDown = TRUE ;
-        CurPos = 0 ;
-        StringList [ en-US ] =
-        {
-            < "AND" ; Default ; > ;
-            < "OR" ; Default ; > ;
-        };
-    };
-    ListBox LB_WHEREFIELD2
-    {
-        HelpID = "dbaccess:ListBox:DLG_FILTERCRIT:LB_WHEREFIELD2";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 60 , 41 ) ;
-        Size = MAP_APPFONT ( 60 , 90 ) ;
-        TabStop = TRUE ;
-        DropDown = TRUE ;
-    };
-    ListBox LB_WHERECOMP2
-    {
-        HelpID = "dbaccess:ListBox:DLG_FILTERCRIT:LB_WHERECOMP2";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 124 , 41 ) ;
-        Size = MAP_APPFONT ( 49 , 72 ) ;
-        TabStop = TRUE ;
-        DropDown = TRUE ;
-        DDExtraWidth = TRUE ;
-        CurPos = 0 ;
-    };
-    Edit ET_WHEREVALUE2
-    {
-        HelpID = "dbaccess:Edit:DLG_FILTERCRIT:ET_WHEREVALUE2";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 177 , 41 ) ;
-        Size = MAP_APPFONT ( 60 , 12 ) ;
-        TabStop = TRUE ;
-    };
-    ListBox LB_WHERECOND3
-    {
-        HelpID = "dbaccess:ListBox:DLG_FILTERCRIT:LB_WHERECOND3";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 15 , 57 ) ;
-        Size = MAP_APPFONT ( 41 , 36 ) ;
-        TabStop = TRUE ;
-        DropDown = TRUE ;
-        CurPos = 0 ;
-        StringList [ en-US ] =
-        {
-            < "AND" ; Default ; > ;
-            < "OR" ; Default ; > ;
-        };
-    };
-    ListBox LB_WHEREFIELD3
-    {
-        HelpID = "dbaccess:ListBox:DLG_FILTERCRIT:LB_WHEREFIELD3";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 60 , 57 ) ;
-        Size = MAP_APPFONT ( 60 , 90 ) ;
-        TabStop = TRUE ;
-        DropDown = TRUE ;
-    };
-    ListBox LB_WHERECOMP3
-    {
-        HelpID = "dbaccess:ListBox:DLG_FILTERCRIT:LB_WHERECOMP3";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 124 , 57 ) ;
-        Size = MAP_APPFONT ( 49 , 72 ) ;
-        TabStop = TRUE ;
-        DropDown = TRUE ;
-        DDExtraWidth = TRUE ;
-        CurPos = 0 ;
-    };
-    Edit ET_WHEREVALUE3
-    {
-        HelpID = "dbaccess:Edit:DLG_FILTERCRIT:ET_WHEREVALUE3";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 177 , 57 ) ;
-        Size = MAP_APPFONT ( 60 , 12 ) ;
-        TabStop = TRUE ;
-    };
-    FixedText FT_WHEREFIELD
-    {
-        Pos = MAP_APPFONT ( 60 , 14 ) ;
-        Size = MAP_APPFONT ( 60 , 8 ) ;
-        Center = TRUE ;
-        Text [ en-US ] = "Field name" ;
-    };
-    FixedText FT_WHERECOMP
-    {
-        Pos = MAP_APPFONT ( 124 , 14 ) ;
-        Size = MAP_APPFONT ( 50 , 8 ) ;
-        Center = TRUE ;
-        Text [ en-US ] = "Condition" ;
-    };
-    FixedText FT_WHEREVALUE
-    {
-        Pos = MAP_APPFONT ( 177 , 14 ) ;
-        Size = MAP_APPFONT ( 60 , 8 ) ;
-        Center = TRUE ;
-        Text [ en-US ] = "Value" ;
-    };
-    FixedText FT_WHEREOPER
-    {
-        Pos = MAP_APPFONT ( 15 , 14 ) ;
-        Size = MAP_APPFONT ( 40 , 8 ) ;
-        Center = TRUE ;
-        Text [ en-US ] = "Operator" ;
-    };
-    FixedLine FL_FIELDS
-    {
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 236 , 8 ) ;
-        Text [ en-US ] = "Criteria" ;
-    };
-    OKButton BT_OK
-    {
-        Pos = MAP_APPFONT ( 249 , 6 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-        DefButton = TRUE ;
-    };
-    CancelButton BT_CANCEL
-    {
-        Pos = MAP_APPFONT ( 249 , 23 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-    HelpButton BT_HELP
-    {
-        Pos = MAP_APPFONT ( 249 , 43 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-    String STR_NOENTRY
-    {
-        Text [ en-US ] = "- none -" ;
-    };
-    String STR_COMPARE_OPERATORS
-    {
-        Text [ en-US ] = "=;<>;<;<=;>;>=;like;not like;null;not null";
-    };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc
index 5beaf5b534ec..17aca78d5ad4 100644
--- a/dbaccess/source/ui/inc/dbu_resource.hrc
+++ b/dbaccess/source/ui/inc/dbu_resource.hrc
@@ -80,7 +80,6 @@
 #define DLG_SQLEXCEPTIONCHAIN           RID_DIALOG_START +  3
 #define DLG_DATASOURCE_SELECTION        RID_DIALOG_START +  4
 #define DLG_PARAMETERS                  RID_DIALOG_START +  5
-#define DLG_FILTERCRIT                  RID_DIALOG_START +  6
 
 #define DLG_SAVE_AS                     RID_DIALOG_START + 11
 #define DLG_JOIN_TABADD                 RID_DIALOG_START + 14
diff --git a/dbaccess/source/ui/inc/queryfilter.hxx b/dbaccess/source/ui/inc/queryfilter.hxx
index ab9a49d9f7ea..2fbb8127217a 100644
--- a/dbaccess/source/ui/inc/queryfilter.hxx
+++ b/dbaccess/source/ui/inc/queryfilter.hxx
@@ -67,27 +67,21 @@ namespace dbaui
                         ,public ::svxform::OParseContextClient
     {
     private:
-        ListBox         aLB_WHEREFIELD1;
-        ListBox         aLB_WHERECOMP1;
-        Edit            aET_WHEREVALUE1;
-        ListBox         aLB_WHERECOND2;
-        ListBox         aLB_WHEREFIELD2;
-        ListBox         aLB_WHERECOMP2;
-        Edit            aET_WHEREVALUE2;
-        ListBox         aLB_WHERECOND3;
-        ListBox         aLB_WHEREFIELD3;
-        ListBox         aLB_WHERECOMP3;
-        Edit            aET_WHEREVALUE3;
-        FixedText       aFT_WHEREFIELD;
-        FixedText       aFT_WHERECOMP;
-        FixedText       aFT_WHEREVALUE;
-        FixedText       aFT_WHEREOPER;
-        FixedLine       aFL_FIELDS;
-        OKButton        aBT_OK;
-        CancelButton    aBT_CANCEL;
-        HelpButton      aBT_HELP;
-        OUString        aSTR_NOENTRY;
-        OUString        aSTR_COMPARE_OPERATORS;
+        ListBox*        m_pLB_WHEREFIELD1;
+        ListBox*        m_pLB_WHERECOMP1;
+        Edit*           m_pET_WHEREVALUE1;
+
+        ListBox*        m_pLB_WHERECOND2;
+        ListBox*        m_pLB_WHEREFIELD2;
+        ListBox*        m_pLB_WHERECOMP2;
+        Edit*           m_pET_WHEREVALUE2;
+
+        ListBox*        m_pLB_WHERECOND3;
+        ListBox*        m_pLB_WHEREFIELD3;
+        ListBox*        m_pLB_WHERECOMP3;
+        Edit*           m_pET_WHEREVALUE3;
+
+        OUString        m_aSTR_COMPARE_OPERATORS;
 
         ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer>    m_xQueryComposer;
         ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>     m_xColumns;
diff --git a/dbaccess/uiconfig/ui/queryfilterdialog.ui b/dbaccess/uiconfig/ui/queryfilterdialog.ui
new file mode 100644
index 000000000000..d03584a13d43
--- /dev/null
+++ b/dbaccess/uiconfig/ui/queryfilterdialog.ui
@@ -0,0 +1,348 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.1 -->
+<interface>
+  <requires lib="gtk+" version="3.0"/>
+  <object class="GtkDialog" id="QueryFilterDialog">
+    <property name="can_focus">False</property>
+    <property name="border_width">6</property>
+    <property name="title" translatable="yes">Standard Filter</property>
+    <property name="type_hint">dialog</property>
+    <child internal-child="vbox">
+      <object class="GtkBox" id="dialog-vbox1">
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">12</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox" id="dialog-action_area1">
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="ok">
+                <property name="label">gtk-ok</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="has_default">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="cancel">
+                <property name="label">gtk-cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="help">
+                <property name="label">gtk-help</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkFrame" id="frame1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="hexpand">True</property>
+            <property name="label_xalign">0</property>
+            <property name="shadow_type">none</property>
+            <child>
+              <object class="GtkAlignment" id="alignment2">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="top_padding">6</property>
+                <property name="left_padding">12</property>
+                <child>
+                  <object class="GtkGrid" id="grid2">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="row_spacing">6</property>
+                    <property name="column_spacing">12</property>
+                    <child>
+                      <object class="GtkLabel" id="label2">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Operator</property>
+                        <property name="ellipsize">end</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">0</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="label5">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Field name</property>
+                        <property name="ellipsize">end</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">0</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="label6">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Condition</property>
+                        <property name="ellipsize">end</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">2</property>
+                        <property name="top_attach">0</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkComboBoxText" id="field1">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="hexpand">True</property>
+                        <items>
+                          <item translatable="yes">- none -</item>
+                        </items>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">1</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkComboBoxText" id="cond1">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="hexpand">True</property>
+                        <items>
+                          <item translatable="yes">=</item>
+                          <item translatable="yes">&lt;&gt;</item>
+                          <item translatable="yes">&lt;</item>
+                          <item translatable="yes">=</item>
+                          <item translatable="yes">&gt;</item>
+                          <item translatable="yes">=</item>
+                          <item translatable="yes">like</item>
+                          <item translatable="yes">not like</item>
+                          <item translatable="yes">null</item>
+                          <item translatable="yes">not null</item>
+                        </items>
+                      </object>
+                      <packing>
+                        <property name="left_attach">2</property>
+                        <property name="top_attach">1</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkComboBoxText" id="field2">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="hexpand">True</property>
+                        <items>
+                          <item translatable="yes">- none -</item>
+                        </items>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">2</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkComboBoxText" id="field3">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="hexpand">True</property>
+                        <items>
+                          <item translatable="yes">- none -</item>
+                        </items>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">3</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkComboBoxText" id="cond2">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="hexpand">True</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">2</property>
+                        <property name="top_attach">2</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkComboBoxText" id="cond3">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="hexpand">True</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">2</property>
+                        <property name="top_attach">3</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="label7">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Value</property>
+                        <property name="ellipsize">end</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">3</property>
+                        <property name="top_attach">0</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkEntry" id="value1">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">3</property>
+                        <property name="top_attach">1</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkEntry" id="value2">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">3</property>
+                        <property name="top_attach">2</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkEntry" id="value3">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">3</property>
+                        <property name="top_attach">3</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkComboBoxText" id="op2">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="hexpand">True</property>
+                        <items>
+                          <item translatable="yes">AND</item>
+                          <item translatable="yes">OR</item>
+                        </items>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">2</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkComboBoxText" id="op3">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="hexpand">True</property>
+                        <items>
+                          <item translatable="yes">AND</item>
+                          <item translatable="yes">OR</item>
+                        </items>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">3</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child type="label">
+              <object class="GtkLabel" id="label1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Criteria</property>
+                <attributes>
+                  <attribute name="weight" value="bold"/>
+                </attributes>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="0">ok</action-widget>
+      <action-widget response="0">cancel</action-widget>
+      <action-widget response="0">help</action-widget>
+    </action-widgets>
+  </object>
+</interface>