sc/source/ui/view/editsh.cxx | 11 +++++++---- sc/uiconfig/scalc/ui/conditionaleasydialog.ui | 8 ++++---- 2 files changed, 11 insertions(+), 8 deletions(-)
New commits: commit b7cba4953a072c88813ecd1886cd0fdaa5790de7 Author: Andras Timar <[email protected]> AuthorDate: Fri Jan 5 14:44:21 2024 +0100 Commit: Andras Timar <[email protected]> CommitDate: Sun Jan 7 16:36:40 2024 +0100 LOK: disallow entering multiple hyperlinks in spreadsheet cells This is for UX consistency. Previously it was allowed to enter multiple hyperlinks in spreadsheet cells when the spreadsheet was in OpenDocument format. Only in case of XLS/XLSX it was not possible. But we got a feedback that it is desirable to have a similar user experience for all spreadsheet file formats in Online. In LibreOffice nothing changes, it works according to the setting in Options - LibreOffice Calc - Compatibility - Hyperlinks. Change-Id: I7eece4307289711e9c925c05085497afaafe600e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161667 Reviewed-by: Attila Szűcs <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161729 Tested-by: Jenkins Reviewed-by: Andras Timar <[email protected]> diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx index 9ed398fb9876..c392f111e203 100644 --- a/sc/source/ui/view/editsh.cxx +++ b/sc/source/ui/view/editsh.cxx @@ -18,6 +18,7 @@ */ #include <comphelper/string.hxx> +#include <comphelper/lok.hxx> #include <scitems.hxx> #include <editeng/eeitem.hxx> #include <i18nutil/unicode.hxx> @@ -572,8 +573,9 @@ void ScEditShell::Execute( SfxRequest& rReq ) SvxLinkInsertMode eMode = pHyper->GetInsertMode(); bool bCellLinksOnly - = SC_MOD()->GetAppOptions().GetLinksInsertedLikeMSExcel() - && rViewData.GetSfxDocShell()->GetMedium()->GetFilter()->IsMSOFormat(); + = (SC_MOD()->GetAppOptions().GetLinksInsertedLikeMSExcel() + && rViewData.GetSfxDocShell()->GetMedium()->GetFilter()->IsMSOFormat()) + || comphelper::LibreOfficeKit::isActive(); bool bDone = false; if ( (eMode == HLINK_DEFAULT || eMode == HLINK_FIELD) && !bCellLinksOnly ) @@ -786,8 +788,9 @@ void ScEditShell::GetState( SfxItemSet& rSet ) { SvxHyperlinkItem aHLinkItem; bool bCellLinksOnly - = SC_MOD()->GetAppOptions().GetLinksInsertedLikeMSExcel() - && rViewData.GetSfxDocShell()->GetMedium()->GetFilter()->IsMSOFormat(); + = (SC_MOD()->GetAppOptions().GetLinksInsertedLikeMSExcel() + && rViewData.GetSfxDocShell()->GetMedium()->GetFilter()->IsMSOFormat()) + || comphelper::LibreOfficeKit::isActive(); std::unique_ptr<const SvxFieldData> aSvxFieldDataPtr(GetURLField()); const SvxURLField* pURLField(static_cast<const SvxURLField*>(aSvxFieldDataPtr.get())); if (!bCellLinksOnly) commit 96131f0e80f23ceeafab39508cafb68f33b8e58d Author: Andras Timar <[email protected]> AuthorDate: Fri Jan 5 12:02:41 2024 +0100 Commit: Andras Timar <[email protected]> CommitDate: Sun Jan 7 16:36:29 2024 +0100 context="stock" is not good for non-stock translatable strings Change-Id: Ieccef2b6b5604011d6eb72a168a5381ccdd7de99 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161658 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Andras Timar <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161728 Tested-by: Jenkins diff --git a/sc/uiconfig/scalc/ui/conditionaleasydialog.ui b/sc/uiconfig/scalc/ui/conditionaleasydialog.ui index c7a43c4cb256..2440952dea4e 100644 --- a/sc/uiconfig/scalc/ui/conditionaleasydialog.ui +++ b/sc/uiconfig/scalc/ui/conditionaleasydialog.ui @@ -5,7 +5,7 @@ <object class="GtkDialog" id="CondFormatEasyDlg"> <property name="can-focus">False</property> <property name="border-width">6</property> - <property name="title" translatable="yes" context="stock">Apply conditional formatting...</property> + <property name="title" translatable="yes" context="conditionaleasydialog|title">Apply conditional formatting...</property> <property name="type-hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox"> @@ -133,7 +133,7 @@ <object class="GtkLabel" id="with"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="label" translatable="yes" context="stock">with</property> + <property name="label" translatable="yes" context="conditionaleasydialog|label">with</property> <accessibility> <relation type="label-for" target="themeCombo"/> </accessibility> @@ -171,7 +171,7 @@ <object class="GtkLabel" id="description"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="label" translatable="yes" context="stock">Apply conditional formatting to cells: %1</property> + <property name="label" translatable="yes" context="conditionaleasydialog|label">Apply conditional formatting to cells: %1</property> <accessibility> <relation type="label-for" target="entryNumber"/> <relation type="label-for" target="entryNumber2"/> @@ -238,7 +238,7 @@ <object class="GtkLabel" id="range"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="label" translatable="yes" context="stock">Range:</property> + <property name="label" translatable="yes" context="conditionaleasydialog|label">Range:</property> <accessibility> <relation type="label-for" target="entryRange"/> </accessibility>
