modern .ui widgetlayout for consdlg

Change-Id: I622e31c4b538502c5b20191087065b59fcb81114
Reviewed-on: https://gerrit.libreoffice.org/5034
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

7 files changed, 688 insertions, 438 deletions

diff --git a/sc/AllLangResTarget_sc.mk b/sc/AllLangResTarget_sc.mk
index 7f6095eae7d3..23e1a59692f8 100644
--- a/sc/AllLangResTarget_sc.mk
+++ b/sc/AllLangResTarget_sc.mk
@@ -67,7 +67,6 @@ $(eval $(call gb_SrsTarget_add_files,sc/res,\
     sc/source/ui/styleui/styledlg.src \
     sc/source/ui/dbgui/pivot.src \
     sc/source/ui/dbgui/dpgroupdlg.src \
-    sc/source/ui/dbgui/consdlg.src \
     sc/source/ui/dbgui/pvfundlg.src \
     sc/source/ui/dbgui/dapitype.src \
     sc/source/ui/dbgui/imoptdlg.src \
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 5a10ddf0d6f9..ea74595d3939 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -63,6 +63,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
 	sc/uiconfig/scalc/ui/allheaderfooterdialog \
 	sc/uiconfig/scalc/ui/analysisofvariancedialog \
 	sc/uiconfig/scalc/ui/cellprotectionpage \
+	sc/uiconfig/scalc/ui/consolidatedialog \
 	sc/uiconfig/scalc/ui/createnamesdialog \
 	sc/uiconfig/scalc/ui/dataform \
 	sc/uiconfig/scalc/ui/definename \
diff --git a/sc/source/ui/dbgui/consdlg.cxx b/sc/source/ui/dbgui/consdlg.cxx
index aa85cbed3b3b..3fcdacdeab03 100644
--- a/sc/source/ui/dbgui/consdlg.cxx
+++ b/sc/source/ui/dbgui/consdlg.cxx
@@ -29,7 +29,7 @@
 #include "scresid.hxx"
 
 #include "globstr.hrc"
-#include "consdlg.hrc"
+#include "sc.hrc" // consdlg.hrc has been deleted
 
 #define _CONSDLG_CXX
 #include "consdlg.hxx"
@@ -67,39 +67,8 @@ public:
 ScConsolidateDlg::ScConsolidateDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
                                     const SfxItemSet&   rArgSet )
 
-    :   ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_CONSOLIDATE ),
+    :   ScAnyRefDlg ( pB, pCW, pParent, "ConsolidateDialog" , "modules/scalc/ui/consolidatedialog.ui" ),
         //
