Convert Paragraph Alignment & Indent to Widget UI

Conver Paragraph Alignment and Indent & Spacing to widget UI.

Change-Id: Ib3b7d76a63bd677d5d94f7385bbf589f18eceeda
Reviewed-on: https://gerrit.libreoffice.org/4047
Reviewed-by: Olivier Hallot <olivier.hallot@edx.srv.br>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

cui/UIConfig_cui.mk

@@ -58,6 +58,8 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
 	cui/uiconfig/ui/optuserpage \
 	cui/uiconfig/ui/optviewpage \
 	cui/uiconfig/ui/pageformatpage \
+        cui/uiconfig/ui/paragalignpage \
+        cui/uiconfig/ui/paraindentspacing \
 	cui/uiconfig/ui/pastespecial \
 	cui/uiconfig/ui/personalization_tab \
 	cui/uiconfig/ui/pickbulletpage \

cui/source/inc/paragrph.hxx

@@ -54,46 +54,39 @@ class SvxStdParagraphTabPage: public SfxTabPage
 private:
     SvxStdParagraphTabPage( Window* pParent, const SfxItemSet& rSet );
 
-    FixedLine               aIndentFrm;
     // indention
-    FixedText               aLeftLabel;
+    SvxRelativeField*       m_pLeftIndent;
-    SvxRelativeField        aLeftIndent;
 
-    FixedText               aRightLabel;
+    FixedText*              m_pRightLabel;
-    SvxRelativeField        aRightIndent;
+    SvxRelativeField*       m_pRightIndent;
 
-    FixedText               aFLineLabel;
+    FixedText*              m_pFLineLabel;
-    SvxRelativeField        aFLineIndent;
+    SvxRelativeField*       m_pFLineIndent;
-    CheckBox                aAutoCB;
+    CheckBox*               m_pAutoCB;
-
-    FixedLine               aDistFrm;
 
     // distance
-    FixedText               aTopLabel;
+    SvxRelativeField*       m_pTopDist;
-    SvxRelativeField        aTopDist;
+    SvxRelativeField*       m_pBottomDist;
-    FixedText               aBottomLabel;
+    CheckBox*               m_pContextualCB;
-    SvxRelativeField        aBottomDist;
-    CheckBox                aContextualCB;
 
     // line spacing
-    FixedLine               aLineDistFrm;
+    ListBox*                m_pLineDist;
-    ListBox                 aLineDist;
+    FixedText*              m_pLineDistAtLabel;
-    FixedText               aLineDistAtLabel;
+    MetricField*            m_pLineDistAtPercentBox;
-    MetricField             aLineDistAtPercentBox;
+    MetricField*            m_pLineDistAtMetricBox;
-    MetricField             aLineDistAtMetricBox;
+    FixedText*              m_pAbsDist;
-    String                  sAbsDist;
+    OUString                sAbsDist;
-    SvxParaPrevWindow       aExampleWin;
+    SvxParaPrevWindow*      m_pExampleWin;
 
     // only writer
-    FixedLine               aRegisterFL;
+    VclFrame*               m_pRegisterFL;
-    CheckBox                aRegisterCB;
+    CheckBox*               m_pRegisterCB;
 
-    Edit*                   pActLineDistFld;
     long                    nAbst;
     long                    nWidth;
     long                    nMinFixDist;
-    sal_Bool                    bRelativeMode;
+    sal_Bool                bRelativeMode;
-    sal_Bool                    bNegativeIndents;
+    sal_Bool                bNegativeIndents;
 
     void                    SetLineSpacing_Impl( const SvxLineSpacingItem& rAttr );
     void                    Init_Impl();
@@ -106,13 +99,14 @@ private:
 protected:
     virtual int             DeactivatePage( SfxItemSet* pSet = 0 );
 
+
 public:
     DECL_LINK(ELRLoseFocusHdl, void *);
 
     static SfxTabPage*      Create( Window* pParent, const SfxItemSet& rSet );
-    static sal_uInt16*          GetRanges();
+    static sal_uInt16*      GetRanges();
 
-    virtual sal_Bool            FillItemSet( SfxItemSet& rSet );
+    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
     virtual void            Reset( const SfxItemSet& rSet );
 
 
@@ -124,6 +118,8 @@ public:
     void                    EnableAbsLineDist(long nMinTwip);
     void                    EnableNegativeMode();
     virtual void            PageCreated(SfxAllItemSet aSet);
+
+    virtual                ~SvxStdParagraphTabPage();
 };
 
 // class SvxParaAlignTabPage ------------------------------------------------
@@ -133,28 +129,27 @@ class SvxParaAlignTabPage : public SfxTabPage
     using TabPage::DeactivatePage;
 
     // alignment
-    FixedLine               aAlignFrm;
+    RadioButton*             m_pLeft;
-    RadioButton             aLeft;
+    RadioButton*             m_pRight;
-    RadioButton             aRight;
+    RadioButton*             m_pCenter;
-    RadioButton             aCenter;
+    RadioButton*             m_pJustify;
-    RadioButton             aJustify;
+    FixedText*               m_pLeftBottom;
-    FixedText               aLastLineFT;
+    FixedText*               m_pRightTop;
-    ListBox                 aLastLineLB;
-    CheckBox                aExpandCB;
 
-    CheckBox                aSnapToGridCB;
+    FixedText*               m_pLastLineFT;
+    ListBox*                 m_pLastLineLB;
+    CheckBox*                m_pExpandCB;
+
+    CheckBox*                m_pSnapToGridCB;
 
     //preview
-    SvxParaPrevWindow       aExampleWin;
+    SvxParaPrevWindow*       m_pExampleWin;
     //vertical alignment
-    FixedLine               aVertAlignFL;
+    VclFrame*                m_pVertAlignFL;
+    ListBox*                 m_pVertAlignLB;
 
-    FixedText               aVertAlignFT;
+    VclFrame*                m_pPropertiesFL;
-    ListBox                 aVertAlignLB;
+    svx::FrameDirectionListBox*  m_pTextDirectionLB;
-
-    FixedLine                   aPropertiesFL;
-    FixedText                   aTextDirectionFT;
-    svx::FrameDirectionListBox  aTextDirectionLB;
 
     DECL_LINK(AlignHdl_Impl, void *);
     DECL_LINK(LastLineHdl_Impl, void *);
