sc/source/core/data/formulacell.cxx | 2 +-
sw/source/ui/index/swuiidxmrk.cxx | 7 +++++++
2 files changed, 8 insertions(+), 1 deletion(-)
New commits:
commit f3b98808b13e7ec7bfcee9e249175cbb75ee7245
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Fri Mar 26 10:22:05 2021 +0100
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Fri Mar 26 11:52:40 2021 +0100
sc: fix incorrect comment
it's wrong since it was introduced in
12c95935f265b484c0a2fa13470085710729c903
$SC_FORCE_CALCULATION to force Calc use opencl/threads for everything
See sc/source/core/tool/calcconfig.cxx:39
Change-Id: I5569e220059d66a4bf71ec267cae603810c066c1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113149
Reviewed-by: Luboš Luňák <l.lu...@collabora.com>
Tested-by: Jenkins
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index cad18eb8022a..93e9067b9016 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -4607,7 +4607,7 @@ bool ScFormulaCell::InterpretFormulaGroup(SCROW
nStartOffset, SCROW nEndOffset)
return false;
}
- // Use SC_TEST_CALCULATION=opencl/threads to force calculation e.g. for
unittests
+ // Use SC_FORCE_CALCULATION=opencl/threads to force calculation e.g. for
unittests
static ForceCalculationType forceType =
ScCalcConfig::getForceCalculationType();
if (forceType == ForceCalculationCore
|| ( GetWeight() <
ScInterpreter::GetGlobalConfig().mnOpenCLMinimumFormulaGroupSize
commit 3b857c1d195003f75df6ab3633a263093e25cd91
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Fri Mar 26 09:30:20 2021 +0100
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Fri Mar 26 11:52:31 2021 +0100
sw edit bibliography entry dialog: apply after edit
Steps to reproduce the problem:
1) double-click on a bibliography entry field -> edit bibliography entry
dialog appears
2) click on "edit" button -> define bibliography entry sub-dialog
appears
3) change e.g. the URL there -> OK -> sub-dialog closes
4) click "close" -> outer dialog closes
And now the user is confused, because the field is not updated. This
works as expected if "apply" is pressed instead of "close".
This happens because the SwAuthMarkModalDlg that hosts the
SwAuthorMarkPane can be in insert or edit mode. The inner dialog just
updates in-memory state outside the doc model. This makes sense in
insert mode, so the user can fine-tune where to insert the field; but
a separate "apply" step in edit mode makes little sense.
Fix the problem by automatically applying the changed values in edit
mode.
Change-Id: I333225328d103f160f8120a2abc7a264322437a0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113146
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
Tested-by: Jenkins
diff --git a/sw/source/ui/index/swuiidxmrk.cxx
b/sw/source/ui/index/swuiidxmrk.cxx
index cb3339e3c55f..9ea9b3cf5e93 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -1296,6 +1296,13 @@ IMPL_LINK(SwAuthorMarkPane, CreateEntryHdl,
weld::Button&, rButton, void)
m_xAuthorFI->set_label(m_sFields[AUTH_FIELD_AUTHOR]);
m_xTitleFI->set_label(m_sFields[AUTH_FIELD_TITLE]);
m_xActionBT->set_sensitive(true);
+
+ if (!bNewEntry)
+ {
+ // When in edit mode, automatically apply the changed entry to update
the field in the doc
+ // model.
+ InsertHdl(*m_xActionBT);
+ }
}
IMPL_LINK_NOARG(SwAuthorMarkPane, ChangeSourceHdl, weld::ToggleButton&, void)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