-        aFtFunc         ( this, ScResId( FT_FUNC ) ),
-        aLbFunc         ( this, ScResId( LB_FUNC ) ),
-
-        aFtConsAreas    ( this, ScResId( FT_CONSAREAS ) ),
-        aLbConsAreas    ( this, ScResId( LB_CONSAREAS ) ),
-
-        aLbDataArea     ( this, ScResId( LB_DATA_AREA ) ),
-        aFtDataArea     ( this, ScResId( FT_DATA_AREA ) ),
-        aEdDataArea     ( this, this, &aFtDataArea, ScResId( ED_DATA_AREA ) ),
-        aRbDataArea     ( this, ScResId( RB_DATA_AREA ), &aEdDataArea, this ),
-
-        aLbDestArea     ( this, ScResId( LB_DEST_AREA ) ),
-        aFtDestArea     ( this, ScResId( FT_DEST_AREA ) ),
-        aEdDestArea     ( this, this, &aFtDestArea, ScResId( ED_DEST_AREA ) ),
-        aRbDestArea     ( this, ScResId( RB_DEST_AREA ), &aEdDestArea, this),
-
-        aFlConsBy       ( this, ScResId( FL_CONSBY ) ),
-        aBtnByRow       ( this, ScResId( BTN_BYROW ) ),
-        aBtnByCol       ( this, ScResId( BTN_BYCOL) ),
-
-        aFlSep          ( this, ScResId( FL_SEP ) ),
-        aFlOptions      ( this, ScResId( FL_OPTIONS ) ),
-        aBtnRefs        ( this, ScResId( BTN_REFS ) ),
-
-        aBtnOk          ( this, ScResId( BTN_OK ) ),
-        aBtnCancel      ( this, ScResId( BTN_CANCEL ) ),
-        aBtnHelp        ( this, ScResId( BTN_HELP ) ),
-        aBtnAdd         ( this, ScResId( BTN_ADD ) ),
-        aBtnRemove      ( this, ScResId( BTN_REMOVE ) ),
-        aBtnMore        ( this, ScResId( BTN_MORE ) ),
-
         aStrUndefined   ( ScResId( SCSTR_UNDEFINED ) ),
         //
         theConsData     ( ((const ScConsolidateItem&)
@@ -115,10 +84,30 @@ ScConsolidateDlg::ScConsolidateDlg( SfxBindings* pB, SfxChildWindow* pCW, Window
         nAreaDataCount  ( 0 ),
         nWhichCons      ( rArgSet.GetPool()->GetWhich( SID_CONSOLIDATE ) ),
 
-        pRefInputEdit   ( &aEdDataArea )
+        pRefInputEdit   ( pEdDataArea )
 {
+    get(pLbFunc,"func");
+    get(pLbConsAreas,"consareas");
+
+    get(pLbDataArea,"lbdataarea");
+    get(pEdDataArea,"eddataarea");
+    get(pRbDataArea,"rbdataarea");
+
+    get(pLbDestArea,"lbdestarea");
+    get(pEdDestArea,"eddestarea");
+    get(pRbDestArea,"rbdestarea");
+
+    get(pExpander,"more");
+    get(pBtnByRow,"byrow");
+    get(pBtnByCol,"bycol");
+    get(pBtnRefs,"refs");
+
+    get(pBtnOk,"ok");
+    get(pBtnCancel,"cancel");
+    get(pBtnAdd,"add");
+    get(pBtnRemove,"delete");
+
     Init();
-    FreeResource();
 }
 
 
@@ -140,38 +129,41 @@ void ScConsolidateDlg::Init()
     String aStr;
     sal_uInt16 i=0;
 
-    aEdDataArea .SetGetFocusHdl( LINK( this, ScConsolidateDlg, GetFocusHdl ) );
-    aEdDestArea .SetGetFocusHdl( LINK( this, ScConsolidateDlg, GetFocusHdl ) );
-    aLbDataArea .SetGetFocusHdl( LINK( this, ScConsolidateDlg, GetFocusHdl ) );
-    aLbDestArea .SetGetFocusHdl( LINK( this, ScConsolidateDlg, GetFocusHdl ) );
-    aEdDataArea .SetModifyHdl   ( LINK( this, ScConsolidateDlg, ModifyHdl ) );
-    aEdDestArea .SetModifyHdl   ( LINK( this, ScConsolidateDlg, ModifyHdl ) );
-    aLbConsAreas.SetSelectHdl   ( LINK( this, ScConsolidateDlg, SelectHdl ) );
-    aLbDataArea .SetSelectHdl   ( LINK( this, ScConsolidateDlg, SelectHdl ) );
-    aLbDestArea .SetSelectHdl   ( LINK( this, ScConsolidateDlg, SelectHdl ) );
-    aBtnOk      .SetClickHdl    ( LINK( this, ScConsolidateDlg, OkHdl ) );
-    aBtnCancel  .SetClickHdl    ( LINK( this, ScConsolidateDlg, ClickHdl ) );
-    aBtnAdd     .SetClickHdl    ( LINK( this, ScConsolidateDlg, ClickHdl ) );
-    aBtnRemove  .SetClickHdl    ( LINK( this, ScConsolidateDlg, ClickHdl ) );
-
-    aBtnMore.AddWindow( &aFlConsBy );
-    aBtnMore.AddWindow( &aBtnByRow );
-    aBtnMore.AddWindow( &aBtnByCol );
-    aBtnMore.AddWindow( &aFlSep );
-    aBtnMore.AddWindow( &aFlOptions );
-    aBtnMore.AddWindow( &aBtnRefs );
-
-    aBtnAdd.Disable();
-    aBtnRemove.Disable();
-
-    aBtnByRow.Check( theConsData.bByRow );
-    aBtnByCol.Check( theConsData.bByCol );
-    aBtnRefs .Check( theConsData.bReferenceData );
-
-    aLbFunc.SelectEntryPos( FuncToLbPos( theConsData.eFunction ) );
+    pRbDataArea->SetReferences(this, pEdDataArea);
+    pRbDestArea->SetReferences(this, pEdDestArea);
+
+    pEdDataArea ->SetGetFocusHdl( LINK( this, ScConsolidateDlg, GetFocusHdl ) );
+    pEdDestArea ->SetGetFocusHdl( LINK( this, ScConsolidateDlg, GetFocusHdl ) );
+    pLbDataArea ->SetGetFocusHdl( LINK( this, ScConsolidateDlg, GetFocusHdl ) );
+    pLbDestArea ->SetGetFocusHdl( LINK( this, ScConsolidateDlg, GetFocusHdl ) );
+    pEdDataArea ->SetModifyHdl   ( LINK( this, ScConsolidateDlg, ModifyHdl ) );
+    pEdDestArea ->SetModifyHdl   ( LINK( this, ScConsolidateDlg, ModifyHdl ) );
+    pLbConsAreas->SetSelectHdl   ( LINK( this, ScConsolidateDlg, SelectHdl ) );
+    pLbDataArea ->SetSelectHdl   ( LINK( this, ScConsolidateDlg, SelectHdl ) );
+    pLbDestArea ->SetSelectHdl   ( LINK( this, ScConsolidateDlg, SelectHdl ) );
+    pBtnOk      ->SetClickHdl    ( LINK( this, ScConsolidateDlg, OkHdl ) );
+    pBtnCancel  ->SetClickHdl    ( LINK( this, ScConsolidateDlg, ClickHdl ) );
+    pBtnAdd     ->SetClickHdl    ( LINK( this, ScConsolidateDlg, ClickHdl ) );
+    pBtnRemove  ->SetClickHdl    ( LINK( this, ScConsolidateDlg, ClickHdl ) );
+
+    pBtnAdd->Disable();
+    pBtnRemove->Disable();
+
+    pBtnByRow->Check( theConsData.bByRow );
+    pBtnByCol->Check( theConsData.bByCol );
+    pBtnRefs->Check( theConsData.bReferenceData );
+
+    pLbFunc->SelectEntryPos( FuncToLbPos( theConsData.eFunction ) );
+
+    // Hack: pLbConsAreas used to be MultiLB. We don't have VCL builder equivalent
+    // of it yet. So enable selecting multiple items here
+    pLbConsAreas->EnableMultiSelection( sal_True );
+
+    pLbConsAreas->set_width_request(pLbConsAreas->approximate_char_width() * 16);
+    pLbConsAreas->SetDropDownLineCount(5);
 
     // Einlesen der Konsolidierungsbereiche
-    aLbConsAreas.Clear();
+    pLbConsAreas->Clear();
     const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention();
     for ( i=0; i<theConsData.nDataAreaCount; i++ )
     {
@@ -181,7 +173,7 @@ void ScConsolidateDlg::Init()
             ScRange( rArea.nColStart, rArea.nRowStart, rArea.nTab,
                     rArea.nColEnd, rArea.nRowEnd, rArea.nTab ).Format( aStr,
                         SCR_ABS_3D, pDoc, eConv );
-            aLbConsAreas.InsertEntry( aStr );
+            pLbConsAreas->InsertEntry( aStr );
         }
     }
 
@@ -189,10 +181,10 @@ void ScConsolidateDlg::Init()
     {
         ScAddress( theConsData.nCol, theConsData.nRow, theConsData.nTab
                 ).Format( aStr, SCA_ABS_3D, pDoc, eConv );
-        aEdDestArea.SetText( aStr );
+        pEdDestArea->SetText( aStr );
     }
     else
-        aEdDestArea.SetText( EMPTY_STRING );
+        pEdDestArea->SetText( EMPTY_STRING );
 
     //----------------------------------------------------------
 
@@ -227,12 +219,12 @@ void ScConsolidateDlg::Init()
     }
 
     FillAreaLists();
-    ModifyHdl( &aEdDestArea );
-    aLbDataArea.SelectEntryPos( 0 );
-    aEdDataArea.SetText( EMPTY_STRING );
-    aEdDataArea.GrabFocus();
+    ModifyHdl( pEdDestArea );
+    pLbDataArea->SelectEntryPos( 0 );
+    pEdDataArea->SetText( EMPTY_STRING );
+    pEdDataArea->GrabFocus();
 
-    aFlSep.SetStyle( aFlSep.GetStyle() | WB_VERT );
+    //aFlSep.SetStyle( aFlSep.GetStyle() | WB_VERT );
 
     //@BugID 54702 Enablen/Disablen nur noch in Basisklasse
     //SFX_APPWINDOW->Enable();
@@ -242,10 +234,10 @@ void ScConsolidateDlg::Init()
 //----------------------------------------------------------------------------
 void ScConsolidateDlg::FillAreaLists()
 {
-    aLbDataArea.Clear();
-    aLbDestArea.Clear();
-    aLbDataArea.InsertEntry( aStrUndefined );
-    aLbDestArea.InsertEntry( aStrUndefined );
+    pLbDataArea->Clear();
+    pLbDestArea->Clear();
+    pLbDataArea->InsertEntry( aStrUndefined );
+    pLbDestArea->InsertEntry( aStrUndefined );
 
     if ( pRangeUtil && pAreaData && (nAreaDataCount > 0) )
     {
@@ -253,10 +245,10 @@ void ScConsolidateDlg::FillAreaLists()
               (i<nAreaDataCount) && (pAreaData[i].aStrName.Len()>0);
               i++ )
         {
-            aLbDataArea.InsertEntry( pAreaData[i].aStrName, i+1 );
+            pLbDataArea->InsertEntry( pAreaData[i].aStrName, i+1 );
 
 //          if ( !pAreaData[i].bIsDbArea )
-                aLbDestArea.InsertEntry( pAreaData[i].aStrName, i+1 );
+                pLbDestArea->InsertEntry( pAreaData[i].aStrName, i+1 );
         }
     }
 }
