convert table properties tabdialog to .ui

Change-Id: Ide72fb6bfc604f13e9d01250aac8e9b011bd034b

16 files changed, 126 insertions, 478 deletions

diff --git a/sw/UI_swriter.mk b/sw/UI_swriter.mk
index e33a4dfb3f4b..b7f8f743282f 100644
--- a/sw/UI_swriter.mk
+++ b/sw/UI_swriter.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_UI_add_uifiles,modules/swriter,\
 	sw/uiconfig/swriter/ui/statisticsinfopage \
 	sw/uiconfig/swriter/ui/stringinput \
 	sw/uiconfig/swriter/ui/tablecolumnpage \
+	sw/uiconfig/swriter/ui/tableproperties \
 	sw/uiconfig/swriter/ui/tabletextflowpage \
 	sw/uiconfig/swriter/ui/titlepage \
 	sw/uiconfig/swriter/ui/wordcount \
diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc
index 66c2134a163d..21c1232e0d5a 100644
--- a/sw/inc/globals.hrc
+++ b/sw/inc/globals.hrc
@@ -149,7 +149,6 @@
 
 #define TP_FRM_STD                  (RC_GLOBALS_BEGIN +  31)
 
-#define TP_FORMAT_TABLE             (RC_GLOBALS_BEGIN +  34)
 #define TP_GRF_EXT                  (RC_GLOBALS_BEGIN +  35)
 
 #define DLG_FRM_STD                 (RC_GLOBALS_BEGIN +  36)
@@ -167,8 +166,6 @@
 #define TP_FRM_WRAP                 (RC_GLOBALS_BEGIN +  49)
 #define TP_FRM_ADD                  (RC_GLOBALS_BEGIN +  51)
 
-#define TP_TABLE_TEXTFLOW           (RC_GLOBALS_BEGIN +  52)
-
 #define TP_PARA_ALIGN               (RC_GLOBALS_BEGIN +  55)
 #define TP_OPTTABLE_PAGE            (RC_GLOBALS_BEGIN +  56)
 
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 298c2fa814f8..bb1816b7cd03 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -157,7 +157,6 @@
 #define HID_FRM_STD                                             "SW_HID_FRM_STD"
 #define HID_GRF_EXT                                             "SW_HID_GRF_EXT"
 #define HID_FOOTNOTE_PAGE                                       "SW_HID_FOOTNOTE_PAGE"
-#define HID_FORMAT_TABLE                                        "SW_HID_FORMAT_TABLE"
 #define HID_LAB_LAB                                             "SW_HID_LAB_LAB"
 #define HID_LAB_PRT                                             "SW_HID_LAB_PRT"
 #define HID_ENV_PRT                                             "SW_HID_ENV_PRT"
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index 553dcc0d9a41..f5aa68c636d3 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -397,8 +397,8 @@ public:
     virtual SfxAbstractDialog * CreateSwWrapDlg ( Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, sal_Bool bDrawMode, int nResId ) = 0; //add for SwWrapDlg
 
     virtual VclAbstractDialog * CreateSwTableWidthDlg(Window *pParent, SwTableFUNC &rFnc) = 0; //add for SwTableWidthDlg
-    virtual SfxAbstractTabDialog* CreateSwTableTabDlg( Window* pParent, SfxItemPool& Pool,
-                                                        const SfxItemSet* pItemSet, SwWrtShell* pSh,int nResId ) = 0; //add for SwTableTabDlg
+    virtual SfxAbstractTabDialog* CreateSwTableTabDlg(Window* pParent, SfxItemPool& Pool,
+        const SfxItemSet* pItemSet, SwWrtShell* pSh) = 0; //add for SwTableTabDlg
 
     virtual AbstractSwFldDlg * CreateSwFldDlg ( SfxBindings* pB, SwChildWinWrapper* pCW, Window *pParent, int nResId ) = 0; //add for SwFldDlg
     virtual SfxAbstractDialog*   CreateSwFldEditDlg ( SwView& rVw, int nResId ) = 0; //add for SwFldEditDlg
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index 99c0f31e33e0..507248932ff1 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -747,7 +747,7 @@ IMPL_LINK( SwInsertDBColAutoPilot, TblFmtHdl, PushButton*, pButton )
     SwAbstractDialogFactory* pFact = swui::GetFactory();
     OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
 
