split out table columns page and adapt code

Change-Id: I37fc7936357676dff135e85db17040324d2f3534

4 files changed, 105 insertions, 393 deletions

diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index 939b132e8ad3..9dbfeeebc409 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -724,57 +724,39 @@ int  SwFormatTablePage::DeactivatePage( SfxItemSet* _pSet )
 /*------------------------------------------------------------------------
     Beschreibung: Seite Spaltenkonfiguration
 ------------------------------------------------------------------------*/
-SwTableColumnPage::SwTableColumnPage( Window* pParent,
-            const SfxItemSet& rSet ) :
-    SfxTabPage(pParent, SW_RES( TP_TABLE_COLUMN ), rSet ),
-    aModifyTableCB(this,    SW_RES(CB_MOD_TBL)),
-    aProportionalCB(this,   SW_RES(CB_PROP)),
-    aSpaceFT(this,          SW_RES(FT_SPACE)),
-    aSpaceED(this,          SW_RES(ED_SPACE)),
-
-    aColFL(this,            SW_RES(COL_FL_LAYOUT)),
-    aUpBtn(this,            SW_RES(COL_BTN_UP)),
-    aFT1(this,              SW_RES(COL_FT_1)),
-    aMF1(this,              SW_RES(COL_MF_1)),
-    aFT2(this,              SW_RES(COL_FT_2)),
-    aMF2(this,              SW_RES(COL_MF_2)),
-    aFT3(this,              SW_RES(COL_FT_3)),
-    aMF3(this,              SW_RES(COL_MF_3)),
-    aFT4(this,              SW_RES(COL_FT_4)),
-    aMF4(this,              SW_RES(COL_MF_4)),
-    aFT5(this,              SW_RES(COL_FT_5)),
-    aMF5(this,              SW_RES(COL_MF_5)),
-    aFT6(this,              SW_RES(COL_FT_6)),
-    aMF6(this,              SW_RES(COL_MF_6)),
-    aDownBtn(this,          SW_RES(COL_BTN_DOWN)),
-
-    nTableWidth(0),
-    nMinWidth( MINLAY ),
-    nNoOfCols( 0 ),
-    nNoOfVisibleCols( 0 ),
-    bModified(sal_False),
-    bModifyTbl(sal_False),
-    bPercentMode(sal_False)
+SwTableColumnPage::SwTableColumnPage(Window* pParent, const SfxItemSet& rSet)
+    : SfxTabPage(pParent, "TableColumnPage",
+        "modules/swriter/ui/tablecolumnpage.ui", rSet)
+    , nTableWidth(0)
+    , nMinWidth(MINLAY)
+    , nNoOfCols(0)
+    , nNoOfVisibleCols(0)
+    , bModified(false)
+    , bModifyTbl(false)
+    , bPercentMode(false)
 {
-    FreeResource();
-    SetExchangeSupport();
-
-    aDownBtn.SetAccessibleRelationMemberOf(&aColFL);
-    aUpBtn.SetAccessibleRelationMemberOf(&aColFL);
+    get(m_pModifyTableCB, "adaptwidth");
+    get(m_pProportionalCB, "adaptcolumns");
+    get(m_pSpaceFT, "spaceft");
+    get(m_pSpaceED, "space-nospin");
+    get(m_pUpBtn, "next");
+    get(m_pDownBtn, "back");
+
+    m_aFieldArr[0].set(get<MetricField>("width1"));
+    m_aFieldArr[1].set(get<MetricField>("width2"));
+    m_aFieldArr[2].set(get<MetricField>("width3"));
+    m_aFieldArr[3].set(get<MetricField>("width4"));
+    m_aFieldArr[4].set(get<MetricField>("width5"));
+    m_aFieldArr[5].set(get<MetricField>("width6"));
+
+    m_pTextArr[0] = get<FixedText>("1");
+    m_pTextArr[1] = get<FixedText>("2");
+    m_pTextArr[2] = get<FixedText>("3");
+    m_pTextArr[3] = get<FixedText>("4");
+    m_pTextArr[4] = get<FixedText>("5");
+    m_pTextArr[5] = get<FixedText>("6");
 
-    pFieldArr[0] = &aMF1;
-    pFieldArr[1] = &aMF2;
-    pFieldArr[2] = &aMF3;
-    pFieldArr[3] = &aMF4;
-    pFieldArr[4] = &aMF5;
-    pFieldArr[5] = &aMF6;
-
-    pTextArr[0] = &aFT1;
-    pTextArr[1] = &aFT2;
-    pTextArr[2] = &aFT3;
-    pTextArr[3] = &aFT4;
-    pTextArr[4] = &aFT5;
-    pTextArr[5] = &aFT6;
+    SetExchangeSupport();
 
     const SfxPoolItem* pItem;
     Init((SFX_ITEM_SET == rSet.GetItemState( SID_HTML_MODE, sal_False,&pItem )
@@ -816,25 +798,25 @@ void  SwTableColumnPage::Reset( const SfxItemSet& )
             if( pTblData->GetColumns()[i].nWidth  < nMinWidth )
                     nMinWidth = pTblData->GetColumns()[i].nWidth;
         }
-        sal_Int64 nMinTwips = pFieldArr[0]->NormalizePercent( nMinWidth );
-        sal_Int64 nMaxTwips = pFieldArr[0]->NormalizePercent( nTableWidth );
+        sal_Int64 nMinTwips = m_aFieldArr[0].NormalizePercent( nMinWidth );
+        sal_Int64 nMaxTwips = m_aFieldArr[0].NormalizePercent( nTableWidth );
         for( i = 0; (i < MET_FIELDS) && (i < nNoOfVisibleCols); i++ )
         {
-            pFieldArr[i]->SetPrcntValue( pFieldArr[i]->NormalizePercent(
+            m_aFieldArr[i].SetPrcntValue( m_aFieldArr[i].NormalizePercent(
                                                 GetVisibleWidth(i) ), FUNIT_TWIP );
-            pFieldArr[i]->SetMin( nMinTwips , FUNIT_TWIP );
-            pFieldArr[i]->SetMax( nMaxTwips , FUNIT_TWIP );
-            pFieldArr[i]->Enable();
-            pTextArr[i]->Enable();
+            m_aFieldArr[i].SetMin( nMinTwips , FUNIT_TWIP );
+            m_aFieldArr[i].SetMax( nMaxTwips , FUNIT_TWIP );
+            m_aFieldArr[i].Enable();
+            m_pTextArr[i]->Enable();
         }
 
         if( nNoOfVisibleCols > MET_FIELDS )
-            aUpBtn.Enable();
+            m_pUpBtn->Enable();
         i = nNoOfVisibleCols;
         while( i < MET_FIELDS )
         {
-            pFieldArr[i]->SetText( aEmptyStr );
-            pTextArr[i]->Hide();
+            m_aFieldArr[i].SetText( aEmptyStr );
+            m_pTextArr[i]->Disable();
             i++;
         }
     }
@@ -852,28 +834,27 @@ void  SwTableColumnPage::Init(sal_Bool bWeb)
     for( sal_uInt16 i = 0; i < MET_FIELDS; i++ )
     {
         aValueTbl[i] = i;
-        SetMetric(*pFieldArr[i], aMetric);
-        pFieldArr[i]->SetUpHdl( aLkUp );
-        pFieldArr[i]->SetDownHdl( aLkDown );
-        pFieldArr[i]->SetLoseFocusHdl( aLkLF );
-
+        m_aFieldArr[i].SetMetric(aMetric);
+        m_aFieldArr[i].SetUpHdl( aLkUp );
+        m_aFieldArr[i].SetDownHdl( aLkDown );
+        m_aFieldArr[i].SetLoseFocusHdl( aLkLF );
     }
-    SetMetric(aSpaceED, aMetric);
+    SetMetric(*m_pSpaceED, aMetric);
 
     Link aLk = LINK( this, SwTableColumnPage, AutoClickHdl );
-    aUpBtn.SetClickHdl( aLk );
-    aDownBtn.SetClickHdl( aLk );
+    m_pUpBtn->SetClickHdl( aLk );
+    m_pDownBtn->SetClickHdl( aLk );
 
     aLk = LINK( this, SwTableColumnPage, ModeHdl );
-    aModifyTableCB .SetClickHdl( aLk );
-    aProportionalCB.SetClickHdl( aLk );
+    m_pModifyTableCB->SetClickHdl( aLk );
+    m_pProportionalCB->SetClickHdl( aLk );
 };
 
 
 IMPL_LINK( SwTableColumnPage, AutoClickHdl, CheckBox *, pBox )
 {
     //Anzeigefenster verschieben
-    if(pBox == (CheckBox *)&aDownBtn)
+    if(pBox == (CheckBox *)m_pDownBtn)
     {
         if(aValueTbl[0] > 0)
         {
@@ -881,7 +862,7 @@ IMPL_LINK( SwTableColumnPage, AutoClickHdl, CheckBox *, pBox )
                 aValueTbl[i] -= 1;
         }
     }
-    if(pBox == (CheckBox *)&aUpBtn)
+    if (pBox == (CheckBox *)m_pUpBtn)
     {
         if( aValueTbl[ MET_FIELDS -1 ] < nNoOfVisibleCols -1  )
         {
@@ -894,59 +875,59 @@ IMPL_LINK( SwTableColumnPage, AutoClickHdl, CheckBox *, pBox )
         String sEntry = rtl::OUString('~');
         String sIndex = String::CreateFromInt32( aValueTbl[i] + 1 );
         sEntry += sIndex;
-        pTextArr[i]->SetText( sEntry );
+        m_pTextArr[i]->SetText( sEntry );
 
         //added by menghu for SODC_5143,12/12/2006
         String sColumnWidth = SW_RESSTR( STR_ACCESS_COLUMN_WIDTH);
         sColumnWidth.SearchAndReplace( DEFINE_CONST_UNICODE("%1"), sIndex );
-        pFieldArr[i]->SetAccessibleName( sColumnWidth );
+        m_aFieldArr[i].SetAccessibleName( sColumnWidth );
     }
 
-    aDownBtn.Enable(aValueTbl[0] > 0);
-    aUpBtn.Enable(aValueTbl[ MET_FIELDS -1 ] < nNoOfVisibleCols -1 );
+    m_pDownBtn->Enable(aValueTbl[0] > 0);
+    m_pUpBtn->Enable(aValueTbl[ MET_FIELDS -1 ] < nNoOfVisibleCols -1 );
     UpdateCols(0);
     return 0;
 };
 
 
-IMPL_LINK_INLINE_START( SwTableColumnPage, UpHdl, PercentField *, pEdit )
+IMPL_LINK_INLINE_START( SwTableColumnPage, UpHdl, MetricField*, pEdit )
 {
     bModified = sal_True;
     ModifyHdl( pEdit );
     return 0;
 };
-IMPL_LINK_INLINE_END( SwTableColumnPage, UpHdl, PercentField *, pEdit )
+IMPL_LINK_INLINE_END( SwTableColumnPage, UpHdl, MetricField*, pEdit )
 
 
-IMPL_LINK_INLINE_START( SwTableColumnPage, DownHdl, PercentField *, pEdit )
+IMPL_LINK_INLINE_START( SwTableColumnPage, DownHdl, MetricField*, pEdit )
 {
     bModified = sal_True;
     ModifyHdl( pEdit );
     return 0;
 };
-IMPL_LINK_INLINE_END( SwTableColumnPage, DownHdl, PercentField *, pEdit )
+IMPL_LINK_INLINE_END( SwTableColumnPage, DownHdl, MetricField*, pEdit )
 
 
-IMPL_LINK_INLINE_START( SwTableColumnPage, LoseFocusHdl, PercentField *, pEdit )
+IMPL_LINK_INLINE_START( SwTableColumnPage, LoseFocusHdl, MetricField*, pEdit )
 {
-    if(pEdit->IsModified())
+    if (pEdit->IsModified())
     {
         bModified = sal_True;
         ModifyHdl( pEdit );
     }
     return 0;
 };
-IMPL_LINK_INLINE_END( SwTableColumnPage, LoseFocusHdl, PercentField *, pEdit )
+IMPL_LINK_INLINE_END( SwTableColumnPage, LoseFocusHdl, MetricField*, pEdit )
 
 
 IMPL_LINK( SwTableColumnPage, ModeHdl, CheckBox*, pBox )
 {
     sal_Bool bCheck = pBox->IsChecked();
-    if(pBox == &aProportionalCB)
+    if (pBox == m_pProportionalCB)
     {
         if(bCheck)
-            aModifyTableCB.Check();
-        aModifyTableCB.Enable(!bCheck && bModifyTbl);
+            m_pModifyTableCB->Check();
+        m_pModifyTableCB->Enable(!bCheck && bModifyTbl);
     }
     return 0;
 };
@@ -956,9 +937,9 @@ sal_Bool  SwTableColumnPage::FillItemSet( SfxItemSet& )
 {
     for( sal_uInt16 i = 0; i < MET_FIELDS; i++ )
     {
-        if(pFieldArr[i]->HasFocus())
+        if (m_aFieldArr[i].HasFocus())
         {
-            LoseFocusHdl(pFieldArr[i]);
+            LoseFocusHdl(m_aFieldArr[i].get());
             break;
         }
     }
@@ -971,16 +952,22 @@ sal_Bool  SwTableColumnPage::FillItemSet( SfxItemSet& )
 };
 
 
-void   SwTableColumnPage::ModifyHdl( PercentField* pEdit )
+void   SwTableColumnPage::ModifyHdl( MetricField* pField )
 {
+        PercentFieldWrap *pEdit = NULL;
         sal_uInt16 nAktPos;
         sal_uInt16 i;
 
         for( i = 0; i < MET_FIELDS; i++)
-            if(pEdit == pFieldArr[i])
+        {
+            if (pField == m_aFieldArr[i].get())
+            {
+                pEdit = &m_aFieldArr[i];
                 break;
+            }
+        }
 
-        if (MET_FIELDS <= i)
+        if (MET_FIELDS <= i || !pEdit)
         {
             OSL_ENSURE(false, "cannot happen.");
             return;
@@ -1004,8 +991,8 @@ void   SwTableColumnPage::UpdateCols( sal_uInt16 nAktPos )
     }
     SwTwips nDiff = nSum - nTableWidth;
 
-    sal_Bool bModifyTable = aModifyTableCB.IsChecked();
-    sal_Bool bProp =    aProportionalCB.IsChecked();
+    sal_Bool bModifyTable = m_pModifyTableCB->IsChecked();
+    sal_Bool bProp =    m_pProportionalCB->IsChecked();
 
     if(!bModifyTable && !bProp )
     {
@@ -1097,25 +1084,23 @@ void   SwTableColumnPage::UpdateCols( sal_uInt16 nAktPos )
     }
 
     if(!bPercentMode)
-        aSpaceED.SetValue(aSpaceED.Normalize( pTblData->GetSpace() - nTableWidth) , FUNIT_TWIP);
+        m_pSpaceED->SetValue(m_pSpaceED->Normalize( pTblData->GetSpace() - nTableWidth) , FUNIT_TWIP);
 
     for( i = 0; ( i < nNoOfVisibleCols ) && ( i < MET_FIELDS ); i++)
     {
-        pFieldArr[i]->SetPrcntValue(pFieldArr[i]->NormalizePercent(
+        m_aFieldArr[i].SetPrcntValue(m_aFieldArr[i].NormalizePercent(
                         GetVisibleWidth(aValueTbl[i]) ), FUNIT_TWIP);
-        pFieldArr[i]->ClearModifyFlag();
+        m_aFieldArr[i].ClearModifyFlag();
     }
-
 }
 
-
 void    SwTableColumnPage::ActivatePage( const SfxItemSet& )
 {
     bPercentMode = pTblData->GetWidthPercent() != 0;
     for( sal_uInt16 i = 0; (i < MET_FIELDS) && (i < nNoOfVisibleCols); i++ )
     {
-        pFieldArr[i]->SetRefValue(pTblData->GetWidth());
-        pFieldArr[i]->ShowPercent( bPercentMode );
+        m_aFieldArr[i].SetRefValue(pTblData->GetWidth());
+        m_aFieldArr[i].ShowPercent( bPercentMode );
     }
 
     sal_uInt16 nTblAlign = pTblData->GetAlign();
@@ -1134,20 +1119,20 @@ void    SwTableColumnPage::ActivatePage( const SfxItemSet& )
         bModifyTbl = sal_False;
     if(bPercentMode)
     {
-        aModifyTableCB  .Check(sal_False);
-        aProportionalCB .Check(sal_False);
+        m_pModifyTableCB->Check(sal_False);
+        m_pProportionalCB->Check(sal_False);
     }
     else if( !bModifyTbl )
     {
-        aProportionalCB.Check(sal_False);
-        aModifyTableCB.Check(sal_False);
+        m_pProportionalCB->Check(sal_False);
+        m_pModifyTableCB->Check(sal_False);
     }
-    aSpaceFT.Enable(!bPercentMode);
-    aSpaceED.Enable(!bPercentMode);
-    aModifyTableCB.Enable( !bPercentMode && bModifyTbl );
-    aProportionalCB.Enable(!bPercentMode && bModifyTbl );
+    m_pSpaceFT->Enable(!bPercentMode);
+    m_pSpaceED->Enable(!bPercentMode);
+    m_pModifyTableCB->Enable( !bPercentMode && bModifyTbl );
+    m_pProportionalCB->Enable(!bPercentMode && bModifyTbl );
 
-    aSpaceED.SetValue(aSpaceED.Normalize(
+    m_pSpaceED->SetValue(m_pSpaceED->Normalize(
                 pTblData->GetSpace() - nTableWidth) , FUNIT_TWIP);
 
 }
diff --git a/sw/source/ui/table/tabledlg.hrc b/sw/source/ui/table/tabledlg.hrc
index 603ac1e6d7e5..f801bba344e1 100644
--- a/sw/source/ui/table/tabledlg.hrc
+++ b/sw/source/ui/table/tabledlg.hrc
@@ -37,7 +37,6 @@
 #define FL_DIST                 24
 #define FT_WIDTH        25
 #define FT_POS          32
-#define CB_HEADLINE         40
 #define FL_PROPERTIES       42
 #define FT_TEXTORIENTATION    43
 #define LB_TEXTORIENTATION    44
@@ -49,25 +48,5 @@
 #define FT_NAME         104
 #define FL_OPTIONS              105
 #define FL_NAME                 106
-#define COL_FT_1        107
-#define COL_MF_1        108
-#define COL_FT_2        109
-#define COL_MF_2        110
-#define COL_FT_3        111
-#define COL_MF_3        112
-#define COL_FT_4        113
-#define COL_MF_4        114
-#define COL_FT_5        115
-#define COL_MF_5        116
-#define COL_FT_6        117
-#define COL_MF_6        118
-#define COL_FL_LAYOUT   119
-#define COL_BTN_UP      120
-#define COL_BTN_DOWN    121
-#define CB_MOD_TBL      122
-#define CB_PROP         123
-
-#define FT_SPACE        125
-#define ED_SPACE        126
 
 #define RB_FROM_LEFT    127
diff --git a/sw/source/ui/table/tabledlg.src b/sw/source/ui/table/tabledlg.src
index 04a789c6d568..79140b6e42ad 100644
--- a/sw/source/ui/table/tabledlg.src
+++ b/sw/source/ui/table/tabledlg.src
@@ -313,245 +313,6 @@ TabPage TP_FORMAT_TABLE
     };
 };
 
-TabPage TP_TABLE_COLUMN
-{
-    HelpID = HID_TABLE_COLUMN ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
-    Hide = TRUE;
-    CheckBox CB_MOD_TBL
-    {
-        HelpID = "sw:CheckBox:TP_TABLE_COLUMN:CB_MOD_TBL";
-        Pos = MAP_APPFONT ( 6 , 6 ) ;
-        Size = MAP_APPFONT ( 180 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Adapt table ~width" ;
-    };
-    CheckBox CB_PROP
-    {
-        HelpID = "sw:CheckBox:TP_TABLE_COLUMN:CB_PROP";
-        Pos = MAP_APPFONT ( 6 , 20 ) ;
-        Size = MAP_APPFONT ( 180 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Ad~just columns proportionally" ;
-    };
-    FixedText FT_SPACE
-    {
-        Pos = MAP_APPFONT ( 6 , 36 ) ;
-        Size = MAP_APPFONT ( 85 , 8 ) ;
-        Text [ en-US ] = "Remaining space" ;
-    };
-    MetricField ED_SPACE
-    {
-        HelpID = "sw:MetricField:TP_TABLE_COLUMN:ED_SPACE";
-        ReadOnly = TRUE ;
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 95 , 34 ) ;
-        Size = MAP_APPFONT ( 30 , 12 ) ;
-        TabStop = TRUE ;
-        Left = TRUE ;
-        Minimum = 0 ;
-        Maximum = 5600 ;
-        DecimalDigits = 2 ;
-        Unit = FUNIT_CM ;
-        First = 10 ;
-        Last = 5600 ;
-        SpinSize = 10 ;
-    };
-    ImageButton COL_BTN_DOWN
-    {
-        HelpID = "sw:ImageButton:TP_TABLE_COLUMN:COL_BTN_DOWN";
-        Disable = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 65 ) ;
-        Size = MAP_APPFONT ( 10 , 10 ) ;
-        TabStop = TRUE ;
-        SYMBOL = IMAGEBUTTON_ARROW_LEFT ;
-    };
-    ImageButton COL_BTN_UP
-    {
-        HelpID = "sw:ImageButton:TP_TABLE_COLUMN:COL_BTN_UP";
-        Disable = TRUE ;
-        Pos = MAP_APPFONT ( 234 , 65 ) ;
-        Size = MAP_APPFONT ( 10 , 10 ) ;
-        TabStop = TRUE ;
-        SYMBOL = IMAGEBUTTON_ARROW_RIGHT ;
-    };
-    FixedText COL_FT_1
-    {
-        Disable = TRUE ;
-        Pos = MAP_APPFONT ( 30 , 65 ) ;
-        Size = MAP_APPFONT ( 9 , 8 ) ;
-        Text = "~1" ;
-        Left = TRUE ;
-        Center = TRUE ;
-        Right = TRUE ;
-    };
-    MetricField COL_MF_1
-    {
-        HelpID = "sw:MetricField:TP_TABLE_COLUMN:COL_MF_1";
-        Disable = TRUE ;
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 13 , 81 ) ;
-        Size = MAP_APPFONT ( 36 , 12 ) ;
-        TabStop = TRUE ;
-        Left = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Minimum = 1 ;
-        Maximum = 5600 ;
-        DecimalDigits = 2 ;
-        Unit = FUNIT_CM ;
-        First = 10 ;
-        Last = 5600 ;
-        SpinSize = 10 ;
-    };
-    FixedText COL_FT_2
-    {
-        Disable = TRUE ;
-        Pos = MAP_APPFONT ( 68 , 65 ) ;
-        Size = MAP_APPFONT ( 9 , 8 ) ;
-        Text = "~2" ;
-        Left = TRUE ;
-        Right = TRUE ;
-    };
-    MetricField COL_MF_2
-    {
-        HelpID = "sw:MetricField:TP_TABLE_COLUMN:COL_MF_2";
-        Disable = TRUE ;
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 52 , 81 ) ;
-        Size = MAP_APPFONT ( 36 , 12 ) ;
-        TabStop = TRUE ;
-        Left = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Minimum = 0 ;
-        Maximum = 5600 ;
-        DecimalDigits = 2 ;
-        Unit = FUNIT_CM ;
-        First = 10 ;
-        Last = 5600 ;
-        SpinSize = 10 ;
-    };
-    FixedText COL_FT_3
-    {
-        Disable = TRUE ;
-        Pos = MAP_APPFONT ( 107 , 65 ) ;
-        Size = MAP_APPFONT ( 9 , 8 ) ;
-        Text = "~3" ;
-        Left = TRUE ;
-        Right = TRUE ;
-    };
-    MetricField COL_MF_3
-    {
-        HelpID = "sw:MetricField:TP_TABLE_COLUMN:COL_MF_3";
-        Disable = TRUE ;
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 91 , 81 ) ;
-        Size = MAP_APPFONT ( 36 , 12 ) ;
-        TabStop = TRUE ;
-        Left = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Minimum = 0 ;
-        Maximum = 5600 ;
-        DecimalDigits = 2 ;
-        Unit = FUNIT_CM ;
-        First = 10 ;
-        Last = 5600 ;
-        SpinSize = 10 ;
-    };
-    FixedText COL_FT_4
-    {
-        Disable = TRUE ;
-        Pos = MAP_APPFONT ( 146 , 65 ) ;
-        Size = MAP_APPFONT ( 9 , 8 ) ;
-        Text = "~4" ;
-        Left = TRUE ;
-        Right = TRUE ;
-    };
-    MetricField COL_MF_4
-    {
-        HelpID = "sw:MetricField:TP_TABLE_COLUMN:COL_MF_4";
-        Disable = TRUE ;
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 130 , 81 ) ;
-        Size = MAP_APPFONT ( 36 , 12 ) ;
-        TabStop = TRUE ;
-        Left = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Minimum = 0 ;
-        Maximum = 5600 ;
-        DecimalDigits = 2 ;
-        Unit = FUNIT_CM ;
-        First = 10 ;
-        Last = 5600 ;
-        SpinSize = 10 ;
-    };
-    FixedText COL_FT_5
-    {
-        Disable = TRUE ;
-        Pos = MAP_APPFONT ( 185 , 65 ) ;
-        Size = MAP_APPFONT ( 9 , 8 ) ;
-        Text = "~5" ;
-        Left = TRUE ;
-        Right = TRUE ;
-    };
-    MetricField COL_MF_5
-    {
-        HelpID = "sw:MetricField:TP_TABLE_COLUMN:COL_MF_5";
-        Disable = TRUE ;
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 169 , 81 ) ;
-        Size = MAP_APPFONT ( 36 , 12 ) ;
-        TabStop = TRUE ;
-        Left = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Minimum = 0 ;
-        Maximum = 5600 ;
-        DecimalDigits = 2 ;
-        Unit = FUNIT_CM ;
-        First = 10 ;
-        Last = 5600 ;
-        SpinSize = 10 ;
-    };
-    FixedText COL_FT_6
-    {
-        Disable = TRUE ;
-        Pos = MAP_APPFONT ( 204 , 65 ) ;
-        Size = MAP_APPFONT ( 9 , 8 ) ;
-        Text = "~6" ;
-        Left = TRUE ;
-        Right = TRUE ;
-    };
-    MetricField COL_MF_6
-    {
-        HelpID = "sw:MetricField:TP_TABLE_COLUMN:COL_MF_6";
-        Disable = TRUE ;
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 208 , 81 ) ;
-        Size = MAP_APPFONT ( 36 , 12 ) ;
-        TabStop = TRUE ;
-        Left = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Minimum = 0 ;
-        Maximum = 5600 ;
-        DecimalDigits = 2 ;
-        Unit = FUNIT_CM ;
-        First = 10 ;
-        Last = 5600 ;
-        SpinSize = 10 ;
-    };
-    FixedLine COL_FL_LAYOUT
-    {
-        Pos = MAP_APPFONT ( 6 , 50 ) ;
-        Size = MAP_APPFONT ( 240 , 8 ) ;
-        Text [ en-US ] = "Column width" ;
-    };
-};
 InfoBox MSG_WRONG_TABLENAME
 {
     Message [ en-US ] = "The name of the table must not contain spaces." ;
diff --git a/sw/source/ui/table/tablepg.hxx b/sw/source/ui/table/tablepg.hxx
index 4e28ce690324..3515bce0cbcc 100644
--- a/sw/source/ui/table/tablepg.hxx
+++ b/sw/source/ui/table/tablepg.hxx
@@ -97,29 +97,16 @@ public:
 
 class SwTableColumnPage : public SfxTabPage
 {
-    CheckBox        aModifyTableCB;
-    CheckBox        aProportionalCB;
-    FixedText       aSpaceFT;
-    MetricField     aSpaceED;
-     FixedLine        aColFL;
-    ImageButton     aUpBtn;
-    FixedText       aFT1;
-    PercentField    aMF1;
-    FixedText       aFT2;
-    PercentField    aMF2;
-    FixedText       aFT3;
-    PercentField    aMF3;
-    FixedText       aFT4;
-    PercentField    aMF4;
-    FixedText       aFT5;
-    PercentField    aMF5;
-    FixedText       aFT6;
-    PercentField    aMF6;
-    ImageButton     aDownBtn;
+    CheckBox*       m_pModifyTableCB;
+    CheckBox*       m_pProportionalCB;
+    FixedText*      m_pSpaceFT;
+    MetricField*    m_pSpaceED;
+    PushButton*     m_pUpBtn;
+    PushButton*     m_pDownBtn;
 
     SwTableRep*     pTblData;
-    PercentField*   pFieldArr[MET_FIELDS];
-    FixedText*      pTextArr[MET_FIELDS];
+    PercentFieldWrap  m_aFieldArr[MET_FIELDS];
+    FixedText*      m_pTextArr[MET_FIELDS];
     SwTwips         nTableWidth;
     SwTwips         nMinWidth;
     sal_uInt16          nNoOfCols;
@@ -132,10 +119,10 @@ class SwTableColumnPage : public SfxTabPage
 
     void        Init(sal_Bool bWeb);
     DECL_LINK( AutoClickHdl, CheckBox * );
-    void        ModifyHdl( PercentField* pEdit );
-    DECL_LINK( UpHdl, PercentField * );
-    DECL_LINK( DownHdl, PercentField * );
-    DECL_LINK( LoseFocusHdl, PercentField * );
+    void        ModifyHdl( MetricField* pEdit );
+    DECL_LINK( UpHdl, MetricField * );
+    DECL_LINK( DownHdl, MetricField * );
+    DECL_LINK( LoseFocusHdl, MetricField * );
     DECL_LINK( ModeHdl, CheckBox * );
     void        UpdateCols( sal_uInt16 nAktPos );
     SwTwips     GetVisibleWidth(sal_uInt16 nPos);