@@ -281,9 +273,9 @@ void ScConsolidateDlg::SetReference( const ScRange& rRef, ScDocument* pDocP )
         if ( rRef.aStart.Tab() != rRef.aEnd.Tab() )
             nFmt |= SCA_TAB2_3D;
 
-        if ( pRefInputEdit == &aEdDataArea)
+        if ( pRefInputEdit == pEdDataArea)
             rRef.Format( aStr, nFmt, pDocP, eConv );
-        else if ( pRefInputEdit == &aEdDestArea )
+        else if ( pRefInputEdit == pEdDestArea )
             rRef.aStart.Format( aStr, nFmt, pDocP, eConv );
 
         pRefInputEdit->SetRefString( aStr );
@@ -335,7 +327,7 @@ void ScConsolidateDlg::Deactivate()
 sal_Bool ScConsolidateDlg::VerifyEdit( formula::RefEdit* pEd )
 {
     if ( !pRangeUtil || !pDoc || !pViewData ||
-         ((pEd != &aEdDataArea) && (pEd != &aEdDestArea)) )
+         ((pEd != pEdDataArea) && (pEd != pEdDestArea)) )
         return false;
 
     SCTAB   nTab    = pViewData->GetTabNo();
@@ -343,12 +335,12 @@ sal_Bool ScConsolidateDlg::VerifyEdit( formula::RefEdit* pEd )
     String  theCompleteStr;
     const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention();
 