-    SfxAbstractTabDialog* pDlg = pFact->CreateSwTableTabDlg(  pButton, rSh.GetAttrPool(),pTblSet, &rSh, DLG_FORMAT_TABLE );
+    SfxAbstractTabDialog* pDlg = pFact->CreateSwTableTabDlg(pButton, rSh.GetAttrPool(), pTblSet, &rSh);
     OSL_ENSURE(pDlg, "Dialogdiet fail!");
     if( RET_OK == pDlg->Execute() )
         pTblSet->Put( *pDlg->GetOutputItemSet() );
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx
index c928c8dca967..541a2ecd5be5 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -985,23 +985,11 @@ VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateSwTableWidthDlg(Window *
     return new VclAbstractDialog_Impl( pDlg );
 }
 
-SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateSwTableTabDlg( Window* pParent, SfxItemPool& Pool,
-                                                        const SfxItemSet* pItemSet, SwWrtShell* pSh,int nResId )
+SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateSwTableTabDlg(Window* pParent, SfxItemPool& Pool,
+    const SfxItemSet* pItemSet, SwWrtShell* pSh)
 {
-    SfxTabDialog* pDlg=NULL;
-    switch ( nResId )
-    {
-        case DLG_FORMAT_TABLE :
-            pDlg = new SwTableTabDlg( pParent, Pool, pItemSet,pSh );
-            break;
-
-        default:
-            break;
-    }
-
-    if ( pDlg )
-        return new AbstractTabDialog_Impl( pDlg );
-    return 0;
+    SfxTabDialog* pDlg = new SwTableTabDlg(pParent, Pool, pItemSet, pSh);
+    return new AbstractTabDialog_Impl(pDlg);
 }
 
 AbstractSwFldDlg * SwAbstractDialogFactory_Impl::CreateSwFldDlg ( SfxBindings* pB, SwChildWinWrapper* pCW, Window *pParent, int nResId )
diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx
index 880cf8cdad88..670554e69f24 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -481,8 +481,8 @@ public:
 
     virtual SfxAbstractDialog * CreateSwWrapDlg ( Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, sal_Bool bDrawMode, int nResId ); //add for SwWrapDlg
     virtual VclAbstractDialog * CreateSwTableWidthDlg(Window *pParent, SwTableFUNC &rFnc);
