[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - officecfg/registry sw/source
officecfg/registry/schema/org/openoffice/Office/Writer.xcs |6 ++
sw/source/core/text/txtfld.cxx |4 +++-
2 files changed, 9 insertions(+), 1 deletion(-)
New commits:
commit fd0d7e7916efa0fcb4796b6a8fd7fccb586d56db
Author: Matthew Kogan
AuthorDate: Fri Oct 13 14:53:24 2023 +0100
Commit: Xisco Fauli
CommitDate: Fri Oct 27 14:41:18 2023 +0200
tdf#154454 sw: make comparison of changed paragraph numbering optional
by the new config option "DisplayChangedParagraphNumbering", as a
temporary fix to hide incorrect changes in corner cases.
Regression from commit 2413f213625253a9c2b1787b3b9fe859d724a9bd
"tdf#115523 sw_redlinenum: show correct, also original numbering".
Change-Id: I6d85033cc3f60ac1075501fedfcd4c9862e00a9e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157940
Tested-by: László Németh
Reviewed-by: László Németh
(cherry picked from commit d67d47bf0e9c9b24fb9aeed8807c31ed28d7fec2)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158042
Tested-by: Jenkins
Reviewed-by: Ilmari Lauhakangas
Reviewed-by: Xisco Fauli
diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
index d09e31d0dbc8..57905ce11c1a 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
@@ -2622,6 +2622,12 @@
Specifies whether RSIDs are stored in the document
model.
+
+
+ Specifies whether changed paragraph numbering is
displayed.
+
+true
+
diff --git a/sw/source/core/text/txtfld.cxx b/sw/source/core/text/txtfld.cxx
index 7de5583cd1a9..68c32ee19b32 100644
--- a/sw/source/core/text/txtfld.cxx
+++ b/sw/source/core/text/txtfld.cxx
@@ -58,6 +58,7 @@
#include
#include
#include
+#include
static bool lcl_IsInBody( SwFrame const *pFrame )
{
@@ -626,7 +627,8 @@ SwNumberPortion *SwTextFormatter::NewNumberPortion(
SwTextFormatInfo ) con
if ( !aText.isEmpty() || !aHiddenText.isEmpty() )
{
-if (aText != aHiddenText && !aHiddenText.isEmpty())
+bool bDisplayChangedParagraphNumbering =
officecfg::Office::Writer::Comparison::DisplayChangedParagraphNumbering::get();
+if (bDisplayChangedParagraphNumbering && aText !=
aHiddenText && !aHiddenText.isEmpty())
{
bHasHiddenNum = true;
// show also original number after the actual one
enclosed in [ and ],
[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - officecfg/registry
officecfg/registry/data/org/openoffice/Office/Accelerators.xcu | 26 +- 1 file changed, 13 insertions(+), 13 deletions(-) New commits: commit afdf76ebab71f9d9f8b6e9e62ffdbc862b0a2379 Author: Caolán McNamara AuthorDate: Fri Aug 18 13:27:46 2023 +0100 Commit: Xisco Fauli CommitDate: Thu Oct 5 16:33:27 2023 +0200 tdf#151059 don't use Ctrl+Alt+3 etc by default for gallery because on some keyboard layouts ctrl+alt is basically equivalent to altgr and removes the possibility to enter specific letters. use Alt+3 etc because that 1-9 sequence seems free and unproblematic vs other combinations. If that doesn't work out then maybe we don't need one per sidebar entry and just have a single entry to jump to the sidebar toolbar and a follow up of press of 1-9 to activate a specific deck. Change-Id: I676d03c7e1c7bcb3b6c08e6d30aa23cf61838b38 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155831 Tested-by: Jenkins Reviewed-by: Caolán McNamara (cherry picked from commit 3614953bf1f4ada22247d04a772d1e3e1d361cef) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157549 Reviewed-by: Xisco Fauli diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu index a26b90b298d6..647b46927e5f 100644 --- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu @@ -344,25 +344,25 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for some emoji thing .uno:CommandPopup - + I10N SHORTCUTS - NO TRANSLATE .uno:SidebarDeck.PropertyDeck - + I10N SHORTCUTS - NO TRANSLATE .uno:SidebarDeck.StyleListDeck - + I10N SHORTCUTS - NO TRANSLATE .uno:SidebarDeck.GalleryDeck - + I10N SHORTCUTS - NO TRANSLATE .uno:SidebarDeck.NavigatorDeck @@ -605,7 +605,7 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for some emoji thing - + I10N SHORTCUTS - NO TRANSLATE .uno:SidebarDeck.ScFunctionsDeck @@ -1629,7 +1629,7 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for some emoji thing - + I10N SHORTCUTS - NO TRANSLATE .uno:SidebarDeck.ShapesDeck @@ -2908,25 +2908,25 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for some emoji thing - + I10N SHORTCUTS - NO TRANSLATE .uno:SidebarDeck.ShapesDeck - + I10N SHORTCUTS - NO TRANSLATE .uno:SidebarDeck.SdSlideTransitionDeck - + I10N SHORTCUTS - NO TRANSLATE .uno:SidebarDeck.SdCustomAnimationDeck - + I10N SHORTCUTS - NO TRANSLATE .uno:SidebarDeck.SdMasterPagesDeck @@ -6010,19 +6010,19 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for some emoji thing .uno:Grow - + I10N SHORTCUTS - NO TRANSLATE .uno:SidebarDeck.WriterPageDeck - + I10N SHORTCUTS - NO TRANSLATE .uno:SidebarDeck.InspectorDeck - + I10N SHORTCUTS - NO TRANSLATE .uno:SidebarDeck.A11yCheckDeck
[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - officecfg/registry
officecfg/registry/schema/org/openoffice/Office/Common.xcs |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 24bf5a2bfaae62e6e0218a4f2521f54e816cd459 Author: Justin Luth AuthorDate: Tue Jul 18 06:20:57 2023 -0400 Commit: Caolán McNamara CommitDate: Sun Jul 23 22:42:10 2023 +0200 Revert "tdf#152463 Turn on AutoSave and Backup by default" This reverts 7.6 commit 5cb7fed2a5a02ff1cb4551752a0bd8d3001a1f22. There are a number of reasons to delay this change: -the configuration settings have changed location, so anything done by others for the 7.6 release will be broken in the 24.2 release 6 months later. -lots of fixes for autosave are going into 24.2, but they can't be backported because they include string changes which need to be translated. Since AutoSave is not really production ready, it should not be enabled by default in 7.6. This should be reverted ASAP since people are already building 7.6 marketing. Change-Id: I31c56cf1b5605c9db3e0a431af76cf2dd14572de Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154578 Reviewed-by: Justin Luth Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index f47edadcae0f..1b650ba56018 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -2047,7 +2047,7 @@ saved in a time interval. AutoSave every - true + false @@ -2065,7 +2065,7 @@ document is saved. Always create backup copy - true + false
[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - officecfg/registry sc/source
officecfg/registry/schema/org/openoffice/Office/Calc.xcs |7 +++
sc/source/ui/view/cellsh4.cxx| 12
2 files changed, 15 insertions(+), 4 deletions(-)
New commits:
commit c7de706f5f4b32babdad1cf2ced4e79c802df46a
Author: Heiko Tietze
AuthorDate: Mon Jul 17 16:03:41 2023 +0200
Commit: Heiko Tietze
CommitDate: Fri Jul 21 14:51:01 2023 +0200
Resolves tdf#112876 - Make use of scroll lock configurable
Change-Id: I8e2f238e59601fcc1d92fc0593c3d20e75396cc5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154528
Reviewed-by: Mike Kaganski
Tested-by: Jenkins
(cherry picked from commit 4adc868328e958a4a9cead3731bd3468497c97c8)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154696
Reviewed-by: Heiko Tietze
diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index d282ca681fa0..0cb348ea087e 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -690,6 +690,13 @@
true
+
+
+ Toggles the scroll lock behavior allowing to disable it for
special keyboards
+ Toggles the scroll lock behavior allowing to disable it for
special keyboards
+
+true
+
Specifies the functions last used.
diff --git a/sc/source/ui/view/cellsh4.cxx b/sc/source/ui/view/cellsh4.cxx
index 13d6993634dd..e44dbe599dba 100644
--- a/sc/source/ui/view/cellsh4.cxx
+++ b/sc/source/ui/view/cellsh4.cxx
@@ -27,6 +27,7 @@
#include
#include
#include
+#include
#include
void ScCellShell::ExecuteCursor( SfxRequest& rReq )
@@ -121,10 +122,13 @@ void ScCellShell::ExecuteCursor( SfxRequest& rReq )
// If ScrollLock key is active, cell cursor stays on the current cell while
// scrolling the grid.
bool bScrollLock = false;
-KeyIndicatorState eState = pFrameWin->GetIndicatorState();
-if (eState & KeyIndicatorState::SCROLLLOCK)
-bScrollLock = true;
-
+// tdf#112876 - allow to disable for special keyboards
+if (officecfg::Office::Calc::Input::UseScrollLock::get())
+{
+KeyIndicatorState eState = pFrameWin->GetIndicatorState();
+if (eState & KeyIndicatorState::SCROLLLOCK)
+bScrollLock = true;
+}
//OS: once for all should do, however!
pTabViewShell->ExecuteInputDirect();
switch ( nSlotId )
[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu | 14 ++ 1 file changed, 14 insertions(+) New commits: commit 85c32bc8cfb22cc81ef5bf3ca3396b46376de59f Author: Julien Nabet AuthorDate: Thu Jun 15 18:26:36 2023 +0200 Commit: Xisco Fauli CommitDate: Fri Jun 16 09:19:48 2023 +0200 Related tdf#148263: on Writer, no need to repeat "Delete" for columns To reproduce the regression, just do this: - launch Writer - create a by default 2x2 table - select a cell - right click and take a look at sub-entries of Delete entry Change-Id: I05bf4824e0786f1b4ea73b24389d38858e01818e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153122 Tested-by: Julien Nabet Reviewed-by: Julien Nabet (cherry picked from commit 6b6428228963f7a9edc99173f46fc4221097e0cf) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153132 Tested-by: Jenkins Reviewed-by: Xisco Fauli diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu index b5f215d7d9e5..e1631728ec94 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu @@ -1825,6 +1825,20 @@ 1 + + + Delete Columns + + + ~Columns + + + Delete selected columns + + + 1 + + Delete Table
