Convert line tab page to widget UI

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

2 files changed, 29 insertions, 34 deletions

diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx
index 5207b7a04611..58329cd9b601 100644
--- a/cui/source/inc/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
@@ -87,36 +87,32 @@ class SvxLineTabPage : public SvxTabPage
     using TabPage::ActivatePage;
     using TabPage::DeactivatePage;
 private:
-    FixedLine           aFlLine;
-    FixedText           aFtLineStyle;
-    LineLB              aLbLineStyle;
-    FixedText           aFtColor;
-    ColorLB             aLbColor;
-    FixedText           aFtLineWidth;
-    MetricField         aMtrLineWidth;
-    FixedText           aFtTransparent;
-    MetricField         aMtrTransparent;
-    FixedLine           aFlLineEnds;
-    LineEndLB           aLbStartStyle;
-    MetricField         aMtrStartWidth;
-    TriStateBox         aTsbCenterStart;
-    FixedText           aFtLineEndsStyle;
-    LineEndLB           aLbEndStyle;
-    FixedText           aFtLineEndsWidth;
-    MetricField         aMtrEndWidth;
-    TriStateBox         aTsbCenterEnd;
-    CheckBox            aCbxSynchronize;
-    FixedLine           aFLSeparator;
-    SvxXLinePreview     aCtlPreview;
+    VclBox*             m_pBoxStyle;
+    LineLB*             m_pLbLineStyle;
+    ColorLB*            m_pLbColor;
+    MetricField*        m_pMtrLineWidth;
+    MetricField*        m_pMtrTransparent;
+
+    VclFrame*           m_pFlLineEnds;
+    VclBox*             m_pBoxArrowStyles;
+    LineEndLB*          m_pLbStartStyle;
+    VclBox*             m_pBoxStart;
+    MetricField*        m_pMtrStartWidth;
+    TriStateBox*        m_pTsbCenterStart;
+    VclBox*             m_pBoxEnd;
+    LineEndLB*          m_pLbEndStyle;
+    MetricField*        m_pMtrEndWidth;
+    TriStateBox*        m_pTsbCenterEnd;
+    CheckBox*           m_pCbxSynchronize;
+    SvxXLinePreview*    m_pCtlPreview;
 
     // #116827#
-    FixedLine           maFLEdgeStyle;
-    FixedText           maFTEdgeStyle;
-    LineEndLB           maLBEdgeStyle;
+    VclFrame*           m_pFLEdgeStyle;
+    VclGrid*            m_pGridEdgeCaps;
+    ListBox*            m_pLBEdgeStyle;
 
     // LineCaps
-    FixedText           maFTCapStyle;
-    LineEndLB           maLBCapStyle;
+    ListBox*             m_pLBCapStyle;
 
     //#58425# symbols on a line (e. g. StarChart) ->
     /** a list of symbols to be shown in menu. Symbol at position SID_ATTR_SYMBOLTYPE is to be shown in preview.
@@ -129,13 +125,12 @@ private:
     long                nSymbolType;
     /// attributes for the shown symbols; only necessary if not equal to line properties
     SfxItemSet*         pSymbolAttr;
-    FixedLine           aFlSymbol;
-    MenuButton          aSymbolMB;
-    FixedText           aSymbolWidthFT;
-    MetricField         aSymbolWidthMF;
-    FixedText           aSymbolHeightFT;
-    MetricField         aSymbolHeightMF;
-    CheckBox            aSymbolRatioCB;
+    VclFrame*           m_pFlSymbol;
+    VclGrid*            m_pGridIconSize;
+    MenuButton*         m_pSymbolMB;
+    MetricField*        m_pSymbolWidthMF;
+    MetricField*        m_pSymbolHeightMF;
+    CheckBox*           m_pSymbolRatioCB;
     std::vector<OUString> aGrfNames;
     SvxBmpItemInfoList  aGrfBrushItems;
     sal_Bool            bLastWidthModified;
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index b6ffdaa0dd41..d11061d014af 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -246,7 +246,7 @@
 
 #define HID_TPSHADOW_CTRL "CUI_HID_TPSHADOW_CTRL"
 #define HID_LINE_ENDDEF "CUI_HID_LINE_ENDDEF"
-#define HID_LINE_LINE "CUI_HID_LINE_LINE"
+
 #define HID_LINE_DEF "CUI_HID_LINE_DEF"
 #define HID_SPELLDLG_SETWORD "CUI_HID_SPELLDLG_SETWORD"
 #define HID_PAGE_TEXTATTR "CUI_HID_PAGE_TEXTATTR"