tdf#113959 Use svxlo-FrameDirectionListBox instead of ListBox
Reduce number of translatable strings in columnpage.ui
Change-Id: Id3d8744bed8ac8366b10f93fa8e38803316eeb82
Reviewed-on: https://gerrit.libreoffice.org/46171
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index db28e79..af6561a 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -435,6 +435,10 @@ SwColumnPage::SwColumnPage(vcl::Window *pParent, const SfxItemSet &rSet)
connectPercentField(m_aDistEd1, "spacing1mf");
connectPercentField(m_aDistEd2, "spacing2mf");
m_pTextDirectionLB->InsertEntryValue( SvxResId( RID_SVXSTR_FRAMEDIR_LTR ), SvxFrameDirection::Horizontal_LR_TB );
m_pTextDirectionLB->InsertEntryValue( SvxResId( RID_SVXSTR_FRAMEDIR_RTL ), SvxFrameDirection::Horizontal_RL_TB );
m_pTextDirectionLB->InsertEntryValue( SvxResId( RID_SVXSTR_FRAMEDIR_SUPER ), SvxFrameDirection::Environment );
SetExchangeSupport();
m_pDefaultVS->SetColCount( 5 );
diff --git a/sw/source/uibase/inc/column.hxx b/sw/source/uibase/inc/column.hxx
index 531a914..f64843f 100644
--- a/sw/source/uibase/inc/column.hxx
+++ b/sw/source/uibase/inc/column.hxx
@@ -32,6 +32,7 @@
#include <sfx2/basedlgs.hxx>
#include <sfx2/tabdlg.hxx>
#include <svx/colorbox.hxx>
#include <svx/frmdirlbox.hxx>
#include <fmtclbl.hxx>
#include "colex.hxx"
#include "prcntfld.hxx"
@@ -114,7 +115,7 @@ class SwColumnPage : public SfxTabPage
VclPtr<ListBox> m_pLinePosDLB;
VclPtr<FixedText> m_pTextDirectionFT;
VclPtr<ListBox> m_pTextDirectionLB;
VclPtr<svx::FrameDirectionListBox> m_pTextDirectionLB;
// Example
VclPtr<SwColExample> m_pPgeExampleWN;
diff --git a/sw/uiconfig/swriter/ui/columnpage.ui b/sw/uiconfig/swriter/ui/columnpage.ui
index fe1880b..1ce5640 100644
--- a/sw/uiconfig/swriter/ui/columnpage.ui
+++ b/sw/uiconfig/swriter/ui/columnpage.ui
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 -->
<interface domain="sw">
<!-- interface-requires LibreOffice 1.0 -->
<requires lib="gtk+" version="3.0"/>
<requires lib="LibreOffice" version="1.0"/>
<object class="GtkAdjustment" id="adjustment1">
<property name="lower">1</property>
<property name="upper">20</property>
@@ -47,28 +47,6 @@
<property name="stock">gtk-go-forward</property>
<property name="icon_size">1</property>
</object>
<object class="GtkListStore" id="liststore1">
<columns>
<!-- column-name gchararray1 -->
<column type="gchararray"/>
<!-- column-name gint1 -->
<column type="gint"/>
</columns>
<data>
<row>
<col id="0" translatable="yes" context="columnpage|liststore1">Left-to-right</col>
<col id="1">0</col>
</row>
<row>
<col id="0" translatable="yes" context="columnpage|liststore1">Right-to-left</col>
<col id="1">1</col>
</row>
<row>
<col id="0" translatable="yes" context="columnpage|liststore1">Use superordinate object settings</col>
<col id="1">4</col>
</row>
</data>
</object>
<object class="GtkListStore" id="liststore2">
<columns>
<!-- column-name gchararray1 -->
@@ -733,11 +711,9 @@
</packing>
</child>
<child>
<object class="GtkComboBox" id="textdirectionlb">
<object class="svxlo-FrameDirectionListBox" id="textdirectionlb">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
<property name="hexpand">True</property>
<property name="model">liststore1</property>
</object>
<packing>
<property name="left_attach">1</property>
