diff options
| author | Justin Luth <justin_luth@sil.org> | 2016-10-29 17:26:57 +0300 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-11-02 09:25:01 +0000 |
| commit | f013d4a1f4073cda735befd6e446bee35f3db65c (patch) | |
| tree | a728faa86c2e114c7abb6db9161e0c7d002ce1d6 /sw/source/uibase | |
| parent | 9937b8daa7c6b8012d9ce4f936e239d87f34a0d1 (diff) | |
tdf#41542 PaddingWithoutBorders: allow UI changes if...
If the compatibility option is set, allow the border dialog for frames
to be able to adjust the spacing values without enabling the border lines.
That means it is only true for .doc and .docx right now.
Change-Id: I4004a849f7369c993089d1c7b5d856cbea4f7780
Reviewed-on: https://gerrit.libreoffice.org/28602
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Justin Luth <justin_luth@sil.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'sw/source/uibase')
| -rw-r--r-- | sw/source/uibase/shells/frmsh.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sw/source/uibase/shells/frmsh.cxx b/sw/source/uibase/shells/frmsh.cxx index 6406fcada123..d1eb5f0b56dc 100644 --- a/sw/source/uibase/shells/frmsh.cxx +++ b/sw/source/uibase/shells/frmsh.cxx @@ -405,6 +405,7 @@ void SwFrameShell::Execute(SfxRequest &rReq) SID_COLOR_TABLE, SID_PATTERN_LIST, // [10179 SID_HTML_MODE, SID_HTML_MODE, // [10414 + SID_ALLOW_PADDING_WITHOUT_BORDERS, SID_ALLOW_PADDING_WITHOUT_BORDERS, // [11139 FN_GET_PRINT_AREA, FN_GET_PRINT_AREA, // [21032 FN_SURROUND, FN_HORI_ORIENT, // [21303 FN_SET_FRM_NAME, FN_KEEP_ASPECT_RATIO, // [21306 @@ -456,6 +457,9 @@ void SwFrameShell::Execute(SfxRequest &rReq) const uno::Reference < embed::XEmbeddedObject > xObj( rSh.GetOleRef() ); aSet.Put( SfxBoolItem( FN_OLE_IS_MATH, xObj.is() && SotExchange::IsMath( xObj->getClassID() ) ) ); + aSet.Put( SfxBoolItem( SID_ALLOW_PADDING_WITHOUT_BORDERS, + rSh.GetDoc()->getIDocumentSettingAccess().get(DocumentSettingId::ALLOW_PADDING_WITHOUT_BORDERS) ) ); + OString sDefPage; if(pArgs && pArgs->GetItemState(FN_FORMAT_FRAME_DLG, false, &pItem) == SfxItemState::SET) sDefPage = OUStringToOString(static_cast<const SfxStringItem *>(pItem)->GetValue(), RTL_TEXTENCODING_UTF8); |