diff options
author | Heiko Tietze <tietze.heiko@gmail.com> | 2024-11-07 16:12:56 +0100 |
---|---|---|
committer | Heiko Tietze <heiko.tietze@documentfoundation.org> | 2024-11-20 16:56:07 +0100 |
commit | f40dc496a511ae06a308dd0859bc3aad28a8ec7e (patch) | |
tree | b8c7e7658f194316dcee6fced0f9a4ae5fed39ab /sw/source/uibase/config/usrpref.cxx | |
parent | c635271eb17e3b9d50223356dbc09b771fcd643f (diff) |
Resolves tdf#163856 - Disentangle boundaries options
* Boundary toggles removed from app colors
* Object boundaries completely removed (color replaced with
DOCBOUNDARIES; Impress placeholder on/off now an expert option)
* Toggle options added under formatting aids
* Individual UNO commands marked deprecated
* New command added to show all boundaries
* Frames follow sections now in state and color
* Kind of wrapping doesn't matter anmymore
Change-Id: I7bbec20831dcb95abef6523884d84b05a1a7df0a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176242
Tested-by: Jenkins
Reviewed-by: Rafael Lima <rafael.palma.lima@gmail.com>
Diffstat (limited to 'sw/source/uibase/config/usrpref.cxx')
-rw-r--r-- | sw/source/uibase/config/usrpref.cxx | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/sw/source/uibase/config/usrpref.cxx b/sw/source/uibase/config/usrpref.cxx index 795a678412e1..d446baca6b42 100644 --- a/sw/source/uibase/config/usrpref.cxx +++ b/sw/source/uibase/config/usrpref.cxx @@ -125,8 +125,12 @@ Sequence<OUString> SwContentViewConfig::GetPropertyNames() const "Display/DefaultAnchor", // 25 "Zoom/DefaultZoom", // 26 "Zoom/ZoomType", // 27 - "Zoom/ZoomValue", //28 - "Display/TextBoundaries" // 29 + "Zoom/ZoomValue", // 28 + "Display/TextBoundaries", // 29 + "Display/TextBoundariesFull", // 30 + "Display/SectionBoundaries", // 31 + "Display/TableBoundaries", // 32 + "Display/ShowBoundaries" // 33 }; #if defined(__GNUC__) && !defined(__clang__) // clang 8.0.0 says strcmp isn't constexpr @@ -205,7 +209,11 @@ void SwContentViewConfig::ImplCommit() case 26: bVal = m_rParent.IsDefaultZoom(); break;// "Zoom/DefaultZoom" case 27:pValues[nProp] <<= static_cast<sal_Int32>(m_rParent.GetDefaultZoomType()); break; // "Zoom/ZoomType" case 28: pValues[nProp] <<= static_cast<sal_Int32>(m_rParent.GetDefaultZoomValue()); break; // "Zoom/ZoomValue" - case 29: bVal = m_rParent.IsTextBoundariesFull(); break; // "Display/TextBoundaries" + case 29: bVal = m_rParent.IsTextBoundaries(); break; // "Display/TextBoundaries" + case 30: bVal = m_rParent.IsTextBoundariesFull(); break; // "Display/TextBoundariesFull" + case 31: bVal = m_rParent.IsSectionBoundaries(); break; // "Display/SectionBoundaries" + case 32: bVal = m_rParent.IsTableBoundaries(); break; // "Display/TableBoundaries" + case 33: bVal = m_rParent.IsShowBoundaries(); break; // "Display/ShowBoundaries" } if ((nProp != g_UpdateLinkIndex) && (nProp != g_DefaultAnchor) && (nProp != g_ZoomType) && (nProp != g_ZoomValue)) @@ -283,7 +291,11 @@ void SwContentViewConfig::Load() m_rParent.SetDefaultZoomValue(static_cast<sal_uInt16>(nSet), true); } break; //"Zoom/ZoomValue" // 28 - case 29: m_rParent.SetTextBoundariesFull(bSet); break; //"Display/TextBoundaries" // 29 + case 29: m_rParent.SetTextBoundaries(bSet); break; //"Display/TextBoundaries" + case 30: m_rParent.SetTextBoundariesFull(bSet); break; //"Display/TextBoundariesFull" + case 31: m_rParent.SetSectionBoundaries(bSet); break; //"Display/SectionBoundaries" + case 32: m_rParent.SetTableBoundaries(bSet); break; //"Display/TableBoundaries" + case 33: m_rParent.SetShowBoundaries(bSet); break; //"Display/ShowBoundaries" } } } |