subject:"core.git\: officecfg\/registry"

core.git: officecfg/registry

2026-03-22 Thread Jim Raykowski (via logerrit)

 officecfg/registry/data/org/openoffice/Office/Accelerators.xcu |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 652e1d41e219285e66b73f28db2e84853800ea65
Author: Jim Raykowski 
AuthorDate: Wed Mar 18 01:32:21 2026 -0800
Commit: Jim Raykowski 
CommitDate: Sun Mar 22 08:04:51 2026 +0100

tdf#171259 Change Alt+PgUp/PgDn UNOs to match Navigator page movements

Change-Id: Ib143af185c2396dea999537ea64e9c12933b8845
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/201988
Reviewed-by: Jim Raykowski 
Tested-by: Jenkins

diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu 
b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index 83d682637b80..0b698c01a48f 100644
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -6828,7 +6828,7 @@ Ctrl+Shift+u aka U_SHIFT_MOD1 under GTK/IBUS is for 
unicode key input
 
   
 L10N SHORTCUTS - NO 
TRANSLATE
-.uno:GoToStartOfNextPage
+.uno:GoToNextPage
   
 
 
@@ -6858,7 +6858,7 @@ Ctrl+Shift+u aka U_SHIFT_MOD1 under GTK/IBUS is for 
unicode key input
 
   
 L10N SHORTCUTS - NO 
TRANSLATE
-.uno:GoToStartOfPrevPage
+.uno:GoToPrevPage

core.git: officecfg/registry

2026-03-18 Thread Ilmari Lauhakangas (via logerrit)

 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 38ea6c42fd0bfdb0904d182627229cf224c1b822
Author: Ilmari Lauhakangas 
AuthorDate: Tue Mar 17 15:27:52 2026 +0200
Commit: Ilmari Lauhakangas 
CommitDate: Thu Mar 19 06:24:04 2026 +0100

tdf#160143 Fix accelerator conflict for Delete Columns

Change-Id: Ib242ac44805e9215be7260299ff34a5837277ad3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/201912
Tested-by: Jenkins
Reviewed-by: Ilmari Lauhakangas 

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 2a5fb829fdbc..1b1af5583b5a 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -7620,7 +7620,7 @@ bit 3 (0x8): #define 
UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8
   Delete Columns
 
 
-  Delete ~Columns
+  ~Delete Columns
 
 
   Delete selected columns

core.git: officecfg/registry sw/inc sw/sdi sw/source sw/uiconfig

2026-03-02 Thread Moritz Duge (via logerrit)

 officecfg/registry/data/org/openoffice/Office/Accelerators.xcu  |   12 ++--
 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |2 
 sw/inc/docufld.hxx  |4 +
 sw/sdi/swriter.sdi  |2 
 sw/source/core/fields/docufld.cxx   |9 +++
 sw/source/core/fields/fldbas.cxx|3 -
 sw/source/core/unocore/unofield.cxx |2 
 sw/source/core/unocore/unomap.cxx   |1 
 sw/source/uibase/shells/basesh.cxx  |   25 
++
 sw/source/uibase/shells/textfld.cxx |8 ++-
 sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx|   13 
+++--
 sw/uiconfig/sglobal/menubar/menubar.xml |2 
 sw/uiconfig/sweb/menubar/menubar.xml|2 
 sw/uiconfig/swform/menubar/menubar.xml  |2 
 sw/uiconfig/swreport/menubar/menubar.xml|2 
 sw/uiconfig/swriter/menubar/menubar.xml |2 
 sw/uiconfig/swriter/ui/navigatorpanel.ui|2 
 sw/uiconfig/swriter/ui/notebookbar.ui   |2 
 sw/uiconfig/swriter/ui/notebookbar_compact.ui   |2 
 sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui|2 
 sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui   |2 
 sw/uiconfig/swxform/menubar/menubar.xml |2 
 22 files changed, 77 insertions(+), 26 deletions(-)

New commits:
commit c4189d97fb78fa3687febbb9260b4c6477068182
Author: Moritz Duge 
AuthorDate: Sun Feb 8 02:32:30 2026 +0100
Commit: Moritz Duge 
CommitDate: Mon Mar 2 13:19:57 2026 +0100

tdf#156499 new SoftFixed to complement Fixed field state

Use instead of Fixed when importing DOCX and RTF DocProperty fields
whose text does not match the File - Properties - Custom variable's
content.

SoftFixed allows users to trigger updates via UI (Update All, F9, ...).
But fields won't update automatically, matching the MSO behaviour.

see also tdf#147861 and commit c4cb1d1dd581a5f120d9cf8b1d4274ec38f3eabe

Change-Id: Iaeecfd48a58abf0827f07be5522f3cb03e25ac8d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198894
Tested-by: Jenkins
Reviewed-by: Moritz Duge 
Reviewed-by: Justin Luth 

diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu 
b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index fae92d2d866f..83d682637b80 100644
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -2541,7 +2541,7 @@ Ctrl+Shift+u aka U_SHIFT_MOD1 under GTK/IBUS is for 
unicode key input
 
   
 L10N SHORTCUTS - NO 
TRANSLATE
-.uno:UpdateFields
+.uno:UpdateFields?UnlockSoftFixed:bool=1
   
 
 
@@ -4085,7 +4085,7 @@ Ctrl+Shift+u aka U_SHIFT_MOD1 under GTK/IBUS is for 
unicode key input
 
   
 L10N SHORTCUTS - NO 
TRANSLATE
-.uno:UpdateFields
+.uno:UpdateFields?UnlockSoftFixed:bool=1
   
 
 
@@ -4882,7 +4882,7 @@ Ctrl+Shift+u aka U_SHIFT_MOD1 under GTK/IBUS is for 
unicode key input
 
   
 L10N SHORTCUTS - NO 
TRANSLATE
-.uno:UpdateFields
+.uno:UpdateFields?UnlockSoftFixed:bool=1
   
 
 
@@ -5684,7 +5684,7 @@ Ctrl+Shift+u aka U_SHIFT_MOD1 under GTK/IBUS is for 
unicode key input
 
   
 L10N SHORTCUTS - NO 
TRANSLATE
-.uno:UpdateFields
+.uno:UpdateFields?UnlockSoftFixed:bool=1
   
 
 
@@ -6630,7 +6630,7 @@ Ctrl+Shift+u aka U_SHIFT_MOD1 under GTK/IBUS is for 
unicode key input
 
   
 L10N SHORTCUTS - NO 
TRANSLATE
-.uno:UpdateFields
+.uno:UpdateFields?UnlockSoftFixed:bool=1
   
 
 
@@ -7501,7 +7501,7 @@ Ctrl+Shift+u aka U_SHIFT_MOD1 under GTK/IBUS is for 
unicode key input
 
   
 L10N SHORTCUTS - NO 
TRANSLATE
-.uno:UpdateFields
+.uno:UpdateFields?UnlockSoftFixed:bool=1
   
 
 
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 8e8bd514810f..60eacde2cc73 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -2120,7 +2120,7 @@
   1

core.git: officecfg/registry sw/inc sw/sdi sw/source sw/uiconfig

2026-03-01 Thread shlok3640 (via logerrit)

 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |8 +
 sw/inc/cmdid.h  |1 
 sw/inc/strings.hrc  |2 
 sw/sdi/_textsh.sdi  |7 
 sw/sdi/swriter.sdi  |   15 ++
 sw/source/uibase/shells/textsh1.cxx |   72 
++
 sw/uiconfig/swriter/menubar/menubar.xml |1 
 7 files changed, 106 insertions(+)

New commits:
commit d2cd98b66f099b77ad7c45f8d9a9f6f4adae1439
Author: shlok3640 
AuthorDate: Fri Feb 27 10:54:06 2026 +
Commit: Heiko Tietze 
CommitDate: Sun Mar 1 14:24:17 2026 +0100

tdf#168272 Add Insert Landscape Page function

Change-Id: I9efd61029b400d4af1662259937ca272e4709938
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200606
Reviewed-by: Heiko Tietze 
Tested-by: Jenkins

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 936b8bb57838..8e8bd514810f 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -847,6 +847,14 @@
   1
 
   
+  
+
+  Insert Landscape Page Break
+
+
+  1
+
+  
   
 
   Table
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index b77f535a6d3d..1b0449c5b67f 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -236,6 +236,7 @@ class SwUINumRuleItem;
 #define FN_INSERT_CHECKBOX_CONTENT_CONTROL (FN_INSERT + 21)  /* Checkbox 
content control */
 #define FN_INSERT_OBJECT_DLG(FN_INSERT + 22)/* Object */
 #define FN_INSERT_PAGEBREAK (FN_INSERT + 23)/* Page break*/
+#define FN_INSERT_LANDSCAPE_PAGE(FN_INSERT + 55)
 #define FN_INSERT_DROPDOWN_CONTENT_CONTROL (FN_INSERT + 24)  /* Dropdown 
content control */
 #define FN_CONTENT_CONTROL_PROPERTIES (FN_INSERT + 25)  /* Content control 
properties */
 #define FN_INSERT_PICTURE_CONTENT_CONTROL (FN_INSERT + 26) /* Picture content 
control */
diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
index cd0160b28e72..04763d6a3097 100644
--- a/sw/inc/strings.hrc
+++ b/sw/inc/strings.hrc
@@ -462,6 +462,8 @@
 #define STR_COPY_UNDO   NC_("STR_COPY_UNDO", "Copy: 
$1")
 #define STR_REPLACE_UNDONC_("STR_REPLACE_UNDO", 
"Replace $1 $2 $3")
 #define STR_INSERT_PAGE_BREAK_UNDO  
NC_("STR_INSERT_PAGE_BREAK_UNDO", "Insert page break")
+#define STR_INSERT_PORTRAIT_PAGE
NC_("STR_INSERT_PORTRAIT_PAGE", "Insert Portrait Page Break")
+#define STR_INSERT_LANDSCAPE_PAGE   
NC_("STR_INSERT_LANDSCAPE_PAGE", "Insert Landscape Page Break")
 #define STR_INSERT_COLUMN_BREAK_UNDO
NC_("STR_INSERT_COLUMN_BREAK_UNDO", "Insert column break")
 #define STR_INSERT_ENV_UNDO NC_("STR_INSERT_ENV_UNDO", 
"Insert Envelope")
 #define STR_DRAG_AND_COPY   NC_("STR_DRAG_AND_COPY", 
"Copy: $1")
diff --git a/sw/sdi/_textsh.sdi b/sw/sdi/_textsh.sdi
index 87aeb4c9935d..c74f30430ea3 100644
--- a/sw/sdi/_textsh.sdi
+++ b/sw/sdi/_textsh.sdi
@@ -277,6 +277,13 @@ interface BaseText
 StateMethod = GetState ;
 ]
 
+FN_INSERT_LANDSCAPE_PAGE // status(final|play)
+[
+ExecMethod = Execute ;
+StateMethod = GetState ;
+DisableFlags="SfxDisableFlags::SwOnProtectedCursor" ;
+]
+
 FN_INSERT_PAGEBREAK // status(final|play)
 [
 ExecMethod = ExecInsert ;
diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index a39a202c1cda..e4a5b523ad0a 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -3408,7 +3408,22 @@ SfxVoidItem TransformDocumentStructure 
FN_TRANSFORM_DOCUMENT_STRUCTURE
 ToolBoxConfig = TRUE,
 GroupId = SfxGroupId::Edit;
 ]
+SfxVoidItem InsertLandscapePage FN_INSERT_LANDSCAPE_PAGE
+()
+[
+AutoUpdate = FALSE,
+FastCall = FALSE,
+ReadOnlyDoc = FALSE,
+Toggle = FALSE,
+Container = FALSE,
+RecordAbsolute = FALSE,
+RecordPerSet;
 
+AccelConfig = TRUE,
+MenuConfig = TRUE,
+ToolBoxConfig = TRUE,
+GroupId = SfxGroupId::Insert;
+]
 SfxVoidItem InsertMultiIndex FN_INSERT_MULTI_TOX
 ()
 [
diff --git a/sw/source/uibase/shells/textsh1.cxx 
b/sw/source/uibase/shells/textsh1.cxx
index e00d90ab7be6..b7cb581d95f3 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -92,6 +92,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -957,6 +959,57 @@ void SwTextShell::Execute(SfxRequest &rReq)
 pArgs->GetItemState(GetPool().GetWhichIDFromSlotID(nSlot), false, 
&pItem);
 switch( nSlot )
 {
+case FN_INSERT_LANDSCAPE_PAGE:
+

core.git: officecfg/registry

2026-02-25 Thread Samuel Mehrbrodt (via logerrit)

 officecfg/registry/data/org/openoffice/Office/UI.xcu |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit df5fd71899304f310ff931f73eed497c28fd8b66
Author: Samuel Mehrbrodt 
AuthorDate: Mon Feb 23 16:02:06 2026 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Thu Feb 26 07:47:52 2026 +0100

Fix duplicate filters in text document class

* Remove duplicate WordPerfect entry
* Remove writerglobal8 and writerweb8_writer_template
  which already belong to their own GlobalDocument and WebDocument global 
filter classes

This fixes warnings like:
  
warn:sfx.dialog:1688061:1688061:sfx2/source/dialog/filtergrouping.cxx:357: 
already have an element for WordPerfect
  
warn:sfx.dialog:1688061:1688061:sfx2/source/dialog/filtergrouping.cxx:357: 
already have an element for writerweb8_writer_template
  
warn:sfx.dialog:1688061:1688061:sfx2/source/dialog/filtergrouping.cxx:357: 
already have an element for writerglobal8

Change-Id: I6fd0527d943224de76a1b72eabcb2ba0aea2af1c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200066
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 

diff --git a/officecfg/registry/data/org/openoffice/Office/UI.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI.xcu
index 5ef896681953..2b08e08bbf7a 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI.xcu
@@ -26,7 +26,7 @@
 Text documents (Writer)
   
   
-AportisDoc Palm DB;HTML 
(StarWriter);LotusWordPro;MS Word 2003 XML;MS Word 2007 XML;MS Word 2007 XML 
Template;MS Word 97;MS Word 97 Vorlage;MS_Works;Office Open XML Text;Office 
Open XML Text Template;OpenDocument Text Flat XML;PocketWord File;Rich Text 
Format;StarOffice XML 
(Writer);Markdown;Text;WordPerfect;WordPerfect;writer_MIZI_Hwp_97;writer_StarOffice_XML_Writer_Template;writer8;writer8_template;writerglobal8;writerweb8_writer_template
+AportisDoc Palm DB;HTML 
(StarWriter);LotusWordPro;MS Word 2003 XML;MS Word 2007 XML;MS Word 2007 XML 
Template;MS Word 97;MS Word 97 Vorlage;MS_Works;Office Open XML Text;Office 
Open XML Text Template;OpenDocument Text Flat XML;PocketWord File;Rich Text 
Format;StarOffice XML 
(Writer);Markdown;Text;WordPerfect;writer_MIZI_Hwp_97;writer_StarOffice_XML_Writer_Template;writer8;writer8_template

core.git: officecfg/registry sc/inc sc/qa sc/sdi sc/source sc/uiconfig

2026-02-24 Thread Tomaž Vajngerl (via logerrit)

 officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu |8 
 sc/inc/globstr.hrc|1 
 sc/inc/sc.hrc |4 
 sc/inc/sortparam.hxx  |9 
 sc/qa/unit/helper/qahelper.cxx|   44 ++
 sc/qa/unit/helper/qahelper.hxx|4 
 sc/qa/unit/ucalc_sort.cxx |  196 
++
 sc/sdi/cellsh.sdi |1 
 sc/sdi/scalc.sdi  |   17 
 sc/source/core/data/sortparam.cxx |6 
 sc/source/core/data/table3.cxx|   38 +
 sc/source/ui/docshell/dbdocfun.cxx|   12 
 sc/source/ui/undo/undosort.cxx|2 
 sc/source/ui/view/cellsh2.cxx |   24 +
 sc/uiconfig/scalc/menubar/menubar.xml |1 
 15 files changed, 351 insertions(+), 16 deletions(-)

New commits:
commit a8ae0abbd646443a65dc2e5f44c395fb5a454a29
Author: Tomaž Vajngerl 
AuthorDate: Mon Feb 23 13:39:24 2026 +0900
Commit: Tomaž Vajngerl 
CommitDate: Wed Feb 25 02:24:28 2026 +0100

tdf#158196 Shuffle operation to randomly shuffle a cell range

Useful for statistics where it is needed to shuffle the entries
or to have a randomly shuffled range of numbers.

Implementation reuses what was already there to sort a cell range
but uses its own random reordering function.

Change-Id: Ibfceb0825c2b2a3e63b0e6a45963dd043464b77a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/22963
Reviewed-by: Tomaž Vajngerl 
Tested-by: Jenkins

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index e7b584b32d3f..3dbc69f5dfe3 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -2192,6 +2192,14 @@
   1
 
   
+  
+
+  Shuffle
+
+
+  1
+
+  
   
 
   Rename S~heet...
diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index f386f4220adb..6a24c9224314 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -69,6 +69,7 @@
 #define STR_UNDO_SUBTOTALS  NC_("STR_UNDO_SUBTOTALS", 
"Subtotals")
 #define STR_UNDO_TABLETOTALSNC_("STR_UNDO_TABLETOTALS", 
"Table Total Row")
 #define STR_UNDO_SORT   NC_("STR_UNDO_SORT", "Sort")
+#define STR_UNDO_SHUFFLENC_("STR_UNDO_SHUFFLE", 
"Shuffle")
 #define STR_UNDO_QUERY  NC_("STR_UNDO_QUERY", "Filter")
 #define STR_UNDO_DBADDTABLE NC_("STR_UNDO_DBTABLE", 
"Create table")
 #define STR_UNDO_DBREMTABLE NC_("STR_UNDO_DBTABLE", 
"Delete table")
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 9dc545881550..86a239b531f4 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -386,8 +386,8 @@ class SvxZoomSliderItem;
 #define SID_OUTLINE_SHOW(DATA_MENU_START + 26)
 #define SID_OUTLINE_MAKETypedWhichId(DATA_MENU_START + 
27)
 #define SID_OUTLINE_REMOVE  TypedWhichId(DATA_MENU_START + 
28)
-
-#define DATA_MENU_END   (DATA_MENU_START + 29)
+#define SID_SHUFFLE (DATA_MENU_START + 29)
+#define DATA_MENU_END   (DATA_MENU_START + 30)
 
 #define TAB_POPUP_START (DATA_MENU_END)
 #define FID_TAB_MENU_RENAME (TAB_POPUP_START)
diff --git a/sc/inc/sortparam.hxx b/sc/inc/sortparam.hxx
index 0de0e3bbdb1b..44a8a50fbdc7 100644
--- a/sc/inc/sortparam.hxx
+++ b/sc/inc/sortparam.hxx
@@ -37,6 +37,12 @@ struct ScQueryParam;
 class SdrObject;
 class ScPostIt;
 
+enum class SortOrderType
+{
+Ordered,
+Random
+};
+
 /** Sort by which color */
 enum class ScColorSortMode {
 None,
@@ -156,6 +162,7 @@ struct SC_DLLPUBLIC ScSortParam
 css::lang::Locale aCollatorLocale;
 OUStringaCollatorAlgorithm;
 sal_uInt16  nCompatHeader;
+SortOrderType meSortOrderType = SortOrderType::Ordered;
 
 ScSortParam();
 ScSortParam( const ScSortParam& r );
@@ -363,6 +370,7 @@ struct ReorderParam
 bool mbHiddenFiltered;
 bool mbUpdateRefs;
 bool mbHasHeaders;
+bool mbShuffle;
 
 /**
  * Reorder the position indices such that it can be used to undo the
@@ -375,6 +383,7 @@ struct ReorderParam
 , mbHiddenFiltered(false)
 , mbUpdateRefs(false)
 , mbHasHeaders(false)
+, mbShuffle(false)
 {
 }
 };
diff --git a/sc/qa/unit/helper/qahelper.cxx b/sc/qa/unit/helper/qahelper.cxx
index 73fa003745e7..6e513ba7ff65 100644
--- a/sc/qa

core.git: officecfg/registry

2026-02-23 Thread Rahul Anand (via logerrit)

 officecfg/registry/data/org/openoffice/Office/Accelerators.xcu |   12 
++
 1 file changed, 3 insertions(+), 9 deletions(-)

New commits:
commit bf1cb18b1a98210538febfde1479eec0eb52bb2b
Author: Rahul Anand 
AuthorDate: Mon Feb 9 16:23:14 2026 +0530
Commit: Heiko Tietze 
CommitDate: Mon Feb 23 11:09:03 2026 +0100

tdf#148648 Change shortcut Shift+Ctrl+R from ruler to cross-reference

Change-Id: I09c9036bd425e0ed5cee48037df37ac046d287c3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198969
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu 
b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index feba2feb8c9c..fae92d2d866f 100644
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -2828,7 +2828,7 @@ Ctrl+Shift+u aka U_SHIFT_MOD1 under GTK/IBUS is for 
unicode key input
 
   
 L10N SHORTCUTS - NO 
TRANSLATE
-.uno:Ruler
+.uno:InsertReferenceField
   
 
 
@@ -4369,12 +4369,6 @@ Ctrl+Shift+u aka U_SHIFT_MOD1 under GTK/IBUS is for 
unicode key input
 .uno:RightPara
   
 
-
-  
-L10N SHORTCUTS - NO 
TRANSLATE
-.uno:Ruler
-  
-
 
   
 L10N SHORTCUTS - NO 
TRANSLATE
@@ -6948,7 +6942,7 @@ Ctrl+Shift+u aka U_SHIFT_MOD1 under GTK/IBUS is for 
unicode key input
 
   
 L10N SHORTCUTS - NO 
TRANSLATE
-.uno:Ruler
+.uno:InsertReferenceField
   
 
 
@@ -7794,7 +7788,7 @@ Ctrl+Shift+u aka U_SHIFT_MOD1 under GTK/IBUS is for 
unicode key input
 
   
 L10N SHORTCUTS - NO 
TRANSLATE
-.uno:Ruler
+.uno:InsertReferenceField

core.git: officecfg/registry

2026-02-09 Thread Michael Weghorn (via logerrit)

 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |   10 
++
 1 file changed, 10 insertions(+)

New commits:
commit a7a91d5b42191da921ff8fafe61c1b288e3659f6
Author: Michael Weghorn 
AuthorDate: Mon Feb 9 10:05:50 2026 +0100
Commit: Michael Weghorn 
CommitDate: Mon Feb 9 14:07:30 2026 +0100

tdf#170387 officefcg: Restore label for PackageManagerDialog service

The use of "service:com.sun.star.deployment.ui.PackageManagerDialog"
in menus etc. was replaced by the new UNO command
".uno:ExtensionManager" in

commit be04a19fa2b8357520e6d0297466e1909a3c3995
Author: Michael Weghorn 
Date:   Fri Nov 7 13:59:50 2025 +0100

tdf#169318 tdf#127201 extension mgr: Open via new UNO command

However, old configurations (e.g. a menubar configuration
saved into a document) may still reference
"service:com.sun.star.deployment.ui.PackageManagerDialog".

Restore the corresponding entry in GenericCommands.xcu
so that those entries are again shown with their "Extensions..."
label instead of an empty string.

Change-Id: I403297dbca2f1820b1ff634b3e9641c60be9b29f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198964
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 75a6bb1804a5..74f60060e2c6 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -6823,6 +6823,16 @@ bit 3 (0x8): #define 
UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8
   1
 
   
+  
+  
+
+  ~Extensions...
+
+
+  1
+
+  
   
 
   Digital Signatu~res...

core.git: officecfg/registry

2026-02-02 Thread Heiko Tietze (via logerrit)

 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |3 ---
 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu  |3 ---
 2 files changed, 6 deletions(-)

New commits:
commit 29ad5237a85e0f2ffc69b34905967cf5b0683a85
Author: Heiko Tietze 
AuthorDate: Wed Jan 28 13:12:02 2026 +0100
Commit: Heiko Tietze 
CommitDate: Mon Feb 2 17:43:10 2026 +0100

Resolves tdf#169767 - More informative label for Clone Formatting

Change-Id: I1d6453662210c4d281ce125eac17904dc100c050
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198288
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index bea72c96840e..75a6bb1804a5 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -4650,9 +4650,6 @@ bit 3 (0x8): #define 
UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8
   
   
 
-  Clone
-
-
   Clone Formatting
 
 
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index cd2a862e26aa..936b8bb57838 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -3339,9 +3339,6 @@
   
   
 
-  Clone
-
-
   Clone Formatting

core.git: officecfg/registry

2026-02-02 Thread Heiko Tietze (via logerrit)

 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |   10 
+-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit c7728bf944cfcc8384c6176441ccfba5a63467ee
Author: Heiko Tietze 
AuthorDate: Wed Jan 28 12:32:19 2026 +0100
Commit: Heiko Tietze 
CommitDate: Mon Feb 2 17:41:15 2026 +0100

Resolves tdf#169766 - Make UNO command labeled "New" more informative

Change-Id: I58584e486b344e44eaf9d4bbb3bde62bbaae7386
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198286
Reviewed-by: Heiko Tietze 
Tested-by: Jenkins

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index dfd7dfcce3c0..bea72c96840e 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -3312,7 +3312,10 @@ bit 3 (0x8): #define 
UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8
   
   
 
-  ~New
+  ~New Document
+
+
+  New
 
 
   1
@@ -3568,11 +3571,8 @@ bit 3 (0x8): #define 
UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8
 
   
   
-
-  ~New Style from Selection
-
 
-  New
+  New Style from Selection
 
 
   1

core.git: officecfg/registry sc/inc sc/Library_sc.mk sc/source sc/uiconfig sc/UIConfig_scalc.mk sfx2/source vcl/jsdialog

2026-01-29 Thread Balazs Varga (via logerrit)

 officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu |5 
 sc/Library_sc.mk  |2 
 sc/UIConfig_scalc.mk  |1 
 sc/inc/TableStylesControl.hxx |   32 +
 sc/source/ui/app/scdll.cxx|2 
 sc/source/ui/cctrl/TableStylesBox.cxx |  141 ++
 sc/source/ui/cctrl/TableStylesControl.cxx |   65 +++
 sc/source/ui/inc/TableStylesBox.hxx   |   43 ++
 sc/source/ui/view/tabview3.cxx|1 
 sc/uiconfig/scalc/ui/notebookbar_online.ui|   25 +
 sc/uiconfig/scalc/ui/tablestylesbox.ui|  202 
++
 sfx2/source/control/unoctitm.cxx  |1 
 vcl/jsdialog/enabled.cxx  |1 
 vcl/jsdialog/jsdialogbuilder.cxx  |4 
 14 files changed, 522 insertions(+), 3 deletions(-)

New commits:
commit 8f928fa25cef8673cea07a3cdf682192266419e2
Author: Balazs Varga 
AuthorDate: Wed Nov 26 09:04:21 2025 +0100
Commit: Balazs Varga 
CommitDate: Thu Jan 29 09:32:39 2026 +0100

Table Styles: Add NoteBookBar implementation for table styles

New ui file for the notebookbars which includes all the database
settings options.

Also fix some view shell issue when we deselect a table context
and Insert Table is not active

Since JSCheckButton is kind of a button which can have a default
state (false) always need to send Update to online for registering
the api call connecting to the checkbutton.

Change-Id: Ie9701d2897b389c2a0192650a2f907e5fae59673
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194917
Reviewed-by: Gökay ŞATIR 
Tested-by: Jenkins CollaboraOffice 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196772
Reviewed-by: Balazs Varga 
Tested-by: Balazs Varga 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197998
Tested-by: Jenkins

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index b967140a304a..e7b584b32d3f 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -1164,6 +1164,11 @@
   1
 
   
+  
+
+  Table Style Options
+
+  
   
 
   ~Table
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index b7cdaedbf717..05800e33aba0 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -409,6 +409,8 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
 sc/source/ui/cctrl/tbzoomsliderctrl \
 sc/source/ui/cctrl/SheetViewBox \
 sc/source/ui/cctrl/SheetViewControl \
+sc/source/ui/cctrl/TableStylesBox \
+sc/source/ui/cctrl/TableStylesControl \
 sc/source/ui/condformat/condformatdlg \
 sc/source/ui/condformat/condformatdlgentry \
 sc/source/ui/condformat/condformatdlgdata \
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index e3352482f77c..fbc7e5c78699 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -266,6 +266,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/subtotaloptionspage \
sc/uiconfig/scalc/ui/subtotalgrppage \
sc/uiconfig/scalc/ui/statisticsinfopage \
+   sc/uiconfig/scalc/ui/tablestylesbox \
sc/uiconfig/scalc/ui/tabcolordialog \
sc/uiconfig/scalc/ui/textimportoptions \
sc/uiconfig/scalc/ui/textimportcsv \
diff --git a/sc/inc/TableStylesControl.hxx b/sc/inc/TableStylesControl.hxx
new file mode 100644
index ..a0bf7aeb002a
--- /dev/null
+++ b/sc/inc/TableStylesControl.hxx
@@ -0,0 +1,32 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#pragma once
+
+#include 
+
+namespace sc
+{
+/** Toolbox control for showing the Table Styles in the toolbar / notebookbar 
*/
+class TableStylesControl final : public SfxToolBoxControl
+{
+public:
+SFX_DECL_TOOLBOX_CONTROL();
+
+TableStylesControl(sal_uInt16 nSlotId, ToolBoxItemId nId, ToolBox& 
rToolBox);
+virtual ~TableStylesControl() override;
+
+virtual void StateChangedAtToolBoxControl(sal_uInt16 nSID, SfxItemState 
eState,
+  const SfxPoolItem* pState) 
override;
+virtual VclPtr CreateItemWindow(vcl::Window* pParent) 
override;
+};
+
+} // end of namespace sc
+
+/

core.git: officecfg/registry

2026-01-22 Thread Heiko Tietze (via logerrit)

 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |8 
+++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit e2d7bc21ea537cf07dd80482039879e5957bb6d3
Author: Heiko Tietze 
AuthorDate: Thu Jan 22 13:40:04 2026 +0100
Commit: Heiko Tietze 
CommitDate: Fri Jan 23 08:08:42 2026 +0100

Resolves tdf#169975 - Show "Column" instead "Section" on Tool- and 
Notebookbar

Change-Id: I10c0ada85e92a1c9d96bff6670ed1b72aa4d4f6d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197808
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index cd6dbcd61764..cd2a862e26aa 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -138,7 +138,13 @@
   
   
 
-  Se~ction...
+  Columns
+
+
+  Section...
+
+
+  Insert a section with columns
 
 
   1

core.git: officecfg/registry sw/source

2026-01-22 Thread Aron Budea (via logerrit)

 officecfg/registry/schema/org/openoffice/Office/Common.xcs |4 +--
 sw/source/uibase/wrtsh/wrtsh1.cxx  |   16 -
 2 files changed, 12 insertions(+), 8 deletions(-)

New commits:
commit 02796c7467903d10e9cc38fc50acce4994537b7a
Author: Aron Budea 
AuthorDate: Tue Jan 20 03:25:07 2026 +1030
Commit: Aron Budea 
CommitDate: Thu Jan 22 11:46:19 2026 +0100

Related: tdf#169441 Improve description and handling of mismatching config

Use default bullet font if DefaultListBulletsFonts is shorter
than DefaultListBullets.

Change-Id: Ie83c111bfb1be88f3ac3dfd7c0323ac92c21cba4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197625
Tested-by: Jenkins
Tested-by: Aron Budea 
Reviewed-by: Aron Budea 

diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index f9857f2fc550..e2506f843218 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -3408,7 +3408,7 @@
   
   
 
-  List of default bullets in unordered list
+  List of default bullet sequence when unordered list is toggled 
in Writer
 
 
   •
@@ -3418,7 +3418,7 @@
   
   
 
-  List of default bullet fonts in unordered list. Matching font 
for `DefaultListBullets`.
+  List of default bullet fonts in unordered list. Matching font 
for 'DefaultListBullets'.
 
 
   OpenSymbol
diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx 
b/sw/source/uibase/wrtsh/wrtsh1.cxx
index abb064a84c42..bbfb85dd7ae4 100644
--- a/sw/source/uibase/wrtsh/wrtsh1.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh1.cxx
@@ -1706,23 +1706,27 @@ void SwWrtShell::NumOrBulletOn(bool bNum)
 
 if (! bNum)
 {
+static constexpr OUString sDefaultBulletSymbol = u"•"_ustr;
+static constexpr OUString sDefaultBulletSymbolFont = 
u"OpenSymbol"_ustr;
 uno::Sequence aBulletSymbols(
 
officecfg::Office::Common::BulletsNumbering::DefaultListBullets::get());
 uno::Sequence aBulletSymbolsFonts(
 
officecfg::Office::Common::BulletsNumbering::DefaultListBulletsFonts::get());
 if (!aBulletSymbols.hasElements())
 {
+SAL_WARN("sw", "empty DefaultListBullets config, adding a 
default single bullet");
 // Add a single element even if user cleared the list in 
the config
 aBulletSymbols.realloc(1);
-aBulletSymbols.getArray()[0] = u"•"_ustr;
-aBulletSymbolsFonts.realloc(1);
-aBulletSymbolsFonts.getArray()[0] = "OpenSymbol";
+aBulletSymbols.getArray()[0] = sDefaultBulletSymbol;
 }
-sal_Int32 nBulletSymbolIndex = nLvl % 
aBulletSymbols.getLength();
+const sal_Int32 nBulletSymbolIndex = nLvl % 
aBulletSymbols.getLength();
 
aFormat.SetBulletChar(aBulletSymbols[nBulletSymbolIndex].toChar());
 vcl::Font aFont;
-sal_Int32 nBulletSymbolsFontIndex = nLvl % 
aBulletSymbolsFonts.getLength();
-
aFont.SetFamilyName(aBulletSymbolsFonts[nBulletSymbolsFontIndex]);
+// Symbol and font correspond to each other, use same index
+if (nBulletSymbolIndex < aBulletSymbolsFonts.getLength())
+
aFont.SetFamilyName(aBulletSymbolsFonts[nBulletSymbolIndex]);
+else
+aFont.SetFamilyName(sDefaultBulletSymbolFont);
 aFormat.SetBulletFont(&aFont);
 aFormat.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
 // #i93908# clear suffix for bullet lists

core.git: officecfg/registry xmlsecurity/source

2026-01-20 Thread Tibor Nagy (via logerrit)

 officecfg/registry/schema/org/openoffice/Office/Security.xcs  |   11 
+
 xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx |   20 
+-
 2 files changed, 30 insertions(+), 1 deletion(-)

New commits:
commit 514299d0ef6d9a34a4379d5182ef90d57d8cc770
Author: Tibor Nagy 
AuthorDate: Sun Jan 18 00:01:56 2026 +0100
Commit: Nagy Tibor 
CommitDate: Tue Jan 20 11:44:13 2026 +0100

xmlsecurity: avoid long blocking delays caused by CRL timeouts

Windows performs certificate revocation checks (CRL) during signature
verification. When the revocation endpoints listed in a certificate are
unreachable or respond slowly, the revocation checking logic issues
blocking network requests and waits for connection timeouts, which can
introduce multi‑second delays for each certificate in the chain.

Add a configuration option to disable CRL checking. The signature is
still validated against the certificate itself, preserving security
while improving performance in restricted environments.

Change-Id: I83e76556b8bd37d6b0b2fda4bb676ebd10580b38
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197516
Reviewed-by: Nagy Tibor 
Tested-by: Jenkins

diff --git a/officecfg/registry/schema/org/openoffice/Office/Security.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Security.xcs
index de72566c0dfa..434e080a9072 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Security.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Security.xcs
@@ -32,6 +32,17 @@
 
   
 
+
+  
+Specifies security settings related to certificates.
+  
+  
+
+  Disable certificate revocation checks.
+
+false
+  
+
 
   
 Specifies whether to remove the hidden content when sending the 
document attached to an email
diff --git 
a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx 
b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
index 8f5b46ad09ce..e8c3c8cac57f 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
@@ -51,6 +51,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::lang ;
@@ -862,6 +863,23 @@ sal_Int32 
SecurityEnvironment_MSCryptImpl::verifyCertificate(
 
 }
 
+// Optionally disable certificate revocation checking.
+// Revocation checking (CRL) can cause significant delays during 
signature verification.
+// They typically occur when the revocation endpoints listed in the 
certificate are
+// unreachable, misconfigured, or slow to respond.
+// In such cases, blocking network calls wait for TCP connection 
attempts to time out,
+// which may take several seconds per certificate in the chain.
+// Disabling revocation checking avoids these network timeouts and 
allows verification
+// to complete without waiting for external revocation services.
+DWORD revocationFlag = 0;
+bool bDisableCRLCheck = 
officecfg::Office::Security::Certificate::DisableCertificateRevocationCheck::get();
+if (!bDisableCRLCheck)
+{
+revocationFlag =
+CERT_CHAIN_REVOCATION_CHECK_CHAIN |
+CERT_CHAIN_REVOCATION_CHECK_CHAIN_EXCLUDE_ROOT;
+}
+
 //CertGetCertificateChain searches by default in MY, CA, ROOT and TRUST
 //We do not check revocation of the root. In most cases there are none.
 //Then we would get CERT_TRUST_REVOCATION_STATUS_UNKNOWN
@@ -872,7 +890,7 @@ sal_Int32 
SecurityEnvironment_MSCryptImpl::verifyCertificate(
 nullptr , //use current system time
 hCollectionStore,
 &chainPara ,
-CERT_CHAIN_REVOCATION_CHECK_CHAIN | 
CERT_CHAIN_REVOCATION_CHECK_CHAIN_EXCLUDE_ROOT,
+revocationFlag,
 nullptr ,
 &pChainContext);

core.git: officecfg/registry sd/inc sd/source

2026-01-18 Thread Gabor Kelemen (via logerrit)

 officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu |  204 
--
 sd/inc/pchelp.hrc |   49 ++
 sd/source/console/PresenterHelpView.cxx   |   34 -
 sd/source/console/PresenterHelpView.hxx   |2 
 4 files changed, 55 insertions(+), 234 deletions(-)

New commits:
commit d1d399ab50472042f6ad9486b4de6337fa5075c1
Author: Gabor Kelemen 
AuthorDate: Sun Jan 11 21:11:52 2026 +0100
Commit: Gabor Kelemen 
CommitDate: Sun Jan 18 17:49:35 2026 +0100

Presenter Console: simplify Help string handling

No need to store these in the configuration

Change-Id: I1790f544e337854d1e921bc4fc98aa37952ad067
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197052
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen 

diff --git a/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu 
b/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu
index 9c5949ced066..c4478c291ceb 100644
--- a/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu
@@ -969,210 +969,6 @@
 
   
 
-
-  
-
-  
-Left click, right or down arrow, spacebar, 
page down, enter, return
-  
-  
-Next slide, or next effect
-  
-
-
-  
-Right click, left or up arrow, page up, 
backspace
-  
-  
-Previous slide, or previous effect
-  
-
-
-  
-'P'
-  
-  
-Use mouse pointer as pen
-  
-
-
-  
-Home
-  
-  
-First slide
-  
-
-
-  
-End
-  
-  
-Last slide
-  
-
-
-  
-'E'
-  
-  
-Erase all ink on slide
-  
-
-
-  
-Alt-Page Up
-  
-  
-Previous slide without effects
-  
-
-
-  
-Alt-Page Down
-  
-  
-Next slide without effects
-  
-
-
-  
- 
-  
-  
- 
-  
-
-
-  
-'B', '.'
-  
-  
-Blacks/Unblacks the screen
-  
-
-
-  
-'W', ','
-  
-  
-Whites/Unwhites the screen
-  
-
-
-  
- 
-  
-  
- 
-  
-
-
-  
-Esc, '-'
-  
-  
-End slide show
-  
-
-
-  
- 
-  
-  
- 
-  
-
-
-  
-Number followed by Enter
-  
-  
-Go to that slide
-  
-
-
-  
- 
-  
-  
- 
-  
-
-
-  
-'G', 'S'
-  
-  
-Grow/Shrink size of notes font
-  
-
-
-  
-'A', 'Z'
-  
-  
-Scroll notes up/down
-  
-
-
-  
-'H', 'L'
-  
-  
-Move caret in notes view 
backward/forward
-  
-
-
-  
- 
-  
-  
- 
-  
-
-
-  
-Ctrl-'1'
-  
-  
-Shows the Presenter Console
-  
-
-
-  
-Ctrl-'2'
-  
-  
-Shows the Presentation Notes
-  
-
-
-  
-Ctrl-'3'
-  
-  
-Shows the Slides Overview
-  
-
-
-  
-Ctrl-'4'
-  
-  
-Switches monitors
-  
-
-
-  
-Ctrl-'A'
-  
-  
-Turn off pointer as pen mode
-  
-
-  
-
   
   
 
diff --git a/sd/inc/pchelp.hrc b/sd/inc/pchelp.hrc
new file mode 100644
index ..d7efc8fe8fe5
--- /dev/null
+++ b/sd/inc/pchelp.hrc
@@ -0,0 +1,49 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the followi

core.git: officecfg/registry sd/inc sd/source

2026-01-18 Thread Gabor Kelemen (via logerrit)

 officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu |   12 
---
 sd/inc/strings.hrc|3 +
 sd/source/console/PresenterSlideShowView.cxx  |   17 
++
 3 files changed, 8 insertions(+), 24 deletions(-)

New commits:
commit 808c3ace57d33d6a6f2af408ad694398f15be550
Author: Gabor Kelemen 
AuthorDate: Sun Jan 11 17:45:36 2026 +0100
Commit: Gabor Kelemen 
CommitDate: Sun Jan 18 14:39:20 2026 +0100

Simplify string access in Presenter Console

No need to store static UI strings in the registry

Change-Id: Ief7ab77a8e854a89a9f8b28a4b56dda13e8c8774
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197017
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen 

diff --git a/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu 
b/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu
index a2039c30a233..9c5949ced066 100644
--- a/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu
@@ -1887,18 +1887,6 @@
 
   true
 
-
-  
-
-  Click to exit presentation...
-
-  
-  
-
-  Current Slide (end)
-
-  
-
   
   
 
diff --git a/sd/inc/strings.hrc b/sd/inc/strings.hrc
index 1bd737c2cb72..a4fcd5c79a47 100644
--- a/sd/inc/strings.hrc
+++ b/sd/inc/strings.hrc
@@ -479,4 +479,7 @@
 #define STR_A11Y_PRESENTER_PREVIEW  
NC_("STR_A11Y_PRESENTER_PREVIEW", "Current Slide Info")
 #define STR_A11Y_PRESENTER_NOTES
NC_("STR_A11Y_PRESENTER_NOTES", "Presenter Notes")
 
+#define STR_CLICKTOEXITPRESENTATION_TEXT
NC_("STR_CLICKTOEXITPRESENTATION_TEXT", "Click to exit presentation...")
+#define STR_CLICKTOEXITPRESENTATION_TITLE   
NC_("STR_CLICKTOEXITPRESENTATION_TITLE", "Current Slide (end)")
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/console/PresenterSlideShowView.cxx 
b/sd/source/console/PresenterSlideShowView.cxx
index b7286e60ce4b..49e432cc2895 100644
--- a/sd/source/console/PresenterSlideShowView.cxx
+++ b/sd/source/console/PresenterSlideShowView.cxx
@@ -25,6 +25,9 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+
 #include 
 #include 
 #include 
@@ -158,18 +161,8 @@ void PresenterSlideShowView::LateInit()
 }
 
 // Read text for one past last slide.
-PresenterConfigurationAccess aConfiguration (
-mxComponentContext,
-PresenterConfigurationAccess::msPresenterScreenRootName,
-PresenterConfigurationAccess::READ_ONLY);
-aConfiguration.GetConfigurationNode(
-u"Presenter/Views/CurrentSlidePreview/"
-"Strings/ClickToExitPresentationText/String"_ustr)
->>= msClickToExitPresentationText;
-aConfiguration.GetConfigurationNode(
-u"Presenter/Views/CurrentSlidePreview/"
-"Strings/ClickToExitPresentationTitle/String"_ustr)
->>= msClickToExitPresentationTitle;
+msClickToExitPresentationText = SdResId(STR_CLICKTOEXITPRESENTATION_TEXT);
+msClickToExitPresentationTitle = 
SdResId(STR_CLICKTOEXITPRESENTATION_TITLE);
 }
 
 PresenterSlideShowView::~PresenterSlideShowView()

core.git: officecfg/registry

2026-01-17 Thread Gabor Kelemen (via logerrit)

 officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu   |   17 
--
 officecfg/registry/schema/org/openoffice/Office/PresenterScreen.xcs |5 --
 2 files changed, 22 deletions(-)

New commits:
commit beb6cd86c9dddb5c1219f8c90bd3ad17fecadd07
Author: Gabor Kelemen 
AuthorDate: Sat Jan 10 16:46:59 2026 +0100
Commit: Gabor Kelemen 
CommitDate: Sat Jan 17 14:38:31 2026 +0100

[API CHANGE] Remove ooO::PresenterScreen::Presenter::Accessibility set

This is a followup to commit e896bbbd55af7eac5d4f60af56b134f85afcbd78
where use of these strings was removed, now the API can go as well

The DUMMY_NO_MORE_USED strings were also picked up for translation,
this issue is gone too.

Change-Id: I28736125f68615bd1612ee013cf5f8d5b3d5c85f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197016
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen 

diff --git a/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu 
b/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu
index f89c549e4117..a2039c30a233 100644
--- a/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu
@@ -2085,22 +2085,5 @@
 
   
 
-
-  
-
-  DUMMY_NO_MORE_USED
-
-  
-  
-
-  DUMMY_NO_MORE_USED
-
-  
-  
-
-  DUMMY_NO_MORE_USED
-
-  
-
   
 
diff --git 
a/officecfg/registry/schema/org/openoffice/Office/PresenterScreen.xcs 
b/officecfg/registry/schema/org/openoffice/Office/PresenterScreen.xcs
index 6c744a215dee..917ae8930248 100644
--- a/officecfg/registry/schema/org/openoffice/Office/PresenterScreen.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/PresenterScreen.xcs
@@ -691,11 +691,6 @@
 
 DefaultLayout
   
-  
-
-  Strings that are used make the presenter console 
accessible.
-
-  
   
 
   The view mode on start up of the extension. Valid values are 0 
for the Preview-only mode, 1 for the notes view, 2 for the slide 
overview.

core.git: officecfg/registry svl/qa

2026-01-14 Thread Aron Budea (via logerrit)

 officecfg/registry/schema/org/openoffice/Office/Common.xcs |2 +-
 svl/qa/unit/svl.cxx|4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 211cbca48cc3d2c912663224c650f4ee3431f7e5
Author: Aron Budea 
AuthorDate: Wed Jan 14 21:49:45 2026 +1030
Commit: Aron Budea 
CommitDate: Wed Jan 14 19:29:44 2026 +0100

tdf#170325 update default TwoDigitYear to 1950

2030 is almost here, so start of range still interpeted
as 1900s should be pushed back.

Change-Id: I76d7171a9947860d8353241aae1f2a97e9da5c69
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197261
Tested-by: Jenkins
Reviewed-by: Aron Budea 

diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index ba4964e28dcf..f9857f2fc550 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -3618,7 +3618,7 @@
   two-digit-year date formats.
   First two-digit year
 
-1930
+1950
   
 
 
diff --git a/svl/qa/unit/svl.cxx b/svl/qa/unit/svl.cxx
index 9afc57d1799d..0ea8c093af66 100644
--- a/svl/qa/unit/svl.cxx
+++ b/svl/qa/unit/svl.cxx
@@ -1239,7 +1239,7 @@ void Test::testIsNumberFormatSpecific()
 std::vector aIO = {
 { "005-12-14", true, "0005-12-14", 0 },
 {   "5-12-14", true, "2005-12-14", 0 },
-{  "32-12-14", true, "1932-12-14", 0 }
+{  "52-12-14", true, "1952-12-14", 0 }
 };
 
 checkSpecificNumberFormats( aFormatter, aIO, "[en-US] date");
@@ -1253,7 +1253,7 @@ void Test::testIsNumberFormatSpecific()
 std::vector aIO = {
 { "005-12-14", true, "0005-12-14", 0 },
 {   "5-12-14", true, "2005-12-14", 0 },
-{  "32-12-14", true, "1932-12-14", 0 }
+{  "52-12-14", true, "1952-12-14", 0 }
 };
 
 checkSpecificNumberFormats( aFormatter, aIO, "[de-DE] date");

core.git: officecfg/registry sd/inc sd/source sd/uiconfig sd/UIConfig_simpress.mk

2026-01-12 Thread Mohit Marathe (via logerrit)

 officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu |   10 
+++
 sd/UIConfig_simpress.mk |2 
 sd/inc/drawdoc.hxx  |2 
 sd/inc/sdpage.hxx   |4 
+
 sd/source/core/drawdoc2.cxx |   17 
++
 sd/source/core/sdpage.cxx   |2 
 sd/source/ui/slidesorter/controller/SlideSorterController.cxx   |   14 
-
 sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx |   27 
+-
 sd/source/ui/view/ViewClipboard.cxx |5 
+
 sd/source/ui/view/drviews7.cxx  |   11 

 sd/source/ui/view/viewshe3.cxx  |2 
 sd/uiconfig/simpress/popupmenu/pagepanecanvas.xml   |   13 

 sd/uiconfig/simpress/popupmenu/pagepanecanvasmaster.xml |   13 

 13 files changed, 118 insertions(+), 4 deletions(-)

New commits:
commit 958327b810c8228504be6d2a46b75faf4093e8dc
Author: Mohit Marathe 
AuthorDate: Tue Oct 21 10:55:32 2025 +0530
Commit: Michael Stahl 
CommitDate: Mon Jan 12 19:24:44 2026 +0100

sd: make sure that canvas page remains as the last page

This commit restricts the following operations:
- duplicating canvas page
- moving canvas page up
- inserting a page after the canvas page
- including canvas page in the slideshow

Also, prevent deleting the only non-canvas page.

Signed-off-by: Mohit Marathe 
Change-Id: I8050dfc9836719f345e0f5349f25b62cd164344d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192769
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Michael Stahl 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196797
Tested-by: Jenkins

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
index 8475ac8c9847..2532a49ea2e8 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
@@ -125,6 +125,11 @@
   Slide Sorter/Pane
 
   
+  
+
+  Slide Sorter/Pane (Canvas)
+
+  
   
 
   Slide Sorter/Pane (no selection)
@@ -135,6 +140,11 @@
   Master Slide Sorter/Pane
 
   
+  
+
+  Master Slide Sorter/Pane (Canvas)
+
+  
   
 
   Master Slide Sorter/Pane (no 
selection)
diff --git a/sd/UIConfig_simpress.mk b/sd/UIConfig_simpress.mk
index c70fc3bc9cb3..ad21ed0e48fb 100644
--- a/sd/UIConfig_simpress.mk
+++ b/sd/UIConfig_simpress.mk
@@ -37,9 +37,11 @@ $(eval $(call 
gb_UIConfig_add_popupmenufiles,modules/simpress,\
sd/uiconfig/simpress/popupmenu/oleobject \
sd/uiconfig/simpress/popupmenu/outline \
sd/uiconfig/simpress/popupmenu/pagepanemaster \
+   sd/uiconfig/simpress/popupmenu/pagepanecanvasmaster \
sd/uiconfig/simpress/popupmenu/pagepanenoselmaster \
sd/uiconfig/simpress/popupmenu/pagepanenosel \
sd/uiconfig/simpress/popupmenu/pagepane \
+   sd/uiconfig/simpress/popupmenu/pagepanecanvas \
sd/uiconfig/simpress/popupmenu/pagetab \
sd/uiconfig/simpress/popupmenu/page \
sd/uiconfig/simpress/popupmenu/table \
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index bb485147e9fb..c15f6a36a31e 100644
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
@@ -1001,7 +1001,7 @@ public:
 bool bIsPageObj,
 const sal_Int32 nInsertPosition);
 
-SAL_DLLPRIVATE bool HasCanvasPage() const { return mpCanvasPage != 
nullptr; }
+SAL_DLLPRIVATE bool HasCanvasPage() const { return mpCanvasPage.is(); }
 
 SAL_DLLPRIVATE sal_uInt16 GetOrInsertCanvasPage ();
 
diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx
index 013fecbccb56..35d095513cac 100644
--- a/sd/inc/sdpage.hxx
+++ b/sd/inc/sdpage.hxx
@@ -123,6 +123,7 @@ friend class sd::UndoAttrObject;
 sal_uInt16  mnPaperBin;   ///< PaperBin
 SdPageLink* mpPageLink;   ///< Page link (at left sides only)
 boolmbIsCanvasPage;   ///< whether the page is a canvas 
page
+boolmbIsCanvasMasterPage; ///< whether it is the master page 
of canvas page
 
 // PDF link annotations for read-only pdfium
 std::vector> maLinkAnnotations;
@@ -404,6 +405,9 @@ public:
 bool IsCanvasPage() const { return mbIsCanvasPage; }
 void SetCanvasPage() { mbIsCanvasPage = true; }
 
+bool IsCanvasMasterPage() const { return mbIsCanvasMasterPage; }
+void SetCanvasMasterPage() { mbIsCanvasMasterPage = true; }
+
 private:
 bool mbIsPrecious;
 
diff --git

core.git: officecfg/registry sw/source

2026-01-12 Thread Aron Budea (via logerrit)

 officecfg/registry/schema/org/openoffice/Office/Common.xcs |   24 +++--
 sw/source/uibase/wrtsh/wrtsh1.cxx  |   16 ++--
 2 files changed, 34 insertions(+), 6 deletions(-)

New commits:
commit 3c12bd0f084e74fe4ca98db50b454af5ef2b96d9
Author: Aron Budea 
AuthorDate: Mon Jan 12 01:40:19 2026 +1030
Commit: Miklos Vajna 
CommitDate: Mon Jan 12 13:24:47 2026 +0100

tdf#169441 Decouple default list levels from bullet library items

First commit f944648e0f5d52605a267ed50bba4bfc035aecc6 added
a new config to make bullet library items configurable, then
commit 626357f53c934e7f57dc80c3c83ad080767961f3 switched
from using the set of three default list bullets to bullet
library items.
The configs are DefaultBullets and DefaultBulletsFonts.

The problem is that the bullet library was never meant to
correspond to the default list, and a bulleted list looks
silly now. Let's introduce new configs for the list, with
the old defaults:
DefaultListBullets / DefaultListBulletsFonts

Once reaching the end with increasing levels, the list
wraps around.

Change-Id: I91f6a06e3c298edcfd0d11a3597c23129e0b085d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197014
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index cd3ba8cc88f4..ba4964e28dcf 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -3378,7 +3378,7 @@
   
   
 
-  List of default bullets
+  List of default bullets in bullet library
 
 
   ●
@@ -3393,7 +3393,7 @@
   
   
 
-  List of default bullet fonts. Matching font for 
`DefaultBullets`.
+  List of default bullet fonts in bullet library. Matching font 
for `DefaultBullets`.
 
 
   OpenSymbol
@@ -3406,6 +3406,26 @@
   OpenSymbol
 
   
+  
+
+  List of default bullets in unordered list
+
+
+  •
+  ◦
+  ▪
+
+  
+  
+
+  List of default bullet fonts in unordered list. Matching font 
for `DefaultListBullets`.
+
+
+  OpenSymbol
+  OpenSymbol
+  OpenSymbol
+
+  
 
 
   
diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx 
b/sw/source/uibase/wrtsh/wrtsh1.cxx
index ea695848b948..992930f8c1a7 100644
--- a/sw/source/uibase/wrtsh/wrtsh1.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh1.cxx
@@ -1707,13 +1707,21 @@ void SwWrtShell::NumOrBulletOn(bool bNum)
 if (! bNum)
 {
 uno::Sequence aBulletSymbols(
-
officecfg::Office::Common::BulletsNumbering::DefaultBullets::get());
+
officecfg::Office::Common::BulletsNumbering::DefaultListBullets::get());
 uno::Sequence aBulletSymbolsFonts(
-
officecfg::Office::Common::BulletsNumbering::DefaultBulletsFonts::get());
-sal_Int32 nBulletSymbolIndex = nLvl < 
aBulletSymbols.getLength() ? nLvl : 0;
+
officecfg::Office::Common::BulletsNumbering::DefaultListBulletsFonts::get());
+if (!aBulletSymbols.hasElements())
+{
+// Add a single element even if user cleared the list in 
the config
+aBulletSymbols.realloc(1);
+aBulletSymbols.getArray()[0] = u"•"_ustr;
+aBulletSymbolsFonts.realloc(1);
+aBulletSymbolsFonts.getArray()[0] = "OpenSymbol";
+}
+sal_Int32 nBulletSymbolIndex = nLvl % 
aBulletSymbols.getLength();
 
aFormat.SetBulletChar(aBulletSymbols[nBulletSymbolIndex].toChar());
 vcl::Font aFont;
-sal_Int32 nBulletSymbolsFontIndex = nLvl < 
aBulletSymbolsFonts.getLength() ? nLvl : 0;
+sal_Int32 nBulletSymbolsFontIndex = nLvl % 
aBulletSymbolsFonts.getLength();
 
aFont.SetFamilyName(aBulletSymbolsFonts[nBulletSymbolsFontIndex]);
 aFormat.SetBulletFont(&aFont);
 aFormat.SetNumberingType(SVX_NUM_CHAR_SPECIAL);

core.git: officecfg/registry

2026-01-11 Thread Gabor Kelemen (via logerrit)

 officecfg/registry/data/org/openoffice/Office/ExtensionDependencies.xcu |   78 
--
 1 file changed, 78 deletions(-)

New commits:
commit 3792b5f59ae3d4f30e50fd6f04e25e73707cbe1c
Author: Gabor Kelemen 
AuthorDate: Fri Jan 9 20:45:12 2026 +0100
Commit: Gabor Kelemen 
CommitDate: Sun Jan 11 14:40:42 2026 +0100

Remove Presenter Console extension dependency info

Since it is not an independent extension anymore
it makes no sense to check for Office version

Change-Id: I660e437356e68934f74feaaeeb6cd96979056daf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196941
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen 
Reviewed-by: Noel Grandin 

diff --git 
a/officecfg/registry/data/org/openoffice/Office/ExtensionDependencies.xcu 
b/officecfg/registry/data/org/openoffice/Office/ExtensionDependencies.xcu
index aab16d541dea..86d158f811c3 100644
--- a/officecfg/registry/data/org/openoffice/Office/ExtensionDependencies.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/ExtensionDependencies.xcu
@@ -18,83 +18,5 @@
 -->
 http://openoffice.org/2001/registry"; 
xmlns:xs="http://www.w3.org/2001/XMLSchema"; oor:name="ExtensionDependencies" 
oor:package="org.openoffice.Office">
   
-
-  
-
-  1.0
-  1.0.1
-  1.0.2
-  1.0.3
-
-  
-  
-
-  
-
-
-  
-
-  1.0
-  1.0.1
-  1.0.2
-  1.0.3
-
-  
-  
-
-  
-
-
-  
-
-  1.0
-  1.0.1
-  1.0.2
-  1.0.3
-
-  
-  
-
-  
-
-
-  
-
-  1.0
-  1.0.1
-  1.0.2
-  1.0.3
-
-  
-  
-
-  
-
-
-  
-
-  1.0
-  1.0.1
-  1.0.2
-  1.0.3
-
-  
-  
-
-  
-
-
-  
-
-  1.0
-  1.0.1
-  1.0.2
-  1.0.3
-
-  
-  
-
-  
-

core.git: officecfg/registry sd/inc sd/sdi sd/source

2026-01-07 Thread Mohit Marathe (via logerrit)

 officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu |
8 
 sd/inc/app.hrc   |
1 
 sd/inc/drawdoc.hxx   |
3 +
 sd/inc/sdpage.hxx|
4 ++
 sd/sdi/SlideSorterController.sdi |
5 ++
 sd/sdi/_drvwsh.sdi   |
5 ++
 sd/sdi/sdraw.sdi |   
17 ++
 sd/source/core/drawdoc2.cxx  |   
17 ++
 sd/source/ui/slidesorter/controller/SlsSlotManager.cxx   |   
14 
 sd/source/ui/view/drviews2.cxx   |
8 
 10 files changed, 82 insertions(+)

New commits:
commit 1a03df815c8673919847ce02c6b2bd56237a6293
Author: Mohit Marathe 
AuthorDate: Fri Oct 10 11:11:34 2025 +0530
Commit: Mohit Marathe 
CommitDate: Thu Jan 8 06:53:23 2026 +0100

sd: add uno command for inserting a canvas page

Executing `.uno:InsertCanvasPage` will insert a page of size 5m x 5m at
the last page.

Signed-off-by: Mohit Marathe 
Change-Id: Ic6c9237e9e763de7f1e32d4d1a95c56c0e4ed5a1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192319
Reviewed-by: Michael Stahl 
Tested-by: Jenkins CollaboraOffice 
(cherry picked from commit 90d410298855a0e1c5d125685e80a0803809dc7c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196680

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
index 46d9353ea053..95183dee 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
@@ -846,6 +846,14 @@
   1
 
   
+  
+
+  New Canvas Slide
+
+
+  1
+
+  
   
 
   Insert Page from File...
diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc
index d63a4d35c843..7adaa74bdbed 100644
--- a/sd/inc/app.hrc
+++ b/sd/inc/app.hrc
@@ -346,6 +346,7 @@
 #define SID_NOTES_MASTER_MODE   (SID_SD_START+350)
 // FREE
 #define SID_INSERTPAGE_QUICK(SID_SD_START+352)
+#define SID_INSERT_CANVAS_SLIDE (SID_SD_START+353)
 // FREE
 #define SID_INSERT_FLD_PAGE_TITLE   (SID_SD_START+356)
 #define SID_INSERT_FLD_DATE_VAR (SID_SD_START+357)
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index 3c16e264da04..db7656d450b1 100644
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
@@ -999,6 +999,9 @@ public:
 bool bIsPageObj,
 const sal_Int32 nInsertPosition);
 
+
+SAL_DLLPRIVATE sal_uInt16 InsertCanvasPage ();
+
 /** return the document fonts for latin, cjk and ctl according to the 
current
 languages set at this document */
 SAL_DLLPRIVATE void getDefaultFonts( vcl::Font& rLatinFont, vcl::Font& 
rCJKFont, vcl::Font& rCTLFont );
diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx
index 04e4fd1d3f3d..a63a362373f3 100644
--- a/sd/inc/sdpage.hxx
+++ b/sd/inc/sdpage.hxx
@@ -122,6 +122,7 @@ friend class sd::UndoAttrObject;
 rtl_TextEncoding meCharSet;   ///< Text encoding
 sal_uInt16  mnPaperBin;   ///< PaperBin
 SdPageLink* mpPageLink;   ///< Page link (at left sides only)
+boolmbIsCanvasPage;   ///< whether the page is a canvas 
page
 
 // PDF link annotations for read-only pdfium
 std::vector> maLinkAnnotations;
@@ -400,6 +401,9 @@ public:
 
 static sal_uInt16 mnLastPageId;
 
+bool IsCanvasPage() const { return mbIsCanvasPage; }
+void SetCanvasPage() { mbIsCanvasPage = true; }
+
 private:
 bool mbIsPrecious;
 
diff --git a/sd/sdi/SlideSorterController.sdi b/sd/sdi/SlideSorterController.sdi
index 22bc64214868..a278785f11cd 100644
--- a/sd/sdi/SlideSorterController.sdi
+++ b/sd/sdi/SlideSorterController.sdi
@@ -328,6 +328,11 @@ interface SlideSorterView
 ExecMethod = ExecMovePageLast ;
 StateMethod = GetStateMovePageLast ;
 ]
+SID_INSERT_CANVAS_SLIDE
+[
+ExecMethod = FuTemporary ;
+StateMethod = GetMenuState ;
+]
 }
 
 shell SlideSorterController
diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi
index a87109cb8b9e..2284cde27056 100644
--- a/sd/sdi/_drvwsh.sdi
+++ b/sd/sdi/_drvwsh.sdi
@@ -160,6 +160,11 @@ interface DrawView
 ExecMethod = FuTemporary ;
 StateMethod = GetMenuState ;
 ]
+SID_INSERT_CANVAS_SLIDE
+[
+ExecMethod = FuTemporary ;
+StateMethod = GetMenuState ;
+]
 SID_HYPERLINK_SETLINK // ole : no, status : no
 [
 ExecMethod = FuTemporary ;
diff --git a/sd/sdi/sdraw.s

core.git: officecfg/registry sw/inc sw/sdi sw/source

2025-12-30 Thread Jim Raykowski (via logerrit)

 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |   14 +
 sw/inc/cmdid.h  |2 
 sw/inc/strings.hrc  |2 
 sw/inc/swundo.hxx   |1 
 sw/sdi/_viewsh.sdi  |5 
 sw/sdi/swriter.sdi  |   16 +
 sw/source/core/undo/undobj.cxx  |3 
 sw/source/uibase/uiview/view2.cxx   |  113 
++
 8 files changed, 156 insertions(+)

New commits:
commit 076ad399c286917b67245302fac7c226fafecb89
Author: Jim Raykowski 
AuthorDate: Fri Dec 26 00:34:41 2025 -0900
Commit: Jim Raykowski 
CommitDate: Wed Dec 31 04:55:33 2025 +0100

tdf#167491 Enhancement to sort chapters alphabetically

The UNO command for this feature .uno:SortChapters is set experimental.
I found a couple undo redo crashes exposed by this patch. Fixes for
these are done in related patches.

Change-Id: I75e67b137668be200dce192cfd5cd9a4e1ffdf8e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196240
Tested-by: Jenkins
Reviewed-by: Jim Raykowski 

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index ec26db44a0e1..cd6dbcd61764 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -3597,6 +3597,20 @@
   1
 
   
+  
+ 
+   Sort Chapters
+ 
+ 
+   Make chapters in the document 
alphabetically sorted
+ 
+ 
+   1
+ 
+ 
+   true
+ 
+   
 
 
   
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index 9a32d2b85d7b..b77f535a6d3d 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -213,6 +213,8 @@ class SwUINumRuleItem;
 
 #define FN_VIEW_BASELINE_GRID_VISIBLE (FN_VIEW + 74)  /* Menu for displaying 
baseline grid */
 
+#define FN_SORT_CHAPTERS (FN_VIEW + 75) /* Make chapters alphabetically sorted 
*/
+
 // Region: Insert
 #define FN_INSERT_BOOKMARK  (FN_INSERT + 2 )  /* Bookmark */
 // FN_INSERT + 3 is FN_INSERT_BREAK
diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
index 0dc4bc9bd2df..0b70e22c6077 100644
--- a/sw/inc/strings.hrc
+++ b/sw/inc/strings.hrc
@@ -1575,6 +1575,8 @@
 
 #define STR_PAGES NNC_("STR_PAGES", "Page: %1", "Pages: %1-%2")
 
+#define STR_UNDO_SORT_CHAPTERS NC_("STR_UNDO_SORT_CHAPTERS", "Sort chapters")
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/swundo.hxx b/sw/inc/swundo.hxx
index e19622a4f783..76af157fd129 100644
--- a/sw/inc/swundo.hxx
+++ b/sw/inc/swundo.hxx
@@ -185,6 +185,7 @@ enum class SwUndoId
 CONVERT_FIELD_TO_TEXT = 153,
 REINSTATE_REDLINE = 154,
 COPY_HEADER_FOOTER = 155,
+SORT_CHAPTERS = 156,
 };
 
 OUString GetUndoComment(SwUndoId eId);
diff --git a/sw/sdi/_viewsh.sdi b/sw/sdi/_viewsh.sdi
index 73099317370a..42916cccacbb 100644
--- a/sw/sdi/_viewsh.sdi
+++ b/sw/sdi/_viewsh.sdi
@@ -,4 +,9 @@ interface BaseTextEditView
 StateMethod = StateViewOptions ;
 ]
 
+FN_SORT_CHAPTERS
+[
+ExecMethod = Execute ;
+]
+
 }
diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index 1b2eb90d94fe..a39a202c1cda 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -9069,3 +9069,19 @@ SfxBoolItem BaselineGridVisible 
FN_VIEW_BASELINE_GRID_VISIBLE
 ToolBoxConfig = TRUE,
 GroupId = SfxGroupId::View;
 ]
+
+SfxVoidItem SortChapters FN_SORT_CHAPTERS
+[
+AutoUpdate = FALSE,
+FastCall = FALSE
+ReadOnlyDoc = FALSE,
+Toggle = FALSE,
+Container = FALSE,
+RecordAbsolute = FALSE,
+RecordPerSet;
+
+AccelConfig = TRUE,
+MenuConfig = TRUE,
+ToolBoxConfig = TRUE,
+GroupId = SfxGroupId::Edit;
+]
diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx
index 7b83049455fe..c994448a10c6 100644
--- a/sw/source/core/undo/undobj.cxx
+++ b/sw/source/core/undo/undobj.cxx
@@ -700,6 +700,9 @@ OUString GetUndoComment(SwUndoId eId)
 case SwUndoId::COPY_HEADER_FOOTER:
 pId = STR_UNDO_COPY_HEADER_FOOTER;
 break;
+case SwUndoId::SORT_CHAPTERS:
+pId = STR_UNDO_SORT_CHAPTERS;
+break;
 }
 
 assert(pId);
diff --git a/sw/source/uibase/uiview/view2.cxx 
b/sw/source/uibase/uiview/view2.cxx
index 1aa9107700e6..b36157e7663f 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -164,6 +164,8 @@
 
 #include 
 
+#include 
+
 const char sStatusDelim[] = " : ";
 
 using namespace sfx2;
@@ -1707,7 +1709,118 @@ void SwView::Execute(SfxRequest &rReq)
 }
 break;
 }
+

core.git: officecfg/registry sw/inc sw/sdi sw/source sw/uiconfig

2025-12-17 Thread Tamás Zolnai (via logerrit)

 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |   22 
++
 sw/inc/cmdid.h  |2 
 sw/sdi/_viewsh.sdi  |6 ++
 sw/sdi/swriter.sdi  |   16 
+++
 sw/source/uibase/app/appopt.cxx |4 +
 sw/source/uibase/uiview/view0.cxx   |8 +++
 sw/uiconfig/sglobal/menubar/menubar.xml |3 -
 sw/uiconfig/swriter/menubar/menubar.xml |3 -
 8 files changed, 62 insertions(+), 2 deletions(-)

New commits:
commit 2f1136f178a7b74a5af3856342d3e1cb332e3fc7
Author: Tamás Zolnai 
AuthorDate: Fri Dec 12 11:25:20 2025 +0100
Commit: Tamás Zolnai 
CommitDate: Wed Dec 17 11:28:23 2025 +0100

tdf#169806: Add baseline grid feature to Writer menu.

* Create a "Display Baseline Grid" menu item, which triggers the
rendering of the baseline grid.
* Rename the parent menu item from "Grid and Helplines" to
"Grids and Helplines" (plural grids).
* Display the new menu items for Writer normal mode and master
document mode (not shown in web mode, for example).

Change-Id: I2c45c2ebf6557efa96de012c74e83535be653bdf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195705
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai 

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index ab2f9b6256de..ec26db44a0e1 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -3575,6 +3575,28 @@
   1
 
   
+  
+
+  Gr~ids and Helplines
+
+
+  1
+
+
+  .uno:GridMenu
+
+  
+  
+
+  Display ~Baseline Grid
+
+
+  Display the baseline grid for page 
line-spacing
+
+
+  1
+
+  
 
 
   
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index 5b1b63310c53..9a32d2b85d7b 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -211,6 +211,8 @@ class SwUINumRuleItem;
 #define FN_TRACK_CHANGES_IN_THIS_VIEW  (FN_VIEW + 72)  /* Record track 
changes only in this view */
 #define FN_TRACK_CHANGES_IN_ALL_VIEWS  (FN_VIEW + 73)  /* Record track 
changes only in all views */
 
+#define FN_VIEW_BASELINE_GRID_VISIBLE (FN_VIEW + 74)  /* Menu for displaying 
baseline grid */
+
 // Region: Insert
 #define FN_INSERT_BOOKMARK  (FN_INSERT + 2 )  /* Bookmark */
 // FN_INSERT + 3 is FN_INSERT_BREAK
diff --git a/sw/sdi/_viewsh.sdi b/sw/sdi/_viewsh.sdi
index 5db24b03bc07..73099317370a 100644
--- a/sw/sdi/_viewsh.sdi
+++ b/sw/sdi/_viewsh.sdi
@@ -1105,4 +1105,10 @@ interface BaseTextEditView
 ExecMethod = Execute ;
 ]
 
+FN_VIEW_BASELINE_GRID_VISIBLE
+[
+ExecMethod = ExecViewOptions ;
+StateMethod = StateViewOptions ;
+]
+
 }
diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index 2bf53f9ed34c..cd6598cd3996 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -9051,3 +9051,19 @@ SfxVoidItem CopyFieldDialog FN_COPY_FIELD
 ToolBoxConfig = FALSE,
 GroupId = SfxGroupId::Edit;
 ]
+
+SfxBoolItem BaselineGridVisible FN_VIEW_BASELINE_GRID_VISIBLE
+[
+AutoUpdate = TRUE,
+FastCall = FALSE,
+ReadOnlyDoc = TRUE,
+Toggle = TRUE,
+Container = FALSE,
+RecordAbsolute = FALSE,
+RecordPerSet;
+
+AccelConfig = TRUE,
+MenuConfig = TRUE,
+ToolBoxConfig = TRUE,
+GroupId = SfxGroupId::View;
+]
diff --git a/sw/source/uibase/app/appopt.cxx b/sw/source/uibase/app/appopt.cxx
index 927eeae82842..399b6b55df14 100644
--- a/sw/source/uibase/app/appopt.cxx
+++ b/sw/source/uibase/app/appopt.cxx
@@ -380,6 +380,10 @@ void SwModule::ApplyItemSet( sal_uInt16 nId, const 
SfxItemSet& rSet )
 if( const SfxBoolItem* pItem = rSet.GetItemIfSet( 
FN_PARAM_BASELINE_GRID_VISIBLE, false ))
 {
 aViewOpt.SetBaselineGridVisible(pItem->GetValue());
+if(pBindings)
+{
+pBindings->Invalidate(FN_VIEW_BASELINE_GRID_VISIBLE);
+}
 }
 
 // Interpret Writer Printer Options
diff --git a/sw/source/uibase/uiview/view0.cxx 
b/sw/source/uibase/uiview/view0.cxx
index 0ee6dab7bf72..5eea15c5ef86 100644
--- a/sw/source/uibase/uiview/view0.cxx
+++ b/sw/source/uibase/uiview/view0.cxx
@@ -386,6 +386,9 @@ void SwView::StateViewOptions(SfxItemSet &rSet)
 case SID_CLICK_CHANGE_ROTATION:
 aBool.SetValue( pOpt->IsClickChangeRotation());
 break;
+case FN_VIEW_BASELINE_GRID_VISIBLE:
+aBool.SetValue(pOpt->IsBaselineGridVisible());
+break;
 }
 
 if( nWhich )

core.git: officecfg/registry sc/source

2025-12-17 Thread Heiko Tietze (via logerrit)

 officecfg/registry/schema/org/openoffice/Office/Calc.xcs |7 +++
 sc/source/ui/view/notemark.cxx   |3 ++-
 2 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit b32e65bcd122998ecdeb990b07823f5d60cc226a
Author: Heiko Tietze 
AuthorDate: Wed Dec 17 09:16:09 2025 +0100
Commit: Heiko Tietze 
CommitDate: Wed Dec 17 11:13:04 2025 +0100

Resolves tdf#169504 - Option to control comment transparency

Change-Id: I1e0a74f48be0bd8e4f9fd71bdbeb08b39b19ac7d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195760
Reviewed-by: Heiko Tietze 
Tested-by: Jenkins

diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index 80e79448d344..1f85aab91333 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -121,6 +121,13 @@
   
   true
 
+
+  
+Indicates whether temporary comments on hover are 
transparent.
+Comment transparency
+  
+  true
+
 
   
   
diff --git a/sc/source/ui/view/notemark.cxx b/sc/source/ui/view/notemark.cxx
index 93c6a144fcad..e7fe6376c61f 100644
--- a/sc/source/ui/view/notemark.cxx
+++ b/sc/source/ui/view/notemark.cxx
@@ -28,6 +28,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #define SC_NOTEOVERLAY_TIME800
 #define SC_NOTEOVERLAY_SHORT   70
@@ -95,7 +96,7 @@ const drawinglayer::primitive2d::Primitive2DContainer& 
ScNoteOverlay::getOrCreat
 pSdrPage->NbcRemoveObject(mxObject->GetOrdNum());
 
 // show the visualization with slight transparency
-static bool bUseTransparency(true);
+static bool 
bUseTransparency(officecfg::Office::Calc::Content::Display::NoteTransparency::get());
 if (bUseTransparency && !maSequence.empty())
 {
 maSequence = drawinglayer::primitive2d::Primitive2DContainer{

core.git: officecfg/registry stoc/source

2025-12-16 Thread shlok3640 (via logerrit)

 officecfg/registry/schema/org/openoffice/Office/Java.xcs |   32 ---
 stoc/source/javavm/javavm.cxx|  137 ---
 stoc/source/javavm/javavm.hxx|2 
 3 files changed, 171 deletions(-)

New commits:
commit 1b30dee17ca96575720a31510fe97e118abf987e
Author: shlok3640 
AuthorDate: Sat Dec 13 10:07:15 2025 +
Commit: Stephan Bergmann 
CommitDate: Tue Dec 16 14:19:26 2025 +0100

tdf#162563 Remove Java Applet configuration (NetAccess/Security)

Removes the "NetAccess" and "Security" configuration properties
from the Office.Java schema.

Also removes the corresponding logic in stoc/source/javavm/javavm.cxx
that read these properties to configure the JVM appletviewer mode.
Since Applet support is being removed (deprecated in Java 9, removed
in Java 17), the JVM no longer needs these specific security flags.

Change-Id: Ifb2a2be4d103750d918d938d569c7dc8e196f19d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195591
Reviewed-by: Stephan Bergmann 
Tested-by: Jenkins

diff --git a/officecfg/registry/schema/org/openoffice/Office/Java.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Java.xcs
index 1be106081b35..0e212b52c4b9 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Java.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Java.xcs
@@ -37,38 +37,6 @@
   
 Provides information used to initialize a Java Virtual Machine. 

   
-  
-
-
-  Determines if security checks are performed for applets.
-  Enable security checks
-
-true
-  
-  
-
-
-  Determines if and to what extent Java applets are allowed to 
access the network.
-  Net access
-
-
-  
-
-  Host - connect to origin
-
-  
-  
-
-  Unrestricted - connect to all
-
-  
-  
-
-  None - no connection allowed
-
-  
-
-  
   
 
   Specifies whether JVM based UNO components are run via uno 
command outside the LibreOffice process.
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx
index 2dd721c597ee..0027cdbb88af 100644
--- a/stoc/source/javavm/javavm.cxx
+++ b/stoc/source/javavm/javavm.cxx
@@ -393,36 +393,6 @@ void getJavaPropsFromJavaSettings(
 }
 }
 }
-if (xConfigAccess->hasByName(u"NetAccess"_ustr))
-{
-sal_Int32 val = 0;
-if (xConfigAccess->getByName(u"NetAccess"_ustr) >>= val)
-{
-OUString sVal;
-switch( val)
-{
-case 0: sVal = "host";
-break;
-case 1: sVal = "unrestricted";
-break;
-case 3: sVal = "none";
-break;
-}
-OUString sProperty = "appletviewer.security.mode=" + sVal;
-pjvm->pushProp(sProperty);
-}
-}
-if (xConfigAccess->hasByName(u"Security"_ustr))
-{
-bool val = true;
-xConfigAccess->getByName(u"Security"_ustr) >>= val;
-OUString sProperty(u"stardiv.security.disableSecurity="_ustr);
-if( val)
-sProperty += "false";
-else
-sProperty += "true";
-pjvm->pushProp(sProperty);
-}
 }
 
 void setTimeZone(stoc_javavm::JVM * pjvm) noexcept {
@@ -923,8 +893,6 @@ JavaVirtualMachine::disposing(css::lang::EventObject const 
& rSource)
 osl::MutexGuard aGuard(m_aMutex);
 if (rSource.Source == m_xInetConfiguration)
 m_xInetConfiguration.clear();
-if (rSource.Source == m_xJavaConfiguration)
-m_xJavaConfiguration.clear();
 }
 
 void SAL_CALL JavaVirtualMachine::elementInserted(
@@ -953,7 +921,6 @@ void SAL_CALL JavaVirtualMachine::elementReplaced(
 rEvent.Accessor >>= aAccessor;
 OUString aPropertyName;
 OUString aPropertyValue;
-bool bSecurityChanged = false;
 if ( aAccessor == "ooInetProxyType" )
 {
 // Proxy none, manually
@@ -992,40 +959,6 @@ void SAL_CALL JavaVirtualMachine::elementReplaced(
 rEvent.Element >>= aPropertyValue;
 aPropertyValue = aPropertyValue.replace(';', '|');
 }
-else if ( aAccessor == "NetAccess" )
-{
-aPropertyName = "appletviewer.security.mode";
-sal_Int32 n = 0;
-if (rEvent.Element >>= n)
-switch (n)
-{
-case 0:
-aPropertyValue = "host";
-break;
-case 1:
-aPropertyValue = "unrestricted";
-break;
-case 3:
-aPropertyValue = "none";
-break;
-}
-else
-return;
-bSecurityChanged = true;
-}
-else if ( aAccessor == "Security" )
-{
-aProperty

core.git: officecfg/registry sc/inc sc/source sc/uiconfig

2025-12-12 Thread Heiko Tietze (via logerrit)

 officecfg/registry/schema/org/openoffice/Office/Calc.xcs |7 -
 sc/inc/appoptio.hxx  |4 
 sc/inc/sc.hrc|1 
 sc/source/core/data/validat.cxx  |6 -
 sc/source/core/tool/appoptio.cxx |   14 --
 sc/source/ui/app/inputhdl.cxx|5 
 sc/source/ui/app/scmod.cxx   |   10 -
 sc/source/ui/inc/tpcompatibility.hxx |2 
 sc/source/ui/optdlg/tpcompatibility.cxx  |   15 --
 sc/uiconfig/scalc/ui/optcompatibilitypage.ui |   82 +--
 10 files changed, 12 insertions(+), 134 deletions(-)

New commits:
commit a20df918a9ea3bcb8082e73b3f1c0c928ebbf814
Author: Heiko Tietze 
AuthorDate: Fri Dec 12 08:50:01 2025 +0100
Commit: Heiko Tietze 
CommitDate: Fri Dec 12 11:59:59 2025 +0100

Revert "Resolves tdf#160096 - Allow invalid values regardless the 
validation"

This reverts commit a6bc66ca8ddf23ede2807c2043d94f5c77adfe39.

Reason for revert: Incorrect solution

Change-Id: I6d094fed4b3655711c396093ce99295002b50283
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195513
Tested-by: Jenkins
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 7db98412d8d3..80e79448d344 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -1971,13 +1971,6 @@
 
 false
   
-  
-
-  If set, data are accepted regardless of being invalid (as 
known from Excel and LibreOffice before tdf#159595)
-  Data Validity like Excel
-
-false
-  
 
 
   
diff --git a/sc/inc/appoptio.hxx b/sc/inc/appoptio.hxx
index 1b9c4cc50439..d4beeec78c06 100644
--- a/sc/inc/appoptio.hxx
+++ b/sc/inc/appoptio.hxx
@@ -86,9 +86,6 @@ public:
 voidSetLinksInsertedLikeMSExcel(bool bNew) { 
mbLinksInsertedLikeMSExcel = bNew; }
 boolGetLinksInsertedLikeMSExcel() const { return 
mbLinksInsertedLikeMSExcel; }
 
-voidSetAllowInvalidData(bool bNew) { mbAllowInvalidData = bNew; }
-boolGetAllowInvalidData() const { return mbAllowInvalidData; }
-
 ScAppOptions& operator=   ( const ScAppOptions& rOpt );
 
 private:
@@ -114,7 +111,6 @@ private:
 boolbClickChangeRotation;
 ScOptionsUtil::KeyBindingType meKeyBindingType;
 boolmbLinksInsertedLikeMSExcel;
-boolmbAllowInvalidData;
 };
 
 //  Config Item containing app options
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 6cc35ba4fed8..629289aef0bf 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -638,7 +638,6 @@ static_assert(SID_PREVIEW_END < SID_KEYFUNC_START, "calc 
slots ids trampling inf
 #define SID_EDIT_SPARKLINE  (SID_NEW_SLOTS+116)
 #define SID_SC_OPT_LINKSTypedWhichId(SID_NEW_SLOTS + 
117)
 #define SID_CLEAR_AUTO_FILTER   (SID_NEW_SLOTS+118)
-#define SID_SC_OPT_ALLOWINVALIDDATA  TypedWhichId(SID_NEW_SLOTS + 
119)
 
 // idl parameter
 
diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx
index 4e0039f83141..7850c0e52304 100644
--- a/sc/source/core/data/validat.cxx
+++ b/sc/source/core/data/validat.cxx
@@ -37,7 +37,6 @@
 #include 
 #include 
 
-#include 
 #include 
 #include 
 #include 
@@ -52,7 +51,6 @@
 #include 
 #include 
 #include 
-#include 
 
 #include 
 #include 
@@ -385,9 +383,7 @@ void ScValidationData::DoError(weld::Window* pParent, const 
OUString& rInput, co
 }
 
 if (!bShowError) {
-const bool bAcceptInvalidData = 
ScModule::get()->GetAppOptions().GetAllowInvalidData();
-if (!bAcceptInvalidData)
-callback(true);
+callback(true);
 return;
 }
 
diff --git a/sc/source/core/tool/appoptio.cxx b/sc/source/core/tool/appoptio.cxx
index 14dc123689e1..3825ccf8468b 100644
--- a/sc/source/core/tool/appoptio.cxx
+++ b/sc/source/core/tool/appoptio.cxx
@@ -83,7 +83,6 @@ void ScAppOptions::SetDefaults()
 
 meKeyBindingType = ScOptionsUtil::KEY_DEFAULT;
 mbLinksInsertedLikeMSExcel = false;
-mbAllowInvalidData = false;
 }
 
 ScAppOptions& ScAppOptions::operator=( const ScAppOptions& rCpy )
@@ -108,7 +107,6 @@ ScAppOptions& ScAppOptions::operator=( const ScAppOptions& 
rCpy )
 bClickChangeRotation = rCpy.bClickChangeRotation;
 meKeyBindingType  = rCpy.meKeyBindingType;
 mbLinksInsertedLikeMSExcel = rCpy.mbLinksInsertedLikeMSExcel;
-mbAllowInvalidData = rCpy.mbAllowInvalidData;
 return *this;
 }
 
@@ -203,8 +201,6 @@ constexpr OUStringLiteral CFGPATH_COMPAT = 
u"Office.Calc/Compatibility";
 
 #define SCCOMPATOPT_KEY_BINDING 0
 #define SCCOMPATOPT_LINK_LIKE_MS1
-#define SCCOMPATOPT_ALLOWINVALIDDATA 2
-
 
 // Default value of

core.git: officecfg/registry sc/inc sc/source sc/uiconfig

2025-12-09 Thread Heiko Tietze (via logerrit)

 officecfg/registry/schema/org/openoffice/Office/Calc.xcs |7 +
 sc/inc/appoptio.hxx  |4 
 sc/inc/sc.hrc|1 
 sc/source/core/data/validat.cxx  |6 -
 sc/source/core/tool/appoptio.cxx |   14 ++
 sc/source/ui/app/inputhdl.cxx|5 
 sc/source/ui/app/scmod.cxx   |   10 +
 sc/source/ui/inc/tpcompatibility.hxx |2 
 sc/source/ui/optdlg/tpcompatibility.cxx  |   15 ++
 sc/uiconfig/scalc/ui/optcompatibilitypage.ui |   82 +--
 10 files changed, 134 insertions(+), 12 deletions(-)

New commits:
commit a6bc66ca8ddf23ede2807c2043d94f5c77adfe39
Author: Heiko Tietze 
AuthorDate: Tue Dec 9 13:06:44 2025 +0100
Commit: Heiko Tietze 
CommitDate: Wed Dec 10 07:39:03 2025 +0100

Resolves tdf#160096 - Allow invalid values regardless the validation

Introduces a new compatibility option
Makes c869fb5ea2fa1dbbfa7c17754aeac48ed7f77cc4 optionally

Change-Id: I75c2a801f41a5e3d9688fdb1557f86506ed11697
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195288
Reviewed-by: Heiko Tietze 
Tested-by: Jenkins

diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index 80e79448d344..7db98412d8d3 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -1971,6 +1971,13 @@
 
 false
   
+  
+
+  If set, data are accepted regardless of being invalid (as 
known from Excel and LibreOffice before tdf#159595)
+  Data Validity like Excel
+
+false
+  
 
 
   
diff --git a/sc/inc/appoptio.hxx b/sc/inc/appoptio.hxx
index d4beeec78c06..1b9c4cc50439 100644
--- a/sc/inc/appoptio.hxx
+++ b/sc/inc/appoptio.hxx
@@ -86,6 +86,9 @@ public:
 voidSetLinksInsertedLikeMSExcel(bool bNew) { 
mbLinksInsertedLikeMSExcel = bNew; }
 boolGetLinksInsertedLikeMSExcel() const { return 
mbLinksInsertedLikeMSExcel; }
 
+voidSetAllowInvalidData(bool bNew) { mbAllowInvalidData = bNew; }
+boolGetAllowInvalidData() const { return mbAllowInvalidData; }
+
 ScAppOptions& operator=   ( const ScAppOptions& rOpt );
 
 private:
@@ -111,6 +114,7 @@ private:
 boolbClickChangeRotation;
 ScOptionsUtil::KeyBindingType meKeyBindingType;
 boolmbLinksInsertedLikeMSExcel;
+boolmbAllowInvalidData;
 };
 
 //  Config Item containing app options
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 629289aef0bf..6cc35ba4fed8 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -638,6 +638,7 @@ static_assert(SID_PREVIEW_END < SID_KEYFUNC_START, "calc 
slots ids trampling inf
 #define SID_EDIT_SPARKLINE  (SID_NEW_SLOTS+116)
 #define SID_SC_OPT_LINKSTypedWhichId(SID_NEW_SLOTS + 
117)
 #define SID_CLEAR_AUTO_FILTER   (SID_NEW_SLOTS+118)
+#define SID_SC_OPT_ALLOWINVALIDDATA  TypedWhichId(SID_NEW_SLOTS + 
119)
 
 // idl parameter
 
diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx
index 7850c0e52304..4e0039f83141 100644
--- a/sc/source/core/data/validat.cxx
+++ b/sc/source/core/data/validat.cxx
@@ -37,6 +37,7 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -51,6 +52,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -383,7 +385,9 @@ void ScValidationData::DoError(weld::Window* pParent, const 
OUString& rInput, co
 }
 
 if (!bShowError) {
-callback(true);
+const bool bAcceptInvalidData = 
ScModule::get()->GetAppOptions().GetAllowInvalidData();
+if (!bAcceptInvalidData)
+callback(true);
 return;
 }
 
diff --git a/sc/source/core/tool/appoptio.cxx b/sc/source/core/tool/appoptio.cxx
index 3825ccf8468b..14dc123689e1 100644
--- a/sc/source/core/tool/appoptio.cxx
+++ b/sc/source/core/tool/appoptio.cxx
@@ -83,6 +83,7 @@ void ScAppOptions::SetDefaults()
 
 meKeyBindingType = ScOptionsUtil::KEY_DEFAULT;
 mbLinksInsertedLikeMSExcel = false;
+mbAllowInvalidData = false;
 }
 
 ScAppOptions& ScAppOptions::operator=( const ScAppOptions& rCpy )
@@ -107,6 +108,7 @@ ScAppOptions& ScAppOptions::operator=( const ScAppOptions& 
rCpy )
 bClickChangeRotation = rCpy.bClickChangeRotation;
 meKeyBindingType  = rCpy.meKeyBindingType;
 mbLinksInsertedLikeMSExcel = rCpy.mbLinksInsertedLikeMSExcel;
+mbAllowInvalidData = rCpy.mbAllowInvalidData;
 return *this;
 }
 
@@ -201,6 +203,8 @@ constexpr OUStringLiteral CFGPATH_COMPAT = 
u"Office.Calc/Compatibility";
 
 #define SCCOMPATOPT_KEY_BINDING 0
 #define SCCOMPATOPT_LINK_LIKE_MS1
+#define SCCOMPATOPT_ALLOWINVALIDDATA 2
+
 
 // Default value of Layout/Other/Status

core.git: officecfg/registry

2025-12-09 Thread Ilmari Lauhakangas (via logerrit)

 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |   28 
+-
 1 file changed, 14 insertions(+), 14 deletions(-)

New commits:
commit 35e97e664f2a5631a63b78d1a31f833232dea17b
Author: Ilmari Lauhakangas 
AuthorDate: Tue Dec 9 08:29:36 2025 +0100
Commit: Ilmari Lauhakangas 
CommitDate: Tue Dec 9 17:13:37 2025 +0100

tdf#158289 Use consistent grammar for the labels of commands related to

tracked changes

Change-Id: I4861245a27f24421b1a774ddcc19407d066d5a70
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195268
Tested-by: Jenkins
Reviewed-by: Ilmari Lauhakangas 

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 634945d86b04..ab2f9b6256de 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -231,7 +231,7 @@
   Reject
 
 
-  Reject Track Change
+  Reject Tracked Change
 
 
   Reject Change
@@ -245,7 +245,7 @@
   Reject and Move to Next
 
 
-  Reject Track Change and select the next 
one
+  Reject Tracked Change and select the next 
one
 
 
   1
@@ -292,7 +292,7 @@
   Accept
 
 
-  Accept Track Change
+  Accept Tracked Change
 
 
   Accept Change
@@ -306,7 +306,7 @@
   Accept and Move to Next
 
 
-  Accept Track Change and select the next 
one
+  Accept Tracked Change and select the next 
one
 
 
   1
@@ -342,7 +342,7 @@
   Next
 
 
-  Next Track Change
+  Next Tracked Change
 
 
   1
@@ -353,7 +353,7 @@
   Pr~evious
 
 
-  Previous Track Change
+  Previous Tracked Change
 
 
   1
@@ -375,7 +375,7 @@
   ~Record
 
 
-  Record Track Changes
+  Record Tracked Changes
 
 
   1
@@ -383,10 +383,10 @@
   
   
 
-  Track Changes Functions
+  Change-Tracking Functions
 
 
-  Show Track Changes Functions
+  Show Change-Tracking Functions
 
 
   1
@@ -394,13 +394,13 @@
   
   
 
-  Show Track Changes
+  Show Tracked Changes
 
 
   Show
 
 
-  Show track changes
+  Show tracked changes
 
 
   1
@@ -515,7 +515,7 @@
   ~Comment...
 
 
-  Insert Track Change Comment
+  Insert Comment for Tracked Change
 
 
   1
@@ -542,7 +542,7 @@
   ~Manage...
 
 
-  Manage Track Changes
+  Manage Tracked Changes
 
 
   1
@@ -3358,7 +3358,7 @@
   
   
 
-  Manage Track Changes
+  Manage Tracked Changes
 
 
   .uno:AcceptTrackedChanges

core.git: officecfg/registry vcl/source

2025-12-05 Thread Michael Weghorn (via logerrit)

 officecfg/registry/data/org/openoffice/Office/Common.xcu   |2 ++
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |9 +
 vcl/source/app/ColorDialog.cxx |9 +
 3 files changed, 20 insertions(+)

New commits:
commit 5bb41f2a588caff88b2fd957af9c9e94d8cdf2e0
Author: Michael Weghorn 
AuthorDate: Fri Dec 5 16:59:14 2025 +0100
Commit: Michael Weghorn 
CommitDate: Sat Dec 6 08:43:02 2025 +0100

tdf#169505 Allow disabling native color pickers

Similar to the existing option that allows
disabling system/toolkit file pickers
(officecfg::Office::Common::Misc::UseSystemFileDialog),
also add an option
(officecfg::Office::Common::Misc::UseSystemColorDialog::get)
to disable the system/toolkit color pickers, which were
unconditionally enabled for the GTK and Qt based VCL plugins
in commits

commit dae9472b27914807ec08062e8293a091e90cffb6
Author: Michael Weghorn 
Date:   Fri Jul 25 14:26:06 2025 +0200

tdf#167669 weld: Introduce weld::ColorChooserDialog

and

commit c0721600c294ebc46217477a80a8eea34609e4bc
Author: Michael Weghorn 
Date:   Fri Jul 25 14:55:34 2025 +0200

tdf#167669 gtk: Use native GtkColorChooserDialog

and

commit 072010169bb4668f3c624a9f379e8a79e4e3e57a
Author: Michael Weghorn 
Date:   Fri Jul 25 15:09:25 2025 +0200

tdf#167669 tdf#130857 qt: Use native QColorDialog

For users that prefer the custom LibreOffice dialog
instead of the native toolkit ones, this allows switching
back to the former one as follows:

* "Tools" -> "Options"
* "LibreOffice(Dev)" -> "Advanced"
* press "Open Expert Configuration" button
* search for "UseSystemColorDialog" and toggle the value
  of the corresponding setting to false

A checkbox in the "General" tab of the options dialog
to make toggling this easier will be added in a separate
upcoming commit.

Change-Id: I99c5f1e350c36aa3cb70f26724cce9263160f945
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195104
Reviewed-by: Michael Weghorn 
Tested-by: Jenkins

diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu 
b/officecfg/registry/data/org/openoffice/Office/Common.xcu
index 54cd6c148d83..4887cff4 100644
--- a/officecfg/registry/data/org/openoffice/Office/Common.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu
@@ -402,6 +402,8 @@
 
   
   
+
+
 
 
 
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 766de1514ddb..cd3ba8cc88f4 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -5320,6 +5320,15 @@
 
 true
   
+  
+
+  Determines if the system's color pickers should be
+  used. If false, the proprietary color picker implementation
+  will be used. Relevant on platforms where color picker
+  integration is implemented.
+
+true
+  
   
 
   Determines if the system's file and folder pickers should be
diff --git a/vcl/source/app/ColorDialog.cxx b/vcl/source/app/ColorDialog.cxx
index b231fce639a5..7b9b8f90ef04 100644
--- a/vcl/source/app/ColorDialog.cxx
+++ b/vcl/source/app/ColorDialog.cxx
@@ -17,9 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -49,6 +51,13 @@ private:
 
 ColorDialog::ColorDialog(weld::Window* pParent, vcl::ColorPickerMode eMode)
 {
+if (!officecfg::Office::Common::Misc::UseSystemColorDialog::get())
+{
+// use custom LibreOffice color picker dialog
+m_pColorDialogController = 
std::make_shared(pParent, COL_BLACK, eMode);
+return;
+}
+
 std::unique_ptr pDialog
 = GetSalInstance()->CreateColorChooserDialog(pParent, eMode);
 assert(pDialog);

core.git: officecfg/registry sc/source

2025-11-28 Thread Xisco Fauli (via logerrit)

 officecfg/registry/data/org/openoffice/Office/Calc.xcu |2 +-
 sc/source/core/tool/interpr2.cxx   |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0ece629aae3ba9f862f919b988d97fa7bf99924f
Author: Xisco Fauli 
AuthorDate: Fri Nov 28 10:25:42 2025 +0100
Commit: Xisco Fauli 
CommitDate: Fri Nov 28 12:14:08 2025 +0100

fix typo: BLN -> BGN

After
commit 37d1cc071ba0cc7f9922c4409d0a014a722ebbce
Author: Rene Engelhard 
Date:   Sat Aug 9 19:05:15 2025 +0200

add EUR for Bulgaria/Lew

Change-Id: I6679404cba0be0219bf7ede06297f9b1c990e8b4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194760
Reviewed-by: Eike Rathke 
Tested-by: Jenkins
Reviewed-by: René Engelhard 

diff --git a/officecfg/registry/data/org/openoffice/Office/Calc.xcu 
b/officecfg/registry/data/org/openoffice/Office/Calc.xcu
index 2b1e0e2bf5a3..bfea83487242 100644
--- a/officecfg/registry/data/org/openoffice/Office/Calc.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Calc.xcu
@@ -244,7 +244,7 @@
 EUR
   
   
-BLN
+BGN
   
   
 1.95583
diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index 797d863abefb..d12b5c4dbb54 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -3304,7 +3304,7 @@ static bool lclConvertMoney( std::u16string_view 
aSearchUnit, double& rfRate, in
 { "LVL", 0.702804, 2 },
 { "LTL", 3.45280,  2 },
 { "HRK", 7.53450,  2 },
-{ "BLN", 1.95583,  2 }
+{ "BGN", 1.95583,  2 }
 };
 
 for (const auto & i : aConvertTable)

core.git: officecfg/registry Repository.mk sdext/AllLangMoTarget_sdext.mk sdext/inc sdext/Library_PresentationMinimizer.mk sdext/Module_sdext.mk sdext/source

2025-11-10 Thread Gabor Kelemen (via logerrit)

 Repository.mk |
1 
 officecfg/registry/data/org/openoffice/Office/PresentationMinimizer.xcu   |   
81 ---
 officecfg/registry/schema/org/openoffice/Office/PresentationMinimizer.xcs |  
109 --
 sdext/AllLangMoTarget_sdext.mk|   
14 +
 sdext/Library_PresentationMinimizer.mk|
2 
 sdext/Module_sdext.mk |
4 
 sdext/inc/sdextresid.hxx  |   
16 +
 sdext/inc/strings.hrc |   
41 +++
 sdext/source/minimizer/configurationaccess.cxx|   
41 ---
 sdext/source/minimizer/configurationaccess.hxx|
2 
 sdext/source/minimizer/impoptimizer.cxx   |   
16 -
 sdext/source/minimizer/informationdialog.cxx  |   
18 -
 sdext/source/minimizer/optimizerdialog.cxx|   
20 +
 sdext/source/minimizer/optimizerdialogcontrols.cxx|   
14 -
 sdext/source/minimizer/pppoptimizertoken.cxx  |   
26 --
 sdext/source/minimizer/pppoptimizertoken.hxx  |   
25 --
 sdext/source/minimizer/sdextresid.cxx |   
15 +
 17 files changed, 131 insertions(+), 314 deletions(-)

New commits:
commit f86a784f8fb1f5bf0a14d723855ad6ad9d342532
Author: Gabor Kelemen 
AuthorDate: Sun Nov 9 11:13:37 2025 +0100
Commit: Andras Timar 
CommitDate: Mon Nov 10 15:32:38 2025 +0100

tdf#61950 Move Presentation Minimizer UI strings out of officecfg

Change-Id: I8a9bba8cdde89a87340ed9dd46dbac53b6806e9d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193654
Tested-by: Jenkins
Reviewed-by: Andras Timar 

diff --git a/Repository.mk b/Repository.mk
index 2068a2b70b1e..d6219fccf094 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -1214,6 +1214,7 @@ $(eval $(call gb_Helper_register_mos,\
sca \
scc \
sd \
+   sdext \
sfx \
shell \
sm \
diff --git 
a/officecfg/registry/data/org/openoffice/Office/PresentationMinimizer.xcu 
b/officecfg/registry/data/org/openoffice/Office/PresentationMinimizer.xcu
index 8f93e4843d69..f784825ecd48 100644
--- a/officecfg/registry/data/org/openoffice/Office/PresentationMinimizer.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/PresentationMinimizer.xcu
@@ -18,87 +18,6 @@
  -->
 
 http://openoffice.org/2004/installation"; 
xmlns:oor="http://openoffice.org/2001/registry"; 
xmlns:xs="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
oor:package="org.openoffice.Office" oor:name="PresentationMinimizer">
-
-
-Presentation Minimizer
-
-
-Introduction
-
-
-Images
-
-
-OLE Objects
-
-
-Object Linking and Embedding (OLE) is a 
technology that allows embedding and linking to documents and other objects.
-
-The current presentation contains OLE objects.
-
-
-Object Linking and Embedding (OLE) is a 
technology that allows embedding and linking to documents and other objects.
-
-The current presentation contains no OLE objects.
-
-
-Slides
-
-
-Summary
-
-
-Delete %SLIDES slides.
-
-
-Optimize %IMAGES images to %QUALITY% JPEG 
quality at %RESOLUTION DPI.
-
-
-Create replacement images for %OLE 
objects.
-
-
-My Settings 
-
-
-OK
-
-
-Successfully updated the presentation 
“%TITLE”.
-
-
-The file size has changed from 
%OLDFILESIZE MB to %NEWFILESIZE MB.
-
-
-The file size has changed from 
%OLDFILESIZE MB to approximately %NEWFILESIZE MB.
-
-
-The file size has changed to %NEWFILESIZE 
MB.
-
-
-The file size has changed to approximately 
%NEWFILESIZE MB.
-
-
-Duplicating presentation...
-
-
-Deleting slides...
-
-
-Optimizing images...
-
-
-Creating replacement images for OLE 
objects...
-
-
-.
-
-
-(minimized)
-
-
-Do you want to minimize presentation 
without saving?
-
-
 
 
 Projector optimized
diff --git 
a/officecfg/registry/schema/org/openoffice/Office/PresentationMinimizer.xcs 
b/officecfg/registry/schema/org/openoffice/Office/PresentationMini

core.git: officecfg/registry

2025-11-07 Thread Sampath-1984 (via logerrit)

 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 603713b6da00dafee9f6d218ad22126a65e3edc3
Author: Sampath-1984 
AuthorDate: Sun Nov 2 18:40:14 2025 +0530
Commit: Heiko Tietze 
CommitDate: Sat Nov 8 07:55:09 2025 +0100

tdf#168525 Change "Text from file..." to "Contents from Text Document..."

Change the label for '' in 
the file 'officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu'

Change-Id: I6fb1b6fcd36be05ea21183fe9ab9e676be1ab4d0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193301
Reviewed-by: Heiko Tietze 
Tested-by: Jenkins

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index a9c5d7832fd3..0ce4a0cb3972 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -3195,7 +3195,7 @@ bit 3 (0x8): #define 
UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8
   
   
 
-  Text from File...
+  Content from Document...
 
 
   1

core.git: officecfg/registry sc/inc sc/Library_sc.mk sc/sdi sc/source sc/uiconfig sc/UIConfig_scalc.mk vcl/jsdialog

2025-10-25 Thread Tomaž Vajngerl (via logerrit)

 officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu |5 
 sc/Library_sc.mk  |2 
 sc/UIConfig_scalc.mk  |1 
 sc/inc/SheetViewControl.hxx   |   32 +++
 sc/inc/sc.hrc |2 
 sc/sdi/scalc.sdi  |   21 +
 sc/sdi/tabvwsh.sdi|1 
 sc/source/ui/app/scdll.cxx|2 
 sc/source/ui/cctrl/SheetViewBox.cxx   |  106 
++
 sc/source/ui/cctrl/SheetViewControl.cxx   |   63 +
 sc/source/ui/inc/SheetViewBox.hxx |   36 +++
 sc/source/ui/inc/viewdata.hxx |4 
 sc/source/ui/view/tabview3.cxx|2 
 sc/source/ui/view/tabvwsh3.cxx|   15 +
 sc/source/ui/view/tabvwsha.cxx|6 
 sc/source/ui/view/viewdata.cxx|4 
 sc/source/ui/view/viewfun3.cxx|   10 
 sc/uiconfig/scalc/ui/notebookbar_online.ui|   27 ++
 sc/uiconfig/scalc/ui/sheetviewbox.ui  |   28 ++
 vcl/jsdialog/enabled.cxx  |1 
 20 files changed, 361 insertions(+), 7 deletions(-)

New commits:
commit 8ce68da7503eab59a50c89713824f9d0a2a95ee0
Author: Tomaž Vajngerl 
AuthorDate: Wed Oct 22 16:06:00 2025 +0900
Commit: Tomaž Vajngerl 
CommitDate: Sun Oct 26 05:08:31 2025 +0100

sc: Toolbar / NotebookBar combobox for selecting sheet views

Introduced CurrentSheetView command that handles reading and
setting the sheet view for the current sheet. In addition under
the same command, the toolbar / (online) notebookbar combobox to
show and set the combobox is available, so it can be added to the
toolbar.

Change-Id: I7910ac0590ca2b2349496e91fdf61e70c297d651
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192797
Reviewed-by: Szymon Kłos 
Tested-by: Jenkins CollaboraOffice 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192966
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index 3dcb94e9369e..7d3e943b92a3 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -35,6 +35,11 @@
   Number Format Type
 
   
+  
+
+  Current Sheet View
+
+  
   
 
   Flip Horizontally
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index 7a4c6a34cc14..eb705ac493db 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -404,6 +404,8 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
 sc/source/ui/cctrl/checklistmenu \
 sc/source/ui/cctrl/dpcontrol \
 sc/source/ui/cctrl/tbzoomsliderctrl \
+sc/source/ui/cctrl/SheetViewBox \
+sc/source/ui/cctrl/SheetViewControl \
 sc/source/ui/condformat/condformatdlg \
 sc/source/ui/condformat/condformatdlgentry \
 sc/source/ui/condformat/condformatdlgdata \
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 6b4026af9734..e1e03bb2f099 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -239,6 +239,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/sharedfooterdialog \
sc/uiconfig/scalc/ui/sharedheaderdialog \
sc/uiconfig/scalc/ui/sharedwarningdialog \
+   sc/uiconfig/scalc/ui/sheetviewbox \
sc/uiconfig/scalc/ui/showchangesdialog \
sc/uiconfig/scalc/ui/showdetaildialog \
sc/uiconfig/scalc/ui/showsheetdialog \
diff --git a/sc/inc/SheetViewControl.hxx b/sc/inc/SheetViewControl.hxx
new file mode 100644
index ..878c10680685
--- /dev/null
+++ b/sc/inc/SheetViewControl.hxx
@@ -0,0 +1,32 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#pragma once
+
+#include 
+
+namespace sc
+{
+/** Toolbox control for showing the SheetViewBox in the toolbar / notebookbar 
*/
+class SheetViewControl final : public SfxToolBoxControl
+{
+public:
+SFX_DECL_TOOLBOX_CONTROL();
+
+SheetViewControl(sal_uInt16 nSlotId, ToolBoxItemId nId, ToolBox& rToolBox);
+virtual ~SheetViewControl() override;
+
+virtual

core.git: officecfg/registry sw/inc sw/source sw/uiconfig

2025-10-23 Thread Heiko Tietze (via logerrit)

 officecfg/registry/schema/org/openoffice/Office/Writer.xcs |7 +
 sw/inc/viewopt.hxx |2 
 sw/source/ui/config/optpage.cxx|   18 +++
 sw/source/uibase/config/viewopt.cxx|8 +
 sw/source/uibase/docvw/edtdd.cxx   |3 
 sw/source/uibase/inc/optpage.hxx   |4 
 sw/uiconfig/swriter/ui/optformataidspage.ui|   71 +
 7 files changed, 112 insertions(+), 1 deletion(-)

New commits:
commit a2e3d9389182b5f06b80ebc73b832d1df9700bef
Author: Heiko Tietze 
AuthorDate: Wed Oct 22 16:16:58 2025 +0200
Commit: Heiko Tietze 
CommitDate: Thu Oct 23 09:56:35 2025 +0200

Resolves tdf#100998 - Add option to suppress drag'n drop of text selection

Change-Id: Ib8c352fc5c51610a7bb2323c94eaa3e00585f67b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192857
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
index 6d3efca6330a..054e7434e89c 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
@@ -2182,6 +2182,13 @@
   
   false
 
+
+  
+Specifies whether drag'n drop of selected text is possible 
in editengine.
+Allow drag'n drop
+  
+  true
+
   
 
 
diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx
index 9b62e330963f..ff93ba1540c7 100644
--- a/sw/inc/viewopt.hxx
+++ b/sw/inc/viewopt.hxx
@@ -610,6 +610,8 @@ public:
 
 static bool IsIgnoreProtectedArea();
 
+static bool IsAllowDragDropText();
+
 bool IsPDFExport() const
 {return bool(m_nCore2Options & ViewOptCoreFlags2::PdfExport); }
 
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 214a0852c70e..8c919093c13d 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -1742,6 +1742,9 @@ 
SwShdwCursorOptionsTabPage::SwShdwCursorOptionsTabPage(weld::Container* pPage, w
 , 
m_xFmtAidsAutoComplFrame(m_xBuilder->weld_frame(u"fmtaidsautocompleteframe"_ustr))
 , 
m_xEncloseWithCharactersCB(m_xBuilder->weld_check_button(u"enclosewithcharacters"_ustr))
 , 
m_xEncloseWithCharactersImg(m_xBuilder->weld_widget(u"lockenclosewithcharacters"_ustr))
+, m_xDragDropFrame(m_xBuilder->weld_frame(u"frmDragDrop"_ustr))
+, m_xDragDropCB(m_xBuilder->weld_check_button(u"allowdragdrop"_ustr))
+, m_xDragDropImg(m_xBuilder->weld_widget(u"lockallowdragdrop"_ustr))
 , 
m_xTextBoundariesCB(m_xBuilder->weld_check_button(u"cbTextBoundaries"_ustr))
 , 
m_xSectionBoundariesCB(m_xBuilder->weld_check_button(u"cbSectionBoundaries"_ustr))
 , 
m_xTableBoundariesCB(m_xBuilder->weld_check_button(u"cbTableBoundaries"_ustr))
@@ -1866,6 +1869,14 @@ bool SwShdwCursorOptionsTabPage::FillItemSet( 
SfxItemSet* rSet )
 bRet = true;
 }
 
+if( m_xDragDropCB->get_state_changed_from_saved())
+{
+std::shared_ptr xChanges(
+comphelper::ConfigurationChanges::create());
+
officecfg::Office::Writer::Cursor::Option::AllowDragDrop::set(m_xDragDropCB->get_active(),
 xChanges);
+xChanges->commit();
+}
+
 SwFmtAidsAutoComplItem aFmtAidsAutoComplOpt;
 
aFmtAidsAutoComplOpt.SetEncloseWithCharactersOn(m_xEncloseWithCharactersCB->get_active());
 if (const SwFmtAidsAutoComplItem* pFmtAidsAutoComplItem
@@ -1951,6 +1962,13 @@ void SwShdwCursorOptionsTabPage::Reset( const 
SfxItemSet* rSet )
 m_xCursorInProtImg->set_visible(bReadOnly);
 m_xCursorInProtCB->save_state();
 
+const bool bAllowDragDrop = 
officecfg::Office::Writer::Cursor::Option::AllowDragDrop::get();
+m_xDragDropCB->set_active(bAllowDragDrop);
+bReadOnly = 
officecfg::Office::Writer::Cursor::Option::AllowDragDrop::isReadOnly();
+m_xDragDropCB->set_sensitive(!bReadOnly);
+m_xDragDropImg->set_visible(bReadOnly);
+m_xDragDropCB->save_state();
+
 const SwDocDisplayItem* pDocDisplayAttr = rSet->GetItemIfSet( 
FN_PARAM_DOCDISP, false );
 if(pDocDisplayAttr)
 {
diff --git a/sw/source/uibase/config/viewopt.cxx 
b/sw/source/uibase/config/viewopt.cxx
index 5cfd149b1122..5a2b5dcdbe90 100644
--- a/sw/source/uibase/config/viewopt.cxx
+++ b/sw/source/uibase/config/viewopt.cxx
@@ -579,6 +579,14 @@ bool SwViewOption::IsIgnoreProtectedArea()
 return gIgnoreProtectedArea.get();
 }
 
+bool SwViewOption::IsAllowDragDropText()
+{
+if (comphelper::IsFuzzing())
+return true;
+static comphelper::ConfigurationListenerProperty 
gAllowDragDrop(getWCOptionListener(), u"AllowDragDrop"_ustr);
+return gAllowDragDrop.get();
+}
+
 void SwViewOption::SyncLayoutRelatedViewOptions(const SwViewOption& rOpt)
 {
 SetFieldName(rOpt.IsFieldName());

core.git: officecfg/registry

2025-10-18 Thread Heiko Tietze (via logerrit)

 officecfg/registry/schema/org/openoffice/Office/Common.xcs |   20 +
 1 file changed, 8 insertions(+), 12 deletions(-)

New commits:
commit 61902b95e501414640e74932131b7954639a0414
Author: Heiko Tietze 
AuthorDate: Fri Sep 5 22:39:36 2025 +0200
Commit: Heiko Tietze 
CommitDate: Tue Sep 23 12:13:37 2025 +0200

Resolves tdf#168292 - Bullet Library has repetitive content

Change-Id: I48a0ed570c0d7058b9391784499563dcf7b38e69
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190626
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index dac5c6a81458..86649b3315ed 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -3381,16 +3381,14 @@
   List of default bullets
 
 
-  •
-  ◦
-  ▪
-  •
-  ◦
-  ▪
-  •
-  ◦
-  ▪
-  •
+  ●
+  ○
+  □
+  ►
+  →
+  -
+  –
+  ✸
 
   
   
@@ -3406,8 +3404,6 @@
   OpenSymbol
   OpenSymbol
   OpenSymbol
-  OpenSymbol
-  OpenSymbol

core.git: officecfg/registry

2025-10-18 Thread Jesus Solis (via logerrit)

 officecfg/registry/data/org/openoffice/Office/Accelerators.xcu |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit f32ece43cbf21a2ab9f9042c684c06b01bcc0ac9
Author: Jesus Solis 
AuthorDate: Tue Sep 30 21:42:08 2025 -0500
Commit: Ilmari Lauhakangas 
CommitDate: Thu Oct 16 09:07:52 2025 +0200

tdf#15 add keyboard shortcut to toggle list ordering

Change-Id: I727ed9df88ca992af8dcc09a9dc897c9289fbe3e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191702
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu 
b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index c86c3cfa27a5..199401558d59 100644
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -3173,6 +3173,12 @@ Ctrl+Shift+u aka U_SHIFT_MOD1 under GTK/IBUS is for 
unicode key input
 .uno:DesignerDialog
   
 
+
+  
+L10N SHORTCUTS - NO 
TRANSLATE
+.uno:DefaultBullet
+  
+
 
   
 L10N SHORTCUTS - NO 
TRANSLATE

core.git: officecfg/registry sc/inc sc/Library_sc.mk sc/sdi sc/source sc/uiconfig sc/UIConfig_scalc.mk vcl/jsdialog

2025-10-17 Thread Tomaž Vajngerl (via logerrit)

 officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu |8 
 sc/Library_sc.mk  |1 
 sc/UIConfig_scalc.mk  |1 
 sc/inc/SheetView.hxx  |7 
 sc/inc/SheetViewManager.hxx   |3 
 sc/inc/sc.hrc |1 
 sc/sdi/scalc.sdi  |   18 +
 sc/sdi/tabvwsh.sdi|1 
 sc/source/core/data/SheetView.cxx |3 
 sc/source/core/data/SheetViewManager.cxx  |8 
 sc/source/ui/dialogs/SelectSheetViewDialog.cxx|   92 +
 sc/source/ui/inc/dialogs/SelectSheetViewDialog.hxx|   42 ++
 sc/source/ui/inc/viewfunc.hxx |1 
 sc/source/ui/view/tabvwsh3.cxx|   18 +
 sc/source/ui/view/tabvwsha.cxx|1 
 sc/source/ui/view/viewfun3.cxx|   28 -
 sc/uiconfig/scalc/ui/selectsheetviewdialog.ui |  161 
++
 vcl/jsdialog/enabled.cxx  |3 
 18 files changed, 380 insertions(+), 17 deletions(-)

New commits:
commit 3b0ea28e061f9335b907ae8febfadf8fc04c599b
Author: Tomaž Vajngerl 
AuthorDate: Mon Oct 6 23:49:50 2025 +0900
Commit: Tomaž Vajngerl 
CommitDate: Fri Oct 10 14:00:06 2025 +0200

sc: add a SelectSheetView command to select a sheet view

This adds a command that opens a dialog to show all the available
sheet views for the current sheet. Selecting a sheet view will
switch to that sheet view (or default view) on OK.

This also adds name as a parameter to SheetView class, so we can
store a name of the sheet view. The name is currently generated
and is in a format of "Temp SheetView #".

Change-Id: I11accc30780991f74da97120bb4085ef283a0564
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191978
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins CollaboraOffice 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192149
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index a9d1175b75c4..3dcb94e9369e 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -2725,6 +2725,14 @@
   1
 
   
+  
+
+  Select Sheet View
+
+
+  1
+
+  
   
 
   Exit Sheet View
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index 724c24b1de00..7a4c6a34cc14 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -435,6 +435,7 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
 sc/source/ui/dbgui/sfiltdlg \
 sc/source/ui/dbgui/validate \
 sc/source/ui/dialogs/searchresults \
+sc/source/ui/dialogs/SelectSheetViewDialog \
 sc/source/ui/dialogs/SparklineDialog \
 sc/source/ui/dialogs/SparklineDataRangeDialog \
 sc/source/ui/docshell/arealink \
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 84ff69d9bc3e..6b4026af9734 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -228,6 +228,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/searchresults \
sc/uiconfig/scalc/ui/selectdatasource \
sc/uiconfig/scalc/ui/selectrange \
+   sc/uiconfig/scalc/ui/selectsheetviewdialog \
sc/uiconfig/scalc/ui/selectsource \
sc/uiconfig/scalc/ui/sheetprintpage \
sc/uiconfig/scalc/ui/sharedocumentdlg \
diff --git a/sc/inc/SheetView.hxx b/sc/inc/SheetView.hxx
index 4411f56b7b1d..4f4e2258004f 100644
--- a/sc/inc/SheetView.hxx
+++ b/sc/inc/SheetView.hxx
@@ -8,7 +8,9 @@
  */
 
 #pragma once
+
 #include "types.hxx"
+#include 
 
 class ScTable;
 
@@ -24,13 +26,16 @@ class SheetView
 private:
 ScTable* mpTable = nullptr;
 bool mbSynced = true;
+OUString maName;
 
 public:
-SheetView(ScTable* pTable);
+SheetView(ScTable* pTable, OUString const& rName);
 
 ScTable* getTablePointer() const;
 SCTAB getTableNumber() const;
 
+OUString const& GetName() { return maName; }
+
 /** A sheet view is valid if the pointer to the table is set */
 bool isValid() const;
 
diff --git a/sc/inc/SheetViewManager.hxx b/sc/inc/SheetViewManager.hxx
index b8562c568eeb..3687197d3619 100644
--- a/sc/inc/SheetViewManager.hxx
+++ b/sc/inc/SheetViewManager.hxx
@@ -26,12 +26,15 @@ class SC_DLLPUBLIC SheetViewManager
 {
 private:
 std::vector> maViews;
+sal_Int32 maNameCounter = 0;
 
 bool i

core.git: officecfg/registry

2025-10-17 Thread Ilmari Lauhakangas (via logerrit)

 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 3648632bd1c002477f17fb2d0e1c2aa9c31ab72a
Author: Ilmari Lauhakangas 
AuthorDate: Mon Oct 13 21:17:09 2025 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Mon Oct 13 21:38:35 2025 +0200

tdf#164389 Tweak accelerators for variable Date/Time fields in Writer

With GTK3, the first press of "d" unexpectedly jumped to Date (variable)

Change-Id: I4e51e94b583a67d0eb9557a2f5d6673dfe932345
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192327
Tested-by: Jenkins
Reviewed-by: Ilmari Lauhakangas 

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index dd8b4b54e69d..634945d86b04 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -1158,7 +1158,7 @@
   
   
 
-  ~Date (variable)
+  Dat~e (variable)
 
 
   1
@@ -1182,7 +1182,7 @@
   
   
 
-  ~Time (variable)
+  Time (~variable)
 
 
   1

core.git: officecfg/registry

2025-10-03 Thread Gabor Kelemen (via logerrit)

 officecfg/registry/data/org/openoffice/Office/Accelerators.xcu |9 +
 1 file changed, 9 insertions(+)

New commits:
commit b085558c5cfda4aee2832559ad09e9bb1754f93c
Author: Gabor Kelemen 
AuthorDate: Tue Sep 30 08:51:33 2025 +0200
Commit: Gabor Kelemen 
CommitDate: Fri Oct 3 13:59:19 2025 +0200

tdf#119676 modify shortcut of Extensions dialog for French

reportedly Ctrl+Alt+E does not work with French layout
Try Alt+Shift+Q

Change-Id: Ie2a630cb3ca5d65e6f793cd5e8f1108f444b70ee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191649
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen 

diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu 
b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index e8cdc2e19960..c86c3cfa27a5 100644
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -198,6 +198,15 @@ Ctrl+Shift+u aka U_SHIFT_MOD1 under GTK/IBUS is for 
unicode key input
 
   L10N SHORTCUTS - NO 
TRANSLATE
   service:com.sun.star.deployment.ui.PackageManagerDialog
+  
+  
+
+  
+  
+  
+
+  L10N SHORTCUTS - NO 
TRANSLATE
+  service:com.sun.star.deployment.ui.PackageManagerDialog

core.git: officecfg/registry static/CustomTarget_emscripten_fs_image.mk sw/sdi sw/source sw/uiconfig sw/UIConfig_swriter.mk

2025-09-17 Thread Irgaliev Amin (via logerrit)

 officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu |   14 
 static/CustomTarget_emscripten_fs_image.mk |1 
 sw/UIConfig_swriter.mk |1 
 sw/sdi/drawsh.sdi  |6 
 sw/sdi/viewsh.sdi  |  145 
++
 sw/source/uibase/ribbar/conrect.cxx|   30 
++
 sw/source/uibase/uiview/viewdraw.cxx   |   28 +
 sw/source/uibase/uiview/viewstat.cxx   |   28 +
 sw/uiconfig/sglobal/menubar/menubar.xml|1 
 sw/uiconfig/sglobal/toolbar/drawbar.xml|1 
 sw/uiconfig/swform/menubar/menubar.xml |1 
 sw/uiconfig/swform/toolbar/drawbar.xml |1 
 sw/uiconfig/swreport/menubar/menubar.xml   |1 
 sw/uiconfig/swriter/menubar/menubar.xml|1 
 sw/uiconfig/swriter/toolbar/connectorsbar.xml  |   55 
+++
 sw/uiconfig/swriter/toolbar/drawbar.xml|1 
 sw/uiconfig/swriter/ui/notebookbar.ui  |   14 
 sw/uiconfig/swriter/ui/notebookbar_compact.ui  |   10 
 sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui   |   10 
 sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui  |   10 
 sw/uiconfig/swxform/menubar/menubar.xml|1 
 sw/uiconfig/swxform/toolbar/drawbar.xml|1 
 22 files changed, 349 insertions(+), 12 deletions(-)

New commits:
commit 4520c70fa486476403830ee575cbc68e562f0a75
Author: Irgaliev Amin 
AuthorDate: Tue Aug 19 15:28:00 2025 +0400
Commit: Mike Kaganski 
CommitDate: Wed Sep 17 09:00:59 2025 +0200

tdf#79356 - Adding connector support for Writer.

Currently, the connector functionality in Writer is only available after 
copying such lines from Draw.
This patch adds connector functionality directly to Writer.

This functionality is available in:
1.  "Insert" -> "Shape" -> "Connectors" in Standart Toolbar (UI variants)
2.  "Insert" -> "Connectors" in Tabbed (UI variants)

Change-Id: I51b517f160a69248458100ebe4fb97695bbfe1d7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189911
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
index 6463a457506d..abd292a69352 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
@@ -207,6 +207,20 @@
   true
 
   
+  
+
+  false
+
+
+  Connectors
+
+
+  false
+
+
+  true
+
+  
   
 
   false
diff --git a/static/CustomTarget_emscripten_fs_image.mk 
b/static/CustomTarget_emscripten_fs_image.mk
index 018f8333be22..202b324391a3 100644
--- a/static/CustomTarget_emscripten_fs_image.mk
+++ b/static/CustomTarget_emscripten_fs_image.mk
@@ -510,6 +510,7 @@ gb_emscripten_fs_image_files += \
 
$(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/swriter/popupmenu/text.xml
 \
 
$(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/swriter/statusbar/statusbar.xml
 \
 
$(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/swriter/toolbar/alignmentbar.xml
 \
+
$(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/swriter/toolbar/connectorsbar.xml
 \
 
$(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/swriter/toolbar/arrowsbar.xml
 \
 
$(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/swriter/toolbar/arrowshapes.xml
 \
 
$(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/swriter/toolbar/basicshapes.xml
 \
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index f6a9b99d55c7..8c76e3d9dda3 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -40,6 +40,7 @@ $(eval $(call gb_UIConfig_add_statusbarfiles,modules/swriter,\
 
 $(eval $(call gb_UIConfig_add_toolbarfiles,modules/swriter,\
sw/uiconfig/swriter/toolbar/alignmentbar \
+   sw/uiconfig/swriter/toolbar/connectorsbar \
sw/uiconfig/swriter/toolbar/arrowsbar \
sw/uiconfig/swriter/toolbar/arrowshapes \
sw/uiconfig/swriter/toolbar/basicshapes \
diff --git a/sw/sdi/drawsh.sdi b/sw/sdi/drawsh.sdi
index f0d13b306f09..270b7916d208 100644
--- a/sw/sdi/drawsh.sdi
+++ b/sw/sdi/drawsh.sdi
@@ -235,6 +235,12 @@ interface TextDraw : TextDrawBase
 Stat

core.git: officecfg/registry

2025-09-15 Thread Justin Luth (via logerrit)

 officecfg/registry/data/org/openoffice/Office/Accelerators.xcu |4 
 1 file changed, 4 insertions(+)

New commits:
commit 800eeefdafbe07dac5fceaf947e8e078afc16664
Author: Justin Luth 
AuthorDate: Sat Sep 13 06:36:41 2025 -0400
Commit: Justin Luth 
CommitDate: Mon Sep 15 17:38:45 2025 +0200

tdf#159035: remove Alt-C (character style) language menu conflicts

Alt-C traditionally activated some languages' File/Edit/Help menus
until LO 7.4 commit 856887cbc8a0a2fd04b90ee2170948d34c8ff9c4.

I found 4 by searching with
git grep -i -A1 '~File\|~Edit\|~View\|~Insert\|F~ormat\|St~yles\|
T~able\|Fo~rm\|~Tools\|~Window\|~Help' | grep -i -B1 'msgstr.*~c'

I didn't exclude Kurdish because it only conflicted with ~Windows
which is a pretty much useless main menu.

I tested that English still launches the character style dialog.
I also tested each of the languages with an Alt-C conflict,
and they now activate their main menu instead.

Change-Id: I2a8290d4fa5ea0f245b88531009e35d192cfee48
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190961
Tested-by: Jenkins
Reviewed-by: Justin Luth 

diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu 
b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index 26a69a0b8027..e8cdc2e19960 100644
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -280,6 +280,10 @@ Ctrl+Shift+u aka U_SHIFT_MOD1 under GTK/IBUS is for 
unicode key input
   .uno:UnicodeNotationToggle
   .uno:UnicodeNotationToggle
   .uno:UnicodeNotationToggle
+  
+   
+   
+

core.git: officecfg/registry sd/Library_sd.mk sd/source sd/uiconfig sd/util solenv/bin vcl/jsdialog vcl/source vcl/workben

2025-09-15 Thread codewithvk (via logerrit)

 officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu  |   11 
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |8 
 sd/Library_sd.mk |1 
 sd/source/ui/animations/SlideTransitionPane.cxx  |2 
 sd/source/ui/controller/SlideTransitionsToolBoxControl.cxx   |  111 
++
 sd/source/ui/controller/SlideTransitionsToolBoxControl.hxx   |   51 

 sd/uiconfig/simpress/ui/notebookbar_online.ui|   23 ++
 sd/util/sd.component |4 
 solenv/bin/native-code.py|1 
 vcl/jsdialog/enabled.cxx |5 
 vcl/source/window/builder.cxx|3 
 vcl/workben/cgmfuzzer.cxx|2 
 12 files changed, 219 insertions(+), 3 deletions(-)

New commits:
commit bb3316dfadd903afa090107ffbdf8f9ae4d7275b
Author: codewithvk 
AuthorDate: Mon Jul 21 21:56:40 2025 +0530
Commit: Szymon Kłos 
CommitDate: Mon Sep 15 18:52:56 2025 +0200

notebookbar: move slide transition pane

- use interim builder to put wrapper into notebookbar
- assign correct type = notebookbar
- enable for notebookbar, disable for sidebar

Signed-off-by: codewithvk 
Change-Id: I42c1c92e74fd6c0f079738937c03d3f451080c10
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188116
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 
(cherry picked from commit 8e59e9b4fa916e702bb54b963e2cfd75cce1c0e9)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190223
Tested-by: Jenkins

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
index 7e875941d828..c358da30 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
@@ -1082,6 +1082,17 @@
 
   com.sun.star.comp.sd.InsertSlideController
 
+  
+   
+  
+.uno:SlideTransitionsPane
+  
+  
+com.sun.star.presentation.PresentationDocument
+  
+  
+com.sun.star.comp.sd.SlideTransitionsToolBoxControl
+  
   
   
 
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 088a793565d8..606109cb1549 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -3488,6 +3488,14 @@ bit 3 (0x8): #define 
UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8
   1
 
   
+  
+
+  Slide Transitions
+
+
+  1
+
+  
   
 
   Date Field
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index d4a8c3a277a3..2244355494e5 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -228,6 +228,7 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
sd/source/ui/app/scalectrl \
sd/source/ui/controller/slidelayoutcontroller \
sd/source/ui/controller/displaymodecontroller \
+   sd/source/ui/controller/SlideTransitionsToolBoxControl \
sd/source/ui/dlg/AnimationChildWindow \
sd/source/ui/dlg/LayerTabBar \
sd/source/ui/dlg/NavigatorChildWindow \
diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx 
b/sd/source/ui/animations/SlideTransitionPane.cxx
index fc4034f2ab1a..dfff11e8de8c 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -363,7 +363,7 @@ sd::TransitionPresetPtr getPreset(const 
sd::impl::TransitionEffect &rEffect)
 SlideTransitionPane::SlideTransitionPane(
 weld::Widget* pParent,
 ViewShellBase & rBase) :
-PanelLayout( pParent, u"SlideTransitionsPanel"_ustr, 
u"modules/simpress/ui/slidetransitionspanel.ui"_ustr ),
+PanelLayout( pParent, u"SlideTransitionsPanel"_ustr, 
u"modules/simpress/ui/slidetransitionspanel.ui"_ustr, 
reinterpret_cast(SfxViewShell::Current())),
 mrBase( rBase ),
 mpDrawDoc( rBase.GetDocShell() ? rBase.GetDocShell()->GetDoc() : 
nullptr ),
 mxTransitionsIconView(m_xBuilder->weld_icon_view("transitions_icons")),
diff --git a/sd/source/ui/controller/SlideTransitionsToolBoxControl.cxx 
b/sd/source/ui/controller/SlideTransitionsToolBoxControl.cxx
new file mode 100644
index ..0b76fee99d00
--- /dev/null
+++ b/sd/source/ui/controller/SlideTransitionsToolBoxControl.cxx
@@ -0,0 +1,111 @@
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include "SlideTransitionsToolBoxControl.hxx"
+
+SlideTransiti

core.git: officecfg/registry

2025-09-13 Thread Justin Luth (via logerrit)

 officecfg/registry/data/org/openoffice/Office/Accelerators.xcu |   17 
++
 1 file changed, 17 insertions(+)

New commits:
commit 577750482be1f003871fe0ed01e161d189c5871b
Author: Justin Luth 
AuthorDate: Fri Sep 12 21:25:47 2025 -0400
Commit: Justin Luth 
CommitDate: Sat Sep 13 12:09:40 2025 +0200

tdf#159035: remove Alt-P (paragraph style) language menu conflicts

This patch depends on tdf#164000 which made Alt-P Writer-only.

Polish was the reported language in the bug report
where Alt-P traditionally activated the File (~Plik) menu
until LO 7.4 commit 856887cbc8a0a2fd04b90ee2170948d34c8ff9c4.

I found 15 others by searching with
git grep -i -A1 '~File\|~Edit\|~View\|~Insert\|F~ormat\|St~yles\|
T~able\|Fo~rm\|~Tools\|~Window\|~Help' | grep -i -B1 'msgstr.*~p'

I tested that English still launches the paragraph style dialog.
I also tested each of the languages with an Alt-P conflict,
and they now activate their Writer main menu instead.

Change-Id: I6bcdae20a18c2875af33511c8d9c67cf9edb6f51
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190903
Tested-by: Jenkins
Reviewed-by: Justin Luth 

diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu 
b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index 0d3d9d6fe952..26a69a0b8027 100644
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -6103,6 +6103,23 @@ Ctrl+Shift+u aka U_SHIFT_MOD1 under GTK/IBUS is for 
unicode key input
   
 L10N SHORTCUTS - NO 
TRANSLATE
 .uno:EditStyle
+
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+

core.git: officecfg/registry

2025-09-13 Thread Justin Luth (via logerrit)

 officecfg/registry/data/org/openoffice/Office/Accelerators.xcu |   12 
+-
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit d49d496c2f09feb794b487afb99a35dc888357c1
Author: Justin Luth 
AuthorDate: Fri Sep 12 14:14:49 2025 -0400
Commit: Justin Luth 
CommitDate: Sat Sep 13 12:03:28 2025 +0200

tdf#164000: make Alt-P (paragraph style) shortcut key for Writer only

Alt-P has traditionally been used in Draw for the (English) page menu,
but 7.4 introduced it globally as a paragraph style dialog shortcut.

Similar to tdf#151941
(and suggested by tdf#151941 comment 2)
the paragraph style dialog only is useful for Writer
- calc: only opens the sidebar, doesn't have Format - Paragraph
- draw: not paragraph oriented, conflicts with Page menu
- impress/draw: styles are not so useful

So move it out of Global keyboard shortcuts into Writer-only.

P.S. this might also help to avoid
other language Alt- navigation problems
like we see with tdf#159035.

Change-Id: I217af298e482ef76c18f289199f6dd345e1a5ee1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190901
Tested-by: Jenkins
Reviewed-by: Justin Luth 
Reviewed-by: Heiko Tietze 

diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu 
b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index 30c487d7c035..0d3d9d6fe952 100644
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -188,12 +188,6 @@ Ctrl+Shift+u aka U_SHIFT_MOD1 under GTK/IBUS is for 
unicode key input
   .uno:Print
 
   
-  
-
-  L10N SHORTCUTS - NO 
TRANSLATE
-  .uno:EditStyle
-
-  
   
 
   L10N SHORTCUTS - NO 
TRANSLATE
@@ -6105,6 +6099,12 @@ Ctrl+Shift+u aka U_SHIFT_MOD1 under GTK/IBUS is for 
unicode key input
 .uno:StyleApply?Style:string=Text 
body&FamilyName:string=ParagraphStyles
   
 
+
+  
+L10N SHORTCUTS - NO 
TRANSLATE
+.uno:EditStyle
+  
+
 
   
 L10N SHORTCUTS - NO 
TRANSLATE

core.git: officecfg/registry sw/qa

2025-09-06 Thread Neil Roberts (via logerrit)

 officecfg/registry/data/org/openoffice/Office/Accelerators.xcu |  150 
--
 sw/qa/extras/uiwriter/uiwriter3.cxx|   24 +
 2 files changed, 148 insertions(+), 26 deletions(-)

New commits:
commit 5c62e4ec31aa31e0bbb118a39c550233b4ea9a7e
Author: Neil Roberts 
AuthorDate: Thu Sep 4 16:48:34 2025 +0200
Commit: Noel Grandin 
CommitDate: Sat Sep 6 09:20:00 2025 +0200

tdf#89557 Set the movement accelerators to expected ones on MacOS

On MacOS, the keys to move to the beginning and end of the document are
expected to be ⌘↑ and ⌘↓. Similarly, to move between paragraphs, Alt+↑
and Alt+↓ are supposed to be used. This does work correctly in
LibreOffice via the doCommandBySelector method in salframeview.mm. The
MacOS SDK itself handles translating the key events into selectors such
as “moveToBeginningOfDocument”. These are then passed to
doCommandBySelector and LibreOffice has an implementation of each
interesting selector.

However, when the cursor is in a table of contents in a document, the
frame doesn’t have the InputContextFlags::Text option and the selector
translation code is bypassed. Instead the last known key event is
sent. For ⌘↑ and friends, by default this gets interpreted as an
accelerator to move between paragraphs like Ctrl+↑ on other
platforms. That means you can’t move to the beginning and end of the
document in the expected way on MacOS if the cursor is in a table of
contents.

This patch tries to fix that by just reassigning the default
accelerators to be what they are expected to be on MacOS. That way if
anything stops the translation to a selector from working then the usual
accelerator code will work correctly.

Sadly it still isn’t possible to reassign these accelerators to
something else because the selector code will still end up overriding
them when the cursor isn’t in a table of contents. doCommandBySelector
is actually deprecated since MacOS 10.6 so in the long run this will
probably have to be done a different way. In the short term we can’t
just remove the handlers for moveToBeginningOfDocument etc because it
breaks movement in text input fields in dialog boxes. Either way, this
patch improves the situation for MacOS users because at least if you
look at the default accelerator list in the customization dialog then
the keys will now actually do what it says they do.

These changes were made with the following bit of Emacs Lisp code:

(defun fix-accelerator (start end old-url new-url &optional add-key add-url)
  (let ((end (copy-marker end)))
(goto-char start)
(when (re-search-forward (concat "^\)"
 (regexp-quote old-url)
 "")
 end
 t)
  (beginning-of-line)
  (let ((value-node (buffer-substring (point) (match-beginning 1)))
(node-start (buffer-substring start (match-beginning 1
(goto-char (match-beginning 1))
(insert " install:module=\"unxwnt\"")
(forward-line)
(insert value-node
" install:module=\"macosx\">"
new-url
"
")
(when add-key
  (goto-char end)
  (forward-line)
  (insert "
"
  node-start
  " install:module=\"macosx\">"
  add-url
  "
"
  "  
"
  "
"
(set-marker end nil)))

(defun fix-accelerators-region (start end)
  (let ((end (copy-marker end))
(replacements '(("DOWN_MOD1"
 ".uno:GoToNextPara" ".uno:GoToEndOfDoc"
 "DOWN_MOD2" ".uno:GoToNextPara")
("DOWN_SHIFT_MOD1"
 ".uno:EndOfParaSel" ".uno:EndOfDocumentSel")
("DOWN_SHIFT_MOD2"
 ".uno:MoveDown" ".uno:EndOfParaSel")
("UP_MOD1"
 ".uno:GoToStartOfPara" ".uno:GoToStartOfDoc"
 "UP_MOD2" ".uno:GoToStartOfPara")
("UP_SHIFT_MOD1"
 ".uno:StartOfParaSel" ".uno:StartOfDocumentSel")
("UP_SHIFT_MOD2"
 ".uno:MoveUp" ".uno:StartOfParaSel")))
(case-fold-search nil))
(while replacements
  (let ((key (caar replacements))
(replacement-data (cdar replacements)))
(goto-char start)
(when (re-search-forward (concat "^")
(beginning-of-line)
(apply 'fix-acc

core.git: officecfg/registry sc/inc sc/Library_sc.mk sc/sdi sc/source

2025-09-03 Thread Tomaž Vajngerl (via logerrit)

 officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu |8 +
 sc/Library_sc.mk  |2 
 sc/inc/SheetView.hxx  |   55 
++
 sc/inc/SheetViewTypes.hxx |   21 +++
 sc/inc/document.hxx   |   12 ++
 sc/inc/sc.hrc |1 
 sc/inc/table.hxx  |   15 ++
 sc/sdi/scalc.sdi  |   19 +++
 sc/sdi/tabvwsh.sdi|1 
 sc/source/core/data/SheetView.cxx |   23 
 sc/source/core/data/SheetViewManager.cxx  |   35 ++
 sc/source/core/data/document10.cxx|   51 
+
 sc/source/core/data/table1.cxx|4 
 sc/source/core/data/table7.cxx|6 +
 sc/source/ui/inc/viewdata.hxx |   13 ++
 sc/source/ui/inc/viewfunc.hxx |2 
 sc/source/ui/view/tabcont.cxx |   10 -
 sc/source/ui/view/tabvwsh3.cxx|4 
 sc/source/ui/view/tabvwsha.cxx|6 +
 sc/source/ui/view/viewdata.cxx|   17 ++-
 sc/source/ui/view/viewfun3.cxx|   15 ++
 21 files changed, 308 insertions(+), 12 deletions(-)

New commits:
commit 86e535b9a7f871765e418dcecda724392c831150
Author: Tomaž Vajngerl 
AuthorDate: Fri Jun 20 22:54:26 2025 +0200
Commit: Tomaž Vajngerl 
CommitDate: Wed Sep 3 16:36:49 2025 +0200

sc: initial commit of "sheet view" functionality

The idea of a sheet view is that we can change the auto filter's
fitlering and sorting in the current view without influencing
the filter in other views.

This is realised with a copy of a current sheet, which is shown
in the current view instead of the default sheet (which still
can be seen by other views). Very important aspect is to keep the
tables in sync.

There can be multiple sheet views and in the current view we can
switch between the default view and other sheet views freely.

This change adds a command to create a new sheet view. When the
command is triggered, it then creates a copy of the current sheet
and registers a new sheet view for that sheet/table. The current
view automatically uses the copy of the sheet for all changes, but
if the sheet is changed, nothing is synched yet.

Change-Id: Ia77c5ab759113eaae237c638015401418ab56033
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187741
Reviewed-by: Tomaž Vajngerl 
Tested-by: Jenkins

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index 265d328dd575..2b2560714d27 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -2693,6 +2693,14 @@
   1
 
   
+  
+
+  New Sheet View
+
+
+  1
+
+  
   
 
   Assign Macro...
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index c1bfa620e75d..efe89a34bd08 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -191,6 +191,8 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
 sc/source/core/data/rowheightcontext \
 sc/source/core/data/segmenttree \
 sc/source/core/data/sheetevents \
+sc/source/core/data/SheetView \
+sc/source/core/data/SheetViewManager \
 sc/source/core/data/simpleformulacalc \
 sc/source/core/data/SolverSettings \
 sc/source/core/data/sortparam \
diff --git a/sc/inc/SheetView.hxx b/sc/inc/SheetView.hxx
new file mode 100644
index ..abb0a3278ca7
--- /dev/null
+++ b/sc/inc/SheetView.hxx
@@ -0,0 +1,55 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#pragma once
+#include 
+#include "SheetViewTypes.hxx"
+
+class ScTable;
+
+namespace sc
+{
+/** Stores information of a sheet view.
+ *
+ * A sheet view is a special view of a sheet that can be filtered and sorted
+ * independently from other views of the sheet.
+ **/
+class SheetView
+{
+private:
+ScTable* mpTable = nullptr;
+
+public:
+SheetView() = default;
+SheetView(ScTable* pTable);
+
+ScTable*

core.git: officecfg/registry sw/qa

2025-09-01 Thread Ilmari Lauhakangas (via logerrit)

 officecfg/registry/schema/org/openoffice/Office/Writer.xcs |2 
 sw/qa/extras/uiwriter/uiwriter9.cxx|   31 -
 2 files changed, 31 insertions(+), 2 deletions(-)

New commits:
commit 0e087513de7158fb3dbc192425782e5654fbc08c
Author: Ilmari Lauhakangas 
AuthorDate: Sun Aug 31 12:44:18 2025 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Mon Sep 1 19:58:49 2025 +0200

tdf#151710 Don't activate Enclose with characters by default

It is disruptive for non-power users, who then have trouble
finding how to turn it off.

Change-Id: Ib0d849d93794f797aca03d68ead4ef605667aa9e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190431
Tested-by: Jenkins
Reviewed-by: Ilmari Lauhakangas 
Reviewed-by: Mike Kaganski 

diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
index 7cdf4e6b68f0..6d3efca6330a 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
@@ -2194,7 +2194,7 @@
   Specifies whether selected text will be enclosed with 
parentheses, square brackets, curly braces or quotation marks, depending on 
which button is pressed.
   Enclose with characters
 
-true
+false
   
 
 
diff --git a/sw/qa/extras/uiwriter/uiwriter9.cxx 
b/sw/qa/extras/uiwriter/uiwriter9.cxx
index d5e02a24de72..ef1ad2deb2ae 100644
--- a/sw/qa/extras/uiwriter/uiwriter9.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter9.cxx
@@ -606,9 +606,18 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest9, testTdf165351)
 
 CPPUNIT_TEST_FIXTURE(SwUiWriterTest9, testTdf151710)
 {
+// Turn "Enclose with characters" on temporarily
+std::shared_ptr pBatch(
+comphelper::ConfigurationChanges::create());
+
officecfg::Office::Writer::FmtAidsAutocomplete::EncloseWithCharacters::set(true,
 pBatch);
+pBatch->commit();
+comphelper::ScopeGuard _([&] {
+
officecfg::Office::Writer::FmtAidsAutocomplete::EncloseWithCharacters::set(false,
 pBatch);
+pBatch->commit();
+});
+
 createSwDoc();
 
-// Check that the particular setting is turned on by default
 const SwViewOption* pVwOpt = 
getSwDocShell()->GetWrtShell()->GetViewOptions();
 CPPUNIT_ASSERT(pVwOpt);
 CPPUNIT_ASSERT(pVwOpt->IsEncloseWithCharactersOn());
@@ -687,6 +696,16 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest9, testTdf151710)
 
 CPPUNIT_TEST_FIXTURE(SwUiWriterTest9, testTdf167132)
 {
+// Turn "Enclose with characters" on temporarily
+std::shared_ptr pBatch(
+comphelper::ConfigurationChanges::create());
+
officecfg::Office::Writer::FmtAidsAutocomplete::EncloseWithCharacters::set(true,
 pBatch);
+pBatch->commit();
+comphelper::ScopeGuard _([&] {
+
officecfg::Office::Writer::FmtAidsAutocomplete::EncloseWithCharacters::set(false,
 pBatch);
+pBatch->commit();
+});
+
 // Given a document with several paragraphs, and a formula object
 createSwDoc("text-with-formula.fodt");
 CPPUNIT_ASSERT_EQUAL(3, getParagraphs());
@@ -762,6 +781,16 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest9, testTdf167132)
 
 CPPUNIT_TEST_FIXTURE(SwUiWriterTest9, testTdf167133)
 {
+// Turn "Enclose with characters" on temporarily
+std::shared_ptr pBatch(
+comphelper::ConfigurationChanges::create());
+
officecfg::Office::Writer::FmtAidsAutocomplete::EncloseWithCharacters::set(true,
 pBatch);
+pBatch->commit();
+comphelper::ScopeGuard _([&] {
+
officecfg::Office::Writer::FmtAidsAutocomplete::EncloseWithCharacters::set(false,
 pBatch);
+pBatch->commit();
+});
+
 // Given a document with a single paragraph, having a formula object
 createSwDoc("text-with-formula-one-paragraph.fodt");
 dispatchCommand(mxComponent, u".uno:SelectAll"_ustr, {});

core.git: officecfg/registry sw/inc sw/qa sw/source

2025-08-28 Thread Jonathan Clark (via logerrit)

 officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs |2 
 sw/inc/strings.hrc|2 
 sw/qa/extras/layout/data/tdf129808-flag-set.fodt  | 1338 
++
 sw/qa/extras/layout/data/tdf129808-flag-unset.fodt| 1338 
++
 sw/qa/extras/layout/layout.cxx|   11 
 sw/qa/extras/layout/layout5.cxx   |   33 
 sw/source/core/txtnode/fntcache.cxx   |   36 
 7 files changed, 2755 insertions(+), 5 deletions(-)

New commits:
commit e78940b7de0e3913a0b77c1874e162d8a63c6eb7
Author: Jonathan Clark 
AuthorDate: Wed Aug 27 04:18:42 2025 -0600
Commit: Jonathan Clark 
CommitDate: Thu Aug 28 11:45:53 2025 +0200

tdf#129808 sw: Extend leading for CJK fonts in DOC/DOCX files

Whenever Microsoft Word lays out text using a CJK font, it applies an
extra multiplier to the line height. This behavior depends only on the
font file itself; it doesn't matter whether the font is actually used as
the East Asian font or whether the text itself contains any CJK
characters. All that matters is whether the font self-reports as a CJK
font.

Microsoft Word makes this determination based on the OS/2 table's
uCodePageRange* field. If the font reports coverage for any of the
following code pages, the line height multiplier is applied:

- CP932 (JIS/Japan)
- CP936 (Simplied Chinese)
- CP949 (Korean Wansung encoding)
- CP950 (Traditional Chinese)

Previously, Writer would respect the original font metrics when laying
out DOC/DOCX files. This change makes Writer try to emulate Word's
behavior instead, subject to a compatibility flag.

Change-Id: I22e360db9bf633ae28846ec089e558fab5dd145d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190297
Tested-by: Jenkins
Reviewed-by: Jonathan Clark 

diff --git a/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs
index a566cd6d9b76..0952effa4e6b 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs
@@ -172,7 +172,7 @@
   
   
 
-  Use Word-compatible font metrics for text grid
+  Use Word-compatible font metrics for text grid and Asian 
text
 
 false
   
diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
index f3e942e0bb3d..0303d4c509ae 100644
--- a/sw/inc/strings.hrc
+++ b/sw/inc/strings.hrc
@@ -1531,7 +1531,7 @@
 #define STR_COMPAT_OPT_TABOVERMARGIN
NC_("STR_COMPAT_OPT_TABOVERMARGIN", "Allow tabs to extend beyond the right 
margin")
 #define STR_COMPAT_OPT_DO_NOT_MIRROR_RTL_DRAW_OBJS 
NC_("STR_COMPAT_OPT_DO_NOT_MIRROR_RTL_DRAW_OBJS", "Do not mirror drawing 
objects anchored in paragraphs with an RTL writing direction")
 #define STR_COMPAT_OPT_CONTINUOUS_ENDNOTES 
NC_("STR_COMPAT_OPT_CONTINUOUS_ENDNOTES", "Render endnotes at the end of 
document inline, rather than on a separate page")
-#define STR_COMPAT_OPT_MSWORDCOMPGRIDMETRICS 
NC_("STR_COMPAT_OPT_MSWORDCOMPGRIDMETRICS", "Use Word-compatible font metrics 
for text grid")
+#define STR_COMPAT_OPT_MSWORDCOMPGRIDMETRICS 
NC_("STR_COMPAT_OPT_MSWORDCOMPGRIDMETRICS", "Use Word-compatible font metrics 
for text grid and Asian text")
 #define STR_COMPAT_OPT_IGNORETABSANDBLANKSFORLINECALCULATION 
NC_("STR_COMPAT_OPT_IGNORETABSANDBLANKSFORLINECALCULATION", "Make whitespace 
character height not affect line height")
 #define STR_COMPAT_OPT_UNDERLINETRAILINGSPACE 
NC_("STR_COMPAT_OPT_UNDERLINETRAILINGSPACE", "Underline Word-compatible 
trailing blanks")
 #define STR_COMPAT_OPT_BALANCESPACESANDIDEOGRAPHICSPACES 
NC_("STR_COMPAT_OPT_BALANCESPACESANDIDEOGRAPHICSPACES", "Adjust spaces to half 
the width of ideographic spaces, using Word-compatible rules")
diff --git a/sw/qa/extras/layout/data/tdf129808-flag-set.fodt 
b/sw/qa/extras/layout/data/tdf129808-flag-set.fodt
new file mode 100644
index ..35ba4777bb7a
--- /dev/null
+++ b/sw/qa/extras/layout/data/tdf129808-flag-set.fodt
@@ -0,0 +1,1338 @@
+
+http://www.w3.org/TR/css3-text/"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:config="urn:oasis:names:tc:open

core.git: officecfg/registry sc/sdi sc/source sc/uiconfig sc/UIConfig_scalc.mk static/CustomTarget_emscripten_fs_image.mk

2025-08-19 Thread Irgaliev Amin (via logerrit)

 officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu |   14 +
 sc/UIConfig_scalc.mk |1 
 sc/sdi/drawsh.sdi|1 
 sc/sdi/tabvwsh.sdi   |   30 ++
 sc/source/ui/drawfunc/fuconrec.cxx   |  107 
++
 sc/source/ui/drawfunc/fudraw.cxx |1 
 sc/source/ui/view/tabvwsh2.cxx   |   56 
+
 sc/uiconfig/scalc/menubar/menubar.xml|1 
 sc/uiconfig/scalc/toolbar/connectorsbar.xml  |   55 
+
 sc/uiconfig/scalc/toolbar/drawbar.xml|1 
 sc/uiconfig/scalc/ui/notebookbar.ui  |   14 -
 sc/uiconfig/scalc/ui/notebookbar_compact.ui  |   10 
 sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui   |   10 
 sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui  |   10 
 static/CustomTarget_emscripten_fs_image.mk   |1 
 15 files changed, 300 insertions(+), 12 deletions(-)

New commits:
commit 34e6b6a7c1d3f6f7eaabe168e993b05049e7f0a4
Author: Irgaliev Amin 
AuthorDate: Wed Aug 13 20:22:21 2025 +0400
Commit: Mike Kaganski 
CommitDate: Tue Aug 19 10:22:28 2025 +0200

tdf#79356 - Adding connector support for Calc.

Currently, the connector functionality in Calc is only available after 
copying such lines from Draw.
This patch adds connector functionality directly to Calc.

This functionality is available in:
1.  "Insert" -> "Shape" -> "Connectors" in Standart Toolbar (UI variants)
2.  "Insert" -> "Connectors" in Tabbed (UI variants)

Change-Id: Icae023bf123e867dbef152789d1a015ea0dfe52d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189266
Reviewed-by: Mike Kaganski 
Tested-by: Jenkins

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
index 7644f820ffb9..e65410a844fd 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
@@ -708,6 +708,20 @@
   false
 
   
+  
+
+  false
+
+
+  Connectors
+
+
+  false
+
+
+  true
+
+  
   
 
   false
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 2be15a1a6618..84ff69d9bc3e 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -56,6 +56,7 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/scalc,\
sc/uiconfig/scalc/toolbar/calloutshapes \
sc/uiconfig/scalc/toolbar/classificationbar \
sc/uiconfig/scalc/toolbar/colorbar \
+   sc/uiconfig/scalc/toolbar/connectorsbar \
sc/uiconfig/scalc/toolbar/datastreams \
sc/uiconfig/scalc/toolbar/drawbar \
sc/uiconfig/scalc/toolbar/drawobjectbar \
diff --git a/sc/sdi/drawsh.sdi b/sc/sdi/drawsh.sdi
index 03c12d686240..35e8093ba3b7 100644
--- a/sc/sdi/drawsh.sdi
+++ b/sc/sdi/drawsh.sdi
@@ -90,6 +90,7 @@ interface TableDraw
 SID_ATTRIBUTES_AREA [ ExecMethod = ExecDrawAttr; StateMethod = 
GetAttrFuncState; ]
 SID_ATTRIBUTES_LINE [ ExecMethod = ExecDrawAttr; StateMethod = 
GetAttrFuncState; ]
 SID_MEASURE_DLG [ ExecMethod = ExecDrawAttr; StateMethod = 
GetAttrFuncState; ]
+SID_CONNECTION_DLG  [ ExecMethod = ExecDrawAttr; StateMethod = 
GetAttrFuncState; ]
 SID_ATTR_TRANSFORM  [ ExecMethod = ExecDrawAttr; StateMethod = 
GetDrawFuncState; ]
 
 // For the sidebar
diff --git a/sc/sdi/tabvwsh.sdi b/sc/sdi/tabvwsh.sdi
index af9f3458b0d1..6caab24fd665 100644
--- a/sc/sdi/tabvwsh.sdi
+++ b/sc/sdi/tabvwsh.sdi
@@ -125,6 +125,36 @@ interface BaseSelection
 SID_DRAWTBX_CS_STAR [ ExecMethod = ExecDraw; StateMethod = 
GetDrawState; ]
 SID_DRAW_CS_ID  [ ExecMethod = ExecDraw; StateMethod = 
GetDrawState; ]
 
+SID_DRAWTBX_CONNECTORS   [ ExecMethod = ExecDraw; StateMethod = 
GetDrawState; ]
+SID_TOOL_CONNECTOR   [ ExecMethod = ExecDraw; StateMethod = 
GetDrawState; ]
+SID_CONNECTOR_ARROW_START[ ExecMethod = ExecDraw; StateMethod = 
GetDrawState; ]
+SID_CONNECTOR_ARROW_END  [ ExecMethod = ExecDraw; StateMethod = 
GetDrawState; ]
+SID_CONNECTOR_ARROWS [ ExecMethod = ExecDraw; StateMethod = 
GetDrawState; ]
+SID_CONNECTOR_CIRCLE_START   [ ExecMethod = ExecDraw; StateMethod = 
GetDrawState; ]
+SID_CONNECTOR_CIRCLE_END [ ExecMethod = ExecDraw; StateMethod = 
GetDrawState; ]
+SID_CONNECTOR_CIRCLES[ ExecMethod = ExecDraw; StateMethod = 
GetDra

core.git: officecfg/registry sd/inc

2025-08-14 Thread Manish (via logerrit)

 officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu |   
20 +-
 sd/inc/strings.hrc   |   
20 +-
 2 files changed, 20 insertions(+), 20 deletions(-)

New commits:
commit f280abe81654448d1a12164d69fcc1be279fdd23
Author: Manish 
AuthorDate: Sun Aug 10 14:37:35 2025 +0530
Commit: Heiko Tietze 
CommitDate: Thu Aug 14 13:40:26 2025 +0200

tdf#150807 Rename Layouts with accurate expressions

Change-Id: I5d612f1d4b1fcaaf7f87bf8f9a23063f45e947f3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189286
Reviewed-by: Heiko Tietze 
Tested-by: Jenkins

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
index ff126025fd32..7030f416182e 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
@@ -2454,12 +2454,12 @@
   
   
 
-  Title Slide
+  Title and Subtitle
 
   
   
 
-  Title, Content
+  One Box
 
   
   
@@ -2469,37 +2469,37 @@
   
   
 
-  Title and 2 Content
+  Two Boxes
 
   
   
 
-  Title, Content and 2 Content
+  Three Boxes (1 Left, 2 Right)
 
   
   
 
-  Title, 2 Content and Content
+  Three Boxes (2 Left, 1 Right)
 
   
   
 
-  Title, Content over Content
+  Two Boxes (1 over 1)
 
   
   
 
-  Title, 2 Content over Content
+  Three Boxes (2 on Top over 1)
 
   
   
 
-  Title, 4 Content
+  Four Boxes
 
   
   
 
-  Title, 6 Content
+  Six Boxes
 
   
   
@@ -2519,7 +2519,7 @@
   
   
 
-  Title, 2 Vertical Text, Clipart
+  Title, Two Vertical Boxes
 
   
   
diff --git a/sd/inc/strings.hrc b/sd/inc/strings.hrc
index ccdd4b53c16e..466726ed22cc 100644
--- a/sd/inc/strings.hrc
+++ b/sd/inc/strings.hrc
@@ -42,17 +42,17 @@
 #define STR_AUTOLAYOUT_NONE 
NC_("STR_AUTOLAYOUT_NONE", "Blank Slide")
 #define STR_AUTOLAYOUT_ONLY_TITLE   
NC_("STR_AUTOLAYOUT_ONLY_TITLE", "Title Only")
 #define STR_AUTOLAYOUT_ONLY_TEXT
NC_("STR_AUTOLAYOUT_ONLY_TEXT", "Centered Text")
-#define STR_AUTOLAYOUT_TITLE
NC_("STR_AUTOLAYOUT_TITLE", "Title Slide")
-#define STR_AUTOLAYOUT_CONTENT  
NC_("STR_AUTOLAYOUT_CONTENT", "Title, Content")
-#define STR_AUTOLAYOUT_2CONTENT 
NC_("STR_AUTOLAYOUT_2CONTENT", "Title and 2 Content")
-#define STR_AUTOLAYOUT_CONTENT_2CONTENT 
NC_("STR_AUTOLAYOUT_CONTENT_2CONTENT", "Title, Content and 2 Content")
-#define STR_AUTOLAYOUT_2CONTENT_CONTENT 
NC_("STR_AUTOLAYOUT_2CONTENT_CONTENT", "Title, 2 Content and Content")
-#define STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT
NC_("STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT", "Title, 2 Content over Content")
-#define STR_AUTOLAYOUT_CONTENT_OVER_CONTENT 
NC_("STR_AUTOLAYOUT_CONTENT_OVER_CONTENT", "Title, Content over Content")
-#define STR_AUTOLAYOUT_4CONTENT 
NC_("STR_AUTOLAYOUT_4CONTENT", "Title, 4 Content")
-#define STR_AUTOLAYOUT_6CONTENT 
NC_("STR_AUTOLAYOUT_6CONTENT", "Title, 6 Content")
+#define STR_AUTOLAYOUT_TITLE
NC_("STR_AUTOLAYOUT_TITLE", "Title and Subtitle")
+#define STR_AUTOLAYOUT_CONTENT  
NC_("STR_AUTOLAYOUT_CONTENT", "One Box")
+#define STR_AUTOLAYOUT_2CONTENT 
NC_("STR_AUTOLAYOUT_2CONTENT", "Two Boxes")
+#define STR_AUTOLAYOUT_CONTENT_2CONTENT 
NC_("STR_AUTOLAYOUT_CONTENT_2CONTENT", "Three Boxes (1 Left, 2 Right)")
+#define STR_AUTOLAYOUT_2CONTENT_CONTENT 
NC_("STR_AUTOLAYOUT_2CONTENT_CONTENT", "Three Boxes (2 Left, 1 Right)")
+#define STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT
NC_("STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT", "Three Boxes (2 on Top over 1)")
+#define STR_AUTOLAYOUT_CONTENT_OVER_CONTENT 
NC_("STR_AUTOLAYOUT_CONTENT_OVER_CONTENT", "Two Boxes (1 over 1)")
+#define STR_AUTOLAYOUT_4CONTENT 
NC_("STR_AUTOLAYOUT_4CONTENT", "Four Boxes")
+#define STR_AUTOLAYOUT_6CONTENT 
NC_("STR_AUTOLAYOUT_6CONTENT", "Six Boxes")
 #define STR_AL_TITLE_VERT_OUTLINE   
NC_("STR_AL_TITLE_VERT_OUTLINE", "Title, Vertical Text")
-#define STR_AL_TITLE_VERT_OUTLINE_CLIPART   
NC_("STR_AL_TITLE_VERT_OUTLINE_CLIPART", "Title, Vertical Text, Clipart")
+#define STR_AL_TITLE_VERT_O

core.git: officecfg/registry sw/CppunitTest_sw_unowriter.mk sw/qa sw/source

2025-08-06 Thread Michael Stahl (via logerrit)

 officecfg/registry/schema/org/openoffice/Office/Writer.xcs |7 +++
 sw/CppunitTest_sw_unowriter.mk |4 +
 sw/qa/extras/unowriter/unowriter.cxx   |   14 ++
 sw/qa/uitest/ui/frmdlg/frmdlg.py   |3 -
 sw/source/core/frmedt/fecopy.cxx   |   27 -
 5 files changed, 45 insertions(+), 10 deletions(-)

New commits:
commit 6204dfeb53aefbc4de1c82a6bfc2f6903565f5c1
Author: Michael Stahl 
AuthorDate: Wed Aug 6 12:59:26 2025 +0200
Commit: Michael Stahl 
CommitDate: Wed Aug 6 16:58:39 2025 +0200

tdf#167833 sw: if an anchored object is pasted, don't select it

Instead, leave the cursor in the text at the paste location, like
(reportedly) some version of Word does.

This can be configured with the new
Office::Writer::Cursor::Option::SelectPastedAnchoredObject

Change-Id: Id1ddeb0e17c5cd568100d5a8169d929487d16749
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189001
Reviewed-by: Michael Stahl 
Tested-by: Jenkins

diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
index 880323bdcd75..7cdf4e6b68f0 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
@@ -2175,6 +2175,13 @@
   
   false
 
+
+  
+Specifies if pasted anchored objects will be selected; 
otherwise, the text cursor will remain at the location of the paste.
+Select pasted anchored objects
+  
+  false
+
   
 
 
diff --git a/sw/CppunitTest_sw_unowriter.mk b/sw/CppunitTest_sw_unowriter.mk
index 9ed2a7522ec6..6be1fb825361 100644
--- a/sw/CppunitTest_sw_unowriter.mk
+++ b/sw/CppunitTest_sw_unowriter.mk
@@ -65,6 +65,10 @@ $(eval $(call gb_CppunitTest_use_vcl,sw_unowriter))
 
 $(eval $(call gb_CppunitTest_use_rdb,sw_unowriter,services))
 
+$(eval $(call gb_CppunitTest_use_custom_headers,sw_unowriter,\
+officecfg/registry \
+))
+
 $(eval $(call gb_CppunitTest_use_configuration,sw_unowriter))
 
 $(eval $(call gb_CppunitTest_use_uiconfigs,sw_unowriter, \
diff --git a/sw/qa/extras/unowriter/unowriter.cxx 
b/sw/qa/extras/unowriter/unowriter.cxx
index 9869b02a4565..496dcef199bc 100644
--- a/sw/qa/extras/unowriter/unowriter.cxx
+++ b/sw/qa/extras/unowriter/unowriter.cxx
@@ -40,7 +40,10 @@
 #include 
 #include 
 
+#include 
+
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -971,6 +974,17 @@ CPPUNIT_TEST_FIXTURE(SwUnoWriter, 
testRenderablePagePosition)
 
 CPPUNIT_TEST_FIXTURE(SwUnoWriter, testPasteListener)
 {
+comphelper::ScopeGuard g([]() {
+std::shared_ptr pBatch(
+comphelper::ConfigurationChanges::create());
+
officecfg::Office::Writer::Cursor::Option::SelectPastedAnchoredObject::set(false,
 pBatch);
+return pBatch->commit();
+});
+std::shared_ptr pBatch(
+comphelper::ConfigurationChanges::create());
+
officecfg::Office::Writer::Cursor::Option::SelectPastedAnchoredObject::set(true,
 pBatch);
+pBatch->commit();
+
 createSwDoc();
 
 // Insert initial string.
diff --git a/sw/qa/uitest/ui/frmdlg/frmdlg.py b/sw/qa/uitest/ui/frmdlg/frmdlg.py
index a37062c1d392..c08b662027a6 100644
--- a/sw/qa/uitest/ui/frmdlg/frmdlg.py
+++ b/sw/qa/uitest/ui/frmdlg/frmdlg.py
@@ -116,7 +116,8 @@ class Test(UITestCase):
 self.assertTrue(to_char_enabled)
 
 def test_floattable_in_shape_text(self):
-with 
self.ui_test.load_file(get_url_for_data_file("floattable-in-shape-text.docx")) 
as xComponent:
+with 
self.ui_test.set_config('/org.openoffice.Office.Writer/Cursor/Option/SelectPastedAnchoredObject',
 True):
+  with 
self.ui_test.load_file(get_url_for_data_file("floattable-in-shape-text.docx")) 
as xComponent:
 # Given a table in a frame, anchored in shape text (TextBox case):
 self.xUITest.executeCommand(".uno:SelectAll")
 # Insert frame around the selected table:
diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx
index db498d4e0c69..45bc4d3de6bd 100644
--- a/sw/source/core/frmedt/fecopy.cxx
+++ b/sw/source/core/frmedt/fecopy.cxx
@@ -20,6 +20,7 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -801,7 +802,8 @@ namespace {
 return pNew;
 }
 
-void lcl_SelectFlyFormat(SwFrameFormat *const pNew, SwFEShell& rSh)
+void lcl_InitSelectFlyOrDrawFormat(SwFrameFormat *const pNew,
+SwFEShell & rSh, bool const isSelect)
 {
 if(!pNew)
 return;
@@ -810,21 +812,27 @@ namespace {
 case RES_FLYFRMFMT:
 {
 assert(dynamic_cast(pNew));
-const Point aPt(rSh.GetCursorDocPos());
-SwFlyFrame* pFlyFrame = 
static_cast(pNew)->GetFrame(&aPt);
-

core.git: officecfg/registry

2025-08-05 Thread Manish (via logerrit)

 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |   84 
++
 1 file changed, 84 insertions(+)

New commits:
commit 12603054c5fdb993717c2f5d774fb892e9f84474
Author: Manish 
AuthorDate: Fri Aug 1 23:31:03 2025 +0530
Commit: Heiko Tietze 
CommitDate: Tue Aug 5 11:29:21 2025 +0200

tdf#158080 Rename Flowchart commands

Change-Id: I77ecd37758a63cb572b1a9ea1427e66f0c7805eb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188794
Reviewed-by: Heiko Tietze 
Tested-by: Jenkins

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 744956108ded..ad2df1ecb49a 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -787,6 +787,9 @@ bit 3 (0x8): #define 
UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8
 
   Flowchart: Process
 
+
+  Process
+
 
   1
 
@@ -795,6 +798,9 @@ bit 3 (0x8): #define 
UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8
 
   Flowchart: Alternate Process
 
+
+  Alternate Process
+
 
   1
 
@@ -803,6 +809,9 @@ bit 3 (0x8): #define 
UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8
 
   Flowchart: Decision
 
+
+  Decision
+
 
   1
 
@@ -811,6 +820,9 @@ bit 3 (0x8): #define 
UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8
 
   Flowchart: Data
 
+
+  Data
+
 
   1
 
@@ -819,6 +831,9 @@ bit 3 (0x8): #define 
UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8
 
   Flowchart: Predefined Process
 
+
+  Predefined Process
+
 
   1
 
@@ -827,6 +842,9 @@ bit 3 (0x8): #define 
UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8
 
   Flowchart: Internal Storage
 
+
+  Internal Storage
+
 
   1
 
@@ -835,6 +853,9 @@ bit 3 (0x8): #define 
UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8
 
   Flowchart: Document
 
+
+  Document
+
 
   1
 
@@ -843,6 +864,9 @@ bit 3 (0x8): #define 
UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8
 
   Flowchart: Multidocument
 
+
+  Multidocument
+
 
   1
 
@@ -851,6 +875,9 @@ bit 3 (0x8): #define 
UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8
 
   Flowchart: Terminator
 
+
+  Terminator
+
 
   1
 
@@ -859,6 +886,9 @@ bit 3 (0x8): #define 
UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8
 
   Flowchart: Preparation
 
+
+  Preparation
+
 
   1
 
@@ -867,6 +897,9 @@ bit 3 (0x8): #define 
UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8
 
   Flowchart: Manual Input
 
+
+  Manual Input
+
 
   1
 
@@ -875,6 +908,9 @@ bit 3 (0x8): #define 
UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8
 
   Flowchart: Manual Operation
 
+
+  Manual Operation
+
 
   1
 
@@ -883,6 +919,9 @@ bit 3 (0x8): #define 
UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8
 
   Flowchart: Connector
 
+
+  Connector
+
 
   1
 
@@ -891,6 +930,9 @@ bit 3 (0x8): #define 
UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8
 
   Flowchart: Off-page Connector
 
+
+  Off-page Connector
+
 
   1
 
@@ -899,6 +941,9 @@ bit 3 (0x8): #define 
UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8
 
   Flowchart: Card
 
+
+  Card
+
 
   1
 
@@ -907,6 +952,9 @@ bit 3 (0x8): #define 
UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8
 
   Flowchart: Punched Tape
 
+
+  Punched Tape
+
 
   1
 
@@ -915,6 +963,9 @@ bit 3 (0x8): #define 
UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8
 
   Flowchart: Summing Junction
 
+
+  Summing Junction
+
 
   1
 
@@ -923,6 +974,9 @@ bit 3 (0x8): #define 
UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8
 
   Flowchart: Or
 
+
+  Or
+
 
   1
 
@@ -931,6 +985,9 @@ bit 3 (0x8): #define 
UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8
 
   Flowchart: Collate
 
+
+  Collate

core.git: officecfg/registry sc/sdi sc/source

2025-07-28 Thread Sahil Gautam (via logerrit)

 officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu |8 
 sc/sdi/scalc.sdi  |2 
 sc/source/ui/formdlg/dwfunctr.cxx |   84 
+--
 sc/source/ui/inc/dwfunctr.hxx |5 
 sc/source/ui/sidebar/ScPanelFactory.cxx   |2 
 sc/source/ui/view/cellsh1.cxx |  120 
++
 6 files changed, 147 insertions(+), 74 deletions(-)

New commits:
commit 6ece875046ad1873c0ddd78a11a6bdd5b6bd05ee
Author: Sahil Gautam 
AuthorDate: Fri Jul 18 02:52:40 2025 +0530
Commit: Sahil Gautam 
CommitDate: Tue Jul 29 00:07:10 2025 +0200

calc: add parameters to .uno:InsertFunction

+ move the formula insertion logic from sidebar to the uno command
+ use the unoCommand with parameters in the sidebar code

Change-Id: Ib211b9829e39bdd6dcc6d0e1f2afac6671fa1c8c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188221
Tested-by: Jenkins
Reviewed-by: Sahil Gautam 
Reviewed-by: Samuel Mehrbrodt 

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index 8746bc114585..265d328dd575 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -2184,6 +2184,14 @@
   1
 
   
+  
+
+  Insert Function
+
+
+  1
+
+  
   
 
   Select All Sheets
diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi
index e93e78e125e2..76678e70d94a 100644
--- a/sc/sdi/scalc.sdi
+++ b/sc/sdi/scalc.sdi
@@ -3217,7 +3217,7 @@ SfxVoidItem InsertFile FID_INSERT_FILE
 
 
 SfxVoidItem InsertFunction SID_INS_FUNCTION
-()
+(SfxStringItem FunctionName FN_PARAM_1,SfxInt16Item FunctionCategory 
FN_PARAM_2,SfxStringItem FunctionId FN_PARAM_3)
 [
 AutoUpdate = FALSE,
 FastCall = FALSE,
diff --git a/sc/source/ui/formdlg/dwfunctr.cxx 
b/sc/source/ui/formdlg/dwfunctr.cxx
index e46a4edd582c..e6ce78d1e1a9 100644
--- a/sc/source/ui/formdlg/dwfunctr.cxx
+++ b/sc/source/ui/formdlg/dwfunctr.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
 #include 
 #include 
 #include 
@@ -28,6 +29,8 @@
 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -49,7 +52,7 @@
 #*
 #/
 
-ScFunctionWin::ScFunctionWin(weld::Widget* pParent)
+ScFunctionWin::ScFunctionWin(weld::Widget* pParent, SfxBindings* pBindings)
 : PanelLayout(pParent, u"FunctionPanel"_ustr, 
u"modules/scalc/ui/functionpanel.ui"_ustr)
 , xCatBox(m_xBuilder->weld_combo_box(u"category"_ustr))
 , xFuncList(m_xBuilder->weld_tree_view(u"funclist"_ustr))
@@ -59,6 +62,7 @@ ScFunctionWin::ScFunctionWin(weld::Widget* pParent)
 , 
xSimilaritySearch(m_xBuilder->weld_check_button(u"similaritysearch"_ustr))
 , xFiFuncDesc(m_xBuilder->weld_text_view(u"funcdesc"_ustr))
 , m_xSearchString(m_xBuilder->weld_entry(u"search"_ustr))
+, m_pBindings(pBindings)
 , xConfigListener(new 
comphelper::ConfigurationListener(u"/org.openoffice.Office.Calc/Formula/Syntax"_ustr))
 , 
xConfigChange(std::make_unique(xConfigListener, 
this))
 , pFuncDesc(nullptr)
@@ -405,27 +409,11 @@ void ScFunctionWin::DoEnter(bool bDoubleOrEnter)
 return;
 }
 
-OUStringBuffer aArgStr;
 SfxViewShell* pCurSh = SfxViewShell::Current();
 nArgs=0;
 
 if(!aString.isEmpty())
 {
-OUString aFirstArgStr;
-ScModule* pScMod = ScModule::get();
-ScTabViewShell* pViewSh = dynamic_cast( pCurSh );
-ScInputHandler* pHdl = pScMod->GetInputHdl( pViewSh );
-if(!pScMod->IsEditMode())
-{
-rtl::Reference 
xDetectDisposed(xConfigListener);
-pScMod->SetInputMode(SC_INPUT_TABLE);
-// the above call can result in us being disposed
-if (xDetectDisposed->isDisposed())
-return;
-aString = "=" + xFuncList->get_selected_text();
-if (pHdl)
-pHdl->ClearText();
-}
 const ScFuncDesc* pDesc =
  weld::fromId(xFuncList->get_selected_id());
 if (pDesc)
@@ -433,63 +421,17 @@ void ScFunctionWin::DoEnter(bool bDoubleOrEnter)
 pFuncDesc=pDesc;
 UpdateLRUList();
 nArgs = pDesc->nArgCount;
-if(nArgs>0)
-{
-// NOTE: Theoretically the first parameter could have the
-// suppress flag as well, but practically it doesn't.
-aFirstArgStr = pDesc->maDefArgNames[0];
-aFirstArgStr = comphelper::string::strip(aFirstArgStr, ' ');
-aFirstArgStr = aFirstArgStr.replaceAll(" ", "_")

core.git: officecfg/registry sw/inc sw/qa sw/source

2025-07-22 Thread Jonathan Clark (via logerrit)

 officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs |6 
 sw/inc/IDocumentSettingAccess.hxx |2 
 sw/inc/strings.hrc|1 
 sw/inc/viewsh.hxx |2 
 sw/qa/extras/layout/data/tdf167583.fodt   |  168 
++
 sw/qa/extras/layout/data/tdf88752.fodt|4 
 sw/qa/extras/layout/layout5.cxx   |   17 +
 sw/qa/extras/ooxmlexport/ooxmlexport25.cxx|   31 +
 sw/qa/extras/ww8export/ww8export4.cxx |   32 +
 sw/source/core/doc/DocumentSettingManager.cxx |   17 -
 sw/source/core/inc/DocumentSettingManager.hxx |1 
 sw/source/core/text/itrform2.cxx  |6 
 sw/source/core/view/viewsh.cxx|   13 
 sw/source/filter/ww8/docxexport.cxx   |5 
 sw/source/filter/ww8/wrtww8.cxx   |2 
 sw/source/filter/ww8/ww8par.cxx   |4 
 sw/source/ui/config/optcomp.cxx   |6 
 sw/source/uibase/uno/SwXDocumentSettings.cxx  |   15 
 sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx  |2 
 sw/source/writerfilter/dmapper/SettingsTable.cxx  |8 
 sw/source/writerfilter/dmapper/SettingsTable.hxx  |3 
 21 files changed, 339 insertions(+), 6 deletions(-)

New commits:
commit 2745e97d3d21cc91747d51ca4b68f53ac219211e
Author: Jonathan Clark 
AuthorDate: Fri Jul 18 22:04:10 2025 -0600
Commit: Jonathan Clark 
CommitDate: Tue Jul 22 21:45:46 2025 +0200

tdf#167583 sw: Add ADJUST_TABLE_LINE_HEIGHTS_TO_GRID_HEIGHT compat flag

Adds a new compatibility flag to emulate the MSO
CT_Compat_adjustLineHeightInTable / fDontAdjustLineHeightInTable compat
flags.

Layout support for this compatibility flag was implemented previously,
but was mapped to a different compatibility flag. This change also
updates the previous implementation so that it uses the new flag.

Change-Id: Ia07ef35c32716069e049733f16a465d165d584a1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188104
Reviewed-by: Jonathan Clark 
Tested-by: Jenkins

diff --git a/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs
index fecd8b23ffec..a566cd6d9b76 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs
@@ -194,6 +194,12 @@
 
 false
   
+  
+
+  Fix line heights for text inside tables to the text grid line 
height
+
+true
+  
 
   
   
diff --git a/sw/inc/IDocumentSettingAccess.hxx 
b/sw/inc/IDocumentSettingAccess.hxx
index 902f23b72a87..79884c24b17b 100644
--- a/sw/inc/IDocumentSettingAccess.hxx
+++ b/sw/inc/IDocumentSettingAccess.hxx
@@ -147,6 +147,8 @@ enum class DocumentSettingId
 BALANCE_SPACES_AND_IDEOGRAPHIC_SPACES,
 // tdf#37153 Word-compatibility: force top-alignment for cells containing 
a floating shape
 FORCE_TOP_ALIGNMENT_IN_CELL_WITH_FLOATING_ANCHOR,
+// tdf#167583 optionally apply text grid line height to table contents
+ADJUST_TABLE_LINE_HEIGHTS_TO_GRID_HEIGHT,
 };
 
 /** Provides access to settings of a document
diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
index 139028fb46a5..a4d0ab8e6bae 100644
--- a/sw/inc/strings.hrc
+++ b/sw/inc/strings.hrc
@@ -1536,6 +1536,7 @@
 #define STR_COMPAT_OPT_IGNORETABSANDBLANKSFORLINECALCULATION 
NC_("STR_COMPAT_OPT_IGNORETABSANDBLANKSFORLINECALCULATION", "Make whitespace 
character height not affect line height")
 #define STR_COMPAT_OPT_UNDERLINETRAILINGSPACE 
NC_("STR_COMPAT_OPT_UNDERLINETRAILINGSPACE", "Underline Word-compatible 
trailing blanks")
 #define STR_COMPAT_OPT_BALANCESPACESANDIDEOGRAPHICSPACES 
NC_("STR_COMPAT_OPT_BALANCESPACESANDIDEOGRAPHICSPACES", "Adjust spaces to half 
the width of ideographic spaces, using Word-compatible rules")
+#define STR_COMPAT_OPT_ADJUSTTABLELINEHEIGHTSTOGRIDHEIGHT 
NC_("STR_COMPAT_OPT_ADJUSTTABLELINEHEIGHTSTOGRIDHEIGHT", "Adjust line heights 
to grid height in table")
 
 #define STR_TABLE_PANEL_ALIGN_AUTO  
NC_("sidebartableedit|alignautolabel", "Automatic")
 #define STR_TABLE_PANEL_ALIGN_LEFT  
NC_("sidebartableedit|alignleftlabel", "Left")
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index 32181a1e08ba..b8c2f55a2210 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -475,6 +475,8 @@ public:
 
 SW_DLLPUBLIC void SetBalanceSpacesAndIdeographicSpaces(bool bValue);
 
+SW_DLLPUBLIC void SetAdjustTableLineHeightsToGridHeight(bool bVal

core.git: officecfg/registry

2025-07-16 Thread Stephan Bergmann (via logerrit)

 officecfg/registry/data.dtd |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b117346f702cae6709c59dc9ee82a54daf511f71
Author: Stephan Bergmann 
AuthorDate: Wed Jul 16 13:06:40 2025 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Jul 16 14:20:32 2025 +0200

oor:items is allowed in oor:data

...ever since d644a561eeb3e6ceb943819895a40c461effdbe6 "Allow  in
.xcd too", so also update the DTD to match reality

Change-Id: Ib864c1b177c7e13d2ae6bac76f9d856e04c79ace
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187955
Reviewed-by: Stephan Bergmann 
Tested-by: Jenkins

diff --git a/officecfg/registry/data.dtd b/officecfg/registry/data.dtd
index 2c9bce6d6428..ba6853702c24 100644
--- a/officecfg/registry/data.dtd
+++ b/officecfg/registry/data.dtd
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-
+

core.git: officecfg/registry

2025-07-10 Thread Julien Nabet (via logerrit)

 officecfg/registry/schema/org/openoffice/Office/Common.xcs |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9ad8b4b9e1b4e2ffb6533bc119f24ad326a97a07
Author: Julien Nabet 
AuthorDate: Wed Jul 9 19:12:45 2025 +0200
Commit: Julien Nabet 
CommitDate: Thu Jul 10 09:21:52 2025 +0200

Related tdf#167365: declare "Mesa/X.org" as openCL driver on Linux

Change-Id: Ib7fa2bd3e4b2aac0f40957cab73ba402e2eb20e6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187591
Reviewed-by: Julien Nabet 
Tested-by: Jenkins

diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 91cf26ff39ce..dac5c6a81458 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -5499,7 +5499,7 @@
 
   Like OpenCLDenyList, but for combinations known to be 
good.
 
-Linux//Advanced Micro Devices, Inc\.//1445\.5 
\(sse2,avx\);//Advanced Micro Devices, Inc\.//;//Intel\(R\) 
Corporation//;//NVIDIA Corporation//
+Linux//Advanced Micro Devices, Inc\.//1445\.5 
\(sse2,avx\);//Advanced Micro Devices, Inc\.//;//Intel\(R\) 
Corporation//;//NVIDIA Corporation//;Linux//Mesa%2FX.org//

core.git: officecfg/registry sw/source

2025-06-30 Thread László Németh (via logerrit)

 officecfg/registry/schema/org/openoffice/Office/Writer.xcs |7 ++
 sw/source/core/layout/frmtool.cxx  |4 +
 sw/source/core/text/frmpaint.cxx   |   33 +
 sw/source/core/text/porlin.hxx |5 +
 sw/source/core/text/portxt.cxx |   18 ++-
 5 files changed, 56 insertions(+), 11 deletions(-)

New commits:
commit c05bc38067b2ab61ae919fb1fef1381343d03844
Author: László Németh 
AuthorDate: Mon Jun 30 13:17:01 2025 +0200
Commit: László Németh 
CommitDate: Mon Jun 30 18:02:59 2025 +0200

tdf#167298 tdf#166113 sw word spacing: add word spacing indicator

tdf#167298: As an advanced feature for typography and related
development – including bug fixing –, add visualization for
justified text lines with too big word spacing.

tdf#166113: fix bInteropSmartJustify by adding bFullJustified
to avoid unnecessary extra calculation for the last paragraph line.
(Regression since commit 529755f0919217a84a12daad0fddfddd1124f0e9
"tdf#166113 sw smart justify: adjust algorithm for interoperability",
detected by the word spacing indicator).

The red word spacing indicator line is positioned before
the justified text line, and its width is the extra space
of a space character over the maximum word spacing.

For example, if the font-defined space width is 3 pt,
the maximum word spacing is 150%, spaces expanded to 6 pt in
the justified line results a 6 pt - 3 pt * 1.5 = 1.5 pt width
word spacing indicator.

To enable the word spacing indicator in a justified text,

1) Open "Tools" -> Options" -> "Advanced" -> "Open Expert Configuration";

2) search for "ShowWordSpacingIndicator";

3) double-click on the config entry (or press Enter) to set it to True;

4) Enable Formatting Marks (Control-F10).

Follow-up to commit 5a48070f5904c51dc9e7bbad4213d802fd4bc89b
"tdf#126154 sw offapi xmloff cui: add min/max word spacing"
and commit 7d6696757dcdfa3cee481ac7795a91b2b47da363
"tdf#159923 sw cui offapi xmloff: add custom word spacing".

Change-Id: I315b5e6b8239f4fdc8e69eb45fc292b8d5891138
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187199
Reviewed-by: László Németh 
Tested-by: Jenkins

diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
index 8fe6aa00847b..880323bdcd75 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
@@ -867,6 +867,13 @@
   
   false
 
+
+  
+Enables the word spacing indicator, which shows before each 
justified text line how much the expanded space in the current line exceeds the 
maximum word spacing set for the paragraph.
+Show word spacing indicator at justified lines.
+  
+  false
+
 
   
   
diff --git a/sw/source/core/layout/frmtool.cxx 
b/sw/source/core/layout/frmtool.cxx
index dc128f8c03f6..fae999f2ecc3 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -80,6 +80,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace ::com::sun::star;
 
@@ -3985,6 +3986,9 @@ bool IsExtraData( const SwDoc& rDoc )
 return true;
 }
 
+if ( 
officecfg::Office::Writer::Content::Display::ShowWordSpacingIndicator::get() )
+return true;
+
 const SwEditShell* pSh = rDoc.GetEditShell();
 const SwViewOption* pViewOptions = pSh ? pSh->GetViewOptions() : nullptr;
 return pViewOptions && 
pViewOptions->IsShowOutlineContentVisibilityButton();
diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx
index 6d116cdbc156..8ce80bcc1c37 100644
--- a/sw/source/core/text/frmpaint.cxx
+++ b/sw/source/core/text/frmpaint.cxx
@@ -43,6 +43,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 #include 
 
@@ -96,7 +98,7 @@ public:
 }
 
 void PaintExtra( SwTwips nY, tools::Long nAsc, tools::Long nMax, bool 
bRed, const OUString* pRedlineText = nullptr );
-void PaintRedline( SwTwips nY, tools::Long nMax );
+void PaintRedline( SwTwips nY, tools::Long nMax, sal_Int16 nWordSpacing = 
0 );
 };
 
 }
@@ -279,7 +281,8 @@ void SwExtraPainter::PaintExtra( SwTwips nY, tools::Long 
nAsc, tools::Long nMax,
 }
 }
 
-void SwExtraPainter::PaintRedline( SwTwips nY, tools::Long nMax )
+// paint redline or word spacing indicator
+void SwExtraPainter::PaintRedline( SwTwips nY, tools::Long nMax, sal_Int16 
nWordSpacing )
 {
 Point aStart( m_nRedX, nY );
 Point aEnd( m_nRedX, nY + nMax );
@@ -295,15 +298,18 @@ void SwExtraPainter::PaintRedline( SwTwips nY, 
tools::Long nMax )
 }
 }
 const Color aOldCol( m_pSh->GetOut()->GetLineColor() );
-m_pSh->GetOu

core.git: officecfg/registry sw/inc

2025-06-30 Thread Mike Kaganski (via logerrit)

 officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs |2 +-
 sw/inc/strings.hrc|2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e488d7190d53ae236ad5fc89a0c2577e7f564fc2
Author: Mike Kaganski 
AuthorDate: Mon Jun 30 14:04:58 2025 +0500
Commit: Mike Kaganski 
CommitDate: Mon Jun 30 12:44:11 2025 +0200

tdf#156061: fix UI strings for EmptyDbFieldHidesPara compat option

Make it clear, that hiding only happens on merged documents generation.

Change-Id: I95953a09e69e6754adc5010fdaa97215324a33c1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187175
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs
index d22a2c465191..fecd8b23ffec 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs
@@ -130,7 +130,7 @@
   
   
 
-  Hide paragraphs of database fields (e.g., mail merge) with an 
empty value
+  Hide paragraphs of mail merge fields with empty value when 
generating merged documents
 
 true
   
diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
index edbc744db6a0..90a0a35a2c3a 100644
--- a/sw/inc/strings.hrc
+++ b/sw/inc/strings.hrc
@@ -1525,7 +1525,7 @@
 #define STR_COMPAT_OPT_PROTECTFORM  
NC_("STR_COMPAT_OPT_PROTECTFORM", "Protect form (no longer protects whole 
document. Insert write protected section instead)")
 #define STR_COMPAT_OPT_MSWORDCOMPTRAILINGBLANKS 
NC_("STR_COMPAT_OPT_MSWORDCOMPTRAILINGBLANKS", "Word-compatible trailing 
blanks")
 #define STR_COMPAT_OPT_SUBTRACTFLYSANCHOREDATFLYS 
NC_("STR_COMPAT_OPT_SUBTRACTFLYSANCHOREDATFLYS", "Tolerate white lines that may 
appear in PDF page backgrounds")
-#define STR_COMPAT_OPT_EMPTYDBFIELDHIDESPARA
NC_("STR_COMPAT_OPT_EMPTYDBFIELDHIDESPARA", "Hide paragraphs of database fields 
(e.g., mail merge) with an empty value")
+#define STR_COMPAT_OPT_EMPTYDBFIELDHIDESPARA
NC_("STR_COMPAT_OPT_EMPTYDBFIELDHIDESPARA", "Hide paragraphs of mail merge 
fields with empty value when generating merged documents")
 #define STR_COMPAT_OPT_USEVARIABLEWIDTHNBSP 
NC_("STR_COMPAT_OPT_USEVARIABLEWIDTHNBSP", "Render non-breaking spaces (NBSP) 
as standard-space-width (off for fixed size)")
 #define STR_COMPAT_OPT_NOGAPAFTERNOTENUMBER 
NC_("STR_COMPAT_OPT_NOGAPAFTERNOTENUMBER", "Do not add an extra space after 
number in footnotes / endnotes with hanging first line")
 #define STR_COMPAT_OPT_TABSRELATIVETOINDENT 
NC_("STR_COMPAT_OPT_TABSRELATIVETOINDENT", "Set tabstops relative to indent of 
paragraph")

core.git: officecfg/registry

2025-06-26 Thread Heiko Tietze (via logerrit)

 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |   18 
+++---
 1 file changed, 6 insertions(+), 12 deletions(-)

New commits:
commit 7aae69d7c9fd4133234600a232cfc30785cc808c
Author: Heiko Tietze 
AuthorDate: Wed Jun 25 09:14:28 2025 +0200
Commit: Heiko Tietze 
CommitDate: Thu Jun 26 09:03:30 2025 +0200

Resolves tdf#166723 - Misleading use of the word "reinstate"

Change-Id: Iccb79b4c5ee9a5e2ea633942c423ca2411e418ad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186932
Reviewed-by: Heiko Tietze 
Tested-by: Jenkins

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 19a9b4ed7f20..dd8b4b54e69d 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -253,10 +253,10 @@
   
   
 
-  Reinstate and Move to Next
+  Reject but Track and Move to Next
 
 
-  Reinstate Track Change and select the next 
one
+  Reject tracked change but keep it and select 
the next one
 
 
   1
@@ -278,13 +278,10 @@
   
   
 
-  Reinstate All
+  Reject but Track All
 
 
-  Reinstate All Tracked Changes
-
-
-  Reinstate All Changes
+  Reject all tracked changes but keep 
them
 
 
   1
@@ -331,13 +328,10 @@
   
   
 
-  Reinstate
+  Reject but Track
 
 
-  Reinstate Track Change
-
-
-  Reinstate Change
+  Reject tracked change but keep it
 
 
   1

core.git: officecfg/registry vcl/source

2025-06-25 Thread Gabor Kelemen (via logerrit)

 officecfg/registry/schema/org/openoffice/VCL.xcs |3 +++
 vcl/source/window/printdlg.cxx   |   17 ++---
 2 files changed, 5 insertions(+), 15 deletions(-)

New commits:
commit f7547f9e9a5000d36d46dfc375750a495aa32735
Author: Gabor Kelemen 
AuthorDate: Sun May 11 12:56:28 2025 +0200
Commit: Gabor Kelemen 
CommitDate: Thu Jun 26 08:51:30 2025 +0200

[API CHANGE] Replace VCL Settings (PrintDialog/HasPreview)

in order to simplify code.

The flexibility provided by the ConfigurableSettings template
is not really necessary for the simple settings VCL has

Change-Id: I53a5930572a81e9e8ed33846b33c6f5e7a6d01e1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185183
Reviewed-by: Gabor Kelemen 
Tested-by: Jenkins

diff --git a/officecfg/registry/schema/org/openoffice/VCL.xcs 
b/officecfg/registry/schema/org/openoffice/VCL.xcs
index fb99b140f347..2aeddada6d42 100644
--- a/officecfg/registry/schema/org/openoffice/VCL.xcs
+++ b/officecfg/registry/schema/org/openoffice/VCL.xcs
@@ -130,6 +130,9 @@
 
 false
 
+
+true
+
 
 
 
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 893c67a7d1a2..6ac701a4b0cd 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -41,7 +41,6 @@
 #include 
 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -746,7 +745,6 @@ void PrintDialog::setupPaperSidesBox()
 
 void PrintDialog::storeToSettings()
 {
-SettingsConfigItem* pItem = SettingsConfigItem::get();
 std::shared_ptr 
batch(comphelper::ConfigurationChanges::create());
 
 officecfg::VCL::VCLSettings::PrintDialog::LastPrinter::set(
@@ -764,19 +762,13 @@ void PrintDialog::storeToSettings()
 officecfg::VCL::VCLSettings::PrintDialog::CollateSingleJobs::set(
  mxSingleJobsBox->get_active(), batch );
 
-pItem->setValue( u"PrintDialog"_ustr,
- u"HasPreview"_ustr,
- hasPreview() ? u"true"_ustr :
-u"false"_ustr );
+officecfg::VCL::VCLSettings::PrintDialog::HasPreview::set( hasPreview(), 
batch);
 
 batch->commit();
-pItem->Commit();
 }
 
 void PrintDialog::readFromSettings()
 {
-SettingsConfigItem* pItem = SettingsConfigItem::get();
-
 // read last selected tab page; if it exists, activate it
 OUString aValue = 
officecfg::VCL::VCLSettings::PrintDialog::LastPage::get();
 sal_uInt16 nCount = mxTabCtrl->get_n_pages();
@@ -812,12 +804,7 @@ void PrintDialog::readFromSettings()
 mxSingleJobsBox->set_active( 
officecfg::VCL::VCLSettings::PrintDialog::CollateSingleJobs::get() );
 
 // preview box
-aValue = pItem->getValue( u"PrintDialog"_ustr,
-  u"HasPreview"_ustr );
-if ( aValue.equalsIgnoreAsciiCase("false") )
-mxPreviewBox->set_active( false );
-else
-mxPreviewBox->set_active( true );
+mxPreviewBox->set_active( 
officecfg::VCL::VCLSettings::PrintDialog::HasPreview::get() );
 
 }

core.git: officecfg/registry vcl/source

2025-06-25 Thread Gabor Kelemen (via logerrit)

 officecfg/registry/schema/org/openoffice/VCL.xcs |3 +++
 vcl/source/window/printdlg.cxx   |   10 +++---
 2 files changed, 6 insertions(+), 7 deletions(-)

New commits:
commit ae18d722616c6e3dc46b8c68002bf0c0df8f2913
Author: Gabor Kelemen 
AuthorDate: Sun May 11 12:49:18 2025 +0200
Commit: Gabor Kelemen 
CommitDate: Wed Jun 25 18:43:31 2025 +0200

[API CHANGE] Replace VCL Settings (PrintDialog/CollateSingleJobs)

in order to simplify code.

The flexibility provided by the ConfigurableSettings template
is not really necessary for the simple settings VCL has

Change-Id: I7a2c5275eb1df0bc08c48388089d8779a49c5b95
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185182
Reviewed-by: Gabor Kelemen 
Tested-by: Jenkins

diff --git a/officecfg/registry/schema/org/openoffice/VCL.xcs 
b/officecfg/registry/schema/org/openoffice/VCL.xcs
index 58fd515e46b6..fb99b140f347 100644
--- a/officecfg/registry/schema/org/openoffice/VCL.xcs
+++ b/officecfg/registry/schema/org/openoffice/VCL.xcs
@@ -127,6 +127,9 @@
 
 true
 
+
+false
+
 
 
 
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index b95e5715e8d2..893c67a7d1a2 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -761,10 +761,8 @@ void PrintDialog::storeToSettings()
 
 officecfg::VCL::VCLSettings::PrintDialog::Collate::set( 
mxCollateBox->get_active(), batch );
 
-pItem->setValue( u"PrintDialog"_ustr,
- u"CollateSingleJobs"_ustr,
- mxSingleJobsBox->get_active() ? u"true"_ustr :
- u"false"_ustr );
+officecfg::VCL::VCLSettings::PrintDialog::CollateSingleJobs::set(
+ mxSingleJobsBox->get_active(), batch );
 
 pItem->setValue( u"PrintDialog"_ustr,
  u"HasPreview"_ustr,
@@ -811,9 +809,7 @@ void PrintDialog::readFromSettings()
 }
 
 // collate single jobs
-aValue = pItem->getValue( u"PrintDialog"_ustr,
-  u"CollateSingleJobs"_ustr );
-mxSingleJobsBox->set_active(aValue.equalsIgnoreAsciiCase("true"));
+mxSingleJobsBox->set_active( 
officecfg::VCL::VCLSettings::PrintDialog::CollateSingleJobs::get() );
 
 // preview box
 aValue = pItem->getValue( u"PrintDialog"_ustr,

core.git: officecfg/registry vcl/source

2025-06-23 Thread Gabor Kelemen (via logerrit)

 officecfg/registry/schema/org/openoffice/VCL.xcs |3 +++
 vcl/source/window/printdlg.cxx   |8 +++-
 2 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit ad195d5517554dff87b26a960e1fe959e3564a02
Author: Gabor Kelemen 
AuthorDate: Sun May 11 11:20:21 2025 +0200
Commit: Gabor Kelemen 
CommitDate: Mon Jun 23 10:28:34 2025 +0200

[API CHANGE] Replace VCL Settings (PrintDialog/WindowState)

in order to simplify code.

The flexibility provided by the ConfigurableSettings template
is not really necessary for the simple settings VCL has

Change-Id: I263b3ddd6eb4ac826e88210c3f453dcbf60eeb99
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185180
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen 

diff --git a/officecfg/registry/schema/org/openoffice/VCL.xcs 
b/officecfg/registry/schema/org/openoffice/VCL.xcs
index cb2d76944a13..58fd515e46b6 100644
--- a/officecfg/registry/schema/org/openoffice/VCL.xcs
+++ b/officecfg/registry/schema/org/openoffice/VCL.xcs
@@ -133,6 +133,9 @@
 
 
 
+
+
+
 
 
 
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 78fbada59c1f..797aff61fa5d 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -756,9 +756,8 @@ void PrintDialog::storeToSettings()
 officecfg::VCL::VCLSettings::PrintDialog::LastPage::set(
  
mxTabCtrl->get_tab_label_text(mxTabCtrl->get_current_page_ident()), batch);
 
-pItem->setValue( u"PrintDialog"_ustr,
- u"WindowState"_ustr,
- m_xDialog->get_window_state(vcl::WindowDataMask::All) );
+officecfg::VCL::VCLSettings::PrintDialog::WindowState::set(
+ m_xDialog->get_window_state(vcl::WindowDataMask::All), 
batch );
 
 pItem->setValue( u"PrintDialog"_ustr,
  u"CopyCount"_ustr,
@@ -798,8 +797,7 @@ void PrintDialog::readFromSettings()
 }
 
 // persistent window state
-aValue = pItem->getValue( u"PrintDialog"_ustr,
-  u"WindowState"_ustr );
+aValue = officecfg::VCL::VCLSettings::PrintDialog::WindowState::get();
 if (!aValue.isEmpty())
 m_xDialog->set_window_state(aValue);

core.git: officecfg/registry vcl/source

2025-06-22 Thread Gabor Kelemen (via logerrit)

 officecfg/registry/schema/org/openoffice/VCL.xcs |3 +++
 vcl/source/window/printdlg.cxx   |8 +++-
 2 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 4e83aef2f7ebe54547f8602ccdef9d35afd285f1
Author: Gabor Kelemen 
AuthorDate: Sun May 11 11:16:49 2025 +0200
Commit: Gabor Kelemen 
CommitDate: Sun Jun 22 12:27:22 2025 +0200

[API CHANGE] Replace VCL Settings (PrintDialog/LastPage)

in order to simplify code.

The flexibility provided by the ConfigurableSettings template
is not really necessary for the simple settings VCL has

Change-Id: I8babe75085d54a1657f3071d07cfd995320715b7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185179
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen 

diff --git a/officecfg/registry/schema/org/openoffice/VCL.xcs 
b/officecfg/registry/schema/org/openoffice/VCL.xcs
index 2323bca1340c..cb2d76944a13 100644
--- a/officecfg/registry/schema/org/openoffice/VCL.xcs
+++ b/officecfg/registry/schema/org/openoffice/VCL.xcs
@@ -127,6 +127,9 @@
 
 true
 
+
+
+
 
 
 
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 6a8b02626849..78fbada59c1f 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -753,9 +753,8 @@ void PrintDialog::storeToSettings()
   isPrintToFile() ? Printer::GetDefaultPrinterName()
   : mxPrinters->get_active_text(), batch );
 
-pItem->setValue( u"PrintDialog"_ustr,
- u"LastPage"_ustr,
- 
mxTabCtrl->get_tab_label_text(mxTabCtrl->get_current_page_ident()));
+officecfg::VCL::VCLSettings::PrintDialog::LastPage::set(
+ 
mxTabCtrl->get_tab_label_text(mxTabCtrl->get_current_page_ident()), batch);
 
 pItem->setValue( u"PrintDialog"_ustr,
  u"WindowState"_ustr,
@@ -786,8 +785,7 @@ void PrintDialog::readFromSettings()
 SettingsConfigItem* pItem = SettingsConfigItem::get();
 
 // read last selected tab page; if it exists, activate it
-OUString aValue = pItem->getValue( u"PrintDialog"_ustr,
-  u"LastPage"_ustr );
+OUString aValue = 
officecfg::VCL::VCLSettings::PrintDialog::LastPage::get();
 sal_uInt16 nCount = mxTabCtrl->get_n_pages();
 for (sal_uInt16 i = 0; i < nCount; ++i)
 {

core.git: officecfg/registry vcl/source

2025-06-21 Thread Gabor Kelemen (via logerrit)

 officecfg/registry/schema/org/openoffice/VCL.xcs |3 +++
 vcl/source/gdi/print3.cxx|   10 --
 vcl/source/window/printdlg.cxx   |9 +++--
 3 files changed, 10 insertions(+), 12 deletions(-)

New commits:
commit 6faa7e6f7bae3e6a613b4f4b7cee4a9c6d2b7aae
Author: Gabor Kelemen 
AuthorDate: Sun May 11 10:06:53 2025 +0200
Commit: Gabor Kelemen 
CommitDate: Sat Jun 21 18:08:00 2025 +0200

[API CHANGE] Replace VCL Settings (PrintDialog/LastPrinter)

in order to simplify code.

The flexibility provided by the ConfigurableSettings template
is not really necessary for the simple settings VCL has

Change-Id: I48e473adbcb844cf95911bd03f036b064a0840f2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185178
Reviewed-by: Gabor Kelemen 
Tested-by: Jenkins

diff --git a/officecfg/registry/schema/org/openoffice/VCL.xcs 
b/officecfg/registry/schema/org/openoffice/VCL.xcs
index 4b0a4f35aba9..2323bca1340c 100644
--- a/officecfg/registry/schema/org/openoffice/VCL.xcs
+++ b/officecfg/registry/schema/org/openoffice/VCL.xcs
@@ -127,6 +127,9 @@
 
 true
 
+
+
+
 
 
 
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index 75d28ca69688..0da1d81fe127 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -23,6 +23,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -34,7 +35,6 @@
 #include 
 #include 
 
-#include 
 #include 
 #include 
 #include 
@@ -800,11 +800,9 @@ bool Printer::StartJob( const OUString& i_rJobName, 
std::shared_ptrisShowDialogs() && !i_xController->isDirectPrint())
 {
-SettingsConfigItem* pItem = SettingsConfigItem::get();
-pItem->setValue( u"PrintDialog"_ustr,
- u"LastPrinterUsed"_ustr,
- GetName()
- );
+std::shared_ptr 
batch(comphelper::ConfigurationChanges::create());
+officecfg::VCL::VCLSettings::PrintDialog::LastPrinter::set( GetName(), 
batch );
+batch->commit();
 }
 
 return true;
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 4d7c74392a6d..6a8b02626849 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -606,9 +606,7 @@ PrintDialog::PrintDialog(weld::Window* i_pWindow, 
std::shared_ptrgetValue( u"PrintDialog"_ustr,
-u"LastPrinter"_ustr ) );
+OUString aValue( 
officecfg::VCL::VCLSettings::PrintDialog::LastPrinter::get() );
 if (mxPrinters->find_text(aValue) != -1)
 {
 mxPrinters->set_active_text(aValue);
@@ -751,10 +749,9 @@ void PrintDialog::storeToSettings()
 SettingsConfigItem* pItem = SettingsConfigItem::get();
 std::shared_ptr 
batch(comphelper::ConfigurationChanges::create());
 
-pItem->setValue( u"PrintDialog"_ustr,
- u"LastPrinter"_ustr,
+officecfg::VCL::VCLSettings::PrintDialog::LastPrinter::set(
   isPrintToFile() ? Printer::GetDefaultPrinterName()
-  : mxPrinters->get_active_text() );
+  : mxPrinters->get_active_text(), batch );
 
 pItem->setValue( u"PrintDialog"_ustr,
  u"LastPage"_ustr,

core.git: officecfg/registry vcl/source

2025-06-21 Thread Gabor Kelemen (via logerrit)

 officecfg/registry/data/org/openoffice/VCL.xcu |7 ---
 vcl/source/window/printdlg.cxx |4 +---
 2 files changed, 1 insertion(+), 10 deletions(-)

New commits:
commit 1988a527d469ee59e6588128705dd4726514b7ed
Author: Gabor Kelemen 
AuthorDate: Sat May 10 23:03:58 2025 +0200
Commit: Gabor Kelemen 
CommitDate: Sat Jun 21 11:11:57 2025 +0200

[API CHANGE] Replace VCL Settings (PrintDialog/CollateBox)

in order to simplify code.

Drop this config key entirely, it was used for lockdown of the Collate
checkbox depending on a non-default value.

Change-Id: Ied93bd3ce531c15b7ca4b2b23da110e051bcf74c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185177
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen 

diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu 
b/officecfg/registry/data/org/openoffice/VCL.xcu
index bfe5f94f6aec..e68b0c54bf0f 100644
--- a/officecfg/registry/data/org/openoffice/VCL.xcu
+++ b/officecfg/registry/data/org/openoffice/VCL.xcu
@@ -18,13 +18,6 @@
  -->
 
 http://openoffice.org/2001/registry"; 
xmlns:install="http://openoffice.org/2004/installation"; 
xmlns:xs="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; oor:name="VCL" 
oor:package="org.openoffice">
-  
-
-  
-Default
-  
-
-  
   
 
   
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 5d5539ade673..4d7c74392a6d 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -809,9 +809,7 @@ void PrintDialog::readFromSettings()
 m_xDialog->set_window_state(aValue);
 
 // collate
-aValue = pItem->getValue( u"PrintDialog"_ustr,
-  u"CollateBox"_ustr );
-if( aValue.equalsIgnoreAsciiCase("alwaysoff") )
+if( officecfg::VCL::VCLSettings::PrintDialog::Collate::isReadOnly() )
 {
 mbCollateAlwaysOff = true;
 mxCollateBox->set_active( false );

core.git: officecfg/registry vcl/source

2025-06-20 Thread Gabor Kelemen (via logerrit)

 officecfg/registry/data/org/openoffice/VCL.xcu   |3 ---
 officecfg/registry/schema/org/openoffice/VCL.xcs |5 +
 vcl/source/window/printdlg.cxx   |   12 +---
 3 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit b3334b2dad6d8d3ebaedd0a637a58fd5e5443635
Author: Gabor Kelemen 
AuthorDate: Sat May 10 21:54:00 2025 +0200
Commit: Gabor Kelemen 
CommitDate: Fri Jun 20 10:33:39 2025 +0200

[API CHANGE] Replace VCL Settings (PrintDialog/Collate)

in order to simplify code.

The flexibility provided by the ConfigurableSettings template
is not really necessary for the simple settings VCL has

Change-Id: I662adb1cc032c816c16ffe7e9b1350b28b60e8fe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185176
Reviewed-by: Gabor Kelemen 
Tested-by: Jenkins

diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu 
b/officecfg/registry/data/org/openoffice/VCL.xcu
index 634cc0efdb31..bfe5f94f6aec 100644
--- a/officecfg/registry/data/org/openoffice/VCL.xcu
+++ b/officecfg/registry/data/org/openoffice/VCL.xcu
@@ -20,9 +20,6 @@
 http://openoffice.org/2001/registry"; 
xmlns:install="http://openoffice.org/2004/installation"; 
xmlns:xs="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; oor:name="VCL" 
oor:package="org.openoffice">
   
 
-  
-true
-  
   
 Default
   
diff --git a/officecfg/registry/schema/org/openoffice/VCL.xcs 
b/officecfg/registry/schema/org/openoffice/VCL.xcs
index aefd6c9cfc55..4b0a4f35aba9 100644
--- a/officecfg/registry/schema/org/openoffice/VCL.xcs
+++ b/officecfg/registry/schema/org/openoffice/VCL.xcs
@@ -123,6 +123,11 @@
 false
 
 
+
+
+true
+
+
 
 
 false
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 83c874c91457..5d5539ade673 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -23,6 +23,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -748,6 +749,7 @@ void PrintDialog::setupPaperSidesBox()
 void PrintDialog::storeToSettings()
 {
 SettingsConfigItem* pItem = SettingsConfigItem::get();
+std::shared_ptr 
batch(comphelper::ConfigurationChanges::create());
 
 pItem->setValue( u"PrintDialog"_ustr,
  u"LastPrinter"_ustr,
@@ -766,10 +768,7 @@ void PrintDialog::storeToSettings()
  u"CopyCount"_ustr,
  mxCopyCountField->get_text() );
 
-pItem->setValue( u"PrintDialog"_ustr,
- u"Collate"_ustr,
- mxCollateBox->get_active() ? u"true"_ustr :
- u"false"_ustr );
+officecfg::VCL::VCLSettings::PrintDialog::Collate::set( 
mxCollateBox->get_active(), batch );
 
 pItem->setValue( u"PrintDialog"_ustr,
  u"CollateSingleJobs"_ustr,
@@ -781,6 +780,7 @@ void PrintDialog::storeToSettings()
  hasPreview() ? u"true"_ustr :
 u"false"_ustr );
 
+batch->commit();
 pItem->Commit();
 }
 
@@ -820,9 +820,7 @@ void PrintDialog::readFromSettings()
 else
 {
 mbCollateAlwaysOff = false;
-aValue = pItem->getValue( u"PrintDialog"_ustr,
-  u"Collate"_ustr );
-mxCollateBox->set_active( aValue.equalsIgnoreAsciiCase("true") );
+mxCollateBox->set_active( 
officecfg::VCL::VCLSettings::PrintDialog::Collate::get() );
 }
 
 // collate single jobs

core.git: officecfg/registry vcl/unx

2025-06-19 Thread Gabor Kelemen (via logerrit)

 officecfg/registry/data/org/openoffice/VCL.xcu   |5 -
 officecfg/registry/schema/org/openoffice/VCL.xcs |5 +
 vcl/unx/generic/app/wmadaptor.cxx|   11 +--
 3 files changed, 10 insertions(+), 11 deletions(-)

New commits:
commit 550cd135af427ba99f1680d2da0f42a2d91b9558
Author: Gabor Kelemen 
AuthorDate: Sat May 10 16:05:37 2025 +0200
Commit: Gabor Kelemen 
CommitDate: Thu Jun 19 20:07:16 2025 +0200

[API CHANGE] Replace VCL Settings with more static ones 
(ShouldSwitchWorkspace)

in order to simplify code.

The flexibility provided by the ConfigurableSettings template
is not really necessary for the simple settings VCL has

Change-Id: I0711e3c0b4aecb4dadb0f284e495b489d735b609
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185175
Reviewed-by: Gabor Kelemen 
Tested-by: Jenkins

diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu 
b/officecfg/registry/data/org/openoffice/VCL.xcu
index 8899bcc59ec9..634cc0efdb31 100644
--- a/officecfg/registry/data/org/openoffice/VCL.xcu
+++ b/officecfg/registry/data/org/openoffice/VCL.xcu
@@ -27,11 +27,6 @@
 Default
   
 
-
-  
-false
-  
-
   
   
 
diff --git a/officecfg/registry/schema/org/openoffice/VCL.xcs 
b/officecfg/registry/schema/org/openoffice/VCL.xcs
index 81088b39ee88..aefd6c9cfc55 100644
--- a/officecfg/registry/schema/org/openoffice/VCL.xcs
+++ b/officecfg/registry/schema/org/openoffice/VCL.xcs
@@ -123,6 +123,11 @@
 false
 
 
+
+
+false
+
+
 
   
 
diff --git a/vcl/unx/generic/app/wmadaptor.cxx 
b/vcl/unx/generic/app/wmadaptor.cxx
index 67dcb734ab77..dbe45b03bdde 100644
--- a/vcl/unx/generic/app/wmadaptor.cxx
+++ b/vcl/unx/generic/app/wmadaptor.cxx
@@ -30,8 +30,8 @@
 #include 
 #include 
 #include 
-#include 
 #include 
+#include 
 
 #include 
 #include 
@@ -872,10 +872,9 @@ bool WMAdaptor::getWMshouldSwitchWorkspace() const
 WMAdaptor * pWMA = const_cast(this);
 
 pWMA->m_bWMshouldSwitchWorkspace = true;
-vcl::SettingsConfigItem* pItem = vcl::SettingsConfigItem::get();
-OUString aSetting( pItem->getValue( u"WM"_ustr,
- u"ShouldSwitchWorkspace"_ustr 
) );
-if( aSetting.isEmpty() )
+bool aSetting = 
officecfg::VCL::VCLSettings::DesktopManagement::DisablePrinting::get();
+
+if( aSetting )
 {
 if( m_aWMName == "awesome" )
 {
@@ -883,7 +882,7 @@ bool WMAdaptor::getWMshouldSwitchWorkspace() const
 }
 }
 else
-pWMA->m_bWMshouldSwitchWorkspace = aSetting.toBoolean();
+pWMA->m_bWMshouldSwitchWorkspace = aSetting;
 pWMA->m_bWMshouldSwitchWorkspaceInit = true;
 }
 return m_bWMshouldSwitchWorkspace;

core.git: officecfg/registry vcl/source

2025-06-19 Thread Gabor Kelemen (via logerrit)

 officecfg/registry/data/org/openoffice/VCL.xcu   |5 
 officecfg/registry/schema/org/openoffice/VCL.xcs |5 
 vcl/source/window/menu.cxx   |   24 +++
 3 files changed, 9 insertions(+), 25 deletions(-)

New commits:
commit 3a8234187977bb5935164b322e1d2dd6cce1eebf
Author: Gabor Kelemen 
AuthorDate: Sat May 10 15:56:50 2025 +0200
Commit: Gabor Kelemen 
CommitDate: Thu Jun 19 09:08:20 2025 +0200

[API CHANGE] Replace VCL Settings with more static ones 
(SuppressAccelerators)

in order to simplify code.

The flexibility provided by the ConfigurableSettings template
is not really necessary for the simple settings VCL has

Change-Id: Iee125cad1e3f3486f368d9e34b77dbe14b814d0b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185174
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen 

diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu 
b/officecfg/registry/data/org/openoffice/VCL.xcu
index f4165f268c50..8899bcc59ec9 100644
--- a/officecfg/registry/data/org/openoffice/VCL.xcu
+++ b/officecfg/registry/data/org/openoffice/VCL.xcu
@@ -19,11 +19,6 @@
 
 http://openoffice.org/2001/registry"; 
xmlns:install="http://openoffice.org/2004/installation"; 
xmlns:xs="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; oor:name="VCL" 
oor:package="org.openoffice">
   
-
-  
-false
-  
-
 
   
 true
diff --git a/officecfg/registry/schema/org/openoffice/VCL.xcs 
b/officecfg/registry/schema/org/openoffice/VCL.xcs
index 66d0432803cc..81088b39ee88 100644
--- a/officecfg/registry/schema/org/openoffice/VCL.xcs
+++ b/officecfg/registry/schema/org/openoffice/VCL.xcs
@@ -118,6 +118,11 @@
 false
 
 
+
+
+false
+
+
 
   
 
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 632ba6deb314..b85bd19bb98c 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -56,13 +56,12 @@
 #include 
 #include 
 
-#include 
-
 #include 
 #include 
 #include 
 
 #include 
+#include 
 
 namespace vcl
 {
@@ -80,21 +79,6 @@ using namespace vcl;
 constexpr auto EXTRAITEMHEIGHT = 4;
 constexpr auto SPACE_AROUND_TITLE = 4;
 
-static bool ImplAccelDisabled()
-{
-// display of accelerator strings may be suppressed via configuration
-static int nAccelDisabled = -1;
-
-if( nAccelDisabled == -1 )
-{
-OUString aStr =
-vcl::SettingsConfigItem::get()->
-getValue( u"Menu"_ustr, u"SuppressAccelerators"_ustr );
-nAccelDisabled = aStr.equalsIgnoreAsciiCase("true") ? 1 : 0;
-}
-return nAccelDisabled == 1;
-}
-
 static void ImplSetMenuItemData( MenuItemData* pData )
 {
 // convert data
@@ -1549,7 +1533,7 @@ Size Menu::ImplCalcSize( vcl::Window* pWin )
 }
 
 // Accel
-if (!IsMenuBar()&& pData->aAccelKey.GetCode() && 
!ImplAccelDisabled())
+if (!IsMenuBar()&& pData->aAccelKey.GetCode() && 
!officecfg::VCL::VCLSettings::Menu::SuppressAccelerators::get())
 {
 OUString aName = pData->aAccelKey.GetName();
 tools::Long nAccWidth = pWin->GetTextWidth( aName );
@@ -1984,7 +1968,7 @@ void Menu::ImplPaint(vcl::RenderContext& rRenderContext, 
Size const & rSize,
 }
 // how much space is there for the text?
 tools::Long nMaxItemTextWidth = aOutSz.Width() - 
aTmpPos.X() - nExtra - nOuterSpaceX;
-if (!IsMenuBar() && pData->aAccelKey.GetCode() && 
!ImplAccelDisabled())
+if (!IsMenuBar() && pData->aAccelKey.GetCode() && 
!officecfg::VCL::VCLSettings::Menu::SuppressAccelerators::get())
 {
 OUString aAccText = pData->aAccelKey.GetName();
 nMaxItemTextWidth -= 
rRenderContext.GetTextWidth(aAccText) + 3 * nExtra;
@@ -2024,7 +2008,7 @@ void Menu::ImplPaint(vcl::RenderContext& rRenderContext, 
Size const & rSize,
 }
 
 // Accel
-if (!bLayout && !IsMenuBar() && pData->aAccelKey.GetCode() && 
!ImplAccelDisabled())
+if (!bLayout && !IsMenuBar() && pData->aAccelKey.GetCode() && 
!officecfg::VCL::VCLSettings::Menu::SuppressAccelerators::get())
 {
 OUString aAccText = pData->aAccelKey.GetName();
 aTmpPos.setX( aOutSz.Width() - 
rRenderContext.GetTextWidth(aAccText) );

core.git: officecfg/registry vcl/source

2025-06-18 Thread Gabor Kelemen (via logerrit)

 officecfg/registry/data/org/openoffice/VCL.xcu   |5 -
 officecfg/registry/schema/org/openoffice/VCL.xcs |5 +
 vcl/source/app/settings.cxx  |8 ++--
 3 files changed, 7 insertions(+), 11 deletions(-)

New commits:
commit d63a7912b682d1bfa8789cac83422c9ec025dc20
Author: Gabor Kelemen 
AuthorDate: Sat May 10 15:43:32 2025 +0200
Commit: Gabor Kelemen 
CommitDate: Wed Jun 18 14:25:42 2025 +0200

[API CHANGE] Replace VCL Settings with more static ones (DisablePrinting)

in order to simplify code.

The flexibility provided by the ConfigurableSettings template
is not really necessary for the simple settings VCL has

Change-Id: Ia42b01b9914b20473880027eab5dc4ee59dea11d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185173
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen 

diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu 
b/officecfg/registry/data/org/openoffice/VCL.xcu
index 6db713d69ca9..f4165f268c50 100644
--- a/officecfg/registry/data/org/openoffice/VCL.xcu
+++ b/officecfg/registry/data/org/openoffice/VCL.xcu
@@ -19,11 +19,6 @@
 
 http://openoffice.org/2001/registry"; 
xmlns:install="http://openoffice.org/2004/installation"; 
xmlns:xs="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; oor:name="VCL" 
oor:package="org.openoffice">
   
-
-  
-false
-  
-
 
   
 false
diff --git a/officecfg/registry/schema/org/openoffice/VCL.xcs 
b/officecfg/registry/schema/org/openoffice/VCL.xcs
index ac9652bc5d5e..66d0432803cc 100644
--- a/officecfg/registry/schema/org/openoffice/VCL.xcs
+++ b/officecfg/registry/schema/org/openoffice/VCL.xcs
@@ -113,6 +113,11 @@
 3
 
 
+
+
+false
+
+
 
   
 
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 7d8c63e07839..d5fa673d6385 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -20,6 +20,7 @@
 #include 
 
 #include 
+#include 
 
 #ifdef _WIN32
 #include 
@@ -42,7 +43,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 
 #include 
@@ -2271,11 +2271,7 @@ bool MiscSettings::GetDisablePrinting() const
 {
 if( mxData->mnDisablePrinting == TRISTATE_INDET )
 {
-OUString aEnable =
-vcl::SettingsConfigItem::get()->
-getValue( u"DesktopManagement"_ustr,
-  u"DisablePrinting"_ustr );
-mxData->mnDisablePrinting = aEnable.equalsIgnoreAsciiCase("true") ? 
TRISTATE_TRUE : TRISTATE_FALSE;
+mxData->mnDisablePrinting = 
officecfg::VCL::VCLSettings::DesktopManagement::DisablePrinting::get() ? 
TRISTATE_TRUE : TRISTATE_FALSE;
 }
 
 return mxData->mnDisablePrinting != TRISTATE_FALSE;

core.git: officecfg/registry vcl/Library_vclplug_gen.mk vcl/unx

2025-06-17 Thread Gabor Kelemen (via logerrit)

 officecfg/registry/data/org/openoffice/VCL.xcu   |5 
 officecfg/registry/schema/org/openoffice/VCL.xcs |   10 +
 vcl/Library_vclplug_gen.mk   |1 
 vcl/unx/generic/dtrans/X11_selection.cxx |   10 +
 vcl/unx/generic/dtrans/X11_selection.hxx |1 
 vcl/unx/generic/dtrans/config.cxx|  122 ---
 6 files changed, 16 insertions(+), 133 deletions(-)

New commits:
commit aecf1253fdc7b58ee4da7109799a0751897edc7e
Author: Gabor Kelemen 
AuthorDate: Sat May 10 11:33:40 2025 +0200
Commit: Gabor Kelemen 
CommitDate: Tue Jun 17 19:49:23 2025 +0200

[API CHANGE] tdf#46037 Replace VCL Settings (SelectionTimeout)

in order to simplify code.

The flexibility provided by the ConfigurableSettings template
is not really necessary for the simple settings VCL has

Change-Id: I95827072b5c78b8b66d3101b0176d8ed5f85b626
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185172
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen 

diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu 
b/officecfg/registry/data/org/openoffice/VCL.xcu
index 4ed4bdb528ba..6db713d69ca9 100644
--- a/officecfg/registry/data/org/openoffice/VCL.xcu
+++ b/officecfg/registry/data/org/openoffice/VCL.xcu
@@ -24,11 +24,6 @@
 false
   
 
-
-  
-3
-  
-
 
   
 false
diff --git a/officecfg/registry/schema/org/openoffice/VCL.xcs 
b/officecfg/registry/schema/org/openoffice/VCL.xcs
index fe878f851497..ac9652bc5d5e 100644
--- a/officecfg/registry/schema/org/openoffice/VCL.xcs
+++ b/officecfg/registry/schema/org/openoffice/VCL.xcs
@@ -104,5 +104,15 @@
 Contains the localized font substitution tables for VCL (see 
template description).
   
 
+
+
+Contains VCL-related configurations (print dialog, menus, 
etc.).
+
+
+
+3
+
+
+
   
 
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk
index 2d314017bb8b..43b825c5eae2 100644
--- a/vcl/Library_vclplug_gen.mk
+++ b/vcl/Library_vclplug_gen.mk
@@ -89,7 +89,6 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_gen,\
 vcl/unx/generic/app/sm \
 vcl/unx/generic/app/wmadaptor \
 vcl/unx/generic/dtrans/bmp \
-vcl/unx/generic/dtrans/config \
 vcl/unx/generic/dtrans/X11_clipboard \
 vcl/unx/generic/dtrans/X11_dndcontext \
 vcl/unx/generic/dtrans/X11_droptarget \
diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx 
b/vcl/unx/generic/dtrans/X11_selection.cxx
index 826e8fb96489..982adba77b78 100644
--- a/vcl/unx/generic/dtrans/X11_selection.cxx
+++ b/vcl/unx/generic/dtrans/X11_selection.cxx
@@ -68,6 +68,8 @@
 #include 
 
 #include 
+#include 
+
 #include 
 
 constexpr auto DRAG_EVENT_MASK = ButtonPressMask |
@@ -217,7 +219,6 @@ SelectionManager::SelectionManager() :
 m_aThread( nullptr ),
 m_aDragExecuteThread( nullptr ),
 m_aWindow( None ),
-m_nSelectionTimeout( 0 ),
 m_nSelectionTimestamp( CurrentTime ),
 m_bDropEnterSent( true ),
 m_aCurrentDropWindow( None ),
@@ -900,6 +901,7 @@ bool SelectionManager::getPasteData( Atom selection, Atom 
type, Sequence< sal_In
 tv_current = tv_last;
 
 XEvent aEvent;
+auto nSelectionTimeout = 
officecfg::VCL::VCLSettings::Transfer::SelectionTimeout::get();
 do
 {
 bool bAdjustTime = false;
@@ -958,10 +960,10 @@ bool SelectionManager::getPasteData( Atom selection, Atom 
type, Sequence< sal_In
 gettimeofday( &tv_current, nullptr );
 if( bAdjustTime )
 tv_last = tv_current;
-} while( ! it->second->m_aDataArrived.check() && (tv_current.tv_sec - 
tv_last.tv_sec) < getSelectionTimeout() );
+} while( ! it->second->m_aDataArrived.check() && (tv_current.tv_sec - 
tv_last.tv_sec) < nSelectionTimeout );
 
 #if OSL_DEBUG_LEVEL > 1
-SAL_WARN_IF((tv_current.tv_sec - tv_last.tv_sec) > getSelectionTimeout(),
+SAL_WARN_IF((tv_current.tv_sec - tv_last.tv_sec) > nSelectionTimeout,
 "vcl.unx.dtrans", "timed out.");
 #endif
 
@@ -1952,7 +1954,7 @@ bool SelectionManager::handleSendPropertyNotify( 
XPropertyEvent const & rNotify
 std::vector< Atom > aTimeouts;
 for (auto const& incrementalTransfer : it->second)
 {
-if( (nCurrentTime - 
incrementalTransfer.second.m_nTransferStartTime) > (getSelectionTimeout()+2) )
+if( (nCurrentTime - 
incrementalTransfer.second.m_nTransferStartTime) > 
(officecfg::VCL::VCLSettings::Transfer::SelectionTimeout::get()+2) )
 {
 aTimeouts.push_back( incrementalTransfer.first );
 #if OSL_DEBUG_LEVEL > 1
diff --git a/vcl/unx/generic/dtrans/X11_selection.hxx 
b/vcl/unx/generic/dtrans/X11_selection.hxx
index ea7ac20c9479..5ec683990a0d 100644
--- a/vcl/unx/generic/dtrans/X11_selection.hxx
+++ b/vcl

core.git: officecfg/registry sc/source

2025-06-07 Thread Mike Kaganski (via logerrit)

 officecfg/registry/schema/org/openoffice/Office/Calc.xcs |   18 +-
 sc/source/ui/dbgui/scuiasciiopt.cxx  |   41 +++
 2 files changed, 37 insertions(+), 22 deletions(-)

New commits:
commit d16535788721238a423408ba59805f4bcacc4e12
Author: Mike Kaganski 
AuthorDate: Wed Jun 4 19:23:30 2025 +0500
Commit: Mike Kaganski 
CommitDate: Sat Jun 7 12:05:07 2025 +0200

[API CHANGE] tdf#166208: New "Encoding" property for text import / 
clipboard paste

The problem appeared, because the existing CharSet property was storing
the index of the selection in the encoding list box; and that meant, that
any change in the list box content (different sorting; added elements)
could suddenly make the selection wrong the next time. With introduction
of the autodetection entry into the top of the list box in tdf#152336 (in
commit 565b619d57a3b98b0826c4b49dee6606f9ae70e0), many people who had
UTF-8 selected in the dialog previously, got UTF-7 instead; and many had
not noticed the difference, thus seeing unexpected results after import.

The said commit intended to force-select autodetection for the users who
had not used the updated dialog yet; but the detection of that scenario
was flawed, and didn't work (that was discussed, and respective code was
dropped in commit ...).

This change implements that idea. I decided to ignore the stored CharSet
value; after the change, autodetection entry will be pre-selected at the
first start of the dialog. This will be a minor annoyance for users who
have already re-selected wanted encoding after previous upgrade; but it
allows to resolve the bug for people upgrading from versions prior to
25.2. Also, since new versions will not write to CharSet, it's possible
to use a shared profile between old and new versions without breaking
the encoding selection in either.

Change-Id: I59640b16f703077b6fda44a34eadf2edbe8e6bf5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186240
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index 5023d3c9e78e..25b272f35c64 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -1091,11 +1091,18 @@
 
 
   
-Char Set
+Char Set (index of selected item in the dialog's list box; 
obsoleted by Encoding)
 CharSet
   
   -1
 
+
+  
+Encoding (an rtl_TextEncoding value; default is "don't 
know")
+Encoding
+  
+  0
+
 
   
 Fixed Width List of separators
@@ -1201,11 +1208,18 @@
 
 
   
-Char Set
+Char Set (index of selected item in the dialog's list box; 
obsoleted by Encoding)
 CharSet
   
   -1
 
+
+  
+Encoding (an rtl_TextEncoding value; default is "don't 
know")
+Encoding
+  
+  0
+
 
   
 Fixed Width List of separators
diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx 
b/sc/source/ui/dbgui/scuiasciiopt.cxx
index 8370ee76fb12..95dcb676650e 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -81,7 +81,7 @@ constexpr OUString CSVIO_RemoveSpace = u"RemoveSpace"_ustr;
 constexpr OUString CSVIO_EvaluateFormulas = u"EvaluateFormulas"_ustr;
 constexpr OUString CSVIO_SeparatorType = u"SeparatorType"_ustr;
 constexpr OUString CSVIO_FromRow = u"FromRow"_ustr;
-constexpr OUString CSVIO_CharSet = u"CharSet"_ustr;
+constexpr OUString CSVIO_Encoding = u"Encoding"_ustr;
 constexpr OUString CSVIO_QuotedAsText = u"QuotedFieldAsText"_ustr;
 constexpr OUString CSVIO_DetectSpecialNum = u"DetectSpecialNumbers"_ustr;
 constexpr OUString CSVIO_DetectScientificNum = u"DetectScientificNumbers"_ustr;
@@ -160,7 +160,7 @@ static OUString lcl_GetConfigPath(ScImportAsciiCall eCall)
 
 static void lcl_LoadSeparators(ScImportAsciiCall eCall, OUString& 
rFieldSeparators, OUString& rTextSeparators,
  bool& rMergeDelimiters, bool& rQuotedAsText, 
bool& rDetectSpecialNum, bool& rDetectScientificNum,
- SeparatorType& rSepType, sal_Int32& rFromRow, 
sal_Int32& rCharSet,
+ SeparatorType& rSepType, sal_Int32& rFromRow, 
rtl_TextEncoding& rEncoding,
  sal_Int32& rLanguage, bool& rSkipEmptyCells, 
bool& rRemoveSpace,
  bool& rEvaluateFormulas)
 {
@@ -168,6 +168,8 @@ static void lcl_LoadSeparators(ScImportAsciiCall eCall, 
OUString& rFieldSeparato
 const Sequence aNames = aItem.GetNodeNames({});
 const Sequence aVa

core.git: officecfg/registry sw/inc sw/qa sw/source

2025-05-28 Thread Justin Luth (via logerrit)

 officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs |6 +++
 sw/inc/IDocumentSettingAccess.hxx |2 +
 sw/qa/extras/ooxmlexport/ooxmlexport24.cxx|   17 
+++---
 sw/qa/extras/ooxmlexport/ooxmlexport25.cxx|7 
 sw/source/core/doc/DocumentSettingManager.cxx |   13 
+++
 sw/source/core/inc/DocumentSettingManager.hxx |1 
 sw/source/core/layout/tabfrm.cxx  |   12 
+--
 sw/source/filter/ww8/ww8par.cxx   |3 +
 sw/source/filter/ww8/ww8scan.cxx  |2 -
 sw/source/filter/ww8/ww8scan.hxx  |3 +
 sw/source/uibase/uno/SwXDocumentSettings.cxx  |   15 

 sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx  |4 ++
 sw/source/writerfilter/dmapper/SettingsTable.cxx  |   10 +
 sw/source/writerfilter/dmapper/SettingsTable.hxx  |2 +
 14 files changed, 88 insertions(+), 9 deletions(-)

New commits:
commit 10b9d5200e382db5affaefc035ebe4d6b35a92fb
Author: Justin Luth 
AuthorDate: Thu May 22 14:28:33 2025 -0400
Commit: Justin Luth 
CommitDate: Wed May 28 11:42:00 2025 +0200

tdf#37153 tdf#165478 sw: add mso-compat flag doNotVertAlignCellWithSp

This patch depends on
NFC tdf#37153 ww8import: replace 'unknown' with compatibility names

The problem was that the cell vertical orientation should not
ALWAYS be forced to top when the cell contains an floating shape.

This replaces my 6.0 commit 7a9fb40cb07de8c2ea33f92735be5008d30d6704
which incorrectly applied to all MSO documents. All DOC files - yes,
but it should only affect DOCX with compat flag doNotVertAlignCellWithSp
(Don't vertically align table cells with shapes).

It appears that DOC format should ALWAYS be considered
as having this flag enabled, even if it is set to OFF
(and it IS set to off somehow in the unit tests).
At least that is how MS Word 2010 seems to deal with it,
and MS Word 2003 (which doesn't detail these layout flags)
also works the same way (even for the DOCX - which reinforces all DOC).

- open the unit test tdf37153_considerWrapOnObjPos.doc
--   see the image/paragraph marker at the top of the cell.
- delete the image
--   see the paragraph marker drop to the bottom of the cell.

make CppunitTest_sw_ww8export2 CPPUNIT_TEST_NAME=testTdf37153

make CppunitTest_sw_ooxmlexport25 \
CPPUNIT_TEST_NAME=testTdf165478_bottomAligned

For ooxmlexport24's tdf37153_considerWrapOnObjPos.docx,
I probably created that unit test after testing in Word 2003.
There it behaved identically to the DOC version,
and that becomes no surprise when I now find out that
doNotVertAlignCellWithSp is a flag introduced for Word 2007.
Since it was testing for an ancient layout - I changed it.

Change-Id: Id1ef078a19605532bbb694532cbe7f3cf82fb565
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185695
Reviewed-by: Justin Luth 
Tested-by: Jenkins

diff --git a/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs
index b667e24e5172..d22a2c465191 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs
@@ -188,6 +188,12 @@
 
 false
   
+  
+
+  Use old Word-compatible layout, forcing cell contents to be 
top-aligned if the cell contains a floating shape
+
+false
+  
 
   
   
diff --git a/sw/inc/IDocumentSettingAccess.hxx 
b/sw/inc/IDocumentSettingAccess.hxx
index f523a51af65d..902f23b72a87 100644
--- a/sw/inc/IDocumentSettingAccess.hxx
+++ b/sw/inc/IDocumentSettingAccess.hxx
@@ -145,6 +145,8 @@ enum class DocumentSettingId
 MS_WORD_UL_TRAIL_SPACE,
 // tdf#88908 optionally adjust normal spaces in CJK context to halfwidth
 BALANCE_SPACES_AND_IDEOGRAPHIC_SPACES,
+// tdf#37153 Word-compatibility: force top-alignment for cells containing 
a floating shape
+FORCE_TOP_ALIGNMENT_IN_CELL_WITH_FLOATING_ANCHOR,
 };
 
 /** Provides access to settings of a document
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport24.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport24.cxx
index cacc795e54a5..bfcd33955090 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport24.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport24.cxx
@@ -82,6 +82,14 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf99227)
 
 DECLARE_OOXMLEXPORT_TEST(testTdf37153, "tdf37153_considerWrapOnObjPos.docx")
 {
+// NOTE: this is now known to have nothing to do with 
considerWrapOnObjPos...
+
+// Given a Word 2007 file WITHOUT compat flag doNotVertAlignCellWithSp

core.git: officecfg/registry sw/inc sw/qa sw/source

2025-05-14 Thread marus087 (via logerrit)

 officecfg/registry/schema/org/openoffice/Office/Common.xcs |6 +
 sw/inc/strings.hrc |5 +
 sw/qa/extras/layout/layout.cxx |   18 
 sw/qa/extras/layout/layout3.cxx|   48 +
 sw/qa/extras/layout/layout4.cxx|   18 
 sw/source/uibase/uiview/view0.cxx  |   27 ++-
 6 files changed, 119 insertions(+), 3 deletions(-)

New commits:
commit 4e461bb4e33eaabe54dcd6bb3a7f5b2dbce707be
Author: marus087 
AuthorDate: Mon May 12 15:39:54 2025 +0300
Commit: Heiko Tietze 
CommitDate: Wed May 14 10:50:56 2025 +0200

tdf#159444 Warn when View -> Field Names is activated

Change-Id: I0a839ab93ac50e701329d3203ae8e2e655ee748c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185213
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 4de5cfadd07a..663d70a909b6 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -5426,6 +5426,12 @@
 
 true
   
+  
+
+  Determines whether to show the field name when entering the 
field mode.
+
+true
+  
   
 
   Determines whether to confirm delete all comments or all by 
user.
diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
index 9c6b5b9d4d3e..6e1ac4888cce 100644
--- a/sw/inc/strings.hrc
+++ b/sw/inc/strings.hrc
@@ -1558,6 +1558,11 @@
 #define STR_QUERY_INSMODE_TEXT NC_("STR_QUERY_INSMODE_TEXT", "The overwrite 
mode allows to type over text. It is indicated by a block cursor and at the 
statusbar. Press Insert again to switch back.")
 #define STR_QUERY_INSMODE_QUESTION NC_("STR_QUERY_INSMODE_QUESTION", "Do you 
want to continue?")
 
+// To translators: title, text, question for confirmation whether to activate 
Field Names
+#define STR_QUERY_FIELDNAME_TITLE NC_("STR_QUERY_FIELDNAME_TITLE", "You 
activated Field Names")
+#define STR_QUERY_FIELDNAME_TEXT NC_("STR_QUERY_FIELDNAME_TEXT", "This will 
show the names of fields not as they appear in the final document but with 
their internal identifiers.")
+#define STR_QUERY_FIELDNAME_QUESTION NC_("STR_QUERY_FIELDNAME_QUESTION", "Do 
you want to activate Field Names?")
+
 // To translators: title and question for confirmation whether to delete all 
comments / all comments by author; text intentionally empty
 #define STR_QUERY_DELALLCOMMENTS_TITLE NC_("STR_QUERY_DELALLCOMMENTS_TITLE", 
"Confirm delete")
 #define STR_QUERY_DELALLCOMMENTS_QUESTION 
NC_("STR_QUERY_DELALLCOMMENTS_QUESTION", "Are you sure you want to delete all 
comments?")
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index 2fee67640dd4..781830a1ef06 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -27,6 +27,8 @@
 #include 
 #include 
 
+#include 
+
 /// Test to assert layout / rendering result of Writer.
 class SwLayoutWriter : public SwModelTestBase
 {
@@ -761,6 +763,16 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testRedlineFlysInBody)
 
 CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testFlyHiddenParagraph)
 {
+// disable Field Names warning dialog
+const bool bAsk = 
officecfg::Office::Common::Misc::QueryShowFieldName::get();
+std::shared_ptr xChanges;
+if (bAsk)
+{
+xChanges = comphelper::ConfigurationChanges::create();
+officecfg::Office::Common::Misc::QueryShowFieldName::set(false, 
xChanges);
+xChanges->commit();
+}
+
 createSwDoc("fly_hidden_paragraph.fodt");
 
 // first, disable both so para gets hidden
@@ -807,6 +819,12 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, 
testFlyHiddenParagraph)
 // so just hardcode it...
 dispatchCommand(mxComponent, ".uno:Fieldnames", args);
 Scheduler::ProcessEventsToIdle();
+
+if (bAsk)
+{
+officecfg::Office::Common::Misc::QueryShowFieldName::set(true, 
xChanges);
+xChanges->commit();
+}
 }
 
 CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testFieldHideSection)
diff --git a/sw/qa/extras/layout/layout3.cxx b/sw/qa/extras/layout/layout3.cxx
index 260b340a8d25..15034a6fb8b3 100644
--- a/sw/qa/extras/layout/layout3.cxx
+++ b/sw/qa/extras/layout/layout3.cxx
@@ -40,6 +40,8 @@
 #include 
 #include 
 
+#include 
+
 namespace
 {
 /// Test to assert layout / rendering result of Writer.
@@ -1505,6 +1507,16 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, 
testKeepWithNextPlusFlyFollowTextFlow)
 assertXPath(pXmlDoc, "/root/page", 1);
 }
 
+// disable Field Names warning dialog
+const bool bAsk = 
officecfg::Office::Common::Misc::QueryShowFieldName::get();
+std::shared_ptr xChanges;
+if (bAsk)
+{
+xChanges = comphelper::ConfigurationChanges::create();
+officecfg::Office::Common::Misc::

core.git: officecfg/registry sw/inc sw/qa sw/source

2025-05-12 Thread Miklos Vajna (via logerrit)

 officecfg/registry/schema/org/openoffice/Office/Common.xcs |   18 +++---
 sw/inc/editsh.hxx  |2 
 sw/qa/uibase/wrtsh/wrtsh.cxx   |   37 +
 sw/source/uibase/wrtsh/wrtsh1.cxx  |6 +-
 4 files changed, 53 insertions(+), 10 deletions(-)

New commits:
commit d32dd7675b36952dd38e6c9b7d280ff2c4008404
Author: Miklos Vajna 
AuthorDate: Mon May 12 09:42:03 2025 +0200
Commit: Miklos Vajna 
CommitDate: Mon May 12 16:27:17 2025 +0200

tdf#166229 sw: make bullet style change again with list indentation level

Create a new document, turn on bullets, create a next paragraph,
increase the indent level, the same bullet character is used for the
inner level, while this used to be different.

This went wrong in commit 626357f53c934e7f57dc80c3c83ad080767961f3 (Use
configured bullet symbol when clicking bullets button, 2024-07-11),
which changes Writer to take the bullet characters from the common
DefaultBullets settings, because it wanted Writer bullets to respect
that setting. That's OK, but it always took the bullet character
configured for the first level, also the size of the characters were
inconsistent (first is significantly smaller than 2nd, 3rd, 4th).

Fix the problem by taking the current level index into account in
SwWrtShell::NumOrBulletOn(), unless the configured bullet character list
is shorter than the amount of available Writer indentation levels. Also
change the DefaultBullets item values to match what was the default in
Writer.

Likely this is not controversial, since it seems Impress has its
own defaults: Writer has 3 characters cycled through 10 levels, Impress
seems to be switching between "•" and "-" for the first 4 levels, then
just "•" for the remaining levels. And this is just for new bullets,
existing numberings do what's stored in the document.

Change-Id: I4a2a458d3fafe96f702d8c1b2f1cf6cd78b8014d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185208
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index afab119c23d1..4de5cfadd07a 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -3382,13 +3382,15 @@
 
 
   •
-  ●
-  ○
-  □
-  ►
-  →
-  -
-  –
+  ◦
+  ▪
+  •
+  ◦
+  ▪
+  •
+  ◦
+  ▪
+  •
 
   
   
@@ -3404,6 +3406,8 @@
   OpenSymbol
   OpenSymbol
   OpenSymbol
+  OpenSymbol
+  OpenSymbol
 
   
 
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 4210180c006f..a62082d4a36b 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -533,7 +533,7 @@ public:
 /// Delete, split enumeration list.
 void DelNumRules();
 
-void NumUpDown( bool bDown = true );
+SW_DLLPUBLIC void NumUpDown( bool bDown = true );
 
 SW_DLLPUBLIC bool MoveParagraph( SwNodeOffset nOffset = SwNodeOffset(1));
 bool MoveNumParas( bool bUpperLower, bool bUpperLeft );
diff --git a/sw/qa/uibase/wrtsh/wrtsh.cxx b/sw/qa/uibase/wrtsh/wrtsh.cxx
index ea4f7e6fb776..d5b6cd439641 100644
--- a/sw/qa/uibase/wrtsh/wrtsh.cxx
+++ b/sw/qa/uibase/wrtsh/wrtsh.cxx
@@ -508,6 +508,43 @@ CPPUNIT_TEST_FIXTURE(Test, testSplitFlysAnchorJoin)
 pWrtShell->SttEndDoc(/*bStt=*/false);
 CPPUNIT_ASSERT_EQUAL(u"second para"_ustr, 
pCursor->GetPointNode().GetTextNode()->GetText());
 }
+
+CPPUNIT_TEST_FIXTURE(Test, testBulletCharChangeOnIndent)
+{
+// Given an empty document:
+createSwDoc();
+
+// When adding 2 bullets, A is level 1, B is level 2:
+SwWrtShell* pWrtShell = getSwDocShell()->GetWrtShell();
+pWrtShell->BulletOn();
+pWrtShell->Insert(u"A"_ustr);
+pWrtShell->SplitNode();
+// Increase indent: downgrade to level 2.
+pWrtShell->NumUpDown(/*bDown=*/true);
+pWrtShell->Insert(u"B"_ustr);
+
+// Then make sure the bullet characters are different:
+pWrtShell->Up(/*bSelect=*/false);
+SwCursor* pCursor = pWrtShell->GetCursor();
+sal_UCS4 nBullet1 = 0;
+{
+SwTextNode* pTextNode = pCursor->GetPointNode().GetTextNode();
+SwNumRule* pNumRule = pTextNode->GetNumRule();
+const SwNumFormat& rNumFormat = 
pNumRule->Get(pTextNode->GetActualListLevel());
+nBullet1 = rNumFormat.GetBulletChar();
+}
+pWrtShell->Down(/*bSelect=*/false);
+sal_UCS4 nBullet2 = 0;
+{
+SwTextNode* pTextNode = pCursor->GetPointNode().GetTextNode();
+SwNumRule* pNumRule = pTextNode->GetNumRule();
+const SwNumFormat& rNumFormat = 
pNumRule->Get(pTextNode->GetActu

core.git: officecfg/registry shell/source

2025-05-12 Thread Michael Weghorn (via logerrit)

 officecfg/registry/data/org/openoffice/VCL.xcu |6 --
 shell/source/backends/desktopbe/desktopbackend.cxx |3 +--
 shell/source/backends/kf5be/kfaccess.cxx   |7 ---
 shell/source/backends/kf5be/kfbackend.cxx  |   19 +--
 4 files changed, 10 insertions(+), 25 deletions(-)

New commits:
commit c0bdc3daf157ce7929facc95aa1d71967909bde4
Author: Michael Weghorn 
AuthorDate: Thu May 8 23:28:12 2025 +0200
Commit: Michael Weghorn 
CommitDate: Mon May 12 11:41:50 2025 +0200

shell: Drop "EnableATToolSupport" backend setting

The "EnableATToolSupport" setting/property that
can be queried from desktop backend implementations
doesn't seem to be used anywhere, so drop it.

There is still MiscSettings::GetEnableATToolSupport,
but that doesn't make use of the above.

Change-Id: I1ce64101d9795356e87e29c598dde25579a73111
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185071
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 

diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu 
b/officecfg/registry/data/org/openoffice/VCL.xcu
index 2cdc2bd9ab3a..4ed4bdb528ba 100644
--- a/officecfg/registry/data/org/openoffice/VCL.xcu
+++ b/officecfg/registry/data/org/openoffice/VCL.xcu
@@ -19,12 +19,6 @@
 
 http://openoffice.org/2001/registry"; 
xmlns:install="http://openoffice.org/2004/installation"; 
xmlns:xs="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; oor:name="VCL" 
oor:package="org.openoffice">
   
-
-  
-false
-
-  
-
 
   
 false
diff --git a/shell/source/backends/desktopbe/desktopbackend.cxx 
b/shell/source/backends/desktopbe/desktopbackend.cxx
index f91383815644..7cefe025ed58 100644
--- a/shell/source/backends/desktopbe/desktopbackend.cxx
+++ b/shell/source/backends/desktopbe/desktopbackend.cxx
@@ -234,8 +234,7 @@ css::uno::Any Default::getPropertyValue(OUString const & 
PropertyName)
 return xdgDirectoryIfExists("Documents", true);
 }
 
-if ( PropertyName == "EnableATToolSupport" ||
- PropertyName == "ExternalMailer" ||
+if ( PropertyName == "ExternalMailer" ||
  PropertyName == "SourceViewFontHeight" ||
  PropertyName == "SourceViewFontName" ||
  PropertyName == "ooInetHTTPProxyName" ||
diff --git a/shell/source/backends/kf5be/kfaccess.cxx 
b/shell/source/backends/kf5be/kfaccess.cxx
index 741dacdd36f4..e7d6cc60bd86 100644
--- a/shell/source/backends/kf5be/kfaccess.cxx
+++ b/shell/source/backends/kf5be/kfaccess.cxx
@@ -75,13 +75,6 @@ css::beans::Optional 
getValue(std::u16string_view id)
 const OUString sFontName = toOUString(aFontName);
 return css::beans::Optional(true, uno::Any(sFontName));
 }
-else if (id == u"EnableATToolSupport")
-{
-/* does not make much sense without an accessibility bridge */
-bool ATToolSupport = false;
-return css::beans::Optional(true,
-   
uno::Any(OUString::boolean(ATToolSupport)));
-}
 else if (id == u"WorkPathVariable")
 {
 QString 
aDocumentsDir(QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation));
diff --git a/shell/source/backends/kf5be/kfbackend.cxx 
b/shell/source/backends/kf5be/kfbackend.cxx
index 836b3505b94c..0c3c77df119b 100644
--- a/shell/source/backends/kf5be/kfbackend.cxx
+++ b/shell/source/backends/kf5be/kfbackend.cxx
@@ -137,10 +137,10 @@ OString getExecutable()
 void readKDESettings(std::map>& 
rSettings)
 {
 const std::vector aKeys
-= { u"EnableATToolSupport"_ustr, u"ExternalMailer"_ustr,   
u"SourceViewFontHeight"_ustr,
-u"SourceViewFontName"_ustr,  u"WorkPathVariable"_ustr, 
u"ooInetHTTPProxyName"_ustr,
-u"ooInetHTTPProxyPort"_ustr, u"ooInetHTTPSProxyName"_ustr, 
u"ooInetHTTPSProxyPort"_ustr,
-u"ooInetNoProxy"_ustr,   u"ooInetProxyType"_ustr };
+= { u"ExternalMailer"_ustr,   u"SourceViewFontHeight"_ustr, 
u"SourceViewFontName"_ustr,
+u"WorkPathVariable"_ustr, u"ooInetHTTPProxyName"_ustr,  
u"ooInetHTTPProxyPort"_ustr,
+u"ooInetHTTPSProxyName"_ustr, u"ooInetHTTPSProxyPort"_ustr, 
u"ooInetNoProxy"_ustr,
+u"ooInetProxyType"_ustr };
 
 for (const OUString& aKey : aKeys)
 {
@@ -218,12 +218,11 @@ void Service::setPropertyValue(OUString const&, 
css::uno::Any const&)
 
 css::uno::Any Service::getPropertyValue(OUString const& PropertyName)
 {
-if (PropertyName == "EnableATToolSupport" || PropertyName == 
"ExternalMailer"
-|| PropertyName == "SourceViewFontHeight" || PropertyName == 
"SourceViewFontName"
-|| PropertyName == "WorkPathVariable" || PropertyName == 
"ooInetHTTPProxyName"
-|| PropertyName == "ooInetHTTPProxyPort" || PropertyName == 
"ooInetHTTPSProxyName"
-|| PropertyName == "ooInetHTTPSProxyPort" || PropertyName == 
"ooIn

core.git: officecfg/registry sc/source

2025-05-12 Thread Bogdan Visanescu (via logerrit)

 officecfg/registry/schema/org/openoffice/Office/Calc.xcs |   14 ++
 sc/source/ui/dbgui/scuiasciiopt.cxx  |4 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)

New commits:
commit 19f3b72f34c487dc97d582712d21734a7e055fd5
Author: Bogdan Visanescu 
AuthorDate: Sat May 10 11:56:57 2025 +0300
Commit: Gabriel Masei 
CommitDate: Mon May 12 09:18:36 2025 +0200

tdf#165744 Added SeparatorType to ClipboardTextImport and 
TextToColumnsImport

Change-Id: I90b402972f78a2f698fe3cd91e543a1253c95425
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185124
Reviewed-by: Gabriel Masei 
Tested-by: Jenkins

diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index 9d3da5ee9d83..5023d3c9e78e 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -1129,6 +1129,13 @@
   
   true
 
+
+  
+Fixed width, separator or detected separator
+SeparatorType
+  
+  2
+
 
   
 If true, quoted field is always imported as text with no 
exception.
@@ -1243,6 +1250,13 @@
   
   true
 
+
+  
+Fixed width, separator or detected separator
+SeparatorType
+  
+  2
+
 
   
 List of Separators - as a String
diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx 
b/sc/source/ui/dbgui/scuiasciiopt.cxx
index a81d568bdeb2..c17089326809 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -193,12 +193,12 @@ static void lcl_CreatePropertiesNames ( OUString& 
rSepPath, Sequence&
 break;
 case SC_PASTETEXT:
 rSepPath = aSep_Path_Clpbrd;
-nProperties = 14;
+nProperties = 15;
 break;
 case SC_TEXTTOCOLUMNS:
 default:
 rSepPath = aSep_Path_Text2Col;
-nProperties = 8;
+nProperties = 9;
 break;
 }
 rNames.realloc( nProperties );

core.git: officecfg/registry sd/source

2025-04-09 Thread Sarper Akdemir (via logerrit)

 officecfg/registry/data/org/openoffice/Office/Accelerators.xcu |   12 +++
 sd/source/ui/inc/NotesPanelViewShell.hxx   |   15 +++
 sd/source/ui/view/NotesPanelViewShell.cxx  |   39 
+-
 3 files changed, 64 insertions(+), 2 deletions(-)

New commits:
commit b6a4f372f971a1664bd63158c2b0d41fc9d6c33b
Author: Sarper Akdemir 
AuthorDate: Tue Apr 8 14:38:02 2025 +0200
Commit: Sarper Akdemir 
CommitDate: Wed Apr 9 11:47:52 2025 +0200

tdf#163426 sd: notes pane: use ctrl+pgup/down for slide navigation

notes pane uses pgup & pgdown for scrolling the text inside
the pane. which blocks regular slide switching hotkeys for
impress.

add a new impress shortcut ctrl+pgup / ctrl+pgdown for going
to the next or previous slide. for consistency sake this
shortcut is not specific to notes pane but works everywhere on
impress.

make notes pane do not consume these keys so the default keys
from accelerator config takes effect.

Change-Id: I2221f90556683d1c00747ea855a7fe3a11d1a2a5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183849
Reviewed-by: Sarper Akdemir 
Tested-by: Jenkins

diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu 
b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index bcb97f01a706..a28e028ab9b6 100644
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -2983,6 +2983,12 @@ Ctrl+Shift+u aka U_SHIFT_MOD1 under GTK/IBUS is for 
unicode key input
 .uno:NextPage
   
 
+
+  
+L10N SHORTCUTS - NO 
TRANSLATE
+.uno:NextPage
+  
+
 
   
 L10N SHORTCUTS - NO 
TRANSLATE
@@ -2995,6 +3001,12 @@ Ctrl+Shift+u aka U_SHIFT_MOD1 under GTK/IBUS is for 
unicode key input
 .uno:PreviousPage
   
 
+
+  
+L10N SHORTCUTS - NO 
TRANSLATE
+.uno:PreviousPage
+  
+
 
   
 L10N SHORTCUTS - NO 
TRANSLATE
diff --git a/sd/source/ui/inc/NotesPanelViewShell.hxx 
b/sd/source/ui/inc/NotesPanelViewShell.hxx
index 39901d6e4faa..377ad68d550d 100644
--- a/sd/source/ui/inc/NotesPanelViewShell.hxx
+++ b/sd/source/ui/inc/NotesPanelViewShell.hxx
@@ -10,6 +10,7 @@
 #pragma once
 
 #include "ViewShell.hxx"
+#include "fuoltext.hxx"
 #include 
 
 class SdPage;
@@ -98,6 +99,20 @@ private:
 void Construct();
 };
 
+class FuNotesPane : public FuSimpleOutlinerText
+{
+public:
+static rtl::Reference Create(ViewShell* pViewSh, ::sd::Window* 
pWin,
+ ::sd::SimpleOutlinerView* pView, 
SdDrawDocument* pDoc,
+ SfxRequest& rReq);
+
+virtual bool KeyInput(const KeyEvent& rKEvt) override;
+
+protected:
+FuNotesPane(ViewShell* pViewShell, ::sd::Window* pWin, 
::sd::SimpleOutlinerView* pView,
+SdDrawDocument* pDoc, SfxRequest& rReq);
+};
+
 } // end of namespace sd
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/sd/source/ui/view/NotesPanelViewShell.cxx 
b/sd/source/ui/view/NotesPanelViewShell.cxx
index 2834a895b712..9936a9cb81b1 100644
--- a/sd/source/ui/view/NotesPanelViewShell.cxx
+++ b/sd/source/ui/view/NotesPanelViewShell.cxx
@@ -336,8 +336,8 @@ void NotesPanelViewShell::FuPermanent(SfxRequest& rReq)
 rOutl.GetUndoManager().Clear();
 rOutl.UpdateFields();
 
-SetCurrentFunction(FuSimpleOutlinerText::Create(
-this, GetActiveWindow(), mpNotesPanelView.get(), GetDoc(), 
rReq));
+SetCurrentFunction(FuNotesPane::Create(this, GetActiveWindow(), 
mpNotesPanelView.get(),
+   GetDoc(), rReq));
 
 rReq.Done();
 }
@@ -1470,6 +1470,41 @@ bool NotesPanelViewShell::KeyInput(const KeyEvent& 
rKEvt, ::sd::Window* pWin)
 return bReturn;
 }
 
+// FuNotesPane
+rtl::Reference FuNotesPane::Create(ViewShell* pViewSh, ::sd::Window* 
pWin,
+   ::sd::SimpleOutlinerView* pView, 
SdDrawDocument* pDoc,
+   SfxRequest& rReq)
+{
+rtl::Reference xFunc(new FuNotesPane(pViewSh, pWin, pView, pDoc, 
rReq));
+xFunc->DoExecute(rReq);
+return xFunc;
+}
+
+bool FuNotesPane::KeyInput(const KeyEvent& rKEvt)
+{
+sal_uInt16 nCode = rKEvt.GetKeyCode().GetCode();
+switch (nCode)
+{
+case KEY_PAGEUP:
+case KEY_PAGEDOWN:
+{
+// do not consume the input and let Accelerators handle 
Ctrl+PgUp/PgDown
+if (rKEvt.GetKeyCode().IsMod1())
+return false;
+break;
+}
+default:
+break;
+}
+return FuSimpleOutlinerText::KeyInput(rKEvt);
+

core.git: officecfg/registry

2025-04-08 Thread Gülşah Köse (via logerrit)

 officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit eb0a2864dce8b63d3449d54e29d5eb05abede236
Author: Gülşah Köse 
AuthorDate: Fri Mar 21 12:54:31 2025 +0300
Commit: Gülşah Köse 
CommitDate: Tue Apr 8 15:58:54 2025 +0200

ONLINE: Make Area panel visible for OLE objects

Signed-off-by: Gülşah Köse 
Change-Id: Ic4db91a7a4583c10eb62267f8bb233df661aabd5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183194
Reviewed-by: Szymon Kłos 
Tested-by: Jenkins CollaboraOffice 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183846
Tested-by: Jenkins

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
index f9a0e6ad7ffe..1823fba79cce 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
@@ -777,7 +777,7 @@
 WriterVariants, Draw,   visible ;
 WriterVariants, DrawFontwork, visible ;
 Writer, Graphic,hidden  ;
-Writer, OLE,hidden  ;
+Writer, OLE,visible ;
 Writer, Frame,  visible ;

core.git: officecfg/registry sc/inc sc/sdi sc/source sc/uiconfig

2025-04-05 Thread Ujjawal Kumar (via logerrit)

 officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu |5 +
 sc/inc/sc.hrc |1 
 sc/sdi/cellsh.sdi |1 
 sc/sdi/scalc.sdi  |   17 +++
 sc/source/ui/inc/dbfunc.hxx   |1 
 sc/source/ui/view/cellsh2.cxx |   45 
++
 sc/source/ui/view/dbfunc.cxx  |   26 +
 sc/source/ui/view/tabview3.cxx|1 
 sc/uiconfig/scalc/menubar/menubar.xml |1 
 sc/uiconfig/scalc/popupmenu/cell.xml  |1 
 10 files changed, 99 insertions(+)

New commits:
commit 6b67355f1275ea296a6a74c8f4d6a9060ff2f8a1
Author: Ujjawal Kumar 
AuthorDate: Tue Mar 11 02:12:59 2025 +0530
Commit: Heiko Tietze 
CommitDate: Thu Mar 20 17:56:24 2025 +0100

tdf#164322 Add "Clear AutoFilter" option in context menu of cells

Change-Id: Id0555f0e89e3e21010b36559bec0caefe63fe8d6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182755
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index 9d8ddf9d7f04..ae76759617f4 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -933,6 +933,11 @@
   Selection List
 
   
+  
+
+  Clear AutoFilter
+
+  
   
 
   Delete C~ells...
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index a1a8be63f46a..1749b87de475 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -629,6 +629,7 @@ static_assert(SID_PREVIEW_END < SID_KEYFUNC_START, "calc 
slots ids trampling inf
 #define SID_UNGROUP_SPARKLINES  (SID_NEW_SLOTS+115)
 #define SID_EDIT_SPARKLINE  (SID_NEW_SLOTS+116)
 #define SID_SC_OPT_LINKSTypedWhichId(SID_NEW_SLOTS + 
117)
+#define SID_CLEAR_AUTO_FILTER   (SID_NEW_SLOTS+118)
 
 // idl parameter
 
diff --git a/sc/sdi/cellsh.sdi b/sc/sdi/cellsh.sdi
index 44e87cd69119..0f16536d1c42 100644
--- a/sc/sdi/cellsh.sdi
+++ b/sc/sdi/cellsh.sdi
@@ -63,6 +63,7 @@ interface CellSelection
 FID_VALIDATION  [ ExecMethod = ExecuteDB; StateMethod = 
GetBlockState; ]
 FID_CURRENTVALIDATION   [ ExecMethod = ExecuteDB; StateMethod = 
GetBlockState; ]
 SID_TEXT_TO_COLUMNS [ ExecMethod = ExecuteDB; StateMethod = 
GetDBState; ]
+SID_CLEAR_AUTO_FILTER   [ ExecMethod = ExecuteDB; StateMethod = 
GetDBState; ]
 
 // } database operations
 
diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi
index 7fd2dd68b09e..e93e78e125e2 100644
--- a/sc/sdi/scalc.sdi
+++ b/sc/sdi/scalc.sdi
@@ -1069,6 +1069,23 @@ SfxVoidItem DataFilterRemoveFilter SID_UNFILTER
 GroupId = SfxGroupId::Data;
 ]
 
+SfxVoidItem ClearAutoFilter SID_CLEAR_AUTO_FILTER
+()
+[
+AutoUpdate = FALSE,
+FastCall = FALSE,
+ReadOnlyDoc = FALSE,
+Toggle = FALSE,
+Container = FALSE,
+RecordAbsolute = FALSE,
+RecordPerSet;
+
+AccelConfig = TRUE,
+MenuConfig = TRUE,
+ToolBoxConfig = TRUE,
+GroupId = SfxGroupId::Data;
+]
+
 
 SfxVoidItem DataFilterSpecialFilter SID_SPECIAL_FILTER
 ()
diff --git a/sc/source/ui/inc/dbfunc.hxx b/sc/source/ui/inc/dbfunc.hxx
index 9d9f5481121d..5f99c763b47a 100644
--- a/sc/source/ui/inc/dbfunc.hxx
+++ b/sc/source/ui/inc/dbfunc.hxx
@@ -58,6 +58,7 @@ public:
 
 voidToggleAutoFilter();
 voidHideAutoFilter();
+voidClearAutoFilter();
 
 voidRepeatDB( bool bRecord = true );
 
diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx
index 29d6f126b4e6..a89d1f75e245 100644
--- a/sc/source/ui/view/cellsh2.cxx
+++ b/sc/source/ui/view/cellsh2.cxx
@@ -684,6 +684,11 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
 }
 break;
 
+case SID_CLEAR_AUTO_FILTER:
+pTabViewShell->ClearAutoFilter();
+rReq.Done();
+break;
+
 case SID_AUTO_FILTER:
 pTabViewShell->ToggleAutoFilter();
 rReq.Done();
@@ -1301,6 +1306,46 @@ void ScCellShell::GetDBState( SfxItemSet& rSet )
 }
 break;
 
+case SID_CLEAR_AUTO_FILTER:
+{
+const ScTableProtection* pTabProt = 
rDoc.GetTabProtection(nTab);
+if (pTabProt && pTabProt->isProtected() && 
!pTabProt->isOptionEnabled(ScTableProtection::AUTOFILTER))
+{
+rSet.DisableItem(nWhich);
+}
+else
+{
+if (!bAutoFilterTested)
+{
+

core.git: officecfg/registry

2025-04-04 Thread Michael Weghorn (via logerrit)

 officecfg/registry/schema/org/openoffice/Office/Common.xcs |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 295fee0f78c002ca20708fdfd57d52b0e4ce0d87
Author: Michael Weghorn 
AuthorDate: Thu Apr 3 11:03:43 2025 +0200
Commit: Michael Weghorn 
CommitDate: Thu Apr 3 13:40:10 2025 +0200

tdf#164969 tdf#165297 Disable theming by default

commit 924c7de80afa47a93705e5d073c35f2d81f4ed5a
Date:   Wed Dec 25 23:13:47 2024 +0530

tdf#164393 [API CHANGE] Make the "Automatic" theme Customizable

had - among others - enabled theming by default, which
results in incorrect colors being used with at least
GTK and Qt based VCL plugins on Linux in the default
configuration, i.e. without any custom color having
been set anywhere.

As discussed in [1], disable theming again by default, by
setting the default for
`officecfg::Office::Common::Appearance::LibreOfficeTheme`
to 0 again.

This implies that custom colors for widgets cannot be
set in "Tools" -> "Options" -> "Appearance" by default
anymore.
In order to set custom colors for those, the above-mentioned
setting can still be set to 1 in the expert settings
(in which case colors can be set for the "Automatic"
theme also, which was implemented in the above-mentioned
commit).

A larger rework of the theming code is in progress,
see Sahil's WIP Gerrit change at [2].

[1] 
https://gerrit.libreoffice.org/c/core/+/183490/comments/efc32644_52e556d5
[2] https://gerrit.libreoffice.org/c/core/+/183574

Change-Id: I896b7b02a26038f094e044b56f32dbc01cf99ab5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183490
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 

diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index f84ddf2cfe2e..3b6ca946acde 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -5209,7 +5209,7 @@
 
   
 
-1
+0

core.git: officecfg/registry sw/inc sw/qa sw/sdi sw/source sw/uiconfig

2025-03-31 Thread Miklos Vajna (via logerrit)

 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |   14 
 sw/inc/cmdid.h  |1 
 sw/qa/core/edit/edit.cxx|   34 
++
 sw/sdi/docsh.sdi|5 +
 sw/sdi/swriter.sdi  |   18 
+
 sw/source/uibase/app/docsh.cxx  |1 
 sw/source/uibase/app/docsh2.cxx |   11 ++-
 sw/uiconfig/swriter/menubar/menubar.xml |1 
 8 files changed, 84 insertions(+), 1 deletion(-)

New commits:
commit 4535698e0b16bf003e8a3705e28f7347f509eb12
Author: Miklos Vajna 
AuthorDate: Mon Mar 31 09:02:59 2025 +0200
Commit: Miklos Vajna 
CommitDate: Mon Mar 31 12:25:00 2025 +0200

cool#11357 sw redline reinstate: add a reinstate-all command

Accept and reject can be invoked for all redlines in a document, the
same doesn't work with reinstate.

Additional problem is that
sw::DocumentRedlineManager::AcceptAllRedline() iterates over redlines by
consuming them, but reinstate creates new redlines, so just naively
doing the same would create an infinite loop.

Fix the problem by reusing SwEditShell::ReinstateRedlinesInSelection()
for reinstating all redlines: we can easily select the entire document
and reinstate the selection's redlines.

Change-Id: I24c84c1e5add59d94958bccff65261b5940d3104
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183530
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 93270a3c1009..19a9b4ed7f20 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -276,6 +276,20 @@
   1
 
   
+  
+
+  Reinstate All
+
+
+  Reinstate All Tracked Changes
+
+
+  Reinstate All Changes
+
+
+  1
+
+  
   
 
   Accept
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index d2322244916a..2fc80a6e3956 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -154,6 +154,7 @@ class SwUINumRuleItem;
 #define FN_TRANSFORM_DOCUMENT_STRUCTURE (FN_EDIT2 + 47) /* overwrite text of 
content control, and more*/
 #define FN_COPY_FIELD(FN_EDIT2 + 48)/* show field content 
in readonly documents to copy content*/
 #define FN_CONVERT_SEL_FIELD (FN_EDIT2 + 49)/* convert selected 
field to text */
+#define FN_REDLINE_REINSTATE_ALL (FN_EDIT2 + 50)/* redlining reinstate 
all */
 
 // Region: View
 #define FN_DRAW_WRAP_DLGTypedWhichId(FN_VIEW + 3)   /* 
Draw wrapping dlg */
diff --git a/sw/qa/core/edit/edit.cxx b/sw/qa/core/edit/edit.cxx
index cf96b865ac43..ce12c6ac3a72 100644
--- a/sw/qa/core/edit/edit.cxx
+++ b/sw/qa/core/edit/edit.cxx
@@ -367,6 +367,40 @@ CPPUNIT_TEST_FIXTURE(Test, testRedlineReinstateAndNext)
 CPPUNIT_ASSERT_EQUAL(static_cast(4), rRedlines.size());
 }
 
+CPPUNIT_TEST_FIXTURE(Test, testRedlineReinstateAll)
+{
+// Given a document with two deletions:
+createSwDoc();
+SwWrtShell* pWrtShell = getSwDocShell()->GetWrtShell();
+pWrtShell->Insert("abbcdde");
+SwModule* pModule = SwModule::get();
+pModule->SetRedlineAuthor("Alice");
+RedlineFlags nMode = pWrtShell->GetRedlineFlags();
+pWrtShell->SetRedlineFlags(nMode | RedlineFlags::On);
+pWrtShell->Left(SwCursorSkipMode::Chars, /*bSelect=*/false, 1, 
/*bBasicCall=*/false);
+pWrtShell->Left(SwCursorSkipMode::Chars, /*bSelect=*/true, 2, 
/*bBasicCall=*/false);
+pWrtShell->DelRight();
+pWrtShell->Left(SwCursorSkipMode::Chars, /*bSelect=*/false, 3, 
/*bBasicCall=*/false);
+pWrtShell->Left(SwCursorSkipMode::Chars, /*bSelect=*/true, 2, 
/*bBasicCall=*/false);
+pWrtShell->DelRight();
+pWrtShell->SetRedlineFlags(nMode);
+
+// When a 2nd user does reinstate-all:
+pModule->SetRedlineAuthor("Bob");
+pWrtShell->SttPara(/*bSelect=*/false);
+dispatchCommand(mxComponent, ".uno:ReinstateAllTrackedChanges", {});
+
+// Then make sure we have insertions for both deletions:
+SwDoc* pDoc = pWrtShell->GetDoc();
+IDocumentRedlineAccess& rIDRA = pDoc->getIDocumentRedlineAccess();
+SwRedlineTable& rRedlines = rIDRA.GetRedlineTable();
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected: 4
+// - Actual  : 2
+// i.e. reinstate-all didn't create insert redlines.
+CPPUNIT_ASSERT_EQUAL(static_cast(4), rRedlines.size());
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=bre

core.git: officecfg/registry

2025-03-29 Thread Andrea Gelmini (via logerrit)

 officecfg/registry/schema/org/openoffice/Office/UI.xcs |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 720d58ad7f86bd0262a83eeebac6b61e19b55e69
Author: Andrea Gelmini 
AuthorDate: Sat Mar 29 20:32:54 2025 +0100
Commit: Julien Nabet 
CommitDate: Sat Mar 29 21:30:54 2025 +0100

Fix typo

Change-Id: Ief3e82b05c547e1ce30fcdaaba9ed9e765999eba
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183492
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/officecfg/registry/schema/org/openoffice/Office/UI.xcs 
b/officecfg/registry/schema/org/openoffice/Office/UI.xcs
index 1716cee951a4..85c3999bb851 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI.xcs
@@ -1603,7 +1603,7 @@
   
   
 
-  Contains the flags controlling if a filter fialog should be 
shown for a given filter. The default is true.
+  Contains the flags controlling if a filter dialog should be 
shown for a given filter. The default is true.
   Should the settings dialog be shown for this filter

core.git: officecfg/registry sc/inc sc/source sc/uiconfig

2025-03-28 Thread Shardul Vikram Singh (via logerrit)

 officecfg/registry/schema/org/openoffice/Office/Calc.xcs |   11 
 sc/inc/scabstdlg.hxx |1 
 sc/source/ui/attrdlg/scdlgfact.cxx   |1 
 sc/source/ui/dbgui/textimportoptions.cxx |6 --
 sc/source/ui/inc/textimportoptions.hxx   |2 
 sc/source/ui/inc/viewfunc.hxx|8 +--
 sc/source/ui/view/cliputil.cxx   |2 
 sc/source/ui/view/viewfun3.cxx   |8 +--
 sc/source/ui/view/viewfun5.cxx   |   35 ++-
 sc/uiconfig/scalc/ui/textimportoptions.ui|   16 --
 10 files changed, 34 insertions(+), 56 deletions(-)

New commits:
commit fec431aeef76e2f4e21dca8ef55f6807b5ad228d
Author: Shardul Vikram Singh 
AuthorDate: Fri Feb 7 02:24:58 2025 +0530
Commit: Heiko Tietze 
CommitDate: Fri Mar 28 17:52:49 2025 +0100

tdf#65872 Remove import dialog for normal paste in Calc

Remove the import dialog when performing a normal paste.
Show the dialog only for Paste Special to avoid unnecessary interruptions.
For normal paste, use the last selected preferences from Paste Special.

Change-Id: Idfc985b9c13cb3b995c91e947e815d1789e6f041
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181225
Reviewed-by: Heiko Tietze 
Tested-by: Jenkins

diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index 98e1afc76b89..9d3da5ee9d83 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -1207,6 +1207,17 @@
   
 
   
+  
+
+  0 
+
+
+  false
+
+
+  false
+
+  
   
 
   Contains setting for Text to Columns Import
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 245869363f2e..8d46f1b3a2dc 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -396,7 +396,6 @@ public:
 virtual LanguageType GetLanguageType() const = 0;
 virtual bool IsDateConversionSet() const = 0;
 virtual bool IsScientificConversionSet() const = 0;
-virtual bool IsKeepAskingSet() const = 0;
 };
 
 class AbstractScGoToTabDlg : public VclAbstractDialog
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx 
b/sc/source/ui/attrdlg/scdlgfact.cxx
index 2dc64da32d5f..637c9ae58d78 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -131,7 +131,6 @@ public:
 LanguageType GetLanguageType() const override { return 
m_pDlg->getLanguageType(); }
 bool IsDateConversionSet() const override { return 
m_pDlg->isDateConversionSet(); }
 bool IsScientificConversionSet() const override { return 
m_pDlg->isScientificConversionSet(); }
-bool IsKeepAskingSet() const override { return m_pDlg->isKeepAskingSet(); }
 };
 }
 
diff --git a/sc/source/ui/dbgui/textimportoptions.cxx 
b/sc/source/ui/dbgui/textimportoptions.cxx
index b91f8eb6d1bd..84521cb216f3 100644
--- a/sc/source/ui/dbgui/textimportoptions.cxx
+++ b/sc/source/ui/dbgui/textimportoptions.cxx
@@ -32,7 +32,6 @@ ScTextImportOptionsDlg::ScTextImportOptionsDlg(weld::Window* 
pParent)
 , m_xRbCustom(m_xBuilder->weld_radio_button(u"custom"_ustr))
 , m_xCkbConvertDate(m_xBuilder->weld_check_button(u"convertdata"_ustr))
 , 
m_xCkbConvertScientific(m_xBuilder->weld_check_button(u"convertscientificnotation"_ustr))
-, m_xCkbKeepAsking(m_xBuilder->weld_check_button(u"keepasking"_ustr))
 , m_xLbCustomLang(new 
SvxLanguageBox(m_xBuilder->weld_combo_box(u"lang"_ustr)))
 {
 init();
@@ -60,11 +59,6 @@ bool ScTextImportOptionsDlg::isScientificConversionSet() 
const
 return m_xCkbConvertScientific->get_active();
 }
 
-bool ScTextImportOptionsDlg::isKeepAskingSet() const
-{
-return m_xCkbKeepAsking->get_active();
-}
-
 void ScTextImportOptionsDlg::init()
 {
 m_xBtnOk->connect_clicked(LINK(this, ScTextImportOptionsDlg, OKHdl));
diff --git a/sc/source/ui/inc/textimportoptions.hxx 
b/sc/source/ui/inc/textimportoptions.hxx
index 7a2cfb6df589..b12b58a26990 100644
--- a/sc/source/ui/inc/textimportoptions.hxx
+++ b/sc/source/ui/inc/textimportoptions.hxx
@@ -33,7 +33,6 @@ public:
 LanguageType getLanguageType() const;
 bool isDateConversionSet() const;
 bool isScientificConversionSet() const;
-bool isKeepAskingSet() const;
 
 private:
 void init();
@@ -44,7 +43,6 @@ private:
 std::unique_ptr m_xRbCustom;
 std::unique_ptr m_xCkbConvertDate;
 std::unique_ptr m_xCkbConvertScientific;
-std::unique_ptr m_xCkbKeepAsking;
 std::unique_ptr m_xLbCustomLang;
 
 DECL_LINK(OKHdl, weld::Button&, void);
diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx
index ef3c9e2311b0..36cbb20853e8 100644
--- a/sc/source/ui/inc/viewfunc.hxx
+++ b/sc/source/u

core.git: officecfg/registry sw/inc sw/qa sw/sdi sw/source sw/uiconfig

2025-03-28 Thread Miklos Vajna (via logerrit)

 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |   11 ++
 sw/inc/cmdid.h  |2 
 sw/qa/core/edit/edit.cxx|   37 
++
 sw/sdi/_viewsh.sdi  |6 +
 sw/sdi/swriter.sdi  |   19 
+
 sw/source/uibase/uiview/view2.cxx   |   10 +-
 sw/source/uibase/uiview/viewstat.cxx|1 
 sw/uiconfig/swriter/menubar/menubar.xml |1 
 8 files changed, 83 insertions(+), 4 deletions(-)

New commits:
commit 1926105b47df7b15dd34a8c1135f83b936bf9926
Author: Miklos Vajna 
AuthorDate: Thu Mar 27 08:58:55 2025 +0100
Commit: Miklos Vajna 
CommitDate: Fri Mar 28 09:52:37 2025 +0100

cool#11357 sw redline reinstate: add a reinstate-and-next command

Accept and reject has a way to do their action & move to the next
redline, reinstate is missing this combo.

This is because these versions are separate UNO commands and reinstate
just has the direct .uno:ReinstateTrackedChange.

Fix the problem by adding a new .uno:ReinstateTrackedChangeToNext that
does this, together with the command state.

Also add it to the menubar.

Change-Id: Ica2358b3fc38cc66e801292ab13f8ba3ec4e9ece
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183410
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 25d5472d8ec0..93270a3c1009 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -251,6 +251,17 @@
   1
 
   
+  
+
+  Reinstate and Move to Next
+
+
+  Reinstate Track Change and select the next 
one
+
+
+  1
+
+  
   
 
   Reject All
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index 70dd4728e9f3..d2322244916a 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -144,7 +144,7 @@ class SwUINumRuleItem;
 #define FN_REDLINE_ACCEPT_DIRECT (FN_EDIT2 + 37)/* accept redline at 
current position*/
 #define FN_REDLINE_REJECT_DIRECT (FN_EDIT2 + 38)/* reject redline at 
current position*/
 #define FN_REDLINE_REINSTATE_DIRECT  (FN_EDIT2 + 39)/* reinstate redline 
at current position*/
-// free
+#define FN_REDLINE_REINSTATE_TONEXT  (FN_EDIT2 + 40)/* reinstate redline 
and jump to next */
 #define FN_REDLINE_NEXT_CHANGE   (FN_EDIT2 + 41)/* Go to the next 
change */
 #define FN_REDLINE_PREV_CHANGE   (FN_EDIT2 + 42)/* Go to the previous 
change */
 #define FN_REDLINE_ACCEPT_ALL(FN_EDIT2 + 43)/* Redlining Accept 
All*/
diff --git a/sw/qa/core/edit/edit.cxx b/sw/qa/core/edit/edit.cxx
index 3bf605e565f0..cf96b865ac43 100644
--- a/sw/qa/core/edit/edit.cxx
+++ b/sw/qa/core/edit/edit.cxx
@@ -330,6 +330,43 @@ CPPUNIT_TEST_FIXTURE(Test, 
testRedlineReinstateDeletesInSelection)
 CPPUNIT_ASSERT_EQUAL(RedlineType::Insert, rRedlineData4.GetType());
 }
 
+CPPUNIT_TEST_FIXTURE(Test, testRedlineReinstateAndNext)
+{
+// Given a document with two deletions:
+createSwDoc();
+SwWrtShell* pWrtShell = getSwDocShell()->GetWrtShell();
+pWrtShell->Insert("abbcdde");
+SwModule* pModule = SwModule::get();
+pModule->SetRedlineAuthor("Alice");
+RedlineFlags nMode = pWrtShell->GetRedlineFlags();
+pWrtShell->SetRedlineFlags(nMode | RedlineFlags::On);
+pWrtShell->Left(SwCursorSkipMode::Chars, /*bSelect=*/false, 1, 
/*bBasicCall=*/false);
+pWrtShell->Left(SwCursorSkipMode::Chars, /*bSelect=*/true, 2, 
/*bBasicCall=*/false);
+pWrtShell->DelRight();
+pWrtShell->Left(SwCursorSkipMode::Chars, /*bSelect=*/false, 3, 
/*bBasicCall=*/false);
+pWrtShell->Left(SwCursorSkipMode::Chars, /*bSelect=*/true, 2, 
/*bBasicCall=*/false);
+pWrtShell->DelRight();
+pWrtShell->SetRedlineFlags(nMode);
+
+// When a 2nd user moves into the first deletion and does 
reinstate-and-next twice:
+pModule->SetRedlineAuthor("Bob");
+pWrtShell->SttPara(/*bSelect=*/false);
+pWrtShell->Right(SwCursorSkipMode::Chars, /*bSelect=*/false, 2, 
/*bBasicCall=*/false);
+dispatchCommand(mxComponent, ".uno:ReinstateTrackedChangeToNext", {});
+// Again, without an explicit cursor move:
+dispatchCommand(mxComponent, ".uno:ReinstateTrackedChangeToNext", {});
+
+// Then make sure we have insertions for both deletions:
+SwDoc* pDoc = pWrtShell->GetDoc();
+IDocumentRedlineAccess& rIDRA = pDoc->getIDocumentRedlineAccess();
+SwRedlineTable& rRedlines = rIDRA.GetRedlineTable();
+// Without the accompanying fix in place, this test would have

core.git: officecfg/registry vcl/osx

2025-03-25 Thread Patrick Luby (via logerrit)

 officecfg/registry/schema/org/openoffice/Office/Common.xcs |8 ++
 vcl/osx/salframeview.mm|   15 +
 vcl/osx/salmenu.cxx|   13 +++
 3 files changed, 32 insertions(+), 4 deletions(-)

New commits:
commit e8f8af2b9872ff8ce646a0278f142cdb5c4005f7
Author: Patrick Luby 
AuthorDate: Sat Mar 22 19:41:58 2025 -0400
Commit: Patrick Luby 
CommitDate: Sun Mar 23 19:34:16 2025 +0100

Related: tdf#128186 force key window to a native full screen window

AquaSalMenu::setDefaultMenu() is generally called when the key
window has been closed. When not in native full screen mode,
macOS appears to automatically set the key window.

However, closing a native full screen window sometimes causes
the application to drop out of full screen mode even if there
are still native full screen windows open. So, if the application
is active, activate all windows to force macOS to set the key
to a window rather than leaving the application in a state where
the key window is nil.

Also, add a EnableNativeFullScreenWindows expert preference so that
users can disable native full screen mode and make the green button
in the titlebar zoom instead of switching to a full screen window.

Change-Id: I3d9c538d784d7abcd5e75975ea00582768851ec7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183229
Tested-by: Jenkins
Reviewed-by: Patrick Luby 

diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 969df405cc10..75d1caf3a627 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -702,6 +702,14 @@
 15
   
   
+
+  
+ Specifies if clicking the green button in a window's
+ titlebar causes the window to switch to native full screen
+ mode.
+  
+  true
+
 
   
  Specifies if the Command, Option, Control, and Shift keys
diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm
index 74da526f6ba4..939f230ee8ef 100644
--- a/vcl/osx/salframeview.mm
+++ b/vcl/osx/salframeview.mm
@@ -320,12 +320,19 @@ static void updateMenuBarVisibility( const AquaSalFrame 
*pFrame )
  defer: Application::IsHeadlessModeEnabled()];
 
 // Enable fullscreen options if available and useful
-bool bAllowFullScreen = (SalFrameStyleFlags::NONE == (mpFrame->mnStyle & 
(SalFrameStyleFlags::DIALOG | SalFrameStyleFlags::TOOLTIP | 
SalFrameStyleFlags::SYSTEMCHILD | SalFrameStyleFlags::FLOAT | 
SalFrameStyleFlags::TOOLWINDOW | SalFrameStyleFlags::INTRO)));
-bAllowFullScreen &= (SalFrameStyleFlags::NONE == (~mpFrame->mnStyle & 
SalFrameStyleFlags::SIZEABLE));
-bAllowFullScreen &= (mpFrame->mpParent == nullptr);
+if ( 
officecfg::Office::Common::VCL::macOS::EnableNativeFullScreenWindows::get() )
+{
+bool bAllowFullScreen = (SalFrameStyleFlags::NONE == (mpFrame->mnStyle 
& (SalFrameStyleFlags::DIALOG | SalFrameStyleFlags::TOOLTIP | 
SalFrameStyleFlags::SYSTEMCHILD | SalFrameStyleFlags::FLOAT | 
SalFrameStyleFlags::TOOLWINDOW | SalFrameStyleFlags::INTRO)));
+bAllowFullScreen &= (SalFrameStyleFlags::NONE == (~mpFrame->mnStyle & 
SalFrameStyleFlags::SIZEABLE));
+bAllowFullScreen &= (mpFrame->mpParent == nullptr);
+[pNSWindow setCollectionBehavior: (bAllowFullScreen ? 
NSWindowCollectionBehaviorFullScreenPrimary : 
NSWindowCollectionBehaviorFullScreenAuxiliary)];
+}
+else
+{
+[pNSWindow setCollectionBehavior: 
NSWindowCollectionBehaviorFullScreenNone];
+}
 
 [pNSWindow setReleasedWhenClosed: NO];
-[pNSWindow setCollectionBehavior: (bAllowFullScreen ? 
NSWindowCollectionBehaviorFullScreenPrimary : 
NSWindowCollectionBehaviorFullScreenAuxiliary)];
 
 // Disable window restoration until we support it directly
 [pNSWindow setRestorable: NO];
diff --git a/vcl/osx/salmenu.cxx b/vcl/osx/salmenu.cxx
index a14f1874c83e..8200af5663a9 100644
--- a/vcl/osx/salmenu.cxx
+++ b/vcl/osx/salmenu.cxx
@@ -400,6 +400,19 @@ void AquaSalMenu::setDefaultMenu()
 if( [pItem menu] == nil )
 [pMenu insertItem: pItem atIndex: i+1];
 }
+
+// Related: tdf#128186 force key window to a native full screen window
+// AquaSalMenu::setDefaultMenu() is generally called when the key
+// window has been closed. When not in native full screen mode,
+// macOS appears to automatically set the key window.
+// However, closing a native full screen window sometimes causes
+// the application to drop out of full screen mode even if there
+// are still native full screen windows open. So, if the application
+// is active, activate all windows to force macOS to set the key
+// t

core.git: officecfg/registry stoc/source

2025-03-25 Thread prrvchr (via logerrit)

 officecfg/registry/schema/org/openoffice/Office/Java.xcs |   19 ++
 stoc/source/javavm/javavm.cxx|  117 ++-
 2 files changed, 101 insertions(+), 35 deletions(-)

New commits:
commit fabdac1af8d30f849a94defd516d6699945f908d
Author: prrvchr 
AuthorDate: Mon Mar 24 21:32:21 2025 +0100
Commit: Stephan Bergmann 
CommitDate: Tue Mar 25 14:30:56 2025 +0100

tdf#165774 Support for Java instrumentation

Change-Id: I5323eaba60a1dbc6b872550dbbfed0fe989bcd11
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183280
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/officecfg/registry/schema/org/openoffice/Office/Java.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Java.xcs
index e224edc1b251..1be106081b35 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Java.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Java.xcs
@@ -19,6 +19,19 @@
 
 http://openoffice.org/2001/registry"; 
xmlns:xs="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; oor:name="Java" 
oor:package="org.openoffice.Office" xml:lang="en-US">
   
+  
+
+  
+Contains the Java instrumentation agents archives loaded at JVM 
startup.
+  
+  
+
+  An extension can load its own Java instrumentation agent with 
the value: %origin%/lib/myagent.jar.
+  Java instrumentation agent archive URL
+
+  
+
+  
   
 
   
@@ -63,6 +76,12 @@
 
 false
   
+  
+
+  Specifies the Java archives from which the instrumentation 
agents will be loaded at JVM startup.
+  Java instrumentation agent archives
+
+  
 
   
 
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx
index 3aeb7c33ff3f..e86c98c9f22b 100644
--- a/stoc/source/javavm/javavm.cxx
+++ b/stoc/source/javavm/javavm.cxx
@@ -25,6 +25,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -54,6 +55,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -321,34 +323,81 @@ void getDefaultLocaleFromConfig(
 }
 
 /// @throws css::uno::Exception
-void getJavaPropsFromSafetySettings(
+void getJavaPropsFromJavaSettings(
 stoc_javavm::JVM * pjvm,
-const css::uno::Reference & xSMgr,
 const css::uno::Reference &xCtx)
 {
-css::uno::Reference xConfRegistry =
-xSMgr->createInstanceWithContext(
-u"com.sun.star.configuration.ConfigurationRegistry"_ustr,
-xCtx);
-if(!xConfRegistry.is())
+css::uno::Reference xConfigProvider(
+xCtx->getValueByName(
+u"/singletons/com.sun.star.configuration.theDefaultProvider"_ustr),
+css::uno::UNO_QUERY);
+
+if (!xConfigProvider.is())
 throw css::uno::RuntimeException(
-u"javavm.cxx: couldn't get ConfigurationRegistry"_ustr, nullptr);
+u"javavm.cxx: couldn't get ConfigurationProvider"_ustr, nullptr);
 
-css::uno::Reference xConfRegistry_simple(
-xConfRegistry, css::uno::UNO_QUERY_THROW);
-xConfRegistry_simple->open(
-u"org.openoffice.Office.Java"_ustr,
-true, false);
-css::uno::Reference xRegistryRootKey =
-xConfRegistry_simple->getRootKey();
+css::beans::NamedValue aPath(u"nodepath"_ustr, 
css::uno::Any(u"org.openoffice.Office.Java/VirtualMachine"_ustr));
+css::uno::Sequence aArguments{ css::uno::Any(aPath) };
+
+css::uno::Reference 
xConfigAccess(xConfigProvider->createInstanceWithArguments(
+u"com.sun.star.configuration.ConfigurationAccess"_ustr,
+aArguments),
+css::uno::UNO_QUERY);
 
-if (xRegistryRootKey.is())
+if (!xConfigAccess.is())
+throw css::uno::RuntimeException(
+u"javavm.cxx: couldn't get ConfigurationAccess"_ustr, nullptr);
+
+if (xConfigAccess->hasByName(u"InstrumentationAgents"_ustr))
 {
-css::uno::Reference key_NetAccess= 
xRegistryRootKey->openKey(u"VirtualMachine/NetAccess"_ustr);
-if (key_NetAccess.is()
-&& key_NetAccess->getValueType() != 
css::registry::RegistryValueType_NOT_DEFINED)
+css::uno::Reference xAgentAccess;
+xConfigAccess->getByName(u"InstrumentationAgents"_ustr) >>= 
xAgentAccess;
+if (xAgentAccess.is() && xAgentAccess->hasElements())
+{
+OUString sScheme(u"vnd.sun.star.expand:"_ustr);
+css::uno::Reference exp = 
css::util::theMacroExpander::get(xCtx);
+css::uno::Sequence aAgents = 
xAgentAccess->getElementNames();
+for (auto const & sAgent : aAgents)
+{
+css::uno::Reference xAgent;
+xAgentAccess->getByName(sAgent) >>= xAgent;
+if (!xAgent->hasByName(u"URL"_ustr))
+{
+SAL_WARN("stoc.java", "Cant retrieve URL property from 
InstrumentationAgent: " << sAgent);
+

core.git: officecfg/registry

2025-03-24 Thread Oliver Specht (via logerrit)

 officecfg/registry/data/org/openoffice/Office/Accelerators.xcu |   36 
++
 1 file changed, 36 insertions(+)

New commits:
commit fadcf3d1a48ed04308518772a1e7840ff18089f9
Author: Oliver Specht 
AuthorDate: Mon Mar 24 13:38:24 2025 +0100
Commit: Gabor Kelemen 
CommitDate: Mon Mar 24 21:01:07 2025 +0100

tdf#165829 Shortcut Shift+Ctrl+F2 assigned to ConvertFieldToText

Change-Id: I42af5bc081e6618789988446d9011f78541b599d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183263
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen 

diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu 
b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index 34c36d977605..bcb97f01a706 100644
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -2421,6 +2421,12 @@ Ctrl+Shift+u aka U_SHIFT_MOD1 under GTK/IBUS is for 
unicode key input
 .uno:InsertField
   
 
+
+  
+L10N SHORTCUTS - NO 
TRANSLATE
+.uno:ConvertSelectedField
+  
+
 
   
 L10N SHORTCUTS - NO 
TRANSLATE
@@ -3925,6 +3931,12 @@ Ctrl+Shift+u aka U_SHIFT_MOD1 under GTK/IBUS is for 
unicode key input
 .uno:InsertField
   
 
+
+  
+L10N SHORTCUTS - NO 
TRANSLATE
+.uno:ConvertSelectedField
+  
+
 
   
 L10N SHORTCUTS - NO 
TRANSLATE
@@ -4712,6 +4724,12 @@ Ctrl+Shift+u aka U_SHIFT_MOD1 under GTK/IBUS is for 
unicode key input
 .uno:InsertField
   
 
+
+  
+L10N SHORTCUTS - NO 
TRANSLATE
+.uno:ConvertSelectedField
+  
+
 
   
 L10N SHORTCUTS - NO 
TRANSLATE
@@ -5492,6 +5510,12 @@ Ctrl+Shift+u aka U_SHIFT_MOD1 under GTK/IBUS is for 
unicode key input
 .uno:InsertField
   
 
+
+  
+L10N SHORTCUTS - NO 
TRANSLATE
+.uno:ConvertSelectedField
+  
+
 
   
 L10N SHORTCUTS - NO 
TRANSLATE
@@ -6380,6 +6404,12 @@ Ctrl+Shift+u aka U_SHIFT_MOD1 under GTK/IBUS is for 
unicode key input
 .uno:InsertField
   
 
+
+  
+L10N SHORTCUTS - NO 
TRANSLATE
+.uno:ConvertSelectedField
+  
+
 
   
 L10N SHORTCUTS - NO 
TRANSLATE
@@ -7234,6 +7264,12 @@ Ctrl+Shift+u aka U_SHIFT_MOD1 under GTK/IBUS is for 
unicode key input
 .uno:InsertField
   
 
+
+  
+L10N SHORTCUTS - NO 
TRANSLATE
+.uno:ConvertSelectedField
+  
+
 
   
 L10N SHORTCUTS - NO 
TRANSLATE

core.git: officecfg/registry sw/inc sw/qa sw/sdi sw/source

2025-03-19 Thread Miklos Vajna (via logerrit)

 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |   14 +++
 sw/inc/cmdid.h  |2 
 sw/inc/editsh.hxx   |1 
 sw/inc/swmodule.hxx |2 
 sw/qa/core/edit/edit.cxx|   39 
++
 sw/sdi/_viewsh.sdi  |6 +
 sw/sdi/swriter.sdi  |   19 
 sw/source/core/edit/edredln.cxx |   23 
+
 sw/source/uibase/uiview/view2.cxx   |5 +
 9 files changed, 109 insertions(+), 2 deletions(-)

New commits:
commit 7af8b3d3305fe8344cb9339269c5dc3f1cd44650
Author: Miklos Vajna 
AuthorDate: Tue Mar 18 08:49:46 2025 +0100
Commit: Miklos Vajna 
CommitDate: Wed Mar 19 14:42:04 2025 +0100

cool#11357 sw redline reinstate: implement this for a single insert

When reviewing a document with tracked changes, sometimes we want to
reject a change with history, which is currently hard to do on the UI.

For a single insert, a workaround is to select the insert redline and
then press delete, that'll create a delete redline on top of the insert
one.

Fix the problem by adding a new .uno:ReinstateTrackedChange UNO command
that does this for the insert redline under cursor.

More cases (e.g. handle all selected insert redlines) are still to be
handled.

Change-Id: I61dbe38bcfffc9a0a9cf009531d8bf28cfd1e13b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183115
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index ef3152896a4d..25d5472d8ec0 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -304,6 +304,20 @@
   1
 
   
+  
+
+  Reinstate
+
+
+  Reinstate Track Change
+
+
+  Reinstate Change
+
+
+  1
+
+  
   
 
   Next
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index 079f0d0f00bf..70dd4728e9f3 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -143,7 +143,7 @@ class SwUINumRuleItem;
 #define FN_NUM_CONTINUE  (FN_EDIT2 + 36)/* continue previous 
numbering */
 #define FN_REDLINE_ACCEPT_DIRECT (FN_EDIT2 + 37)/* accept redline at 
current position*/
 #define FN_REDLINE_REJECT_DIRECT (FN_EDIT2 + 38)/* reject redline at 
current position*/
-// free
+#define FN_REDLINE_REINSTATE_DIRECT  (FN_EDIT2 + 39)/* reinstate redline 
at current position*/
 // free
 #define FN_REDLINE_NEXT_CHANGE   (FN_EDIT2 + 41)/* Go to the next 
change */
 #define FN_REDLINE_PREV_CHANGE   (FN_EDIT2 + 42)/* Go to the previous 
change */
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 6ad93013acca..c9444a3e0f78 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -959,6 +959,7 @@ public:
 SW_DLLPUBLIC bool RejectRedline( SwRedlineTable::size_type nPos );
 bool AcceptRedlinesInSelection();
 bool RejectRedlinesInSelection();
+void ReinstateRedline(SwRedlineTable::size_type nPos);
 
 /** Search Redline for this Data and @return position in array.
  If not found, return SwRedlineTable::npos. */
diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx
index 6d39a3dc76c5..6199f964d2fe 100644
--- a/sw/inc/swmodule.hxx
+++ b/sw/inc/swmodule.hxx
@@ -204,7 +204,7 @@ public:
 /// See SwXTextDocument::getTrackedChangeAuthors().
 voidGetRedlineAuthorInfo(tools::JsonWriter& rJsonWriter);
 std::size_t InsertRedlineAuthor(const OUString& rAuthor);
-voidSetRedlineAuthor(const OUString& rAuthor); // for unit 
tests
+SW_DLLPUBLIC void   SetRedlineAuthor(const OUString& rAuthor); // for unit 
tests
 
 voidGetInsertAuthorAttr(std::size_t nAuthor, SfxItemSet 
&rSet);
 voidGetDeletedAuthorAttr(std::size_t nAuthor, SfxItemSet 
&rSet);
diff --git a/sw/qa/core/edit/edit.cxx b/sw/qa/core/edit/edit.cxx
index b8ad7ff58743..10705063a001 100644
--- a/sw/qa/core/edit/edit.cxx
+++ b/sw/qa/core/edit/edit.cxx
@@ -13,6 +13,9 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
 
 namespace
 {
@@ -78,6 +81,42 @@ CPPUNIT_TEST_FIXTURE(Test, testDeleteSelNormalize)
 CPPUNIT_ASSERT_EQUAL(nExpectedCharPos, rCursor.nContent.GetIndex());
 }
 
+CPPUNIT_TEST_FIXTURE(Test, testRedlineReinstateSingleInsert)
+{
+// Given a document with a single insertion:
+createSwDoc();
+SwWrtShell* pWrtShell = getSwDocShell()->GetWrtShell();
+pWrtShel

core.git: officecfg/registry sw/inc sw/sdi sw/source sw/uiconfig

2025-03-19 Thread Ujjawal Kumar (via logerrit)

 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |8 ++
 sw/inc/cmdid.h  |1 
 sw/sdi/_tabsh.sdi   |5 +
 sw/sdi/swriter.sdi  |   18 
++
 sw/source/uibase/shells/tabsh.cxx   |   27 
++
 sw/uiconfig/swriter/popupmenu/table.xml |1 
 6 files changed, 60 insertions(+)

New commits:
commit 1b03f6ea0362a38c6c4e5e767fcb5cf87ddd28dd
Author: Ujjawal Kumar 
AuthorDate: Thu Mar 13 20:42:21 2025 +0530
Commit: Heiko Tietze 
CommitDate: Wed Mar 19 12:17:58 2025 +0100

tdf#149825 Add command to insert a paragraph break before table

Change-Id: I7af1a4bba7222f7989aa99bc158f6e4081aad226
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182873
Reviewed-by: Heiko Tietze 
Tested-by: Jenkins

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index d012861cf696..ef3152896a4d 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -1583,6 +1583,14 @@
   1
 
   
+  
+
+  Insert Paragraph Break Above Table
+
+
+  Inserts a paragraph break above the table if 
it is the first element in the page.
+
+  
   
 
   ~Footnote/Endnote Settings...
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index 9baa9c18f86a..079f0d0f00bf 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -420,6 +420,7 @@ class SwUINumRuleItem;
 #define FN_CONVERT_TEXT_TO_TABLE(FN_FORMAT + 131)  /* convert selected 
text to table */
 #define FN_CONVERT_TABLE_TO_TEXT(FN_FORMAT + 132)  /* convert a table to 
text */
 #define FN_TABLE_SORT_DIALOG(FN_FORMAT + 133)  /* sorting in tables*/
+#define FN_BREAK_ABOVE_TABLE(FN_FORMAT + 134)
 
 // Region: Page Template
 #define FN_PAGE_STYLE_SET_LR_MARGIN (FN_FORMAT + 130) /* left / right margin */
diff --git a/sw/sdi/_tabsh.sdi b/sw/sdi/_tabsh.sdi
index 7596d2c29bda..f173f15daaa7 100644
--- a/sw/sdi/_tabsh.sdi
+++ b/sw/sdi/_tabsh.sdi
@@ -24,6 +24,11 @@ interface BaseTextTable
 ExecMethod = Execute ;
 StateMethod = NoState ;
 ]
+FN_BREAK_ABOVE_TABLE
+[
+ExecMethod = Execute ;
+StateMethod = GetState ;
+]
 SID_ATTR_BRUSH
 [
 ExecMethod = Execute ;
diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index 6fd96a160846..cbc33ee85e34 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -6454,6 +6454,24 @@ SfxVoidItem TableDialog FN_FORMAT_TABLE_DLG
 GroupId = SfxGroupId::Table;
 ]
 
+SfxVoidItem BreakAboveTable FN_BREAK_ABOVE_TABLE
+()
+[
+AutoUpdate = FALSE,
+FastCall = TRUE,
+ReadOnlyDoc = FALSE,
+Toggle = FALSE,
+Container = FALSE,
+RecordAbsolute = FALSE,
+RecordPerItem;
+Asynchron;
+
+AccelConfig = TRUE,
+MenuConfig = TRUE,
+ToolBoxConfig = TRUE,
+GroupId = SfxGroupId::Table;
+]
+
 SfxBoolItem TableModeFix FN_TABLE_MODE_FIX
 ()
 [
diff --git a/sw/source/uibase/shells/tabsh.cxx 
b/sw/source/uibase/shells/tabsh.cxx
index 3664e17c50de..6ebf4b9e1063 100644
--- a/sw/source/uibase/shells/tabsh.cxx
+++ b/sw/source/uibase/shells/tabsh.cxx
@@ -73,6 +73,9 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -598,6 +601,12 @@ void SwTableShell::Execute(SfxRequest &rReq)
 case FN_INSERT_TABLE:
 InsertTable( rReq );
 break;
+case FN_BREAK_ABOVE_TABLE:
+{
+rSh.MoveTable( GotoCurrTable, fnTableStart );
+rSh.SplitNode( false );
+break;
+}
 case FN_FORMAT_TABLE_DLG:
 {
 //#127012# get the bindings before the dialog is called
@@ -1539,7 +1548,25 @@ void SwTableShell::GetState(SfxItemSet &rSet)
 rSet.Put(SfxBoolItem(nSlot, bSet));
 }
 break;
+case FN_BREAK_ABOVE_TABLE:
+{
+// exec just moves on top and adds the break, which 
however makes only sense if the table
+// is the very first item of the document; the command 
should be hidden otherwise
+SwContentFrame* curFrame = rSh.GetCurrFrame();
+SwPageFrame* pageFrame = curFrame->FindPageFrame();
+SwFrame* frame = pageFrame->Lower();
 
+while(!frame->IsContentFrame())
+{
+frame = frame->GetLower();
+}
+
+if(frame->FindTabFrame() != curFrame->FindTabFrame())
+{
+rSet.DisableItem(nSlot);
+

core.git: officecfg/registry

2025-03-19 Thread Miklos Vajna (via logerrit)

 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |   18 
+-
 1 file changed, 9 insertions(+), 9 deletions(-)

New commits:
commit c4c399219932318e04ee98fa89b0a59b56b855e9
Author: Miklos Vajna 
AuthorDate: Wed Mar 19 09:31:46 2025 +0100
Commit: Miklos Vajna 
CommitDate: Wed Mar 19 10:34:26 2025 +0100

officecfg: fix indent

After commit e846c8e5ed07e6b67a4375dd8ab4d4ca30fd9066 (tdf#45946 Add
function to convert field to text, 2025-03-17).

Change-Id: I58f1ade9f208475378404feb5d94ea4a00d023bb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183117
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index a3399fd6466a..d012861cf696 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -1757,15 +1757,15 @@
   1
 
   
-
-
-Convert Field To Text
-
-
-1
-
-
-
+  
+
+  Convert Field To Text
+
+
+  1
+
+  
+  
 
   E~xternal Links...

core.git: officecfg/registry vcl/osx

2025-03-18 Thread Patrick Luby (via logerrit)

 officecfg/registry/schema/org/openoffice/Office/Common.xcs |   10 +
 vcl/osx/salframeview.mm|   14 +
 2 files changed, 24 insertions(+)

New commits:
commit 1c4c24042cbe0ede59513d30a676442f7f238b62
Author: Patrick Luby 
AuthorDate: Mon Mar 10 10:08:41 2025 -0400
Commit: Patrick Luby 
CommitDate: Tue Mar 18 23:38:36 2025 +0100

tdf#151423 allow trackpad or Magic Mouse to behave like a regular mouse

Give both trackpad and Magic Mouse users the option to restore
the legacy zoom via Command+swipe gesture.

The IgnoreKeysWhenScrollingWithTrackpadOrMagicMouse preference is
set to true by default and that disables zooming via swiping.
The problem is that while trackpad users are able to zoom via a
magnify gesture, the Magic Mouse doesn't have a magnify gesture.

Since I have not found a reliable way to distinguish a Magic Mouse
from a trackpad, Magic Mouse users have no obvious replacement
for the zoom via Command+swipe gesture.

Change-Id: Ic2fa5ba153ecb3d7a7cd4711549288b28e6591d2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182740
Tested-by: Gabor Kelemen 
Tested-by: Jenkins
Reviewed-by: Patrick Luby 

diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index a7fedae390a2..969df405cc10 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -701,6 +701,16 @@
 
 15
   
+  
+
+  
+ Specifies if the Command, Option, Control, and Shift keys
+ should be ignored or not when scrolling on a trackpad or a
+ Magic Mouse.
+  
+  true
+
+  
 
 
   
diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm
index 3373ca2091b5..74da526f6ba4 100644
--- a/vcl/osx/salframeview.mm
+++ b/vcl/osx/salframeview.mm
@@ -22,6 +22,7 @@
 #include 
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -240,6 +241,19 @@ static void freezeWindowSizeAndReschedule( NSWindow 
*pWindow )
 
 static bool isMouseScrollWheelEvent( NSEvent *pEvent )
 {
+// tdf#151423 allow trackpad or Magic Mouse to behave like a regular mouse
+// Give both trackpad and Magic Mouse users the option to restore
+// the legacy zoom via Command+swipe gesture.
+// The IgnoreKeysWhenScrollingWithTrackpadOrMagicMouse preference is
+// set to true by default and that disables zooming via swiping.
+// The problem is that while trackpad users are able to zoom via a
+// magnify gesture, the Magic Mouse doesn't have a magnify gesture.
+// Since I have not found a reliable way to distinguish a Magic Mouse
+// from a trackpad, Magic Mouse users have no obvious replacement
+// for the zoom via Command+swipe gesture.
+if ( 
!officecfg::Office::Common::VCL::macOS::IgnoreKeysWhenScrollingWithTrackpadOrMagicMouse::get()
 )
+return true;
+
 return ( pEvent && [pEvent type] == NSEventTypeScrollWheel && [pEvent 
phase] == NSEventPhaseNone && [pEvent momentumPhase] == NSEventPhaseNone );
 }

core.git: officecfg/registry sd/uiconfig

2025-03-17 Thread Heiko Tietze (via logerrit)

 officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu |   
11 ++
 sd/uiconfig/sdraw/popupmenu/gluepoint.xml|
1 
 sd/uiconfig/simpress/popupmenu/gluepoint.xml |
1 
 3 files changed, 13 insertions(+)

New commits:
commit 95a21d1cd35ca436c5b4a6d0cd923bfc77a2aa22
Author: Heiko Tietze 
AuthorDate: Mon Mar 17 15:28:20 2025 +0100
Commit: Heiko Tietze 
CommitDate: Mon Mar 17 17:28:38 2025 +0100

Resolves tdf#45864 - Access to glue point deletion from context menu

Function must not be on the toolbar since .uno:Delete removes the whole
object eventually; and adding a state methode to disable it sounds like
over-engineering

Change-Id: If22f38cc0ab44c82ea6155647449f6763d39f64f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183033
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
index ddd1bb8da76d..d0cdf85fe3c4 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
@@ -242,6 +242,17 @@
   1
 
   
+  
+
+  Delete Gluepoint
+
+
+  .uno:Delete
+
+
+  1
+
+  
   
 
   Gluepoint Relative
diff --git a/sd/uiconfig/sdraw/popupmenu/gluepoint.xml 
b/sd/uiconfig/sdraw/popupmenu/gluepoint.xml
index c38a99349714..8a2ec3e527b0 100644
--- a/sd/uiconfig/sdraw/popupmenu/gluepoint.xml
+++ b/sd/uiconfig/sdraw/popupmenu/gluepoint.xml
@@ -9,6 +9,7 @@
 -->
 http://openoffice.org/2001/menu";>
   
+  
   
   
   
diff --git a/sd/uiconfig/simpress/popupmenu/gluepoint.xml 
b/sd/uiconfig/simpress/popupmenu/gluepoint.xml
index c38a99349714..8a2ec3e527b0 100644
--- a/sd/uiconfig/simpress/popupmenu/gluepoint.xml
+++ b/sd/uiconfig/simpress/popupmenu/gluepoint.xml
@@ -9,6 +9,7 @@
 -->
 http://openoffice.org/2001/menu";>
   
+

core.git: officecfg/registry sw/inc sw/qa sw/sdi sw/source sw/uiconfig

2025-03-17 Thread Oliver Specht (via logerrit)

 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |   10 +
 sw/inc/cmdid.h  |3 
 sw/inc/doc.hxx  |1 
 sw/inc/editsh.hxx   |1 
 sw/qa/uitest/writer_tests8/tdf45946.py  |   24 +++
 sw/sdi/_textsh.sdi  |6 
 sw/sdi/swriter.sdi  |   18 ++
 sw/source/core/doc/doc.cxx  |   76 
++
 sw/source/core/edit/edfld.cxx   |8 +
 sw/source/uibase/shells/textfld.cxx |   33 
 sw/uiconfig/sglobal/popupmenu/table.xml |1 
 sw/uiconfig/sglobal/popupmenu/text.xml  |1 
 sw/uiconfig/swform/popupmenu/table.xml  |1 
 sw/uiconfig/swform/popupmenu/text.xml   |1 
 sw/uiconfig/swreport/popupmenu/table.xml|1 
 sw/uiconfig/swreport/popupmenu/text.xml |1 
 sw/uiconfig/swriter/menubar/menubar.xml |1 
 sw/uiconfig/swriter/popupmenu/table.xml |1 
 sw/uiconfig/swriter/popupmenu/text.xml  |1 
 sw/uiconfig/swxform/popupmenu/table.xml |1 
 sw/uiconfig/swxform/popupmenu/text.xml  |1 
 21 files changed, 187 insertions(+), 4 deletions(-)

New commits:
commit e846c8e5ed07e6b67a4375dd8ab4d4ca30fd9066
Author: Oliver Specht 
AuthorDate: Tue May 21 14:27:04 2024 +0200
Commit: Thorsten Behrens 
CommitDate: Mon Mar 17 15:39:22 2025 +0100

tdf#45946 Add function to convert field to text

The current field can be converted to it's representing text.
Exceptions are fields in header or footer that have multiple representations
like page number or chapter fields.

Change-Id: I62b92b2d0b2ed766a2722ffd804496008b72e792
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167900
Tested-by: Gabor Kelemen 
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 17a9da6656e3..a3399fd6466a 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -1757,7 +1757,15 @@
   1
 
   
-  
+
+
+Convert Field To Text
+
+
+1
+
+
+
 
   E~xternal Links...
 
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index abfe12fa9e78..9baa9c18f86a 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -46,7 +46,7 @@ class SwUINumRuleItem;
 #define FN_FRAME(SID_SW_START + 1300)
 #define FN_INSERT2  (SID_SW_START + 1400)
 #define FN_FORMAT2  (SID_SW_START + 1600)
-//#define FN_EDIT2(SID_SW_START + 1800) defined in svxids.hrc
+//#define FN_EDIT2(SID_SW_START + 1800) defined in sfxsids.hrc
 #define FN_QUERY2   (SID_SW_START + 2000)
 #define FN_EXTRA2   (SID_SW_START + 2200)
 #define FN_PARAM2   (SID_SW_START + 2400)
@@ -153,6 +153,7 @@ class SwUINumRuleItem;
 #define FN_REDLINE_REJECT_TONEXT (FN_EDIT2 + 46)/* Redlining Reject 
and jump to next*/
 #define FN_TRANSFORM_DOCUMENT_STRUCTURE (FN_EDIT2 + 47) /* overwrite text of 
content control, and more*/
 #define FN_COPY_FIELD(FN_EDIT2 + 48)/* show field content 
in readonly documents to copy content*/
+#define FN_CONVERT_SEL_FIELD (FN_EDIT2 + 49)/* convert selected 
field to text */
 
 // Region: View
 #define FN_DRAW_WRAP_DLGTypedWhichId(FN_VIEW + 3)   /* 
Draw wrapping dlg */
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index ca8da4e293e3..394195589919 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1508,6 +1508,7 @@ public:
 
 // Replace fields by text - mailmerge support
 bool ConvertFieldsToText(SwRootFrame const& rLayout);
+bool ConvertFieldToText(SwField& rField, SwRootFrame const& rLayout);
 
 // Create sub-documents according to given collection.
 // If no collection is given, use chapter styles for 1st level.
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 67e699a4deec..6ad93013acca 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -406,6 +406,7 @@ public:
 bool InsertField(SwField const &, const bool bForceExpandHints);
 
 SW_DLLPUBLIC void UpdateOneField(SwField &);   ///< One single field.
+SW_DLLPUBLIC void ConvertOn

core.git: officecfg/registry

2025-03-15 Thread Stanislav Horacek (via logerrit)

 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d1e90f2e26fb56c0fc1b290c8910aad9d9d8bcdb
Author: Stanislav Horacek 
AuthorDate: Wed Mar 12 19:23:43 2025 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Sat Mar 15 16:35:17 2025 +0100

related tdf#155050: list of sources is still called "bibliography"

Change-Id: I7a800043d240685b4a249f8c78ceb9e1affef420
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182841
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 9686cdb09823..17a9da6656e3 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -149,10 +149,10 @@
   Table of Contents
 
 
-  Insert Table of Contents, Index or 
Citation
+  Insert Table of Contents, Index or 
Bibliography
 
 
-  Table of Contents, Index or 
Citation...
+  Table of Contents, Index or 
Bibliography...
 
 
   1

core.git: officecfg/registry sc/source

2025-03-12 Thread Szymon Kłos (via logerrit)

 officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu |2 +-
 sc/source/ui/view/tabvwsha.cxx   |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 29e66e84270285886d8ec3062e2d35e810f24704
Author: Szymon Kłos 
AuthorDate: Tue Mar 11 08:48:07 2025 +0100
Commit: Szymon Kłos 
CommitDate: Wed Mar 12 10:40:22 2025 +0100

lok: style panel shortcut icon command fix

This reverts commit 90a63a2325e45b435762570ac9aecd50fcb5b676.
lok: use .uno:SidebarDeck.StyleListDeck as shortcut

it caused regresison in Writer where we should still open the
Style Edit dialog. Only Calc should open style list.

Change-Id: Ia8844330e8f91ef56864ae78b18d5ce57a146c58
Signed-off-by: Szymon Kłos 
(cherry picked from commit 0f57885a3cf63af68bf07b14c5296e14ef0ad4c4)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182807
Tested-by: Jenkins

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
index 4c553d040711..f9a0e6ad7ffe 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
@@ -435,7 +435,7 @@
   PropertyDeck
 
 
-  .uno:SidebarDeck.StyleListDeck
+  .uno:EditStyle
 
 
   
diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx
index bca95efa1494..d756d5f22acc 100644
--- a/sc/source/ui/view/tabvwsha.cxx
+++ b/sc/source/ui/view/tabvwsha.cxx
@@ -938,7 +938,7 @@ void ScTabViewShell::ExecStyle( SfxRequest& rReq )
 const sal_uInt16  nSlotId = rReq.GetSlot();
 if ( !pArgs && nSlotId != SID_STYLE_NEW_BY_EXAMPLE && nSlotId != 
SID_STYLE_UPDATE_BY_EXAMPLE )
 {
-// in case of vertical toolbar
+// in case of vertical toolbar, sidebar shortcut icon
 GetDispatcher()->Execute( SID_STYLE_DESIGNER, SfxCallMode::ASYNCHRON | 
SfxCallMode::RECORD );
 return;
 }

core.git: officecfg/registry

2025-03-05 Thread Karthik (via logerrit)

 officecfg/registry/data/org/openoffice/Office/UI/ChartCommands.xcu   |
4 ++--
 officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu |
4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 9a1be61b2f4e07d18da603bbfc9cd8cd31a147ed
Author: Karthik 
AuthorDate: Wed Mar 5 07:52:23 2025 +0530
Commit: Olivier Hallot 
CommitDate: Wed Mar 5 21:07:35 2025 +0100

tdf#158798 Nomenclature: "Arrange" commands not homogeneous in UI

Change-Id: I1546ab1adf92ac42c68820bc614b5c3eae9c0858
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182506
Reviewed-by: Olivier Hallot 
Tested-by: Jenkins

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/ChartCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/ChartCommands.xcu
index fe1bd066bf16..b2d3fb19318c 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/ChartCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/ChartCommands.xcu
@@ -145,7 +145,7 @@
   
   
 
-  Bring ~Forward
+  Forward One
 
 
   1
@@ -153,7 +153,7 @@
   
   
 
-  Send Back~ward
+  Backward One
 
 
   1
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
index 6d09d6068ac8..ddd1bb8da76d 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
@@ -907,7 +907,7 @@
   
   
 
-  Bring ~Forward
+  Forward One
 
 
   1
@@ -915,7 +915,7 @@
   
   
 
-  Send Back~ward
+  Backward One
 
 
   1

core.git: officecfg/registry

2025-03-05 Thread Szymon Kłos (via logerrit)

 officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0ab812e3ea9c7a3d2fadc294a47ad06873abbdeb
Author: Szymon Kłos 
AuthorDate: Mon Mar 3 19:06:35 2025 +0100
Commit: Szymon Kłos 
CommitDate: Wed Mar 5 11:26:54 2025 +0100

lok: use .uno:SidebarDeck.StyleListDeck as shortcut

EditStyle command was causing the sidebar to close in lok
case and it was not possible to open it again.
Let's use dedicated command for opening the sidebar deck
with styles navigator.

Signed-off-by: Szymon Kłos 
Change-Id: Idf6bbfa8676127ef72699c68ed6a778881c07030
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182442
(cherry picked from commit 90a63a2325e45b435762570ac9aecd50fcb5b676)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182509
Tested-by: Jenkins

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
index f9a0e6ad7ffe..4c553d040711 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
@@ -435,7 +435,7 @@
   PropertyDeck
 
 
-  .uno:EditStyle
+  .uno:SidebarDeck.StyleListDeck

core.git: officecfg/registry sw/inc sw/qa sw/uiconfig

2025-03-03 Thread bruh (via logerrit)

 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |8 +--
 sw/inc/strings.hrc  |   12 
++---
 sw/qa/extras/odfimport/odfimport.cxx|2 
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx|2 
 sw/uiconfig/swriter/ui/bibliographyentry.ui |4 -
 sw/uiconfig/swriter/ui/tocentriespage.ui|   24 
+-
 6 files changed, 26 insertions(+), 26 deletions(-)

New commits:
commit 7668d76e7a7d10a94c6122d7ff7932ab4cb1710a
Author: bruh 
AuthorDate: Fri Feb 7 01:10:04 2025 +0530
Commit: Heiko Tietze 
CommitDate: Mon Mar 3 14:11:05 2025 +0100

tdf#155050 Replaces the Bibliography entries with Citation

The patch replaces Bibliography entries in Tables Of Contents and Index and 
bibliography dialog box with Citation.

Left some of the entries in sw/uiconfig/swriter/ui/bibliographyentry.ui and 
sw/uiconfig/swriter/ui/createauthorentry.ui unchanged as per the discussion on 
the bug page, where it was mentioned not to modify them.

Change-Id: I34c0051806a799b50d546841960c5d5a04b60196
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181224
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index f8dd394dfa5c..9b2cefcc3ba6 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -149,10 +149,10 @@
   Table of Contents
 
 
-  Insert Table of Contents, Index or 
Bibliography
+  Insert Table of Contents, Index or 
Citation
 
 
-  Table of Contents, Index or 
Bibliography...
+  Table of Contents, Index or 
Citation...
 
 
   1
@@ -160,7 +160,7 @@
   
   
 
-  ~Bibliography Entry...
+  ~Citation...
 
 
   9
@@ -525,7 +525,7 @@
   
   
 
-  ~Bibliography Entry...
+  ~Citation...
 
 
   1
diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
index 8a2ec4027aa2..18a66de7b251 100644
--- a/sw/inc/strings.hrc
+++ b/sw/inc/strings.hrc
@@ -337,8 +337,8 @@
 #define STR_NUMERIC NC_("STR_NUMERIC", "Numeric")
 #define STR_ROW NC_("STR_ROW", "Rows")
 #define STR_COL NC_("STR_COL", "Column")
-#define STR_AUTHMRK_EDITNC_("STR_AUTHMRK_EDIT", "Edit 
Bibliography Entry")
-#define STR_AUTHMRK_INSERT  NC_("STR_AUTHMRK_INSERT", 
"Insert Bibliography Entry")
+#define STR_AUTHMRK_EDITNC_("STR_AUTHMRK_EDIT", "Edit 
Citation")
+#define STR_AUTHMRK_INSERT  NC_("STR_AUTHMRK_INSERT", 
"Insert Citation")
 #define STR_ACCESS_PAGESETUP_SPACING
NC_("STR_ACCESS_PAGESETUP_SPACING", "Spacing between %1 and %2")
 #define STR_ACCESS_COLUMN_WIDTH NC_("STR_ACCESS_COLUMN_WIDTH", 
"Column %1 Width")
 #define STR_CAPTION_TABLE   NC_("STR_CAPTION_TABLE", 
"%PRODUCTNAME Writer Table")
@@ -588,7 +588,7 @@
 #define STR_NOTENC_("STR_NOTE", "comment")
 #define STR_REFERENCE   NC_("STR_REFERENCE", 
"cross-reference")
 #define STR_SCRIPT  NC_("STR_SCRIPT", "script")
-#define STR_AUTHORITY_ENTRY NC_("STR_AUTHORITY_ENTRY", 
"bibliography entry")
+#define STR_AUTHORITY_ENTRY NC_("STR_AUTHORITY_ENTRY", 
"citation")
 #define STR_SPECIALCHAR NC_("STR_SPECIALCHAR", 
"special character")
 #define STR_FOOTNOTENC_("STR_FOOTNOTE", "footnote")
 #define STR_GRAPHIC NC_("STR_GRAPHIC", "image")
@@ -865,7 +865,7 @@
 
 #define STR_IDXMRK_EDIT NC_("STR_IDXMRK_EDIT", "Edit 
Index Entry")
 #define STR_IDXMRK_INSERT   NC_("STR_IDXMRK_INSERT", 
"Insert Index Entry")
-#define STR_QUERY_CHANGE_AUTH_ENTRY 
NC_("STR_QUERY_CHANGE_AUTH_ENTRY", "The document already contains the 
bibliography entry but with different data. Do you want to adjust the existing 
entries?")
+#define STR_QUERY_CHANGE_AUTH_ENTRY 
NC_("STR_QUERY_CHANGE_AUTH_ENTRY", "The document already contains the citation 
but with different data. Do you want to adjust the existing entries?")
 
 #define STR_COMMENTS_LABEL  NC_("STR_COMMENTS_LABEL", 
"Comments")
 #define STR_SHOW_COMMENTS   NC_("STR_SHOW_COMMENTS", "Show 
comments")
@@ -993,7 +993,7 @@
 #define STR_USERFLD NC_("STR_USERFLD", "User 
Field")
 #defi

core.git: officecfg/registry

2025-02-07 Thread Shardul Vikram Singh (via logerrit)

 officecfg/registry/data/org/openoffice/Office/Accelerators.xcu |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit e80317dfc5fb918eb90ae188e03038f5c8c23c0a
Author: Shardul Vikram Singh 
AuthorDate: Tue Jan 21 02:34:33 2025 +0530
Commit: Hossein 
CommitDate: Fri Feb 7 13:10:37 2025 +0100

tdf#65911 Fix Alt+C behavior by adjusting install:module for

en-US locale

Ensure Alt+C works consistently for the en-US locale by adding
install:module="unxwnt" to its . Also, add a separate  with
install:module="macosx" to ensure functionality on macOS.

Previously,  entries with install:module (e.g., for de, eu, etc.)
overrode en-US behavior on Unix/Windows platforms due to strict 
interpretation
of the install:module attribute. Even if en-US had a defined  without
install:module, it would be ignored when conflicting locale-specific values
with install:module were present.

This fix prevents unwanted overrides by making en-US explicitly 
platform-aware
while retaining expected behavior for other locales. Alt+C now works 
correctly
for en-US on all platforms and ensures localized behavior for other 
languages.

Change-Id: I630440e5c2d9a07a7a93955224b0901fc6e8036c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180528
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
Reviewed-by: Hossein   

diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu 
b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index ac69b5939add..34c36d977605 100644
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -279,7 +279,8 @@ Ctrl+Shift+u aka U_SHIFT_MOD1 under GTK/IBUS is for unicode 
key input
   
 
   L10N SHORTCUTS - NO 
TRANSLATE
-  .uno:FontDialog
+  .uno:FontDialog
+  .uno:FontDialog
   .uno:UnicodeNotationToggle
   .uno:UnicodeNotationToggle
   .uno:UnicodeNotationToggle

1 2 3 4 5 6 7 8 9 10 >

1 - 100 of 1127 matches

Mail list logo