convert additem dialog to .ui

Change-Id: Id85ad8dc81089b62a82eafbcea1b04ddccdbc50d

8 files changed, 707 insertions, 534 deletions

diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk
index e82509cbc76a..1f07de40c24a 100644
--- a/svx/UIConfig_svx.mk
+++ b/svx/UIConfig_svx.mk
@@ -11,6 +11,7 @@ $(eval $(call gb_UIConfig_UIConfig,svx))
 
 $(eval $(call gb_UIConfig_add_uifiles,svx,\
 	svx/uiconfig/ui/acceptrejectchangesdialog \
+	svx/uiconfig/ui/adddataitemdialog \
 	svx/uiconfig/ui/addinstancedialog \
 	svx/uiconfig/ui/addmodeldialog \
 	svx/uiconfig/ui/addnamespacedialog \
diff --git a/svx/inc/fmhelp.hrc b/svx/inc/fmhelp.hrc
index 953ea7688e7b..96199c7d56db 100644
--- a/svx/inc/fmhelp.hrc
+++ b/svx/inc/fmhelp.hrc
@@ -53,7 +53,6 @@
 #define UID_FORMPROPBROWSER_FRAME                             "SVX_UID_FORMPROPBROWSER_FRAME"
 #define UID_ABSOLUTE_RECORD_WINDOW                            "SVX_UID_ABSOLUTE_RECORD_WINDOW"
 #define HID_DATA_NAVIGATOR_WIN                                "SVX_HID_DATA_NAVIGATOR_WIN"
-#define HID_XFORMS_ADDDATAITEM_DLG                            "SVX_HID_XFORMS_ADDDATAITEM_DLG"
 #define HID_XFORMS_ADDCONDITION_DLG                           "SVX_HID_XFORMS_ADDCONDITION_DLG"
 #define HID_XFORMS_NAMESPACEITEM_DLG                          "SVX_HID_XFORMS_NAMESPACEITEM_DLG"
 #define HID_XFORMS_NAMESPACEITEM_LIST                         "SVX_HID_XFORMS_NAMESPACEITEM_LIST"
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index e16abb2a7aa1..bfc0a85c7e7a 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -2280,47 +2280,38 @@ namespace svxform
     // class AddDataItemDialog
     //========================================================================
 
-    AddDataItemDialog::AddDataItemDialog(
-        Window* pParent, ItemNode* _pNode,
-        const Reference< css::xforms::XFormsUIHelper1 >& _rUIHelper ) :
-
-        ModalDialog( pParent, SVX_RES( RID_SVXDLG_ADD_DATAITEM ) ),
-
-        m_aItemFL       ( this, SVX_RES( FL_ITEM ) ),
-        m_aNameFT       ( this, SVX_RES( FT_NAME ) ),
-        m_aNameED       ( this, SVX_RES( ED_NAME ) ),
-        m_aDefaultFT    ( this, SVX_RES( FT_DEFAULT ) ),
-        m_aDefaultED    ( this, SVX_RES( ED_DEFAULT ) ),
-        m_aDefaultBtn   ( this, SVX_RES( PB_DEFAULT ) ),
-        m_aSettingsFL   ( this, SVX_RES( FL_SETTINGS ) ),
-        m_aDataTypeFT   ( this, SVX_RES( FT_DATATYPE ) ),
-        m_aDataTypeLB   ( this, SVX_RES( LB_DATATYPE ) ),
-        m_aRequiredCB   ( this, SVX_RES( CB_REQUIRED ) ),
-        m_aRequiredBtn  ( this, SVX_RES( PB_REQUIRED ) ),
-        m_aRelevantCB   ( this, SVX_RES( CB_RELEVANT ) ),
-        m_aRelevantBtn  ( this, SVX_RES( PB_RELEVANT ) ),
-        m_aConstraintCB ( this, SVX_RES( CB_CONSTRAINT ) ),
-        m_aConstraintBtn( this, SVX_RES( PB_CONSTRAINT ) ),
-        m_aReadonlyCB   ( this, SVX_RES( CB_READONLY ) ),
-        m_aReadonlyBtn  ( this, SVX_RES( PB_READONLY ) ),
-        m_aCalculateCB  ( this, SVX_RES( CB_CALCULATE ) ),
-        m_aCalculateBtn ( this, SVX_RES( PB_CALCULATE ) ),
-        m_aButtonsFL    ( this, SVX_RES( FL_DATANAV_BTN ) ),
-        m_aOKBtn        ( this, SVX_RES( BTN_DATANAV_OK ) ),
-        m_aEscBtn       ( this, SVX_RES( BTN_DATANAV_ESC ) ),
-        m_aHelpBtn      ( this, SVX_RES( BTN_DATANAV_HELP ) ),
-
-        m_xUIHelper     ( _rUIHelper ),
-        m_pItemNode     ( _pNode ),
-        m_eItemType     ( DITNone ),
-        m_sFL_Element   ( SVX_RESSTR( STR_FIXEDLINE_ELEMENT ) ),
-        m_sFL_Attribute ( SVX_RESSTR( STR_FIXEDLINE_ATTRIBUTE ) ),
-        m_sFL_Binding   ( SVX_RESSTR( STR_FIXEDLINE_BINDING ) ),
-        m_sFT_BindingExp( SVX_RESSTR( STR_FIXEDTEXT_BINDING ) )
-
-    {
-        FreeResource();
-        m_aDataTypeLB.SetDropDownLineCount( 10 );
+    AddDataItemDialog::AddDataItemDialog(Window* pParent, ItemNode* _pNode,
+        const Reference< css::xforms::XFormsUIHelper1 >& _rUIHelper)
+        : ModalDialog(pParent, "AddDataItemDialog" , "svx/ui/adddataitemdialog.ui")
+        , m_xUIHelper(_rUIHelper)
+        , m_pItemNode(_pNode)
+        , m_eItemType(DITNone)
+        , m_sFL_Element(SVX_RESSTR(RID_STR_ELEMENT))
+        , m_sFL_Attribute(SVX_RESSTR(RID_STR_ATTRIBUTE))
+        , m_sFL_Binding(SVX_RESSTR(RID_STR_BINDING))
+        , m_sFT_BindingExp(SVX_RESSTR(RID_STR_BINDING_EXPR))
+    {
+        get(m_pItemFrame, "itemframe");
+        get(m_pNameFT, "nameft");
+        get(m_pNameED, "name");
+        get(m_pDefaultFT, "valueft");
+        get(m_pDefaultED, "value");
+        get(m_pDefaultBtn, "browse");
+        get(m_pSettingsFrame, "settingsframe");
+        get(m_pDataTypeFT, "datatypeft");
+        get(m_pDataTypeLB, "datatype");
+        get(m_pRequiredCB, "required");
+        get(m_pRequiredBtn, "requiredcond");
+        get(m_pRelevantCB, "relevant");
+        get(m_pRelevantBtn, "relevantcond");
+        get(m_pConstraintCB, "constraint");
+        get(m_pConstraintBtn, "constraintcond");
+        get(m_pReadonlyCB, "readonly");
+        get(m_pReadonlyBtn, "readonlycond");
+        get(m_pCalculateCB, "calculate");
+        get(m_pCalculateBtn, "calculatecond");
+        get(m_pOKBtn, "ok");
+        m_pDataTypeLB->SetDropDownLineCount( 10 );
 
         InitDialog();
         InitFromNode();
@@ -2342,7 +2333,7 @@ namespace svxform
                     if ( xBindings.is() )
                         xBindings->remove( makeAny( m_xTempBinding ) );
                 }
-                catch ( Exception& )
+                catch (const Exception&)
                 {
                     SAL_WARN( "svx.form", "AddDataItemDialog::Dtor(): exception caught" );
                 }
@@ -2359,24 +2350,24 @@ namespace svxform
     IMPL_LINK( AddDataItemDialog, CheckHdl, CheckBox *, pBox )
     {
         // Condition buttons are only enable if their check box is checked
-        m_aReadonlyBtn.Enable( m_aReadonlyCB.IsChecked() );
-        m_aRequiredBtn.Enable( m_aRequiredCB.IsChecked() );
-        m_aRelevantBtn.Enable( m_aRelevantCB.IsChecked() );
-        m_aConstraintBtn.Enable( m_aConstraintCB.IsChecked() );
-        m_aCalculateBtn.Enable( m_aCalculateCB.IsChecked() );
+        m_pReadonlyBtn->Enable( m_pReadonlyCB->IsChecked() );
+        m_pRequiredBtn->Enable( m_pRequiredCB->IsChecked() );
+        m_pRelevantBtn->Enable( m_pRelevantCB->IsChecked() );
+        m_pConstraintBtn->Enable( m_pConstraintCB->IsChecked() );
+        m_pCalculateBtn->Enable( m_pCalculateCB->IsChecked() );
 
         if ( pBox && m_xTempBinding.is() )
         {
             OUString sTemp, sPropName;
-            if ( &m_aRequiredCB == pBox )
+            if ( m_pRequiredCB == pBox )
                 sPropName = PN_REQUIRED_EXPR;
-            else if ( &m_aRelevantCB == pBox )
+            else if ( m_pRelevantCB == pBox )
                 sPropName = PN_RELEVANT_EXPR;
-            else if ( &m_aConstraintCB == pBox )
+            else if ( m_pConstraintCB == pBox )
                 sPropName = PN_CONSTRAINT_EXPR;
-            else if ( &m_aReadonlyCB == pBox )
+            else if ( m_pReadonlyCB == pBox )
                 sPropName = PN_READONLY_EXPR;
-            else if ( &m_aCalculateCB == pBox )
+            else if ( m_pCalculateCB == pBox )
                 sPropName = PN_CALCULATE_EXPR;
             bool bIsChecked = ( pBox->IsChecked() != sal_False );
             m_xTempBinding->getPropertyValue( sPropName ) >>= sTemp;
@@ -2394,23 +2385,23 @@ namespace svxform
     IMPL_LINK( AddDataItemDialog, ConditionHdl, PushButton *, pBtn )
     {
         OUString sTemp, sPropName;
-        if ( &m_aDefaultBtn == pBtn )
+        if ( m_pDefaultBtn == pBtn )
             sPropName = PN_BINDING_EXPR;
-        else if ( &m_aRequiredBtn == pBtn )
+        else if ( m_pRequiredBtn == pBtn )
             sPropName = PN_REQUIRED_EXPR;
-        else if ( &m_aRelevantBtn == pBtn )
+        else if ( m_pRelevantBtn == pBtn )
             sPropName = PN_RELEVANT_EXPR;
-        else if ( &m_aConstraintBtn == pBtn )
+        else if ( m_pConstraintBtn == pBtn )
             sPropName = PN_CONSTRAINT_EXPR;
-        else if ( &m_aReadonlyBtn == pBtn )
+        else if (m_pReadonlyBtn == pBtn)
             sPropName = PN_READONLY_EXPR;
-        else if ( &m_aCalculateBtn == pBtn )
+        else if (m_pCalculateBtn == pBtn)
             sPropName = PN_CALCULATE_EXPR;
         AddConditionDialog aDlg( this, sPropName, m_xTempBinding );
-        bool bIsDefBtn = ( &m_aDefaultBtn == pBtn );
+        bool bIsDefBtn = ( m_pDefaultBtn == pBtn );
         OUString sCondition;
         if ( bIsDefBtn )
-            sCondition = m_aDefaultED.GetText();
+            sCondition = m_pDefaultED->GetText();
         else
         {
             m_xTempBinding->getPropertyValue( sPropName ) >>= sTemp;
@@ -2424,7 +2415,7 @@ namespace svxform
         {
             OUString sNewCondition = aDlg.GetCondition();
             if ( bIsDefBtn )
-                m_aDefaultED.SetText( sNewCondition );
+                m_pDefaultED->SetText( sNewCondition );
             else
             {
 
@@ -2474,7 +2465,7 @@ namespace svxform
     {
         bool bIsHandleBinding = ( DITBinding == m_eItemType );
         bool bIsHandleText = ( DITText == m_eItemType );
-        OUString sNewName( m_aNameED.GetText() );
+        OUString sNewName( m_pNameED->GetText() );
 
         if ( ( !bIsHandleBinding && !bIsHandleText && !m_xUIHelper->isValidXMLName( sNewName ) ) ||
              ( bIsHandleBinding && sNewName.isEmpty() ) )
@@ -2488,7 +2479,7 @@ namespace svxform
             return 0;
         }
 
-        OUString sDataType( m_aDataTypeLB.GetSelectEntry() );
+        OUString sDataType( m_pDataTypeLB->GetSelectEntry() );
         m_xTempBinding->setPropertyValue( PN_BINDING_TYPE, makeAny( sDataType ) );
 
         if ( bIsHandleBinding )
@@ -2497,9 +2488,9 @@ namespace svxform
             copyPropSet( m_xTempBinding, m_pItemNode->m_xPropSet );
             try
             {
-                OUString sValue = m_aNameED.GetText();
+                OUString sValue = m_pNameED->GetText();
                 m_pItemNode->m_xPropSet->setPropertyValue( PN_BINDING_ID, makeAny( sValue ) );
-                sValue = m_aDefaultED.GetText();
+                sValue = m_pDefaultED->GetText();
                 m_pItemNode->m_xPropSet->setPropertyValue( PN_BINDING_EXPR, makeAny( sValue ) );
             }
             catch ( Exception& )
@@ -2514,12 +2505,12 @@ namespace svxform
             try
             {
                 if ( bIsHandleText )
-                    m_xUIHelper->setNodeValue( m_pItemNode->m_xNode, m_aDefaultED.GetText() );
+                    m_xUIHelper->setNodeValue( m_pItemNode->m_xNode, m_pDefaultED->GetText() );
                 else
                 {
                     Reference< css::xml::dom::XNode > xNewNode =
-                        m_xUIHelper->renameNode( m_pItemNode->m_xNode, m_aNameED.GetText() );
-                    m_xUIHelper->setNodeValue( xNewNode, m_aDefaultED.GetText() );
+                        m_xUIHelper->renameNode( m_pItemNode->m_xNode, m_pNameED->GetText() );
+                    m_xUIHelper->setNodeValue( xNewNode, m_pDefaultED->GetText() );
                     m_pItemNode->m_xNode = xNewNode;
                 }
             }
@@ -2538,21 +2529,21 @@ namespace svxform
     {
         // set handler
         Link aLink = LINK( this, AddDataItemDialog, CheckHdl );
-        m_aRequiredCB.SetClickHdl( aLink );
-        m_aRelevantCB.SetClickHdl( aLink );
-        m_aConstraintCB.SetClickHdl( aLink );
-        m_aReadonlyCB.SetClickHdl( aLink );
-        m_aCalculateCB.SetClickHdl( aLink );
+        m_pRequiredCB->SetClickHdl( aLink );
+        m_pRelevantCB->SetClickHdl( aLink );
+        m_pConstraintCB->SetClickHdl( aLink );
+        m_pReadonlyCB->SetClickHdl( aLink );
+        m_pCalculateCB->SetClickHdl( aLink );
 
         aLink = LINK( this, AddDataItemDialog, ConditionHdl );
-        m_aDefaultBtn.SetClickHdl( aLink );
-        m_aRequiredBtn.SetClickHdl( aLink );
-        m_aRelevantBtn.SetClickHdl( aLink );
-        m_aConstraintBtn.SetClickHdl( aLink );
-        m_aReadonlyBtn.SetClickHdl( aLink );
-        m_aCalculateBtn.SetClickHdl( aLink );
+        m_pDefaultBtn->SetClickHdl( aLink );
+        m_pRequiredBtn->SetClickHdl( aLink );
+        m_pRelevantBtn->SetClickHdl( aLink );
+        m_pConstraintBtn->SetClickHdl( aLink );
+        m_pReadonlyBtn->SetClickHdl( aLink );
+        m_pCalculateBtn->SetClickHdl( aLink );
 
-        m_aOKBtn.SetClickHdl( LINK( this, AddDataItemDialog, OKHdl ) );
+        m_pOKBtn->SetClickHdl( LINK( this, AddDataItemDialog, OKHdl ) );
     }
 
     //------------------------------------------------------------------------
@@ -2605,9 +2596,9 @@ namespace svxform
                     if ( m_eItemType != DITText )
                     {
                         OUString sName( m_xUIHelper->getNodeName( m_pItemNode->m_xNode ) );
-                        m_aNameED.SetText( sName );
+                        m_pNameED->SetText( sName );
                     }
-                    m_aDefaultED.SetText( m_pItemNode->m_xNode->getNodeValue() );
+                    m_pDefaultED->SetText( m_pItemNode->m_xNode->getNodeValue() );
                 }
                 catch( Exception& )
                 {
@@ -2639,14 +2630,14 @@ namespace svxform
                     if ( xInfo->hasPropertyByName( PN_BINDING_ID ) )
                     {
                         m_pItemNode->m_xPropSet->getPropertyValue( PN_BINDING_ID ) >>= sTemp;
-                        m_aNameED.SetText( sTemp );
+                        m_pNameED->SetText( sTemp );
                         m_pItemNode->m_xPropSet->getPropertyValue( PN_BINDING_EXPR ) >>= sTemp;
-                        m_aDefaultED.SetText( sTemp );
+                        m_pDefaultED->SetText( sTemp );
                     }
                     else if ( xInfo->hasPropertyByName( PN_SUBMISSION_BIND ) )
                     {
                         m_pItemNode->m_xPropSet->getPropertyValue( PN_SUBMISSION_ID ) >>= sTemp;
-                        m_aNameED.SetText( sTemp );
+                        m_pNameED->SetText( sTemp );
                     }
                 }
                 catch( Exception& )
@@ -2655,12 +2646,12 @@ namespace svxform
                 }
 
                 Size a3and1Sz = LogicToPixel( Size( 3, 1 ), MAP_APPFONT );
-                Size aNewSz = m_aDefaultED.GetSizePixel();
-                Point aNewPnt = m_aDefaultED.GetPosPixel();
+                Size aNewSz = m_pDefaultED->GetSizePixel();
+                Point aNewPnt = m_pDefaultED->GetPosPixel();
                 aNewPnt.Y() += a3and1Sz.Height();
-                aNewSz.Width() -= ( m_aDefaultBtn.GetSizePixel().Width() + a3and1Sz.Width() );
-                m_aDefaultED.SetPosSizePixel( aNewPnt, aNewSz );
-                m_aDefaultBtn.Show();
+                aNewSz.Width() -= ( m_pDefaultBtn->GetSizePixel().Width() + a3and1Sz.Width() );
+                m_pDefaultED->SetPosSizePixel( aNewPnt, aNewSz );
+                m_pDefaultBtn->Show();
             }
 
             if ( m_xTempBinding.is() )
@@ -2670,21 +2661,21 @@ namespace svxform
                 {
                     if ( ( m_xTempBinding->getPropertyValue( PN_REQUIRED_EXPR ) >>= sTemp )
                         && !sTemp.isEmpty() )
-                        m_aRequiredCB.Check( sal_True );
+                        m_pRequiredCB->Check( sal_True );
                     if ( ( m_xTempBinding->getPropertyValue( PN_RELEVANT_EXPR ) >>= sTemp )
                         && !sTemp.isEmpty() )
-                        m_aRelevantCB.Check( sal_True );
+                        m_pRelevantCB->Check( sal_True );
                     if ( ( m_xTempBinding->getPropertyValue( PN_CONSTRAINT_EXPR ) >>= sTemp )
                         && !sTemp.isEmpty() )
-                        m_aConstraintCB.Check( sal_True );
+                        m_pConstraintCB->Check( sal_True );
                     if ( ( m_xTempBinding->getPropertyValue( PN_READONLY_EXPR ) >>= sTemp )
                         && !sTemp.isEmpty() )
-                        m_aReadonlyCB.Check( sal_True );
+                        m_pReadonlyCB->Check( sal_True );
                     if ( ( m_xTempBinding->getPropertyValue( PN_CALCULATE_EXPR ) >>= sTemp )
                         && !sTemp.isEmpty() )
-                        m_aCalculateCB.Check( sal_True );
+                        m_pCalculateCB->Check( sal_True );
                 }
-                catch ( Exception& )
+                catch (const Exception&)
                 {
                     SAL_WARN( "svx.form", "AddDataItemDialog::InitFromNode(): exception caught" );
                 }
@@ -2693,36 +2684,9 @@ namespace svxform
 
         if ( DITText == m_eItemType )
         {
-            long nDelta = m_aButtonsFL.GetPosPixel().Y() - m_aSettingsFL.GetPosPixel().Y();
-            size_t i = 0;
-            Window* pWinsForHide[] =
-            {
-                &m_aSettingsFL, &m_aDataTypeFT, &m_aDataTypeLB, &m_aRequiredCB,
-                &m_aRequiredBtn, &m_aRelevantCB, &m_aRelevantBtn, &m_aConstraintCB,
-                &m_aConstraintBtn, &m_aReadonlyCB, &m_aReadonlyBtn, &m_aCalculateCB,
-                &m_aCalculateBtn
-            };
-            Window** pCurrent = pWinsForHide;
-            for ( ; i < sizeof( pWinsForHide ) / sizeof( pWinsForHide[ 0 ] ); ++i, ++pCurrent )
-                (*pCurrent)->Hide();
-
-            Window* pWinsForMove[] =
-            {
-                &m_aButtonsFL, &m_aOKBtn, &m_aEscBtn, &m_aHelpBtn
-            };
-            pCurrent = pWinsForMove;
-            for ( i = 0; i < sizeof( pWinsForMove ) / sizeof( pWinsForMove[ 0 ] ); ++i, ++pCurrent )
-            {
-                Point aNewPos = (*pCurrent)->GetPosPixel();
-                aNewPos.Y() -= nDelta;
-                (*pCurrent)->SetPosPixel( aNewPos );
-            }
-            Size aNewWinSz = GetSizePixel();
-            aNewWinSz.Height() -= nDelta;
-            SetSizePixel( aNewWinSz );
-
-            m_aNameFT.Disable();
-            m_aNameED.Disable();
+            m_pSettingsFrame->Hide();
+            m_pNameFT->Disable();
+            m_pNameED->Disable();
         }
     }
 
@@ -2744,7 +2708,7 @@ namespace svxform
                         sal_Int32 i, nCount = aNameList.getLength();
                         OUString* pNames = aNameList.getArray();
                         for ( i = 0; i < nCount; ++i )
-                            m_aDataTypeLB.InsertEntry( pNames[i] );
+                            m_pDataTypeLB->InsertEntry( pNames[i] );
                     }
 
                     if ( m_xTempBinding.is() )
@@ -2752,10 +2716,10 @@ namespace svxform
                         OUString sTemp;
                         if ( m_xTempBinding->getPropertyValue( PN_BINDING_TYPE ) >>= sTemp )
                         {
-                            sal_uInt16 nPos = m_aDataTypeLB.GetEntryPos( sTemp );
+                            sal_uInt16 nPos = m_pDataTypeLB->GetEntryPos( sTemp );
                             if ( LISTBOX_ENTRY_NOTFOUND == nPos )
-                                nPos = m_aDataTypeLB.InsertEntry( sTemp );
-                            m_aDataTypeLB.SelectEntryPos( nPos );
+                                nPos = m_pDataTypeLB->InsertEntry( sTemp );
+                            m_pDataTypeLB->SelectEntryPos( nPos );
                         }
                     }
                 }
@@ -2782,7 +2746,7 @@ namespace svxform
             case DITBinding :
             {
                 sText = m_sFL_Binding;
-                m_aDefaultFT.SetText( m_sFT_BindingExp );
+                m_pDefaultFT->SetText( m_sFT_BindingExp );
                 break;
             }
 
@@ -2792,7 +2756,7 @@ namespace svxform
             }
         }
 