-    if ( pEd == &aEdDataArea )
+    if ( pEd == pEdDataArea )
     {
         bEditOk = pRangeUtil->IsAbsArea( pEd->GetText(), pDoc,
                                          nTab, &theCompleteStr, NULL, NULL, eConv );
     }
-    else if ( pEd == &aEdDestArea )
+    else if ( pEd == pEdDestArea )
     {
         String aPosStr;
 
@@ -370,18 +362,18 @@ sal_Bool ScConsolidateDlg::VerifyEdit( formula::RefEdit* pEd )
 
 IMPL_LINK( ScConsolidateDlg, GetFocusHdl, Control*, pCtr )
 {
-    if ( pCtr ==(Control*)&aEdDataArea ||
-         pCtr ==(Control*)&aEdDestArea)
+    if ( pCtr ==(Control*)pEdDataArea ||
+         pCtr ==(Control*)pEdDestArea)
     {
         pRefInputEdit = (formula::RefEdit*)pCtr;
     }
-    else if(pCtr ==(Control*)&aLbDataArea )
+    else if(pCtr ==(Control*)pLbDataArea )
     {
-        pRefInputEdit = &aEdDataArea;
+        pRefInputEdit = pEdDataArea;
     }
-    else if(pCtr ==(Control*)&aLbDestArea )
+    else if(pCtr ==(Control*)pLbDestArea )
     {
-        pRefInputEdit = &aEdDestArea;
+        pRefInputEdit = pEdDestArea;
     }
     return 0;
 }
@@ -391,13 +383,13 @@ IMPL_LINK( ScConsolidateDlg, GetFocusHdl, Control*, pCtr )
 
 IMPL_LINK_NOARG(ScConsolidateDlg, OkHdl)
 {
-    sal_uInt16 nDataAreaCount = aLbConsAreas.GetEntryCount();
+    sal_uInt16 nDataAreaCount = pLbConsAreas->GetEntryCount();
 
     if ( nDataAreaCount > 0 )
     {
         ScRefAddress aDestAddress;
         SCTAB       nTab = pViewData->GetTabNo();
-        String      aDestPosStr( aEdDestArea.GetText() );
+        String      aDestPosStr( pEdDestArea->GetText() );
         const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention();
 
         if ( pRangeUtil->IsAbsPos( aDestPosStr, pDoc, nTab, NULL, &aDestAddress, eConv ) )
@@ -410,7 +402,7 @@ IMPL_LINK_NOARG(ScConsolidateDlg, OkHdl)
             for ( i=0; i<nDataAreaCount; i++ )
             {
                 pArea = new ScArea;
-                pRangeUtil->MakeArea( aLbConsAreas.GetEntry( i ),
+                pRangeUtil->MakeArea( pLbConsAreas->GetEntry( i ),
                                       *pArea, pDoc, nTab, eConv );
                 ppDataAreas[i] = pArea;
             }
@@ -418,10 +410,10 @@ IMPL_LINK_NOARG(ScConsolidateDlg, OkHdl)
             theOutParam.nCol            = aDestAddress.Col();
             theOutParam.nRow            = aDestAddress.Row();
             theOutParam.nTab            = aDestAddress.Tab();
-            theOutParam.eFunction       = LbPosToFunc( aLbFunc.GetSelectEntryPos() );
-            theOutParam.bByCol          = aBtnByCol.IsChecked();
-            theOutParam.bByRow          = aBtnByRow.IsChecked();
-            theOutParam.bReferenceData  = aBtnRefs.IsChecked();
+            theOutParam.eFunction       = LbPosToFunc( pLbFunc->GetSelectEntryPos() );
+            theOutParam.bByCol          = pBtnByCol->IsChecked();
+            theOutParam.bByRow          = pBtnByRow->IsChecked();
+            theOutParam.bReferenceData  = pBtnRefs->IsChecked();
             theOutParam.SetAreas( ppDataAreas, nDataAreaCount );
 
             for ( i=0; i<nDataAreaCount; i++ )
@@ -440,7 +432,7 @@ IMPL_LINK_NOARG(ScConsolidateDlg, OkHdl)
         else
         {
             INFOBOX( STR_INVALID_TABREF );
-            aEdDestArea.GrabFocus();
+            pEdDestArea->GrabFocus();
         }
     }
     else
@@ -453,13 +445,13 @@ IMPL_LINK_NOARG(ScConsolidateDlg, OkHdl)
 
 IMPL_LINK( ScConsolidateDlg, ClickHdl, PushButton*, pBtn )
 {
-    if ( pBtn == &aBtnCancel )
+    if ( pBtn == pBtnCancel )
         Close();
-    else if ( pBtn == &aBtnAdd )
+    else if ( pBtn == pBtnAdd )
     {
-        if ( !aEdDataArea.GetText().isEmpty() )
+        if ( !pEdDataArea->GetText().isEmpty() )
         {
-            String      aNewEntry( aEdDataArea.GetText() );
+            String      aNewEntry( pEdDataArea->GetText() );
             ScArea**    ppAreas = NULL;
             sal_uInt16      nAreaCount = 0;
             const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention();
@@ -481,37 +473,37 @@ IMPL_LINK( ScConsolidateDlg, ClickHdl, PushButton*, pBtn )
                                 rArea.nColEnd, rArea.nRowEnd, rArea.nTab
                                 ).Format( aNewArea, SCR_ABS_3D, pDoc, eConv );
 
-                        if ( aLbConsAreas.GetEntryPos( aNewArea )
+                        if ( pLbConsAreas->GetEntryPos( aNewArea )
                              == LISTBOX_ENTRY_NOTFOUND )
                         {
-                            aLbConsAreas.InsertEntry( aNewArea );
+                            pLbConsAreas->InsertEntry( aNewArea );
                         }
                         delete ppAreas[i];
                     }
                 }
                 delete [] ppAreas;
             }
-            else if ( VerifyEdit( &aEdDataArea ) )
+            else if ( VerifyEdit( pEdDataArea ) )
             {
-                String aNewArea( aEdDataArea.GetText() );
+                String aNewArea( pEdDataArea->GetText() );
 
-                if ( aLbConsAreas.GetEntryPos( aNewArea ) == LISTBOX_ENTRY_NOTFOUND )
-                    aLbConsAreas.InsertEntry( aNewArea );
+                if ( pLbConsAreas->GetEntryPos( aNewArea ) == LISTBOX_ENTRY_NOTFOUND )
+                    pLbConsAreas->InsertEntry( aNewArea );
                 else
                     INFOBOX( STR_AREA_ALREADY_INSERTED );
             }
             else
             {
                 INFOBOX( STR_INVALID_TABREF );
-                aEdDataArea.GrabFocus();
+                pEdDataArea->GrabFocus();
             }
         }
     }
-    else if ( pBtn == &aBtnRemove )
+    else if ( pBtn == pBtnRemove )
     {
-        while ( aLbConsAreas.GetSelectEntryCount() )
-            aLbConsAreas.RemoveEntry( aLbConsAreas.GetSelectEntryPos() );
-        aBtnRemove.Disable();
+        while ( pLbConsAreas->GetSelectEntryCount() )
+            pLbConsAreas->RemoveEntry( pLbConsAreas->GetSelectEntryPos() );
+        pBtnRemove->Disable();
     }
     return 0;
 }
@@ -521,16 +513,16 @@ IMPL_LINK( ScConsolidateDlg, ClickHdl, PushButton*, pBtn )
 
 IMPL_LINK( ScConsolidateDlg, SelectHdl, ListBox*, pLb )
 {
-    if ( pLb == &aLbConsAreas )
+    if ( pLb == pLbConsAreas )
     {
-        if ( aLbConsAreas.GetSelectEntryCount() > 0 )
-            aBtnRemove.Enable();
+        if ( pLbConsAreas->GetSelectEntryCount() > 0 )
+            pBtnRemove->Enable();
         else
-            aBtnRemove.Disable();
+            pBtnRemove->Disable();
     }
-    else if ( (pLb == &aLbDataArea) || (pLb == &aLbDestArea) )
+    else if ( (pLb == pLbDataArea) || (pLb == pLbDestArea) )
     {
-        Edit*   pEd = (pLb == &aLbDataArea) ? &aEdDataArea : &aEdDestArea;
+        Edit*   pEd = (pLb == pLbDataArea) ? pEdDataArea : pEdDestArea;
         sal_uInt16  nSelPos = pLb->GetSelectEntryPos();
 
         if (    pRangeUtil
@@ -542,20 +534,20 @@ IMPL_LINK( ScConsolidateDlg, SelectHdl, ListBox*, pLb )
             {
                 String aString( pAreaData[nSelPos-1].aStrArea );
 
-                if ( pLb == &aLbDestArea )
+                if ( pLb == pLbDestArea )
                     pRangeUtil->CutPosString( aString, aString );
 
                 pEd->SetText( aString );
 
-                if ( pEd == &aEdDataArea )
-                    aBtnAdd.Enable();
+                if ( pEd == pEdDataArea )
+                    pBtnAdd->Enable();
             }
         }
         else
         {
             pEd->SetText( EMPTY_STRING );
-            if ( pEd == &aEdDataArea )
-                aBtnAdd.Enable();
+            if ( pEd == pEdDataArea )
+                pBtnAdd->Enable();
         }
     }
     return 0;
@@ -566,19 +558,19 @@ IMPL_LINK( ScConsolidateDlg, SelectHdl, ListBox*, pLb )
 
 IMPL_LINK( ScConsolidateDlg, ModifyHdl, formula::RefEdit*, pEd )
 {
-    if ( pEd == &aEdDataArea )
+    if ( pEd == pEdDataArea )
     {
         String aAreaStr( pEd->GetText() );
         if ( aAreaStr.Len() > 0 )
         {
-            aBtnAdd.Enable();
+            pBtnAdd->Enable();
         }
         else
-            aBtnAdd.Disable();
+            pBtnAdd->Disable();
     }
-    else if ( pEd == &aEdDestArea )
+    else if ( pEd == pEdDestArea )
     {
-        aLbDestArea.SelectEntryPos(0);
+        pLbDestArea->SelectEntryPos(0);
     }
     return 0;
 }
diff --git a/sc/source/ui/dbgui/consdlg.hrc b/sc/source/ui/dbgui/consdlg.hrc
deleted file mode 100644
index eb7d89665a33..000000000000
--- a/sc/source/ui/dbgui/consdlg.hrc
+++ /dev/null
@@ -1,54 +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 "sc.hrc"
-
-#define BTN_OK                      1
-#define BTN_CANCEL                  2
-#define BTN_HELP                    3
-#define BTN_MORE                    4
-
-#define BTN_ADD                     5
-#define BTN_REMOVE                  6
-
-#define FT_FUNC                     11
-#define LB_FUNC                     12
-
-#define FT_CONSAREAS                21
-#define LB_CONSAREAS                22
-
-#define FT_DATA_AREA                31
-#define LB_DATA_AREA                32
-#define ED_DATA_AREA                33
-#define RB_DATA_AREA                34
-
-#define FT_DEST_AREA                41
-#define LB_DEST_AREA                42
-#define ED_DEST_AREA                43
-#define RB_DEST_AREA                44
-
-#define FL_CONSBY                   50
-#define BTN_BYROW                   51
-#define BTN_BYCOL                   52
-#define FL_SEP                      59
-
-#define FL_OPTIONS                  60
-#define BTN_REFS                    61
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/dbgui/consdlg.src b/sc/source/ui/dbgui/consdlg.src
deleted file mode 100644
index ee26d4c0bbec..000000000000
--- a/sc/source/ui/dbgui/consdlg.src
+++ /dev/null
@@ -1,224 +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 "consdlg.hrc"
-ModelessDialog RID_SCDLG_CONSOLIDATE
-{
-    OutputSize = TRUE ;
-    HelpId = CMD_SID_OPENDLG_CONSOLIDATE ;
-    Hide = TRUE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( 280 , 154 ) ;
-    Text [ en-US ] = "Consolidate" ;
-    Moveable = TRUE ;
-    Closeable = FALSE ;
-    ListBox LB_FUNC
-    {
-        HelpID = "sc:ListBox:RID_SCDLG_CONSOLIDATE:LB_FUNC";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 17 ) ;
-        Size = MAP_APPFONT ( 212 , 90 ) ;
-        TabStop = TRUE ;
-        DropDown = TRUE ;
-        StringList [ en-US ] =
-        {
-            < "Sum" ; Default ; > ;
-            < "Count" ; Default ; > ;
-            < "Average" ; Default ; > ;
-            < "Max" ; Default ; > ;
-            < "Min" ; Default ; > ;
-            < "Product" ; Default ; > ;
-            < "Count (numbers only)" ; Default ; > ;
-            < "StDev (sample)" ; Default ; > ;
-            < "StDevP (population)" ; Default ; > ;
-            < "Var (sample)" ; Default ; > ;
-            < "VarP (population)" ; Default ; > ;
-        };
-    };
-    Edit ED_DATA_AREA
-    {
-        HelpID = "sc:Edit:RID_SCDLG_CONSOLIDATE:ED_DATA_AREA";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 100 , 106 ) ;
-        Size = MAP_APPFONT ( 104 , 12 ) ;
-        TabStop = TRUE ;
-    };
-    Edit ED_DEST_AREA
-    {
-        HelpID = "sc:Edit:RID_SCDLG_CONSOLIDATE:ED_DEST_AREA";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 100 , 135 ) ;
-        Size = MAP_APPFONT ( 104 , 12 ) ;
-        TabStop = TRUE ;
-    };
-    ImageButton RB_DATA_AREA
-    {
-        HelpID = "sc:ImageButton:RID_SCDLG_CONSOLIDATE:RB_DATA_AREA";
-        Pos = MAP_APPFONT ( 206 , 105 ) ;
-        Size = MAP_APPFONT ( 13 , 15 ) ;
-        TabStop = TRUE ;
-        QuickHelpText [ en-US ] = "Shrink" ;
-    };
-    ImageButton RB_DEST_AREA
-    {
-        HelpID = "sc:ImageButton:RID_SCDLG_CONSOLIDATE:RB_DEST_AREA";
-        Pos = MAP_APPFONT ( 206 , 134 ) ;
-        Size = MAP_APPFONT ( 13 , 15 ) ;
-        TabStop = TRUE ;
-        QuickHelpText [ en-US ] = "Shrink" ;
-    };
-    ListBox LB_DATA_AREA
-    {
-        HelpID = "sc:ListBox:RID_SCDLG_CONSOLIDATE:LB_DATA_AREA";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 106 ) ;
-        Size = MAP_APPFONT ( 90 , 90 ) ;
-        TabStop = TRUE ;
-        DropDown = TRUE ;
-    };
-    ListBox LB_DEST_AREA
-    {
-        HelpID = "sc:ListBox:RID_SCDLG_CONSOLIDATE:LB_DEST_AREA";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 135 ) ;
-        Size = MAP_APPFONT ( 90 , 90 ) ;
-        TabStop = TRUE ;
-        DropDown = TRUE ;
-    };
-    MultiListBox LB_CONSAREAS
-    {
-        HelpID = "sc:MultiListBox:RID_SCDLG_CONSOLIDATE:LB_CONSAREAS";
-        SimpleMode = TRUE ;
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 46 ) ;
-        Size = MAP_APPFONT ( 212 , 43 ) ;
-        TabStop = TRUE ;
-    };
-    FixedText FT_FUNC
-    {
-        Pos = MAP_APPFONT ( 6 , 6 ) ;
-        Size = MAP_APPFONT ( 212 , 8 ) ;
-        Text [ en-US ] = "~Function" ;
-    };
-    FixedText FT_CONSAREAS
-    {
-        Pos = MAP_APPFONT ( 6 , 35 ) ;
-        Size = MAP_APPFONT ( 212 , 8 ) ;
-        Text [ en-US ] = "~Consolidation ranges" ;
-    };
-    FixedText FT_DATA_AREA
-    {
-        Pos = MAP_APPFONT ( 6 , 95 ) ;
-        Size = MAP_APPFONT ( 212 , 8 ) ;
-        Text [ en-US ] = "~Source data range" ;
-    };
-    FixedText FT_DEST_AREA
-    {
-        Pos = MAP_APPFONT ( 6 , 124 ) ;
-        Size = MAP_APPFONT ( 212 , 8 ) ;
-        Text [ en-US ] = "Copy results ~to" ;
-    };
-    CheckBox BTN_BYROW
-    {
-        HelpID = "sc:CheckBox:RID_SCDLG_CONSOLIDATE:BTN_BYROW";
-        Pos = MAP_APPFONT ( 12 , 165 ) ;
-        Size = MAP_APPFONT ( 94 , 10 ) ;
-        Text [ en-US ] = "~Row labels" ;
-        TabStop = TRUE ;
-    };
-    CheckBox BTN_BYCOL
-    {
-        HelpID = "sc:CheckBox:RID_SCDLG_CONSOLIDATE:BTN_BYCOL";
-        Pos = MAP_APPFONT ( 12 , 179 ) ;
-        Size = MAP_APPFONT ( 94 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "C~olumn labels" ;
-    };
-    FixedLine FL_CONSBY
-    {
-        Pos = MAP_APPFONT ( 6 , 154 ) ;
-        Size = MAP_APPFONT ( 103 , 8 ) ;
-        Text [ en-US ] = "Consolidate by" ;
-    };
-    FixedLine FL_SEP
-    {
-        Pos = MAP_APPFONT ( 112 , 165 ) ;
-        Size = MAP_APPFONT ( 1 , 24 ) ;
-    };
-    FixedLine FL_OPTIONS
-    {
-        Hide = TRUE ;
-        Pos = MAP_APPFONT ( 115 , 154 ) ;
-        Size = MAP_APPFONT ( 103 , 8 ) ;
-        Text [ en-US ] = "Options" ;
-    };
-    CheckBox BTN_REFS
-    {
-        HelpID = "sc:CheckBox:RID_SCDLG_CONSOLIDATE:BTN_REFS";
-        Pos = MAP_APPFONT ( 121 , 165 ) ;
-        Size = MAP_APPFONT ( 94 , 10 ) ;
-        Text [ en-US ] = "~Link to source data" ;
-        TabStop = TRUE ;
-    };
-    OKButton BTN_OK
-    {
-        Pos = MAP_APPFONT ( 224 , 6 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-        DefButton = TRUE ;
-    };
-    CancelButton BTN_CANCEL
-    {
-        Pos = MAP_APPFONT ( 224 , 23 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-    HelpButton BTN_HELP
-    {
-        Pos = MAP_APPFONT ( 224 , 43 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-    MoreButton BTN_MORE
-    {
-        HelpID = "sc:MoreButton:RID_SCDLG_CONSOLIDATE:BTN_MORE";
-        Pos = MAP_APPFONT ( 224 , 134 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-        MapUnit = MAP_APPFONT ;
-        Delta = 41 ;
-    };
-    PushButton BTN_REMOVE
-    {
-        HelpID = "sc:PushButton:RID_SCDLG_CONSOLIDATE:BTN_REMOVE";
-        Pos = MAP_APPFONT ( 224 , 114 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        Text [ en-US ] = "~Delete" ;
-        TabStop = TRUE ;
-    };
-    PushButton BTN_ADD
-    {
-        HelpID = "sc:PushButton:RID_SCDLG_CONSOLIDATE:BTN_ADD";
-        Pos = MAP_APPFONT ( 224 , 96 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        Text [ en-US ] = "~Add" ;
-        TabStop = TRUE ;
-    };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/consdlg.hxx b/sc/source/ui/inc/consdlg.hxx
index 3bae5732cf7f..204db24cd8ee 100644
--- a/sc/source/ui/inc/consdlg.hxx
+++ b/sc/source/ui/inc/consdlg.hxx
@@ -23,6 +23,7 @@
 #include <vcl/fixed.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/group.hxx>
+#include <vcl/layout.hxx>
 #include <vcl/morebtn.hxx>
 #include "global.hxx"
 #include "anyrefdg.hxx"
@@ -53,36 +54,28 @@ protected:
     virtual void    Deactivate();
 
 private:
-    FixedText       aFtFunc;
-    ListBox         aLbFunc;
-
-    FixedText       aFtConsAreas;
-    MultiListBox    aLbConsAreas;
-
-    ListBox         aLbDataArea;
-    FixedText       aFtDataArea;
-    formula::RefEdit        aEdDataArea;
-    formula::RefButton      aRbDataArea;
-
-    ListBox         aLbDestArea;
-    FixedText       aFtDestArea;
-    formula::RefEdit        aEdDestArea;
-    formula::RefButton      aRbDestArea;
-
-    FixedLine       aFlConsBy;
-    CheckBox        aBtnByRow;
-    CheckBox        aBtnByCol;
-
-    FixedLine       aFlSep;
-    FixedLine       aFlOptions;
-    CheckBox        aBtnRefs;
-
-    OKButton        aBtnOk;
-    CancelButton    aBtnCancel;
-    HelpButton      aBtnHelp;
-    PushButton      aBtnAdd;
-    PushButton      aBtnRemove;
-    MoreButton      aBtnMore;
+    ListBox*         pLbFunc;
+    ListBox*         pLbConsAreas;
+
+    ListBox*         pLbDataArea;
+    formula::RefEdit*        pEdDataArea;
+    formula::RefButton*      pRbDataArea;
+
+    ListBox*         pLbDestArea;
+    formula::RefEdit*        pEdDestArea;
+    formula::RefButton*      pRbDestArea;
+
+    VclExpander*     pExpander;
+    CheckBox*        pBtnByRow;
+    CheckBox*        pBtnByCol;
+
+    CheckBox*        pBtnRefs;
+
+    OKButton*        pBtnOk;
+    CancelButton*    pBtnCancel;
+    HelpButton*      pBtnHelp;
+    PushButton*      pBtnAdd;
+    PushButton*      pBtnRemove;
 
     String          aStrUndefined;
 
diff --git a/sc/uiconfig/scalc/ui/consolidatedialog.ui b/sc/uiconfig/scalc/ui/consolidatedialog.ui
new file mode 100644
index 000000000000..9f039fba4614
--- /dev/null
+++ b/sc/uiconfig/scalc/ui/consolidatedialog.ui
@@ -0,0 +1,543 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <object class="GtkDialog" id="ConsolidateDialog">
+    <property name="can_focus">False</property>
+    <property name="border_width">6</property>
+    <property name="title" translatable="yes">Consolidate</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="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="hexpand">True</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="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>
+            <child>
+              <object class="GtkLabel" id="label1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="hexpand">True</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">_Function:</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">func</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="label2">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="hexpand">True</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">_Consolidation ranges:</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">consareas</property>
+              </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="func">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="hexpand">True</property>
+                <property name="entry_text_column">0</property>
+                <property name="id_column">1</property>
+                <items>
+                  <item>Sum</item>
+                  <item>Count</item>
+                  <item>Average</item>
+                  <item>Max</item>
+                  <item>Min</item>
+                  <item>Product</item>
+                  <item>Count (numbers only)</item>
+                  <item>StDev (sample)</item>
+                  <item>StDevP (population)</item>
+                  <item>Var (sample)</item>
+                  <item>VarP (population)</item>
+                </items>
+              </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>
+              <object class="GtkTreeView" id="consareas">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="model">liststore1</property>
+                <property name="hexpand">True</property>
+                <property name="vexpand">True</property>
+                <child internal-child="selection">
+                  <object class="GtkTreeSelection" id="treeview-selection1">
+                    <property name="mode">multiple</property>
+                  </object>
+                </child>
+              </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>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkGrid" id="grid2">
+            <property name="visible">True</property>
+            <property name="can_focus">False</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="column_spacing">12</property>
+                <child>
+                  <object class="GtkComboBox" id="lbdataarea">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="hexpand">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="foruilo-RefEdit" id="eddataarea">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="hexpand">True</property>
+                    <property name="invisible_char">●</property>
+                    <property name="width_chars">50</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="foruilo-RefButton" id="rbdataarea">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <child>
+                      <placeholder/>
+                    </child>
+                  </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>
+              </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>
+              <object class="GtkGrid" id="grid4">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="hexpand">True</property>
+                <property name="vexpand">True</property>
+                <property name="column_spacing">12</property>
+                <child>
+                  <object class="GtkComboBox" id="lbdestarea">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="hexpand">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="foruilo-RefEdit" id="eddestarea">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="hexpand">True</property>
+                    <property name="invisible_char">●</property>
+                    <property name="width_chars">50</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="foruilo-RefButton" id="rbdestarea">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <child>
+                      <placeholder/>
+                    </child>
+                  </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>
+              </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="GtkButtonBox" id="buttonbox1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="hexpand">True</property>
+                <property name="spacing">12</property>
+                <property name="layout_style">center</property>
+                <child>
+                  <object class="GtkButton" id="add">
+                    <property name="label">gtk-add</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">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkButton" id="delete">
+                    <property name="label">gtk-delete</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>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">4</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="ftdataarea">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">_Source data ranges:</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">lbdataarea</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="ftdestarea">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">Copy results _to:</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">lbdestarea</property>
+              </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>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">2</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="vexpand">True</property>
+            <child>
+              <object class="GtkBox" id="box2">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="hexpand">True</property>
+                <property name="vexpand">True</property>
+                <property name="spacing">12</property>
+                <child>
+                  <object class="GtkFrame" id="frame1">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="hexpand">True</property>
+                    <property name="vexpand">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="grid5">
+                            <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>
+                            <child>
+                              <object class="GtkCheckButton" id="byrow">
+                                <property name="label" translatable="yes">_Row labels</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="bycol">
+                                <property name="label" translatable="yes">C_olumn labels</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>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child type="label">
+                      <object class="GtkLabel" id="label3">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Consolidate by</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">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkFrame" id="frame2">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="hexpand">True</property>
+                    <property name="vexpand">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="valign">start</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="GtkCheckButton" id="refs">
+                            <property name="label" translatable="yes">_Link to source data</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>
+                        </child>
+                      </object>
+                    </child>
+                    <child type="label">
+                      <object class="GtkLabel" id="label4">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Options</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>
+            <child type="label">
+              <object class="GtkLabel" id="more_label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Options</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">3</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>