include/editeng/editids.hrc | 2 -
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 8
+++++
svx/sdi/svx.sdi | 15
++++++++++
sw/sdi/_annotsh.sdi | 7
++++
sw/sdi/_textsh.sdi | 6
++++
sw/sdi/drwtxtsh.sdi | 7
++++
sw/source/uibase/shells/annotsh.cxx | 10
++++++
sw/source/uibase/shells/drwtxtex.cxx | 10
++++++
sw/source/uibase/shells/txtattr.cxx | 4 ++
sw/uiconfig/swriter/menubar/menubar.xml | 1
10 files changed, 69 insertions(+), 1 deletion(-)
New commits:
commit 40458226fda358bd90c25ddfe6a9b2cf25b2fcad
Author: Jim Raykowski <rayk...@gmail.com>
AuthorDate: Wed Oct 13 13:24:39 2021 -0800
Commit: Heiko Tietze <heiko.tie...@documentfoundation.org>
CommitDate: Tue Oct 19 08:22:43 2021 +0200
tdf#113512 Writer: 1.15 line spacing UNO command
Resolves the Writer 1.15 line spacing part of the request for 1.15,
2.5, and 3 line spacing UNO commands.
Change-Id: I2a654063df3549e8a23021bc4fc76bc17c270d69
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123569
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tie...@documentfoundation.org>
diff --git a/include/editeng/editids.hrc b/include/editeng/editids.hrc
index 129afc52234e..5560eea1336a 100644
--- a/include/editeng/editids.hrc
+++ b/include/editeng/editids.hrc
@@ -51,7 +51,6 @@
#define SID_ATTR_CHAR_FONTLIST ( SID_SVX_START + 22 )
#define SID_ATTR_BORDER_OUTER ( SID_SVX_START + 24 )
#define SID_ATTR_BORDER_SHADOW ( SID_SVX_START + 25 )
- // free
#define SID_ATTR_PARA_ADJUST ( SID_SVX_START + 27 )
#define SID_ATTR_PARA_ADJUST_LEFT ( SID_SVX_START + 28 )
#define SID_ATTR_PARA_ADJUST_RIGHT ( SID_SVX_START + 29 )
@@ -60,6 +59,7 @@
#define SID_ATTR_PARA_LINESPACE ( SID_SVX_START + 33 )
#define SID_ATTR_PARA_LINESPACE_10 ( SID_SVX_START + 34 )
#define SID_ATTR_PARA_LINESPACE_15 ( SID_SVX_START + 35 )
+#define SID_ATTR_PARA_LINESPACE_115 ( SID_SVX_START + 26 )
#define SID_ATTR_PARA_LINESPACE_20 ( SID_SVX_START + 36 )
#define SID_ATTR_PARA_PAGEBREAK ( SID_SVX_START + 37 )
#define SID_ATTR_PARA_HYPHENZONE ( SID_SVX_START + 38 )
diff --git
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 37fa7fc9ffb0..c45aab0823b4 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -1828,6 +1828,14 @@ bit 3 (0x8): #define
UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8
<value>15</value>
</prop>
</node>
+ <node oor:name=".uno:SpacePara115" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Line Spacing: 1.15</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>15</value>
+ </prop>
+ </node>
<node oor:name=".uno:SpacePara15" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Line Spacing: 1.5</value>
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index 4cb657ee48b5..1e08145d3644 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -8100,6 +8100,21 @@ SfxBoolItem SpacePara1 SID_ATTR_PARA_LINESPACE_10
GroupId = SfxGroupId::Format;
]
+SfxBoolItem SpacePara115 SID_ATTR_PARA_LINESPACE_115
+[
+ AutoUpdate = TRUE,
+ FastCall = FALSE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ ToolBoxConfig = TRUE,
+ GroupId = SfxGroupId::Format;
+]
SfxBoolItem SpacePara15 SID_ATTR_PARA_LINESPACE_15
diff --git a/sw/sdi/_annotsh.sdi b/sw/sdi/_annotsh.sdi
index 66242a1f52ca..b335fb9e0676 100644
--- a/sw/sdi/_annotsh.sdi
+++ b/sw/sdi/_annotsh.sdi
@@ -417,6 +417,13 @@ interface _Annotation
DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
]
+ SID_ATTR_PARA_LINESPACE_115
+ [
+ ExecMethod = Exec ;
+ StateMethod = GetState ;
+ DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
+ ]
+
SID_ATTR_PARA_LINESPACE_15 // api:
[
ExecMethod = Exec ;
diff --git a/sw/sdi/_textsh.sdi b/sw/sdi/_textsh.sdi
index 6af93a628eb6..38359c593471 100644
--- a/sw/sdi/_textsh.sdi
+++ b/sw/sdi/_textsh.sdi
@@ -1167,6 +1167,12 @@ interface BaseText
StateMethod = GetAttrState ;
DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
]
+ SID_ATTR_PARA_LINESPACE_115
+ [
+ ExecMethod = ExecParaAttr ;
+ StateMethod = GetAttrState ;
+ DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
+ ]
SID_ATTR_PARA_LINESPACE_15
[
ExecMethod = ExecParaAttr ;
diff --git a/sw/sdi/drwtxtsh.sdi b/sw/sdi/drwtxtsh.sdi
index 13105b0fdf12..c9e76ab9fbfb 100644
--- a/sw/sdi/drwtxtsh.sdi
+++ b/sw/sdi/drwtxtsh.sdi
@@ -325,6 +325,13 @@ interface TextDrawText
DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
]
+ SID_ATTR_PARA_LINESPACE_115
+ [
+ ExecMethod = Execute ;
+ StateMethod = GetState ;
+ DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
+ ]
+
SID_ATTR_PARA_LINESPACE_15 // api:
[
ExecMethod = Execute ;
diff --git a/sw/source/uibase/shells/annotsh.cxx
b/sw/source/uibase/shells/annotsh.cxx
index 10e023a7992a..0b1ed84fe3cc 100644
--- a/sw/source/uibase/shells/annotsh.cxx
+++ b/sw/source/uibase/shells/annotsh.cxx
@@ -297,6 +297,13 @@ void SwAnnotationShell::Exec( SfxRequest &rReq )
aNewAttr.Put(aItem);
}
break;
+ case SID_ATTR_PARA_LINESPACE_115:
+ {
+ SvxLineSpacingItem aItem(LINE_SPACE_DEFAULT_HEIGHT, EE_PARA_SBL);
+ aItem.SetPropLineSpace(115);
+ aNewAttr.Put(aItem);
+ }
+ break;
case SID_ATTR_PARA_LINESPACE_15:
{
SvxLineSpacingItem aItem(LINE_SPACE_DEFAULT_HEIGHT, EE_PARA_SBL);
@@ -741,12 +748,15 @@ void SwAnnotationShell::GetState(SfxItemSet& rSet)
break;
}
case SID_ATTR_PARA_LINESPACE_10:
+ case SID_ATTR_PARA_LINESPACE_115:
case SID_ATTR_PARA_LINESPACE_15:
case SID_ATTR_PARA_LINESPACE_20:
{
int nLSpace = 0;
if (nWhich==SID_ATTR_PARA_LINESPACE_10)
nLSpace = 100;
+ else if (nWhich==SID_ATTR_PARA_LINESPACE_115)
+ nLSpace = 115;
else if (nWhich==SID_ATTR_PARA_LINESPACE_15)
nLSpace = 150;
else if (nWhich==SID_ATTR_PARA_LINESPACE_20)
diff --git a/sw/source/uibase/shells/drwtxtex.cxx
b/sw/source/uibase/shells/drwtxtex.cxx
index ad2cc4c80c66..6e3a432825e6 100644
--- a/sw/source/uibase/shells/drwtxtex.cxx
+++ b/sw/source/uibase/shells/drwtxtex.cxx
@@ -305,6 +305,13 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
aNewAttr.Put(aItem);
}
break;
+ case SID_ATTR_PARA_LINESPACE_115:
+ {
+ SvxLineSpacingItem aItem(LINE_SPACE_DEFAULT_HEIGHT, EE_PARA_SBL);
+ aItem.SetPropLineSpace(115);
+ aNewAttr.Put(aItem);
+ }
+ break;
case SID_ATTR_PARA_LINESPACE_15:
{
SvxLineSpacingItem aItem(LINE_SPACE_DEFAULT_HEIGHT, EE_PARA_SBL);
@@ -784,6 +791,9 @@ void SwDrawTextShell::GetState(SfxItemSet& rSet)
case SID_ATTR_PARA_LINESPACE_10:
nLSpace = 100;
goto ASK_LINESPACE;
+ case SID_ATTR_PARA_LINESPACE_115:
+ nLSpace = 115;
+ goto ASK_LINESPACE;
case SID_ATTR_PARA_LINESPACE_15:
nLSpace = 150;
goto ASK_LINESPACE;
diff --git a/sw/source/uibase/shells/txtattr.cxx
b/sw/source/uibase/shells/txtattr.cxx
index f8c7b8d3e24f..01054d793c23 100644
--- a/sw/source/uibase/shells/txtattr.cxx
+++ b/sw/source/uibase/shells/txtattr.cxx
@@ -363,6 +363,7 @@ SET_ADJUST:
break;
case SID_ATTR_PARA_LINESPACE_10: ePropL = 100; goto SET_LINESPACE;
case SID_ATTR_PARA_LINESPACE_15: ePropL = 150; goto SET_LINESPACE;
+ case SID_ATTR_PARA_LINESPACE_115: ePropL = 115; goto SET_LINESPACE;
case SID_ATTR_PARA_LINESPACE_20: ePropL = 200; goto SET_LINESPACE;
SET_LINESPACE:
@@ -651,6 +652,9 @@ void SwTextShell::GetAttrState(SfxItemSet &rSet)
case SID_ATTR_PARA_LINESPACE_10:
bFlag = nLineSpace == 100;
break;
+ case SID_ATTR_PARA_LINESPACE_115:
+ bFlag = nLineSpace == 115;
+ break;
case SID_ATTR_PARA_LINESPACE_15:
bFlag = nLineSpace == 150;
break;
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml
b/sw/uiconfig/swriter/menubar/menubar.xml
index e71db98f06f7..e27ca8aa3cad 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -400,6 +400,7 @@
<menu:menu menu:id=".uno:FormatSpacingMenu">
<menu:menupopup>
<menu:menuitem menu:id=".uno:SpacePara1"/>
+ <menu:menuitem menu:id=".uno:SpacePara115"/>
<menu:menuitem menu:id=".uno:SpacePara15"/>
<menu:menuitem menu:id=".uno:SpacePara2"/>
<menu:menuseparator/>