@@ -170,9 +165,9 @@ protected:
 
 public:
     static SfxTabPage*      Create( Window* pParent, const SfxItemSet& rSet );
-    static sal_uInt16*          GetRanges();
+    static sal_uInt16*      GetRanges();
 
-    virtual sal_Bool            FillItemSet( SfxItemSet& rSet );
+    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
     virtual void            Reset( const SfxItemSet& rSet );
 
     void                    EnableJustifyExt();

cui/source/tabpages/paragrph.hrc

@@ -21,55 +21,6 @@
 
 // StandardTabPage ----------------------------------------------------------
 
-#define FT_LEFTINDENT           10
-#define ED_LEFTINDENT           11
-#define FT_FLINEINDENT          12
-#define ED_FLINEINDENT          13
-#define FT_RIGHTINDENT          14
-#define ED_RIGHTINDENT          15
-#define FL_INDENT                       16
-
-#define FT_TOPDIST                      20
-#define ED_TOPDIST                      21
-#define FT_BOTTOMDIST           22
-#define ED_BOTTOMDIST           23
-#define FL_DIST                         24
-#define CB_CONTEXTUALSPACING            25
-
-#define BTN_LEFTALIGN           30
-#define BTN_RIGHTALIGN          31
-#define BTN_CENTERALIGN         32
-#define BTN_JUSTIFYALIGN        33
-#define FL_ALIGN                        34
-#define FL_VERTALIGN                    35
-#define LB_VERTALIGN                    36
-#define CB_SNAP                         38
-#define FT_VERTALIGN                    39
-
-
-#define LB_LINEDIST                     40
-#define FT_LINEDIST                     41
-#define ED_LINEDISTPERCENT      42
-#define ED_LINEDISTMETRIC       43
-#define FL_LINEDIST                     44
-#define WN_EXAMPLE                      46
-
-#define CB_AUTO                         48
-#define FT_LASTLINE                     49
-#define LB_LASTLINE                     50
-#define CB_EXPAND                       51
-#define ST_LINEDIST_ABS                 52
-#define ST_LEFTALIGN_ASIAN              53
-#define ST_RIGHTALIGN_ASIAN             54
-
-
-#define CB_REGISTER                     84
-#define FL_REGISTER                     85
-#define FL_PROPERTIES                   90
-#define FT_TEXTDIRECTION                91
-#define LB_TEXTDIRECTION                92
-
-
 #define STR_EXAMPLE                     5010
 #define STR_PAGE_STYLE                  5011
 #endif

cui/source/tabpages/paragrph.src

@@ -22,402 +22,6 @@
 #include "paragrph.hrc"
 #include <svx/dialogs.hrc>
 
