[Libreoffice-commits] core.git: cui/source cui/uiconfig
Samuel Mehrbrodt
Samuel.Mehrbrodt at cib.de
Thu Jun 16 12:47:13 UTC 2016
cui/source/tabpages/paragrph.cxx | 27 +++++--
cui/uiconfig/ui/paraindentspacing.ui | 134 ++++++++++++-----------------------
2 files changed, 67 insertions(+), 94 deletions(-)
New commits:
commit e74d125954051736f7862eb239e04ba1b199801f
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Date: Thu Jun 16 14:32:14 2016 +0200
tdf#85949 Add 1.15 line spacing in the paragraph dialog also
Change-Id: I55a6028d1db2f2ebbdf0ed4a91e2db88098899fc
Reviewed-on: https://gerrit.libreoffice.org/26370
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 66921fe..eb20663 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -86,12 +86,13 @@ const sal_uInt16 SvxExtParagraphTabPage::pExtRanges[] =
enum LineSpaceList
{
LLINESPACE_1 = 0,
- LLINESPACE_15 = 1,
- LLINESPACE_2 = 2,
- LLINESPACE_PROP = 3,
- LLINESPACE_MIN = 4,
- LLINESPACE_DURCH= 5,
- LLINESPACE_FIX = 6,
+ LLINESPACE_115 = 1,
+ LLINESPACE_15 = 2,
+ LLINESPACE_2 = 3,
+ LLINESPACE_PROP = 4,
+ LLINESPACE_MIN = 5,
+ LLINESPACE_DURCH= 6,
+ LLINESPACE_FIX = 7,
LLINESPACE_END
};
@@ -107,6 +108,11 @@ void SetLineSpace_Impl( SvxLineSpacingItem& rLineSpace,
rLineSpace.GetInterLineSpaceRule() = SVX_INTER_LINE_SPACE_OFF;
break;
+ case LLINESPACE_115:
+ rLineSpace.GetLineSpaceRule() = SVX_LINE_SPACE_AUTO;
+ rLineSpace.SetPropLineSpace( 115 );
+ break;
+
case LLINESPACE_15:
rLineSpace.GetLineSpaceRule() = SVX_LINE_SPACE_AUTO;
rLineSpace.SetPropLineSpace( 150 );
@@ -221,6 +227,7 @@ bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet* rOutSet )
switch ( nPos )
{
case LLINESPACE_1:
+ case LLINESPACE_115:
case LLINESPACE_15:
case LLINESPACE_2:
SetLineSpace_Impl( aSpacing, nPos );
@@ -729,6 +736,12 @@ void SvxStdParagraphTabPage::SetLineSpacing_Impl
m_pLineDist->SelectEntryPos( LLINESPACE_1 );
break;
}
+ // 1.15 line spacing
+ if ( 115 == rAttr.GetPropLineSpace() )
+ {
+ m_pLineDist->SelectEntryPos( LLINESPACE_115 );
+ break;
+ }
// 1.5 line spacing
if ( 150 == rAttr.GetPropLineSpace() )
{
@@ -773,6 +786,7 @@ IMPL_LINK_TYPED( SvxStdParagraphTabPage, LineDistHdl_Impl, ListBox&, rBox, void
switch( rBox.GetSelectEntryPos() )
{
case LLINESPACE_1:
+ case LLINESPACE_115:
case LLINESPACE_15:
case LLINESPACE_2:
m_pLineDistAtLabel->Enable(false);
@@ -879,6 +893,7 @@ void SvxStdParagraphTabPage::UpdateExample_Impl()
switch ( nPos )
{
case LLINESPACE_1:
+ case LLINESPACE_115:
case LLINESPACE_15:
case LLINESPACE_2:
m_pExampleWin->SetLineSpace( (SvxPrevLineSpace)nPos );
diff --git a/cui/uiconfig/ui/paraindentspacing.ui b/cui/uiconfig/ui/paraindentspacing.ui
index 3593b0e..97ae6e9 100644
--- a/cui/uiconfig/ui/paraindentspacing.ui
+++ b/cui/uiconfig/ui/paraindentspacing.ui
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
<interface>
- <!-- interface-requires gtk+ 3.0 -->
- <!-- interface-requires LibreOffice 1.0 -->
+ <requires lib="gtk+" version="3.0"/>
+ <requires lib="LibreOffice" version="1.0"/>
<object class="GtkAdjustment" id="adjustmentED_DIST">
<property name="upper">9999</property>
<property name="step_increment">1</property>
@@ -24,6 +25,44 @@
<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.15 Lines</col>
+ <col id="1">1</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">1.5 Lines</col>
+ <col id="1">2</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Double</col>
+ <col id="1">3</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Proportional</col>
+ <col id="1">4</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">At least</col>
+ <col id="1">5</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Leading</col>
+ <col id="1">6</col>
+ </row>
+ </data>
+ </object>
<object class="GtkGrid" id="ParaIndentSpacing">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -58,8 +97,6 @@
<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>
@@ -89,48 +126,42 @@
<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>
+ <property name="xalign">0</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>
+ <property name="xalign">0</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>
+ <property name="xalign">0</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>
@@ -146,8 +177,6 @@
<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>
@@ -155,14 +184,11 @@
<property name="visible">True</property>
<property name="can_focus">True</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>
@@ -170,14 +196,11 @@
<property name="visible">True</property>
<property name="can_focus">True</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>
@@ -185,14 +208,11 @@
<property name="visible">True</property>
<property name="can_focus">True</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>
@@ -203,8 +223,6 @@
<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>
@@ -225,8 +243,6 @@
<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>
@@ -257,32 +273,28 @@
<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>
+ <property name="xalign">0</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>
+ <property name="xalign">0</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>
@@ -290,14 +302,11 @@
<property name="visible">True</property>
<property name="can_focus">True</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>
@@ -305,14 +314,11 @@
<property name="visible">True</property>
<property name="can_focus">True</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>
@@ -355,8 +361,6 @@
<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>
@@ -409,8 +413,6 @@
<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>
@@ -423,7 +425,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">•</property>
- <property name="invisible_char_set">True</property>
<property name="adjustment">adjustmentLINEDISTPERCENT</property>
</object>
<packing>
@@ -437,7 +438,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">•</property>
- <property name="invisible_char_set">True</property>
<property name="adjustment">adjustmentED_LINEDISTMETRIC</property>
</object>
<packing>
@@ -450,8 +450,6 @@
<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>
</object>
@@ -472,8 +470,6 @@
<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>
@@ -513,53 +509,15 @@
<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>
</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>
</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="box3"/>
More information about the Libreoffice-commits
mailing list