-        m_aItemFL.SetText( sText );
+        m_pItemFrame->set_label(sText);
     }
 
     //========================================================================
diff --git a/svx/source/form/datanavi.src b/svx/source/form/datanavi.src
index 5b3f9aae7e35..15c169cf698b 100644
--- a/svx/source/form/datanavi.src
+++ b/svx/source/form/datanavi.src
@@ -307,199 +307,6 @@ ErrorBox RID_ERR_EMPTY_SUBMISSIONNAME
     Message [ en-US ] = "The submission must have a name." ;
 };
 
-ModalDialog RID_SVXDLG_ADD_DATAITEM
-{
-    HelpID = HID_XFORMS_ADDDATAITEM_DLG ;
-    OutputSize = TRUE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( 180 , 186 ) ;
-    Moveable = TRUE ;
-    FixedLine FL_ITEM
-    {
-        Pos = MAP_APPFONT ( 4 , 3 ) ;
-        Size = MAP_APPFONT ( 172 , 8 ) ;
-        Text [ en-US ] = "Item" ;
-    };
-    FixedText FT_NAME
-    {
-        Pos = MAP_APPFONT ( 6 , 15 ) ;
-        Size = MAP_APPFONT ( 69 , 8 ) ;
-        LeftLabel = TRUE ;
-        Text [ en-US ] = "~Name" ;
-    };
-    Edit ED_NAME
-    {
-        HelpID = "svx:Edit:RID_SVXDLG_ADD_DATAITEM:ED_NAME";
-        Pos = MAP_APPFONT ( 78 , 14 ) ;
-        Size = MAP_APPFONT ( 96 , 12 ) ;
-        Border = TRUE ;
-    };
-    FixedText FT_DEFAULT
-    {
-        Pos = MAP_APPFONT ( 6 , 30 ) ;
-        Size = MAP_APPFONT ( 69 , 8 ) ;
-        LeftLabel = TRUE ;
-        Text [ en-US ] = "~Default Value" ;
-    };
-    Edit ED_DEFAULT
-    {
-        HelpID = "svx:Edit:RID_SVXDLG_ADD_DATAITEM:ED_DEFAULT";
-        Pos = MAP_APPFONT ( 78 , 29 ) ;
-        Size = MAP_APPFONT ( 96 , 12 ) ;
-        Border = TRUE ;
-    };
-    PushButton PB_DEFAULT
-    {
-        HelpID = "svx:PushButton:RID_SVXDLG_ADD_DATAITEM:PB_DEFAULT";
-        Pos = MAP_APPFONT ( 160 , 29 ) ;
-        Size = MAP_APPFONT ( 14 , 14 ) ;
-        TabStop = TRUE ;
-        Hide = TRUE ;
-        Text = "..." ;
-    };
-    FixedLine FL_SETTINGS
-    {
-        Pos = MAP_APPFONT ( 4 , 44 ) ;
-        Size = MAP_APPFONT ( 172 , 8 ) ;
-        Text [ en-US ] = "Settings" ;
-    };
-    FixedText FT_DATATYPE
-    {
-        Pos = MAP_APPFONT ( 6 , 56 ) ;
-        Size = MAP_APPFONT ( 69 , 8 ) ;
-        LeftLabel = TRUE ;
-        Text [ en-US ] = "~Data Type" ;
-    };
-    ListBox LB_DATATYPE
-    {
-        HelpID = "svx:ListBox:RID_SVXDLG_ADD_DATAITEM:LB_DATATYPE";
-        Pos = MAP_APPFONT ( 78 , 55 ) ;
-        Size = MAP_APPFONT ( 96 , 45 ) ;
-        Border = TRUE ;
-        DropDown = TRUE;
-    };
-    CheckBox CB_REQUIRED
-    {
-        HelpID = "svx:CheckBox:RID_SVXDLG_ADD_DATAITEM:CB_REQUIRED";
-        Pos = MAP_APPFONT ( 6 , 72 ) ;
-        Size = MAP_APPFONT ( 69 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~Required" ;
-    };
-    PushButton PB_REQUIRED
-    {
-        HelpID = "svx:PushButton:RID_SVXDLG_ADD_DATAITEM:PB_REQUIRED";
-        Pos = MAP_APPFONT ( 78 , 70 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Condition" ;
-    };
-    CheckBox CB_RELEVANT
-    {
-        HelpID = "svx:CheckBox:RID_SVXDLG_ADD_DATAITEM:CB_RELEVANT";
-        Pos = MAP_APPFONT ( 6 , 89 ) ;
-        Size = MAP_APPFONT ( 69 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "R~elevant" ;
-    };
-    PushButton PB_RELEVANT
-    {
-        HelpID = "svx:PushButton:RID_SVXDLG_ADD_DATAITEM:PB_RELEVANT";
-        Pos = MAP_APPFONT ( 78 , 87 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Condition" ;
-    };
-    CheckBox CB_CONSTRAINT
-    {
-        HelpID = "svx:CheckBox:RID_SVXDLG_ADD_DATAITEM:CB_CONSTRAINT";
-        Pos = MAP_APPFONT ( 6 , 106 ) ;
-        Size = MAP_APPFONT ( 69 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~Constraint" ;
-    };
-    PushButton PB_CONSTRAINT
-    {
-        HelpID = "svx:PushButton:RID_SVXDLG_ADD_DATAITEM:PB_CONSTRAINT";
-        Pos = MAP_APPFONT ( 78 , 104 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Condition" ;
-    };
-    CheckBox CB_READONLY
-    {
-        HelpID = "svx:CheckBox:RID_SVXDLG_ADD_DATAITEM:CB_READONLY";
-        Pos = MAP_APPFONT ( 6 , 123 ) ;
-        Size = MAP_APPFONT ( 69 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Read-~only" ;
-    };
-    PushButton PB_READONLY
-    {
-        HelpID = "svx:PushButton:RID_SVXDLG_ADD_DATAITEM:PB_READONLY";
-        Pos = MAP_APPFONT ( 78 , 121 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Condition" ;
-    };
-    CheckBox CB_CALCULATE
-    {
-        HelpID = "svx:CheckBox:RID_SVXDLG_ADD_DATAITEM:CB_CALCULATE";
-        Pos = MAP_APPFONT ( 6 , 140 ) ;
-        Size = MAP_APPFONT ( 69 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Calc~ulate" ;
-    };
-    PushButton PB_CALCULATE
-    {
-        HelpID = "svx:PushButton:RID_SVXDLG_ADD_DATAITEM:PB_CALCULATE";
-        Pos = MAP_APPFONT ( 78 , 138 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Condition" ;
-    };
-    FixedLine FL_DATANAV_BTN
-    {
-        Pos = MAP_APPFONT ( 4 , 155 ) ;
-        Size = MAP_APPFONT ( 172 , 8 ) ;
-    };
-    OKButton BTN_DATANAV_OK
-    {
-        Pos = MAP_APPFONT ( 15 , 166 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-        DefButton = TRUE ;
-    };
-    CancelButton BTN_DATANAV_ESC
-    {
-        Pos = MAP_APPFONT ( 68 , 166 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-    HelpButton BTN_DATANAV_HELP
-    {
-        Pos = MAP_APPFONT ( 124 , 166 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-    String STR_FIXEDLINE_ELEMENT
-    {
-        Text [ en-US ] = "Element" ;
-    };
-    String STR_FIXEDLINE_ATTRIBUTE
-    {
-        Text [ en-US ] = "Attribute" ;
-    };
-    String STR_FIXEDLINE_BINDING
-    {
-        Text [ en-US ] = "Binding" ;
-    };
-    String STR_FIXEDTEXT_BINDING
-    {
-        Text [ en-US ] = "Binding expression" ;
-    };
-};
-
 Menu RID_MENU_DATANAVIGATOR
 {
     ItemList =
@@ -742,81 +549,120 @@ String RID_STR_DATANAV_SUBM_PARENT
 {
     Text [ en-US ] = "Submission: " ;
 };
+
 String RID_STR_DATANAV_SUBM_ID
 {
     Text [ en-US ] = "ID: " ;
 };
+
 String RID_STR_DATANAV_SUBM_BIND
 {
     Text [ en-US ] = "Binding: " ;
 };
+
 String RID_STR_DATANAV_SUBM_REF
 {
     Text [ en-US ] = "Reference: " ;
 };
+
 String RID_STR_DATANAV_SUBM_ACTION
 {
     Text [ en-US ] = "Action: " ;
 };
+
 String RID_STR_DATANAV_SUBM_METHOD
 {
     Text [ en-US ] = "Method: " ;
 };
+
 String RID_STR_DATANAV_SUBM_REPLACE
 {
     Text [ en-US ] = "Replace: " ;
 };
+
 String RID_STR_DATANAV_ADD_ELEMENT
 {
     Text [ en-US ] = "Add Element" ;
 };
+
 String RID_STR_DATANAV_EDIT_ELEMENT
 {
     Text [ en-US ] = "Edit Element" ;
 };
+
 String RID_STR_DATANAV_REMOVE_ELEMENT
 {
     Text [ en-US ] = "Delete Element" ;
 };
+
 String RID_STR_DATANAV_ADD_ATTRIBUTE
 {
     Text [ en-US ] = "Add Attribute" ;
 };
+
 String RID_STR_DATANAV_EDIT_ATTRIBUTE
 {
     Text [ en-US ] = "Edit Attribute" ;
 };
+
 String RID_STR_DATANAV_REMOVE_ATTRIBUTE
 {
     Text [ en-US ] = "Delete Attribute" ;
 };
+
 String RID_STR_DATANAV_ADD_BINDING
 {
     Text [ en-US ] = "Add Binding" ;
 };
+
 String RID_STR_DATANAV_EDIT_BINDING
 {
     Text [ en-US ] = "Edit Binding" ;
 };
+
 String RID_STR_DATANAV_REMOVE_BINDING
 {
     Text [ en-US ] = "Delete Binding" ;
 };
+
 String RID_STR_DATANAV_ADD_SUBMISSION
 {
     Text [ en-US ] = "Add Submission" ;
 };
+
 String RID_STR_DATANAV_EDIT_SUBMISSION
 {
     Text [ en-US ] = "Edit Submission" ;
 };
+
 String RID_STR_DATANAV_REMOVE_SUBMISSION
 {
     Text [ en-US ] = "Delete Submission" ;
 };
+
 String RID_STR_DATANAV_LINKWARN_BUTTON
 {
     Text [ en-US ] = "~Edit" ;
 };
 
+String RID_STR_ELEMENT
+{
+    Text [ en-US ] = "Element" ;
+};
+
+String RID_STR_ATTRIBUTE
+{
+    Text [ en-US ] = "Attribute" ;
+};
+
+String RID_STR_BINDING
+{
+    Text [ en-US ] = "Binding" ;
+};
+
+String RID_STR_BINDING_EXPR
+{
+    Text [ en-US ] = "Binding expression" ;
+};
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/inc/datanavi.hrc b/svx/source/inc/datanavi.hrc
index 21057a68d99f..b80726d4baaa 100644
--- a/svx/source/inc/datanavi.hrc
+++ b/svx/source/inc/datanavi.hrc
@@ -83,32 +83,6 @@
 #define IID_TEXT                5
 #define IID_OTHER               6
 
-// class AddDataItemDialog
-#define FL_ITEM                 10
-#define FT_NAME                 11
-#define ED_NAME                 12
-#define FT_DEFAULT              13
-#define ED_DEFAULT              14
-#define PB_DEFAULT              15
-#define FL_SETTINGS             16
-#define FT_DATATYPE             17
-#define LB_DATATYPE             18
-#define CB_REQUIRED             19
-#define PB_REQUIRED             20
-#define CB_RELEVANT             21
-#define PB_RELEVANT             22
-#define CB_CONSTRAINT           23
-#define PB_CONSTRAINT           24
-#define CB_READONLY             25
-#define PB_READONLY             26
-#define CB_CALCULATE            27
-#define PB_CALCULATE            28
-
-#define STR_FIXEDLINE_ELEMENT   10
-#define STR_FIXEDLINE_ATTRIBUTE 11
-#define STR_FIXEDLINE_BINDING   12
-#define STR_FIXEDTEXT_BINDING   13
-
 // class AddConditionDialog
 #define FT_CONDITION            10
 #define ED_CONDITION            11
diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx
index 3a99b1de1b13..b119f5b61417 100644
--- a/svx/source/inc/datanavi.hxx
+++ b/svx/source/inc/datanavi.hxx
@@ -21,6 +21,7 @@
 
 #include <vcl/dialog.hxx>
 #include <vcl/fixed.hxx>
+#include <vcl/layout.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/menubtn.hxx>
 #include <vcl/msgbox.hxx>
@@ -408,32 +409,30 @@ namespace svxform
     {
     private:
 
-        FixedLine           m_aItemFL;
-        FixedText           m_aNameFT;
-        Edit                m_aNameED;
-        FixedText           m_aDefaultFT;
-        Edit                m_aDefaultED;
-        PushButton          m_aDefaultBtn;
-
-        FixedLine           m_aSettingsFL;
-        FixedText           m_aDataTypeFT;
-        ListBox             m_aDataTypeLB;
-
-        CheckBox            m_aRequiredCB;
-        PushButton          m_aRequiredBtn;
-        CheckBox            m_aRelevantCB;
-        PushButton          m_aRelevantBtn;
-        CheckBox            m_aConstraintCB;
-        PushButton          m_aConstraintBtn;
-        CheckBox            m_aReadonlyCB;
-        PushButton          m_aReadonlyBtn;
-        CheckBox            m_aCalculateCB;
-        PushButton          m_aCalculateBtn;
+        VclFrame*           m_pItemFrame;
+        FixedText*          m_pNameFT;
+        Edit*               m_pNameED;
+        FixedText*          m_pDefaultFT;
+        Edit*               m_pDefaultED;
+        PushButton*         m_pDefaultBtn;
+
+        VclFrame*           m_pSettingsFrame;
+
+        FixedText*          m_pDataTypeFT;
+        ListBox*            m_pDataTypeLB;
+
+        CheckBox*           m_pRequiredCB;
+        PushButton*         m_pRequiredBtn;
+        CheckBox*           m_pRelevantCB;
+        PushButton*         m_pRelevantBtn;
+        CheckBox*           m_pConstraintCB;
+        PushButton*         m_pConstraintBtn;
+        CheckBox*           m_pReadonlyCB;
+        PushButton*         m_pReadonlyBtn;
+        CheckBox*           m_pCalculateCB;
+        PushButton*         m_pCalculateBtn;
 
-        FixedLine           m_aButtonsFL;
-        OKButton            m_aOKBtn;
-        CancelButton        m_aEscBtn;
-        HelpButton          m_aHelpBtn;
+        OKButton*           m_pOKBtn;
 
         XFormsUIHelper1_ref m_xUIHelper;
         XPropertySet_ref    m_xBinding;
diff --git a/svx/uiconfig/ui/adddataitemdialog.ui b/svx/uiconfig/ui/adddataitemdialog.ui
new file mode 100644
index 000000000000..45889896794c
--- /dev/null
+++ b/svx/uiconfig/ui/adddataitemdialog.ui
@@ -0,0 +1,436 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <object class="GtkDialog" id="AddDataItemDialog">
+    <property name="can_focus">False</property>
+    <property name="border_width">6</property>
+    <property name="type_hint">dialog</property>
+    <child internal-child="vbox">
+      <object class="GtkBox" id="dialog-vbox1">
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">12</property>
+        <child>
+          <object class="GtkFrame" id="itemframe">
+            <property name="visible">True</property>
+            <property name="can_focus">False</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="top_padding">6</property>
+                <property name="left_padding">12</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="row_spacing">6</property>
+                    <property name="column_spacing">12</property>
+                    <property name="row_homogeneous">True</property>
+                    <child>
+                      <object class="GtkEntry" id="name">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="valign">center</property>
+                        <property name="invisible_char">•</property>
+                        <property name="width_chars">46</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">0</property>
+                        <property name="width">2</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="nameft">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">_Name</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">name</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="valueft">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">_Default Value</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">value</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>
+                      <object class="GtkButton" id="browse">
+                        <property name="label" translatable="yes">_...</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="valign">center</property>
+                        <property name="use_underline">True</property>
+                      </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="GtkEntry" id="value">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="valign">center</property>
+                        <property name="invisible_char">•</property>
+                        <property name="width_chars">46</property>
+                        <property name="invisible_char_set">True</property>
+                      </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>
+                  </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">Item</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="settingsframe">
+            <property name="visible">True</property>
+            <property name="can_focus">False</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="hexpand">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="row_spacing">6</property>
+                    <property name="column_spacing">12</property>
+                    <property name="row_homogeneous">True</property>
+                    <child>
+                      <object class="GtkLabel" id="datatypeft">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">_Data Type</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">datatype</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="GtkComboBoxText" id="datatype">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="halign">start</property>
+                        <property name="valign">center</property>
+                        <property name="entry_text_column">0</property>
+                        <property name="id_column">1</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="required">
+                        <property name="label" translatable="yes">_Required</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</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>
+                      <object class="GtkButton" id="requiredcond">
+                        <property name="label" translatable="yes">Condition</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="halign">start</property>
+                        <property name="use_underline">True</property>
+                      </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="GtkCheckButton" id="relevant">
+                        <property name="label" translatable="yes">R_elevant</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</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">2</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkButton" id="relevantcond">
+                        <property name="label" translatable="yes">Condition</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="halign">start</property>
+                        <property name="use_underline">True</property>
+                      </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="GtkCheckButton" id="constraint">
+                        <property name="label" translatable="yes">_Constraint</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</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">3</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkCheckButton" id="readonly">
+                        <property name="label" translatable="yes">Read-_only</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</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">4</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkCheckButton" id="calculate">
+                        <property name="label" translatable="yes">Calc_ulate</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</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">5</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkButton" id="constraintcond">
+                        <property name="label" translatable="yes">Condition</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="halign">start</property>
+                        <property name="use_underline">True</property>
+                      </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="GtkButton" id="readonlycond">
+                        <property name="label" translatable="yes">Condition</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="halign">start</property>
+                        <property name="use_underline">True</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">4</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkButton" id="calculatecond">
+                        <property name="label" translatable="yes">Condition</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="halign">start</property>
+                        <property name="use_underline">True</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">5</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                  </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">Settings</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 internal-child="action_area">
+          <object class="GtkButtonBox" id="dialog-action_area1">
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="ok">
+                <property name="label">gtk-ok</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="has_default">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="cancel">
+                <property name="label">gtk-cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="help">
+                <property name="label">gtk-help</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">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>
diff --git a/svx/uiconfig/ui/addsubmissiondialog.ui b/svx/uiconfig/ui/addsubmissiondialog.ui
index 6ec2caf3c772..719641acfe61 100644
--- a/svx/uiconfig/ui/addsubmissiondialog.ui
+++ b/svx/uiconfig/ui/addsubmissiondialog.ui
@@ -11,62 +11,6 @@
         <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">12</property>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox" id="dialog-action_area1">
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="ok">
-                <property name="label">gtk-ok</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="has_default">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="cancel">
-                <property name="label">gtk-cancel</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="help">
-                <property name="label">gtk-help</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
         <child>
           <object class="GtkFrame" id="frame1">
             <property name="visible">True</property>
@@ -129,7 +73,7 @@
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
-                        <property name="top_attach">3</property>
+                        <property name="top_attach">1</property>
                         <property name="width">1</property>
                         <property name="height">1</property>
                       </packing>
@@ -145,75 +89,12 @@
                       </object>
                       <packing>
                         <property name="left_attach">2</property>
-                        <property name="top_attach">3</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="label3">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Action</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">action</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>
-                      <object class="GtkEntry" id="action">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="valign">center</property>
-                        <property name="invisible_char">•</property>
-                        <property name="width_chars">46</property>
-                        <property name="invisible_char_set">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">1</property>
-                        <property name="width">2</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="xalign">0</property>
-                        <property name="label" translatable="yes">_Method</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">method</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="method">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="entry_text_column">0</property>
-                        <property name="id_column">1</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">2</property>
-                        <property name="width">2</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
-                    <child>
                       <object class="GtkEntry" id="expression">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
@@ -224,82 +105,99 @@
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
-                        <property name="top_attach">3</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="label1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Submission</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="label_xalign">0</property>
+            <property name="shadow_type">none</property>
+            <child>
+              <object class="GtkAlignment" id="alignment2">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="top_padding">6</property>
+                <property name="left_padding">12</property>
+                <child>
+                  <object class="GtkGrid" id="grid1">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="hexpand">True</property>
+                    <property name="row_spacing">6</property>
+                    <property name="column_spacing">12</property>
+                    <property name="row_homogeneous">True</property>
                     <child>
-                      <object class="GtkLabel" id="label5">
+                      <object class="GtkLabel" id="label3">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Binding</property>
+                        <property name="label" translatable="yes">_Data Type</property>
                         <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">binding</property>
+                        <property name="mnemonic_widget">name</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
-                        <property name="top_attach">4</property>
+                        <property name="top_attach">0</property>
                         <property name="width">1</property>
                         <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkLabel" id="label6">
+                      <object class="GtkLabel" id="urlft1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Replace</property>
+                        <property name="label" translatable="yes">Binding e_xpression</property>
                         <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">replace</property>
+                        <property name="mnemonic_widget">expression</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
-                        <property name="top_attach">5</property>
+                        <property name="top_attach">1</property>
                         <property name="width">1</property>
                         <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkComboBoxText" id="binding">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="entry_text_column">0</property>
-                        <property name="id_column">1</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">4</property>
-                        <property name="width">2</property>
-                        <property name="height">1</property>
-                      </packing>
+                      <placeholder/>
                     </child>
                     <child>
-                      <object class="GtkComboBoxText" id="replace">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="entry_text_column">0</property>
-                        <property name="id_column">1</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">5</property>
-                        <property name="width">2</property>
-                        <property name="height">1</property>
-                      </packing>
+                      <placeholder/>
                     </child>
                   </object>
                 </child>
               </object>
             </child>
             <child type="label">
-              <object class="GtkLabel" id="label1">
+              <object class="GtkLabel" id="label4">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Submission</property>
+                <property name="label" translatable="yes">Settings</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -312,6 +210,62 @@
             <property name="position">1</property>
           </packing>
         </child>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox" id="dialog-action_area1">
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="ok">
+                <property name="label">gtk-ok</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="has_default">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="cancel">
+                <property name="label">gtk-cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="help">
+                <property name="label">gtk-help</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
       </object>
     </child>
     <action-widgets>