cui/source/dialogs/iconcdlg.cxx | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
New commits: commit 47741aa17113efb1dcd002c1e1d81d66e16fd1cb Author: Ashod Nakashian <[email protected]> AuthorDate: Sat May 25 16:22:14 2019 -0400 Commit: Ashod Nakashian <[email protected]> CommitDate: Mon Dec 2 04:40:59 2019 +0100 LOK: remove the Reset button from the Hyperlink dialog Some find the reset functionality confusing, so we remove it altogether in LOK. Users can still cancel the dialog and start over for the same effect as using the Reset button. Change-Id: I607f457d5840820df8610da1cc805deac58d60a1 (cherry picked from commit fee013c238bd6914a737c0b47d1d5e3347b2e2ac) Reviewed-on: https://gerrit.libreoffice.org/83632 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Ashod Nakashian <[email protected]> diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx index a652ca151881..14408d963e5f 100644 --- a/cui/source/dialogs/iconcdlg.cxx +++ b/cui/source/dialogs/iconcdlg.cxx @@ -29,6 +29,7 @@ #include <vcl/i18nhelp.hxx> #include <vcl/settings.hxx> #include <vcl/builderfactory.hxx> +#include <comphelper/lok.hxx> using std::vector; @@ -181,7 +182,10 @@ IconChoiceDialog::IconChoiceDialog ( vcl::Window* pParent, const OUString& rID, m_pApplyBtn->Show(); m_pCancelBtn->Show(); m_pHelpBtn->Show(); - m_pResetBtn->Show(); + if (comphelper::LibreOfficeKit::isActive()) + m_pResetBtn->Hide(); + else + m_pResetBtn->Show(); } IconChoiceDialog ::~IconChoiceDialog () @@ -376,7 +380,10 @@ void IconChoiceDialog::ActivatePageImpl () SetHelpId( pData->pPage->GetHelpId() ); } - m_pResetBtn->Show(); + if (comphelper::LibreOfficeKit::isActive()) + m_pResetBtn->Hide(); + else + m_pResetBtn->Show(); } _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
