sfx2/source/dialog/tabdlg.cxx | 5 +++++ 1 file changed, 5 insertions(+)
New commits: commit ea255040d92f45a8c823eaf756e7007e642541fe Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk> AuthorDate: Fri May 24 09:11:11 2019 -0400 Commit: Ashod Nakashian <ashnak...@gmail.com> CommitDate: Mon Nov 25 13:38:15 2019 +0100 sfx2: LOK: disable the Reset button from tabbed dialogs The reset functionality seems to be confusing to more than one user. Their expectation isn't always matching the functionality, perhaps because it has rough edges(?). Disabling for LOK to avoid this; users can Cancel and start over if they wish to do (which is what the Reset button is supposed to do in effect). (cherry picked from commit c3c28235cf1f853e644250ba110b2715a270a8b5) Change-Id: I4a744dd0263ab72a5858746c1f3572e62990a13b Reviewed-on: https://gerrit.libreoffice.org/83630 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com> Reviewed-by: Ashod Nakashian <ashnak...@gmail.com> diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index 41e438e5f6af..8ef457dd31a7 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -38,6 +38,7 @@ #include <vcl/builder.hxx> #include <vcl/IDialogRenderable.hxx> #include <sal/log.hxx> +#include <comphelper/lok.hxx> #include <sfx2/strings.hrc> #include <helpids.h> @@ -1484,6 +1485,10 @@ SfxTabDialogController::SfxTabDialogController m_xExampleSet.reset(new SfxItemSet(*m_pSet)); m_pOutSet.reset(new SfxItemSet(*m_pSet->GetPool(), m_pSet->GetRanges())); } + + // The reset functionality seems to be confusing to many; disable in LOK. + if (comphelper::LibreOfficeKit::isActive()) + RemoveResetButton(); } IMPL_LINK_NOARG(SfxTabDialogController, OkHdl, weld::Button&, void) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits