little tweak to get the two hidden frames shown in draw/impress

Change-Id: Icd4b81749a369828c45101b1b82f4e3a5e8ebb9a

include/svx/optgrid.hxx

@@ -122,18 +122,19 @@ private:
 
     CheckBox*            pCbxSynchronize;
 protected:
-     //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;
+    //these controls are used in draw and impress
+    VclContainer*    pSnapFrames;
+    CheckBox*        pCbxSnapHelplines;
+    CheckBox*        pCbxSnapBorder;
+    CheckBox*        pCbxSnapFrame;
+    CheckBox*        pCbxSnapPoints;
+    MetricField*     pMtrFldSnapArea;
+
+    CheckBox*        pCbxOrtho;
+    CheckBox*        pCbxBigOrtho;
+    CheckBox*        pCbxRotate;
+    MetricField*     pMtrFldAngle;
+    MetricField*     pMtrFldBezAngle;
 
 private:
     sal_Bool                bAttrModified;

sd/source/ui/dlg/tpoption.cxx

@@ -49,16 +49,7 @@ using namespace ::com::sun::star::uno;
 SdTpOptionsSnap::SdTpOptionsSnap( Window* pParent, const SfxItemSet& rInAttrs  ) :
         SvxGridTabPage(pParent, rInAttrs)
 {
-    pCbxSnapHelplines->Show();
-    pCbxSnapBorder->Show();
-    pCbxSnapFrame->Show();
-    pCbxSnapPoints->Show();
-    pMtrFldSnapArea->Show();
-    pCbxOrtho->Show();
-    pCbxBigOrtho->Show();
-    pCbxRotate->Show();
-    pMtrFldAngle->Show();
-    pMtrFldBezAngle->Show();
+    pSnapFrames->Show();
 }
 
 // -----------------------------------------------------------------------

svx/inc/helpid.hrc

@@ -143,7 +143,6 @@
 #define HID_MNU_ZOOM_OPTIMAL                                  "SVX_HID_MNU_ZOOM_OPTIMAL"
 #define HID_MNU_ZOOM_PAGE_WIDTH                               "SVX_HID_MNU_ZOOM_PAGE_WIDTH"
 #define HID_MNU_ZOOM_WHOLE_PAGE                               "SVX_HID_MNU_ZOOM_WHOLE_PAGE"
-#define HID_OPTIONS_GRID                                      "SVX_HID_OPTIONS_GRID"
 #define HID_PASSWORD                                          "SVX_HID_PASSWORD"
 #define HID_POPUP_COLOR                                       "SVX_HID_POPUP_COLOR"
 #define HID_POPUP_COLOR_CTRL                                  "SVX_HID_POPUP_COLOR_CTRL"

svx/source/dialog/optgrid.cxx

@@ -139,6 +139,7 @@ SvxGridTabPage::SvxGridTabPage( Window* pParent, const SfxItemSet& rCoreSet) :
     get(pNumFldDivisionY,"numflddivisiony");
     get(pCbxSynchronize,"synchronize");
 
+    get(pSnapFrames,"snapframes");
     get(pCbxSnapHelplines,"snaphelplines");
     get(pCbxSnapBorder,"snapborder");
     get(pCbxSnapFrame,"snapframe");

svx/uiconfig/ui/optgridpage.ui

@@ -31,6 +31,7 @@
   <object class="GtkBox" id="OptGridPage">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
+    <property name="border_width">6</property>
     <property name="orientation">vertical</property>
     <property name="spacing">12</property>
     <child>
@@ -404,14 +405,15 @@
       </packing>
     </child>
     <child>
-      <object class="GtkBox" id="box3">
-        <property name="sensitive">False</property>
+      <object class="GtkBox" id="snapframes">
         <property name="can_focus">False</property>
+        <property name="no_show_all">True</property>
         <property name="spacing">12</property>
         <child>
           <object class="GtkFrame" id="frame4">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="hexpand">True</property>
             <property name="label_xalign">0</property>
             <property name="shadow_type">none</property>
             <child>
@@ -560,6 +562,7 @@
           <object class="GtkFrame" id="frame5">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="hexpand">True</property>
             <property name="label_xalign">0</property>
             <property name="shadow_type">none</property>
             <child>
@@ -621,6 +624,9 @@
                             <property name="invisible_char">●</property>
                             <property name="adjustment">adjustment4</property>
                             <property name="digits">2</property>
+                            <accessibility>
+                              <relation type="labelled-by" target="rotate"/>
+                            </accessibility>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
@@ -638,6 +644,9 @@
                             <property name="use_underline">True</property>
                             <property name="xalign">0</property>
                             <property name="draw_indicator">True</property>
+                            <accessibility>
+                              <relation type="label-for" target="mtrfldangle:0.00 degrees"/>
+                            </accessibility>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
@@ -714,4 +723,18 @@
       </packing>
     </child>
   </object>
+  <object class="GtkSizeGroup" id="sizegroup1">
+    <property name="ignore_hidden">True</property>
+    <widgets>
+      <widget name="frame2"/>
+      <widget name="frame4"/>
+    </widgets>
+  </object>
+  <object class="GtkSizeGroup" id="sizegroup2">
+    <property name="ignore_hidden">True</property>
+    <widgets>
+      <widget name="frame3"/>
+      <widget name="frame5"/>
+    </widgets>
+  </object>
 </interface>