modern .ui widgetlayout for optgrid

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

1 files changed, 19 insertions, 36 deletions

diff --git a/include/svx/optgrid.hxx b/include/svx/optgrid.hxx
index 777a61a1fde4..9da549332e2a 100644
--- a/include/svx/optgrid.hxx
+++ b/include/svx/optgrid.hxx
@@ -111,46 +111,29 @@ public:
     virtual int         DeactivatePage( SfxItemSet* pSet );
 
 private:
-    CheckBox            aCbxUseGridsnap;
-    CheckBox            aCbxGridVisible;
+    CheckBox*            pCbxUseGridsnap;
+    CheckBox*            pCbxGridVisible;
 
-    FixedLine           aFlResolution;
-    FixedText           aFtDrawX;
-    MetricField         aMtrFldDrawX;
-    FixedText           aFtDrawY;
-    MetricField         aMtrFldDrawY;
+    MetricField*         pMtrFldDrawX;
+    MetricField*         pMtrFldDrawY;
 
-    FixedLine           aFlDivision;
-    FixedText           aFtDivisionX;
-    NumericField        aNumFldDivisionX;
-    FixedText           aDivisionPointX;
-
-    FixedText           aFtDivisionY;
-    NumericField        aNumFldDivisionY;
-    FixedText           aDivisionPointY;
-
-    CheckBox            aCbxSynchronize;
-    FixedLine           aGrpDrawGrid;
+    NumericField*        pNumFldDivisionX;
+    NumericField*        pNumFldDivisionY;
 
+    CheckBox*            pCbxSynchronize;
 protected:
-    //these controls are used in draw and impress
-    FixedLine       aGrpSnap;
-    CheckBox        aCbxSnapHelplines;
-    CheckBox        aCbxSnapBorder;
-    CheckBox        aCbxSnapFrame;
-    CheckBox        aCbxSnapPoints;
-    FixedText       aFtSnapArea;
-    MetricField     aMtrFldSnapArea;
-
-    FixedLine       aSeparatorFL;
-
-    FixedLine       aGrpOrtho;
-    CheckBox        aCbxOrtho;
-    CheckBox        aCbxBigOrtho;
-    CheckBox        aCbxRotate;
-    MetricField     aMtrFldAngle;
-    FixedText       aFtBezAngle;
-    MetricField     aMtrFldBezAngle;
+     //these controls are used in draw and impress
+     CheckBox*        pCbxSnapHelplines;
+     CheckBox*        pCbxSnapBorder;
+     CheckBox*        pCbxSnapFrame;
+     CheckBox*        pCbxSnapPoints;
+     MetricField*     pMtrFldSnapArea;
+
+     CheckBox*        pCbxOrtho;
+     CheckBox*        pCbxBigOrtho;
+     CheckBox*        pCbxRotate;
+     MetricField*     pMtrFldAngle;
+     MetricField*     pMtrFldBezAngle;
 
 private:
     sal_Bool                bAttrModified;