convert pivot filter dialog to .ui

Change-Id: I795d296bae700d1e3a273fbe71fc842d145c5138

13 files changed, 711 insertions, 476 deletions

diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 7d99aec42805..37ce1064060d 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -127,6 +127,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
 	sc/uiconfig/scalc/ui/paradialog \
 	sc/uiconfig/scalc/ui/paratemplatedialog \
 	sc/uiconfig/scalc/ui/pivotfielddialog \
+	sc/uiconfig/scalc/ui/pivotfilterdialog \
 	sc/uiconfig/scalc/ui/pivottablelayout \
 	sc/uiconfig/scalc/ui/printareasdialog \
 	sc/uiconfig/scalc/ui/printeroptions \
diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
index 9fef6bbe4589..bc28f461416e 100644
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -51,8 +51,6 @@
 //  Bereich ist voll!
 
 // Hilfe IDs fuer Dialoge / Pages (max.70) -----------------------------------
-#define HID_SC_PIVOTFILTER                                      "SC_HID_SC_PIVOTFILTER"
-
 #define HID_SC_NAVIGATOR                                        "SC_HID_SC_NAVIGATOR"
 
 #define HID_SC_GROUP_COLS                                       "SC_HID_SC_GROUP_COLS"
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 6f887b15f8ff..c776750b9e13 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -1023,7 +1023,6 @@
 
 #define RID_SCPAGE_SUBT_OPTIONS (SC_DIALOGS_START + 29)
 #define RID_SCPAGE_USERLISTS    (SC_DIALOGS_START + 31)
-#define RID_SCDLG_PIVOTFILTER   (SC_DIALOGS_START + 33)
 #define RID_SCDLG_CONSOLIDATE   (SC_DIALOGS_START + 35)
 #define RID_SCDLG_INSERT_TABLE  (SC_DIALOGS_START + 42)
 
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 0993fb54a1e1..e4e5fd9ab75d 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -410,8 +410,8 @@ public:
 
     virtual AbstractScNamePasteDlg * CreateScNamePasteDlg ( Window * pParent, ScDocShell* pShell, bool bInsList=true ) = 0;
 