- // RID_SVXPAGE_STD_PARAGRAPH ---------------------------------------------
-TabPage RID_SVXPAGE_STD_PARAGRAPH
-{
-    HelpId = HID_FORMAT_PARAGRAPH_STD ;
-    Hide = TRUE ;
-    Text [ en-US ] = "Indents and Spacing" ;
-    Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
-    FixedText FT_LEFTINDENT
-    {
-        Pos = MAP_APPFONT ( 12 , 16 ) ;
-        Size = MAP_APPFONT ( 120 , 8 ) ;
-        Left = TRUE ;
-        Text [ en-US ] = "Before text" ;
-    };
-    MetricField ED_LEFTINDENT
-    {
-        HelpID = "cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_LEFTINDENT";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 135 , 14 ) ;
-        Size = MAP_APPFONT ( 40 , 12 ) ;
-        Group = TRUE ;
-        Left = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Maximum = 9999 ;
-        DecimalDigits = 2 ;
-        Unit = FUNIT_CM ;
-        Last = 9999 ;
-        SpinSize = 10 ;
-    };
-    FixedText FT_RIGHTINDENT
-    {
-        Pos = MAP_APPFONT ( 12 , 32 ) ;
-        Size = MAP_APPFONT ( 120 , 8 ) ;
-        Left = TRUE ;
-        Text [ en-US ] = "After text" ;
-    };
-    MetricField ED_RIGHTINDENT
-    {
-        HelpID = "cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_RIGHTINDENT";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 135 , 30 ) ;
-        Size = MAP_APPFONT ( 40 , 12 ) ;
-        Group = TRUE ;
-        Left = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Maximum = 9999 ;
-        DecimalDigits = 2 ;
-        Unit = FUNIT_CM ;
-        Last = 9999 ;
-        SpinSize = 10 ;
-    };
-    FixedText FT_FLINEINDENT
-    {
-        Pos = MAP_APPFONT ( 12 , 48 ) ;
-        Size = MAP_APPFONT ( 120 , 8 ) ;
-        Text [ en-US ] = "~First line" ;
-        Left = TRUE ;
-    };
-    MetricField ED_FLINEINDENT
-    {
-        HelpID = "cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_FLINEINDENT";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 135 , 46 ) ;
-        Size = MAP_APPFONT ( 40 , 12 ) ;
-        Group = TRUE ;
-        Left = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Minimum = -9999 ;
-        Maximum = 9999 ;
-        DecimalDigits = 2 ;
-        Unit = FUNIT_CM ;
-        First = -9999 ;
-        Last = 9999 ;
-        SpinSize = 10 ;
-    };
-    CheckBox CB_AUTO
-    {
-        HelpID = "cui:CheckBox:RID_SVXPAGE_STD_PARAGRAPH:CB_AUTO";
-        Pos = MAP_APPFONT ( 12 , 61 ) ;
-        Size = MAP_APPFONT ( 120 , 10 ) ;
-        Hide = TRUE ;
-        Text [ en-US ] = "~Automatic" ;
-    };
-    FixedLine FL_INDENT
-    {
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 173 , 8 ) ;
-        Text [ en-US ] = "Indent" ;
-    };
-    FixedText FT_TOPDIST
-    {
-        Pos = MAP_APPFONT ( 12 , 90 ) ;
-        Size = MAP_APPFONT ( 120 , 8 ) ;
-        Left = TRUE ;
-        Text [ en-US ] = "Ab~ove paragraph" ;
-    };
-    MetricField ED_TOPDIST
-    {
-        HelpID = "cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_TOPDIST";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 135 , 88 ) ;
-        Size = MAP_APPFONT ( 40 , 12 ) ;
-        Group = TRUE ;
-        Left = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Maximum = 9999 ;
-        DecimalDigits = 2 ;
-        Unit = FUNIT_CM ;
-        Last = 9999 ;
-        SpinSize = 10 ;
-    };
-    FixedText FT_BOTTOMDIST
-    {
-        Pos = MAP_APPFONT ( 12 , 104 ) ;
-        Size = MAP_APPFONT ( 120 , 8 ) ;
-        Left = TRUE ;
-        Text [ en-US ] = "Below paragraph" ;
-    };
-    MetricField ED_BOTTOMDIST
-    {
-        HelpID = "cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_BOTTOMDIST";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 135 , 104 ) ;
-        Size = MAP_APPFONT ( 40 , 12 ) ;
-        Group = TRUE ;
-        Left = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Maximum = 9999 ;
-        DecimalDigits = 2 ;
-        Unit = FUNIT_CM ;
-        Last = 9999 ;
-        SpinSize = 10 ;
-    };
-    CheckBox CB_CONTEXTUALSPACING
-    {
-        Pos = MAP_APPFONT ( 12 , 118 ) ;
-        Size = MAP_APPFONT ( 173 , 10 ) ;
-        Hide = TRUE ;
-        Text [ en-US ] = "Don't add space between paragraphs of the same style" ;
-    };
-    FixedLine FL_DIST
-    {
-        Pos = MAP_APPFONT ( 6 , 77 ) ;
-        Size = MAP_APPFONT ( 173 , 8 ) ;
-        Text [ en-US ] = "Spacing" ;
-    };
-    ListBox LB_LINEDIST
-    {
-        HelpID = "cui:ListBox:RID_SVXPAGE_STD_PARAGRAPH:LB_LINEDIST";
-        Pos = MAP_APPFONT ( 12 , 147 ) ;
-        Size = MAP_APPFONT ( 55 , 72 ) ;
-        DropDown = TRUE ;
-        StringList [ en-US ] =
-        {
-            < "Single" ; Default ; > ;
-            < "1.5 lines" ; Default ; > ;
-            < "Double" ; Default ; > ;
-            < "Proportional" ; Default ; > ;
-            < "At least" ; Default ; > ;
-            < "Leading" ; Default ; > ;
-        };
-    };
-    String ST_LINEDIST_ABS
-    {
-        Text [ en-US ] = "Fixed" ;
-    };
-    FixedText FT_LINEDIST
-    {
-        Disable = TRUE ;
-        Pos = MAP_APPFONT ( 70 , 149 ) ;
-        Size = MAP_APPFONT ( 60 , 8 ) ;
-        Text [ en-US ] = "of" ;
-        Left = TRUE ;
-    };
-    MetricField ED_LINEDISTPERCENT
-    {
-        HelpID = "cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_LINEDISTPERCENT";
-        Disable = TRUE ;
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 135 , 147 ) ;
-        Size = MAP_APPFONT ( 40 , 12 ) ;
-        Group = TRUE ;
-        Left = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Minimum = 50 ;
-        Maximum = 200 ;
-        Value = 100 ;
-        Unit = FUNIT_CUSTOM ;
-        CustomUnitText = "%" ;
-        First = 50 ;
-        Last = 200 ;
-        SpinSize = 1 ;
-    };
-    MetricField ED_LINEDISTMETRIC
-    {
-        HelpID = "cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_LINEDISTMETRIC";
-        Disable = TRUE ;
-        Border = TRUE ;
-        Hide = TRUE ;
-        Pos = MAP_APPFONT ( 135 , 147 ) ;
-        Size = MAP_APPFONT ( 40 , 12 ) ;
-        Group = TRUE ;
-        Left = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Maximum = 9999 ;
-        DecimalDigits = 2 ;
-        Unit = FUNIT_CM ;
-        Last = 9999 ;
-        SpinSize = 10 ;
-    };
-    FixedLine FL_LINEDIST
-    {
-        Pos = MAP_APPFONT ( 6 , 136 ) ;
-        Size = MAP_APPFONT ( 173 , 8 ) ;
-        Text [ en-US ] = "Line spacing" ;
-    };
-    Window WN_EXAMPLE
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 185 , 7 ) ;
-        Size = MAP_APPFONT ( 68 , 112 ) ;
-    };
-    CheckBox CB_REGISTER
-    {
-        HelpID = "cui:CheckBox:RID_SVXPAGE_STD_PARAGRAPH:CB_REGISTER";
-        Pos = MAP_APPFONT ( 12 , 176 ) ;
-        Size = MAP_APPFONT ( 120 , 10 ) ;
-        Hide = TRUE ;
-        Text [ en-US ] = "A~ctivate" ;
-    };
-    FixedLine FL_REGISTER
-    {
-        Pos = MAP_APPFONT ( 6 , 165 ) ;
-        Size = MAP_APPFONT ( 173 , 8 ) ;
-        Hide = TRUE ;
-        Text [ en-US ] = "Register-true" ;
-    };
-
-};
- // RID_SVXPAGE_ALIGN_PARAGRAPH ---------------------------------------------
-TabPage RID_SVXPAGE_ALIGN_PARAGRAPH
-{
-    HelpId = HID_FORMAT_PARAGRAPH_ALIGN ;
-    Hide = TRUE ;
-    Text [ en-US ] = "Alignment" ;
-    Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
-    FixedLine FL_ALIGN
-    {
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 173 , 8 ) ;
-        Text [ en-US ] = "Options" ;
-        Group = TRUE ;
-    };
-    RadioButton BTN_LEFTALIGN
-    {
-        HelpID = "cui:RadioButton:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_LEFTALIGN";
-        Pos = MAP_APPFONT ( 12 , 14 ) ;
-        Size = MAP_APPFONT ( 161 , 10 ) ;
-        Text [ en-US ] = "~Left" ;
-        Group = TRUE ;
-    };
-    RadioButton BTN_RIGHTALIGN
-    {
-        HelpID = "cui:RadioButton:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_RIGHTALIGN";
-        Pos = MAP_APPFONT ( 12 , 28 ) ;
-        Size = MAP_APPFONT ( 161 , 10 ) ;
-        Text [ en-US ] = "Righ~t" ;
-    };
-    RadioButton BTN_CENTERALIGN
-    {
-        HelpID = "cui:RadioButton:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_CENTERALIGN";
-        Pos = MAP_APPFONT ( 12 , 42 ) ;
-        Size = MAP_APPFONT ( 161 , 10 ) ;
-        Text [ en-US ] = "~Center" ;
-    };
-    RadioButton BTN_JUSTIFYALIGN
-    {
-        HelpID = "cui:RadioButton:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_JUSTIFYALIGN";
-        Pos = MAP_APPFONT ( 12 , 56 ) ;
-        Size = MAP_APPFONT ( 161 , 10 ) ;
-        Text [ en-US ] = "Justified" ;
-    };
-    String ST_LEFTALIGN_ASIAN
-    {
-        Text [ en-US ] = "~Left/Top" ;
-    };
-    String ST_RIGHTALIGN_ASIAN
-    {
-        Text [ en-US ] = "Righ~t/Bottom" ;
-    };
-    FixedText FT_LASTLINE
-    {
-        Pos = MAP_APPFONT ( 20 , 72 ) ;
-        Size = MAP_APPFONT ( 80 , 8 ) ;
-        Hide = TRUE ;
-        Text [ en-US ] = "~Last line" ;
-    };
-    ListBox LB_LASTLINE
-    {
-        HelpID = "cui:ListBox:RID_SVXPAGE_ALIGN_PARAGRAPH:LB_LASTLINE";
-        Pos = MAP_APPFONT ( 105 , 70 ) ;
-        Size = MAP_APPFONT ( 70 , 50 ) ;
-        DropDown = TRUE ;
-        Hide = TRUE ;
-        StringList [ en-US ] =
-        {
-            < "Default" ; Default ; > ;
-            < "Left" ; Default ; > ;
-            < "Centered" ; Default ; > ;
-            < "Justified"; Default; > ;
-        };
-    };
-    CheckBox CB_EXPAND
-    {
-        HelpID = "cui:CheckBox:RID_SVXPAGE_ALIGN_PARAGRAPH:CB_EXPAND";
-        Pos = MAP_APPFONT ( 20 , 86 ) ;
-        Size = MAP_APPFONT ( 153 , 10 ) ;
-        Hide = TRUE ;
-        Text [ en-US ] = "~Expand single word" ;
-    };
-    CheckBox CB_SNAP
-    {
-        HelpID = "cui:CheckBox:RID_SVXPAGE_ALIGN_PARAGRAPH:CB_SNAP";
-        Pos = MAP_APPFONT ( 20 , 100 ) ;
-        Size = MAP_APPFONT ( 153 , 10 ) ;
-        Hide = TRUE ;
-        Text [ en-US ] = "Snap to text grid (if active)";
-    };
-    Window WN_EXAMPLE
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 185 , 7 ) ;
-        Size = MAP_APPFONT ( 68 , 112 ) ;
-    };
-    FixedLine FL_VERTALIGN
-    {
-        Pos = MAP_APPFONT ( 6 , 122 ) ;
-        Size = MAP_APPFONT ( 173 , 8 ) ;
-        Hide = TRUE;
-        Text [ en-US ] = "Text-to-text";
-    };
-    FixedText FT_VERTALIGN
-    {
-        Pos = MAP_APPFONT ( 12 , 135 ) ;
-        Size = MAP_APPFONT ( 90 , 8 ) ;
-        Hide = TRUE;
-        Text [ en-US ] = "~Alignment";
-    };
-    ListBox LB_VERTALIGN
-    {
-        HelpID = "cui:ListBox:RID_SVXPAGE_ALIGN_PARAGRAPH:LB_VERTALIGN";
-        Pos = MAP_APPFONT ( 105 , 133 ) ;
-        Size = MAP_APPFONT ( 70 , 50 ) ;
-        DropDown = TRUE ;
-        Hide = TRUE ;
-        StringList [ en-US ] =
-        {
-            < "Automatic" ; > ;
-            < "Base line" ; > ;
-            < "Top" ; > ;
-            < "Middle" ; > ;
-            < "Bottom" ; > ;
-        };
-    };
-    FixedLine   FL_PROPERTIES
-    {
-        Pos = MAP_APPFONT ( 6 , 154 ) ;
-        Size = MAP_APPFONT ( 248 , 8 ) ;
-        Hide = TRUE ;
-        Text [ en-US ] = "Properties";
-    };
-    FixedText   FT_TEXTDIRECTION
-    {
-        Pos = MAP_APPFONT ( 12 , 167 ) ;
-        Size = MAP_APPFONT ( 60 , 8 ) ;
-        Hide = TRUE ;
-        Text [ en-US ] = "Text ~direction";
-    };
-    ListBox LB_TEXTDIRECTION
-    {
-        HelpID = "cui:ListBox:RID_SVXPAGE_ALIGN_PARAGRAPH:LB_TEXTDIRECTION";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 105 , 165 ) ;
-        Size = MAP_APPFONT ( 146 , 50 ) ;
-        DropDown = TRUE ;
-        Hide = TRUE ;
-    };
-};
-
 String STR_EXAMPLE
 {
     Text [ en-US ] = "Example" ;

cui/uiconfig/ui/paragalignpage.ui

@@ -0,0 +1,484 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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">Right</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>
+    <property name="hexpand">True</property>
+    <property name="border_width">6</property>
+    <property name="row_spacing">12</property>
+    <property name="column_spacing">6</property>
+    <child>
+      <object class="GtkFrame" id="frame1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label_xalign">0</property>
+        <property name="shadow_type">none</property>
+        <child>
+          <object class="GtkAlignment" id="alignment1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="top_padding">6</property>
+            <property name="left_padding">12</property>
+            <child>
+              <object class="GtkBox" id="box1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="spacing">6</property>
+                <child>
+                  <object class="GtkGrid" id="gridOPTIONS">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="border_width">6</property>
+                    <child>
+                      <object class="GtkBox" id="boxALIGNMENT">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="orientation">vertical</property>
+                        <property name="spacing">6</property>
+                        <property name="homogeneous">True</property>
+                        <child>
+                          <object class="GtkRadioButton" id="radioBTN_LEFTALIGN">
+                            <property name="label" translatable="yes">_Left</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="xalign">0</property>
+                            <property name="active">True</property>
+                            <property name="draw_indicator">True</property>
+                            <property name="group">radioBTN_RIGHTALIGN</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkRadioButton" id="radioBTN_RIGHTALIGN">
+                            <property name="label" translatable="yes">_Right</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="xalign">0</property>
+                            <property name="draw_indicator">True</property>
+                            <property name="group">radioBTN_CENTERALIGN</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkRadioButton" id="radioBTN_CENTERALIGN">
+                            <property name="label" translatable="yes">_Center</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="receives_default">False</property>
+                            <property name="relief">none</property>
+                            <property name="use_underline">True</property>
+                            <property name="xalign">0</property>
+                            <property name="active">True</property>
+                            <property name="draw_indicator">True</property>
+                            <property name="group">radioBTN_JUSTIFYALIGN</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkRadioButton" id="radioBTN_JUSTIFYALIGN">
+                            <property name="label" translatable="yes">_Justified</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="xalign">0</property>
+                            <property name="active">True</property>
+                            <property name="draw_indicator">True</property>
+                            <property name="group">radioBTN_LEFTALIGN</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">3</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">0</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkBox" id="box5">
+                        <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">6</property>
+                        <property name="homogeneous">True</property>
+                        <child>
+                          <object class="GtkLabel" id="labelLB_LASTLINE">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="margin_left">15</property>
+                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes">_Last line:</property>
+                            <property name="use_underline">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="checkCB_EXPAND">
+                            <property name="label" translatable="yes">_Expand single word</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="receives_default">False</property>
+                            <property name="margin_left">15</property>
+                            <property name="relief">none</property>
+                            <property name="use_underline">True</property>
+                            <property name="xalign">0</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="checkCB_SNAP">
+                            <property name="label" translatable="yes">_Snap to text grid (if active)</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="receives_default">False</property>
+                            <property name="margin_left">15</property>
+                            <property name="use_underline">True</property>
+                            <property name="xalign">0</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">1</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkBox" id="box6">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="orientation">vertical</property>
+                        <child>
+                          <object class="GtkComboBox" id="comboLB_LASTLINE">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="model">liststoreLB_LASTLINE</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="labelST_RIGHTALIGN_ASIAN">
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">Righ_t/Bottom</property>
+                            <property name="use_underline">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="labelST_LEFTALIGN_ASIAN">
+                            <property name="can_focus">False</property>
+                            <property name="xpad">5</property>
+                            <property name="label" translatable="yes">_Left/Top</property>
+                            <property name="use_underline">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">1</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <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">center</property>
+                    <property name="hexpand">True</property>
+                    <property name="vexpand">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child type="label">
+          <object class="GtkLabel" id="label1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">Options</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
+          </object>
+        </child>
+      </object>
+      <packing>
+        <property name="left_attach">0</property>
+        <property name="top_attach">0</property>
+        <property name="width">1</property>
+        <property name="height">1</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkFrame" id="frameFL_VERTALIGN">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label_xalign">0</property>
+        <property name="shadow_type">none</property>
+        <child>
+          <object class="GtkAlignment" id="alignment2">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="top_padding">6</property>
+            <property name="left_padding">12</property>
+            <child>
+              <object class="GtkBox" id="box2">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="spacing">6</property>
+                <child>
+                  <object class="GtkLabel" id="labelFT_VERTALIGN">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">_Alignment:</property>
+                    <property name="use_underline">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkComboBox" id="comboLB_VERTALIGN">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="model">liststoreLB_VERTALIGN</property>
+                    <property name="entry_text_column">8</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child type="label">
+          <object class="GtkLabel" id="labelFL_VERTALIGN">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">Text-to-text</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
+          </object>
+        </child>
+      </object>
+      <packing>
+        <property name="left_attach">0</property>
+        <property name="top_attach">1</property>
+        <property name="width">1</property>
+        <property name="height">1</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkFrame" id="framePROPERTIES">
+        <property name="can_focus">False</property>
+        <property name="label_xalign">0</property>
+        <property name="shadow_type">none</property>
+        <child>
+          <object class="GtkAlignment" id="alignment3">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="top_padding">6</property>
+            <property name="left_padding">12</property>
+            <child>
+              <object class="GtkBox" id="box3">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="spacing">6</property>
+                <child>
+                  <object class="GtkLabel" id="label2">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">_Text direction:</property>
+                    <property name="use_underline">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="svxlo-FrameDirectionListBox" id="comboLB_TEXTDIRECTION">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="entry_text_column">0</property>
+                    <property name="id_column">1</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child type="label">
+          <object class="GtkLabel" id="labelFL_PROPERTIES">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">Properties</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
+          </object>
+        </child>
+      </object>
+      <packing>
+        <property name="left_attach">0</property>
+        <property name="top_attach">2</property>
+        <property name="width">1</property>
+        <property name="height">1</property>
+      </packing>
+    </child>
+  </object>
+  <object class="GtkSizeGroup" id="sizegroup1">
+    <widgets>
+      <widget name="radioBTN_LEFTALIGN"/>
+      <widget name="radioBTN_RIGHTALIGN"/>
+      <widget name="radioBTN_CENTERALIGN"/>
+      <widget name="radioBTN_JUSTIFYALIGN"/>
+      <widget name="checkCB_EXPAND"/>
+      <widget name="comboLB_LASTLINE"/>
+      <widget name="labelST_RIGHTALIGN_ASIAN"/>
+      <widget name="labelST_LEFTALIGN_ASIAN"/>
+    </widgets>
+  </object>
+</interface>

cui/uiconfig/ui/paraindentspacing.ui

@@ -0,0 +1,560 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <!-- interface-requires LibreOffice 1.0 -->
+  <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="GtkGrid" id="ParaIndentSpacing">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="hexpand">True</property>
+    <property name="border_width">6</property>
+    <property name="row_spacing">12</property>
+    <property name="column_spacing">6</property>
+    <child>
+      <object class="GtkFrame" id="framePROPERTIES">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label_xalign">0</property>
+        <property name="shadow_type">none</property>
+        <child>
+          <object class="GtkAlignment" id="alignment3">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="top_padding">6</property>
+            <property name="left_padding">12</property>
+            <child>
+              <object class="GtkBox" id="box3">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="spacing">6</property>
+                <child>
+                  <object class="GtkComboBox" id="comboLB_LINEDIST">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="model">liststoreLB_LINEDIST</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="labelFT_LINEDIST">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">of</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkBox" id="box1">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="orientation">vertical</property>
+                    <child>
+                      <object class="GtkSpinButton" id="spinED_LINEDISTPERCENT:0%">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="invisible_char">•</property>
+                        <property name="adjustment">adjustmentLINEDISTPERCENT</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkSpinButton" id="spinED_LINEDISTMETRIC:0cm">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="invisible_char">•</property>
+                        <property name="adjustment">adjustmentED_LINEDISTMETRIC</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child type="label">
+          <object class="GtkLabel" id="labelFL_PROPERTIES">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">Line spacing</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
+          </object>
+        </child>
+      </object>
+      <packing>
+        <property name="left_attach">0</property>
+        <property name="top_attach">2</property>
+        <property name="width">1</property>
+        <property name="height">1</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkFrame" id="frameFL_REGISTER">
+        <property name="can_focus">False</property>
+        <property name="label_xalign">0</property>
+        <property name="shadow_type">none</property>
+        <child>
+          <object class="GtkAlignment" id="alignment4">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="top_padding">6</property>
+            <property name="left_padding">12</property>
+            <child>
+              <object class="GtkCheckButton" id="checkCB_REGISTER">
+                <property name="label" translatable="yes">A_ctivate</property>
+                <property name="can_focus">False</property>
+                <property name="receives_default">False</property>
+                <property name="use_underline">True</property>
+                <property name="xalign">0</property>
+                <property name="draw_indicator">True</property>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child type="label">
+          <object class="GtkLabel" id="label3">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">Register-true</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
+          </object>
+        </child>
+      </object>
+      <packing>
+        <property name="left_attach">0</property>
+        <property name="top_attach">3</property>
+        <property name="width">1</property>
+        <property name="height">1</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkBox" id="box4">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="spacing">6</property>
+        <child>
+          <object class="GtkBox" id="box5">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="orientation">vertical</property>
+            <child>
+              <object class="GtkFrame" id="frame1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label_xalign">0</property>
+                <property name="shadow_type">none</property>
+                <child>
+                  <object class="GtkAlignment" id="alignment1">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="top_padding">6</property>
+                    <property name="left_padding">12</property>
+                    <child>
+                      <object class="GtkGrid" id="grid2">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="row_spacing">12</property>
+                        <property name="column_spacing">6</property>
+                        <child>
+                          <object class="GtkLabel" id="labelFT_LEFTINDENT">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes">_Before text:</property>
+                            <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">spinED_LEFTINDENT:0cm</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">0</property>
+                            <property name="width">1</property>
+                            <property name="height">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="labelFT_RIGHTINDENT">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes">After _text:</property>
+                            <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">spinED_RIGHTINDENT:0cm</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">1</property>
+                            <property name="width">1</property>
+                            <property name="height">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="labelFT_FLINEINDENT">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes">_First line:</property>
+                            <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">spinED_FLINEINDENT:0cm</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">2</property>
+                            <property name="width">1</property>
+                            <property name="height">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="checkCB_AUTO">
+                            <property name="label" translatable="yes">_Automatic</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="xalign">0</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">3</property>
+                            <property name="width">1</property>
+                            <property name="height">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="svxlo-SvxRelativeField" id="spinED_LEFTINDENT:0cm">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="invisible_char">•</property>
+                            <property name="invisible_char_set">True</property>
+                            <property name="adjustment">adjustmentspinED_INDENT</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="top_attach">0</property>
+                            <property name="width">1</property>
+                            <property name="height">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="svxlo-SvxRelativeField" id="spinED_RIGHTINDENT:0cm">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="invisible_char">•</property>
+                            <property name="invisible_char_set">True</property>
+                            <property name="adjustment">adjustmentspinED_INDENT</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="top_attach">1</property>
+                            <property name="width">1</property>
+                            <property name="height">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="svxlo-SvxRelativeField" id="spinED_FLINEINDENT:0cm">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="invisible_char">•</property>
+                            <property name="invisible_char_set">True</property>
+                            <property name="adjustment">adjustmentspinED_INDENT</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="top_attach">2</property>
+                            <property name="width">1</property>
+                            <property name="height">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="labelST_LINEDIST_ABS">
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">Fixed</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="top_attach">3</property>
+                            <property name="width">1</property>
+                            <property name="height">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+                <child type="label">
+                  <object class="GtkLabel" id="label1">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">Indent</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkFrame" id="frame2">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label_xalign">0</property>
+                <property name="shadow_type">none</property>
+                <child>
+                  <object class="GtkAlignment" id="alignment2">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="top_padding">6</property>
+                    <property name="left_padding">12</property>
+                    <child>
+                      <object class="GtkBox" id="box2">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="orientation">vertical</property>
+                        <property name="spacing">6</property>
+                        <child>
+                          <object class="GtkGrid" id="grid1">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="row_spacing">12</property>
+                            <property name="column_spacing">6</property>
+                            <child>
+                              <object class="GtkLabel" id="labelFT_TOPDIST">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">Ab_ove paragraph:</property>
+                                <property name="use_underline">True</property>
+                                <property name="mnemonic_widget">spinED_TOPDIST:0cm</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">0</property>
+                                <property name="top_attach">0</property>
+                                <property name="width">1</property>
+                                <property name="height">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="labelFT_BOTTOMDIST">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">Below _paragraph:</property>
+                                <property name="use_underline">True</property>
+                                <property name="mnemonic_widget">spinED_BOTTOMDIST:0cm</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">0</property>
+                                <property name="top_attach">1</property>
+                                <property name="width">1</property>
+                                <property name="height">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="svxlo-SvxRelativeField" id="spinED_TOPDIST:0cm">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="invisible_char">•</property>
+                                <property name="invisible_char_set">True</property>
+                                <property name="adjustment">adjustmentED_DIST</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="top_attach">0</property>
+                                <property name="width">1</property>
+                                <property name="height">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="svxlo-SvxRelativeField" id="spinED_BOTTOMDIST:0cm">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="invisible_char">•</property>
+                                <property name="invisible_char_set">True</property>
+                                <property name="adjustment">adjustmentED_DIST</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="top_attach">1</property>
+                                <property name="width">1</property>
+                                <property name="height">1</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="checkCB_CONTEXTUALSPACING">
+                            <property name="label" translatable="yes">Don't add space between paragraphs of the same style</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="receives_default">False</property>
+                            <property name="xalign">0</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+                <child type="label">
+                  <object class="GtkLabel" id="labelFL_VERTALIGN">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">Spacing</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <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">center</property>
+            <property name="hexpand">True</property>
+            <property name="vexpand">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+      <packing>
+        <property name="left_attach">0</property>
+        <property name="top_attach">0</property>
+        <property name="width">1</property>
+        <property name="height">1</property>
+      </packing>
+    </child>
+    <child>
+      <placeholder/>
+    </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="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 -->
+      <column type="gchararray"/>
+      <!-- column-name guint1 -->
+      <column type="guint"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Single</col>
+        <col id="1">0</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">1.5 lines</col>
+        <col id="1">1</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Double</col>
+        <col id="1">2</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Proportional</col>
+        <col id="1">3</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">At least</col>
+        <col id="1">4</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Leading</col>
+        <col id="1">5</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkSizeGroup" id="sizegroup1">
+    <widgets>
+      <widget name="comboLB_LINEDIST"/>
+      <widget name="box1"/>
+      <widget name="labelFT_LEFTINDENT"/>
+      <widget name="labelFT_RIGHTINDENT"/>
+      <widget name="labelFT_FLINEINDENT"/>
+      <widget name="spinED_LEFTINDENT:0cm"/>
+      <widget name="spinED_RIGHTINDENT:0cm"/>
+      <widget name="spinED_FLINEINDENT:0cm"/>
+      <widget name="labelFT_TOPDIST"/>
+      <widget name="labelFT_BOTTOMDIST"/>
+      <widget name="spinED_TOPDIST:0cm"/>
+      <widget name="spinED_BOTTOMDIST:0cm"/>
+    </widgets>
+  </object>
+</interface>

extras/source/glade/libreoffice-catalog.xml.in

@@ -96,6 +96,9 @@
     <glade-widget-class title="Table Container" name="svxcorelo-SvxSimpleTableContainer"
                         generic-name="Simple Table Container" parent="GtkTreeView"
                         icon-name="widget-gtk-treeview"/>
+    <glade-widget-class title="Paragraph Preview" name="svxlo-SvxParaPrevWindow"
+                        generic-name="Paragraph Preview Window" parent="GtkDrawingArea"
+                        icon-name="widget-gtk-drawingarea"/>
     <glade-widget-class title="Page Preview" name="svxlo-SvxPageWindow"
                         generic-name="Page Preview Window" parent="GtkDrawingArea"
                         icon-name="widget-gtk-drawingarea"/>
@@ -183,7 +186,9 @@
     <glade-widget-class title="Wrap Field" name="svxlo-WrapField"
                         generic-name="Wrap Field" parent="GtkSpinButton"
                         icon-name="widget-gtk-spinbutton"/>
-
+    <glade-widget-class title="Relative Numeric Field" name="svxlo-SvxRelativeField"
+                        generic-name="Relative Numeric Field" parent="GtkSpinButton"
+                        icon-name="widget-gtk-spinbutton"/>                        
     <glade-widget-class title="VclComboBoxText" name="VclComboBoxText"
                         generic-name="ComboBoxText" parent="GtkComboBoxText"
                         icon-name="widget-gtk-comboboxtext">

include/svx/paraprev.hxx

@@ -41,7 +41,6 @@ class SVX_DLLPUBLIC SvxParaPrevWindow : public Window
 {
     using Window::Draw;
 private:
-    Size                aWinSize;
     Size                aSize;
 
     // indentation
@@ -49,48 +48,50 @@ private:
     long                nRightMargin;
     short               nFirstLineOfst;
     // distances
-    sal_uInt16              nUpper;
+    sal_uInt16          nUpper;
-    sal_uInt16              nLower;
+    sal_uInt16          nLower;
     // adjustment
     SvxAdjust           eAdjust;
     // last line in justification
     SvxAdjust           eLastLine;
     // line distance
     SvxPrevLineSpace    eLine;
-    sal_uInt16              nLineVal;
+    sal_uInt16          nLineVal;
 
-    String              aText;
+    OUString            aText;
     Rectangle           Lines[9];
 
 protected:
     virtual void Paint( const Rectangle& rRect );
+    virtual Size GetOptimalSize() const;
 
     void DrawParagraph( sal_Bool bAll );
 
 public:
     SvxParaPrevWindow( Window* pParent, const ResId& rId );
+    SvxParaPrevWindow( Window* pParent, WinBits nBits);
 
-    void        SetFirstLineOfst( short nNew ) { nFirstLineOfst = nNew; }
+    void        SetFirstLineOfst( short nNew )  { nFirstLineOfst = nNew; }
-    void        SetLeftMargin( long nNew )  { nLeftMargin = nNew; }
+    void        SetLeftMargin( long nNew )      { nLeftMargin = nNew; }
-    void        SetRightMargin( long nNew ) { nRightMargin = nNew; }
+    void        SetRightMargin( long nNew )     { nRightMargin = nNew; }
-    void        SetUpper( sal_uInt16 nNew )         { nUpper = nNew; }
+    void        SetUpper( sal_uInt16 nNew )     { nUpper = nNew; }
-    void        SetLower( sal_uInt16 nNew )         { nLower = nNew; }
+    void        SetLower( sal_uInt16 nNew )     { nLower = nNew; }
     void        SetAdjust( SvxAdjust eNew )     { eAdjust = eNew; }
     void        SetLastLine( SvxAdjust eNew )   { eLastLine = eNew; }
     void        SetLineSpace( SvxPrevLineSpace eNew, sal_uInt16 nNew = 0 )
                     {   eLine = eNew; nLineVal = nNew; }
-    void        SetText( const OUString& rStr )   { aText = rStr; }
+    void        SetText( const OUString& rStr ) { aText = rStr; }
     void        SetSize( Size aNew )            { aSize = aNew; }
 
     short       GetFirstLineOfst() const        { return nFirstLineOfst; }
     long        GetLeftMargin() const           { return nLeftMargin; }
     long        GetRightMargin() const          { return nRightMargin; }
-    sal_uInt16      GetUpper() const                { return nUpper; }
+    sal_uInt16  GetUpper() const                { return nUpper; }
-    sal_uInt16      GetLower() const                { return nLower; }
+    sal_uInt16  GetLower() const                { return nLower; }
     SvxAdjust   GetAdjust() const               { return eAdjust; }
 
     SvxPrevLineSpace    GetLineEnum() const     { return eLine; }
-    sal_uInt16              GetLineValue() const    { return nLineVal; }
+    sal_uInt16          GetLineValue() const    { return nLineVal; }
     OUString            GetText() const         { return aText; }
     Size                GetSize() const         { return aSize; }
 

include/svx/relfld.hxx

@@ -40,12 +40,13 @@ protected:
 
 public:
     SvxRelativeField( Window* pParent, const ResId& rResId );
+    SvxRelativeField( Window* pParent, WinBits nBits);
 
     void            EnableRelativeMode( sal_uInt16 nMin = 50, sal_uInt16 nMax = 150,
                                         sal_uInt16 nStep = 5 );
-    sal_Bool            IsRelativeMode() const { return bRelativeMode; }
+    sal_Bool        IsRelativeMode() const { return bRelativeMode; }
     void            SetRelative( sal_Bool bRelative = sal_False );
-    sal_Bool            IsRelative() const { return bRelative; }
+    sal_Bool        IsRelative() const { return bRelative; }
     void            EnableNegativeMode() {bNegativeEnabled = sal_True;}
 };
 

svx/source/dialog/paraprev.cxx

@@ -18,6 +18,7 @@
  */
 
 #include <svx/paraprev.hxx>
+#include <vcl/builder.hxx>
 
 // class SvxParaPrevWindow -----------------------------------------------
 
@@ -38,18 +39,45 @@ SvxParaPrevWindow::SvxParaPrevWindow( Window* pParent, const ResId& rId ) :
 {
     // Count in Twips by default
     SetMapMode( MapMode( MAP_TWIP ) );
-    aWinSize = GetOutputSizePixel();
-    aWinSize = PixelToLogic( aWinSize );
-    Size aTmp(1, 1);
-    aTmp = PixelToLogic(aTmp);
-    aWinSize.Width() -= aTmp.Width() /2;
-    aWinSize.Height() -= aTmp.Height() /2;
 
     aSize = Size( 11905, 16837 );
 
     SetBorderStyle( WINDOW_BORDER_MONO );
 }
 
+SvxParaPrevWindow::SvxParaPrevWindow( Window* pParent,  WinBits nBits) :
+
+    Window( pParent, nBits),
+
+    nLeftMargin     ( 0 ),
+    nRightMargin    ( 0 ),
+    nFirstLineOfst  ( 0 ),
+    nUpper          ( 0 ),
+    nLower          ( 0 ),
+    eAdjust         ( SVX_ADJUST_LEFT ),
+    eLastLine       ( SVX_ADJUST_LEFT ),
+    eLine           ( SVX_PREV_LINESPACE_1 ),
+    nLineVal        ( 0 )
+
+{
+    // Count in Twips by default
+    SetMapMode( MapMode( MAP_TWIP ) );
+
+    aSize = Size( 11905, 16837 );
+
+    SetBorderStyle( WINDOW_BORDER_MONO );
+}
+
+extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxParaPrevWindow(Window *pParent, VclBuilder::stringmap &)
+{
+    return new SvxParaPrevWindow(pParent, WB_BORDER);
+}
+
+Size SvxParaPrevWindow::GetOptimalSize() const
+{
+    return LogicToPixel(Size(68 , 112), MAP_APPFONT);
+}
+
 // -----------------------------------------------------------------------
 
 void SvxParaPrevWindow::Paint( const Rectangle& )
@@ -63,6 +91,13 @@ void SvxParaPrevWindow::Paint( const Rectangle& )
 
 void SvxParaPrevWindow::DrawParagraph( sal_Bool bAll )
 {
+    Size aWinSize = GetOutputSizePixel();
+    aWinSize = PixelToLogic( aWinSize );
+    Size aTmp(1, 1);
+    aTmp = PixelToLogic(aTmp);
+    aWinSize.Width() -= aTmp.Width() /2;
+    aWinSize.Height() -= aTmp.Height() /2;
+
     const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
     const Color& rWinColor = rStyleSettings.GetWindowColor();
     Color aGrayColor(COL_LIGHTGRAY);

svx/source/dialog/relfld.cxx

@@ -18,6 +18,7 @@
  */
 
 #include "svx/relfld.hxx"
+#include "vcl/builder.hxx"
 
 // -----------------------------------------------------------------------
 
@@ -32,7 +33,22 @@ SvxRelativeField::SvxRelativeField( Window* pParent, const ResId& rResId ) :
     SetMin( 0 );
     SetMax( 9999 );
 }
+SvxRelativeField::SvxRelativeField( Window* pParent, WinBits nBits) :
+    MetricField( pParent, nBits)
+{
+    bNegativeEnabled = sal_False;
+    bRelativeMode = sal_False;
+    bRelative     = sal_False;
 
+    SetDecimalDigits( 2 );
+    SetMin( 0 );
+    SetMax( 9999 );
+}
+
+extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxRelativeField(Window *pParent, VclBuilder::stringmap &)
+{
+    return new SvxRelativeField(pParent, WB_BORDER | WB_SPIN | WB_REPEAT | WB_LEFT | WB_GROUP);
+}
 // -----------------------------------------------------------------------
 
 void SvxRelativeField::Modify()