diff options
| author | Jim Raykowski <raykowj@gmail.com> | 2021-10-13 13:24:39 -0800 |
|---|---|---|
| committer | Heiko Tietze <heiko.tietze@documentfoundation.org> | 2021-10-19 08:22:43 +0200 |
| commit | 40458226fda358bd90c25ddfe6a9b2cf25b2fcad (patch) | |
| tree | 53b97e2499835f8e00cd7f3bf5fab50f30b92892 /sw/source | |
| parent | 672b4c155766e9bf18e109e92f3e8cc71a52e21d (diff) | |
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.tietze@documentfoundation.org>
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/uibase/shells/annotsh.cxx | 10 | ||||
| -rw-r--r-- | sw/source/uibase/shells/drwtxtex.cxx | 10 | ||||
| -rw-r--r-- | sw/source/uibase/shells/txtattr.cxx | 4 |
3 files changed, 24 insertions, 0 deletions
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; |