expand scheme to share sizes for paragraph dialog preview widgets

Change-Id: Id1ded6828468ff956c83eb57f1da62fd80761b5d

3 files changed, 81 insertions, 110 deletions

diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index e17f61cb175e..a0844d46894b 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -19,6 +19,7 @@
 
 #include <svl/style.hxx>
 #include <sfx2/app.hxx>
+#include <sfx2/dialoghelper.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/module.hxx>
 #include <vcl/mnemonic.hxx>
@@ -634,34 +635,6 @@ int SvxStdParagraphTabPage::DeactivatePage( SfxItemSet* _pSet )
     return LEAVE_PAGE;
 }
 
-namespace
-{
-    //these tab pages both have the same basic layout with a preview on the
-    //right, get both of their non-preview areas to request the same size
-    //so that the preview appears in the same place in each one so
-    //flipping between tabs isn't distracting as it jumps around
-    void setPreviewsToSamePlace(Window *pParent, VclBuilderContainer *pPage)
-    {
-        for (Window* pChild = pParent->GetWindow(WINDOW_FIRSTCHILD); pChild;
-            pChild = pChild->GetWindow(WINDOW_NEXT))
-        {
-            VclBuilderContainer *pPeer = dynamic_cast<VclBuilderContainer*>(pChild);
-            if (pPeer != pPage && pPeer->hasBuilder())
-            {
-                Window *pOtherGrid = pPeer->get<Window>("maingrid");
-                Window *pOurGrid = pPage->get<Window>("maingrid");
-                if (pOtherGrid && pOurGrid)
-                {
-                    boost::shared_ptr< VclSizeGroup > xGroup(new VclSizeGroup);
-                    pOtherGrid->add_to_size_group(xGroup);
-                    pOurGrid->add_to_size_group(xGroup);
-                }
-            }
-        }
-    }
-}
-
-
 // -----------------------------------------------------------------------
 
 SvxStdParagraphTabPage::SvxStdParagraphTabPage( Window* pParent,  const SfxItemSet& rAttr ) :
diff --git a/cui/uiconfig/ui/paragalignpage.ui b/cui/uiconfig/ui/paragalignpage.ui
index 68238bc7919e..920832d7e61b 100644
--- a/cui/uiconfig/ui/paragalignpage.ui
+++ b/cui/uiconfig/ui/paragalignpage.ui
@@ -2,6 +2,62 @@
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
+  <object class="GtkListStore" id="liststoreLB_LASTLINE">
+    <columns>
+      <!-- column-name gchararray1 -->
+      <column type="gchararray"/>
+      <!-- column-name guint1 -->
+      <column type="guint"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Default</col>
+        <col id="1">0</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Left</col>
+        <col id="1">1</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Centered</col>
+        <col id="1">2</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Justified</col>
+        <col id="1">3</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="liststoreLB_VERTALIGN">
+    <columns>
+      <!-- column-name gchararray1 -->
+      <column type="gchararray"/>
+      <!-- column-name guint1 -->
+      <column type="guint"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Automatic</col>
+        <col id="1">0</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Base line</col>
+        <col id="1">1</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Top</col>
+        <col id="1">2</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Middle</col>
+        <col id="1">3</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Bottom</col>
+        <col id="1">4</col>
+      </row>
+    </data>
+  </object>
   <object class="GtkGrid" id="ParaAlignPage">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -14,17 +70,15 @@
       <object class="GtkAlignment" id="alignment4">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_top">24</property>
         <property name="hexpand">True</property>
         <property name="vexpand">True</property>
+        <property name="top_padding">24</property>
         <child>
           <object class="svxlo-SvxParaPrevWindow" id="drawingareaWN_EXAMPLE">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">center</property>
             <property name="valign">start</property>
-            <property name="hexpand">True</property>
-            <property name="vexpand">True</property>
             <child internal-child="accessible">
               <object class="AtkObject" id="drawingareaWN_EXAMPLE-atkobject">
                 <property name="AtkObject::accessible-name" translatable="yes">Example</property>
@@ -426,62 +480,6 @@
       </packing>
     </child>
   </object>
-  <object class="GtkListStore" id="liststoreLB_LASTLINE">
-    <columns>
-      <!-- column-name gchararray1 -->
-      <column type="gchararray"/>
-      <!-- column-name guint1 -->
-      <column type="guint"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes">Default</col>
-        <col id="1">0</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Left</col>
-        <col id="1">1</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Centered</col>
-        <col id="1">2</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Justified</col>
-        <col id="1">3</col>
-      </row>
-    </data>
-  </object>
-  <object class="GtkListStore" id="liststoreLB_VERTALIGN">
-    <columns>
-      <!-- column-name gchararray1 -->
-      <column type="gchararray"/>
-      <!-- column-name guint1 -->
-      <column type="guint"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes">Automatic</col>
-        <col id="1">0</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Base line</col>
-        <col id="1">1</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Top</col>
-        <col id="1">2</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Middle</col>
-        <col id="1">3</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Bottom</col>
-        <col id="1">4</col>
-      </row>
-    </data>
-  </object>
   <object class="GtkSizeGroup" id="sizegroup1">
     <widgets>
       <widget name="box1"/>
diff --git a/cui/uiconfig/ui/paraindentspacing.ui b/cui/uiconfig/ui/paraindentspacing.ui
index 82df1ba9e41b..f38dc874ae86 100644
--- a/cui/uiconfig/ui/paraindentspacing.ui
+++ b/cui/uiconfig/ui/paraindentspacing.ui
@@ -2,6 +2,28 @@
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
+  <object class="GtkAdjustment" id="adjustmentED_DIST">
+    <property name="upper">9999</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustmentED_LINEDISTMETRIC">
+    <property name="upper">9999</property>
+    <property name="step_increment">10</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustmentLINEDISTPERCENT">
+    <property name="lower">50</property>
+    <property name="upper">200</property>
+    <property name="value">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustmentspinED_INDENT">
+    <property name="upper">9999</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
   <object class="GtkGrid" id="ParaIndentSpacing">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -14,9 +36,9 @@
       <object class="GtkAlignment" id="alignment5">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_top">24</property>
         <property name="hexpand">True</property>
         <property name="vexpand">True</property>
+        <property name="top_padding">24</property>
         <child>
           <object class="svxlo-SvxParaPrevWindow" id="drawingareaWN_EXAMPLE">
             <property name="visible">True</property>
@@ -504,28 +526,6 @@
       </packing>
     </child>
   </object>
-  <object class="GtkAdjustment" id="adjustmentED_DIST">
-    <property name="upper">9999</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkAdjustment" id="adjustmentED_LINEDISTMETRIC">
-    <property name="upper">9999</property>
-    <property name="step_increment">10</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkAdjustment" id="adjustmentLINEDISTPERCENT">
-    <property name="lower">50</property>
-    <property name="upper">200</property>
-    <property name="value">100</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkAdjustment" id="adjustmentspinED_INDENT">
-    <property name="upper">9999</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
   <object class="GtkListStore" id="liststoreLB_LINEDIST">
     <columns>
       <!-- column-name gchararray1 -->