-    virtual AbstractScPivotFilterDlg * CreateScPivotFilterDlg ( Window* pParent,
-                                                                const SfxItemSet&   rArgSet, sal_uInt16 nSourceTab , int nId ) = 0;
+    virtual AbstractScPivotFilterDlg * CreateScPivotFilterDlg(Window* pParent,
+        const SfxItemSet& rArgSet, sal_uInt16 nSourceTab) = 0;
 
     virtual AbstractScDPFunctionDlg * CreateScDPFunctionDlg( Window* pParent,
                                                                 const ScDPLabelDataVector& rLabelVec,
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx
index 7472494852a6..e6c7710c4d30 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -814,22 +814,11 @@ AbstractScNamePasteDlg * ScAbstractDialogFactory_Impl::CreateScNamePasteDlg ( Wi
     return new AbstractScNamePasteDlg_Impl( pDlg );
 }
 
-AbstractScPivotFilterDlg * ScAbstractDialogFactory_Impl::CreateScPivotFilterDlg ( Window* pParent,
-                                                                const SfxItemSet&   rArgSet, sal_uInt16 nSourceTab , int nId )
+AbstractScPivotFilterDlg * ScAbstractDialogFactory_Impl::CreateScPivotFilterDlg(Window* pParent,
+    const SfxItemSet& rArgSet, sal_uInt16 nSourceTab)
 {
-    ScPivotFilterDlg * pDlg=NULL;
-    switch ( nId )
-    {
-        case RID_SCDLG_PIVOTFILTER :
-            pDlg = new ScPivotFilterDlg( pParent, rArgSet, nSourceTab );
-            break;
-        default:
-            break;
-    }
-
-    if ( pDlg )
-        return new AbstractScPivotFilterDlg_Impl( pDlg );
-    return 0;
+    ScPivotFilterDlg *pDlg = new ScPivotFilterDlg(pParent, rArgSet, nSourceTab);
+    return new AbstractScPivotFilterDlg_Impl(pDlg);
 }
 
 AbstractScDPFunctionDlg * ScAbstractDialogFactory_Impl::CreateScDPFunctionDlg ( Window* pParent,
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx
index 9be2c1f5f6b4..40f7bd13098c 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -479,8 +479,8 @@ public:
 
     virtual AbstractScNamePasteDlg * CreateScNamePasteDlg ( Window * pParent, ScDocShell* pShell, bool bInsList=true );
 
-    virtual AbstractScPivotFilterDlg * CreateScPivotFilterDlg ( Window* pParent,
-                                                                const SfxItemSet&   rArgSet, sal_uInt16 nSourceTab , int nId );
+    virtual AbstractScPivotFilterDlg * CreateScPivotFilterDlg(Window* pParent,
+        const SfxItemSet& rArgSet, sal_uInt16 nSourceTab);
 
     virtual AbstractScDPFunctionDlg * CreateScDPFunctionDlg( Window* pParent,
                                                                 const ScDPLabelDataVector& rLabelVec,
diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx
index e412c34e6731..752bc4693a64 100644
--- a/sc/source/ui/dbgui/pfiltdlg.cxx
+++ b/sc/source/ui/dbgui/pfiltdlg.cxx
@@ -44,40 +44,12 @@
 #include <svl/zforlist.hxx>
 #include "svl/sharedstringpool.hxx"
 
+ScPivotFilterDlg::ScPivotFilterDlg(Window* pParent, const SfxItemSet& rArgSet,
+    SCTAB nSourceTab )
+    :   ModalDialog(pParent, "PivotFilterDialog",
+            "modules/scalc/ui/pivotfilterdialog.ui" )
+    ,
 
-
-ScPivotFilterDlg::ScPivotFilterDlg( Window*             pParent,
-                                    const SfxItemSet&   rArgSet,
-                                    SCTAB               nSourceTab )
-
-    :   ModalDialog ( pParent, ScResId( RID_SCDLG_PIVOTFILTER ) ),
-
-        aFlCriteria     ( this, ScResId( FL_CRITERIA ) ),
-        aLbField1       ( this, ScResId( LB_FIELD1 ) ),
-        aLbCond1        ( this, ScResId( LB_COND1 ) ),
-        aEdVal1         ( this, ScResId( ED_VAL1 ) ),
-        aLbConnect1     ( this, ScResId( LB_OP1 ) ),
-        aLbField2       ( this, ScResId( LB_FIELD2 ) ),
-        aLbCond2        ( this, ScResId( LB_COND2 ) ),
-        aEdVal2         ( this, ScResId( ED_VAL2 ) ),
-        aLbConnect2     ( this, ScResId( LB_OP2 ) ),
-        aLbField3       ( this, ScResId( LB_FIELD3 ) ),
-        aLbCond3        ( this, ScResId( LB_COND3 ) ),
-        aEdVal3         ( this, ScResId( ED_VAL3 ) ),
-        aFtConnect      ( this, ScResId( FT_OP ) ),
-        aFtField        ( this, ScResId( FT_FIELD ) ),
-        aFtCond         ( this, ScResId( FT_COND ) ),
-        aFtVal          ( this, ScResId( FT_VAL ) ),
-        aFlOptions      ( this, ScResId( FL_OPTIONS ) ),
-        aBtnCase        ( this, ScResId( BTN_CASE ) ),
-        aBtnRegExp      ( this, ScResId( BTN_REGEXP ) ),
-        aBtnUnique      ( this, ScResId( BTN_UNIQUE ) ),
-        aFtDbAreaLabel  ( this, ScResId( FT_DBAREA_LABEL ) ),
-        aFtDbArea       ( this, ScResId( FT_DBAREA ) ),
-        aBtnOk          ( this, ScResId( BTN_OK ) ),
-        aBtnCancel      ( this, ScResId( BTN_CANCEL ) ),
-        aBtnHelp        ( this, ScResId( BTN_HELP ) ),
-        aBtnMore        ( this, ScResId( BTN_MORE ) ),
         aStrUndefined   ( SC_RESSTR(SCSTR_UNDEFINED) ),
         aStrNone        ( SC_RESSTR(SCSTR_NONE) ),
         aStrEmpty       ( SC_RESSTR(SCSTR_FILTER_EMPTY) ),
@@ -93,63 +65,66 @@ ScPivotFilterDlg::ScPivotFilterDlg( Window*             pParent,
         nSrcTab         ( nSourceTab ),     // ist nicht im QueryParam
         nFieldCount     ( 0 )
 {
+    get(m_pLbField1, "field1");
+    get(m_pLbCond1, "cond1");
+    get(m_pEdVal1, "val1");
+    get(m_pLbConnect1, "connect1");
+    get(m_pLbField2, "field2");
+    get(m_pLbCond2, "cond2");
+    get(m_pEdVal2, "val2");
+    get(m_pLbConnect2, "connect2");
+    get(m_pLbField3, "field3");
+    get(m_pLbCond3, "cond3");
+    get(m_pEdVal3, "val3");
+    get(m_pBtnCase, "case");
+    get(m_pBtnRegExp, "regexp");
+    get(m_pBtnUnique, "unique");
+    get(m_pFtDbArea, "dbarea");
+
     for (sal_uInt16 i=0; i<=MAXCOL; i++)
         pEntryLists[i] = NULL;
 
     Init( rArgSet );
-    FreeResource();
 }
 
-
-
 ScPivotFilterDlg::~ScPivotFilterDlg()
 {
     for (sal_uInt16 i=0; i<=MAXCOL; i++)
         delete pEntryLists[i];
 
-    if ( pOutItem )
-        delete pOutItem;
+    delete pOutItem;
 }
 
-
-
 void ScPivotFilterDlg::Init( const SfxItemSet& rArgSet )
 {
     const ScQueryItem& rQueryItem = (const ScQueryItem&)
                                     rArgSet.Get( nWhichQuery );
 
-    aBtnCase.SetClickHdl    ( LINK( this, ScPivotFilterDlg, CheckBoxHdl ) );
-
-    aLbField1.SetSelectHdl  ( LINK( this, ScPivotFilterDlg, LbSelectHdl ) );
-    aLbField2.SetSelectHdl  ( LINK( this, ScPivotFilterDlg, LbSelectHdl ) );
-    aLbField3.SetSelectHdl  ( LINK( this, ScPivotFilterDlg, LbSelectHdl ) );
-    aLbConnect1.SetSelectHdl( LINK( this, ScPivotFilterDlg, LbSelectHdl ) );
-    aLbConnect2.SetSelectHdl( LINK( this, ScPivotFilterDlg, LbSelectHdl ) );
+    m_pBtnCase->SetClickHdl    ( LINK( this, ScPivotFilterDlg, CheckBoxHdl ) );
 
-    aBtnMore.AddWindow( &aBtnCase );
-    aBtnMore.AddWindow( &aBtnRegExp );
-    aBtnMore.AddWindow( &aBtnUnique );
-    aBtnMore.AddWindow( &aFtDbAreaLabel );
-    aBtnMore.AddWindow( &aFtDbArea );
-    aBtnMore.AddWindow( &aFlOptions );
+    m_pLbField1->SetSelectHdl  ( LINK( this, ScPivotFilterDlg, LbSelectHdl ) );
+    m_pLbField2->SetSelectHdl  ( LINK( this, ScPivotFilterDlg, LbSelectHdl ) );
+    m_pLbField3->SetSelectHdl  ( LINK( this, ScPivotFilterDlg, LbSelectHdl ) );
+    m_pLbConnect1->SetSelectHdl( LINK( this, ScPivotFilterDlg, LbSelectHdl ) );
+    m_pLbConnect2->SetSelectHdl( LINK( this, ScPivotFilterDlg, LbSelectHdl ) );
 
-    aBtnCase    .Check( theQueryData.bCaseSens );
-    aBtnRegExp  .Check( theQueryData.bRegExp );
-    aBtnUnique  .Check( !theQueryData.bDuplicate );
+    m_pBtnCase->Check( theQueryData.bCaseSens );
+    m_pBtnRegExp->Check( theQueryData.bRegExp );
+    m_pBtnUnique->Check( !theQueryData.bDuplicate );
 
     pViewData   = rQueryItem.GetViewData();
     pDoc        = pViewData ? pViewData->GetDocument() : NULL;
 
     // fuer leichteren Zugriff:
-    aFieldLbArr  [0] = &aLbField1;
-    aFieldLbArr  [1] = &aLbField2;
-    aFieldLbArr  [2] = &aLbField3;
-    aValueEdArr  [0] = &aEdVal1;
-    aValueEdArr  [1] = &aEdVal2;
-    aValueEdArr  [2] = &aEdVal3;
-    aCondLbArr   [0] = &aLbCond1;
-    aCondLbArr   [1] = &aLbCond2;
-    aCondLbArr   [2] = &aLbCond3;
+    aFieldLbArr  [0] = m_pLbField1;
+    aFieldLbArr  [1] = m_pLbField2;
+    aFieldLbArr  [2] = m_pLbField3;
+    aValueEdArr  [0] = m_pEdVal1;
+    aValueEdArr  [1] = m_pEdVal2;
+    aValueEdArr  [2] = m_pEdVal3;
+    aCondLbArr   [0] = m_pLbCond1;
+    aCondLbArr   [1] = m_pLbCond2;
+    aCondLbArr   [2] = m_pLbCond3;
 
     if ( pViewData && pDoc )
     {
@@ -182,11 +157,11 @@ void ScPivotFilterDlg::Init( const SfxItemSet& rArgSet )
         aBuf.appendAscii(" (");
         aBuf.append(theDbName);
         aBuf.append(')');
-        aFtDbArea.SetText(aBuf.makeStringAndClear());
+        m_pFtDbArea->SetText(aBuf.makeStringAndClear());
     }
     else
     {
-        aFtDbArea.SetText( EMPTY_OUSTRING );
+        m_pFtDbArea->SetText( EMPTY_OUSTRING );
     }
 
     // Feldlisten einlesen und Eintraege selektieren:
@@ -226,42 +201,42 @@ void ScPivotFilterDlg::Init( const SfxItemSet& rArgSet )
 
     // Disable/Enable Logik:
 
-       (aLbField1.GetSelectEntryPos() != 0)
-    && (aLbField2.GetSelectEntryPos() != 0)
-        ? aLbConnect1.SelectEntryPos( (sal_uInt16)theQueryData.GetEntry(1).eConnect )
-        : aLbConnect1.SetNoSelection();
+       (m_pLbField1->GetSelectEntryPos() != 0)
+    && (m_pLbField2->GetSelectEntryPos() != 0)
+        ? m_pLbConnect1->SelectEntryPos( (sal_uInt16)theQueryData.GetEntry(1).eConnect )
+        : m_pLbConnect1->SetNoSelection();
 
-       (aLbField2.GetSelectEntryPos() != 0)
-    && (aLbField3.GetSelectEntryPos() != 0)
-        ? aLbConnect2.SelectEntryPos( (sal_uInt16)theQueryData.GetEntry(2).eConnect )
-        : aLbConnect2.SetNoSelection();
+       (m_pLbField2->GetSelectEntryPos() != 0)
+    && (m_pLbField3->GetSelectEntryPos() != 0)
+        ? m_pLbConnect2->SelectEntryPos( (sal_uInt16)theQueryData.GetEntry(2).eConnect )
+        : m_pLbConnect2->SetNoSelection();
 
-    if ( aLbField1.GetSelectEntryPos() == 0 )
+    if ( m_pLbField1->GetSelectEntryPos() == 0 )
     {
-        aLbConnect1.Disable();
-        aLbField2.Disable();
-        aLbCond2.Disable();
-        aEdVal2.Disable();
+        m_pLbConnect1->Disable();
+        m_pLbField2->Disable();
+        m_pLbCond2->Disable();
+        m_pEdVal2->Disable();
     }
-    else if ( aLbConnect1.GetSelectEntryCount() == 0 )
+    else if ( m_pLbConnect1->GetSelectEntryCount() == 0 )
     {
-        aLbField2.Disable();
-        aLbCond2.Disable();
-        aEdVal2.Disable();
+        m_pLbField2->Disable();
+        m_pLbCond2->Disable();
+        m_pEdVal2->Disable();
     }
 
-    if ( aLbField2.GetSelectEntryPos() == 0 )
+    if ( m_pLbField2->GetSelectEntryPos() == 0 )
     {
-        aLbConnect2.Disable();
-        aLbField3.Disable();
-        aLbCond3.Disable();
-        aEdVal3.Disable();
+        m_pLbConnect2->Disable();
+        m_pLbField3->Disable();
+        m_pLbCond3->Disable();
+        m_pEdVal3->Disable();
     }
-    else if ( aLbConnect2.GetSelectEntryCount() == 0 )
+    else if ( m_pLbConnect2->GetSelectEntryCount() == 0 )
     {
-        aLbField3.Disable();
-        aLbCond3.Disable();
-        aEdVal3.Disable();
+        m_pLbField3->Disable();
+        m_pLbCond3->Disable();
+        m_pEdVal3->Disable();
     }
 }
 
@@ -269,12 +244,12 @@ void ScPivotFilterDlg::Init( const SfxItemSet& rArgSet )
 
 void ScPivotFilterDlg::FillFieldLists()
 {
-    aLbField1.Clear();
-    aLbField2.Clear();
-    aLbField3.Clear();
-    aLbField1.InsertEntry( aStrNone, 0 );
-    aLbField2.InsertEntry( aStrNone, 0 );
-    aLbField3.InsertEntry( aStrNone, 0 );
+    m_pLbField1->Clear();
+    m_pLbField2->Clear();
+    m_pLbField3->Clear();
+    m_pLbField1->InsertEntry( aStrNone, 0 );
+    m_pLbField2->InsertEntry( aStrNone, 0 );
+    m_pLbField3->InsertEntry( aStrNone, 0 );
 
     if ( pDoc )
     {
@@ -293,9 +268,9 @@ void ScPivotFilterDlg::FillFieldLists()
             {
                 aFieldName = ScGlobal::ReplaceOrAppend( aStrColumn, "%1", ScColToAlpha( col ));
             }
-            aLbField1.InsertEntry( aFieldName, i );
-            aLbField2.InsertEntry( aFieldName, i );
-            aLbField3.InsertEntry( aFieldName, i );
+            m_pLbField1->InsertEntry( aFieldName, i );
+            m_pLbField2->InsertEntry( aFieldName, i );
+            m_pLbField3->InsertEntry( aFieldName, i );
             i++;
         }
         nFieldCount = i;
@@ -330,7 +305,7 @@ void ScPivotFilterDlg::UpdateValueList( sal_uInt16 nList )
                 SCROW   nLastRow    = theQueryData.nRow2;
                 nFirstRow++;
                 bool bHasDates = false;
-                bool bCaseSens = aBtnCase.IsChecked();
+                bool bCaseSens = m_pBtnCase->IsChecked();
                 pEntryLists[nColumn] = new std::vector<ScTypedStrData>;
                 pDoc->GetFilterEntriesArea(
                     nColumn, nFirstRow, nLastRow, nTab, bCaseSens, *pEntryLists[nColumn], bHasDates);
@@ -377,8 +352,8 @@ sal_uInt16 ScPivotFilterDlg::GetFieldSelPos( SCCOL nField )
 const ScQueryItem& ScPivotFilterDlg::GetOutputItem()
 {
     ScQueryParam    theParam( theQueryData );
-    sal_Int32          nConnect1 = aLbConnect1.GetSelectEntryPos();
-    sal_Int32          nConnect2 = aLbConnect2.GetSelectEntryPos();
+    sal_Int32          nConnect1 = m_pLbConnect1->GetSelectEntryPos();
+    sal_Int32          nConnect2 = m_pLbConnect2->GetSelectEntryPos();
 
     svl::SharedStringPool& rPool = pViewData->GetDocument()->GetSharedStringPool();
 
@@ -437,9 +412,9 @@ const ScQueryItem& ScPivotFilterDlg::GetOutputItem()
     theParam.nDestCol   = 0;
     theParam.nDestRow   = 0;
 
-    theParam.bDuplicate     = !aBtnUnique.IsChecked();
-    theParam.bCaseSens      = aBtnCase.IsChecked();
-    theParam.bRegExp        = aBtnRegExp.IsChecked();
+    theParam.bDuplicate     = !m_pBtnUnique->IsChecked();
+    theParam.bCaseSens      = m_pBtnCase->IsChecked();
+    theParam.bRegExp        = m_pBtnRegExp->IsChecked();
 
     if ( pOutItem ) DELETEZ( pOutItem );
     pOutItem = new ScQueryItem( nWhichQuery, &theParam );
@@ -458,83 +433,83 @@ IMPL_LINK( ScPivotFilterDlg, LbSelectHdl, ListBox*, pLb )
      * abhaengig davon, welche ListBox angefasst wurde:
      */
 
-    if ( pLb == &aLbConnect1 )
+    if (pLb == m_pLbConnect1)
     {
-        if ( !aLbField2.IsEnabled() )
+        if ( !m_pLbField2->IsEnabled() )
         {
-            aLbField2.Enable();
-            aLbCond2.Enable();
-            aEdVal2.Enable();
+            m_pLbField2->Enable();
+            m_pLbCond2->Enable();
+            m_pEdVal2->Enable();
         }
     }
-    else if ( pLb == &aLbConnect2 )
+    else if (pLb == m_pLbConnect2)
     {
-        if ( !aLbField3.IsEnabled() )
+        if ( !m_pLbField3->IsEnabled() )
         {
-            aLbField3.Enable();
-            aLbCond3.Enable();
-            aEdVal3.Enable();
+            m_pLbField3->Enable();
+            m_pLbCond3->Enable();
+            m_pEdVal3->Enable();
         }
     }
-    else if ( pLb == &aLbField1 )
+    else if (pLb == m_pLbField1)
     {
-        if ( aLbField1.GetSelectEntryPos() == 0 )
+        if ( m_pLbField1->GetSelectEntryPos() == 0 )
         {
-            aLbConnect1.SetNoSelection();
-            aLbConnect2.SetNoSelection();
-            aLbField2.SelectEntryPos( 0 );
-            aLbField3.SelectEntryPos( 0 );
-            aLbCond2.SelectEntryPos( 0 );
-            aLbCond3.SelectEntryPos( 0 );
+            m_pLbConnect1->SetNoSelection();
+            m_pLbConnect2->SetNoSelection();
+            m_pLbField2->SelectEntryPos( 0 );
+            m_pLbField3->SelectEntryPos( 0 );
+            m_pLbCond2->SelectEntryPos( 0 );
+            m_pLbCond3->SelectEntryPos( 0 );
             ClearValueList( 1 );
             ClearValueList( 2 );
             ClearValueList( 3 );
 
-            aLbConnect1.Disable();
-            aLbConnect2.Disable();
-            aLbField2.Disable();
-            aLbField3.Disable();
-            aLbCond2.Disable();
-            aLbCond3.Disable();
-            aEdVal2.Disable();
-            aEdVal3.Disable();
+            m_pLbConnect1->Disable();
+            m_pLbConnect2->Disable();
+            m_pLbField2->Disable();
+            m_pLbField3->Disable();
+            m_pLbCond2->Disable();
+            m_pLbCond3->Disable();
+            m_pEdVal2->Disable();
+            m_pEdVal3->Disable();
         }
         else
         {
             UpdateValueList( 1 );
-            if ( !aLbConnect1.IsEnabled() )
+            if ( !m_pLbConnect1->IsEnabled() )
             {
-                aLbConnect1.Enable();
+                m_pLbConnect1->Enable();
             }
         }
     }
-    else if ( pLb == &aLbField2 )
+    else if (pLb == m_pLbField2)
     {
-        if ( aLbField2.GetSelectEntryPos() == 0 )
+        if ( m_pLbField2->GetSelectEntryPos() == 0 )
         {
-            aLbConnect2.SetNoSelection();
-            aLbField3.SelectEntryPos( 0 );
-            aLbCond3.SelectEntryPos( 0 );
+            m_pLbConnect2->SetNoSelection();
+            m_pLbField3->SelectEntryPos( 0 );
+            m_pLbCond3->SelectEntryPos( 0 );
             ClearValueList( 2 );
             ClearValueList( 3 );
 
-            aLbConnect2.Disable();
-            aLbField3.Disable();
-            aLbCond3.Disable();
-            aEdVal3.Disable();
+            m_pLbConnect2->Disable();
+            m_pLbField3->Disable();
+            m_pLbCond3->Disable();
+            m_pEdVal3->Disable();
         }
         else
         {
             UpdateValueList( 2 );
-            if ( !aLbConnect2.IsEnabled() )
+            if ( !m_pLbConnect2->IsEnabled() )
             {
-                aLbConnect2.Enable();
+                m_pLbConnect2->Enable();
             }
         }
     }
-    else if ( pLb == &aLbField3 )
+    else if (pLb == m_pLbField3)
     {
-        ( aLbField3.GetSelectEntryPos() == 0 )
+        ( m_pLbField3->GetSelectEntryPos() == 0 )
             ? ClearValueList( 3 )
             : UpdateValueList( 3 );
     }
@@ -548,20 +523,20 @@ IMPL_LINK( ScPivotFilterDlg, CheckBoxHdl, CheckBox*, pBox )
 {
     //  bei Gross-/Kleinschreibung die Werte-Listen aktualisieren
 
-    if ( pBox == &aBtnCase )                    // Wertlisten
+    if (pBox == m_pBtnCase)                    // Wertlisten
     {
         for (sal_uInt16 i=0; i<=MAXCOL; i++)
             DELETEZ( pEntryLists[i] );
 
-        OUString aCurVal1 = aEdVal1.GetText();
-        OUString aCurVal2 = aEdVal2.GetText();
-        OUString aCurVal3 = aEdVal3.GetText();
+        OUString aCurVal1 = m_pEdVal1->GetText();
+        OUString aCurVal2 = m_pEdVal2->GetText();
+        OUString aCurVal3 = m_pEdVal3->GetText();
         UpdateValueList( 1 );
         UpdateValueList( 2 );
         UpdateValueList( 3 );
-        aEdVal1.SetText( aCurVal1 );
-        aEdVal2.SetText( aCurVal2 );
-        aEdVal3.SetText( aCurVal3 );
+        m_pEdVal1->SetText( aCurVal1 );
+        m_pEdVal2->SetText( aCurVal2 );
+        m_pEdVal3->SetText( aCurVal3 );
     }
 
     return 0;
@@ -574,10 +549,10 @@ IMPL_LINK( ScPivotFilterDlg, ValModifyHdl, ComboBox*, pEd )
     if ( pEd )
     {
         OUString aStrVal = pEd->GetText();
-        ListBox* pLb    = &aLbCond1;
+        ListBox* pLb = m_pLbCond1;
 
-             if ( pEd == &aEdVal2 ) pLb = &aLbCond2;
-        else if ( pEd == &aEdVal3 ) pLb = &aLbCond3;
+        if ( pEd == m_pEdVal2 ) pLb = m_pLbCond2;
+        else if ( pEd == m_pEdVal3 ) pLb = m_pLbCond3;
 
         // wenn einer der Sonderwerte leer/nicht-leer
         // gewaehlt wird, so macht nur der =-Operator Sinn:
diff --git a/sc/source/ui/inc/filter.hrc b/sc/source/ui/inc/filter.hrc
index 80401a713b42..96cb9897095e 100644
--- a/sc/source/ui/inc/filter.hrc
+++ b/sc/source/ui/inc/filter.hrc
@@ -17,9 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 #include "sc.hrc"
-                    // -> RID_SCDLG_SPEC_FILTER
-                    // -> RID_SCDLG_PIVOTFILTER
-
 // General
 
 #define BTN_OK              1
diff --git a/sc/source/ui/inc/pfiltdlg.hxx b/sc/source/ui/inc/pfiltdlg.hxx
index 649f3a53b1db..a9731c66ebb4 100644
--- a/sc/source/ui/inc/pfiltdlg.hxx
+++ b/sc/source/ui/inc/pfiltdlg.hxx
@@ -42,44 +42,30 @@ class ScTypedStrData;
 class ScPivotFilterDlg : public ModalDialog
 {
 public:
-                    ScPivotFilterDlg( Window* pParent,
-                                      const SfxItemSet& rArgSet, SCTAB nSourceTab );
-                    ~ScPivotFilterDlg();
+    ScPivotFilterDlg(Window* pParent, const SfxItemSet& rArgSet, SCTAB nSourceTab);
+    ~ScPivotFilterDlg();
 
     const ScQueryItem&  GetOutputItem();
 
 private:
-    FixedLine       aFlCriteria;
-
-    ListBox         aLbField1;
-    ListBox         aLbCond1;
-    ComboBox        aEdVal1;
-
-    ListBox         aLbConnect1;
-    ListBox         aLbField2;
-    ListBox         aLbCond2;
-    ComboBox        aEdVal2;
-
-    ListBox         aLbConnect2;
-    ListBox         aLbField3;
-    ListBox         aLbCond3;
-    ComboBox        aEdVal3;
-
-    FixedText       aFtConnect;
-    FixedText       aFtField;
-    FixedText       aFtCond;
-    FixedText       aFtVal;
-
-    FixedLine       aFlOptions;
-    CheckBox        aBtnCase;
-    CheckBox        aBtnRegExp;
-    CheckBox        aBtnUnique;
-    FixedText       aFtDbAreaLabel;
-    FixedInfo       aFtDbArea;
-    OKButton        aBtnOk;
-    CancelButton    aBtnCancel;
-    HelpButton      aBtnHelp;
-    MoreButton      aBtnMore;
+    ListBox*        m_pLbField1;
+    ListBox*        m_pLbCond1;
+    ComboBox*       m_pEdVal1;
+
+    ListBox*        m_pLbConnect1;
+    ListBox*        m_pLbField2;
+    ListBox*        m_pLbCond2;
+    ComboBox*       m_pEdVal2;
+
+    ListBox*        m_pLbConnect2;
+    ListBox*        m_pLbField3;
+    ListBox*        m_pLbCond3;
+    ComboBox*       m_pEdVal3;
+
+    CheckBox*       m_pBtnCase;
+    CheckBox*       m_pBtnRegExp;
+    CheckBox*       m_pBtnUnique;
+    FixedText*      m_pFtDbArea;
     const OUString aStrUndefined;
     const OUString aStrNone;
     const OUString aStrEmpty;
diff --git a/sc/source/ui/src/filter.src b/sc/source/ui/src/filter.src
index 9b23647d87a8..aee5f7d5a5d2 100644
--- a/sc/source/ui/src/filter.src
+++ b/sc/source/ui/src/filter.src
@@ -18,258 +18,6 @@
  */
 #include "filter.hrc"
 
-ModalDialog RID_SCDLG_PIVOTFILTER
-{
-    OutputSize = TRUE ;
-    HelpId = HID_SC_PIVOTFILTER ;
-    Hide = TRUE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( 298 , 83 ) ;
-    Text [ en-US ] = "Filter" ;
-    Moveable = TRUE ;
-    Closeable = FALSE ;
-    FixedText FT_OP
-    {
-        Pos = MAP_APPFONT ( 12 , 14 ) ;
-        Size = MAP_APPFONT ( 40 , 8 ) ;
-        Text [ en-US ] = "Operator" ;
-    };
-    FixedText FT_FIELD
-    {
-        Pos = MAP_APPFONT ( 58 , 14 ) ;
-        Size = MAP_APPFONT ( 60 , 8 ) ;
-        Text [ en-US ] = "Field name" ;
-    };
-    FixedText FT_COND
-    {
-        Pos = MAP_APPFONT ( 122 , 14 ) ;
-        Size = MAP_APPFONT ( 47 , 8 ) ;
-        Text [ en-US ] = "Condition" ;
-    };
-    FixedText FT_VAL
-    {
-        Pos = MAP_APPFONT ( 173 , 14 ) ;
-        Size = MAP_APPFONT ( 60 , 8 ) ;
-        Text [ en-US ] = "Value" ;
-    };
-    ListBox LB_OP1
-    {
-        HelpID = "sc:ListBox:RID_SCDLG_PIVOTFILTER:LB_OP1";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 41 ) ;
-        Size = MAP_APPFONT ( 40 , 46 ) ;
-        TabStop = TRUE ;
-        DropDown = TRUE ;
-        StringList [ en-US ] =
-        {
-            < "AND" ; Default ; > ;
-            < "OR" ; Default ; > ;
-        };
-    };
-    ListBox LB_OP2
-    {
-        HelpID = "sc:ListBox:RID_SCDLG_PIVOTFILTER:LB_OP2";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 57 ) ;
-        Size = MAP_APPFONT ( 40 , 46 ) ;
-        TabStop = TRUE ;
-        DropDown = TRUE ;
-        StringList [ en-US ] =
-        {
-            < "AND" ; Default ; > ;
-            < "OR" ; Default ; > ;
-        };
-    };
-    ListBox LB_FIELD1
-    {
-        HelpID = "sc:ListBox:RID_SCDLG_PIVOTFILTER:LB_FIELD1";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 58 , 25 ) ;
-        Size = MAP_APPFONT ( 60 , 90 ) ;
-        TabStop = TRUE ;
-        DropDown = TRUE ;
-    };
-    ListBox LB_FIELD2
-    {
-        HelpID = "sc:ListBox:RID_SCDLG_PIVOTFILTER:LB_FIELD2";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 58 , 41 ) ;
-        Size = MAP_APPFONT ( 60 , 90 ) ;
-        TabStop = TRUE ;
-        DropDown = TRUE ;
-    };
-    ListBox LB_FIELD3
-    {
-        HelpID = "sc:ListBox:RID_SCDLG_PIVOTFILTER:LB_FIELD3";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 58 , 57 ) ;
-        Size = MAP_APPFONT ( 60 , 90 ) ;
-        TabStop = TRUE ;
-        DropDown = TRUE ;
-    };
-    ListBox LB_COND1
-    {
-        HelpID = "sc:ListBox:RID_SCDLG_PIVOTFILTER:LB_COND1";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 122 , 25 ) ;
-        Size = MAP_APPFONT ( 47 , 65 ) ;
-        TabStop = TRUE ;
-        DropDown = TRUE ;
-        StringList [ en-US ] =
-        {
-            < "=" ; Default ; > ;
-            < "<" ; Default ; > ;
-            < ">" ; Default ; > ;
-            < "<=" ; Default ; > ;
-            < ">=" ; Default ; > ;
-            < "<>" ; Default ; > ;
-        };
-    };
-    ListBox LB_COND2
-    {
-        HelpID = "sc:ListBox:RID_SCDLG_PIVOTFILTER:LB_COND2";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 122 , 41 ) ;
-        Size = MAP_APPFONT ( 47 , 65 ) ;
-        TabStop = TRUE ;
-        DropDown = TRUE ;
-        StringList [ en-US ] =
-        {
-            < "=" ; Default ; > ;
-            < "<" ; Default ; > ;
-            < ">" ; Default ; > ;
-            < "<=" ; Default ; > ;
-            < ">=" ; Default ; > ;
-            < "<>" ; Default ; > ;
-        };
-    };
-    ListBox LB_COND3
-    {
-        HelpID = "sc:ListBox:RID_SCDLG_PIVOTFILTER:LB_COND3";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 122 , 57 ) ;
-        Size = MAP_APPFONT ( 47 , 65 ) ;
-        TabStop = TRUE ;
-        DropDown = TRUE ;
-        StringList [ en-US ] =
-        {
-            < "=" ; Default ; > ;
-            < "<" ; Default ; > ;
-            < ">" ; Default ; > ;
-            < "<=" ; Default ; > ;
-            < ">=" ; Default ; > ;
-            < "<>" ; Default ; > ;
-        };
-    };
-    ComboBox ED_VAL1
-    {
-        HelpID = "sc:ComboBox:RID_SCDLG_PIVOTFILTER:ED_VAL1";
-        Pos = MAP_APPFONT ( 173 , 25 ) ;
-        Size = MAP_APPFONT ( 60 , 90 ) ;
-        TabStop = TRUE ;
-        DropDown = TRUE ;
-    };
-    ComboBox ED_VAL2
-    {
-        HelpID = "sc:ComboBox:RID_SCDLG_PIVOTFILTER:ED_VAL2";
-        Pos = MAP_APPFONT ( 173 , 41 ) ;
-        Size = MAP_APPFONT ( 60 , 90 ) ;
-        TabStop = TRUE ;
-        DropDown = TRUE ;
-    };
-    ComboBox ED_VAL3
-    {
-        HelpID = "sc:ComboBox:RID_SCDLG_PIVOTFILTER:ED_VAL3";
-        Pos = MAP_APPFONT ( 173 , 57 ) ;
-        Size = MAP_APPFONT ( 60 , 90 ) ;
-        TabStop = TRUE ;
-        DropDown = TRUE ;
-    };
-    FixedLine FL_CRITERIA
-    {
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 230 , 8 ) ;
-        Text [ en-US ] = "Filter criteria";
-    };
-    CheckBox BTN_CASE
-    {
-        HelpID = "sc:CheckBox:RID_SCDLG_PIVOTFILTER:BTN_CASE";
-        Hide = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 86 ) ;
-        Size = MAP_APPFONT ( 221 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~Case sensitive" ;
-    };
-    CheckBox BTN_REGEXP
-    {
-        HelpID = "sc:CheckBox:RID_SCDLG_PIVOTFILTER:BTN_REGEXP";
-        Hide = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 100 ) ;
-        Size = MAP_APPFONT ( 221 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~Regular expression" ;
-    };
-    CheckBox BTN_UNIQUE
-    {
-        HelpID = "sc:CheckBox:RID_SCDLG_PIVOTFILTER:BTN_UNIQUE";
-        Hide = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 114 ) ;
-        Size = MAP_APPFONT ( 221 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~No duplication" ;
-    };
-    FixedLine FL_OPTIONS
-    {
-        Hide = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 75 ) ;
-        Size = MAP_APPFONT ( 230 , 8 ) ;
-        Text [ en-US ] = "Options" ;
-    };
-    FixedText FT_DBAREA
-    {
-        Hide = TRUE ;
-        Pos = MAP_APPFONT ( 70 , 130 ) ;
-        Size = MAP_APPFONT ( 166 , 8 ) ;
-        Left = TRUE ;
-        Text [ en-US ] = "dummy" ;
-    };
-    FixedText FT_DBAREA_LABEL
-    {
-        Hide = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 130 ) ;
-        Size = MAP_APPFONT ( 58 , 8 ) ;
-        Text [ en-US ] = "Data range:" ;
-    };
-    OKButton BTN_OK
-    {
-        Pos = MAP_APPFONT ( 242 , 6 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-        DefButton = TRUE ;
-    };
-    CancelButton BTN_CANCEL
-    {
-        Pos = MAP_APPFONT ( 242 , 23 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-    HelpButton BTN_HELP
-    {
-        Pos = MAP_APPFONT ( 242 , 43 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-    MoreButton BTN_MORE
-    {
-        HelpID = "sc:MoreButton:RID_SCDLG_PIVOTFILTER:BTN_MORE";
-        Pos = MAP_APPFONT ( 242 , 63 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-        MapUnit = MAP_APPFONT ;
-        Delta = 61 ;
-    };
-};
-
 String STR_COPY_AREA_TO
 {
     Text [ en-US ] = "Copy results to" ;
diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx
index ec917c96888a..03e6d667debe 100644
--- a/sc/source/ui/view/gridwin2.cxx
+++ b/sc/source/ui/view/gridwin2.cxx
@@ -212,9 +212,8 @@ void ScGridWindow::DoPushPivotButton( SCCOL nCol, SCROW nRow, const MouseEvent&
             ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
             OSL_ENSURE(pFact, "ScAbstractFactory create fail!");
 
-            AbstractScPivotFilterDlg* pDlg = pFact->CreateScPivotFilterDlg( pViewData->GetViewShell()->GetDialogParent(),
-                                                                            aArgSet, nSrcTab,
-                                                                            RID_SCDLG_PIVOTFILTER);
+            AbstractScPivotFilterDlg* pDlg = pFact->CreateScPivotFilterDlg(
+                pViewData->GetViewShell()->GetDialogParent(), aArgSet, nSrcTab);
             OSL_ENSURE(pDlg, "Dialog create fail!");
             if ( pDlg->Execute() == RET_OK )
             {
diff --git a/sc/source/ui/view/pivotsh.cxx b/sc/source/ui/view/pivotsh.cxx
index 8782062421e7..8f2dfdc91513 100644
--- a/sc/source/ui/view/pivotsh.cxx
+++ b/sc/source/ui/view/pivotsh.cxx
@@ -105,9 +105,8 @@ void ScPivotShell::Execute( SfxRequest& rReq )
                 ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
                 OSL_ENSURE(pFact, "ScAbstractFactory create fail!");
 
-                AbstractScPivotFilterDlg* pDlg = pFact->CreateScPivotFilterDlg( pViewShell->GetDialogParent(),
-                                                                                aArgSet, nSrcTab,
-                                                                                RID_SCDLG_PIVOTFILTER);
+                AbstractScPivotFilterDlg* pDlg = pFact->CreateScPivotFilterDlg(
+                    pViewShell->GetDialogParent(), aArgSet, nSrcTab);
                 OSL_ENSURE(pDlg, "Dialog create fail!");
 
                 if( pDlg->Execute() == RET_OK )
diff --git a/sc/uiconfig/scalc/ui/pivotfilterdialog.ui b/sc/uiconfig/scalc/ui/pivotfilterdialog.ui
new file mode 100644
index 000000000000..1a6d5572cc38
--- /dev/null
+++ b/sc/uiconfig/scalc/ui/pivotfilterdialog.ui
@@ -0,0 +1,544 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.1 -->
+<interface>
+  <requires lib="gtk+" version="3.0"/>
+  <object class="GtkDialog" id="PivotFilterDialog">
+    <property name="can_focus">False</property>
+    <property name="border_width">6</property>
+    <property name="title" translatable="yes">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="hexpand">True</property>
+        <property name="vexpand">True</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="can_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">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="can_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">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="alignment1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="hexpand">True</property>
+                <property name="vexpand">True</property>
+                <property name="top_padding">6</property>
+                <property name="left_padding">12</property>
+                <child>
+                  <object class="GtkGrid" id="grid1">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="hexpand">True</property>
+                    <property name="vexpand">True</property>
+                    <property name="row_spacing">6</property>
+                    <property name="column_spacing">12</property>
+                    <child>
+                      <object class="GtkComboBoxText" id="connect1">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <items>
+                          <item translatable="yes">AND</item>
+                          <item translatable="yes">OR</item>
+                        </items>
+                        <accessibility>
+                          <relation type="labelled-by" target="label2"/>
+                        </accessibility>
+                      </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="connect2">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</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>
+                      <object class="GtkLabel" id="label2">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Operator</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="label3">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Field name</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="label4">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Condition</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="GtkLabel" id="label5">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Value</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="GtkComboBoxText" id="field1">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <accessibility>
+                          <relation type="labelled-by" target="label3"/>
+                        </accessibility>
+                      </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="field2">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <accessibility>
+                          <relation type="labelled-by" target="label3"/>
+                        </accessibility>
+                      </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>
+                        <accessibility>
+                          <relation type="labelled-by" target="label3"/>
+                        </accessibility>
+                      </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="cond1">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <items>
+                          <item>=</item>
+                          <item>&lt;</item>
+                          <item>&gt;</item>
+                          <item>&lt;=</item>
+                          <item>&gt;=</item>
+                          <item>&lt;&gt;</item>
+                        </items>
+                        <accessibility>
+                          <relation type="labelled-by" target="label4"/>
+                        </accessibility>
+                      </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="cond2">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <items>
+                          <item>=</item>
+                          <item>&lt;</item>
+                          <item>&gt;</item>
+                          <item>&lt;=</item>
+                          <item>&gt;=</item>
+                          <item>&lt;&gt;</item>
+                        </items>
+                        <accessibility>
+                          <relation type="labelled-by" target="label4"/>
+                        </accessibility>
+                      </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>
+                        <items>
+                          <item>=</item>
+                          <item>&lt;</item>
+                          <item>&gt;</item>
+                          <item>&lt;=</item>
+                          <item>&gt;=</item>
+                          <item>&lt;&gt;</item>
+                        </items>
+                        <accessibility>
+                          <relation type="labelled-by" target="label4"/>
+                        </accessibility>
+                      </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="GtkComboBoxText" id="val1">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="hexpand">True</property>
+                        <property name="has_entry">True</property>
+                        <child internal-child="entry">
+                          <object class="GtkEntry" id="comboboxtext-entry2">
+                            <property name="can_focus">False</property>
+                          </object>
+                        </child>
+                        <accessibility>
+                          <relation type="labelled-by" target="label5"/>
+                        </accessibility>
+                      </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="GtkComboBoxText" id="val2">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="hexpand">True</property>
+                        <property name="has_entry">True</property>
+                        <child internal-child="entry">
+                          <object class="GtkEntry" id="comboboxtext-entry4">
+                            <property name="can_focus">False</property>
+                          </object>
+                        </child>
+                        <accessibility>
+                          <relation type="labelled-by" target="label5"/>
+                        </accessibility>
+                      </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="GtkComboBoxText" id="val3">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="hexpand">True</property>
+                        <property name="has_entry">True</property>
+                        <child internal-child="entry">
+                          <object class="GtkEntry" id="comboboxtext-entry6">
+                            <property name="can_focus">False</property>
+                          </object>
+                        </child>
+                        <accessibility>
+                          <relation type="labelled-by" target="label5"/>
+                        </accessibility>
+                      </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>
+                      <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">Filter 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>
+        <child>
+          <object class="GtkExpander" id="more">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="hexpand">True</property>
+            <property name="spacing">6</property>
+            <property name="resize_toplevel">True</property>
+            <child>
+              <object class="GtkGrid" id="grid2">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="margin_top">6</property>
+                <property name="hexpand">True</property>
+                <property name="vexpand">True</property>
+                <property name="row_spacing">6</property>
+                <child>
+                  <object class="GtkGrid" id="grid3">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="hexpand">True</property>
+                    <property name="vexpand">True</property>
+                    <property name="row_spacing">6</property>
+                    <property name="column_spacing">12</property>
+                    <child>
+                      <object class="GtkCheckButton" id="case">
+                        <property name="label" translatable="yes">_Case sensitive</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="hexpand">True</property>
+                        <property name="use_underline">True</property>
+                        <property name="xalign">0</property>
+                        <property name="draw_indicator">True</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="GtkCheckButton" id="regexp">
+                        <property name="label" translatable="yes">Regular _expressions</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="hexpand">True</property>
+                        <property name="use_underline">True</property>
+                        <property name="xalign">0</property>
+                        <property name="draw_indicator">True</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="GtkCheckButton" id="unique">
+                        <property name="label" translatable="yes">_No duplications</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="hexpand">True</property>
+                        <property name="use_underline">True</property>
+                        <property name="xalign">0</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">1</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                  </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="GtkGrid" id="grid5">
+                    <property name="sensitive">False</property>
+                    <property name="can_focus">False</property>
+                    <property name="column_spacing">12</property>
+                    <child>
+                      <object class="GtkLabel" id="dbarealabel">
+                        <property name="sensitive">False</property>
+                        <property name="can_focus">False</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Data range:</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="dbarea">
+                        <property name="sensitive">False</property>
+                        <property name="can_focus">False</property>
+                        <property name="hexpand">True</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">dummy</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>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">1</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+              </object>
+            </child>
+            <child type="label">
+              <object class="GtkLabel" id="label6">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Op_tions</property>
+                <property name="use_underline">True</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">2</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>