-    virtual SfxAbstractTabDialog* CreateSwTableTabDlg( Window* pParent, SfxItemPool& Pool,
-                                                        const SfxItemSet* pItemSet, SwWrtShell* pSh,int nResId ); //add for SwTableTabDlg
+    virtual SfxAbstractTabDialog* CreateSwTableTabDlg(Window* pParent, SfxItemPool& Pool,
+        const SfxItemSet* pItemSet, SwWrtShell* pSh); //add for SwTableTabDlg
     virtual AbstractSwFldDlg * CreateSwFldDlg ( SfxBindings* pB, SwChildWinWrapper* pCW, Window *pParent, int nResId ); //add for SwFldDlg
     virtual SfxAbstractDialog*   CreateSwFldEditDlg ( SwView& rVw, int nResId ); //add for SwFldEditDlg
     virtual AbstractSwRenameXNamedDlg * CreateSwRenameXNamedDlg( Window* pParent, //add for SwRenameXNamedDlg
diff --git a/sw/source/ui/docvw/PageBreakWin.cxx b/sw/source/ui/docvw/PageBreakWin.cxx
index f945467a3ff3..0abdb2833b5f 100644
--- a/sw/source/ui/docvw/PageBreakWin.cxx
+++ b/sw/source/ui/docvw/PageBreakWin.cxx
@@ -57,6 +57,7 @@
 #include <drawinglayer/processor2d/processorfromoutputdevice.hxx>
 #include <editeng/brkitem.hxx>
 #include <sfx2/dispatch.hxx>
+#include <svl/stritem.hxx>
 #include <vcl/svapp.hxx>
 
 
@@ -248,7 +249,7 @@ void SwPageBreakWin::Select( )
                         SwCntntNode* pNd = pCnt->GetNode();
                         rSh.SetSelection( *pNd );
 
-                        SfxUInt16Item aItem( pEditWin->GetView().GetPool( ).GetWhich( FN_FORMAT_TABLE_DLG ), TP_TABLE_TEXTFLOW );
+                        SfxStringItem aItem(pEditWin->GetView().GetPool().GetWhich(FN_FORMAT_TABLE_DLG), "textflow");
                         pEditWin->GetView().GetViewFrame()->GetDispatcher()->Execute(
                                 FN_FORMAT_TABLE_DLG, SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD, &aItem, NULL );
 
diff --git a/sw/source/ui/inc/table.hrc b/sw/source/ui/inc/table.hrc
index 77af9b45850f..ff790c1a31f2 100644
--- a/sw/source/ui/inc/table.hrc
+++ b/sw/source/ui/inc/table.hrc
@@ -18,8 +18,6 @@
 
 #include "rcid.hrc"
 
-#define DLG_FORMAT_TABLE        (RC_TABLE_BEGIN + 1)
-
 #define DLG_ROW_HEIGHT          (RC_TABLE_BEGIN + 4)
 
 
@@ -27,7 +25,6 @@
 
 
 
-#define TP_TABLE_COLUMN         (RC_TABLE_BEGIN + 11)
 #define DLG_INSERT_CHART        (RC_TABLE_BEGIN + 12)
 #define MSG_WRONG_TABLENAME     (RC_TABLE_BEGIN + 13)
 
diff --git a/sw/source/ui/inc/tabledlg.hxx b/sw/source/ui/inc/tabledlg.hxx
index 5905493f9f92..5bc5ea091fec 100644
--- a/sw/source/ui/inc/tabledlg.hxx
+++ b/sw/source/ui/inc/tabledlg.hxx
@@ -34,7 +34,10 @@ struct TColumn;
 class SwTableTabDlg : public SfxTabDialog
 {
     SwWrtShell* pShell;
-    sal_uInt16      nHtmlMode;
+    sal_uInt16 m_nHtmlMode;
+    sal_uInt16 m_nTextFlowId;
+    sal_uInt16 m_nBackgroundId;
+    sal_uInt16 m_nBorderId;
 
     virtual void        PageCreated(sal_uInt16 nId, SfxTabPage& rPage);
 public:
diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx
index ff1e40116434..c3ce9a144eb9 100644
--- a/sw/source/ui/shells/tabsh.cxx
+++ b/sw/source/ui/shells/tabsh.cxx
@@ -569,11 +569,11 @@ void SwTableShell::Execute(SfxRequest &rReq)
                 SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
                 OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
 
-                pDlg = pFact->CreateSwTableTabDlg( GetView().GetWindow(), GetPool(), &aCoreSet, &rSh, DLG_FORMAT_TABLE );
+                pDlg = pFact->CreateSwTableTabDlg(GetView().GetWindow(), GetPool(), &aCoreSet, &rSh);
                 OSL_ENSURE(pDlg, "Dialogdiet fail!");
 
-                if( pItem )
-                    pDlg->SetCurPageId( ((SfxUInt16Item *)pItem)->GetValue() );
+                if (pItem)
+                    pDlg->SetCurPageId(OUStringToOString(((SfxStringItem *)pItem)->GetValue(), RTL_TEXTENCODING_UTF8));
             }
             aCoreSet.Put(SfxUInt16Item(SID_HTML_MODE, ::GetHtmlMode(GetView().GetDocShell())));
             rSh.GetTblAttr(aCoreSet);
diff --git a/sw/source/ui/table/swtablerep.cxx b/sw/source/ui/table/swtablerep.cxx
index 4fddcae6b57c..b4d1197ed84f 100644
--- a/sw/source/ui/table/swtablerep.cxx
+++ b/sw/source/ui/table/swtablerep.cxx
@@ -50,7 +50,6 @@
 #include <SwStyleNameMapper.hxx>
 
 #include <cmdid.h>
-#include <tabledlg.hrc>
 #include <table.hrc>
 #include "swtablerep.hxx"
 
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index 9dbfeeebc409..cb8f631c006d 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -53,7 +53,6 @@
 #include <SwStyleNameMapper.hxx>
 
 #include <cmdid.h>
-#include <tabledlg.hrc>
 #include <table.hrc>
 #include <svx/svxids.hrc>
 #include <svx/dialogs.hrc>
@@ -1236,42 +1235,40 @@ void SwTableColumnPage::SetVisibleWidth(sal_uInt16 nPos, SwTwips nNewWidth)
 
 }
 
-
-SwTableTabDlg::SwTableTabDlg(Window* pParent, SfxItemPool& ,
-                    const SfxItemSet* pItemSet, SwWrtShell* pSh ) :
-        SfxTabDialog(pParent, SW_RES(DLG_FORMAT_TABLE), pItemSet,0),
-        pShell(pSh),
-        nHtmlMode(::GetHtmlMode(pSh->GetView().GetDocShell()))
+SwTableTabDlg::SwTableTabDlg(Window* pParent, SfxItemPool&,
+    const SfxItemSet* pItemSet, SwWrtShell* pSh)
+    : SfxTabDialog(0, pParent, "TablePropertiesDialog",
+        "modules/swriter/ui/tableproperties.ui", pItemSet, 0)
+    , pShell(pSh)
+    , m_nHtmlMode(::GetHtmlMode(pSh->GetView().GetDocShell()))
 {
-    FreeResource();
     SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
     OSL_ENSURE(pFact, "Dialogdiet fail!");
-    AddTabPage(TP_FORMAT_TABLE, &SwFormatTablePage::Create, 0 );
-    AddTabPage(TP_TABLE_TEXTFLOW, &SwTextFlowPage::Create, 0 );
-    AddTabPage(TP_TABLE_COLUMN, &SwTableColumnPage::Create, 0 );
-    AddTabPage(TP_BACKGROUND, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), 0 );
-    AddTabPage(TP_BORDER, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), 0 );
+    AddTabPage("table", &SwFormatTablePage::Create, 0);
+    m_nTextFlowId = AddTabPage("textflow", &SwTextFlowPage::Create, 0);
+    AddTabPage("columns", &SwTableColumnPage::Create, 0);
+    m_nBackgroundId = AddTabPage("background", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_BACKGROUND), 0);
+    m_nBorderId = AddTabPage("borders", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_BORDER), 0);
 }
 
-
 void  SwTableTabDlg::PageCreated(sal_uInt16 nId, SfxTabPage& rPage)
 {
     SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
-    if( TP_BACKGROUND == nId )
+    if (nId == m_nBackgroundId)
     {
         sal_Int32 nFlagType = SVX_SHOW_TBLCTL;
-        if(!( nHtmlMode & HTMLMODE_ON ) ||
-            nHtmlMode & HTMLMODE_SOME_STYLES)
+        if(!( m_nHtmlMode & HTMLMODE_ON ) ||
+            m_nHtmlMode & HTMLMODE_SOME_STYLES)
             nFlagType |= SVX_SHOW_SELECTOR;
         aSet.Put (SfxUInt32Item(SID_FLAG_TYPE, nFlagType));
         rPage.PageCreated(aSet);
     }
-    else if(TP_BORDER == nId)
+    else if (nId == m_nBorderId)
     {
         aSet.Put (SfxUInt16Item(SID_SWMODE_TYPE,SW_BORDER_MODE_TABLE));
         rPage.PageCreated(aSet);
     }
-    else if(TP_TABLE_TEXTFLOW == nId)
+    else if (nId == m_nTextFlowId)
     {
         ((SwTextFlowPage&)rPage).SetShell(pShell);
         const sal_uInt16 eType = pShell->GetFrmType(0,sal_True);
diff --git a/sw/source/ui/table/tabledlg.hrc b/sw/source/ui/table/tabledlg.hrc
deleted file mode 100644
index f801bba344e1..000000000000
--- a/sw/source/ui/table/tabledlg.hrc
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * 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 "globals.hrc"
-
-#define ED_WIDTH        1
-#define FL_WIDTH                3
-#define CB_REL_WIDTH    4
-#define RB_LEFT         10
-#define RB_RIGHT        11
-#define RB_CENTER       12
-#define RB_FREE         13
-#define RB_FULL         14
-#define FL_POS                  15
-#define ED_LEFT_DIST    51
-#define ED_RIGHT_DIST   52
-#define FT_RIGHT_DIST   53
-#define FT_LEFT_DIST    54
-#define FT_TOP_DIST     20
-#define ED_TOP_DIST     21
-#define FT_BOTTOM_DIST  22
-#define ED_BOTTOM_DIST  23
-#define FL_DIST                 24
-#define FT_WIDTH        25
-#define FT_POS          32
-#define FL_PROPERTIES       42
-#define FT_TEXTORIENTATION    43
-#define LB_TEXTORIENTATION    44
-
-#define BT_OK           100
-#define BT_CANCEL       101
-#define BT_MORE         102
-#define ED_NAME         103
-#define FT_NAME         104
-#define FL_OPTIONS              105
-#define FL_NAME                 106
-
-#define RB_FROM_LEFT    127
diff --git a/sw/source/ui/table/tabledlg.src b/sw/source/ui/table/tabledlg.src
index 79140b6e42ad..89e2adb30649 100644
--- a/sw/source/ui/table/tabledlg.src
+++ b/sw/source/ui/table/tabledlg.src
@@ -17,301 +17,6 @@
  */
 
 #include "table.hrc"
-#include "tabledlg.hrc"
-#include "helpid.h"
-#define TEXT_TEXTFLOW  \
-    Text [ en-US ] = "Text Flow" ; \
-
-TabDialog DLG_FORMAT_TABLE
-{
-    OutputSize = TRUE ;
-    SVLook = TRUE ;
-    Text [ en-US ] = "Table Format" ;
-    Moveable = TRUE ;
-    TabControl 1
-    {
-        SVLook = TRUE ;
-        PageList =
-        {
-            PageItem
-            {
-                Identifier = TP_FORMAT_TABLE ;
-                Text [ en-US ] = "Table" ;
-                PageResID = TP_FORMAT_TABLE ;
-            };
-            PageItem
-            {
-                Identifier = TP_TABLE_TEXTFLOW ;
-                TEXT_TEXTFLOW
-            };
-            PageItem
-            {
-                Identifier = TP_TABLE_COLUMN ;
-                Text [ en-US ] = "Columns" ;
-                PageResID = TP_TABLE_COLUMN ;
-            };
-            PageItem
-            {
-                Identifier = TP_BORDER ;
-                Text [ en-US ] = "Borders" ;
-                PageResID = TP_BORDER ;
-            };
-            PageItem
-            {
-                Identifier = TP_BACKGROUND ;
-                Text [ en-US ] = "Background" ;
-                PageResID = TP_BACKGROUND ;
-            };
-        };
-    };
-};
-
-TabPage TP_FORMAT_TABLE
-{
-    HelpID = HID_FORMAT_TABLE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
-    Hide = TRUE;
-    FixedText FT_NAME
-    {
-        Pos = MAP_APPFONT ( 12 , 16 ) ;
-        Size = MAP_APPFONT ( 60 , 8 ) ;
-        Text [ en-US ] = "~Name" ;
-    };
-    Edit ED_NAME
-    {
-        HelpID = "sw:Edit:TP_FORMAT_TABLE:ED_NAME";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 75 , 14 ) ;
-        Size = MAP_APPFONT ( 112 , 12 ) ;
-        TabStop = TRUE ;
-    };
-    FixedText FT_WIDTH
-    {
-        Pos = MAP_APPFONT ( 12 , 32 ) ;
-        Size = MAP_APPFONT ( 60 , 10 ) ;
-        Text [ en-US ] = "W~idth" ;
-    };
-    MetricField ED_WIDTH
-    {
-        HelpID = "sw:MetricField:TP_FORMAT_TABLE:ED_WIDTH";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 75 , 30 ) ;
-        Size = MAP_APPFONT ( 40 , 12 ) ;
-        TabStop = TRUE ;
-        Left = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Minimum = 0 ;
-        Maximum = 9999 ;
-        DecimalDigits = 2 ;
-        Value = 0 ;
-        Unit = FUNIT_CM ;
-        First = 0 ;
-        Last = 9999 ;
-        SpinSize = 5 ;
-    };
-    CheckBox CB_REL_WIDTH
-    {
-        HelpID = "sw:CheckBox:TP_FORMAT_TABLE:CB_REL_WIDTH";
-        Pos = MAP_APPFONT ( 118 , 32 ) ;
-        Size = MAP_APPFONT ( 69 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Relati~ve" ;
-    };
-    FixedLine FL_OPTIONS
-    {
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 184 , 8 ) ;
-        Text [ en-US ] = "Properties" ;
-    };
-    RadioButton RB_FULL
-    {
-        HelpID = "sw:RadioButton:TP_FORMAT_TABLE:RB_FULL";
-        Pos = MAP_APPFONT ( 202 , 14 ) ;
-        Size = MAP_APPFONT ( 50 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "A~utomatic" ;
-    };
-    RadioButton RB_LEFT
-    {
-        HelpID = "sw:RadioButton:TP_FORMAT_TABLE:RB_LEFT";
-        Pos = MAP_APPFONT ( 202 , 28 ) ;
-        Size = MAP_APPFONT ( 50 , 10 ) ;
-        Text [ en-US ] = "~Left" ;
-        TabStop = TRUE ;
-    };
-    RadioButton RB_FROM_LEFT
-    {
-        HelpID = "sw:RadioButton:TP_FORMAT_TABLE:RB_FROM_LEFT";
-        Pos = MAP_APPFONT ( 202 , 42 ) ;
-        Size = MAP_APPFONT ( 50 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~From left";
-    };
-    RadioButton RB_RIGHT
-    {
-        HelpID = "sw:RadioButton:TP_FORMAT_TABLE:RB_RIGHT";
-        Pos = MAP_APPFONT ( 202 , 56 ) ;
-        Size = MAP_APPFONT ( 50 , 10 ) ;
-        Text [ en-US ] = "R~ight" ;
-        TabStop = TRUE ;
-    };
-    RadioButton RB_CENTER
-    {
-        HelpID = "sw:RadioButton:TP_FORMAT_TABLE:RB_CENTER";
-        Pos = MAP_APPFONT ( 202 , 70 ) ;
-        Size = MAP_APPFONT ( 50 , 10 ) ;
-        Text [ en-US ] = "~Center" ;
-        TabStop = TRUE ;
-    };
-    RadioButton RB_FREE
-    {
-        HelpID = "sw:RadioButton:TP_FORMAT_TABLE:RB_FREE";
-        Pos = MAP_APPFONT ( 202 , 84 ) ;
-        Size = MAP_APPFONT ( 50 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~Manual" ;
-    };
-    FixedLine FL_POS
-    {
-        Pos = MAP_APPFONT ( 196 , 3 ) ;
-        Size = MAP_APPFONT ( 58 , 8 ) ;
-        Text [ en-US ] = "Alignment" ;
-    };
-    FixedLine FL_DIST
-    {
-        Pos = MAP_APPFONT ( 6 , 48 ) ;
-        Size = MAP_APPFONT ( 184 , 8 ) ;
-        Text [ en-US ] = "Spacing" ;
-    };
-    FixedText FT_LEFT_DIST
-    {
-        Pos = MAP_APPFONT ( 12 , 61 ) ;
-        Size = MAP_APPFONT ( 130 , 8 ) ;
-        Text [ en-US ] = "Lef~t" ;
-    };
-    MetricField ED_LEFT_DIST
-    {
-        HelpID = "sw:MetricField:TP_FORMAT_TABLE:ED_LEFT_DIST";
-        Pos = MAP_APPFONT ( 147 , 59 ) ;
-        Size = MAP_APPFONT ( 40 , 12 ) ;
-        Border = TRUE ;
-        TabStop = TRUE ;
-        Left = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Minimum = -9999 ;
-        Maximum = 9999 ;
-        DecimalDigits = 2 ;
-        Unit = FUNIT_CM ;
-        First = 0 ;
-        Last = 9999 ;
-        SpinSize = 5 ;
-    };
-    FixedText FT_RIGHT_DIST
-    {
-        Pos = MAP_APPFONT ( 12 , 77 ) ;
-        Size = MAP_APPFONT ( 130 , 8 ) ;
-        Text [ en-US ] = "Ri~ght" ;
-    };
-
-    MetricField ED_RIGHT_DIST
-    {
-        HelpID = "sw:MetricField:TP_FORMAT_TABLE:ED_RIGHT_DIST";
-        Pos = MAP_APPFONT ( 147 , 75 ) ;
-        Size = MAP_APPFONT ( 40 , 12 ) ;
-        Border = TRUE ;
-        TabStop = TRUE ;
-        Left = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Minimum = -9999 ;
-        Maximum = 9999 ;
-        DecimalDigits = 2 ;
-        Unit = FUNIT_CM ;
-        First = 0 ;
-        Last = 9999 ;
-        SpinSize = 5 ;
-    };
-    FixedText FT_TOP_DIST
-    {
-        Pos = MAP_APPFONT ( 12 , 93 ) ;
-        Size = MAP_APPFONT ( 130 , 8 ) ;
-        Text [ en-US ] = "~Above" ;
-    };
-    MetricField ED_TOP_DIST
-    {
-        HelpID = "sw:MetricField:TP_FORMAT_TABLE:ED_TOP_DIST";
-        Pos = MAP_APPFONT ( 147 , 91 ) ;
-        Size = MAP_APPFONT ( 40 , 12 ) ;
-        Border = TRUE ;
-        TabStop = TRUE ;
-        Left = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Minimum = 0 ;
-        Maximum = 9999 ;
-        DecimalDigits = 2 ;
-        Unit = FUNIT_CM ;
-        First = 0 ;
-        Last = 9999 ;
-        SpinSize = 5 ;
-    };
-    FixedText FT_BOTTOM_DIST
-    {
-        Pos = MAP_APPFONT ( 12 , 109 ) ;
-        Size = MAP_APPFONT ( 130 , 8 ) ;
-        Text [ en-US ] = "~Below" ;
-    };
-    MetricField ED_BOTTOM_DIST
-    {
-        HelpID = "sw:MetricField:TP_FORMAT_TABLE:ED_BOTTOM_DIST";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 147 , 107 ) ;
-        Size = MAP_APPFONT ( 40 , 12 ) ;
-        TabStop = TRUE ;
-        Left = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Minimum = 0 ;
-        Maximum = 1000 ;
-        DecimalDigits = 2 ;
-        Unit = FUNIT_CM ;
-        First = 0 ;
-        Last = 9999 ;
-        SpinSize = 5 ;
-    };
-    FixedLine   FL_PROPERTIES
-    {
-        Pos = MAP_APPFONT ( 6 , 125 ) ;
-        Size = MAP_APPFONT ( 248 , 8 ) ;
-        Hide = TRUE ;
-        Text [ en-US ] = "Properties";
-    };
-    FixedText   FT_TEXTORIENTATION
-    {
-        Pos = MAP_APPFONT ( 12 , 138 ) ;
-        Size = MAP_APPFONT ( 60 , 8 ) ;
-        Hide = TRUE ;
-        Text [ en-US ] = "Text ~direction";
-    };
-    ListBox     LB_TEXTORIENTATION
-    {
-        HelpID = "sw:ListBox:TP_FORMAT_TABLE:LB_TEXTORIENTATION";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 75 , 136 ) ;
-        Size = MAP_APPFONT ( 176 , 50 ) ;
-        DropDown = TRUE ;
-        Hide = TRUE ;
-    StringList [ en-US ] =
-    {
-         < "Left-to-right" ; 0; > ;
-        < "Right-to-left" ; 1; > ;
-        < "Use superordinate object settings" ; 4; > ;
-    };
-    };
-};
 
 InfoBox MSG_WRONG_TABLENAME
 {
diff --git a/sw/uiconfig/swriter/ui/tableproperties.ui b/sw/uiconfig/swriter/ui/tableproperties.ui
index 40d7ddb5ec61..236bfcc08a3c 100644
--- a/sw/uiconfig/swriter/ui/tableproperties.ui
+++ b/sw/uiconfig/swriter/ui/tableproperties.ui
@@ -1,23 +1,97 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
-  <object class="GtkWindow" id="window1">
+  <object class="GtkDialog" id="TablePropertiesDialog">
     <property name="can_focus">False</property>
-    <child>
-      <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
+    <property name="border_width">5</property>
+    <property name="title" translatable="yes">Table Format</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">5</property>
+        <property name="spacing">2</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>
+            <child>
+              <object class="GtkButton" id="reset">
+                <property name="label">gtk-revert-to-saved</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">3</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="GtkNotebook" id="notebook1">
+          <object class="GtkNotebook" id="tabcontrol">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
+            <property name="hexpand">True</property>
+            <property name="vexpand">True</property>
             <child>
               <placeholder/>
             </child>
             <child type="tab">
-              <object class="GtkLabel" id="label42">
+              <object class="GtkLabel" id="table">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Table</property>
@@ -30,7 +104,7 @@
               <placeholder/>
             </child>
             <child type="tab">
-              <object class="GtkLabel" id="label34">
+              <object class="GtkLabel" id="textflow">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Text Flow</property>
@@ -44,7 +118,7 @@
               <placeholder/>
             </child>
             <child type="tab">
-              <object class="GtkLabel" id="label25">
+              <object class="GtkLabel" id="columns">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Columns</property>
@@ -58,7 +132,7 @@
               <placeholder/>
             </child>
             <child type="tab">
-              <object class="GtkLabel" id="label1">
+              <object class="GtkLabel" id="borders">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Borders</property>
@@ -72,7 +146,7 @@
               <placeholder/>
             </child>
             <child type="tab">
-              <object class="GtkLabel" id="label2">
+              <object class="GtkLabel" id="background">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Background</property>
@@ -86,77 +160,16 @@
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkButtonBox" id="buttonbox1">
-            <property name="visible">True</property>
-            <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="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>
-            <child>
-              <object class="GtkButton" id="button1">
-                <property name="label" translatable="yes">Reset</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">3</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
       </object>
     </child>
+    <action-widgets>
+      <action-widget response="0">ok</action-widget>
+      <action-widget response="0">cancel</action-widget>
+      <action-widget response="0">help</action-widget>
+      <action-widget response="0">reset</action-widget>
+    </action-widgets>
   </object>
 </interface>