core.git: extras/CustomTarget_tplpresnt.mk extras/source

[Laurent Balland (via logerrit)]

 dev/null   
|binary
 extras/CustomTarget_tplpresnt.mk   
|2 
 extras/source/templates/presnt/Candy/META-INF/manifest.xml 
|2 
 
extras/source/templates/presnt/Candy/Pictures/14A80500DD5BB9FFED422172.png
 |binary
 extras/source/templates/presnt/Candy/Thumbnails/thumbnail.png  
|binary
 extras/source/templates/presnt/Candy/content.xml   
| 3701 +-
 extras/source/templates/presnt/Candy/meta.xml  
|7 
 extras/source/templates/presnt/Candy/styles.xml
| 2513 ++
 8 files changed, 1578 insertions(+), 4647 deletions(-)

New commits:
commit 00b3bcc64fc32165d19e78b99cc6f78317824806
Author: Laurent Balland 
AuthorDate: Sun Feb 18 18:33:34 2024 +0100
Commit: Laurent Balland 
CommitDate: Tue May 7 11:42:37 2024 +0200

tdf#160712 tdf#160899 Update Candy template

+ Use only Noto family fonts
+ remove language and country tags
+ rename master pages
   -"Title of Content" to "Table of Content"
   -"Title content 3" to "Title Content 3"
   -correct first master page as "Candy" (tdf#158496)
+ remove error messages (tdf#159199 Comment 3)
+ replace dummy text with placeholders (tdf#160712)
+ use styles for Filled colors
+ move credits to meta.xml
+ replace gradient picture with gradients
+ remove credits picture
+ remove unused styles
+ remove area color for background objects (tdf#160899)

Change-Id: I03f2d2c86c3adbc9c5b8bdff31279c0c4c51ed69
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165602
Reviewed-by: Laurent Balland 
Tested-by: Jenkins
Reviewed-by: Stéphane Guillou 

diff --git a/extras/CustomTarget_tplpresnt.mk b/extras/CustomTarget_tplpresnt.mk
index fd8053c42170..a7939f983a86 100644
--- a/extras/CustomTarget_tplpresnt.mk
+++ b/extras/CustomTarget_tplpresnt.mk
@@ -51,8 +51,6 @@ extras_PRESENTATIONS_XMLFILES := \
Candy/Pictures/1500050014DEA376B6E67205.png  \
Candy/Pictures/178004383B6CE268A9802A07.png  \
Candy/Pictures/1780043870026B1FACED0D1B.png  \
-   Candy/Pictures/1201070E007A072587FC46AD7996.png  \
-   Candy/Pictures/120107810028E4140FADDA6D818B.png  \
Freshes/Pictures/1198067FB46981E5FBCD5A53.jpg  \
Freshes/Pictures/12C503C02FC12A07C25F42DF.jpg  \
Freshes/Pictures/12D5067FACCA26111F046EB5.jpg  \
diff --git a/extras/source/templates/presnt/Candy/META-INF/manifest.xml 
b/extras/source/templates/presnt/Candy/META-INF/manifest.xml
index bdf0afc404ef..f5c11fdb62b3 100644
--- a/extras/source/templates/presnt/Candy/META-INF/manifest.xml
+++ b/extras/source/templates/presnt/Candy/META-INF/manifest.xml
@@ -2,8 +2,6 @@
 
  
  
- 
- 
  
  
  
diff --git 
a/extras/source/templates/presnt/Candy/Pictures/14A80500DD5BB9FFED422172.png
 
b/extras/source/templates/presnt/Candy/Pictures/14A80500DD5BB9FFED422172.png
index a3c806107c4c..5c84c8606832 100644
Binary files 
a/extras/source/templates/presnt/Candy/Pictures/14A80500DD5BB9FFED422172.png
 and 
b/extras/source/templates/presnt/Candy/Pictures/14A80500DD5BB9FFED422172.png
 differ
diff --git 
a/extras/source/templates/presnt/Candy/Pictures/1201070E007A072587FC46AD7996.png
 
b/extras/source/templates/presnt/Candy/Pictures/1201070E007A072587FC46AD7996.png
deleted file mode 100644
index dcf392c69f3a..
Binary files 
a/extras/source/templates/presnt/Candy/Pictures/1201070E007A072587FC46AD7996.png
 and /dev/null differ
diff --git 
a/extras/source/templates/presnt/Candy/Pictures/120107810028E4140FADDA6D818B.png
 
b/extras/source/templates/presnt/Candy/Pictures/120107810028E4140FADDA6D818B.png
deleted file mode 100644
index cee0c4982bdd..
Binary files 
a/extras/source/templates/presnt/Candy/Pictures/120107810028E4140FADDA6D818B.png
 and /dev/null differ
diff --git a/extras/source/templates/presnt/Candy/Thumbnails/thumbnail.png 
b/extras/source/templates/presnt/Candy/Thumbnails/thumbnail.png
index f2a7d98d3225..6661fd9a0bbf 100644
Binary files a/extras/source/templates/presnt/Candy/Thumbnails/thumbnail.png 
and b/extras/source/templates/presnt/Candy/Thumbnails/thumbnail.png differ
diff --git a/extras/source/templates/presnt/Candy/content.xml 
b/extras/source/templates/presnt/Candy/content.xml
index a666e829aae2..bf65246b6f65 100644
--- a/extras/source/templates/presnt/Candy/content.xml
+++ b/extras/source/templates/presnt/Candy/content.xml
@@ -2,20 +2,9 @@
 http://openoffice.org/2009/office; 

core.git: Branch 'libreoffice-24-2-3' - sc/source

[Laurent Balland (via logerrit)]

 sc/source/ui/docshell/impex.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 1d00b945c25c5b9df6553c0c89ef63749ac0a419
Author: Laurent Balland 
AuthorDate: Mon Apr 15 18:43:35 2024 +0200
Commit: Xisco Fauli 
CommitDate: Tue Apr 23 10:10:44 2024 +0200

tdf#129701 Follow-up of previous change

According to comments in https://gerrit.libreoffice.org/c/core/+/163536
Follow-up of previous change

Change-Id: Icd7b6798d6ef35ca9574125cd3d4c4d89044569c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166133
Tested-by: Jenkins
Reviewed-by: Eike Rathke 
(cherry picked from commit 47187acee758680cda8086b6e295ef7beea3491b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166178
(cherry picked from commit 637312e2aa682ca11543a421a8de0bbbe72bf86b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166215
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Xisco Fauli 
Reviewed-by: Laurent Balland 
Reviewed-by: Xisco Fauli 

diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index 8e6315db9419..a61ee53d2526 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -1662,7 +1662,7 @@ bool ScImportExport::ExtText2Doc( SvStream& rStrm )
 ScDocumentImport aDocImport(rDoc);
 do
 {
-SCCOL nLastCol = nEndCol; // tdf#129701 preserve value of nEndCol
+const SCCOL nLastCol = nEndCol; // tdf#129701 preserve value of nEndCol
 for( ;; )
 {
 aLine = ReadCsvLine(rStrm, !bFixed, aSeps, cStr, cDetectSep);
@@ -1784,15 +1784,15 @@ bool ScImportExport::ExtText2Doc( SvStream& rStrm )
 aTransliteration, aCalendar,
 pEnglishTransliteration.get(), 
pEnglishCalendar.get());
 }
+++nCol;
 if (bIsLastColEmpty)
 {
 bIsLastColEmpty = false; // toggle to stop
 }
 else
 {
-++nCol;
 // tdf#129701 detect if there is a last empty 
column when we need it
-bIsLastColEmpty = !(*p) && !bSkipEmptyCells && 
!bDetermineRange && nCol == nLastCol;
+bIsLastColEmpty = (nCol == nLastCol) && !(*p) && 
!bSkipEmptyCells && !bDetermineRange;
 }
 
 }

core.git: Changes to 'feature/cib_contract49c'

[Laurent Balland (via logerrit)]

New branch 'feature/cib_contract49c' available with the following commits:

core.git: Branch 'libreoffice-24-2' - sc/source

[Laurent Balland (via logerrit)]

 sc/source/ui/docshell/impex.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 637312e2aa682ca11543a421a8de0bbbe72bf86b
Author: Laurent Balland 
AuthorDate: Mon Apr 15 18:43:35 2024 +0200
Commit: Eike Rathke 
CommitDate: Thu Apr 18 14:44:15 2024 +0200

tdf#129701 Follow-up of previous change

According to comments in https://gerrit.libreoffice.org/c/core/+/163536
Follow-up of previous change

Change-Id: Icd7b6798d6ef35ca9574125cd3d4c4d89044569c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166133
Tested-by: Jenkins
Reviewed-by: Eike Rathke 
(cherry picked from commit 47187acee758680cda8086b6e295ef7beea3491b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166178

diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index 8e6315db9419..a61ee53d2526 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -1662,7 +1662,7 @@ bool ScImportExport::ExtText2Doc( SvStream& rStrm )
 ScDocumentImport aDocImport(rDoc);
 do
 {
-SCCOL nLastCol = nEndCol; // tdf#129701 preserve value of nEndCol
+const SCCOL nLastCol = nEndCol; // tdf#129701 preserve value of nEndCol
 for( ;; )
 {
 aLine = ReadCsvLine(rStrm, !bFixed, aSeps, cStr, cDetectSep);
@@ -1784,15 +1784,15 @@ bool ScImportExport::ExtText2Doc( SvStream& rStrm )
 aTransliteration, aCalendar,
 pEnglishTransliteration.get(), 
pEnglishCalendar.get());
 }
+++nCol;
 if (bIsLastColEmpty)
 {
 bIsLastColEmpty = false; // toggle to stop
 }
 else
 {
-++nCol;
 // tdf#129701 detect if there is a last empty 
column when we need it
-bIsLastColEmpty = !(*p) && !bSkipEmptyCells && 
!bDetermineRange && nCol == nLastCol;
+bIsLastColEmpty = (nCol == nLastCol) && !(*p) && 
!bSkipEmptyCells && !bDetermineRange;
 }
 
 }

core.git: Branch 'libreoffice-7-6' - sc/qa sc/source

[Laurent Balland (via logerrit)]

 sc/qa/uitest/data/tdf129701.ods|binary
 sc/qa/uitest/pasteSpecial/tdf129701-PasteUnformated.py |   70 +
 sc/source/ui/docshell/impex.cxx|   17 +++-
 3 files changed, 85 insertions(+), 2 deletions(-)

New commits:
commit ed0165f6cbd1f3f9e47be26fe5d60c29eb946030
Author: Laurent Balland 
AuthorDate: Thu Dec 7 19:38:54 2023 +0100
Commit: Laurent Balland 
CommitDate: Wed Apr 17 19:25:25 2024 +0200

tdf#129701 Skip empty cell: treat last column

 This is a combination of 2 commits.

tdf#129701 Skip empty cell: treat last column

When pasting data as text, with "Skip empty cells" not checked, empty
cells in the last column of the source do not empty cells in
destination, because there is nothing anymore to paste and while loop
stops.
This commit adds a flag to check if the last cell of each line is empty,
and treat it if "Skip empty cells" is not checked.

Add UITest to Copy data with empty cells;
Paste Unformatted text, without "Skip empty cells";
Check data with empty cells in last column.

xChange-Id: Idec823fb1c27b803f49c6d13d6c757ef0f41e437
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160951
Tested-by: Jenkins
Reviewed-by: Laurent Balland 
(cherry picked from commit e66ffda7c7f1e78dbca082ff7549ded121dc7356)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163536
Reviewed-by: Christian Lohmaier 
(cherry picked from commit 60e0ebe633b1dee8bb2a66b9d133f5303749d8d5)

tdf#129701 Follow-up of previous change

According to comments in https://gerrit.libreoffice.org/c/core/+/163536
Follow-up of previous change

xChange-Id: Icd7b6798d6ef35ca9574125cd3d4c4d89044569c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166133
Tested-by: Jenkins
Reviewed-by: Eike Rathke 
(cherry picked from commit 47187acee758680cda8086b6e295ef7beea3491b)

Change-Id: Idec823fb1c27b803f49c6d13d6c757ef0f41e437
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164493
Reviewed-by: Eike Rathke 
Tested-by: Jenkins
Reviewed-by: Laurent Balland 

diff --git a/sc/qa/uitest/data/tdf129701.ods b/sc/qa/uitest/data/tdf129701.ods
new file mode 100644
index ..94407fcd566e
Binary files /dev/null and b/sc/qa/uitest/data/tdf129701.ods differ
diff --git a/sc/qa/uitest/pasteSpecial/tdf129701-PasteUnformated.py 
b/sc/qa/uitest/pasteSpecial/tdf129701-PasteUnformated.py
new file mode 100644
index ..596cd62f8bc1
--- /dev/null
+++ b/sc/qa/uitest/pasteSpecial/tdf129701-PasteUnformated.py
@@ -0,0 +1,70 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-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/.
+#
+from uitest.framework import UITestCase
+from libreoffice.uno.propertyvalue import mkPropertyValues
+from uitest.uihelper.common import get_url_for_data_file
+from uitest.uihelper.common import get_state_as_dict
+from libreoffice.calc.document import get_cell_by_position
+
+class tdf129701(UITestCase):
+
+def test_tdf129701(self):
+
+with self.ui_test.load_file(get_url_for_data_file("tdf129701.ods")):
+xCalcDoc = self.xUITest.getTopFocusWindow()
+gridwin = xCalcDoc.getChild("grid_window")
+gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": 
"D21:F25"}))
+self.xUITest.executeCommand(".uno:Copy")
+
+gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "J4"}))
+with 
self.ui_test.execute_dialog_through_command(".uno:PasteUnformatted", 
close_button="ok") as xDialog:
+
+xSkipEmtyCells   = xDialog.getChild("skipemptycells")
+xSeparatedBy = xDialog.getChild("toseparatedby")
+xTab = xDialog.getChild("tab")
+xMergeDelimiters = xDialog.getChild("mergedelimiters")
+
+xSeparatedBy.executeAction("CLICK", tuple())
+if get_state_as_dict(xTab)['Selected'] == 'false':
+xTab.executeAction("CLICK", tuple())
+if get_state_as_dict(xMergeDelimiters)['Selected'] == 'true':
+xMergeDelimiters.executeAction("CLICK", tuple())
+if get_state_as_dict(xSkipEmtyCells)['Selected'] == 'true':
+xSkipEmtyCells.executeAction("CLICK", tuple())
+# Check wether Skip empty cells is unselected
+self.assertEqual('false', 
get_state_as_dict(xSkipEmtyCells)['Selected'])
+
+document = self.ui_test.get_component()
+# Without the fix in place, this test would have failed with
+# non empty cells in column 11
+
+self.assertEqual( "x1", 

core.git: sc/source

[Laurent Balland (via logerrit)]

 sc/source/ui/docshell/impex.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 47187acee758680cda8086b6e295ef7beea3491b
Author: Laurent Balland 
AuthorDate: Mon Apr 15 18:43:35 2024 +0200
Commit: Eike Rathke 
CommitDate: Wed Apr 17 13:05:52 2024 +0200

tdf#129701 Follow-up of previous change

According to comments in https://gerrit.libreoffice.org/c/core/+/163536
Follow-up of previous change

Change-Id: Icd7b6798d6ef35ca9574125cd3d4c4d89044569c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166133
Tested-by: Jenkins
Reviewed-by: Eike Rathke 

diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index 248c837b6dd1..80b4a2b96701 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -1592,7 +1592,7 @@ bool ScImportExport::ExtText2Doc( SvStream& rStrm )
 ScDocumentImport aDocImport(rDoc);
 do
 {
-SCCOL nLastCol = nEndCol; // tdf#129701 preserve value of nEndCol
+const SCCOL nLastCol = nEndCol; // tdf#129701 preserve value of nEndCol
 for( ;; )
 {
 aLine = ReadCsvLine(rStrm, !bFixed, aSeps, cStr, cDetectSep);
@@ -1714,15 +1714,15 @@ bool ScImportExport::ExtText2Doc( SvStream& rStrm )
 aTransliteration, aCalendar,
 pEnglishTransliteration.get(), 
pEnglishCalendar.get());
 }
+++nCol;
 if (bIsLastColEmpty)
 {
 bIsLastColEmpty = false; // toggle to stop
 }
 else
 {
-++nCol;
 // tdf#129701 detect if there is a last empty 
column when we need it
-bIsLastColEmpty = !(*p) && !bSkipEmptyCells && 
!bDetermineRange && nCol == nLastCol;
+bIsLastColEmpty = (nCol == nLastCol) && !(*p) && 
!bSkipEmptyCells && !bDetermineRange;
 }
 
 }

core.git: Branch 'libreoffice-24-2' - extras/source

[Laurent Balland (via logerrit)]

 extras/source/templates/presnt/Beehive/styles.xml |4 ++--
 extras/source/templates/presnt/Blue_Curve/styles.xml  |4 ++--
 extras/source/templates/presnt/Blueprint_Plans/styles.xml |4 ++--
 extras/source/templates/presnt/DNA/styles.xml |4 ++--
 extras/source/templates/presnt/Focus/styles.xml   |4 ++--
 extras/source/templates/presnt/Forestbird/styles.xml  |4 ++--
 extras/source/templates/presnt/Grey_Elegant/styles.xml|4 ++--
 extras/source/templates/presnt/Growing_Liberty/styles.xml |4 ++--
 extras/source/templates/presnt/Inspiration/styles.xml |4 ++--
 extras/source/templates/presnt/Lights/styles.xml  |4 ++--
 extras/source/templates/presnt/Midnightblue/styles.xml|4 ++--
 extras/source/templates/presnt/Pencil/styles.xml  |4 ++--
 extras/source/templates/presnt/Piano/styles.xml   |4 ++--
 extras/source/templates/presnt/Portfolio/styles.xml   |4 ++--
 extras/source/templates/presnt/Progress/styles.xml|4 ++--
 extras/source/templates/presnt/Sunset/styles.xml  |4 ++--
 extras/source/templates/presnt/Vivid/styles.xml   |4 ++--
 extras/source/templates/presnt/Yellow_Idea/styles.xml |4 ++--
 18 files changed, 36 insertions(+), 36 deletions(-)

New commits:
commit 4e983181e038a539c3d9834c585037d4808c5d90
Author: Laurent Balland 
AuthorDate: Sat Apr 13 11:06:34 2024 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Sat Apr 13 14:23:29 2024 +0200

tdf#160567 Replace duplicate style A4 with A0

Style A4 was defined twice and A0 was missing. Rename second A4 with A0
and change size to 48pt

Change-Id: I529b4fab5223269908867531873d36d3e878e7e7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166045
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 
(cherry picked from commit 838d2666e85fc27cdcfc66198b6d7a983eec1ea6)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165944

diff --git a/extras/source/templates/presnt/Beehive/styles.xml 
b/extras/source/templates/presnt/Beehive/styles.xml
index 74f40446049b..29843493f876 100644
--- a/extras/source/templates/presnt/Beehive/styles.xml
+++ b/extras/source/templates/presnt/Beehive/styles.xml
@@ -87,9 +87,9 @@
 
   
 
-
+
   
-  
+  
 
 
   
diff --git a/extras/source/templates/presnt/Blue_Curve/styles.xml 
b/extras/source/templates/presnt/Blue_Curve/styles.xml
index bc0420e28577..9e3863fedfc5 100644
--- a/extras/source/templates/presnt/Blue_Curve/styles.xml
+++ b/extras/source/templates/presnt/Blue_Curve/styles.xml
@@ -97,9 +97,9 @@
 
   
 
-
+
   
-  
+  
 
 
   
diff --git a/extras/source/templates/presnt/Blueprint_Plans/styles.xml 
b/extras/source/templates/presnt/Blueprint_Plans/styles.xml
index bd1b430c6cae..00d8310d25fb 100644
--- a/extras/source/templates/presnt/Blueprint_Plans/styles.xml
+++ b/extras/source/templates/presnt/Blueprint_Plans/styles.xml
@@ -100,9 +100,9 @@
 
   
 
-
+
   
-  
+  
 
 
   
diff --git a/extras/source/templates/presnt/DNA/styles.xml 
b/extras/source/templates/presnt/DNA/styles.xml
index ac5a9da4739d..42422332ddee 100644
--- a/extras/source/templates/presnt/DNA/styles.xml
+++ b/extras/source/templates/presnt/DNA/styles.xml
@@ -95,9 +95,9 @@
 
   
 
-
+
   
-  
+  
 
 
   
diff --git a/extras/source/templates/presnt/Focus/styles.xml 
b/extras/source/templates/presnt/Focus/styles.xml
index 4d5464c0d1ad..a563575e2fd3 100644
--- a/extras/source/templates/presnt/Focus/styles.xml
+++ b/extras/source/templates/presnt/Focus/styles.xml
@@ -99,9 +99,9 @@
 
   
 
-
+
   
-  
+  
 
 
   
diff --git a/extras/source/templates/presnt/Forestbird/styles.xml 
b/extras/source/templates/presnt/Forestbird/styles.xml
index 37f2285c8d03..c59cef8d8dec 100644
--- a/extras/source/templates/presnt/Forestbird/styles.xml
+++ b/extras/source/templates/presnt/Forestbird/styles.xml
@@ -96,9 +96,9 @@
 
   
 
-
+
   
-  
+  
 
 
   
diff --git a/extras/source/templates/presnt/Grey_Elegant/styles.xml 
b/extras/source/templates/presnt/Grey_Elegant/styles.xml
index e7990759f3ea..f68bef1597b1 100644
--- a/extras/source/templates/presnt/Grey_Elegant/styles.xml
+++ b/extras/source/templates/presnt/Grey_Elegant/styles.xml
@@ -145,9 +145,9 @@
 
   
 
-
+
   
-  
+  
 
 
   
diff --git a/extras/source/templates/presnt/Growing_Liberty/styles.xml 
b/extras/source/templates/presnt/Growing_Liberty/styles.xml
index 15715b0a9474..cea97722d541 100644
--- a/extras/source/templates/presnt/Growing_Liberty/styles.xml
+++ b/extras/source/templates/presnt/Growing_Liberty/styles.xml
@@ -112,9 +112,9 @@
 
   
 
-
+
   
-  
+  

core.git: extras/source

[Laurent Balland (via logerrit)]

 extras/source/templates/presnt/Beehive/styles.xml |4 ++--
 extras/source/templates/presnt/Blue_Curve/styles.xml  |4 ++--
 extras/source/templates/presnt/Blueprint_Plans/styles.xml |4 ++--
 extras/source/templates/presnt/DNA/styles.xml |4 ++--
 extras/source/templates/presnt/Focus/styles.xml   |4 ++--
 extras/source/templates/presnt/Forestbird/styles.xml  |4 ++--
 extras/source/templates/presnt/Grey_Elegant/styles.xml|4 ++--
 extras/source/templates/presnt/Growing_Liberty/styles.xml |4 ++--
 extras/source/templates/presnt/Inspiration/styles.xml |4 ++--
 extras/source/templates/presnt/Lights/styles.xml  |4 ++--
 extras/source/templates/presnt/Midnightblue/styles.xml|4 ++--
 extras/source/templates/presnt/Pencil/styles.xml  |4 ++--
 extras/source/templates/presnt/Piano/styles.xml   |4 ++--
 extras/source/templates/presnt/Portfolio/styles.xml   |4 ++--
 extras/source/templates/presnt/Progress/styles.xml|4 ++--
 extras/source/templates/presnt/Sunset/styles.xml  |4 ++--
 extras/source/templates/presnt/Vivid/styles.xml   |4 ++--
 extras/source/templates/presnt/Yellow_Idea/styles.xml |4 ++--
 18 files changed, 36 insertions(+), 36 deletions(-)

New commits:
commit 2b6eb4eb9360f3004e2b3ce89879af5d1fb51aa8
Author: Laurent Balland 
AuthorDate: Sat Apr 13 11:06:34 2024 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Sat Apr 13 12:31:58 2024 +0200

tdf#160567 Replace duplicate style A4 with A0

Style A4 was defined twice and A0 was missing. Rename second A4 with A0
and change size to 48pt

Change-Id: I529b4fab5223269908867531873d36d3e878e7e7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166045
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/extras/source/templates/presnt/Beehive/styles.xml 
b/extras/source/templates/presnt/Beehive/styles.xml
index 74f40446049b..29843493f876 100644
--- a/extras/source/templates/presnt/Beehive/styles.xml
+++ b/extras/source/templates/presnt/Beehive/styles.xml
@@ -87,9 +87,9 @@
 
   
 
-
+
   
-  
+  
 
 
   
diff --git a/extras/source/templates/presnt/Blue_Curve/styles.xml 
b/extras/source/templates/presnt/Blue_Curve/styles.xml
index bc0420e28577..9e3863fedfc5 100644
--- a/extras/source/templates/presnt/Blue_Curve/styles.xml
+++ b/extras/source/templates/presnt/Blue_Curve/styles.xml
@@ -97,9 +97,9 @@
 
   
 
-
+
   
-  
+  
 
 
   
diff --git a/extras/source/templates/presnt/Blueprint_Plans/styles.xml 
b/extras/source/templates/presnt/Blueprint_Plans/styles.xml
index bd1b430c6cae..00d8310d25fb 100644
--- a/extras/source/templates/presnt/Blueprint_Plans/styles.xml
+++ b/extras/source/templates/presnt/Blueprint_Plans/styles.xml
@@ -100,9 +100,9 @@
 
   
 
-
+
   
-  
+  
 
 
   
diff --git a/extras/source/templates/presnt/DNA/styles.xml 
b/extras/source/templates/presnt/DNA/styles.xml
index ac5a9da4739d..42422332ddee 100644
--- a/extras/source/templates/presnt/DNA/styles.xml
+++ b/extras/source/templates/presnt/DNA/styles.xml
@@ -95,9 +95,9 @@
 
   
 
-
+
   
-  
+  
 
 
   
diff --git a/extras/source/templates/presnt/Focus/styles.xml 
b/extras/source/templates/presnt/Focus/styles.xml
index 4d5464c0d1ad..a563575e2fd3 100644
--- a/extras/source/templates/presnt/Focus/styles.xml
+++ b/extras/source/templates/presnt/Focus/styles.xml
@@ -99,9 +99,9 @@
 
   
 
-
+
   
-  
+  
 
 
   
diff --git a/extras/source/templates/presnt/Forestbird/styles.xml 
b/extras/source/templates/presnt/Forestbird/styles.xml
index 37f2285c8d03..c59cef8d8dec 100644
--- a/extras/source/templates/presnt/Forestbird/styles.xml
+++ b/extras/source/templates/presnt/Forestbird/styles.xml
@@ -96,9 +96,9 @@
 
   
 
-
+
   
-  
+  
 
 
   
diff --git a/extras/source/templates/presnt/Grey_Elegant/styles.xml 
b/extras/source/templates/presnt/Grey_Elegant/styles.xml
index 56c54c7599c6..0ab79d21e8ab 100644
--- a/extras/source/templates/presnt/Grey_Elegant/styles.xml
+++ b/extras/source/templates/presnt/Grey_Elegant/styles.xml
@@ -102,9 +102,9 @@
 
   
 
-
+
   
-  
+  
 
 
   
diff --git a/extras/source/templates/presnt/Growing_Liberty/styles.xml 
b/extras/source/templates/presnt/Growing_Liberty/styles.xml
index 15715b0a9474..cea97722d541 100644
--- a/extras/source/templates/presnt/Growing_Liberty/styles.xml
+++ b/extras/source/templates/presnt/Growing_Liberty/styles.xml
@@ -112,9 +112,9 @@
 
   
 
-
+
   
-  
+  
 
 
   
diff --git a/extras/source/templates/presnt/Inspiration/styles.xml 

core.git: Branch 'libreoffice-24-2' - sc/qa sc/source

[Laurent Balland (via logerrit)]

 sc/qa/uitest/data/tdf129701.ods|binary
 sc/qa/uitest/pasteSpecial/tdf129701-PasteUnformated.py |   70 +
 sc/source/ui/docshell/impex.cxx|   19 +++-
 3 files changed, 86 insertions(+), 3 deletions(-)

New commits:
commit 60e0ebe633b1dee8bb2a66b9d133f5303749d8d5
Author: Laurent Balland 
AuthorDate: Thu Dec 7 19:38:54 2023 +0100
Commit: Christian Lohmaier 
CommitDate: Thu Mar 7 11:59:46 2024 +0100

tdf#129701 Skip empty cell: treat last column

When pasting data as text, with "Skip empty cells" not checked, empty
cells in the last column of the source do not empty cells in
destination, because there is nothing anymore to paste and while loop
stops.
This commit adds a flag to check if the last cell of each line is empty,
and treat it if "Skip empty cells" is not checked.

Add UITest to Copy data with empty cells;
Paste Unformatted text, without "Skip empty cells";
Check data with empty cells in last column.

Change-Id: Idec823fb1c27b803f49c6d13d6c757ef0f41e437
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160951
Tested-by: Jenkins
Reviewed-by: Laurent Balland 
(cherry picked from commit e66ffda7c7f1e78dbca082ff7549ded121dc7356)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163536
Reviewed-by: Christian Lohmaier 

diff --git a/sc/qa/uitest/data/tdf129701.ods b/sc/qa/uitest/data/tdf129701.ods
new file mode 100644
index ..94407fcd566e
Binary files /dev/null and b/sc/qa/uitest/data/tdf129701.ods differ
diff --git a/sc/qa/uitest/pasteSpecial/tdf129701-PasteUnformated.py 
b/sc/qa/uitest/pasteSpecial/tdf129701-PasteUnformated.py
new file mode 100644
index ..596cd62f8bc1
--- /dev/null
+++ b/sc/qa/uitest/pasteSpecial/tdf129701-PasteUnformated.py
@@ -0,0 +1,70 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-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/.
+#
+from uitest.framework import UITestCase
+from libreoffice.uno.propertyvalue import mkPropertyValues
+from uitest.uihelper.common import get_url_for_data_file
+from uitest.uihelper.common import get_state_as_dict
+from libreoffice.calc.document import get_cell_by_position
+
+class tdf129701(UITestCase):
+
+def test_tdf129701(self):
+
+with self.ui_test.load_file(get_url_for_data_file("tdf129701.ods")):
+xCalcDoc = self.xUITest.getTopFocusWindow()
+gridwin = xCalcDoc.getChild("grid_window")
+gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": 
"D21:F25"}))
+self.xUITest.executeCommand(".uno:Copy")
+
+gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "J4"}))
+with 
self.ui_test.execute_dialog_through_command(".uno:PasteUnformatted", 
close_button="ok") as xDialog:
+
+xSkipEmtyCells   = xDialog.getChild("skipemptycells")
+xSeparatedBy = xDialog.getChild("toseparatedby")
+xTab = xDialog.getChild("tab")
+xMergeDelimiters = xDialog.getChild("mergedelimiters")
+
+xSeparatedBy.executeAction("CLICK", tuple())
+if get_state_as_dict(xTab)['Selected'] == 'false':
+xTab.executeAction("CLICK", tuple())
+if get_state_as_dict(xMergeDelimiters)['Selected'] == 'true':
+xMergeDelimiters.executeAction("CLICK", tuple())
+if get_state_as_dict(xSkipEmtyCells)['Selected'] == 'true':
+xSkipEmtyCells.executeAction("CLICK", tuple())
+# Check wether Skip empty cells is unselected
+self.assertEqual('false', 
get_state_as_dict(xSkipEmtyCells)['Selected'])
+
+document = self.ui_test.get_component()
+# Without the fix in place, this test would have failed with
+# non empty cells in column 11
+
+self.assertEqual( "x1", get_cell_by_position(document, 0, 9, 
3).getString())
+self.assertEqual( ""  , get_cell_by_position(document, 0,10, 
3).getString())
+self.assertEqual( ""  , get_cell_by_position(document, 0,11, 
3).getString())
+self.assertEqual("A16", get_cell_by_position(document, 0,12, 
3).getString())
+self.assertEqual( ""  , get_cell_by_position(document, 0, 9, 
4).getString())
+self.assertEqual( "x2", get_cell_by_position(document, 0,10, 
4).getString())
+self.assertEqual( ""  , get_cell_by_position(document, 0,11, 
4).getString())
+self.assertEqual("A17", get_cell_by_position(document, 0,12, 
4).getString())
+self.assertEqual( ""  , get_cell_by_position(document, 0, 9, 
5).getString())
+

core.git: extras/CustomTarget_tplpresnt.mk extras/source

[Laurent Balland (via logerrit)]

 dev/null |binary
 extras/CustomTarget_tplpresnt.mk |1 
 extras/source/templates/presnt/Grey_Elegant/META-INF/manifest.xml|1 
 extras/source/templates/presnt/Grey_Elegant/Thumbnails/thumbnail.png |binary
 extras/source/templates/presnt/Grey_Elegant/content.xml  |  696 
+-
 extras/source/templates/presnt/Grey_Elegant/styles.xml   |  674 
+
 6 files changed, 205 insertions(+), 1167 deletions(-)

New commits:
commit c87cb8bca3804bfe853572dd0e7c47b64ccab9a5
Author: Laurent Balland 
AuthorDate: Thu Dec 21 08:48:59 2023 +0100
Commit: Laurent Balland 
CommitDate: Tue Mar 5 09:42:34 2024 +0100

Update Grey Elegant template

- title page: use placeholders
   - remove LO logo
   - rename title page to follow resolution of tdf#150925
   - enlarge space around vertical bar
- remove dummy texts and use outline placeholders (slides 3 to 8)
- set same order for slides and master slides (slides 4/5)
- remove unused styles
- remove objects outside slides (Jigsaw and Bullet 3)
- Jigsaw: move up quote to not overlap bullet
- update preview (larger title, smaller file size thanks to Jérôme Bouat)

Change-Id: I318fa2bf4a16f2bd7d3242f5246bdb5fc88d5098
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161289
Tested-by: Jenkins
Reviewed-by: Stéphane Guillou 
Reviewed-by: Laurent Balland 

diff --git a/extras/CustomTarget_tplpresnt.mk b/extras/CustomTarget_tplpresnt.mk
index 887aa1aafaac..64913497a6d1 100644
--- a/extras/CustomTarget_tplpresnt.mk
+++ b/extras/CustomTarget_tplpresnt.mk
@@ -71,7 +71,6 @@ extras_PRESENTATIONS_XMLFILES := \
Grey_Elegant/Pictures/12010019001967D610D5BD5B9486.png  \
Grey_Elegant/Pictures/120100190019B19ADF33FD67D860.png  \
Grey_Elegant/Pictures/120100190019CA03B954885E470D.png  \
-   Grey_Elegant/Pictures/12010087001D01E2F59468D22926.png  \
Grey_Elegant/Pictures/12010330026455AC9786240DB2F8.png  \
Grey_Elegant/Pictures/125102950295D9236A158400ED63.svg  \
Grey_Elegant/Pictures/128002950295458C6106AED5C839.svg  \
diff --git a/extras/source/templates/presnt/Grey_Elegant/META-INF/manifest.xml 
b/extras/source/templates/presnt/Grey_Elegant/META-INF/manifest.xml
index 15abfd0e9f94..616539a8f9fe 100644
--- a/extras/source/templates/presnt/Grey_Elegant/META-INF/manifest.xml
+++ b/extras/source/templates/presnt/Grey_Elegant/META-INF/manifest.xml
@@ -11,7 +11,6 @@
  
  
  
- 
  
  
  
diff --git 
a/extras/source/templates/presnt/Grey_Elegant/Pictures/12010087001D01E2F59468D22926.png
 
b/extras/source/templates/presnt/Grey_Elegant/Pictures/12010087001D01E2F59468D22926.png
deleted file mode 100644
index 9a19fad77aba..
Binary files 
a/extras/source/templates/presnt/Grey_Elegant/Pictures/12010087001D01E2F59468D22926.png
 and /dev/null differ
diff --git 
a/extras/source/templates/presnt/Grey_Elegant/Thumbnails/thumbnail.png 
b/extras/source/templates/presnt/Grey_Elegant/Thumbnails/thumbnail.png
index 7dd522f935c2..03b8ce3dfb0a 100644
Binary files 
a/extras/source/templates/presnt/Grey_Elegant/Thumbnails/thumbnail.png and 
b/extras/source/templates/presnt/Grey_Elegant/Thumbnails/thumbnail.png differ
diff --git a/extras/source/templates/presnt/Grey_Elegant/content.xml 
b/extras/source/templates/presnt/Grey_Elegant/content.xml
index 4b274f28ec61..ae55db58c394 100644
--- a/extras/source/templates/presnt/Grey_Elegant/content.xml
+++ b/extras/source/templates/presnt/Grey_Elegant/content.xml
@@ -14,10 +14,6 @@
 
   
 
-
-  
-  
-
 
   
   
@@ -25,101 +21,19 @@
 
   
 
-
-  
-
 
   
 
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-
-
-  
-
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-
 
   
 
-
-  
-  
-
-
-  
-  
-
 
   
 
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-
 
   
   
 
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-
 
   
 
@@ -132,10 +46,6 @@
 
   
 
-
-  
-  
-
 
   
 
@@ -145,22 +55,10 @@
 
   
 
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-
 
   
 
-
+
   
   
 
@@ -196,13 +94,8 @@
   
   
 
-
-  
-
-
-  
-  
-  
+
+  
 
 
   
@@ -216,131 +109,25 @@
   
   
 
- 

core.git: extras/CustomTarget_tplwizard.mk extras/source

[Laurent Balland (via logerrit)]

 dev/null |binary
 extras/CustomTarget_tplwizard.mk |   18 +++---
 2 files changed, 7 insertions(+), 11 deletions(-)

New commits:
commit 39048e0c0e9af455197ff57cc2947f8fb23e8542
Author: Laurent Balland 
AuthorDate: Mon Jan 1 09:47:28 2024 +0100
Commit: Laurent Balland 
CommitDate: Sat Feb 17 08:59:41 2024 +0100

tdf#158623 Remove thumbnail.png of Wizard template

The preview pictures of the templates used by the wizards cannot be seen
by user.

Change-Id: Idfa0a5b5593f2815582ff34e48330ad9d563992b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161513
Tested-by: Jenkins
Reviewed-by: Laurent Balland 

diff --git a/extras/CustomTarget_tplwizard.mk b/extras/CustomTarget_tplwizard.mk
index 5d73663ed423..e0eadbaa1f3d 100644
--- a/extras/CustomTarget_tplwizard.mk
+++ b/extras/CustomTarget_tplwizard.mk
@@ -9,8 +9,8 @@
 
 $(eval $(call gb_CustomTarget_CustomTarget,extras/source/templates/wizard))
 
-# mimetype, content.xml, settings.xml, styles.xml, META-INF/manifest.xml and
-# Thumbnails/thumbnail.png files are automatically added for each template
+# mimetype, content.xml, settings.xml, styles.xml and META-INF/manifest.xml
+# files are automatically added for each template
 # list of meta.xml files (one per template) + other files (manifest.rdf, 
pictures...)
 extras_WIZARD_XMLFILES := \
agenda/10grey/meta.xml \
@@ -174,7 +174,7 @@ extras_WIZARD_XMLFILES_RELATIVE = $(subst $(1)/,,$(filter 
$(1)/%,$(extras_WIZARD
 
 .SECONDEXPANSION:
 # secondexpansion since the patterns not just cover a filename portion, but 
also include a
-# directory portion withdifferent number of elements
+# directory portion with different number of elements
 # copy regular files (mimetype, *.jpg, *.png, *.rdf, *.svg, *.svm, …)
 $(call gb_CustomTarget_get_workdir,extras/source/templates/wizard)/% : 
$(SRCDIR)/extras/source/templates/wizard/% \
 | $$(dir $(call 
gb_CustomTarget_get_workdir,extras/source/templates/wizard)/$$*).dir
@@ -203,15 +203,13 @@ $(call 
gb_CustomTarget_get_workdir,extras/source/templates/wizard)/%.ott : \
 $$(addprefix $(call 
gb_CustomTarget_get_workdir,extras/source/templates/wizard)/$$*/,\
 styles.xml $$(call extras_WIZARD_XMLFILES_RELATIVE,$$*) ) \
 $$(addprefix $(call 
gb_CustomTarget_get_workdir,extras/source/templates/wizard)/$$*/,\
-META-INF/manifest.xml $$(call extras_WIZARD_XMLFILES_RELATIVE,$$*) 
) \
-$$(addprefix $(call 
gb_CustomTarget_get_workdir,extras/source/templates/wizard)/$$*/,\
-Thumbnails/thumbnail.png $$(call 
extras_WIZARD_XMLFILES_RELATIVE,$$*) )
+META-INF/manifest.xml $$(call extras_WIZARD_XMLFILES_RELATIVE,$$*) 
)
$(call gb_Output_announce,templates/wizard/$*.ott,$(true),ZIP,2)
$(call gb_Trace_StartRange,templates/wizard/$*.ott,ZIP)
$(call gb_Helper_abbreviate_dirs,\
cd $(dir $<) && \
zip -q0X --filesync --must-match $@ mimetype && \
-   zip -qrX --must-match $@ content.xml settings.xml styles.xml 
META-INF/manifest.xml Thumbnails/thumbnail.png && \
+   zip -qrX --must-match $@ content.xml settings.xml styles.xml 
META-INF/manifest.xml && \
zip -qrX --must-match $@ $(call 
extras_WIZARD_XMLFILES_RELATIVE,$*) \
)
$(call gb_Trace_EndRange,templates/wizard/$*.ott,ZIP)
@@ -227,15 +225,13 @@ $(call 
gb_CustomTarget_get_workdir,extras/source/templates/wizard)/%.ots : \
 $$(addprefix $(call 
gb_CustomTarget_get_workdir,extras/source/templates/wizard)/$$*/,\
 styles.xml $$(call extras_WIZARD_XMLFILES_RELATIVE,$$*) ) \
 $$(addprefix $(call 
gb_CustomTarget_get_workdir,extras/source/templates/wizard)/$$*/,\
-META-INF/manifest.xml $$(call extras_WIZARD_XMLFILES_RELATIVE,$$*) 
) \
-$$(addprefix $(call 
gb_CustomTarget_get_workdir,extras/source/templates/wizard)/$$*/,\
-Thumbnails/thumbnail.png $$(call 
extras_WIZARD_XMLFILES_RELATIVE,$$*) )
+META-INF/manifest.xml $$(call extras_WIZARD_XMLFILES_RELATIVE,$$*) 
)
$(call gb_Output_announce,templates/wizard/$*.ots,$(true),ZIP,2)
$(call gb_Trace_StartRange,templates/wizard/$*.ots,ZIP)
$(call gb_Helper_abbreviate_dirs,\
cd $(dir $<) && \
zip -q0X --filesync --must-match $@ mimetype && \
-   zip -qrX --must-match $@ content.xml settings.xml styles.xml 
META-INF/manifest.xml Thumbnails/thumbnail.png && \
+   zip -qrX --must-match $@ content.xml settings.xml styles.xml 
META-INF/manifest.xml && \
zip -qrX --must-match $@ $(call 
extras_WIZARD_XMLFILES_RELATIVE,$*) \
)
$(call gb_Trace_EndRange,templates/wizard/$*.ots,ZIP)
diff --git 
a/extras/source/templates/wizard/agenda/10grey/Thumbnails/thumbnail.png 
b/extras/source/templates/wizard/agenda/10grey/Thumbnails/thumbnail.png
deleted file mode 100644

core.git: basic/qa sc/qa svl/qa svl/source

[Laurent Balland (via logerrit)]

 basic/qa/vba_tests/format.vb |3 -
 sc/qa/unit/data/contentCSV/numberFormat.csv  |2 
 sc/qa/unit/data/contentCSV/testNumberFormats.csv |   56 +++
 sc/qa/unit/data/ods/formats.ods  |binary
 svl/qa/unit/svl.cxx  |   18 ---
 svl/source/numbers/zformat.cxx   |8 ++-
 6 files changed, 46 insertions(+), 41 deletions(-)

New commits:
commit 5378ce372ae29fcb06c5134c18f935c1c7ea3c51
Author: Laurent Balland 
AuthorDate: Sun Jan 7 10:48:14 2024 +0100
Commit: Laurent Balland 
CommitDate: Sat Feb 17 08:59:22 2024 +0100

tdf#158890 Replace '?' with figure blank

...instead of regular blank
Do not modify other blanks (thousand separator, fraction separator)

Change-Id: I82f8023a4e55d8091545191dee55a88aba25dbdd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161737
Tested-by: Jenkins
Reviewed-by: Laurent Balland 

diff --git a/basic/qa/vba_tests/format.vb b/basic/qa/vba_tests/format.vb
index 4e62e87e498e..67abc5ffe24a 100644
--- a/basic/qa/vba_tests/format.vb
+++ b/basic/qa/vba_tests/format.vb
@@ -148,7 +148,8 @@ Sub Custom_Number_Format_Sample()
 TestUtil.AssertEqual(Format(123456, "E0"),   "12E4", 
"Format(123456, ""E0"")")
 TestUtil.AssertEqual(Format(2345.25, "$#,###.##"),   "$2,345.25",
"Format(2345.25, ""$#,###.##"")")
 TestUtil.AssertEqual(Format(0.25, "##.###\%"),   ".25%", 
"Format(0.25, ""##.###\%"")")
-TestUtil.AssertEqual(Format(12.25, "0.???"), "12.25 ",   
"Format(12.25, ""0.???"")")
+' tdf#158890 blank replaced by figure blank
+TestUtil.AssertEqual(Format(12.25, "0.???"), "12.25 ",   
"Format(12.25, ""0.???"")")
 
 Exit Sub
 errorHandler:
diff --git a/sc/qa/unit/data/contentCSV/numberFormat.csv 
b/sc/qa/unit/data/contentCSV/numberFormat.csv
index c6aaf5a149b6..6f19b3693c31 100644
--- a/sc/qa/unit/data/contentCSV/numberFormat.csv
+++ b/sc/qa/unit/data/contentCSV/numberFormat.csv
@@ -6,4 +6,4 @@
 FALSE,TRUE
 />
 258.9E3,-953E-06
-0.5  ,"/ 123.46"
+0.5  ,"/ 123.46"
diff --git a/sc/qa/unit/data/contentCSV/testNumberFormats.csv 
b/sc/qa/unit/data/contentCSV/testNumberFormats.csv
index 266f4baa8a46..476a3eaad49e 100644
--- a/sc/qa/unit/data/contentCSV/testNumberFormats.csv
+++ b/sc/qa/unit/data/contentCSV/testNumberFormats.csv
@@ -1,32 +1,32 @@
 ;Integer;;;Thousand separator;;;Fraction;;;Fraction + Thousand 
separator;;;Scientific;;;Engineering;;
 
Format;"""format=""00";"""format=""??";"""format=""??";"""format=""000,000";"""format=""???,???";"""format=""??0,000";"""format=""000
 ?/?";"""format=""??? ?/?";"""format=""?00 ?/?";"""format=""0,000 
?/?";"""format=""?,??? ?/?";"""format=""?,?00 
?/?";"""format=""0.000E+00";"""format=""?.###E+00";"""format=""?.0##E+00";"""format=""000E+00";"""format=""???E+00";"""format=""?00E+00"
-0.123456;format=00;format=  ;format=  ;format=000,000;format=  
 ;format=  0,000;format=000 1/8;format=1/8;format= 00 1/8;format=0,000 
1/8;format=  1/8;format=   00 
1/8;format=1.235E-01;format=1.235E-01;format=1.235E-01;format=123E-03;format=123E-03;format=123E-03
-1.23456;format=01;format= 1;format=  0001;format=000,001;format=  
1;format=  0,001;format=001 2/9;format=  1 2/9;format= 01 2/9;format=0,001 
2/9;format=1 2/9;format=   01 
2/9;format=1.235E+00;format=1.235E+00;format=1.235E+00;format=001E+00;format=  
1E+00;format= 01E+00
-12.3456;format=12;format=12;format=  0012;format=000,012;format= 
12;format=  0,012;format=012 1/3;format= 12 1/3;format= 12 1/3;format=0,012 
1/3;format=   12 1/3;format=   12 
1/3;format=1.235E+01;format=1.235E+01;format=1.235E+01;format=012E+00;format= 
12E+00;format= 12E+00
-123.456;format=000123;format=   123;format=  0123;format=000,123;format=
123;format=  0,123;format=123 4/9;format=123 4/9;format=123 4/9;format=0,123 
4/9;format=  123 4/9;format=  123 
4/9;format=1.235E+02;format=1.235E+02;format=1.235E+02;format=123E+00;format=123E+00;format=123E+00
-1234.56;format=001235;format=  1235;format=  1235;format=001,235;format=  
1,235;format=  1,235;format=1234 5/9;format=1234 5/9;format=1234 
5/9;format=1,234 5/9;format=1,234 5/9;format=1,234 
5/9;format=1.235E+03;format=1.235E+03;format=1.235E+03;format=001E+03;format=  
1E+03;format= 01E+03
-12345.6;format=012346;format= 12346;format= 12346;format=012,346;format= 
12,346;format= 12,346;format=12345 3/5;format=12345 3/5;format=12345 
3/5;format=12,345 3/5;format=12,345 3/5;format=12,345 
3/5;format=1.235E+04;format=1.235E+04;format=1.235E+04;format=012E+03;format= 
12E+03;format= 12E+03
-123456;format=123456;format=123456;format=123456;format=123,456;format=123,456;format=123,456;format=123456
;format=123456;format=123456;format=123,456;format=123,456
;format=123,456

core.git: sc/qa sc/source

[Laurent Balland (via logerrit)]

 sc/qa/uitest/data/tdf129701.ods|binary
 sc/qa/uitest/pasteSpecial/tdf129701-PasteUnformated.py |   70 +
 sc/source/ui/docshell/impex.cxx|   19 +++-
 3 files changed, 86 insertions(+), 3 deletions(-)

New commits:
commit e66ffda7c7f1e78dbca082ff7549ded121dc7356
Author: Laurent Balland 
AuthorDate: Thu Dec 7 19:38:54 2023 +0100
Commit: Laurent Balland 
CommitDate: Sat Feb 17 08:58:55 2024 +0100

tdf#129701 Skip empty cell: treat last column

When pasting data as text, with "Skip empty cells" not checked, empty
cells in the last column of the source do not empty cells in
destination, because there is nothing anymore to paste and while loop
stops.
This commit adds a flag to check if the last cell of each line is empty,
and treat it if "Skip empty cells" is not checked.

Add UITest to Copy data with empty cells;
Paste Unformatted text, without "Skip empty cells";
Check data with empty cells in last column.

Change-Id: Idec823fb1c27b803f49c6d13d6c757ef0f41e437
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160951
Tested-by: Jenkins
Reviewed-by: Laurent Balland 

diff --git a/sc/qa/uitest/data/tdf129701.ods b/sc/qa/uitest/data/tdf129701.ods
new file mode 100644
index ..94407fcd566e
Binary files /dev/null and b/sc/qa/uitest/data/tdf129701.ods differ
diff --git a/sc/qa/uitest/pasteSpecial/tdf129701-PasteUnformated.py 
b/sc/qa/uitest/pasteSpecial/tdf129701-PasteUnformated.py
new file mode 100644
index ..596cd62f8bc1
--- /dev/null
+++ b/sc/qa/uitest/pasteSpecial/tdf129701-PasteUnformated.py
@@ -0,0 +1,70 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-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/.
+#
+from uitest.framework import UITestCase
+from libreoffice.uno.propertyvalue import mkPropertyValues
+from uitest.uihelper.common import get_url_for_data_file
+from uitest.uihelper.common import get_state_as_dict
+from libreoffice.calc.document import get_cell_by_position
+
+class tdf129701(UITestCase):
+
+def test_tdf129701(self):
+
+with self.ui_test.load_file(get_url_for_data_file("tdf129701.ods")):
+xCalcDoc = self.xUITest.getTopFocusWindow()
+gridwin = xCalcDoc.getChild("grid_window")
+gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": 
"D21:F25"}))
+self.xUITest.executeCommand(".uno:Copy")
+
+gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "J4"}))
+with 
self.ui_test.execute_dialog_through_command(".uno:PasteUnformatted", 
close_button="ok") as xDialog:
+
+xSkipEmtyCells   = xDialog.getChild("skipemptycells")
+xSeparatedBy = xDialog.getChild("toseparatedby")
+xTab = xDialog.getChild("tab")
+xMergeDelimiters = xDialog.getChild("mergedelimiters")
+
+xSeparatedBy.executeAction("CLICK", tuple())
+if get_state_as_dict(xTab)['Selected'] == 'false':
+xTab.executeAction("CLICK", tuple())
+if get_state_as_dict(xMergeDelimiters)['Selected'] == 'true':
+xMergeDelimiters.executeAction("CLICK", tuple())
+if get_state_as_dict(xSkipEmtyCells)['Selected'] == 'true':
+xSkipEmtyCells.executeAction("CLICK", tuple())
+# Check wether Skip empty cells is unselected
+self.assertEqual('false', 
get_state_as_dict(xSkipEmtyCells)['Selected'])
+
+document = self.ui_test.get_component()
+# Without the fix in place, this test would have failed with
+# non empty cells in column 11
+
+self.assertEqual( "x1", get_cell_by_position(document, 0, 9, 
3).getString())
+self.assertEqual( ""  , get_cell_by_position(document, 0,10, 
3).getString())
+self.assertEqual( ""  , get_cell_by_position(document, 0,11, 
3).getString())
+self.assertEqual("A16", get_cell_by_position(document, 0,12, 
3).getString())
+self.assertEqual( ""  , get_cell_by_position(document, 0, 9, 
4).getString())
+self.assertEqual( "x2", get_cell_by_position(document, 0,10, 
4).getString())
+self.assertEqual( ""  , get_cell_by_position(document, 0,11, 
4).getString())
+self.assertEqual("A17", get_cell_by_position(document, 0,12, 
4).getString())
+self.assertEqual( ""  , get_cell_by_position(document, 0, 9, 
5).getString())
+self.assertEqual( ""  , get_cell_by_position(document, 0,10, 
5).getString())
+self.assertEqual( "x3", get_cell_by_position(document, 0,11, 
5).getString())
+

core.git: extras/source

[Laurent Balland (via logerrit)]

 extras/source/templates/presnt/Candy/README.txt |6 --
 extras/source/templates/presnt/Candy/meta.xml   |   15 +
 extras/source/templates/presnt/Freshes/README.md|   41 --
 extras/source/templates/presnt/Freshes/meta.xml |   46 
 extras/source/templates/presnt/Grey_Elegant/README.txt  |   22 ---
 extras/source/templates/presnt/Grey_Elegant/meta.xml|   24 
 extras/source/templates/presnt/Growing_Liberty/meta.xml |   22 +++
 extras/source/templates/presnt/Yellow_Idea/meta.xml |   17 +
 8 files changed, 123 insertions(+), 70 deletions(-)

New commits:
commit 4f6143ac17cd36f33828136d2b1e3dbd5833e30c
Author: Laurent Balland 
AuthorDate: Fri Dec 29 11:43:04 2023 +0100
Commit: Laurent Balland 
CommitDate: Tue Jan 2 13:01:08 2024 +0100

tdf#158863 Move README to meta.xml

Impress templates from Indonesian community contain some README files,
containing authors name and licences information. They are only
available in source code.
This commit removes these README files and move information to meta.xml
file, dc:decription element. This information is now available to user
in dialog: File > Properties > Description

It needs to delete also 
extras/source/templates/presnt/Growing_Liberty/readme.txt
As this file is using CR/LF as end of line, I cannot remove it through 
normal git/gerrit process.

Change-Id: Ic815b6da7a8c2e1975518aafd3965ebf2b08fc20
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161501
Tested-by: Laurent Balland 
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/extras/source/templates/presnt/Candy/README.txt 
b/extras/source/templates/presnt/Candy/README.txt
deleted file mode 100644
index 4b2fdace13c7..
--- a/extras/source/templates/presnt/Candy/README.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-This work is licensed under the Creative Commons Attribution-ShareAlike 4.0 
International License by Ermin D. Alita, Annisa Aulia Rasyidah, Laila Muhdi, 
Cahyaning Asih, and @li_Orch.
-To view a copy of this license, visit 
https://creativecommons.org/licenses/by-sa/4.0/legalcode or send a letter to 
Creative Commons,
-PO Box 1866, Mountain View, CA 94042, USA.
-And also this work is using Montserrat Font wich this fonts are licensed under 
the Open Fonts License (OFL).
-You can get this font on https://fonts.google.com/specimen/Montserrat.
-For the best result please make sure the mentioned font are already installed.
diff --git a/extras/source/templates/presnt/Candy/meta.xml 
b/extras/source/templates/presnt/Candy/meta.xml
index 66de12078d07..8ea57748ce74 100644
--- a/extras/source/templates/presnt/Candy/meta.xml
+++ b/extras/source/templates/presnt/Candy/meta.xml
@@ -1,6 +1,21 @@
 
 http://openoffice.org/2009/office; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#; 
xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" 
xmlns:dc="http://purl.org/dc/elements/1.1/; 
xmlns:xlink="http://www.w3.org/1999/xlink; 
xmlns:ooo="http://openoffice.org/2004/office; 
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" 
office:version="1.3">
   
+Ermin D. Alita, Annisa Aulia Rasyidah, Laila Muhdi, 
Cahyaning Asih, and @li_Orch
 Candy
+
+   Candy - LibreOffice Impress Template
+by by Ermin D. Alita, Annisa Aulia Rasyidah, Laila Muhdi, Cahyaning Asih, and 
@li_Orch
+
+This template is made as an answer to Indonesian LibreOffice Community and
+Gimpscape ID's call-to-arms to contribute to the 10th anniversary of
+LibreOffice celebration.
+
+This work is licensed under the Creative Commons Attribution-ShareAlike 4.0 
International License
+by Ermin D. Alita, Annisa Aulia Rasyidah, Laila Muhdi, Cahyaning Asih, and 
@li_Orch.
+To view a copy of this license, visit 
https://creativecommons.org/licenses/by-sa/4.0/legalcode
+or send a letter to Creative Commons,
+PO Box 1866, Mountain View, CA 94042, USA.
+
   
 
diff --git a/extras/source/templates/presnt/Freshes/README.md 
b/extras/source/templates/presnt/Freshes/README.md
deleted file mode 100644
index 6516bfa598af..
--- a/extras/source/templates/presnt/Freshes/README.md
+++ /dev/null
@@ -1,41 +0,0 @@
-#Freshes LOImpress Template by Risyad Rais
-Freshes LOImpress Template is supposed to be a template for LibreOffice
-Impress. But I guess calling it a placeholder or sample slides might be even
-more suitable since it's not really optimized properly for LibreOffice Impress
-Workflow.
-This template is made as an answer to Indonesian LibreOffice Community and
-Gimpscape ID's call-to-arms to contribute to the 10th anniversary of
-LibreOffice celebration.
-##How to:
-It's recommended to install Lato font family for this template.
-###Normal slides:
-1. Duplicate the slide you want to edit
-2. Edit the texts
-3. 

core.git: Branch 'libreoffice-24-2' - 3 commits - extras/source

[Laurent Balland (via logerrit)]

 
extras/source/templates/presnt/Grey_Elegant/Pictures/12010019001945D72F17575B71B4.png
 |binary
 
extras/source/templates/presnt/Grey_Elegant/Pictures/1201001900194F0EE08BB7018624.png
 |binary
 
extras/source/templates/presnt/Grey_Elegant/Pictures/12010019001967D610D5BD5B9486.png
 |binary
 
extras/source/templates/presnt/Grey_Elegant/Pictures/120100190019B19ADF33FD67D860.png
 |binary
 
extras/source/templates/presnt/Grey_Elegant/Pictures/120100190019CA03B954885E470D.png
 |binary
 
extras/source/templates/presnt/Grey_Elegant/Pictures/12010330026455AC9786240DB2F8.png
 |binary
 
extras/source/templates/presnt/Piano/Pictures/13540120266623530F1969D0.png
|binary
 
extras/source/templates/presnt/Vintage/Pictures/1058001F99D2A38C014B254B.png
  |binary
 
extras/source/templates/presnt/Yellow_Idea/Pictures/1201001A001A21D7EADBA56038F4.png
  |binary
 
extras/source/templates/presnt/Yellow_Idea/Pictures/120100410019BACEF928CB2A84CB.png
  |binary
 
extras/source/templates/presnt/Yellow_Idea/Pictures/1201004D008BE35F31AC2914377D.png
  |binary
 
extras/source/templates/presnt/Yellow_Idea/Pictures/1201004E00192EFFFDEF12FDB2A8.png
  |binary
 
extras/source/templates/presnt/Yellow_Idea/Pictures/1201009E00BD075AA48B79110C47.png
  |binary
 13 files changed

New commits:
commit 1345eba186501f75d9bc814875d7946a36679796
Author: Laurent Balland 
AuthorDate: Sun Dec 10 12:16:18 2023 +0100
Commit: Xisco Fauli 
CommitDate: Tue Dec 12 09:40:16 2023 +0100

tdf#158250 Vivid, Piano templates: replace pictures

Contribution from Jérôme Bouat
Replace pictures with grey level

Change-Id: Ib8522871404261e81c25b50ac1ee073058e0dce5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160533
Tested-by: Jenkins
Reviewed-by: Laurent Balland 
(cherry picked from commit 6fda99d874d73f93b51e483e29b85b69333acef9)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160484
Reviewed-by: Xisco Fauli 

diff --git 
a/extras/source/templates/presnt/Piano/Pictures/13540120266623530F1969D0.png
 
b/extras/source/templates/presnt/Piano/Pictures/13540120266623530F1969D0.png
index df16d704c26c..4755736ed78b 100644
Binary files 
a/extras/source/templates/presnt/Piano/Pictures/13540120266623530F1969D0.png
 and 
b/extras/source/templates/presnt/Piano/Pictures/13540120266623530F1969D0.png
 differ
diff --git 
a/extras/source/templates/presnt/Vintage/Pictures/1058001F99D2A38C014B254B.png
 
b/extras/source/templates/presnt/Vintage/Pictures/1058001F99D2A38C014B254B.png
index 51f498c0f76f..a7264148dc75 100644
Binary files 
a/extras/source/templates/presnt/Vintage/Pictures/1058001F99D2A38C014B254B.png
 and 
b/extras/source/templates/presnt/Vintage/Pictures/1058001F99D2A38C014B254B.png
 differ
commit 3f1b1400ca1341385f70a1f8edc3ea74ce9f1d85
Author: Laurent Balland 
AuthorDate: Sun Dec 10 12:29:09 2023 +0100
Commit: Xisco Fauli 
CommitDate: Tue Dec 12 09:40:07 2023 +0100

tdf#158250 Grey Elegant template: replace pictures

Contribution from Jérôme Bouat
Replace pictures with grey level

Change-Id: If56958228085a77a61e867622a7a1a48e127745c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160535
Tested-by: Jenkins
Reviewed-by: Laurent Balland 
(cherry picked from commit b91d7649a6c2be19439b9c042ee9520c32e621e4)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160483
Reviewed-by: Xisco Fauli 

diff --git 
a/extras/source/templates/presnt/Grey_Elegant/Pictures/12010019001945D72F17575B71B4.png
 
b/extras/source/templates/presnt/Grey_Elegant/Pictures/12010019001945D72F17575B71B4.png
index ac31c1f71c18..5e7b03557265 100644
Binary files 
a/extras/source/templates/presnt/Grey_Elegant/Pictures/12010019001945D72F17575B71B4.png
 and 
b/extras/source/templates/presnt/Grey_Elegant/Pictures/12010019001945D72F17575B71B4.png
 differ
diff --git 
a/extras/source/templates/presnt/Grey_Elegant/Pictures/1201001900194F0EE08BB7018624.png
 
b/extras/source/templates/presnt/Grey_Elegant/Pictures/1201001900194F0EE08BB7018624.png
index 16cbe3dd99f7..22d7ddc628c9 100644
Binary files 
a/extras/source/templates/presnt/Grey_Elegant/Pictures/1201001900194F0EE08BB7018624.png
 and 
b/extras/source/templates/presnt/Grey_Elegant/Pictures/1201001900194F0EE08BB7018624.png
 differ
diff --git 
a/extras/source/templates/presnt/Grey_Elegant/Pictures/12010019001967D610D5BD5B9486.png
 
b/extras/source/templates/presnt/Grey_Elegant/Pictures/12010019001967D610D5BD5B9486.png
index 1a3676b65be3..690dd493eb8d 100644
Binary files 

core.git: Branch 'libreoffice-24-2' - 2 commits - extras/source sw/qa sw/source

[Laurent Balland (via logerrit)]

 
extras/source/templates/presnt/Blueprint_Plans/Pictures/1058001F99D2A38C014B254B.png
 |binary
 
extras/source/templates/presnt/Blueprint_Plans/Pictures/133C026D847ACE982C6E20B6.png
 |binary
 
extras/source/templates/presnt/Blueprint_Plans/Pictures/1201050002D0F25E20EA381A5EBD.png
 |binary
 sw/qa/extras/rtfexport/rtfexport6.cxx  
  |   12 --
 sw/source/filter/ww8/rtfattributeoutput.cxx
  |8 +-
 sw/source/filter/ww8/wrtw8nds.cxx  
  |7 +
 6 files changed, 18 insertions(+), 9 deletions(-)

New commits:
commit 0be761900d69febd9ccb2a6a88b6183416d09c7b
Author: Laurent Balland 
AuthorDate: Sun Dec 10 12:01:43 2023 +0100
Commit: Xisco Fauli 
CommitDate: Tue Dec 12 09:39:18 2023 +0100

tdf#158250 Blueprint Plans template: update images

Contribution from Jérôme Bouat
Replace pictures with grey level and indexed colours

Change-Id: I5e253af65529d45b3c9ed2e30f6e2f018cbe03e7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160532
Tested-by: Jenkins
Reviewed-by: Laurent Balland 
(cherry picked from commit 7cfd3da36b54301fd51189282b39c71efd6bb894)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160481
Reviewed-by: Xisco Fauli 

diff --git 
a/extras/source/templates/presnt/Blueprint_Plans/Pictures/1058001F99D2A38C014B254B.png
 
b/extras/source/templates/presnt/Blueprint_Plans/Pictures/1058001F99D2A38C014B254B.png
index 51f498c0f76f..a7264148dc75 100644
Binary files 
a/extras/source/templates/presnt/Blueprint_Plans/Pictures/1058001F99D2A38C014B254B.png
 and 
b/extras/source/templates/presnt/Blueprint_Plans/Pictures/1058001F99D2A38C014B254B.png
 differ
diff --git 
a/extras/source/templates/presnt/Blueprint_Plans/Pictures/133C026D847ACE982C6E20B6.png
 
b/extras/source/templates/presnt/Blueprint_Plans/Pictures/133C026D847ACE982C6E20B6.png
index df9e0e0ccd29..084ab4241606 100644
Binary files 
a/extras/source/templates/presnt/Blueprint_Plans/Pictures/133C026D847ACE982C6E20B6.png
 and 
b/extras/source/templates/presnt/Blueprint_Plans/Pictures/133C026D847ACE982C6E20B6.png
 differ
diff --git 
a/extras/source/templates/presnt/Blueprint_Plans/Pictures/1201050002D0F25E20EA381A5EBD.png
 
b/extras/source/templates/presnt/Blueprint_Plans/Pictures/1201050002D0F25E20EA381A5EBD.png
index fa93caf0..4dc77fde421f 100644
Binary files 
a/extras/source/templates/presnt/Blueprint_Plans/Pictures/1201050002D0F25E20EA381A5EBD.png
 and 
b/extras/source/templates/presnt/Blueprint_Plans/Pictures/1201050002D0F25E20EA381A5EBD.png
 differ
commit ecf9e5b85ae1fae2ee3dc8db2b70aeb8202225f2
Author: Justin Luth 
AuthorDate: Tue Dec 5 21:43:16 2023 -0500
Commit: Xisco Fauli 
CommitDate: Tue Dec 12 09:39:05 2023 +0100

tdf#108505 rtfexport: avoid mis-inheriting field char settings

The field result fully defines its own character properties,
so it should not inherit any "parent" properties from the field.

My test file didn't show any problems with DOCX or DOC,
and reading through the code I didn't notice anything
that looked wrong. Both are very different from RTF syntax,
and it didn't look like they did anything "special"
for this situation, so nothing to copy from...

This whole area of field properties looks very hacky,
but it seems pretty clear that OutputTextNode
loops through OutAttr's run properties for each of
start/sep/end for fields. OutAttr picks up all of the
direct formatting, so nothing should be "missing",
and therefore a \plain character reset should be appropriate.

The good news is that MS Word 2010 imported both the bad
and the good export just like we do.

make CppunitTest_sw_rtfexport6 \
CPPUNIT_TEST_NAME=testTdf108505_fieldCharFormat2


Change-Id: I713c071dfcd40117bfff03d152718eb5d847327e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160375
Tested-by: Jenkins
Reviewed-by: Justin Luth 
Reviewed-by: Miklos Vajna 
(cherry picked from commit 5f888fa920c99cce91dfd18244a5c3869807b970)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160580
Reviewed-by: Xisco Fauli 

diff --git a/sw/qa/extras/rtfexport/rtfexport6.cxx 
b/sw/qa/extras/rtfexport/rtfexport6.cxx
index 275d2593d2df..ff331caa7307 100644
--- a/sw/qa/extras/rtfexport/rtfexport6.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport6.cxx
@@ -178,21 +178,19 @@ DECLARE_RTFEXPORT_TEST(testTdf108505_fieldCharFormat, 
"tdf108505_fieldCharFormat
 
 DECLARE_RTFEXPORT_TEST(testTdf108505_fieldCharFormat2, 
"tdf108505_fieldCharFormat2.rtf")
 {
-// not exported 

core.git: 2 commits - extras/source

[Laurent Balland (via logerrit)]

 
extras/source/templates/presnt/Blueprint_Plans/Pictures/1058001F99D2A38C014B254B.png
 |binary
 
extras/source/templates/presnt/Blueprint_Plans/Pictures/133C026D847ACE982C6E20B6.png
 |binary
 
extras/source/templates/presnt/Blueprint_Plans/Pictures/1201050002D0F25E20EA381A5EBD.png
 |binary
 
extras/source/templates/presnt/Yellow_Idea/Pictures/1201001A001A21D7EADBA56038F4.png
 |binary
 
extras/source/templates/presnt/Yellow_Idea/Pictures/120100410019BACEF928CB2A84CB.png
 |binary
 
extras/source/templates/presnt/Yellow_Idea/Pictures/1201004D008BE35F31AC2914377D.png
 |binary
 
extras/source/templates/presnt/Yellow_Idea/Pictures/1201004E00192EFFFDEF12FDB2A8.png
 |binary
 
extras/source/templates/presnt/Yellow_Idea/Pictures/1201009E00BD075AA48B79110C47.png
 |binary
 8 files changed

New commits:
commit 7cfd3da36b54301fd51189282b39c71efd6bb894
Author: Laurent Balland 
AuthorDate: Sun Dec 10 12:01:43 2023 +0100
Commit: Laurent Balland 
CommitDate: Sun Dec 10 17:18:32 2023 +0100

tdf#158250 Blueprint Plans template: update images

Contribution from Jérôme Bouat
Replace pictures with grey level and indexed colours

Change-Id: I5e253af65529d45b3c9ed2e30f6e2f018cbe03e7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160532
Tested-by: Jenkins
Reviewed-by: Laurent Balland 

diff --git 
a/extras/source/templates/presnt/Blueprint_Plans/Pictures/1058001F99D2A38C014B254B.png
 
b/extras/source/templates/presnt/Blueprint_Plans/Pictures/1058001F99D2A38C014B254B.png
index 51f498c0f76f..a7264148dc75 100644
Binary files 
a/extras/source/templates/presnt/Blueprint_Plans/Pictures/1058001F99D2A38C014B254B.png
 and 
b/extras/source/templates/presnt/Blueprint_Plans/Pictures/1058001F99D2A38C014B254B.png
 differ
diff --git 
a/extras/source/templates/presnt/Blueprint_Plans/Pictures/133C026D847ACE982C6E20B6.png
 
b/extras/source/templates/presnt/Blueprint_Plans/Pictures/133C026D847ACE982C6E20B6.png
index df9e0e0ccd29..084ab4241606 100644
Binary files 
a/extras/source/templates/presnt/Blueprint_Plans/Pictures/133C026D847ACE982C6E20B6.png
 and 
b/extras/source/templates/presnt/Blueprint_Plans/Pictures/133C026D847ACE982C6E20B6.png
 differ
diff --git 
a/extras/source/templates/presnt/Blueprint_Plans/Pictures/1201050002D0F25E20EA381A5EBD.png
 
b/extras/source/templates/presnt/Blueprint_Plans/Pictures/1201050002D0F25E20EA381A5EBD.png
index fa93caf0..4dc77fde421f 100644
Binary files 
a/extras/source/templates/presnt/Blueprint_Plans/Pictures/1201050002D0F25E20EA381A5EBD.png
 and 
b/extras/source/templates/presnt/Blueprint_Plans/Pictures/1201050002D0F25E20EA381A5EBD.png
 differ
commit 9168109f39a587a14c65b5b22103c909d6a6054e
Author: Laurent Balland 
AuthorDate: Sun Dec 10 12:22:12 2023 +0100
Commit: Laurent Balland 
CommitDate: Sun Dec 10 17:18:19 2023 +0100

tdf#158250 Yellow Idea template: replace pictures

Contribution from Jérôme Bouat
Replace pictures with grey level

Change-Id: I933b20ad7b06d60e8039caaf8ce777bb52ce4225
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160534
Tested-by: Jenkins
Reviewed-by: Laurent Balland 

diff --git 
a/extras/source/templates/presnt/Yellow_Idea/Pictures/1201001A001A21D7EADBA56038F4.png
 
b/extras/source/templates/presnt/Yellow_Idea/Pictures/1201001A001A21D7EADBA56038F4.png
index c6e585c3d8b6..ee4897033c32 100644
Binary files 
a/extras/source/templates/presnt/Yellow_Idea/Pictures/1201001A001A21D7EADBA56038F4.png
 and 
b/extras/source/templates/presnt/Yellow_Idea/Pictures/1201001A001A21D7EADBA56038F4.png
 differ
diff --git 
a/extras/source/templates/presnt/Yellow_Idea/Pictures/120100410019BACEF928CB2A84CB.png
 
b/extras/source/templates/presnt/Yellow_Idea/Pictures/120100410019BACEF928CB2A84CB.png
index 028f13522c81..369336dc2f6c 100644
Binary files 
a/extras/source/templates/presnt/Yellow_Idea/Pictures/120100410019BACEF928CB2A84CB.png
 and 
b/extras/source/templates/presnt/Yellow_Idea/Pictures/120100410019BACEF928CB2A84CB.png
 differ
diff --git 
a/extras/source/templates/presnt/Yellow_Idea/Pictures/1201004D008BE35F31AC2914377D.png
 
b/extras/source/templates/presnt/Yellow_Idea/Pictures/1201004D008BE35F31AC2914377D.png
index 6482e91b58dd..c7b5270e0046 100644
Binary files 
a/extras/source/templates/presnt/Yellow_Idea/Pictures/1201004D008BE35F31AC2914377D.png
 and 
b/extras/source/templates/presnt/Yellow_Idea/Pictures/1201004D008BE35F31AC2914377D.png
 differ
diff --git 
a/extras/source/templates/presnt/Yellow_Idea/Pictures/1201004E00192EFFFDEF12FDB2A8.png
 

core.git: 2 commits - extras/source

[Laurent Balland (via logerrit)]

 
extras/source/templates/presnt/Grey_Elegant/Pictures/12010019001945D72F17575B71B4.png
 |binary
 
extras/source/templates/presnt/Grey_Elegant/Pictures/1201001900194F0EE08BB7018624.png
 |binary
 
extras/source/templates/presnt/Grey_Elegant/Pictures/12010019001967D610D5BD5B9486.png
 |binary
 
extras/source/templates/presnt/Grey_Elegant/Pictures/120100190019B19ADF33FD67D860.png
 |binary
 
extras/source/templates/presnt/Grey_Elegant/Pictures/120100190019CA03B954885E470D.png
 |binary
 
extras/source/templates/presnt/Grey_Elegant/Pictures/12010330026455AC9786240DB2F8.png
 |binary
 
extras/source/templates/presnt/Piano/Pictures/13540120266623530F1969D0.png
|binary
 
extras/source/templates/presnt/Vintage/Pictures/1058001F99D2A38C014B254B.png
  |binary
 8 files changed

New commits:
commit b91d7649a6c2be19439b9c042ee9520c32e621e4
Author: Laurent Balland 
AuthorDate: Sun Dec 10 12:29:09 2023 +0100
Commit: Laurent Balland 
CommitDate: Sun Dec 10 17:18:06 2023 +0100

tdf#158250 Grey Elegant template: replace pictures

Contribution from Jérôme Bouat
Replace pictures with grey level

Change-Id: If56958228085a77a61e867622a7a1a48e127745c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160535
Tested-by: Jenkins
Reviewed-by: Laurent Balland 

diff --git 
a/extras/source/templates/presnt/Grey_Elegant/Pictures/12010019001945D72F17575B71B4.png
 
b/extras/source/templates/presnt/Grey_Elegant/Pictures/12010019001945D72F17575B71B4.png
index ac31c1f71c18..5e7b03557265 100644
Binary files 
a/extras/source/templates/presnt/Grey_Elegant/Pictures/12010019001945D72F17575B71B4.png
 and 
b/extras/source/templates/presnt/Grey_Elegant/Pictures/12010019001945D72F17575B71B4.png
 differ
diff --git 
a/extras/source/templates/presnt/Grey_Elegant/Pictures/1201001900194F0EE08BB7018624.png
 
b/extras/source/templates/presnt/Grey_Elegant/Pictures/1201001900194F0EE08BB7018624.png
index 16cbe3dd99f7..22d7ddc628c9 100644
Binary files 
a/extras/source/templates/presnt/Grey_Elegant/Pictures/1201001900194F0EE08BB7018624.png
 and 
b/extras/source/templates/presnt/Grey_Elegant/Pictures/1201001900194F0EE08BB7018624.png
 differ
diff --git 
a/extras/source/templates/presnt/Grey_Elegant/Pictures/12010019001967D610D5BD5B9486.png
 
b/extras/source/templates/presnt/Grey_Elegant/Pictures/12010019001967D610D5BD5B9486.png
index 1a3676b65be3..690dd493eb8d 100644
Binary files 
a/extras/source/templates/presnt/Grey_Elegant/Pictures/12010019001967D610D5BD5B9486.png
 and 
b/extras/source/templates/presnt/Grey_Elegant/Pictures/12010019001967D610D5BD5B9486.png
 differ
diff --git 
a/extras/source/templates/presnt/Grey_Elegant/Pictures/120100190019B19ADF33FD67D860.png
 
b/extras/source/templates/presnt/Grey_Elegant/Pictures/120100190019B19ADF33FD67D860.png
index afa1d1541ec9..fee4dbad2003 100644
Binary files 
a/extras/source/templates/presnt/Grey_Elegant/Pictures/120100190019B19ADF33FD67D860.png
 and 
b/extras/source/templates/presnt/Grey_Elegant/Pictures/120100190019B19ADF33FD67D860.png
 differ
diff --git 
a/extras/source/templates/presnt/Grey_Elegant/Pictures/120100190019CA03B954885E470D.png
 
b/extras/source/templates/presnt/Grey_Elegant/Pictures/120100190019CA03B954885E470D.png
index 3a6a13e37ffb..d974e642e2be 100644
Binary files 
a/extras/source/templates/presnt/Grey_Elegant/Pictures/120100190019CA03B954885E470D.png
 and 
b/extras/source/templates/presnt/Grey_Elegant/Pictures/120100190019CA03B954885E470D.png
 differ
diff --git 
a/extras/source/templates/presnt/Grey_Elegant/Pictures/12010330026455AC9786240DB2F8.png
 
b/extras/source/templates/presnt/Grey_Elegant/Pictures/12010330026455AC9786240DB2F8.png
index 52664f895960..71dd76d1f922 100644
Binary files 
a/extras/source/templates/presnt/Grey_Elegant/Pictures/12010330026455AC9786240DB2F8.png
 and 
b/extras/source/templates/presnt/Grey_Elegant/Pictures/12010330026455AC9786240DB2F8.png
 differ
commit 6fda99d874d73f93b51e483e29b85b69333acef9
Author: Laurent Balland 
AuthorDate: Sun Dec 10 12:16:18 2023 +0100
Commit: Laurent Balland 
CommitDate: Sun Dec 10 17:17:52 2023 +0100

tdf#158250 Vivid, Piano templates: replace pictures

Contribution from Jérôme Bouat
Replace pictures with grey level

Change-Id: Ib8522871404261e81c25b50ac1ee073058e0dce5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160533
Tested-by: Jenkins
Reviewed-by: Laurent Balland 

diff --git 
a/extras/source/templates/presnt/Piano/Pictures/13540120266623530F1969D0.png
 

core.git: sd/source

[Laurent Balland (via logerrit)]

 sd/source/core/stlsheet.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0b504bb12e4d563d1505e9c2039cbbd723cf1162
Author: Laurent Balland 
AuthorDate: Sun Dec 3 13:58:11 2023 +0100
Commit: Laurent Balland 
CommitDate: Thu Dec 7 16:56:36 2023 +0100

tdf#158500 missing style Object with no fill no line

Style "Object with no fill no line" was not correctly treated during
automatic translation to UI language

Change-Id: I9364b25e326387110af81494d7fa5e4c05b5f972
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160262
Tested-by: Jenkins
Reviewed-by: Laurent Balland 

diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 391cd8eada8a..e262e7a713ff 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -621,6 +621,7 @@ struct ApiNameMap
 { std::u16string_view(u"notes"), HID_PSEUDOSHEET_NOTES },
 { std::u16string_view(u"standard"), HID_STANDARD_STYLESHEET_NAME },
 { std::u16string_view(u"objectwithoutfill"), 
HID_POOLSHEET_OBJWITHOUTFILL },
+{ std::u16string_view(u"Object with no fill and no line"), 
HID_POOLSHEET_OBJNOLINENOFILL },
 
 { std::u16string_view(u"Text"), HID_POOLSHEET_TEXT },
 { std::u16string_view(u"A4"), HID_POOLSHEET_A4 },

core.git: extras/source

[Laurent Balland (via logerrit)]

 
extras/source/templates/presnt/Candy/Pictures/14A80500DD5BB9FFED422172.png
 |binary
 
extras/source/templates/presnt/Candy/Pictures/1500050014DEA376B6E67205.png
 |binary
 
extras/source/templates/presnt/Candy/Pictures/1201070E007A072587FC46AD7996.png
 |binary
 3 files changed

New commits:
commit c805fac1715e4955708299334e95d0dff47e32d7
Author: Laurent Balland 
AuthorDate: Sun Dec 3 11:02:12 2023 +0100
Commit: Laurent Balland 
CommitDate: Thu Dec 7 16:48:32 2023 +0100

tdf#158250 Candy Impress template: replace picture

Contribution from Jérôme Bouat
Replace 24 bits color picture by 8 bits color picture

Change-Id: If4f2f3a75f475a9dc0b43be4e0e8afdb98a0eaa8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160256
Tested-by: Jenkins
Reviewed-by: Laurent Balland 

diff --git 
a/extras/source/templates/presnt/Candy/Pictures/14A80500DD5BB9FFED422172.png
 
b/extras/source/templates/presnt/Candy/Pictures/14A80500DD5BB9FFED422172.png
index 716d36b84fab..a3c806107c4c 100644
Binary files 
a/extras/source/templates/presnt/Candy/Pictures/14A80500DD5BB9FFED422172.png
 and 
b/extras/source/templates/presnt/Candy/Pictures/14A80500DD5BB9FFED422172.png
 differ
diff --git 
a/extras/source/templates/presnt/Candy/Pictures/1500050014DEA376B6E67205.png
 
b/extras/source/templates/presnt/Candy/Pictures/1500050014DEA376B6E67205.png
index 2d9b683e3070..8d946f2fce9c 100644
Binary files 
a/extras/source/templates/presnt/Candy/Pictures/1500050014DEA376B6E67205.png
 and 
b/extras/source/templates/presnt/Candy/Pictures/1500050014DEA376B6E67205.png
 differ
diff --git 
a/extras/source/templates/presnt/Candy/Pictures/1201070E007A072587FC46AD7996.png
 
b/extras/source/templates/presnt/Candy/Pictures/1201070E007A072587FC46AD7996.png
index c51184593c96..dcf392c69f3a 100644
Binary files 
a/extras/source/templates/presnt/Candy/Pictures/1201070E007A072587FC46AD7996.png
 and 
b/extras/source/templates/presnt/Candy/Pictures/1201070E007A072587FC46AD7996.png
 differ

[Libreoffice-commits] core.git: extras/source

[Laurent Balland (via logerrit)]

 extras/source/templates/presnt/Beehive/styles.xml |6 +++---
 extras/source/templates/presnt/Blue_Curve/styles.xml  |6 +++---
 extras/source/templates/presnt/Blueprint_Plans/styles.xml |6 +++---
 extras/source/templates/presnt/Candy/styles.xml   |6 +++---
 extras/source/templates/presnt/DNA/styles.xml |6 +++---
 extras/source/templates/presnt/Focus/styles.xml   |6 +++---
 extras/source/templates/presnt/Forestbird/styles.xml  |6 +++---
 extras/source/templates/presnt/Freshes/styles.xml |6 +++---
 extras/source/templates/presnt/Grey_Elegant/styles.xml|6 +++---
 extras/source/templates/presnt/Growing_Liberty/styles.xml |6 +++---
 extras/source/templates/presnt/Inspiration/styles.xml |6 +++---
 extras/source/templates/presnt/Lights/styles.xml  |6 +++---
 extras/source/templates/presnt/Midnightblue/styles.xml|6 +++---
 extras/source/templates/presnt/Pencil/styles.xml  |6 +++---
 extras/source/templates/presnt/Piano/styles.xml   |6 +++---
 extras/source/templates/presnt/Portfolio/styles.xml   |6 +++---
 extras/source/templates/presnt/Progress/styles.xml|6 +++---
 extras/source/templates/presnt/Sunset/styles.xml  |6 +++---
 extras/source/templates/presnt/Vivid/styles.xml   |6 +++---
 extras/source/templates/presnt/Yellow_Idea/styles.xml |6 +++---
 20 files changed, 60 insertions(+), 60 deletions(-)

New commits:
commit 0f82e9d42822e627edd1fb3b3c87e1f8a22136a4
Author: Laurent Balland 
AuthorDate: Sun Dec 3 11:38:04 2023 +0100
Commit: Laurent Balland 
CommitDate: Wed Dec 6 09:04:23 2023 +0100

tdf#158488 Impress templates: restore style hierarchy

Some templates were defining Title/Header/Text A0 styles with A4 as
parent. Reset it to A0

Change-Id: Ide7b0e5287d38991ad5149eacb80f600467039f1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160261
Tested-by: Jenkins
Reviewed-by: Laurent Balland 

diff --git a/extras/source/templates/presnt/Beehive/styles.xml 
b/extras/source/templates/presnt/Beehive/styles.xml
index 02d4d06cc9f4..74f40446049b 100644
--- a/extras/source/templates/presnt/Beehive/styles.xml
+++ b/extras/source/templates/presnt/Beehive/styles.xml
@@ -91,15 +91,15 @@
   
   
 
-
+
   
   
 
-
+
   
   
 
-
+
   
 
 
diff --git a/extras/source/templates/presnt/Blue_Curve/styles.xml 
b/extras/source/templates/presnt/Blue_Curve/styles.xml
index 7d6a90f4d70e..bc0420e28577 100644
--- a/extras/source/templates/presnt/Blue_Curve/styles.xml
+++ b/extras/source/templates/presnt/Blue_Curve/styles.xml
@@ -101,15 +101,15 @@
   
   
 
-
+
   
   
 
-
+
   
   
 
-
+
   
 
 
diff --git a/extras/source/templates/presnt/Blueprint_Plans/styles.xml 
b/extras/source/templates/presnt/Blueprint_Plans/styles.xml
index 745769d5a7d2..bd1b430c6cae 100644
--- a/extras/source/templates/presnt/Blueprint_Plans/styles.xml
+++ b/extras/source/templates/presnt/Blueprint_Plans/styles.xml
@@ -104,15 +104,15 @@
   
   
 
-
+
   
   
 
-
+
   
   
 
-
+
   
 
 
diff --git a/extras/source/templates/presnt/Candy/styles.xml 
b/extras/source/templates/presnt/Candy/styles.xml
index b839c8078818..da2008e0bf86 100644
--- a/extras/source/templates/presnt/Candy/styles.xml
+++ b/extras/source/templates/presnt/Candy/styles.xml
@@ -112,15 +112,15 @@
   
   
 
-
+
   
   
 
-
+
   
   
 
-
+
   
 
 
diff --git a/extras/source/templates/presnt/DNA/styles.xml 
b/extras/source/templates/presnt/DNA/styles.xml
index ab202f0232a5..ac5a9da4739d 100644
--- a/extras/source/templates/presnt/DNA/styles.xml
+++ b/extras/source/templates/presnt/DNA/styles.xml
@@ -99,15 +99,15 @@
   
   
 
-
+
   
   
 
-
+
   
   
 
-
+
   
 
 
diff --git a/extras/source/templates/presnt/Focus/styles.xml 
b/extras/source/templates/presnt/Focus/styles.xml
index ea730ad66917..4d5464c0d1ad 100644
--- a/extras/source/templates/presnt/Focus/styles.xml
+++ b/extras/source/templates/presnt/Focus/styles.xml
@@ -103,15 +103,15 @@
   
   
 
-
+
   
   
 
-
+
   
   
 
-
+
   
 
 
diff --git a/extras/source/templates/presnt/Forestbird/styles.xml 
b/extras/source/templates/presnt/Forestbird/styles.xml
index 85b989dc1305..37f2285c8d03 100644
--- a/extras/source/templates/presnt/Forestbird/styles.xml
+++ b/extras/source/templates/presnt/Forestbird/styles.xml
@@ -100,15 +100,15 @@
   
   
 
-
+
   
   
 
-
+
   
   
 
-
+
   
 
 
diff --git 

[Libreoffice-commits] core.git: extras/source

[Laurent Balland (via logerrit)]

 extras/source/templates/presnt/Beehive/styles.xml  |2 
 extras/source/templates/presnt/Blue_Curve/content.xml  |8 -
 extras/source/templates/presnt/DNA/content.xml |2 
 extras/source/templates/presnt/DNA/styles.xml  |   18 +-
 extras/source/templates/presnt/Focus/content.xml   |2 
 extras/source/templates/presnt/Focus/styles.xml|   74 
+-
 extras/source/templates/presnt/Nature_Illustration/content.xml |8 -
 extras/source/templates/presnt/Progress/content.xml|8 -
 extras/source/templates/presnt/Progress/styles.xml |   48 +++---
 extras/source/templates/presnt/Vivid/content.xml   |8 -
 extras/source/templates/presnt/Vivid/styles.xml|   38 ++---
 11 files changed, 93 insertions(+), 123 deletions(-)

New commits:
commit a9ad36ae46ff76c0d59b0d170314fdd3a9ee5d35
Author: Laurent Balland 
AuthorDate: Tue Nov 28 21:31:43 2023 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Tue Dec 5 23:20:39 2023 +0100

Impress templates: restore font declarations

Some warnings appear when opening the template due to some missing font
declarations
Remove date declaration
Fix some minor errors detected with ODFValidator
Focus: remove DejaVu Sans2 font declaration (duplicate)

Change-Id: I48a61d7df651d8113d5f15ba0c5877f6553e5003
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160064
Tested-by: Jenkins
Reviewed-by: Laurent Balland 
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/extras/source/templates/presnt/Beehive/styles.xml 
b/extras/source/templates/presnt/Beehive/styles.xml
index 43408af8019d..02d4d06cc9f4 100644
--- a/extras/source/templates/presnt/Beehive/styles.xml
+++ b/extras/source/templates/presnt/Beehive/styles.xml
@@ -441,7 +441,7 @@
 
 
   
-  
+  
 
 
   
diff --git a/extras/source/templates/presnt/Blue_Curve/content.xml 
b/extras/source/templates/presnt/Blue_Curve/content.xml
index a5e6a3954b3d..3e2190dea407 100644
--- a/extras/source/templates/presnt/Blue_Curve/content.xml
+++ b/extras/source/templates/presnt/Blue_Curve/content.xml
@@ -14,13 +14,6 @@
 
   
 
-
-  
-  .
-  
-  .
-  
-
 
   
 
@@ -54,7 +47,6 @@
   
   
 
-  
   
 
 
diff --git a/extras/source/templates/presnt/DNA/content.xml 
b/extras/source/templates/presnt/DNA/content.xml
index b10ed4dd4a19..0644ebd1eddc 100644
--- a/extras/source/templates/presnt/DNA/content.xml
+++ b/extras/source/templates/presnt/DNA/content.xml
@@ -4,6 +4,8 @@
   
 
 
+
+
   
   
 
diff --git a/extras/source/templates/presnt/DNA/styles.xml 
b/extras/source/templates/presnt/DNA/styles.xml
index bf3366a7ca3e..ab202f0232a5 100644
--- a/extras/source/templates/presnt/DNA/styles.xml
+++ b/extras/source/templates/presnt/DNA/styles.xml
@@ -68,7 +68,7 @@
 
   
   
-  
+  
 
 
   
@@ -78,7 +78,7 @@
 
 
   
-  
+  
 
 
   
@@ -112,7 +112,7 @@
 
 
   
-  
+  
 
 
   
@@ -127,7 +127,7 @@
 
 
   
-  
+  
 
 
   
@@ -179,12 +179,12 @@
 
   
   
-  
+  
 
 
   
   
-  
+  
 
 
   
@@ -232,7 +232,7 @@
 
   
   
-  
+  
 
 
   
@@ -299,7 +299,7 @@
 
   
   
-  
+  
 
 
   
@@ -347,7 +347,7 @@
 
   
   
-  
+  
 
 
   
diff --git a/extras/source/templates/presnt/Focus/content.xml 
b/extras/source/templates/presnt/Focus/content.xml
index fb38594989d0..1d88905e6b15 100644
--- a/extras/source/templates/presnt/Focus/content.xml
+++ b/extras/source/templates/presnt/Focus/content.xml
@@ -2,7 +2,7 @@
 http://www.w3.org/2003/g/data-view#; 
xmlns:xhtml="http://www.w3.org/1999/xhtml; 
xmlns:css3t="http://www.w3.org/TR/css3-text/; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema; 
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 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:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1
 .0" xmlns:ooo="http://openoffice.org/2004/office; 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" 

[Libreoffice-commits] core.git: extras/source

[Laurent Balland (via logerrit)]

 extras/source/templates/presnt/Vintage/styles.xml |   54 --
 1 file changed, 54 deletions(-)

New commits:
commit 23c300a06dbfb5399cf479d603e6f7fe1433d134
Author: Laurent Balland 
AuthorDate: Sun Dec 3 20:48:06 2023 +0100
Commit: Laurent Balland 
CommitDate: Tue Dec 5 14:49:58 2023 +0100

Vintage Impress template: remove unused styles

These old styles are used in the template and is no more in use in LO.
So they remain untranslated when changing UI language.

Change-Id: I130eb25df9b76783d498d6ab1e5191551b9a4d0f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160269
Tested-by: Jenkins
Reviewed-by: Laurent Balland 

diff --git a/extras/source/templates/presnt/Vintage/styles.xml 
b/extras/source/templates/presnt/Vintage/styles.xml
index a870b0926dcb..5bdd81803fd7 100644
--- a/extras/source/templates/presnt/Vintage/styles.xml
+++ b/extras/source/templates/presnt/Vintage/styles.xml
@@ -63,63 +63,9 @@
   
   
 
-
-  
-
-
-  
-
 
   
 
-
-  
-
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-  
-
-
-  
-  
-  
-
-
-  
-  
-  
-
-
-  
-  
-  
-
-
-  
-  
-  
-
-
-  
-  
-
 
   
   

[Libreoffice-commits] core.git: extras/source

[Laurent Balland (via logerrit)]

 extras/source/templates/presnt/Grey_Elegant/content.xml |  310 ++--
 extras/source/templates/presnt/Grey_Elegant/meta.xml|6 
 extras/source/templates/presnt/Grey_Elegant/styles.xml  |  604 ++--
 3 files changed, 490 insertions(+), 430 deletions(-)

New commits:
commit 146663cc75d3954ae4a4e2f6f1f64d831618b56f
Author: Laurent Balland 
AuthorDate: Sat Nov 4 10:40:50 2023 +0100
Commit: Laurent Balland 
CommitDate: Tue Dec 5 11:22:42 2023 +0100

tdf#158022 Grey Elegant template: restore placeholders

- Restore preview of slide in notes (master notes and notes, same size
  and position than other templates)
- Enable header/date-time/footer/page number in master notes
- Uniformisation of font Noto Sans
- Bring to front header and outlines
- Add date/time, footer and slide number on all master pages (except
  Title)
- Improve Header and Outline positions
- Use placeholders for example texts
- Move credits on master slide "Table of content" and slide 9 to
  meta.xml
- Change name of Title master page due to tdf#158496

Change-Id: I29eec8ad61fdf35a53be15678fd09aefc2b11a60
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158956
Tested-by: Jenkins
Reviewed-by: Laurent Balland 

diff --git a/extras/source/templates/presnt/Grey_Elegant/content.xml 
b/extras/source/templates/presnt/Grey_Elegant/content.xml
index 1f7b0d3fa9f2..4b274f28ec61 100644
--- a/extras/source/templates/presnt/Grey_Elegant/content.xml
+++ b/extras/source/templates/presnt/Grey_Elegant/content.xml
@@ -2,18 +2,8 @@
 http://openoffice.org/2009/office; 
xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" 
xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" 
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:css3t="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:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xmlns:rpt="http://openoffice.org/2005/report; 
xmlns:dc="http://purl.org/dc/elements/1.1/; 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:oooc="http://openoffice.org/2004/calc; 
xmlns:style="urn:oasis:names:tc:opendocument:
 xmlns:style:1.0" xmlns:ooow="http://openoffice.org/2004/writer; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:xlink="http://www.w3.org/1999/xlink; 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:ooo="http://openoffice.org/2004/office; 
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 xmlns:tableooo="http://openoffice.org/2009/table; 
xmlns:drawooo="http://openoffice.org/2010/draw; 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:dom="http://www.w3.org/2001/xml-events; 
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:xsd="ht
 tp://www.w3.org/2001/XMLSchema" 
xmlns:math="http://www.w3.org/1998/Math/MathML; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:xforms="http://www.w3.org/2002/xforms; office:version="1.3">
   
   
-
-
-
-
-
-
 
-
-
 
-
-
 
 
   
@@ -41,10 +31,6 @@
 
   
 
-
-  
-  
-
 
   
   
@@ -171,10 +157,6 @@
   
   
 
-
-  
-  
-
 
   
 
@@ -316,11 +298,6 @@
   
   
 
-
-  
-  
-  
-
 
   
   
@@ -362,7 +339,7 @@
 
   
   
-  
+  
 
 
   
@@ -399,14 +376,6 @@
   
   
 
-
-  
-
-
-  
-  
-  
-
 
   
   
@@ -447,9 +416,6 @@
 
   
 
-
-  
-
 
   
 
@@ -466,10 +432,7 @@
   
 
 
-  
-
-
-  
+  
 
 
   
@@ -513,63 +476,11 @@
 
   
 
-
-  
-
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-
-
-  

[Libreoffice-commits] core.git: extras/source

[Laurent Balland (via logerrit)]

 extras/source/templates/presnt/Freshes/content.xml |7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)

New commits:
commit a56003dc89903f2b03d041807d48bb1e004a3853
Author: Laurent Balland 
AuthorDate: Sat Dec 2 09:48:36 2023 +0100
Commit: Laurent Balland 
CommitDate: Mon Dec 4 18:50:59 2023 +0100

tdf#158017 Freshes Impress template: color font

Color font was forced to black with 70% of transparency to render a grey
color. This trick fails with dark mode.
A standard grey color is restored with this commit (and 0% transparency)

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

diff --git a/extras/source/templates/presnt/Freshes/content.xml 
b/extras/source/templates/presnt/Freshes/content.xml
index d7699c7b4588..817414365b79 100644
--- a/extras/source/templates/presnt/Freshes/content.xml
+++ b/extras/source/templates/presnt/Freshes/content.xml
@@ -640,7 +640,7 @@
   
 
 
-  
+  
 
 
   
@@ -681,9 +681,6 @@
 
   
 
-
-  
-
 
   
 
@@ -1492,7 +1489,7 @@
 
   
 
-  Lorem ipsum dolor sit amet, 
consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et 
dolore magna aliqua.
+  Lorem ipsum dolor sit amet, 
consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et 
dolore magna aliqua.
 
   
 

[Libreoffice-commits] core.git: 2 commits - extras/source

[Laurent Balland (via logerrit)]

 extras/source/templates/presnt/Metropolis/styles.xml  |   54 --
 extras/source/templates/presnt/Nature_Illustration/styles.xml |   54 --
 2 files changed, 108 deletions(-)

New commits:
commit f1f8fd8455aee3cb07108696856c6026d453f372
Author: Laurent Balland 
AuthorDate: Sun Dec 3 14:30:10 2023 +0100
Commit: Laurent Balland 
CommitDate: Mon Dec 4 18:50:13 2023 +0100

Nature Illustration template: remove unused styles

These old styles are used in the template and is no more in use in LO.
So they remain untranslated when changing UI language.

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

diff --git a/extras/source/templates/presnt/Nature_Illustration/styles.xml 
b/extras/source/templates/presnt/Nature_Illustration/styles.xml
index 200ec815019b..8c384e2ce424 100644
--- a/extras/source/templates/presnt/Nature_Illustration/styles.xml
+++ b/extras/source/templates/presnt/Nature_Illustration/styles.xml
@@ -65,63 +65,9 @@
   
   
 
-
-  
-
-
-  
-
 
   
 
-
-  
-
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-  
-
-
-  
-  
-  
-
-
-  
-  
-  
-
-
-  
-  
-  
-
-
-  
-  
-  
-
-
-  
-  
-
 
   
   
commit d103f4afddd6360c3e09fde3cbe7c3f720ac7f65
Author: Laurent Balland 
AuthorDate: Sun Dec 3 14:19:42 2023 +0100
Commit: Laurent Balland 
CommitDate: Mon Dec 4 18:50:00 2023 +0100

Metropolis Impress template: remove unused styles

These old styles are used in the template and is no more in use in LO.
So they remain untranslated when changing UI language.

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

diff --git a/extras/source/templates/presnt/Metropolis/styles.xml 
b/extras/source/templates/presnt/Metropolis/styles.xml
index cada57042c56..6a7a14efca6c 100644
--- a/extras/source/templates/presnt/Metropolis/styles.xml
+++ b/extras/source/templates/presnt/Metropolis/styles.xml
@@ -62,63 +62,9 @@
   
   
 
-
-  
-
-
-  
-
 
   
 
-
-  
-
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-  
-
-
-  
-  
-  
-
-
-  
-  
-  
-
-
-  
-  
-  
-
-
-  
-  
-  
-
-
-  
-  
-
 
   
   

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - extras/source

[Laurent Balland (via logerrit)]

 extras/source/templates/presnt/Nature_Illustration/styles.xml |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit e48528083bf689675375a8540b8ba350c328d2b0
Author: Laurent Balland 
AuthorDate: Wed Nov 22 09:19:44 2023 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Mon Dec 4 06:06:58 2023 +0100

tdf158206 Nature Illustration template background

On first master page, move picture from page background to an object at
the background

Change-Id: I0f288396f63230fc0fe524b3e30f6d1fc4d7ef11
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159808
Tested-by: Jenkins
Reviewed-by: Stéphane Guillou 
Reviewed-by: Laurent Balland 
(cherry picked from commit 58a3ca303c95ccf54c107cfe3f751ad147b52511)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160170
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/extras/source/templates/presnt/Nature_Illustration/styles.xml 
b/extras/source/templates/presnt/Nature_Illustration/styles.xml
index 76aedfbe40c3..645108a12834 100644
--- a/extras/source/templates/presnt/Nature_Illustration/styles.xml
+++ b/extras/source/templates/presnt/Nature_Illustration/styles.xml
@@ -521,7 +521,7 @@
   
 
 
-  
+  
 
 
   
@@ -719,6 +719,11 @@
   
 
 
+  
+
+  
+
+  
   
 
   

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - extras/source

[Laurent Balland (via logerrit)]

 extras/source/templates/presnt/Growing_Liberty/content.xml |   10 
 extras/source/templates/presnt/Growing_Liberty/styles.xml  |  147 ++---
 2 files changed, 71 insertions(+), 86 deletions(-)

New commits:
commit d6c12d226273eb645f45ec2a1645bfed2697666c
Author: Laurent Balland 
AuthorDate: Sun Nov 19 18:18:01 2023 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Mon Dec 4 06:05:28 2023 +0100

tdf#158230 Growing Liberty template: restore preview

Move Title-Slide master page at first place to get it from Master page
Side panel
Move picture from background of master page to image at the back
Other updates:
- remove unused fonts
- remove English text "number"

Change-Id: I8e6567ec3661ebce8ccd08f97d3661b1994c3ee7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159691
Tested-by: Jenkins
Reviewed-by: Stéphane Guillou 
Reviewed-by: Laurent Balland 
(cherry picked from commit 95779d24f012b9f21d1890f433bd12a4f3d903c8)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160171
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/extras/source/templates/presnt/Growing_Liberty/content.xml 
b/extras/source/templates/presnt/Growing_Liberty/content.xml
index 1058159decb9..a5f9aa9fada4 100644
--- a/extras/source/templates/presnt/Growing_Liberty/content.xml
+++ b/extras/source/templates/presnt/Growing_Liberty/content.xml
@@ -2,21 +2,11 @@
 http://openoffice.org/2009/office; 
xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" 
xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" 
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:css3t="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:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xmlns:rpt="http://openoffice.org/2005/report; 
xmlns:dc="http://purl.org/dc/elements/1.1/; 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:oooc="http://openoffice.org/2004/calc; 
xmlns:style="urn:oasis:names:tc:opendocument:
 xmlns:style:1.0" xmlns:ooow="http://openoffice.org/2004/writer; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:xlink="http://www.w3.org/1999/xlink; 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:ooo="http://openoffice.org/2004/office; 
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 xmlns:tableooo="http://openoffice.org/2009/table; 
xmlns:drawooo="http://openoffice.org/2010/draw; 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:dom="http://www.w3.org/2001/xml-events; 
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:xsd="ht
 tp://www.w3.org/2001/XMLSchema" 
xmlns:math="http://www.w3.org/1998/Math/MathML; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:xforms="http://www.w3.org/2002/xforms; office:version="1.3">
   
   
-
-
-
-
-
-
-
-
 
 
 
-
 
 
-
 
 
 
diff --git a/extras/source/templates/presnt/Growing_Liberty/styles.xml 
b/extras/source/templates/presnt/Growing_Liberty/styles.xml
index 8512e1fc149a..0a866682f799 100644
--- a/extras/source/templates/presnt/Growing_Liberty/styles.xml
+++ b/extras/source/templates/presnt/Growing_Liberty/styles.xml
@@ -1,21 +1,11 @@
 
 http://openoffice.org/2009/office; 
xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" 
xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" 
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/; 
xmlns:rpt="http://openoffice.org/2005/report; 
xmlns:dc="http://purl.org/dc/elements/1.1/; 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:oooc="http://openoffice.org/2004/calc; 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
xmlns:ooow="http://openoffice.org/2004/writer; 

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - extras/source

[Laurent Balland (via logerrit)]

 extras/source/templates/presnt/Blueprint_Plans/styles.xml |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 0621b2be4e7e950ef1fb65b6f81aa5c9434e71c5
Author: Laurent Balland 
AuthorDate: Wed Nov 22 08:56:21 2023 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Sat Dec 2 20:03:13 2023 +0100

tdf#158205 Blueprint Impress template background

On first master page, move picture from page background to an object at
the background

Change-Id: I0e01ee9cad4a282c98e3678a7a45cfe13698e0e3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159807
Tested-by: Jenkins
Reviewed-by: Laurent Balland 
(cherry picked from commit 9c1a9c66897225b26340de71bf71b11bc088bdca)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160176
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/extras/source/templates/presnt/Blueprint_Plans/styles.xml 
b/extras/source/templates/presnt/Blueprint_Plans/styles.xml
index d381e582b45b..b15863b89f3e 100644
--- a/extras/source/templates/presnt/Blueprint_Plans/styles.xml
+++ b/extras/source/templates/presnt/Blueprint_Plans/styles.xml
@@ -907,7 +907,7 @@
   
 
 
-  
+  
 
 
   
@@ -1175,6 +1175,11 @@
   
 
 
+  
+
+  
+
+  
   
 
   

[Libreoffice-commits] core.git: extras/source

[Laurent Balland (via logerrit)]

 extras/source/templates/presnt/Blueprint_Plans/styles.xml |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 2a0b9ebf39cf53735f0e27d084a6c0cb4eb0891c
Author: Laurent Balland 
AuthorDate: Wed Nov 22 08:56:21 2023 +0100
Commit: Laurent Balland 
CommitDate: Sat Dec 2 09:58:49 2023 +0100

tdf#158205 Blueprint Impress template background

On first master page, move picture from page background to an object at
the background

Change-Id: I0e01ee9cad4a282c98e3678a7a45cfe13698e0e3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159807
Tested-by: Jenkins
Reviewed-by: Laurent Balland 

diff --git a/extras/source/templates/presnt/Blueprint_Plans/styles.xml 
b/extras/source/templates/presnt/Blueprint_Plans/styles.xml
index 632dbfe9b63f..745769d5a7d2 100644
--- a/extras/source/templates/presnt/Blueprint_Plans/styles.xml
+++ b/extras/source/templates/presnt/Blueprint_Plans/styles.xml
@@ -909,7 +909,7 @@
   
 
 
-  
+  
 
 
   
@@ -1177,6 +1177,11 @@
   
 
 
+  
+
+  
+
+  
   
 
   

[Libreoffice-commits] core.git: extras/source

[Laurent Balland (via logerrit)]

 extras/source/templates/presnt/Beehive/content.xml |   67 ++---
 1 file changed, 34 insertions(+), 33 deletions(-)

New commits:
commit 29a86b786644d985bdb4d7ccc847ec81daf8d38f
Author: Laurent Balland 
AuthorDate: Wed Nov 29 13:56:20 2023 +0100
Commit: Laurent Balland 
CommitDate: Sat Dec 2 09:57:45 2023 +0100

Beehive Impress template: restore indentation

Indentation was broken in content.xml

Change-Id: Ia9f05d5af286aa1e3b8ddd9bb205769550d25e42
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160088
Tested-by: Jenkins
Reviewed-by: Laurent Balland 

diff --git a/extras/source/templates/presnt/Beehive/content.xml 
b/extras/source/templates/presnt/Beehive/content.xml
index 066152760096..bbd71ccf5483 100644
--- a/extras/source/templates/presnt/Beehive/content.xml
+++ b/extras/source/templates/presnt/Beehive/content.xml
@@ -44,36 +44,37 @@
   
   
 
-
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
+  
+
+
+  
+
+
+  
+
+
+  
+  
+
+  
+
+  
+  
+
+
+  
+
+
+  
+
+
+  
+  
+
+  
+
+  
+  
+
+  
+

[Libreoffice-commits] core.git: extras/source

[Laurent Balland (via logerrit)]

 extras/source/templates/presnt/Beehive/content.xml |   17 ++--
 extras/source/templates/presnt/Beehive/styles.xml  |8 +-
 extras/source/templates/presnt/Blue_Curve/content.xml  |8 +-
 extras/source/templates/presnt/Blue_Curve/styles.xml   |8 +-
 extras/source/templates/presnt/Blueprint_Plans/content.xml |   12 +--
 extras/source/templates/presnt/Blueprint_Plans/styles.xml  |   16 ++--
 extras/source/templates/presnt/Candy/content.xml   |   52 ++---
 extras/source/templates/presnt/Candy/styles.xml|   44 +--
 extras/source/templates/presnt/Focus/content.xml   |   16 ++--
 extras/source/templates/presnt/Focus/styles.xml|   18 ++--
 extras/source/templates/presnt/Forestbird/content.xml  |   16 ++--
 extras/source/templates/presnt/Forestbird/styles.xml   |   16 ++--
 extras/source/templates/presnt/Freshes/content.xml |   48 ++--
 extras/source/templates/presnt/Freshes/styles.xml  |   44 +--
 extras/source/templates/presnt/Growing_Liberty/content.xml |   48 ++--
 extras/source/templates/presnt/Growing_Liberty/styles.xml  |   48 ++--
 extras/source/templates/presnt/Inspiration/content.xml |2 
 extras/source/templates/presnt/Inspiration/styles.xml  |2 
 extras/source/templates/presnt/Lights/content.xml  |   12 +--
 extras/source/templates/presnt/Lights/styles.xml   |   12 +--
 extras/source/templates/presnt/Midnightblue/content.xml|   12 +--
 extras/source/templates/presnt/Midnightblue/styles.xml |   12 +--
 extras/source/templates/presnt/Pencil/content.xml  |8 +-
 extras/source/templates/presnt/Pencil/styles.xml   |8 +-
 extras/source/templates/presnt/Piano/content.xml   |8 +-
 extras/source/templates/presnt/Piano/styles.xml|8 +-
 extras/source/templates/presnt/Portfolio/content.xml   |   12 +--
 extras/source/templates/presnt/Portfolio/styles.xml|   12 +--
 extras/source/templates/presnt/Progress/content.xml|   16 ++--
 extras/source/templates/presnt/Progress/styles.xml |   16 ++--
 extras/source/templates/presnt/Vivid/content.xml   |   12 +--
 extras/source/templates/presnt/Vivid/styles.xml|   52 ++---
 extras/source/templates/presnt/Yellow_Idea/content.xml |   36 -
 extras/source/templates/presnt/Yellow_Idea/styles.xml  |   36 -
 34 files changed, 349 insertions(+), 346 deletions(-)

New commits:
commit 619500d6919c227e734b119481a4b334972e0b7b
Author: Laurent Balland 
AuthorDate: Wed Nov 22 22:07:08 2023 +0100
Commit: Laurent Balland 
CommitDate: Thu Nov 30 20:05:59 2023 +0100

Impress templates notes: correct preview size

In Notes mode, these templates have a preview of 4/3 ratio. Change them
in 16/9 like the slides
Unification of preview and notes position and size

Change-Id: Ie088b2226e438476cf421f6351c3bd617e7e6bbf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159876
Tested-by: Jenkins
Reviewed-by: Laurent Balland 

diff --git a/extras/source/templates/presnt/Beehive/content.xml 
b/extras/source/templates/presnt/Beehive/content.xml
index 4c09453ca0de..066152760096 100644
--- a/extras/source/templates/presnt/Beehive/content.xml
+++ b/extras/source/templates/presnt/Beehive/content.xml
@@ -52,12 +52,13 @@
   
   
   
-  
-  
+  
+  
   
   
   
-  
+  
+
   
   
   
@@ -66,11 +67,13 @@
   
   
   
-  
-  
+  
+  
   
-  
-  
+  
+  
+  
+  
   
   
   
diff --git a/extras/source/templates/presnt/Beehive/styles.xml 
b/extras/source/templates/presnt/Beehive/styles.xml
index 187a135a2a81..43408af8019d 100644
--- a/extras/source/templates/presnt/Beehive/styles.xml
+++ b/extras/source/templates/presnt/Beehive/styles.xml
@@ -3135,8 +3135,8 @@
 
   
   
-
-
+
+
   
 
 
@@ -4145,8 +4145,8 @@
 
   
   
-
-
+
+
   
 
 
diff --git a/extras/source/templates/presnt/Blue_Curve/content.xml 
b/extras/source/templates/presnt/Blue_Curve/content.xml
index 2ba960c24210..a5e6a3954b3d 100644
--- a/extras/source/templates/presnt/Blue_Curve/content.xml
+++ b/extras/source/templates/presnt/Blue_Curve/content.xml
@@ -61,8 +61,8 @@
   
 
 
-  
-  
+  
+  
 
   
 

[Libreoffice-commits] core.git: extras/source

[Laurent Balland (via logerrit)]

 extras/source/templates/presnt/Growing_Liberty/content.xml |   10 
 extras/source/templates/presnt/Growing_Liberty/styles.xml  |  147 ++---
 2 files changed, 71 insertions(+), 86 deletions(-)

New commits:
commit 95779d24f012b9f21d1890f433bd12a4f3d903c8
Author: Laurent Balland 
AuthorDate: Sun Nov 19 18:18:01 2023 +0100
Commit: Laurent Balland 
CommitDate: Thu Nov 30 18:07:58 2023 +0100

tdf#158230 Growing Liberty template: restore preview

Move Title-Slide master page at first place to get it from Master page
Side panel
Move picture from background of master page to image at the back
Other updates:
- remove unused fonts
- remove English text "number"

Change-Id: I8e6567ec3661ebce8ccd08f97d3661b1994c3ee7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159691
Tested-by: Jenkins
Reviewed-by: Stéphane Guillou 
Reviewed-by: Laurent Balland 

diff --git a/extras/source/templates/presnt/Growing_Liberty/content.xml 
b/extras/source/templates/presnt/Growing_Liberty/content.xml
index 06802c9aaa31..4dd31750e5be 100644
--- a/extras/source/templates/presnt/Growing_Liberty/content.xml
+++ b/extras/source/templates/presnt/Growing_Liberty/content.xml
@@ -2,21 +2,11 @@
 http://openoffice.org/2009/office; 
xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" 
xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" 
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:css3t="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:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xmlns:rpt="http://openoffice.org/2005/report; 
xmlns:dc="http://purl.org/dc/elements/1.1/; 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:oooc="http://openoffice.org/2004/calc; 
xmlns:style="urn:oasis:names:tc:opendocument:
 xmlns:style:1.0" xmlns:ooow="http://openoffice.org/2004/writer; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:xlink="http://www.w3.org/1999/xlink; 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:ooo="http://openoffice.org/2004/office; 
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 xmlns:tableooo="http://openoffice.org/2009/table; 
xmlns:drawooo="http://openoffice.org/2010/draw; 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:dom="http://www.w3.org/2001/xml-events; 
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:xsd="ht
 tp://www.w3.org/2001/XMLSchema" 
xmlns:math="http://www.w3.org/1998/Math/MathML; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:xforms="http://www.w3.org/2002/xforms; office:version="1.3">
   
   
-
-
-
-
-
-
-
-
 
 
 
-
 
 
-
 
 
 
diff --git a/extras/source/templates/presnt/Growing_Liberty/styles.xml 
b/extras/source/templates/presnt/Growing_Liberty/styles.xml
index 8512e1fc149a..0a866682f799 100644
--- a/extras/source/templates/presnt/Growing_Liberty/styles.xml
+++ b/extras/source/templates/presnt/Growing_Liberty/styles.xml
@@ -1,21 +1,11 @@
 
 http://openoffice.org/2009/office; 
xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" 
xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" 
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/; 
xmlns:rpt="http://openoffice.org/2005/report; 
xmlns:dc="http://purl.org/dc/elements/1.1/; 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:oooc="http://openoffice.org/2004/calc; 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
xmlns:ooow="http://openoffice.org/2004/writer; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:xlink="http://www.w3.org/1999/xlink; 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compati
 ble:1.0" xmlns:ooo="http://openoffice.org/2004/office; 

[Libreoffice-commits] core.git: extras/source

[Laurent Balland (via logerrit)]

 extras/source/templates/presnt/Nature_Illustration/styles.xml |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 58a3ca303c95ccf54c107cfe3f751ad147b52511
Author: Laurent Balland 
AuthorDate: Wed Nov 22 09:19:44 2023 +0100
Commit: Laurent Balland 
CommitDate: Thu Nov 30 18:04:58 2023 +0100

tdf158206 Nature Illustration template background

On first master page, move picture from page background to an object at
the background

Change-Id: I0f288396f63230fc0fe524b3e30f6d1fc4d7ef11
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159808
Tested-by: Jenkins
Reviewed-by: Stéphane Guillou 
Reviewed-by: Laurent Balland 

diff --git a/extras/source/templates/presnt/Nature_Illustration/styles.xml 
b/extras/source/templates/presnt/Nature_Illustration/styles.xml
index 5b8c0bd7fed8..200ec815019b 100644
--- a/extras/source/templates/presnt/Nature_Illustration/styles.xml
+++ b/extras/source/templates/presnt/Nature_Illustration/styles.xml
@@ -523,7 +523,7 @@
   
 
 
-  
+  
 
 
   
@@ -721,6 +721,11 @@
   
 
 
+  
+
+  
+
+  
   
 
   

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - extras/source

[Laurent Balland (via logerrit)]

 extras/source/templates/presnt/Midnightblue/styles.xml |   65 -
 1 file changed, 33 insertions(+), 32 deletions(-)

New commits:
commit a5998d38b0f22fb0db713986ff20712b5e37e9dc
Author: Laurent Balland 
AuthorDate: Thu Nov 16 19:42:33 2023 +0100
Commit: Xisco Fauli 
CommitDate: Thu Nov 30 12:09:10 2023 +0100

tdf#158204 Midnightblue template correct color

Color of the upper and lower strip of the first master slide was
declared in "Accent 1" style. This style is overwritten when applying
the master page from the side panel.
Color is now defined as overloading of standard style
All inheritances from Accent 1 and Accent 2 were removed for master page
Midnightblue
Other updates:
- page number position, size and font was corrected
- Liberation font declaration was missing
- remove German name of a style
- replace html code  by '

Change-Id: I2e0ef69d7117719a9829535db24c94048603d9b1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159519
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
Reviewed-by: Stéphane Guillou 
Signed-off-by: Xisco Fauli 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160142

diff --git a/extras/source/templates/presnt/Midnightblue/styles.xml 
b/extras/source/templates/presnt/Midnightblue/styles.xml
index 52a5997fd8ff..9db05bd864bb 100644
--- a/extras/source/templates/presnt/Midnightblue/styles.xml
+++ b/extras/source/templates/presnt/Midnightblue/styles.xml
@@ -1,6 +1,7 @@
 
 http://openoffice.org/2004/office; 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:xlink="http://www.w3.org/1999/xlink; 
xmlns:dc="http://purl.org/dc/elements/1.1/; 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:rpt="http://openoffice.org/2005/report; 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:ooow="http://openoffice.org/2004/writer; 
xmlns:oooc="http://openoffice.org/2004/calc; xm
 lns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:tableooo="http://openoffice.org/2009/table; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 xmlns:drawooo="http://openoffice.org/2010/draw; 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:dom="http://www.w3.org/2001/xml-events; 
xmlns:xhtml="http://www.w3.org/1999/xhtml; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#; 
xmlns:css3t="http://www.w3.org/TR/css3-text/; 
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" 
xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" 
xmlns:officeooo="http://openo
 ffice.org/2009/office" office:version="1.2">
   
+
 
 
 
@@ -72,7 +73,7 @@
   
 
   
-  
+  
 
 
   
@@ -81,12 +82,12 @@
   
   
 
-
+
   
 
 
   
-  
+  
 
 
   
@@ -120,7 +121,7 @@
 
 
   
-  
+  
 
 
   
@@ -135,7 +136,7 @@
 
 
   
-  
+  
 
 
   
@@ -191,12 +192,12 @@
   
 
   
-  
+  
 
 
   
   
-  
+  
 
 
   
@@ -244,11 +245,11 @@
 
   
   
-  
+  
 
 
   
-  
+  
 
 
   
@@ -311,7 +312,7 @@
 
   
   
-  
+  
 
 
   
@@ -361,7 +362,7 @@
   
 
   
-  
+  
 
 
   
@@ -372,12 +373,12 @@
   
 
   
-  
+  
 
 
   
   
-  
+  
 
 
   
@@ -425,7 +426,7 @@
 
   
   
-  
+  
 
 
   
@@ -489,7 +490,7 @@
 
   
   
-  
+  
 
 
   
@@ -539,7 +540,7 @@
   
 
   
-  
+  
 
 
   
@@ -550,12 +551,12 @@
   
 
   
-  
+  
 
 
   
   
-  
+  
 
 
   
@@ -603,7 +604,7 @@
 
   
   
-  
+  
 
 
   
@@ -667,7 +668,7 @@
 
   
   
-  
+  
 
 
   
@@ -717,7 +718,7 @@
   
 
   
-  
+  
 
 
   
@@ -761,14 

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - extras/source

[Laurent Balland (via logerrit)]

 extras/source/templates/presnt/Candy/content.xml |9 ---
 extras/source/templates/presnt/Candy/styles.xml  |   55 ++-
 2 files changed, 25 insertions(+), 39 deletions(-)

New commits:
commit 6737658171df267a466ff55bd870f97e5bffebc1
Author: Laurent Balland 
AuthorDate: Tue Nov 21 18:57:57 2023 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Wed Nov 29 04:26:06 2023 +0100

tdf#158202 Candy Impress template background

On first master page, move picture from page background to an object at
the background
Other updates:
- remove unused font declarations
- remove page number value

Change-Id: Ieded7b794e00213b7c47e0059bb7120ed133b125
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159794
Tested-by: Jenkins
Reviewed-by: Laurent Balland 
(cherry picked from commit c8b21dd6a310ff4fb1dd53c6930768fda34dda4b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159896

diff --git a/extras/source/templates/presnt/Candy/content.xml 
b/extras/source/templates/presnt/Candy/content.xml
index aef0e01fa93b..b435ce9c16af 100644
--- a/extras/source/templates/presnt/Candy/content.xml
+++ b/extras/source/templates/presnt/Candy/content.xml
@@ -2,24 +2,15 @@
 http://openoffice.org/2009/office; 
xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" 
xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" 
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:css3t="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:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xmlns:rpt="http://openoffice.org/2005/report; 
xmlns:dc="http://purl.org/dc/elements/1.1/; 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:oooc="http://openoffice.org/2004/calc; 
xmlns:style="urn:oasis:names:tc:opendocument:
 xmlns:style:1.0" xmlns:ooow="http://openoffice.org/2004/writer; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:xlink="http://www.w3.org/1999/xlink; 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:ooo="http://openoffice.org/2004/office; 
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 xmlns:tableooo="http://openoffice.org/2009/table; 
xmlns:drawooo="http://openoffice.org/2010/draw; 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:dom="http://www.w3.org/2001/xml-events; 
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:xsd="ht
 tp://www.w3.org/2001/XMLSchema" 
xmlns:math="http://www.w3.org/1998/Math/MathML; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:xforms="http://www.w3.org/2002/xforms; office:version="1.3">
   
   
-
 
 
-
 
 
-
 
-
 
 
-
-
-
 
 
-
-
 
 
 
diff --git a/extras/source/templates/presnt/Candy/styles.xml 
b/extras/source/templates/presnt/Candy/styles.xml
index d9ae11fac954..1f14a5a3f08f 100644
--- a/extras/source/templates/presnt/Candy/styles.xml
+++ b/extras/source/templates/presnt/Candy/styles.xml
@@ -1,24 +1,15 @@
 
 http://openoffice.org/2009/office; 
xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" 
xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" 
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/; 
xmlns:rpt="http://openoffice.org/2005/report; 
xmlns:dc="http://purl.org/dc/elements/1.1/; 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:oooc="http://openoffice.org/2004/calc; 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
xmlns:ooow="http://openoffice.org/2004/writer; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:xlink="http://www.w3.org/1999/xlink; 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compati
 ble:1.0" xmlns:ooo="http://openoffice.org/2004/office; 

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - extras/source

[Laurent Balland (via logerrit)]

 extras/source/templates/presnt/Freshes/content.xml |   10 ---
 extras/source/templates/presnt/Freshes/styles.xml  |   61 +
 2 files changed, 28 insertions(+), 43 deletions(-)

New commits:
commit a5f5d9c343ed94987b69ec1573ea7ba85148d714
Author: Laurent Balland 
AuthorDate: Tue Nov 21 19:57:21 2023 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Sat Nov 25 08:00:16 2023 +0100

tdf#158203 Freshes Impress template background

On first master page, move picture from page background to an object at
the background
Other updates:
- remove unused font declarations
- remove english text in number page

Change-Id: I19e2b1f3a6f137ef86e5b43862d4e91ca278f0d4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159797
Tested-by: Jenkins
Reviewed-by: Stéphane Guillou 
Reviewed-by: Laurent Balland 
(cherry picked from commit 288075bf40b3de11b8f45fc67c52ff0d1d1169b5)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159897
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/extras/source/templates/presnt/Freshes/content.xml 
b/extras/source/templates/presnt/Freshes/content.xml
index 037a6a82314c..ecaec2274586 100644
--- a/extras/source/templates/presnt/Freshes/content.xml
+++ b/extras/source/templates/presnt/Freshes/content.xml
@@ -2,26 +2,16 @@
 http://openoffice.org/2009/office; 
xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" 
xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" 
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:css3t="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:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xmlns:rpt="http://openoffice.org/2005/report; 
xmlns:dc="http://purl.org/dc/elements/1.1/; 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:oooc="http://openoffice.org/2004/calc; 
xmlns:style="urn:oasis:names:tc:opendocument:
 xmlns:style:1.0" xmlns:ooow="http://openoffice.org/2004/writer; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:xlink="http://www.w3.org/1999/xlink; 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:ooo="http://openoffice.org/2004/office; 
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 xmlns:tableooo="http://openoffice.org/2009/table; 
xmlns:drawooo="http://openoffice.org/2010/draw; 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:dom="http://www.w3.org/2001/xml-events; 
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:xsd="ht
 tp://www.w3.org/2001/XMLSchema" 
xmlns:math="http://www.w3.org/1998/Math/MathML; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:xforms="http://www.w3.org/2002/xforms; office:version="1.3">
   
   
-
-
-
 
-
 
 
-
-
 
 
 
 
-
-
-
 
 
 
-
 
 
   
diff --git a/extras/source/templates/presnt/Freshes/styles.xml 
b/extras/source/templates/presnt/Freshes/styles.xml
index 4672913a991d..ead0ed67ce29 100644
--- a/extras/source/templates/presnt/Freshes/styles.xml
+++ b/extras/source/templates/presnt/Freshes/styles.xml
@@ -1,26 +1,16 @@
 
 http://openoffice.org/2009/office; 
xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" 
xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" 
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/; 
xmlns:rpt="http://openoffice.org/2005/report; 
xmlns:dc="http://purl.org/dc/elements/1.1/; 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:oooc="http://openoffice.org/2004/calc; 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
xmlns:ooow="http://openoffice.org/2004/writer; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:xlink="http://www.w3.org/1999/xlink; 

[Libreoffice-commits] core.git: extras/source

[Laurent Balland (via logerrit)]

 extras/source/templates/presnt/Candy/content.xml |9 ---
 extras/source/templates/presnt/Candy/styles.xml  |   55 ++-
 2 files changed, 25 insertions(+), 39 deletions(-)

New commits:
commit c8b21dd6a310ff4fb1dd53c6930768fda34dda4b
Author: Laurent Balland 
AuthorDate: Tue Nov 21 18:57:57 2023 +0100
Commit: Laurent Balland 
CommitDate: Fri Nov 24 09:31:35 2023 +0100

tdf#158202 Candy Impress template background

On first master page, move picture from page background to an object at
the background
Other updates:
- remove unused font declarations
- remove page number value

Change-Id: Ieded7b794e00213b7c47e0059bb7120ed133b125
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159794
Tested-by: Jenkins
Reviewed-by: Laurent Balland 

diff --git a/extras/source/templates/presnt/Candy/content.xml 
b/extras/source/templates/presnt/Candy/content.xml
index c2e28dbad4e9..3e8d2f56a092 100644
--- a/extras/source/templates/presnt/Candy/content.xml
+++ b/extras/source/templates/presnt/Candy/content.xml
@@ -2,24 +2,15 @@
 http://openoffice.org/2009/office; 
xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" 
xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" 
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:css3t="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:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xmlns:rpt="http://openoffice.org/2005/report; 
xmlns:dc="http://purl.org/dc/elements/1.1/; 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:oooc="http://openoffice.org/2004/calc; 
xmlns:style="urn:oasis:names:tc:opendocument:
 xmlns:style:1.0" xmlns:ooow="http://openoffice.org/2004/writer; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:xlink="http://www.w3.org/1999/xlink; 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:ooo="http://openoffice.org/2004/office; 
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 xmlns:tableooo="http://openoffice.org/2009/table; 
xmlns:drawooo="http://openoffice.org/2010/draw; 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:dom="http://www.w3.org/2001/xml-events; 
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:xsd="ht
 tp://www.w3.org/2001/XMLSchema" 
xmlns:math="http://www.w3.org/1998/Math/MathML; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:xforms="http://www.w3.org/2002/xforms; office:version="1.3">
   
   
-
 
 
-
 
 
-
 
-
 
 
-
-
-
 
 
-
-
 
 
 
diff --git a/extras/source/templates/presnt/Candy/styles.xml 
b/extras/source/templates/presnt/Candy/styles.xml
index d9ae11fac954..1f14a5a3f08f 100644
--- a/extras/source/templates/presnt/Candy/styles.xml
+++ b/extras/source/templates/presnt/Candy/styles.xml
@@ -1,24 +1,15 @@
 
 http://openoffice.org/2009/office; 
xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" 
xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" 
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/; 
xmlns:rpt="http://openoffice.org/2005/report; 
xmlns:dc="http://purl.org/dc/elements/1.1/; 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:oooc="http://openoffice.org/2004/calc; 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
xmlns:ooow="http://openoffice.org/2004/writer; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:xlink="http://www.w3.org/1999/xlink; 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compati
 ble:1.0" xmlns:ooo="http://openoffice.org/2004/office; 
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 

[Libreoffice-commits] core.git: extras/source

[Laurent Balland (via logerrit)]

 extras/source/templates/presnt/Freshes/content.xml |   10 ---
 extras/source/templates/presnt/Freshes/styles.xml  |   61 +
 2 files changed, 28 insertions(+), 43 deletions(-)

New commits:
commit 288075bf40b3de11b8f45fc67c52ff0d1d1169b5
Author: Laurent Balland 
AuthorDate: Tue Nov 21 19:57:21 2023 +0100
Commit: Laurent Balland 
CommitDate: Fri Nov 24 09:16:58 2023 +0100

tdf#158203 Freshes Impress template background

On first master page, move picture from page background to an object at
the background
Other updates:
- remove unused font declarations
- remove english text in number page

Change-Id: I19e2b1f3a6f137ef86e5b43862d4e91ca278f0d4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159797
Tested-by: Jenkins
Reviewed-by: Stéphane Guillou 
Reviewed-by: Laurent Balland 

diff --git a/extras/source/templates/presnt/Freshes/content.xml 
b/extras/source/templates/presnt/Freshes/content.xml
index 037a6a82314c..ecaec2274586 100644
--- a/extras/source/templates/presnt/Freshes/content.xml
+++ b/extras/source/templates/presnt/Freshes/content.xml
@@ -2,26 +2,16 @@
 http://openoffice.org/2009/office; 
xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" 
xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" 
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:css3t="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:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xmlns:rpt="http://openoffice.org/2005/report; 
xmlns:dc="http://purl.org/dc/elements/1.1/; 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:oooc="http://openoffice.org/2004/calc; 
xmlns:style="urn:oasis:names:tc:opendocument:
 xmlns:style:1.0" xmlns:ooow="http://openoffice.org/2004/writer; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:xlink="http://www.w3.org/1999/xlink; 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:ooo="http://openoffice.org/2004/office; 
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 xmlns:tableooo="http://openoffice.org/2009/table; 
xmlns:drawooo="http://openoffice.org/2010/draw; 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:dom="http://www.w3.org/2001/xml-events; 
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:xsd="ht
 tp://www.w3.org/2001/XMLSchema" 
xmlns:math="http://www.w3.org/1998/Math/MathML; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:xforms="http://www.w3.org/2002/xforms; office:version="1.3">
   
   
-
-
-
 
-
 
 
-
-
 
 
 
 
-
-
-
 
 
 
-
 
 
   
diff --git a/extras/source/templates/presnt/Freshes/styles.xml 
b/extras/source/templates/presnt/Freshes/styles.xml
index 4672913a991d..ead0ed67ce29 100644
--- a/extras/source/templates/presnt/Freshes/styles.xml
+++ b/extras/source/templates/presnt/Freshes/styles.xml
@@ -1,26 +1,16 @@
 
 http://openoffice.org/2009/office; 
xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" 
xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" 
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/; 
xmlns:rpt="http://openoffice.org/2005/report; 
xmlns:dc="http://purl.org/dc/elements/1.1/; 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:oooc="http://openoffice.org/2004/calc; 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
xmlns:ooow="http://openoffice.org/2004/writer; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:xlink="http://www.w3.org/1999/xlink; 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compati
 ble:1.0" xmlns:ooo="http://openoffice.org/2004/office; 
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" 

[Libreoffice-commits] core.git: extras/source

[Laurent Balland (via logerrit)]

 extras/source/templates/presnt/Midnightblue/styles.xml |   67 -
 1 file changed, 34 insertions(+), 33 deletions(-)

New commits:
commit b77c15fd6a12803073a0077a946b1e38d8a9107b
Author: Laurent Balland 
AuthorDate: Thu Nov 16 19:42:33 2023 +0100
Commit: Laurent Balland 
CommitDate: Tue Nov 21 18:17:52 2023 +0100

tdf#158204 Midnightblue template correct color

Color of the upper and lower strip of the first master slide was
declared in "Accent 1" style. This style is overwritten when applying
the master page from the side panel.
Color is now defined as overloading of standard style
All inheritances from Accent 1 and Accent 2 were removed for master page
Midnightblue
Other updates:
- page number position, size and font was corrected
- Liberation font declaration was missing
- remove German name of a style
- replace html code  by '

Change-Id: I2e0ef69d7117719a9829535db24c94048603d9b1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159519
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
Reviewed-by: Stéphane Guillou 

diff --git a/extras/source/templates/presnt/Midnightblue/styles.xml 
b/extras/source/templates/presnt/Midnightblue/styles.xml
index a85ac18ea08d..2a704e5d5fb1 100644
--- a/extras/source/templates/presnt/Midnightblue/styles.xml
+++ b/extras/source/templates/presnt/Midnightblue/styles.xml
@@ -1,11 +1,12 @@
 
 http://openoffice.org/2004/office; 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:xlink="http://www.w3.org/1999/xlink; 
xmlns:dc="http://purl.org/dc/elements/1.1/; 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:rpt="http://openoffice.org/2005/report; 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:ooow="http://openoffice.org/2004/writer; 
xmlns:oooc="http://openoffice.org/2004/calc; xm
 lns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:tableooo="http://openoffice.org/2009/table; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 xmlns:drawooo="http://openoffice.org/2010/draw; 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:dom="http://www.w3.org/2001/xml-events; 
xmlns:xhtml="http://www.w3.org/1999/xhtml; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#; 
xmlns:css3t="http://www.w3.org/TR/css3-text/; 
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" 
xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" 
xmlns:officeooo="http://openo
 ffice.org/2009/office" office:version="1.2">
   
+
 
 
 
 
-
+
   
   
 
@@ -74,7 +75,7 @@
   
 
   
-  
+  
 
 
   
@@ -83,12 +84,12 @@
   
   
 
-
+
   
 
 
   
-  
+  
 
 
   
@@ -122,7 +123,7 @@
 
 
   
-  
+  
 
 
   
@@ -137,7 +138,7 @@
 
 
   
-  
+  
 
 
   
@@ -193,12 +194,12 @@
   
 
   
-  
+  
 
 
   
   
-  
+  
 
 
   
@@ -246,11 +247,11 @@
 
   
   
-  
+  
 
 
   
-  
+  
 
 
   
@@ -313,7 +314,7 @@
 
   
   
-  
+  
 
 
   
@@ -363,7 +364,7 @@
   
 
   
-  
+  
 
 
   
@@ -374,12 +375,12 @@
   
 
   
-  
+  
 
 
   
   
-  
+  
 
 
   
@@ -427,7 +428,7 @@
 
   
   
-  
+  
 
 
   
@@ -491,7 +492,7 @@
 
   
   
-  
+  
 
 
   
@@ -541,7 +542,7 @@
   
 
   
-  
+  
 
 
   
@@ -552,12 +553,12 @@
   
 
   
-  
+  
 
 
   
   
-  
+  
 
 
   
@@ -605,7 +606,7 @@
 
   
   
-  
+  
 
 
   
@@ -669,7 +670,7 @@
 
   
   
-  
+  
 
 
   
@@ -719,7 +720,7 @@
   
 
   
-  
+  
 
 
   
@@ -763,14 +764,14 @@
   
   
 
-
-  
+
+  

[Libreoffice-commits] core.git: basic/qa include/xmloff schema/libreoffice sc/qa svl/qa svl/source xmloff/source

[Laurent Balland (via logerrit)]

 basic/qa/vba_tests/format.vb|2 
 include/xmloff/xmlnumfe.hxx |2 
 include/xmloff/xmltoken.hxx |1 
 sc/qa/unit/data/ods/tdf156449-Blank-In-Exponent.ods |binary
 sc/qa/unit/subsequent_export_test4.cxx  |   31 
 schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng |9 +++
 svl/qa/unit/svl.cxx |8 +++
 svl/source/numbers/zformat.cxx  |8 +--
 xmloff/source/core/xmltoken.cxx |1 
 xmloff/source/style/xmlnumfe.cxx|   20 ++-
 xmloff/source/style/xmlnumfi.cxx|   16 +-
 xmloff/source/token/tokens.txt  |1 
 12 files changed, 89 insertions(+), 10 deletions(-)

New commits:
commit 443027cd71aef3eb45bbf3631869ea63457f2c81
Author: Laurent Balland 
AuthorDate: Wed Jul 26 17:58:00 2023 +0200
Commit: Laurent Balland 
CommitDate: Wed Nov 1 11:43:54 2023 +0100

tdf#156449 Preserve '0' or '?' in exponent

Exponent in scientific number may use '?' as blank like in format "0.00E+?0"
This change:
- adds interpreatation of '0' and '?' in exponent
- adds "blank-exponent-digits" attribute to scientific number for import
  and export to ODF
- prevents using exponent with only '?'. There must be at least one '0'
  in exponent
- adds QA test of such format and test import/export/import to ODF and OOXML
- corrects one basic test

Change-Id: If52edc632a161f842270bb2fd77af535e2b978d4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154986
Tested-by: Jenkins
Reviewed-by: Laurent Balland 

diff --git a/basic/qa/vba_tests/format.vb b/basic/qa/vba_tests/format.vb
index 0e997ca824db..4e62e87e498e 100644
--- a/basic/qa/vba_tests/format.vb
+++ b/basic/qa/vba_tests/format.vb
@@ -135,7 +135,7 @@ Sub Custom_Number_Format_Sample()
 TestUtil.AssertEqual(Format(12345.25, "#,###.##"),   "12,345.25",
"Format(12345.25, ""#,###.##"")")
 TestUtil.AssertEqual(Format(0.25, "##.00%"), "25.00%",   
"Format(0.25, ""##.00%"")")
 TestUtil.AssertEqual(Format(100, "#,###"),   "1,000,000",
"Format(100, ""#,###"")")
-TestUtil.AssertEqual(Format(1.09837555, "#.#E+###"), "1.09838E+000", 
"Format(1.09837555, ""#.#E+###"")")
+TestUtil.AssertEqual(Format(1.09837555, "#.#E+000"), "1.09838E+000", 
"Format(1.09837555, ""#.#E+000"")")
 TestUtil.AssertEqual(Format(1.09837555, "###.E#"),   "1.0984E0", 
"Format(1.09837555, ""###.E#"")")
 TestUtil.AssertEqual(Format(1098.37555, "###.E#"),   "1.0984E3", 
"Format(1098.37555, ""###.E#"")")
 TestUtil.AssertEqual(Format(1098375.55, "###.E#"),   "1.0984E6", 
"Format(1098375.55, ""###.E#"")")
diff --git a/include/xmloff/xmlnumfe.hxx b/include/xmloff/xmlnumfe.hxx
index 8421c5f7e323..d96f40c53a04 100644
--- a/include/xmloff/xmlnumfe.hxx
+++ b/include/xmloff/xmlnumfe.hxx
@@ -71,7 +71,7 @@ private:
 bool bGrouping, sal_Int32 
nTrailingThousands,
 const SvXMLEmbeddedTextEntryArr& 
rEmbeddedEntries );
 SAL_DLLPRIVATE void WriteScientificElement_Impl( sal_Int32 nDecimals, 
sal_Int32 nMinDecimals, sal_Int32 nInteger, sal_Int32 nBlankInteger,
-bool bGrouping, sal_Int32 nExp, 
sal_Int32 nExpInterval, bool bExpSign, bool bExponentLowercase,
+bool bGrouping, sal_Int32 nExp, 
sal_Int32 nExpInterval, bool bExpSign, bool bExponentLowercase, sal_Int32 
nBlankExp,
 const SvXMLEmbeddedTextEntryArr& 
rEmbeddedEntries );
 SAL_DLLPRIVATE void WriteFractionElement_Impl( sal_Int32 nInteger, 
sal_Int32 nBlankInteger, bool bGrouping,
const SvNumberformat& 
rFormat, sal_uInt16 nPart );
diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index 62f3ebcd613d..4e6441841774 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -3469,6 +3469,7 @@ namespace xmloff::token {
 XML_EXPONENT_INTERVAL,
 XML_EXPONENT_LOWERCASE,
 XML_FORCED_EXPONENT_SIGN,
+XML_BLANK_EXPONENT_DIGITS,
 XML_MIN_DECIMAL_PLACES,
 XML_MAX_DENOMINATOR_VALUE,
 XML_MAX_NUMERATOR_DIGITS,
diff --git a/sc/qa/unit/data/ods/tdf156449-Blank-In-Exponent.ods 
b/sc/qa/unit/data/ods/tdf156449-Blank-In-Exponent.ods
new file mode 100644
index ..73647881e73d
Binary files /dev/null and 
b/sc/qa/unit/data/ods/tdf156449-Blank-In-Exponent.ods differ
diff --git a/sc/qa/unit/subsequent_export_test4.cxx 
b/sc/qa/unit/subsequent_export_test4.cxx
index 2b4141425136..390783131733 100644
--- 

[Libreoffice-commits] core.git: include/xmloff schema/libreoffice sc/qa xmloff/source

[Laurent Balland (via logerrit)]

 include/xmloff/xmlnumfe.hxx |2 
 include/xmloff/xmltoken.hxx |1 
 sc/qa/unit/data/ods/tdf153993-Exponent-lower-case.ods   |binary
 sc/qa/unit/subsequent_export_test4.cxx  |   14 
 schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng |9 ++
 xmloff/source/core/xmltoken.cxx |1 
 xmloff/source/style/xmlnumfe.cxx|   24 ++-
 xmloff/source/style/xmlnumfi.cxx|   40 
 xmloff/source/token/tokens.txt  |1 
 9 files changed, 78 insertions(+), 14 deletions(-)

New commits:
commit cc721291cc4a53503398b82dd86baa521b2b13cc
Author: Laurent Balland 
AuthorDate: Sat Jul 1 10:43:39 2023 +0200
Commit: Laurent Balland 
CommitDate: Wed Nov 1 09:10:19 2023 +0100

tdf#153993 Extend ODF: lowercase for exponent char

In scientific format, user may want to have clearer format such as:
0.000" "000" "e+" "0

This change
- adds "exponent-lowercase" boolean attribute to scientific-number format 
to preserve "e" or "E" char
- includes all positions up to exponent for embedded text of scientific 
number

Add QA test

Change-Id: Ie263f4ecf30a1a8dcd8046e1e048767020e54dc2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153824
Tested-by: Jenkins
Reviewed-by: Laurent Balland 

diff --git a/include/xmloff/xmlnumfe.hxx b/include/xmloff/xmlnumfe.hxx
index 64a66a27ef05..8421c5f7e323 100644
--- a/include/xmloff/xmlnumfe.hxx
+++ b/include/xmloff/xmlnumfe.hxx
@@ -71,7 +71,7 @@ private:
 bool bGrouping, sal_Int32 
nTrailingThousands,
 const SvXMLEmbeddedTextEntryArr& 
rEmbeddedEntries );
 SAL_DLLPRIVATE void WriteScientificElement_Impl( sal_Int32 nDecimals, 
sal_Int32 nMinDecimals, sal_Int32 nInteger, sal_Int32 nBlankInteger,
-bool bGrouping, sal_Int32 nExp, 
sal_Int32 nExpInterval, bool bExpSign,
+bool bGrouping, sal_Int32 nExp, 
sal_Int32 nExpInterval, bool bExpSign, bool bExponentLowercase,
 const SvXMLEmbeddedTextEntryArr& 
rEmbeddedEntries );
 SAL_DLLPRIVATE void WriteFractionElement_Impl( sal_Int32 nInteger, 
sal_Int32 nBlankInteger, bool bGrouping,
const SvNumberformat& 
rFormat, sal_uInt16 nPart );
diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index 066a55960e0b..62f3ebcd613d 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -3467,6 +3467,7 @@ namespace xmloff::token {
 XML_EXTERNALDATA,
 
 XML_EXPONENT_INTERVAL,
+XML_EXPONENT_LOWERCASE,
 XML_FORCED_EXPONENT_SIGN,
 XML_MIN_DECIMAL_PLACES,
 XML_MAX_DENOMINATOR_VALUE,
diff --git a/sc/qa/unit/data/ods/tdf153993-Exponent-lower-case.ods 
b/sc/qa/unit/data/ods/tdf153993-Exponent-lower-case.ods
new file mode 100644
index ..aaa07ca80342
Binary files /dev/null and 
b/sc/qa/unit/data/ods/tdf153993-Exponent-lower-case.ods differ
diff --git a/sc/qa/unit/subsequent_export_test4.cxx 
b/sc/qa/unit/subsequent_export_test4.cxx
index b611ceb5ba6f..2b4141425136 100644
--- a/sc/qa/unit/subsequent_export_test4.cxx
+++ b/sc/qa/unit/subsequent_export_test4.cxx
@@ -1503,6 +1503,20 @@ CPPUNIT_TEST_FIXTURE(ScExportTest4, 
testEmbeddedTextInDecimal)
 lcl_TestNumberFormat(*getScDoc(), "#,##0.000\" \"###\" \"###");
 }
 
+CPPUNIT_TEST_FIXTURE(ScExportTest4, testLowercaseExponent)
+{
+createScDoc("ods/tdf153993-Exponent-lower-case.ods");
+
+// save to ODS and reload
+saveAndReload("calc8");
+lcl_TestNumberFormat(*getScDoc(), "0.000\" \"000\" \"e+\" \"0");
+
+// save to XLSX and reload
+// lower case not preserve in XLSX
+saveAndReload("Calc Office Open XML");
+lcl_TestNumberFormat(*getScDoc(), "0.000 000 E+ 0");
+}
+
 CPPUNIT_TEST_FIXTURE(ScExportTest4, testTotalsRowFunction)
 {
 createScDoc("xlsx/totalsRowFunction.xlsx");
diff --git a/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng 
b/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng
index b9fbcfc7ce4b..c9993768aa40 100644
--- a/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng
+++ b/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng
@@ -2845,6 +2845,15 @@ 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.
 
   
 
+  
+  
+
+  
+
+  
+
+  
+
   
   
 
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index fa439f9f367b..00234904e7b4 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -3472,6 +3472,7 @@ namespace xmloff::token {
 TOKEN( "external-data", XML_EXTERNALDATA),
 
 

[Libreoffice-commits] core.git: sc/inc sc/source

[Laurent Balland (via logerrit)]

 sc/inc/globstr.hrc |   14 
+-
 sc/inc/strings.hrc |2 -
 sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx |2 -
 sc/source/ui/view/cellsh.cxx   |   12 
 4 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit 9a0018a356c89baf600a72eed8ee4ac927815b9b
Author: Laurent Balland 
AuthorDate: Wed Feb 22 23:01:01 2023 +0100
Commit: Laurent Balland 
CommitDate: Wed Oct 18 17:03:07 2023 +0200

Replace $baz by %foo for sanity checks

Tools for sanity-checks like
https://docs.weblate.org/en/latest/user/checks.html#percent-placeholders
looks for percent instead of dollar
Try to align with %1 as suggested by Chistian Lohmaier

Change-Id: I97d353f452316b939f2eaf7d30e68b9aab9f83e5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147493
Tested-by: Jenkins
Reviewed-by: Laurent Balland 

diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index 2b949cba8264..e8e45fc01b2e 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -157,14 +157,14 @@
 #define STR_PIVOT_GROUP NC_("STR_PIVOT_GROUP", "Group")
 #define STR_PIVOT_ROW_LABELSNC_("STR_PIVOT_ROW_LABELS", 
"Row Labels")
 #define STR_PIVOT_COL_LABELSNC_("STR_PIVOT_COL_LABELS", 
"Column Labels")
-/* To translators: $1 == will be replaced by STR_SELCOUNT_ROWARG, and $2 by 
STR_SELCOUNT_COLARG
+/* %1 will be replaced by STR_SELCOUNT_ROWARG, and %2 by STR_SELCOUNT_COLARG
e.g. Selected: 1 row, 2 columns */
-#define STR_SELCOUNTNC_("STR_SELCOUNT", "Selected: 
$1, $2")
-// To translators: STR_SELCOUNT_ROWARG is $1 of STR_SELCOUNT. $1 of 
STR_SELCOUNT_ROWARG is number of rows
-#define STR_SELCOUNT_ROWARG NNC_("STR_SELCOUNT_ROWARG", 
"$1 row", "$1 rows")
-// To translators: STR_SELCOUNT_COLARG is $1 of STR_SELCOUNT. $1 of 
STR_SELCOUNT_ROWARG is number of columns
-#define STR_SELCOUNT_COLARG NNC_("STR_SELCOUNT_COLARG", 
"$1 column", "$1 columns")
-#define STR_FILTER_SELCOUNT NC_("STR_FILTER_SELCOUNT", "$1 
of $2 records found")
+#define STR_SELCOUNTNC_("STR_SELCOUNT", "Selected: 
%1, %2")
+// STR_SELCOUNT_ROWARG is %1 of STR_SELCOUNT. %d of STR_SELCOUNT_ROWARG is 
number of rows
+#define STR_SELCOUNT_ROWARG NNC_("STR_SELCOUNT_ROWARG", 
"%d row", "%d rows")
+// STR_SELCOUNT_COLARG is %2 of STR_SELCOUNT. %d of STR_SELCOUNT_ROWARG is 
number of columns
+#define STR_SELCOUNT_COLARG NNC_("STR_SELCOUNT_COLARG", 
"%d column", "%d columns")
+#define STR_FILTER_SELCOUNT NC_("STR_FILTER_SELCOUNT", "%1 
of %2 records found")
 #define STR_COLUMN  NC_("STR_COLUMN", "Column")
 #define STR_ROW NC_("STR_ROW", "Row")
 #define STR_PAGENC_("STR_PAGE", "Page")
diff --git a/sc/inc/strings.hrc b/sc/inc/strings.hrc
index b40ed197be4b..74c15b5b698b 100644
--- a/sc/inc/strings.hrc
+++ b/sc/inc/strings.hrc
@@ -259,7 +259,7 @@
 #define STRID_CALC_FIRST_QUARTILE   
NC_("STRID_CALC_FIRST_QUARTILE", "First Quartile")
 #define STRID_CALC_THIRD_QUARTILE   
NC_("STRID_CALC_THIRD_QUARTILE", "Third Quartile")
 /* RandomNumberGeneratorDialog */
-#define STR_UNDO_DISTRIBUTION_TEMPLATE  
NC_("STR_UNDO_DISTRIBUTION_TEMPLATE", "Random ($(DISTRIBUTION))")
+#define STR_UNDO_DISTRIBUTION_TEMPLATE  
NC_("STR_UNDO_DISTRIBUTION_TEMPLATE", "Random (%1)")
 #define STR_DISTRIBUTION_UNIFORM_REAL   
NC_("STR_DISTRIBUTION_UNIFORM_REAL", "Uniform")
 #define STR_DISTRIBUTION_UNIFORM_INTEGER
NC_("STR_DISTRIBUTION_UNIFORM_INTEGER", "Uniform Integer")
 #define STR_DISTRIBUTION_NORMAL 
NC_("STR_DISTRIBUTION_NORMAL", "Normal")
diff --git a/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx 
b/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx
index 2490ebf47301..38894160eff1 100644
--- a/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx
@@ -262,7 +262,7 @@ void ScRandomNumberGeneratorDialog::GenerateNumbers(RNG& 
randomGenerator, Transl
 {
 OUString aUndo = ScResId(STR_UNDO_DISTRIBUTION_TEMPLATE);
 OUString aDistributionName = ScResId(pDistributionStringId);
-aUndo = aUndo.replaceAll("$(DISTRIBUTION)",  aDistributionName);
+aUndo = aUndo.replaceAll("%1",  aDistributionName);
 
 ScDocShell* pDocShell = mrViewData.GetDocShell();
 SfxUndoManager* pUndoManager = pDocShell->GetUndoManager();
diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx
index 34c87d0e61c6..1a866df3c881 100644
--- a/sc/source/ui/view/cellsh.cxx
+++ 

[Libreoffice-commits] core.git: extras/source

[Laurent Balland (via logerrit)]

 extras/source/templates/presnt/Growing_Liberty/META-INF/manifest.xml |3 
 extras/source/templates/presnt/Growing_Liberty/content.xml   |  466 
--
 2 files changed, 1 insertion(+), 468 deletions(-)

New commits:
commit c76678bbe9c3f835e0fd3dc2ec2381ec821dd548
Author: Laurent Balland 
AuthorDate: Fri Jun 2 13:12:54 2023 +0200
Commit: Heiko Tietze 
CommitDate: Wed Sep 27 05:39:32 2023 +0200

tdf#155390 Impress template Growing Liberty update

Remove last page
Remove styles only used by this page
Update manifest.xml to get conformant ODF 1.3 extended

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

diff --git 
a/extras/source/templates/presnt/Growing_Liberty/META-INF/manifest.xml 
b/extras/source/templates/presnt/Growing_Liberty/META-INF/manifest.xml
index eb36d11d72de..bdc5b9b3272c 100644
--- a/extras/source/templates/presnt/Growing_Liberty/META-INF/manifest.xml
+++ b/extras/source/templates/presnt/Growing_Liberty/META-INF/manifest.xml
@@ -18,7 +18,6 @@
  
  
  
- 
  
  
-
\ No newline at end of file
+
diff --git a/extras/source/templates/presnt/Growing_Liberty/content.xml 
b/extras/source/templates/presnt/Growing_Liberty/content.xml
index 1058159decb9..7f9072dea369 100644
--- a/extras/source/templates/presnt/Growing_Liberty/content.xml
+++ b/extras/source/templates/presnt/Growing_Liberty/content.xml
@@ -149,18 +149,6 @@
   
   
 
-
-  
-
-
-  
-
-
-  
-
-
-  
-
 
   
   
@@ -615,49 +603,6 @@
   
   
 
-
-  
-  
-
-
-  
-  
-  
-
-
-  
-  
-
-
-  
-  
-  
-
-
-  
-  
-
-
-  
-  
-  
-
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-
 
   
 
@@ -736,15 +681,6 @@
 
   
 
-
-  
-
-
-  
-
-
-  
-
 
   
 
@@ -2161,408 +2097,6 @@
   
 
   
-  
-
-
-  
-Fully Editable Icon 
Sets
-  
-  
-
-
-
-
-  
-
-
-  
-by Garik Barseghyan from 
Pixabay
-  
-  
-
-
-
-
-  
-
-
-  
-https://pixabay.com/users/insspirito-1851261/
-  
-  
-
-
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-   

[Libreoffice-commits] core.git: include/xmloff schema/libreoffice sc/qa xmloff/source

[Laurent Balland (via logerrit)]

 include/xmloff/xmlnumfe.hxx |1 
 include/xmloff/xmltoken.hxx |1 
 sc/qa/unit/data/ods/tdf152724-Blank-width-char.ods  |binary
 sc/qa/unit/subsequent_export_test4.cxx  |   13 +
 schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng |   28 +++
 xmloff/source/core/xmltoken.cxx |1 
 xmloff/source/style/xmlnumfe.cxx|  107 +---
 xmloff/source/style/xmlnumfi.cxx|  103 ++-
 xmloff/source/token/tokens.txt  |1 
 9 files changed, 222 insertions(+), 33 deletions(-)

New commits:
commit 74d9da037cac01c5abd768a99b2f948553fbf144
Author: Laurent Balland 
AuthorDate: Sat Feb 4 09:29:20 2023 +0100
Commit: Eike Rathke 
CommitDate: Fri Aug 25 17:49:17 2023 +0200

tdf#152724 Extend ODF for blank width "_x"

Number format code "_x" is currently saved as a text string containing a
number of spaces corresponding to the width of character "x". It may be
confusing for user if its format code is modified.
This change introduces a new XML tag XML_BLANK_WIDTH_CHAR to replace the
previous text string if ODF version is extended

 and :
the attribute is composed of a string containing the used character and its
position in the text string (if position is 0, it is omitted).
Several blank code characters are separated by '_'.
Replacement blanks in the text string are preserved to enable compatibility.

Example: format code
"foo"_M_I_N"!"???,???.000_.000"!"_)
is saved as:
  
   foo   !
   
 

   
   ! 
  

Add QA test

Change-Id: I785e1a14e900e9fd5af88dd7b743fefcc48c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146582
Tested-by: Jenkins
Reviewed-by: Eike Rathke 

diff --git a/include/xmloff/xmlnumfe.hxx b/include/xmloff/xmlnumfe.hxx
index 43e1814dc26b..7c76e5117b1f 100644
--- a/include/xmloff/xmlnumfe.hxx
+++ b/include/xmloff/xmlnumfe.hxx
@@ -51,6 +51,7 @@ private:
 OUStringm_sPrefix;
 SvNumberFormatter*  m_pFormatter;
 OUStringBuffer  m_sTextContent;
+OUStringBuffer  m_sBlankWidthString;
 boolm_bHasText;
 std::unique_ptr  m_pUsedList;
 std::unique_ptr  m_pLocaleData;
diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index e8ffd3fedcd5..7771577a453d 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -3466,6 +3466,7 @@ namespace xmloff::token {
 XML_ZEROS_DENOMINATOR_DIGITS,
 XML_INTEGER_FRACTION_DELIMITER,
 XML_MAX_BLANK_INTEGER_DIGITS,
+XML_BLANK_WIDTH_CHAR,
 
 // tdf#115319
 XML_REFERENCE_LANGUAGE,
diff --git a/sc/qa/unit/data/ods/tdf152724-Blank-width-char.ods 
b/sc/qa/unit/data/ods/tdf152724-Blank-width-char.ods
new file mode 100644
index ..4716d4be5355
Binary files /dev/null and b/sc/qa/unit/data/ods/tdf152724-Blank-width-char.ods 
differ
diff --git a/sc/qa/unit/subsequent_export_test4.cxx 
b/sc/qa/unit/subsequent_export_test4.cxx
index 74313ef67c27..357ac567575f 100644
--- a/sc/qa/unit/subsequent_export_test4.cxx
+++ b/sc/qa/unit/subsequent_export_test4.cxx
@@ -1480,6 +1480,19 @@ CPPUNIT_TEST_FIXTURE(ScExportTest4, 
testSecondsWithoutTruncateAndDecimals)
 lcl_TestNumberFormat(*getScDoc(), "[SS].00");
 }
 
+CPPUNIT_TEST_FIXTURE(ScExportTest4, testBlankWidthCharacter)
+{
+createScDoc("ods/tdf152724-Blank-width-char.ods");
+
+// save to ODS and reload
+saveAndReload("calc8");
+lcl_TestNumberFormat(*getScDoc(), "[>0]_-?0;[<0]-?0;_-?0;@");
+
+// save to XLSX and reload
+saveAndReload("Calc Office Open XML");
+lcl_TestNumberFormat(*getScDoc(), "_-?0;-?0;_-?0;@");
+}
+
 CPPUNIT_TEST_FIXTURE(ScExportTest4, testEmbeddedTextInDecimal)
 {
 createScDoc("xlsx/embedded-text-in-decimal.xlsx");
diff --git a/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng 
b/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng
index b1a344e7bf4a..b7ad4b8a1a7c 100644
--- a/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng
+++ b/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng
@@ -2047,6 +2047,14 @@ 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.
 
   
 
+
+  
+
+  
+ 
+
+  
+
 

 
@@ -2745,6 +2753,26 @@ 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.
 
   
 
+  
+
+
+  
+
+  
+
+  
+
+  
+  
+
+  
+
+  
+
+  
+
+  
+
   
   
 
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index 8127996aa1c9..4f6f2223e721 100644
--- 

[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - chart2/qa chart2/source

[Laurent Balland (via logerrit)]

 chart2/qa/extras/chart2export.cxx|   16 +---
 chart2/source/inc/RegressionCurveModel.hxx   |1 +
 chart2/source/tools/RegressionCurveModel.cxx |   11 ++-
 3 files changed, 24 insertions(+), 4 deletions(-)

New commits:
commit 4defe6e3c4ab16ee0993c74d9af30fe1abecb8c5
Author: Laurent Balland 
AuthorDate: Sun Jul 2 18:00:31 2023 +0200
Commit: Xisco Fauli 
CommitDate: Mon Aug 7 10:46:35 2023 +0200

tdf#155526 Remove Insert R2 in all cases

When opening a file containing a Moving average trend line,
addRegressionCurve is not used, then MayHaveCorrelationCoefficient property 
is not
correctly set.
This change modify this property in all cases.
Update property in firePropertyChangeEvent() as it is not possible in
constructor: JunitTest_chart2_unoapi fails in MeanValue as SolarMutex
is not owned

Add QA test

Change-Id: I13bdb81239a7362431edcf28bfc38ac4820a7776
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153859
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 
(cherry picked from commit 6fc12ad600a1ee10253c269a5988907a2894be76)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155174
Reviewed-by: Xisco Fauli 

diff --git a/chart2/qa/extras/chart2export.cxx 
b/chart2/qa/extras/chart2export.cxx
index f287577fb63a..67101a09fad0 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -163,7 +163,7 @@ void checkCommonTrendline(
 Reference const & xCurve,
 double aExpectedExtrapolateForward, double 
aExpectedExtrapolateBackward,
 bool aExpectedForceIntercept, double aExpectedInterceptValue,
-bool aExpectedShowEquation, bool aExpectedR2)
+bool aExpectedShowEquation, bool aExpectedR2, bool aExpectedMayHaveR2)
 {
 Reference xProperties( xCurve , uno::UNO_QUERY );
 CPPUNIT_ASSERT(xProperties.is());
@@ -197,6 +197,10 @@ void checkCommonTrendline(
 bool bShowCorrelationCoefficient = false;
 
CPPUNIT_ASSERT(xEquationProperties->getPropertyValue("ShowCorrelationCoefficient")
 >>= bShowCorrelationCoefficient);
 CPPUNIT_ASSERT_EQUAL(aExpectedR2, bShowCorrelationCoefficient);
+
+bool bMayHaveR2 = false;
+
CPPUNIT_ASSERT(xEquationProperties->getPropertyValue("MayHaveCorrelationCoefficient")
 >>= bMayHaveR2);
+CPPUNIT_ASSERT_EQUAL(aExpectedMayHaveR2, bMayHaveR2);
 }
 
 void checkNameAndType(Reference const & xProperties, const 
OUString& aExpectedName, const OUString& aExpectedServiceName)
@@ -226,7 +230,7 @@ void checkLinearTrendline(
 xCurve,
 aExpectedExtrapolateForward, aExpectedExtrapolateBackward,
 /*aExpectedForceIntercept*/false, aExpectedInterceptValue,
-/*aExpectedShowEquation*/true, /*aExpectedR2*/false);
+/*aExpectedShowEquation*/true, /*aExpectedR2*/false, 
/*aExpectedMayHaveR2*/true);
 }
 
 void checkPolynomialTrendline(
@@ -248,7 +252,7 @@ void checkPolynomialTrendline(
 xCurve,
 aExpectedExtrapolateForward, aExpectedExtrapolateBackward,
 /*aExpectedForceIntercept*/true, aExpectedInterceptValue,
-/*aExpectedShowEquation*/true, /*aExpectedR2*/true);
+/*aExpectedShowEquation*/true, /*aExpectedR2*/true, 
/*aExpectedMayHaveR2*/true);
 }
 
 void checkMovingAverageTrendline(
@@ -262,6 +266,12 @@ void checkMovingAverageTrendline(
 sal_Int32 aPeriod = 2;
 CPPUNIT_ASSERT(xProperties->getPropertyValue("MovingAveragePeriod") >>= 
aPeriod);
 CPPUNIT_ASSERT_EQUAL(aExpectedPeriod, aPeriod);
+
+checkCommonTrendline(
+xCurve,
+/*aExpectedExtrapolateForward*/0.0, 
/*aExpectedExtrapolateBackward*/0.0,
+/*aExpectedForceIntercept*/false, /*aExpectedInterceptValue*/0.0,
+/*aExpectedShowEquation*/false, /*aExpectedR2*/false, 
/*aExpectedMayHaveR2*/false);
 }
 
 void checkTrendlinesInChart(uno::Reference< chart2::XChartDocument > const & 
xChartDoc)
diff --git a/chart2/source/inc/RegressionCurveModel.hxx 
b/chart2/source/inc/RegressionCurveModel.hxx
index 89955f1314e4..ddd75a8391a1 100644
--- a/chart2/source/inc/RegressionCurveModel.hxx
+++ b/chart2/source/inc/RegressionCurveModel.hxx
@@ -119,6 +119,7 @@ private:
 
 rtl::Reference m_xModifyEventForwarder;
 css::uno::Reference< css::beans::XPropertySet > m_xEquationProperties;
+void setPropertyMayHaveR2();
 };
 
 // implementations for factory instantiation
diff --git a/chart2/source/tools/RegressionCurveModel.cxx 
b/chart2/source/tools/RegressionCurveModel.cxx
index d64d053e2611..9d4ea544df07 100644
--- a/chart2/source/tools/RegressionCurveModel.cxx
+++ b/chart2/source/tools/RegressionCurveModel.cxx
@@ -182,12 +182,20 @@ void SAL_CALL 
RegressionCurveModel::setEquationProperties( const uno::Reference<
 ModifyListenerHelper::removeListener( m_xEquationProperties, 
m_xModifyEventForwarder );
 
 m_xEquationProperties.set( xEquationProperties );
-m_xEquationProperties->setPropertyValue( 

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - chart2/qa chart2/source

[Laurent Balland (via logerrit)]

 chart2/qa/extras/chart2export.cxx|   16 +---
 chart2/source/inc/RegressionCurveModel.hxx   |1 +
 chart2/source/tools/RegressionCurveModel.cxx |   11 ++-
 3 files changed, 24 insertions(+), 4 deletions(-)

New commits:
commit ccdcdc57472b986b0e2ba346d533e015eff3781d
Author: Laurent Balland 
AuthorDate: Sun Jul 2 18:00:31 2023 +0200
Commit: Xisco Fauli 
CommitDate: Thu Aug 3 10:30:00 2023 +0200

tdf#155526 Remove Insert R2 in all cases

When opening a file containing a Moving average trend line,
addRegressionCurve is not used, then MayHaveCorrelationCoefficient property 
is not
correctly set.
This change modify this property in all cases.
Update property in firePropertyChangeEvent() as it is not possible in
constructor: JunitTest_chart2_unoapi fails in MeanValue as SolarMutex
is not owned

Add QA test

Change-Id: I13bdb81239a7362431edcf28bfc38ac4820a7776
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153859
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 
(cherry picked from commit 6fc12ad600a1ee10253c269a5988907a2894be76)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155173
Reviewed-by: Xisco Fauli 

diff --git a/chart2/qa/extras/chart2export.cxx 
b/chart2/qa/extras/chart2export.cxx
index 6e9a18efeed5..2f5f030ef3d1 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -52,7 +52,7 @@ void checkCommonTrendline(
 Reference const & xCurve,
 double aExpectedExtrapolateForward, double 
aExpectedExtrapolateBackward,
 bool aExpectedForceIntercept, double aExpectedInterceptValue,
-bool aExpectedShowEquation, bool aExpectedR2)
+bool aExpectedShowEquation, bool aExpectedR2, bool aExpectedMayHaveR2)
 {
 Reference xProperties( xCurve , uno::UNO_QUERY );
 CPPUNIT_ASSERT(xProperties.is());
@@ -86,6 +86,10 @@ void checkCommonTrendline(
 bool bShowCorrelationCoefficient = false;
 
CPPUNIT_ASSERT(xEquationProperties->getPropertyValue("ShowCorrelationCoefficient")
 >>= bShowCorrelationCoefficient);
 CPPUNIT_ASSERT_EQUAL(aExpectedR2, bShowCorrelationCoefficient);
+
+bool bMayHaveR2 = false;
+
CPPUNIT_ASSERT(xEquationProperties->getPropertyValue("MayHaveCorrelationCoefficient")
 >>= bMayHaveR2);
+CPPUNIT_ASSERT_EQUAL(aExpectedMayHaveR2, bMayHaveR2);
 }
 
 void checkNameAndType(Reference const & xProperties, const 
OUString& aExpectedName, const OUString& aExpectedServiceName)
@@ -115,7 +119,7 @@ void checkLinearTrendline(
 xCurve,
 aExpectedExtrapolateForward, aExpectedExtrapolateBackward,
 /*aExpectedForceIntercept*/false, aExpectedInterceptValue,
-/*aExpectedShowEquation*/true, /*aExpectedR2*/false);
+/*aExpectedShowEquation*/true, /*aExpectedR2*/false, 
/*aExpectedMayHaveR2*/true);
 }
 
 void checkPolynomialTrendline(
@@ -137,7 +141,7 @@ void checkPolynomialTrendline(
 xCurve,
 aExpectedExtrapolateForward, aExpectedExtrapolateBackward,
 /*aExpectedForceIntercept*/true, aExpectedInterceptValue,
-/*aExpectedShowEquation*/true, /*aExpectedR2*/true);
+/*aExpectedShowEquation*/true, /*aExpectedR2*/true, 
/*aExpectedMayHaveR2*/true);
 }
 
 void checkMovingAverageTrendline(
@@ -151,6 +155,12 @@ void checkMovingAverageTrendline(
 sal_Int32 aPeriod = 2;
 CPPUNIT_ASSERT(xProperties->getPropertyValue("MovingAveragePeriod") >>= 
aPeriod);
 CPPUNIT_ASSERT_EQUAL(aExpectedPeriod, aPeriod);
+
+checkCommonTrendline(
+xCurve,
+/*aExpectedExtrapolateForward*/0.0, 
/*aExpectedExtrapolateBackward*/0.0,
+/*aExpectedForceIntercept*/false, /*aExpectedInterceptValue*/0.0,
+/*aExpectedShowEquation*/false, /*aExpectedR2*/false, 
/*aExpectedMayHaveR2*/false);
 }
 
 void checkTrendlinesInChart(uno::Reference< chart2::XChartDocument > const & 
xChartDoc)
diff --git a/chart2/source/inc/RegressionCurveModel.hxx 
b/chart2/source/inc/RegressionCurveModel.hxx
index 89955f1314e4..ddd75a8391a1 100644
--- a/chart2/source/inc/RegressionCurveModel.hxx
+++ b/chart2/source/inc/RegressionCurveModel.hxx
@@ -119,6 +119,7 @@ private:
 
 rtl::Reference m_xModifyEventForwarder;
 css::uno::Reference< css::beans::XPropertySet > m_xEquationProperties;
+void setPropertyMayHaveR2();
 };
 
 // implementations for factory instantiation
diff --git a/chart2/source/tools/RegressionCurveModel.cxx 
b/chart2/source/tools/RegressionCurveModel.cxx
index 5c1082e89a74..06be003ef106 100644
--- a/chart2/source/tools/RegressionCurveModel.cxx
+++ b/chart2/source/tools/RegressionCurveModel.cxx
@@ -183,12 +183,20 @@ void SAL_CALL 
RegressionCurveModel::setEquationProperties( const uno::Reference<
 ModifyListenerHelper::removeListener( m_xEquationProperties, 
m_xModifyEventForwarder );
 
 m_xEquationProperties.set( xEquationProperties );
-m_xEquationProperties->setPropertyValue( 

[Libreoffice-commits] core.git: sc/inc sc/source sc/uiconfig

[Laurent Balland (via logerrit)]

 sc/inc/filter.hxx |6 ++-
 sc/inc/scabstdlg.hxx  |1 
 sc/source/filter/html/htmlimp.cxx |9 +++--
 sc/source/filter/inc/eeimport.hxx |3 +
 sc/source/filter/inc/ftools.hxx   |2 -
 sc/source/filter/inc/htmlimp.hxx  |3 +
 sc/source/filter/rtf/eeimpars.cxx |7 +++-
 sc/source/ui/attrdlg/scdlgfact.cxx|5 +++
 sc/source/ui/attrdlg/scdlgfact.hxx|1 
 sc/source/ui/dbgui/textimportoptions.cxx  |   36 +++---
 sc/source/ui/docshell/docsh.cxx   |9 +++--
 sc/source/ui/docshell/impex.cxx   |3 +
 sc/source/ui/inc/textimportoptions.hxx|8 +++--
 sc/source/ui/unoobj/filtuno.cxx   |2 +
 sc/source/ui/view/viewfun5.cxx|4 ++
 sc/uiconfig/scalc/ui/textimportoptions.ui |   47 --
 16 files changed, 114 insertions(+), 32 deletions(-)

New commits:
commit 5ae709d8519dd6d0de265d516c6158ccbdf4882e
Author: Laurent Balland 
AuthorDate: Sun Jun 4 19:03:16 2023 +0200
Commit: Laurent Balland 
CommitDate: Tue Jul 25 21:44:36 2023 +0200

follow tdf#154131 Treat also HMTL import

Add Detect numbers in scientific notation option to HTML paste
Still need some qa tests

Change-Id: I553404a01ab2a61566b861b3c01d14bdc0c46668
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152591
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/sc/inc/filter.hxx b/sc/inc/filter.hxx
index 7a71b89c503e..6bceb74b69d0 100644
--- a/sc/inc/filter.hxx
+++ b/sc/inc/filter.hxx
@@ -50,7 +50,8 @@ class ScEEAbsImport {
 virtual ScRange GetRange() = 0;
 virtual voidWriteToDocument(
 bool bSizeColsRows = false, double nOutputFactor = 1.0,
-SvNumberFormatter* pFormatter = nullptr, bool bConvertDate = true ) = 
0;
+SvNumberFormatter* pFormatter = nullptr, bool bConvertDate = true,
+bool bConvertScientific = true ) = 0;
 };
 
 class SAL_DLLPUBLIC_RTTI ScFormatFilterPlugin {
@@ -67,7 +68,8 @@ class SAL_DLLPUBLIC_RTTI ScFormatFilterPlugin {
  const rtl_TextEncoding eSrc ) = 0;
 virtual ErrCode ScImportRTF( SvStream&, const OUString& rBaseURL, 
ScDocument*, ScRange& rRange ) = 0;
 virtual ErrCode ScImportHTML( SvStream&, const OUString& rBaseURL, 
ScDocument*, ScRange& rRange, double nOutputFactor,
-   bool bCalcWidthHeight, SvNumberFormatter* 
pFormatter, bool bConvertDate ) = 0;
+   bool bCalcWidthHeight, SvNumberFormatter* 
pFormatter, bool bConvertDate,
+   bool bConvertScientific ) = 0;
 
 // various import helpers
 virtual std::unique_ptr CreateRTFImport( ScDocument* pDoc, 
const ScRange& rRange ) = 0;
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index a06a435e7d5e..7a94af5f6fe9 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -394,6 +394,7 @@ protected:
 public:
 virtual LanguageType GetLanguageType() const = 0;
 virtual bool IsDateConversionSet() const = 0;
+virtual bool IsScientificConversionSet() const = 0;
 virtual bool IsKeepAskingSet() const = 0;
 };
 
diff --git a/sc/source/filter/html/htmlimp.cxx 
b/sc/source/filter/html/htmlimp.cxx
index 12e98a9ef018..3168a02fc4eb 100644
--- a/sc/source/filter/html/htmlimp.cxx
+++ b/sc/source/filter/html/htmlimp.cxx
@@ -45,13 +45,13 @@
 
 ErrCode ScFormatFilterPluginImpl::ScImportHTML( SvStream , const 
OUString& rBaseURL, ScDocument *pDoc,
 ScRange& rRange, double nOutputFactor, bool bCalcWidthHeight, 
SvNumberFormatter* pFormatter,
-bool bConvertDate )
+bool bConvertDate, bool bConvertScientific )
 {
 ScHTMLImport aImp( pDoc, rBaseURL, rRange, bCalcWidthHeight );
 ErrCode nErr = aImp.Read( rStream, rBaseURL );
 ScRange aR = aImp.GetRange();
 rRange.aEnd = aR.aEnd;
-aImp.WriteToDocument( true, nOutputFactor, pFormatter, bConvertDate );
+aImp.WriteToDocument( true, nOutputFactor, pFormatter, bConvertDate, 
bConvertScientific );
 return nErr;
 }
 
@@ -112,9 +112,10 @@ void ScHTMLImport::InsertRangeName( ScDocument& rDoc, 
const OUString& rName, con
 }
 
 void ScHTMLImport::WriteToDocument(
-bool bSizeColsRows, double nOutputFactor, SvNumberFormatter* pFormatter, 
bool bConvertDate )
+bool bSizeColsRows, double nOutputFactor, SvNumberFormatter* pFormatter, 
bool bConvertDate,
+bool bConvertScientific )
 {
-ScEEImport::WriteToDocument( bSizeColsRows, nOutputFactor, pFormatter, 
bConvertDate );
+ScEEImport::WriteToDocument( bSizeColsRows, nOutputFactor, pFormatter, 
bConvertDate, bConvertScientific );
 
 const ScHTMLParser* pParser = static_cast(mpParser.get());
 const ScHTMLTable* pGlobTable = pParser->GetGlobalTable();
diff --git a/sc/source/filter/inc/eeimport.hxx 
b/sc/source/filter/inc/eeimport.hxx
index d4ddc31f40c2..0d0466eb8909 100644
--- 

[Libreoffice-commits] core.git: chart2/qa chart2/source

[Laurent Balland (via logerrit)]

 chart2/qa/extras/chart2export.cxx|   16 +---
 chart2/source/inc/RegressionCurveModel.hxx   |1 +
 chart2/source/tools/RegressionCurveModel.cxx |   11 ++-
 3 files changed, 24 insertions(+), 4 deletions(-)

New commits:
commit 6fc12ad600a1ee10253c269a5988907a2894be76
Author: Laurent Balland 
AuthorDate: Sun Jul 2 18:00:31 2023 +0200
Commit: Tomaž Vajngerl 
CommitDate: Sun Jul 16 14:32:03 2023 +0200

tdf#155526 Remove Insert R2 in all cases

When opening a file containing a Moving average trend line,
addRegressionCurve is not used, then MayHaveCorrelationCoefficient property 
is not
correctly set.
This change modify this property in all cases.
Update property in firePropertyChangeEvent() as it is not possible in
constructor: JunitTest_chart2_unoapi fails in MeanValue as SolarMutex
is not owned

Add QA test

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

diff --git a/chart2/qa/extras/chart2export.cxx 
b/chart2/qa/extras/chart2export.cxx
index 6e9a18efeed5..2f5f030ef3d1 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -52,7 +52,7 @@ void checkCommonTrendline(
 Reference const & xCurve,
 double aExpectedExtrapolateForward, double 
aExpectedExtrapolateBackward,
 bool aExpectedForceIntercept, double aExpectedInterceptValue,
-bool aExpectedShowEquation, bool aExpectedR2)
+bool aExpectedShowEquation, bool aExpectedR2, bool aExpectedMayHaveR2)
 {
 Reference xProperties( xCurve , uno::UNO_QUERY );
 CPPUNIT_ASSERT(xProperties.is());
@@ -86,6 +86,10 @@ void checkCommonTrendline(
 bool bShowCorrelationCoefficient = false;
 
CPPUNIT_ASSERT(xEquationProperties->getPropertyValue("ShowCorrelationCoefficient")
 >>= bShowCorrelationCoefficient);
 CPPUNIT_ASSERT_EQUAL(aExpectedR2, bShowCorrelationCoefficient);
+
+bool bMayHaveR2 = false;
+
CPPUNIT_ASSERT(xEquationProperties->getPropertyValue("MayHaveCorrelationCoefficient")
 >>= bMayHaveR2);
+CPPUNIT_ASSERT_EQUAL(aExpectedMayHaveR2, bMayHaveR2);
 }
 
 void checkNameAndType(Reference const & xProperties, const 
OUString& aExpectedName, const OUString& aExpectedServiceName)
@@ -115,7 +119,7 @@ void checkLinearTrendline(
 xCurve,
 aExpectedExtrapolateForward, aExpectedExtrapolateBackward,
 /*aExpectedForceIntercept*/false, aExpectedInterceptValue,
-/*aExpectedShowEquation*/true, /*aExpectedR2*/false);
+/*aExpectedShowEquation*/true, /*aExpectedR2*/false, 
/*aExpectedMayHaveR2*/true);
 }
 
 void checkPolynomialTrendline(
@@ -137,7 +141,7 @@ void checkPolynomialTrendline(
 xCurve,
 aExpectedExtrapolateForward, aExpectedExtrapolateBackward,
 /*aExpectedForceIntercept*/true, aExpectedInterceptValue,
-/*aExpectedShowEquation*/true, /*aExpectedR2*/true);
+/*aExpectedShowEquation*/true, /*aExpectedR2*/true, 
/*aExpectedMayHaveR2*/true);
 }
 
 void checkMovingAverageTrendline(
@@ -151,6 +155,12 @@ void checkMovingAverageTrendline(
 sal_Int32 aPeriod = 2;
 CPPUNIT_ASSERT(xProperties->getPropertyValue("MovingAveragePeriod") >>= 
aPeriod);
 CPPUNIT_ASSERT_EQUAL(aExpectedPeriod, aPeriod);
+
+checkCommonTrendline(
+xCurve,
+/*aExpectedExtrapolateForward*/0.0, 
/*aExpectedExtrapolateBackward*/0.0,
+/*aExpectedForceIntercept*/false, /*aExpectedInterceptValue*/0.0,
+/*aExpectedShowEquation*/false, /*aExpectedR2*/false, 
/*aExpectedMayHaveR2*/false);
 }
 
 void checkTrendlinesInChart(uno::Reference< chart2::XChartDocument > const & 
xChartDoc)
diff --git a/chart2/source/inc/RegressionCurveModel.hxx 
b/chart2/source/inc/RegressionCurveModel.hxx
index 89955f1314e4..ddd75a8391a1 100644
--- a/chart2/source/inc/RegressionCurveModel.hxx
+++ b/chart2/source/inc/RegressionCurveModel.hxx
@@ -119,6 +119,7 @@ private:
 
 rtl::Reference m_xModifyEventForwarder;
 css::uno::Reference< css::beans::XPropertySet > m_xEquationProperties;
+void setPropertyMayHaveR2();
 };
 
 // implementations for factory instantiation
diff --git a/chart2/source/tools/RegressionCurveModel.cxx 
b/chart2/source/tools/RegressionCurveModel.cxx
index 5c1082e89a74..06be003ef106 100644
--- a/chart2/source/tools/RegressionCurveModel.cxx
+++ b/chart2/source/tools/RegressionCurveModel.cxx
@@ -183,12 +183,20 @@ void SAL_CALL 
RegressionCurveModel::setEquationProperties( const uno::Reference<
 ModifyListenerHelper::removeListener( m_xEquationProperties, 
m_xModifyEventForwarder );
 
 m_xEquationProperties.set( xEquationProperties );
-m_xEquationProperties->setPropertyValue( 
"MayHaveCorrelationCoefficient", uno::Any( m_eRegressionCurveType != 
CURVE_TYPE_MOVING_AVERAGE ) );
+setPropertyMayHaveR2();
 

[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - chart2/source

[Laurent Balland (via logerrit)]

 chart2/source/controller/main/ControllerCommandDispatch.cxx |   13 ---
 chart2/source/inc/RegressionCurveHelper.hxx |1 
 chart2/source/tools/RegressionCurveHelper.cxx   |   14 
 chart2/source/tools/RegressionCurveModel.cxx|1 
 chart2/source/tools/RegressionEquation.cxx  |8 ++
 5 files changed, 34 insertions(+), 3 deletions(-)

New commits:
commit 47d3f102add9a46216e9082efdff362eb8555ad3
Author: Laurent Balland 
AuthorDate: Sun Jun 18 19:25:39 2023 +0200
Commit: Tomaž Vajngerl 
CommitDate: Wed Jul 5 03:19:43 2023 +0200

tdf#155526 Moving average: remove Insert R2

Moving average trend line does not R² value.
This change remove "Insert R²" from context menu when the trend is of
type "Moving average"

Change-Id: I729a6421df34859e7176c798a2b68a6f13cfb544
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153294
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 
(cherry picked from commit aa86e7e8c22527eb5da0b8a05dbd4bd749f7a2b8)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153838

diff --git a/chart2/source/controller/main/ControllerCommandDispatch.cxx 
b/chart2/source/controller/main/ControllerCommandDispatch.cxx
index 620082bd99d8..ba659fd00449 100644
--- a/chart2/source/controller/main/ControllerCommandDispatch.cxx
+++ b/chart2/source/controller/main/ControllerCommandDispatch.cxx
@@ -285,23 +285,28 @@ void ControllerState::update(
 // Trendline Equation
 bMayFormatTrendlineEquation = bMayDeleteTrendlineEquation = 
RegressionCurveHelper::hasEquation( xRegCurve );
 bMayAddTrendlineEquation = !bMayDeleteTrendlineEquation;
+bMayAddR2Value = RegressionCurveHelper::MayHaveCorrelationCoefficient( 
xRegCurve ) && bMayAddTrendlineEquation;
 }
 else if( aObjectType == OBJECTTYPE_DATA_CURVE_EQUATION )
 {
 bMayFormatTrendlineEquation = true;
 bool bHasR2Value = false;
+bool bMayHaveR2 = true;
 try
 {
 uno::Reference< beans::XPropertySet > xEquationProperties =
 ObjectIdentifier::getObjectPropertySet( aSelObjCID, xModel );
 if( xEquationProperties.is() )
+{
 xEquationProperties->getPropertyValue( 
"ShowCorrelationCoefficient" ) >>= bHasR2Value;
+xEquationProperties->getPropertyValue( 
"MayHaveCorrelationCoefficient" ) >>= bMayHaveR2;
+}
 }
 catch(const uno::RuntimeException&)
 {
 TOOLS_WARN_EXCEPTION("chart2", "" );
 }
-bMayAddR2Value = !bHasR2Value;
+bMayAddR2Value = !bHasR2Value && bMayHaveR2;
 bMayDeleteR2Value = bHasR2Value;
 }
 }
@@ -672,8 +677,10 @@ void ControllerCommandDispatch::updateCommandAvailability()
 m_aCommandAvailability[ ".uno:InsertMeanValue" ] = bIsWritable && 
bControllerStateIsValid && m_apControllerState->bMayAddMeanValue;
 m_aCommandAvailability[ ".uno:InsertTrendline" ] = bIsWritable && 
bControllerStateIsValid && m_apControllerState->bMayAddTrendline;
 m_aCommandAvailability[ ".uno:InsertTrendlineEquation" ] = bIsWritable && 
bControllerStateIsValid && m_apControllerState->bMayAddTrendlineEquation;
-m_aCommandAvailability[ ".uno:InsertTrendlineEquationAndR2" ] = 
m_aCommandAvailability[ ".uno:InsertTrendlineEquation" ];
-m_aCommandAvailability[ ".uno:InsertR2Value" ] = bIsWritable && 
bControllerStateIsValid && m_apControllerState->bMayAddR2Value;
+m_aCommandAvailability[ ".uno:InsertTrendlineEquationAndR2" ] =
+m_aCommandAvailability[ ".uno:InsertTrendlineEquation" ] && 
m_apControllerState->bMayAddR2Value;
+m_aCommandAvailability[ ".uno:InsertR2Value" ] = bIsWritable && 
bControllerStateIsValid && m_apControllerState->bMayAddR2Value
+&& !m_apControllerState->bMayAddTrendlineEquation;
 m_aCommandAvailability[ ".uno:DeleteR2Value" ] = bIsWritable && 
bControllerStateIsValid && m_apControllerState->bMayDeleteR2Value;
 
 m_aCommandAvailability[ ".uno:InsertXErrorBars" ] = bIsWritable && 
bControllerStateIsValid && m_apControllerState->bMayAddXErrorBars;
diff --git a/chart2/source/inc/RegressionCurveHelper.hxx 
b/chart2/source/inc/RegressionCurveHelper.hxx
index 2666b41d9bb9..e2df1bb4cd4d 100644
--- a/chart2/source/inc/RegressionCurveHelper.hxx
+++ b/chart2/source/inc/RegressionCurveHelper.hxx
@@ -199,6 +199,7 @@ namespace chart::RegressionCurveHelper
 const rtl::Reference<::chart::RegressionCurveModel>& xCurve );
 
 OOO_DLLPUBLIC_CHARTTOOLS bool hasEquation(const 
css::uno::Reference& xCurve );
+OOO_DLLPUBLIC_CHARTTOOLS bool MayHaveCorrelationCoefficient(const 
css::uno::Reference& xCurve );
 
 } //  namespace chart
 
diff --git a/chart2/source/tools/RegressionCurveHelper.cxx 
b/chart2/source/tools/RegressionCurveHelper.cxx
index 2ff161bf0cf7..9626b07c1fbd 100644
--- a/chart2/source/tools/RegressionCurveHelper.cxx
+++ 

[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - chart2/source

[Laurent Balland (via logerrit)]

 chart2/source/controller/dialogs/ObjectNameProvider.cxx |   48 +---
 1 file changed, 28 insertions(+), 20 deletions(-)

New commits:
commit 37d8a0f0a4814891b563eac789379787d9179cf5
Author: Laurent Balland 
AuthorDate: Tue Jun 27 21:23:19 2023 +0200
Commit: Tomaž Vajngerl 
CommitDate: Mon Jul 3 15:35:10 2023 +0200

tdf#155526 Restore status bar for moving average

Previous commit dc03f59374d4fc74dd44ddedc903bb9c00a74bb7 broke text in
status bar when a moving average trend line is selected

Change-Id: I259fb9aee1eccf9fac93038c6dd2755490769f88
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153677
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 
(cherry picked from commit 125b0f6609332523d30bef600979b698c2d216f8)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153706
(cherry picked from commit 2e04c00f21cf2566c3de34d9dd828cc1615329fd)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153839

diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx 
b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
index ab002761bde6..ffd2bf74d17f 100644
--- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx
+++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
@@ -597,33 +597,41 @@ OUString ObjectNameProvider::getHelpText( 
std::u16string_view rObjectCID, const
 if ( !(xEqProp->getPropertyValue( "YName") >>= 
aYName) )
 aYName = "f(x)";
 }
-xCalculator->setRegressionProperties(aDegree, 
bForceIntercept, aInterceptValue, 2, aMovingType);
+xCalculator->setRegressionProperties(aDegree, 
bForceIntercept, aInterceptValue, aPeriod, aMovingType);
 xCalculator->setXYNames ( aXName, aYName );
 RegressionCurveHelper::initializeCurveCalculator( 
xCalculator, xSeries, xChartModel );
 
-// replace formula
-OUString aWildcard = "%FORMULA";
-sal_Int32 nIndex = aRet.indexOf( aWildcard );
-if( nIndex != -1 )
+// change text for Moving Average
+if ( RegressionCurveHelper::getRegressionType( xCurve 
) == SvxChartRegress::MovingAverage )
+{
+aRet = xCalculator->getRepresentation();
+}
+else
 {
-OUString aFormula ( 
xCalculator->getRepresentation() );
-if ( cDecSeparator != '.' )
+// replace formula
+OUString aWildcard = "%FORMULA";
+sal_Int32 nIndex = aRet.indexOf( aWildcard );
+if( nIndex != -1 )
 {
-aFormula = aFormula.replace( '.', 
cDecSeparator );
+OUString aFormula ( 
xCalculator->getRepresentation() );
+if ( cDecSeparator != '.' )
+{
+aFormula = aFormula.replace( '.', 
cDecSeparator );
+}
+aRet = aRet.replaceAt( nIndex, 
aWildcard.getLength(), aFormula );
 }
-aRet = aRet.replaceAt( nIndex, 
aWildcard.getLength(), aFormula );
-}
 
-// replace r^2
-aWildcard = "%RSQUARED";
-nIndex = aRet.indexOf( aWildcard );
-if( nIndex != -1 )
-{
-double fR( 
xCalculator->getCorrelationCoefficient());
-aRet = aRet.replaceAt(
-nIndex, aWildcard.getLength(),
-::rtl::math::doubleToUString(
-fR*fR, rtl_math_StringFormat_G, 4, 
cDecSeparator, true ));
+// replace r^2
+aWildcard = "%RSQUARED";
+nIndex = aRet.indexOf( aWildcard );
+if( nIndex != -1 )
+{
+double fR( 
xCalculator->getCorrelationCoefficient());
+aRet = aRet.replaceAt(
+nIndex, aWildcard.getLength(),
+::rtl::math::doubleToUString(
+fR*fR, rtl_math_StringFormat_G, 4, 
cDecSeparator, true ));
+}
 }
 }
 catch( const uno::Exception & )

[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - chart2/source

[Laurent Balland (via logerrit)]

 chart2/source/controller/dialogs/ObjectNameProvider.cxx|   13 
+-
 chart2/source/controller/dialogs/res_Trendline.cxx |4 ---
 chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx |   10 ++-
 3 files changed, 11 insertions(+), 16 deletions(-)

New commits:
commit 6916aef75602b598c096fba00567e884dd010a7b
Author: Laurent Balland 
AuthorDate: Mon Jun 12 21:48:13 2023 +0200
Commit: Laurent Balland 
CommitDate: Sat Jul 1 15:26:04 2023 +0200

tdf#155526 Add Period to trend line equation

Insert Period value earlier to have it ready for representation
Allow Moving average equation in dialog UI

Change-Id: I1d20572c39462e60b60ab7eec1f174a3cf934d4a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153094
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 
(cherry picked from commit dc03f59374d4fc74dd44ddedc903bb9c00a74bb7)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153755
Reviewed-by: Laurent Balland 

diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx 
b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
index c60ff1ca364a..ab002761bde6 100644
--- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx
+++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
@@ -601,18 +601,9 @@ OUString ObjectNameProvider::getHelpText( 
std::u16string_view rObjectCID, const
 xCalculator->setXYNames ( aXName, aYName );
 RegressionCurveHelper::initializeCurveCalculator( 
xCalculator, xSeries, xChartModel );
 
-// change text for Moving Average
-OUString aWildcard( "%PERIOD" );
-sal_Int32 nIndex = 
xCalculator->getRepresentation().indexOf( aWildcard );
-if( nIndex != -1 )
-{  // replace period
-aRet = xCalculator->getRepresentation();
-aRet = aRet.replaceAt( nIndex, 
aWildcard.getLength(), OUString::number(aPeriod) );
-}
-
 // replace formula
-aWildcard = "%FORMULA";
-nIndex = aRet.indexOf( aWildcard );
+OUString aWildcard = "%FORMULA";
+sal_Int32 nIndex = aRet.indexOf( aWildcard );
 if( nIndex != -1 )
 {
 OUString aFormula ( 
xCalculator->getRepresentation() );
diff --git a/chart2/source/controller/dialogs/res_Trendline.cxx 
b/chart2/source/controller/dialogs/res_Trendline.cxx
index 647c071b1040..58ef6497a538 100644
--- a/chart2/source/controller/dialogs/res_Trendline.cxx
+++ b/chart2/source/controller/dialogs/res_Trendline.cxx
@@ -372,10 +372,8 @@ void TrendlineResources::UpdateControlStates()
 m_xFmtFld_InterceptValue->set_sensitive( bInterceptAvailable );
 if( bMovingAverage )
 {
-m_xCB_ShowEquation->set_state(TRISTATE_FALSE);
 m_xCB_ShowCorrelationCoeff->set_state(TRISTATE_FALSE);
 }
-m_xCB_ShowEquation->set_sensitive( !bMovingAverage );
 m_xCB_ShowCorrelationCoeff->set_sensitive( !bMovingAverage );
 m_xCB_RegressionMovingType->set_sensitive(bMovingAverage);
 m_xNF_Period->set_sensitive(bMovingAverage);
@@ -428,8 +426,6 @@ void TrendlineResources::SetNbPoints( sal_Int32 nNbPoints )
 
 IMPL_LINK_NOARG(TrendlineResources, ShowEquation, weld::Toggleable&, void)
 {
-m_xEE_XName->set_sensitive(m_xCB_ShowEquation->get_active());
-m_xEE_YName->set_sensitive(m_xCB_ShowEquation->get_active());
 UpdateControlStates();
 }
 
diff --git a/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx 
b/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx
index 6726d9d78b36..f71262f738b9 100644
--- a/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx
@@ -157,7 +157,15 @@ OUString 
MovingAverageRegressionCurveCalculator::ImplGetRepresentation(
 const uno::Reference< util::XNumberFormatter >& /*xNumFormatter*/,
 sal_Int32 /*nNumberFormatKey*/, sal_Int32* /*pFormulaLength = nullptr */ ) 
const
 {
-return SchResId( STR_OBJECT_MOVING_AVERAGE_WITH_PARAMETERS );
+OUString aRet = SchResId( STR_OBJECT_MOVING_AVERAGE_WITH_PARAMETERS );
+// change text for Moving Average
+OUString aWildcard( "%PERIOD" );
+sal_Int32 nIndex = aRet.indexOf( aWildcard );
+if( nIndex != -1 )
+{  // replace period
+aRet = aRet.replaceAt( nIndex, aWildcard.getLength(), 
OUString::number(mPeriod) );
+}
+return aRet;
 }
 
 } //  namespace chart

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - chart2/source

[Laurent Balland (via logerrit)]

 chart2/source/controller/dialogs/ObjectNameProvider.cxx |   48 +---
 1 file changed, 28 insertions(+), 20 deletions(-)

New commits:
commit 2e04c00f21cf2566c3de34d9dd828cc1615329fd
Author: Laurent Balland 
AuthorDate: Tue Jun 27 21:23:19 2023 +0200
Commit: Tomaž Vajngerl 
CommitDate: Thu Jun 29 15:19:17 2023 +0200

tdf#155526 Restore status bar for moving average

Previous commit dc03f59374d4fc74dd44ddedc903bb9c00a74bb7 broke text in
status bar when a moving average trend line is selected

Change-Id: I259fb9aee1eccf9fac93038c6dd2755490769f88
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153677
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 
(cherry picked from commit 125b0f6609332523d30bef600979b698c2d216f8)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153706

diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx 
b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
index 41eae9e7f1a8..2097e43c2130 100644
--- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx
+++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
@@ -597,33 +597,41 @@ OUString ObjectNameProvider::getHelpText( 
std::u16string_view rObjectCID, const
 if ( !(xEqProp->getPropertyValue( "YName") >>= 
aYName) )
 aYName = "f(x)";
 }
-xCalculator->setRegressionProperties(aDegree, 
bForceIntercept, aInterceptValue, 2, aMovingType);
+xCalculator->setRegressionProperties(aDegree, 
bForceIntercept, aInterceptValue, aPeriod, aMovingType);
 xCalculator->setXYNames ( aXName, aYName );
 RegressionCurveHelper::initializeCurveCalculator( 
xCalculator, xSeries, xChartModel );
 
-// replace formula
-OUString aWildcard = "%FORMULA";
-sal_Int32 nIndex = aRet.indexOf( aWildcard );
-if( nIndex != -1 )
+// change text for Moving Average
+if ( RegressionCurveHelper::getRegressionType( xCurve 
) == SvxChartRegress::MovingAverage )
+{
+aRet = xCalculator->getRepresentation();
+}
+else
 {
-OUString aFormula ( 
xCalculator->getRepresentation() );
-if ( cDecSeparator != '.' )
+// replace formula
+OUString aWildcard = "%FORMULA";
+sal_Int32 nIndex = aRet.indexOf( aWildcard );
+if( nIndex != -1 )
 {
-aFormula = aFormula.replace( '.', 
cDecSeparator );
+OUString aFormula ( 
xCalculator->getRepresentation() );
+if ( cDecSeparator != '.' )
+{
+aFormula = aFormula.replace( '.', 
cDecSeparator );
+}
+aRet = aRet.replaceAt( nIndex, 
aWildcard.getLength(), aFormula );
 }
-aRet = aRet.replaceAt( nIndex, 
aWildcard.getLength(), aFormula );
-}
 
-// replace r^2
-aWildcard = "%RSQUARED";
-nIndex = aRet.indexOf( aWildcard );
-if( nIndex != -1 )
-{
-double fR( 
xCalculator->getCorrelationCoefficient());
-aRet = aRet.replaceAt(
-nIndex, aWildcard.getLength(),
-::rtl::math::doubleToUString(
-fR*fR, rtl_math_StringFormat_G, 4, 
cDecSeparator, true ));
+// replace r^2
+aWildcard = "%RSQUARED";
+nIndex = aRet.indexOf( aWildcard );
+if( nIndex != -1 )
+{
+double fR( 
xCalculator->getCorrelationCoefficient());
+aRet = aRet.replaceAt(
+nIndex, aWildcard.getLength(),
+::rtl::math::doubleToUString(
+fR*fR, rtl_math_StringFormat_G, 4, 
cDecSeparator, true ));
+}
 }
 }
 catch( const uno::Exception & )

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - chart2/source

[Laurent Balland (via logerrit)]

 chart2/source/controller/dialogs/ObjectNameProvider.cxx|   13 
+-
 chart2/source/controller/dialogs/res_Trendline.cxx |4 ---
 chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx |   10 ++-
 3 files changed, 11 insertions(+), 16 deletions(-)

New commits:
commit 917aff51c9f119105eacb527b7829c67ffe044bb
Author: Laurent Balland 
AuthorDate: Mon Jun 12 21:48:13 2023 +0200
Commit: Tomaž Vajngerl 
CommitDate: Thu Jun 29 12:34:56 2023 +0200

tdf#155526 Add Period to trend line equation

Insert Period value earlier to have it ready for representation
Allow Moving average equation in dialog UI

Change-Id: I1d20572c39462e60b60ab7eec1f174a3cf934d4a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153094
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 
(cherry picked from commit dc03f59374d4fc74dd44ddedc903bb9c00a74bb7)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153707

diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx 
b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
index e4ec234362bc..41eae9e7f1a8 100644
--- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx
+++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
@@ -601,18 +601,9 @@ OUString ObjectNameProvider::getHelpText( 
std::u16string_view rObjectCID, const
 xCalculator->setXYNames ( aXName, aYName );
 RegressionCurveHelper::initializeCurveCalculator( 
xCalculator, xSeries, xChartModel );
 
-// change text for Moving Average
-OUString aWildcard( "%PERIOD" );
-sal_Int32 nIndex = 
xCalculator->getRepresentation().indexOf( aWildcard );
-if( nIndex != -1 )
-{  // replace period
-aRet = xCalculator->getRepresentation();
-aRet = aRet.replaceAt( nIndex, 
aWildcard.getLength(), OUString::number(aPeriod) );
-}
-
 // replace formula
-aWildcard = "%FORMULA";
-nIndex = aRet.indexOf( aWildcard );
+OUString aWildcard = "%FORMULA";
+sal_Int32 nIndex = aRet.indexOf( aWildcard );
 if( nIndex != -1 )
 {
 OUString aFormula ( 
xCalculator->getRepresentation() );
diff --git a/chart2/source/controller/dialogs/res_Trendline.cxx 
b/chart2/source/controller/dialogs/res_Trendline.cxx
index 647c071b1040..58ef6497a538 100644
--- a/chart2/source/controller/dialogs/res_Trendline.cxx
+++ b/chart2/source/controller/dialogs/res_Trendline.cxx
@@ -372,10 +372,8 @@ void TrendlineResources::UpdateControlStates()
 m_xFmtFld_InterceptValue->set_sensitive( bInterceptAvailable );
 if( bMovingAverage )
 {
-m_xCB_ShowEquation->set_state(TRISTATE_FALSE);
 m_xCB_ShowCorrelationCoeff->set_state(TRISTATE_FALSE);
 }
-m_xCB_ShowEquation->set_sensitive( !bMovingAverage );
 m_xCB_ShowCorrelationCoeff->set_sensitive( !bMovingAverage );
 m_xCB_RegressionMovingType->set_sensitive(bMovingAverage);
 m_xNF_Period->set_sensitive(bMovingAverage);
@@ -428,8 +426,6 @@ void TrendlineResources::SetNbPoints( sal_Int32 nNbPoints )
 
 IMPL_LINK_NOARG(TrendlineResources, ShowEquation, weld::Toggleable&, void)
 {
-m_xEE_XName->set_sensitive(m_xCB_ShowEquation->get_active());
-m_xEE_YName->set_sensitive(m_xCB_ShowEquation->get_active());
 UpdateControlStates();
 }
 
diff --git a/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx 
b/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx
index 6726d9d78b36..f71262f738b9 100644
--- a/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx
@@ -157,7 +157,15 @@ OUString 
MovingAverageRegressionCurveCalculator::ImplGetRepresentation(
 const uno::Reference< util::XNumberFormatter >& /*xNumFormatter*/,
 sal_Int32 /*nNumberFormatKey*/, sal_Int32* /*pFormulaLength = nullptr */ ) 
const
 {
-return SchResId( STR_OBJECT_MOVING_AVERAGE_WITH_PARAMETERS );
+OUString aRet = SchResId( STR_OBJECT_MOVING_AVERAGE_WITH_PARAMETERS );
+// change text for Moving Average
+OUString aWildcard( "%PERIOD" );
+sal_Int32 nIndex = aRet.indexOf( aWildcard );
+if( nIndex != -1 )
+{  // replace period
+aRet = aRet.replaceAt( nIndex, aWildcard.getLength(), 
OUString::number(mPeriod) );
+}
+return aRet;
 }
 
 } //  namespace chart

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - chart2/source

[Laurent Balland (via logerrit)]

 chart2/source/controller/main/ControllerCommandDispatch.cxx |   13 ---
 chart2/source/inc/RegressionCurveHelper.hxx |1 
 chart2/source/tools/RegressionCurveHelper.cxx   |   14 
 chart2/source/tools/RegressionCurveModel.cxx|1 
 chart2/source/tools/RegressionEquation.cxx  |8 ++
 5 files changed, 34 insertions(+), 3 deletions(-)

New commits:
commit 439e2fb0ccc8fc75fb9239a7370db9dd56ee9c55
Author: Laurent Balland 
AuthorDate: Sun Jun 18 19:25:39 2023 +0200
Commit: Tomaž Vajngerl 
CommitDate: Thu Jun 29 09:41:56 2023 +0200

tdf#155526 Moving average: remove Insert R2

Moving average trend line does not R² value.
This change remove "Insert R²" from context menu when the trend is of
type "Moving average"

Change-Id: I729a6421df34859e7176c798a2b68a6f13cfb544
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153294
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 
(cherry picked from commit aa86e7e8c22527eb5da0b8a05dbd4bd749f7a2b8)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153700

diff --git a/chart2/source/controller/main/ControllerCommandDispatch.cxx 
b/chart2/source/controller/main/ControllerCommandDispatch.cxx
index 9e03e495827d..98468a138c3f 100644
--- a/chart2/source/controller/main/ControllerCommandDispatch.cxx
+++ b/chart2/source/controller/main/ControllerCommandDispatch.cxx
@@ -283,23 +283,28 @@ void ControllerState::update(
 // Trendline Equation
 bMayFormatTrendlineEquation = bMayDeleteTrendlineEquation = 
RegressionCurveHelper::hasEquation( xRegCurve );
 bMayAddTrendlineEquation = !bMayDeleteTrendlineEquation;
+bMayAddR2Value = RegressionCurveHelper::MayHaveCorrelationCoefficient( 
xRegCurve ) && bMayAddTrendlineEquation;
 }
 else if( aObjectType == OBJECTTYPE_DATA_CURVE_EQUATION )
 {
 bMayFormatTrendlineEquation = true;
 bool bHasR2Value = false;
+bool bMayHaveR2 = true;
 try
 {
 uno::Reference< beans::XPropertySet > xEquationProperties =
 ObjectIdentifier::getObjectPropertySet( aSelObjCID, xModel );
 if( xEquationProperties.is() )
+{
 xEquationProperties->getPropertyValue( 
"ShowCorrelationCoefficient" ) >>= bHasR2Value;
+xEquationProperties->getPropertyValue( 
"MayHaveCorrelationCoefficient" ) >>= bMayHaveR2;
+}
 }
 catch(const uno::RuntimeException&)
 {
 TOOLS_WARN_EXCEPTION("chart2", "" );
 }
-bMayAddR2Value = !bHasR2Value;
+bMayAddR2Value = !bHasR2Value && bMayHaveR2;
 bMayDeleteR2Value = bHasR2Value;
 }
 }
@@ -674,8 +679,10 @@ void ControllerCommandDispatch::updateCommandAvailability()
 m_aCommandAvailability[ ".uno:InsertMeanValue" ] = bIsWritable && 
bControllerStateIsValid && m_apControllerState->bMayAddMeanValue;
 m_aCommandAvailability[ ".uno:InsertTrendline" ] = bIsWritable && 
bControllerStateIsValid && m_apControllerState->bMayAddTrendline;
 m_aCommandAvailability[ ".uno:InsertTrendlineEquation" ] = bIsWritable && 
bControllerStateIsValid && m_apControllerState->bMayAddTrendlineEquation;
-m_aCommandAvailability[ ".uno:InsertTrendlineEquationAndR2" ] = 
m_aCommandAvailability[ ".uno:InsertTrendlineEquation" ];
-m_aCommandAvailability[ ".uno:InsertR2Value" ] = bIsWritable && 
bControllerStateIsValid && m_apControllerState->bMayAddR2Value;
+m_aCommandAvailability[ ".uno:InsertTrendlineEquationAndR2" ] =
+m_aCommandAvailability[ ".uno:InsertTrendlineEquation" ] && 
m_apControllerState->bMayAddR2Value;
+m_aCommandAvailability[ ".uno:InsertR2Value" ] = bIsWritable && 
bControllerStateIsValid && m_apControllerState->bMayAddR2Value
+&& !m_apControllerState->bMayAddTrendlineEquation;
 m_aCommandAvailability[ ".uno:DeleteR2Value" ] = bIsWritable && 
bControllerStateIsValid && m_apControllerState->bMayDeleteR2Value;
 
 m_aCommandAvailability[ ".uno:InsertXErrorBars" ] = bIsWritable && 
bControllerStateIsValid && m_apControllerState->bMayAddXErrorBars;
diff --git a/chart2/source/inc/RegressionCurveHelper.hxx 
b/chart2/source/inc/RegressionCurveHelper.hxx
index 9f1b935c0d01..f9d919506460 100644
--- a/chart2/source/inc/RegressionCurveHelper.hxx
+++ b/chart2/source/inc/RegressionCurveHelper.hxx
@@ -195,6 +195,7 @@ namespace chart::RegressionCurveHelper
 const rtl::Reference<::chart::RegressionCurveModel>& xCurve );
 
 OOO_DLLPUBLIC_CHARTTOOLS bool hasEquation(const 
css::uno::Reference& xCurve );
+OOO_DLLPUBLIC_CHARTTOOLS bool MayHaveCorrelationCoefficient(const 
css::uno::Reference& xCurve );
 
 } //  namespace chart
 
diff --git a/chart2/source/tools/RegressionCurveHelper.cxx 
b/chart2/source/tools/RegressionCurveHelper.cxx
index 0bed3ca19e16..ef4c2091b4c2 100644
--- a/chart2/source/tools/RegressionCurveHelper.cxx
+++ 

[Libreoffice-commits] core.git: chart2/source

[Laurent Balland (via logerrit)]

 chart2/source/controller/dialogs/ObjectNameProvider.cxx |   48 +---
 1 file changed, 28 insertions(+), 20 deletions(-)

New commits:
commit 125b0f6609332523d30bef600979b698c2d216f8
Author: Laurent Balland 
AuthorDate: Tue Jun 27 21:23:19 2023 +0200
Commit: Tomaž Vajngerl 
CommitDate: Thu Jun 29 08:02:02 2023 +0200

tdf#155526 Restore status bar for moving average

Previous commit dc03f59374d4fc74dd44ddedc903bb9c00a74bb7 broke text in
status bar when a moving average trend line is selected

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

diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx 
b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
index 41eae9e7f1a8..2097e43c2130 100644
--- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx
+++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
@@ -597,33 +597,41 @@ OUString ObjectNameProvider::getHelpText( 
std::u16string_view rObjectCID, const
 if ( !(xEqProp->getPropertyValue( "YName") >>= 
aYName) )
 aYName = "f(x)";
 }
-xCalculator->setRegressionProperties(aDegree, 
bForceIntercept, aInterceptValue, 2, aMovingType);
+xCalculator->setRegressionProperties(aDegree, 
bForceIntercept, aInterceptValue, aPeriod, aMovingType);
 xCalculator->setXYNames ( aXName, aYName );
 RegressionCurveHelper::initializeCurveCalculator( 
xCalculator, xSeries, xChartModel );
 
-// replace formula
-OUString aWildcard = "%FORMULA";
-sal_Int32 nIndex = aRet.indexOf( aWildcard );
-if( nIndex != -1 )
+// change text for Moving Average
+if ( RegressionCurveHelper::getRegressionType( xCurve 
) == SvxChartRegress::MovingAverage )
+{
+aRet = xCalculator->getRepresentation();
+}
+else
 {
-OUString aFormula ( 
xCalculator->getRepresentation() );
-if ( cDecSeparator != '.' )
+// replace formula
+OUString aWildcard = "%FORMULA";
+sal_Int32 nIndex = aRet.indexOf( aWildcard );
+if( nIndex != -1 )
 {
-aFormula = aFormula.replace( '.', 
cDecSeparator );
+OUString aFormula ( 
xCalculator->getRepresentation() );
+if ( cDecSeparator != '.' )
+{
+aFormula = aFormula.replace( '.', 
cDecSeparator );
+}
+aRet = aRet.replaceAt( nIndex, 
aWildcard.getLength(), aFormula );
 }
-aRet = aRet.replaceAt( nIndex, 
aWildcard.getLength(), aFormula );
-}
 
-// replace r^2
-aWildcard = "%RSQUARED";
-nIndex = aRet.indexOf( aWildcard );
-if( nIndex != -1 )
-{
-double fR( 
xCalculator->getCorrelationCoefficient());
-aRet = aRet.replaceAt(
-nIndex, aWildcard.getLength(),
-::rtl::math::doubleToUString(
-fR*fR, rtl_math_StringFormat_G, 4, 
cDecSeparator, true ));
+// replace r^2
+aWildcard = "%RSQUARED";
+nIndex = aRet.indexOf( aWildcard );
+if( nIndex != -1 )
+{
+double fR( 
xCalculator->getCorrelationCoefficient());
+aRet = aRet.replaceAt(
+nIndex, aWildcard.getLength(),
+::rtl::math::doubleToUString(
+fR*fR, rtl_math_StringFormat_G, 4, 
cDecSeparator, true ));
+}
 }
 }
 catch( const uno::Exception & )

[Libreoffice-commits] core.git: sc/source

[Laurent Balland (via logerrit)]

 sc/source/ui/dbgui/scuiasciiopt.cxx |   25 +++--
 sc/source/ui/inc/scuiasciiopt.hxx   |1 +
 2 files changed, 16 insertions(+), 10 deletions(-)

New commits:
commit 983644d061e1415c7c5554dd6fd51fe1043e9b9a
Author: Laurent Balland 
AuthorDate: Sat Jun 3 14:52:45 2023 +0200
Commit: Eike Rathke 
CommitDate: Tue Jun 27 17:41:43 2023 +0200

Import CSV: remove erroneous warning

If Fixed width is selected, clicking on any option in Other section 
generates a
warning about option not allowed, which is wrong. Only checkboxes in
Seprator section are not allowed

Change-Id: I3fc6fd6ac870e8c681aae8fd1d033b550d9bc20d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152573
Tested-by: Jenkins
Reviewed-by: Eike Rathke 

diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx 
b/sc/source/ui/dbgui/scuiasciiopt.cxx
index 61fa2d697251..601323a6586d 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -506,20 +506,21 @@ ScImportAsciiDlg::ScImportAsciiDlg(weld::Window* pParent, 
std::u16string_view aD
 mcTextSep = lcl_CharFromCombo(*mxCbTextSep, SCSTR_TEXTSEP);
 
 Link aSeparatorClickHdl =LINK( this, 
ScImportAsciiDlg, SeparatorClickHdl );
+Link aOtherOptionsClickHdl =LINK( this, 
ScImportAsciiDlg, OtherOptionsClickHdl );
 mxCbTextSep->connect_changed( LINK( this, ScImportAsciiDlg, 
SeparatorComboBoxHdl ) );
 mxCkbTab->connect_toggled( aSeparatorClickHdl );
 mxCkbSemicolon->connect_toggled( aSeparatorClickHdl );
 mxCkbComma->connect_toggled( aSeparatorClickHdl );
 mxCkbAsOnce->connect_toggled( aSeparatorClickHdl );
-mxCkbQuotedAsText->connect_toggled( aSeparatorClickHdl );
-mxCkbDetectNumber->connect_toggled( aSeparatorClickHdl );
-mxCkbDetectScientificNumber->connect_toggled( aSeparatorClickHdl );
-mxCkbEvaluateFormulas->connect_toggled( aSeparatorClickHdl );
-mxCkbSkipEmptyCells->connect_toggled( aSeparatorClickHdl );
 mxCkbSpace->connect_toggled( aSeparatorClickHdl );
 mxCkbRemoveSpace->connect_toggled( aSeparatorClickHdl );
 mxCkbOther->connect_toggled( aSeparatorClickHdl );
 mxEdOther->connect_changed(LINK(this, ScImportAsciiDlg, SeparatorEditHdl));
+mxCkbQuotedAsText->connect_toggled( aOtherOptionsClickHdl );
+mxCkbDetectNumber->connect_toggled( aOtherOptionsClickHdl );
+mxCkbDetectScientificNumber->connect_toggled( aOtherOptionsClickHdl );
+mxCkbEvaluateFormulas->connect_toggled( aOtherOptionsClickHdl );
+mxCkbSkipEmptyCells->connect_toggled( aOtherOptionsClickHdl );
 
 // *** text encoding ListBox ***
 // all encodings allowed, including Unicode, but subsets are excluded
@@ -837,12 +838,9 @@ IMPL_LINK( ScImportAsciiDlg, SeparatorEditHdl, 
weld::Entry&, rEdit, void )
 SeparatorHdl();
 }
 
-void ScImportAsciiDlg::SeparatorHdl(const weld::Widget* pCtrl)
+IMPL_LINK(ScImportAsciiDlg, OtherOptionsClickHdl, weld::Toggleable&, rCtrl, 
void)
 {
-OSL_ENSURE( pCtrl, "ScImportAsciiDlg::SeparatorHdl - missing sender" );
-OSL_ENSURE( !mxRbFixed->get_active(), "ScImportAsciiDlg::SeparatorHdl - 
not allowed in fixed width" );
-
-if (pCtrl == mxCkbDetectNumber.get())
+if ( == mxCkbDetectNumber.get())
 {
 if (mxCkbDetectNumber->get_active())
 {
@@ -853,6 +851,13 @@ void ScImportAsciiDlg::SeparatorHdl(const weld::Widget* 
pCtrl)
 mxCkbDetectScientificNumber->set_sensitive(true);
 return;
 }
+}
+
+void ScImportAsciiDlg::SeparatorHdl(const weld::Widget* pCtrl)
+{
+OSL_ENSURE( pCtrl, "ScImportAsciiDlg::SeparatorHdl - missing sender" );
+OSL_ENSURE( !mxRbFixed->get_active(), "ScImportAsciiDlg::SeparatorHdl - 
not allowed in fixed width" );
+
 /*  #i41550# First update state of the controls. The GetSeparators()
 function needs final state of the check boxes. */
 if (pCtrl == mxCkbOther.get() && mxCkbOther->get_active())
diff --git a/sc/source/ui/inc/scuiasciiopt.hxx 
b/sc/source/ui/inc/scuiasciiopt.hxx
index a96f2f591320..309192477ecf 100644
--- a/sc/source/ui/inc/scuiasciiopt.hxx
+++ b/sc/source/ui/inc/scuiasciiopt.hxx
@@ -111,6 +111,7 @@ private:
 DECL_LINK( RbSepFixHdl, weld::Toggleable&, 
void );
 DECL_LINK( SeparatorEditHdl, weld::Entry&, 
void );
 DECL_LINK( SeparatorClickHdl, 
weld::Toggleable&, void );
+DECL_LINK( OtherOptionsClickHdl, 
weld::Toggleable&, void );
 DECL_LINK( SeparatorComboBoxHdl, 
weld::ComboBox&, void );
 void SeparatorHdl(const weld::Widget*);
 DECL_LINK( LbColTypeHdl, weld::ComboBox&, void 
);

[Libreoffice-commits] core.git: include/xmloff schema/libreoffice xmloff/source

[Laurent Balland (via logerrit)]

 include/xmloff/xmlnumfe.hxx |4 
 schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng |   13 ++
 xmloff/source/style/xmlnumfe.cxx|   73 +++-
 xmloff/source/style/xmlnumfi.cxx|4 
 4 files changed, 61 insertions(+), 33 deletions(-)

New commits:
commit 8ef4d3a4160af967937e9bb7c60bee4a8eb71a1b
Author: Laurent Balland 
AuthorDate: Fri Apr 21 18:06:32 2023 +0200
Commit: Eike Rathke 
CommitDate: Tue Jun 27 17:26:22 2023 +0200

related tdf#153993 Embedded text in scientific numbers

Embedded text was limited to number:number. But scientific notation may
require embedded text like
0.000" "000E+00
This change extend ODF format to support embedded text in
number:scientific-number also

Change-Id: I4e3220b06efbd9228d722bf518e137d7707ccf4f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150804
Tested-by: Jenkins
Reviewed-by: Eike Rathke 

diff --git a/include/xmloff/xmlnumfe.hxx b/include/xmloff/xmlnumfe.hxx
index fd0711b3a0c3..43e1814dc26b 100644
--- a/include/xmloff/xmlnumfe.hxx
+++ b/include/xmloff/xmlnumfe.hxx
@@ -64,12 +64,14 @@ private:
 
 SAL_DLLPRIVATE void WriteColorElement_Impl( const Color& rColor );
 SAL_DLLPRIVATE void WriteIntegerElement_Impl( sal_Int32 nInteger, 
sal_Int32 nBlankInteger, bool bGrouping );
+SAL_DLLPRIVATE void WriteEmbeddedEntries_Impl( const 
SvXMLEmbeddedTextEntryArr& rEmbeddedEntries );
 SAL_DLLPRIVATE void WriteNumberElement_Impl( sal_Int32 nDecimals, 
sal_Int32 nMinDecimals,
 sal_Int32 nInteger, sal_Int32 
nBlankInteger, const OUString& rDashStr,
 bool bGrouping, sal_Int32 
nTrailingThousands,
 const SvXMLEmbeddedTextEntryArr& 
rEmbeddedEntries );
 SAL_DLLPRIVATE void WriteScientificElement_Impl( sal_Int32 nDecimals, 
sal_Int32 nMinDecimals, sal_Int32 nInteger, sal_Int32 nBlankInteger,
-bool bGrouping, sal_Int32 nExp, 
sal_Int32 nExpInterval, bool bExpSign );
+bool bGrouping, sal_Int32 nExp, 
sal_Int32 nExpInterval, bool bExpSign,
+const SvXMLEmbeddedTextEntryArr& 
rEmbeddedEntries );
 SAL_DLLPRIVATE void WriteFractionElement_Impl( sal_Int32 nInteger, 
sal_Int32 nBlankInteger, bool bGrouping,
const SvNumberformat& 
rFormat, sal_uInt16 nPart );
 SAL_DLLPRIVATE void WriteCurrencyElement_Impl( const OUString& rString,
diff --git a/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng 
b/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng
index f01e1c8533e7..6bb2c6972b7c 100644
--- a/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng
+++ b/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng
@@ -1995,6 +1995,19 @@ 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.
   
 
 
+
+  
+
+
+
+
+
+  
+
+
+  
+
+

 
 
diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx
index 59e9f7714916..fb767dc3a10d 100644
--- a/xmloff/source/style/xmlnumfe.cxx
+++ b/xmloff/source/style/xmlnumfe.cxx
@@ -550,6 +550,35 @@ void SvXMLNumFmtExport::WriteIntegerElement_Impl(
 }
 }
 
+void SvXMLNumFmtExport::WriteEmbeddedEntries_Impl( const 
SvXMLEmbeddedTextEntryArr& rEmbeddedEntries )
+{
+auto nEntryCount = rEmbeddedEntries.size();
+for (decltype(nEntryCount) nEntry=0; nEntry < nEntryCount; ++nEntry)
+{
+const SvXMLEmbeddedTextEntry *const pObj = [nEntry];
+
+//  position attribute
+// position == 0 is between first integer digit and decimal separator
+// position < 0 is inside decimal part
+m_rExport.AddAttribute( XML_NAMESPACE_NUMBER, XML_POSITION,
+OUString::number( pObj->nFormatPos ) );
+SvXMLElementExport aChildElem( m_rExport, XML_NAMESPACE_NUMBER, 
XML_EMBEDDED_TEXT,
+  true, false );
+
+//  text as element content
+OUStringBuffer aContent( pObj->aText );
+while ( nEntry+1 < nEntryCount && 
rEmbeddedEntries[nEntry+1].nFormatPos == pObj->nFormatPos )
+{
+// The array can contain several elements for the same position in 
the number
+// (for example, literal text and space from underscores). They 
must be merged
+// into a single embedded-text element.
+aContent.append(rEmbeddedEntries[nEntry+1].aText);
+++nEntry;
+}
+m_rExport.Characters( aContent.makeStringAndClear() );
+}
+}
+
 void SvXMLNumFmtExport::WriteNumberElement_Impl(
 sal_Int32 nDecimals, sal_Int32 nMinDecimals,

[Libreoffice-commits] core.git: chart2/source

[Laurent Balland (via logerrit)]

 chart2/source/controller/main/ControllerCommandDispatch.cxx |   13 ---
 chart2/source/inc/RegressionCurveHelper.hxx |1 
 chart2/source/tools/RegressionCurveHelper.cxx   |   14 
 chart2/source/tools/RegressionCurveModel.cxx|1 
 chart2/source/tools/RegressionEquation.cxx  |8 ++
 5 files changed, 34 insertions(+), 3 deletions(-)

New commits:
commit aa86e7e8c22527eb5da0b8a05dbd4bd749f7a2b8
Author: Laurent Balland 
AuthorDate: Sun Jun 18 19:25:39 2023 +0200
Commit: Tomaž Vajngerl 
CommitDate: Tue Jun 27 07:48:34 2023 +0200

tdf#155526 Moving average: remove Insert R2

Moving average trend line does not R² value.
This change remove "Insert R²" from context menu when the trend is of
type "Moving average"

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

diff --git a/chart2/source/controller/main/ControllerCommandDispatch.cxx 
b/chart2/source/controller/main/ControllerCommandDispatch.cxx
index 9e03e495827d..98468a138c3f 100644
--- a/chart2/source/controller/main/ControllerCommandDispatch.cxx
+++ b/chart2/source/controller/main/ControllerCommandDispatch.cxx
@@ -283,23 +283,28 @@ void ControllerState::update(
 // Trendline Equation
 bMayFormatTrendlineEquation = bMayDeleteTrendlineEquation = 
RegressionCurveHelper::hasEquation( xRegCurve );
 bMayAddTrendlineEquation = !bMayDeleteTrendlineEquation;
+bMayAddR2Value = RegressionCurveHelper::MayHaveCorrelationCoefficient( 
xRegCurve ) && bMayAddTrendlineEquation;
 }
 else if( aObjectType == OBJECTTYPE_DATA_CURVE_EQUATION )
 {
 bMayFormatTrendlineEquation = true;
 bool bHasR2Value = false;
+bool bMayHaveR2 = true;
 try
 {
 uno::Reference< beans::XPropertySet > xEquationProperties =
 ObjectIdentifier::getObjectPropertySet( aSelObjCID, xModel );
 if( xEquationProperties.is() )
+{
 xEquationProperties->getPropertyValue( 
"ShowCorrelationCoefficient" ) >>= bHasR2Value;
+xEquationProperties->getPropertyValue( 
"MayHaveCorrelationCoefficient" ) >>= bMayHaveR2;
+}
 }
 catch(const uno::RuntimeException&)
 {
 TOOLS_WARN_EXCEPTION("chart2", "" );
 }
-bMayAddR2Value = !bHasR2Value;
+bMayAddR2Value = !bHasR2Value && bMayHaveR2;
 bMayDeleteR2Value = bHasR2Value;
 }
 }
@@ -674,8 +679,10 @@ void ControllerCommandDispatch::updateCommandAvailability()
 m_aCommandAvailability[ ".uno:InsertMeanValue" ] = bIsWritable && 
bControllerStateIsValid && m_apControllerState->bMayAddMeanValue;
 m_aCommandAvailability[ ".uno:InsertTrendline" ] = bIsWritable && 
bControllerStateIsValid && m_apControllerState->bMayAddTrendline;
 m_aCommandAvailability[ ".uno:InsertTrendlineEquation" ] = bIsWritable && 
bControllerStateIsValid && m_apControllerState->bMayAddTrendlineEquation;
-m_aCommandAvailability[ ".uno:InsertTrendlineEquationAndR2" ] = 
m_aCommandAvailability[ ".uno:InsertTrendlineEquation" ];
-m_aCommandAvailability[ ".uno:InsertR2Value" ] = bIsWritable && 
bControllerStateIsValid && m_apControllerState->bMayAddR2Value;
+m_aCommandAvailability[ ".uno:InsertTrendlineEquationAndR2" ] =
+m_aCommandAvailability[ ".uno:InsertTrendlineEquation" ] && 
m_apControllerState->bMayAddR2Value;
+m_aCommandAvailability[ ".uno:InsertR2Value" ] = bIsWritable && 
bControllerStateIsValid && m_apControllerState->bMayAddR2Value
+&& !m_apControllerState->bMayAddTrendlineEquation;
 m_aCommandAvailability[ ".uno:DeleteR2Value" ] = bIsWritable && 
bControllerStateIsValid && m_apControllerState->bMayDeleteR2Value;
 
 m_aCommandAvailability[ ".uno:InsertXErrorBars" ] = bIsWritable && 
bControllerStateIsValid && m_apControllerState->bMayAddXErrorBars;
diff --git a/chart2/source/inc/RegressionCurveHelper.hxx 
b/chart2/source/inc/RegressionCurveHelper.hxx
index 9f1b935c0d01..f9d919506460 100644
--- a/chart2/source/inc/RegressionCurveHelper.hxx
+++ b/chart2/source/inc/RegressionCurveHelper.hxx
@@ -195,6 +195,7 @@ namespace chart::RegressionCurveHelper
 const rtl::Reference<::chart::RegressionCurveModel>& xCurve );
 
 OOO_DLLPUBLIC_CHARTTOOLS bool hasEquation(const 
css::uno::Reference& xCurve );
+OOO_DLLPUBLIC_CHARTTOOLS bool MayHaveCorrelationCoefficient(const 
css::uno::Reference& xCurve );
 
 } //  namespace chart
 
diff --git a/chart2/source/tools/RegressionCurveHelper.cxx 
b/chart2/source/tools/RegressionCurveHelper.cxx
index 8d9ba75962e9..65e6b13ac0a0 100644
--- a/chart2/source/tools/RegressionCurveHelper.cxx
+++ b/chart2/source/tools/RegressionCurveHelper.cxx
@@ -898,6 +898,20 @@ bool RegressionCurveHelper::hasEquation( const Reference< 

[Libreoffice-commits] core.git: chart2/source

[Laurent Balland (via logerrit)]

 chart2/source/controller/dialogs/ObjectNameProvider.cxx|   13 
+-
 chart2/source/controller/dialogs/res_Trendline.cxx |4 ---
 chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx |   10 ++-
 3 files changed, 11 insertions(+), 16 deletions(-)

New commits:
commit dc03f59374d4fc74dd44ddedc903bb9c00a74bb7
Author: Laurent Balland 
AuthorDate: Mon Jun 12 21:48:13 2023 +0200
Commit: Tomaž Vajngerl 
CommitDate: Sun Jun 18 13:31:09 2023 +0200

tdf#155526 Add Period to trend line equation

Insert Period value earlier to have it ready for representation
Allow Moving average equation in dialog UI

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

diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx 
b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
index e4ec234362bc..41eae9e7f1a8 100644
--- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx
+++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
@@ -601,18 +601,9 @@ OUString ObjectNameProvider::getHelpText( 
std::u16string_view rObjectCID, const
 xCalculator->setXYNames ( aXName, aYName );
 RegressionCurveHelper::initializeCurveCalculator( 
xCalculator, xSeries, xChartModel );
 
-// change text for Moving Average
-OUString aWildcard( "%PERIOD" );
-sal_Int32 nIndex = 
xCalculator->getRepresentation().indexOf( aWildcard );
-if( nIndex != -1 )
-{  // replace period
-aRet = xCalculator->getRepresentation();
-aRet = aRet.replaceAt( nIndex, 
aWildcard.getLength(), OUString::number(aPeriod) );
-}
-
 // replace formula
-aWildcard = "%FORMULA";
-nIndex = aRet.indexOf( aWildcard );
+OUString aWildcard = "%FORMULA";
+sal_Int32 nIndex = aRet.indexOf( aWildcard );
 if( nIndex != -1 )
 {
 OUString aFormula ( 
xCalculator->getRepresentation() );
diff --git a/chart2/source/controller/dialogs/res_Trendline.cxx 
b/chart2/source/controller/dialogs/res_Trendline.cxx
index 647c071b1040..58ef6497a538 100644
--- a/chart2/source/controller/dialogs/res_Trendline.cxx
+++ b/chart2/source/controller/dialogs/res_Trendline.cxx
@@ -372,10 +372,8 @@ void TrendlineResources::UpdateControlStates()
 m_xFmtFld_InterceptValue->set_sensitive( bInterceptAvailable );
 if( bMovingAverage )
 {
-m_xCB_ShowEquation->set_state(TRISTATE_FALSE);
 m_xCB_ShowCorrelationCoeff->set_state(TRISTATE_FALSE);
 }
-m_xCB_ShowEquation->set_sensitive( !bMovingAverage );
 m_xCB_ShowCorrelationCoeff->set_sensitive( !bMovingAverage );
 m_xCB_RegressionMovingType->set_sensitive(bMovingAverage);
 m_xNF_Period->set_sensitive(bMovingAverage);
@@ -428,8 +426,6 @@ void TrendlineResources::SetNbPoints( sal_Int32 nNbPoints )
 
 IMPL_LINK_NOARG(TrendlineResources, ShowEquation, weld::Toggleable&, void)
 {
-m_xEE_XName->set_sensitive(m_xCB_ShowEquation->get_active());
-m_xEE_YName->set_sensitive(m_xCB_ShowEquation->get_active());
 UpdateControlStates();
 }
 
diff --git a/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx 
b/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx
index 6726d9d78b36..f71262f738b9 100644
--- a/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx
@@ -157,7 +157,15 @@ OUString 
MovingAverageRegressionCurveCalculator::ImplGetRepresentation(
 const uno::Reference< util::XNumberFormatter >& /*xNumFormatter*/,
 sal_Int32 /*nNumberFormatKey*/, sal_Int32* /*pFormulaLength = nullptr */ ) 
const
 {
-return SchResId( STR_OBJECT_MOVING_AVERAGE_WITH_PARAMETERS );
+OUString aRet = SchResId( STR_OBJECT_MOVING_AVERAGE_WITH_PARAMETERS );
+// change text for Moving Average
+OUString aWildcard( "%PERIOD" );
+sal_Int32 nIndex = aRet.indexOf( aWildcard );
+if( nIndex != -1 )
+{  // replace period
+aRet = aRet.replaceAt( nIndex, aWildcard.getLength(), 
OUString::number(mPeriod) );
+}
+return aRet;
 }
 
 } //  namespace chart

[Libreoffice-commits] help.git: Branch 'libreoffice-7-6' - source/text

[Laurent Balland (via logerrit)]

 source/text/shared/00/0208.xhp  |   13 ++---
 source/text/shared/guide/csv_params.xhp |   15 +--
 2 files changed, 23 insertions(+), 5 deletions(-)

New commits:
commit ef0e2a4bf333ba01d2e3fd81ad9e4b14fb205e4d
Author: Laurent Balland 
AuthorDate: Tue May 30 21:46:27 2023 +0200
Commit: Laurent Balland 
CommitDate: Thu Jun 15 18:30:25 2023 +0200

tdf#154131 Detect numbers in scientfic notation

Add a new option to CSV params
Add help to dialog

Change-Id: If812698a5083cc19431d6de6c2439d2879baa1f7
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/152407
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit a8a5edeadd66edfc0fb0747ba7f1251da1b2597c)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/152983

diff --git a/source/text/shared/00/0208.xhp 
b/source/text/shared/00/0208.xhp
index 0e6ce5b98e..38cdfd518b 100644
--- a/source/text/shared/00/0208.xhp
+++ b/source/text/shared/00/0208.xhp
@@ -108,11 +108,18 @@
 
 
 Detect special numbers
-When this option is enabled, Calc will automatically detect all number 
formats, including special number formats such as dates, time, and scientific 
notation.
+When this option is enabled, Calc will automatically detect all number 
formats, including special number formats such as dates and time. Scientific 
notation will also be detected as Detect scientific notation 
option must be enabled at the same time.
 The selected 
language influences how such special numbers are detected, since different 
languages and regions many have different conventions for such special 
numbers.
-When this 
option is disabled, Calc will detect and convert only numbers in decimal or 
scientific notation. The rest will be imported as text. A decimal number string 
can have digits 0-9, thousands separators, and a decimal separator. Thousands 
separators and decimal separators may vary with the selected language and 
region.
-
+When this 
option is disabled, Calc will detect and convert only numbers in decimal 
notation. Detection of numbers in scientific notation will depend on 
Detect scientific notation option. The rest will be imported as 
text. A decimal number string can have digits 0-9, thousands separators, and a 
decimal separator. Thousands separators and decimal separators may vary with 
the selected language and region.
+
+
+Detect scientific notation
+When this option is enabled, Calc will automatically detect numbers 
with scientific notation, like 5E2 for 500.
+The selected 
language influences how scientific notation is detected, since different 
languages and regions many have different decimal separator.
+This option 
can be be disabled only if Detect special numbers option is 
previously disabled.
+When this 
option is disabled, Calc will detect and convert only numbers in decimal 
notation. The rest will be imported as text. A decimal number string can have 
digits 0-9, thousands separators, and a decimal separator. Thousands separators 
and decimal separators may vary with the selected language and 
region.
 
+
 Skip empty cells
 Available when using Paste 
Special: when this option is enabled, Calc preserves previous 
content of cells when pasting empty ones. Otherwise, Calc deletes content of 
previous cells.
 In 
Text to Columns conversion, if cell content begins with a 
separator and this option is disabled, then first column will be 
emptied.
diff --git a/source/text/shared/guide/csv_params.xhp 
b/source/text/shared/guide/csv_params.xhp
index a6bcf26e46..4a695e793d 100644
--- a/source/text/shared/guide/csv_params.xhp
+++ b/source/text/shared/guide/csv_params.xhp
@@ -25,7 +25,7 @@
 
 
 CSV Filter 
Options
-The CSV filter accepts an option string containing five to 
thirteen tokens, separated by commas. Tokens 6 to 13 are optional.
+The CSV filter accepts an option string containing five to 
fifteen tokens, separated by commas. Tokens 6 to 15 are optional.
 
 
 Import from UTF-8, 
Language German, Comma separated, Text delimiter ", Quoted field as text. CSV 
file has columns formatted as date, number, number, number:
@@ -134,7 +134,7 @@
 
 
 Import: String, either 
false or true. Default value: 
false. This token is the equivalent of the check box "Detect 
special numbers".
-Export: String, either false or true. 
Default value: true. This token has no UI equivalent. If 
true, the number cells are stored as numbers. If 
false, the numbers are stored as text, with text 
delimiters.
+Export: String, either 
false or true. Default value: 
true. This token has no UI equivalent. If 
true, the number cells are stored as numbers. If 
false, the numbers are stored as text, with text 
delimiters.
 
 
 
@@ -219,6 +219,17 @@
 String, either false or 
true. Default value: false. If 
true include a 

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - helpcontent2

[Laurent Balland (via logerrit)]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7ef2a697b7daa3338febd98057241b57cf7722b3
Author: Laurent Balland 
AuthorDate: Thu Jun 15 18:30:26 2023 +0200
Commit: Gerrit Code Review 
CommitDate: Thu Jun 15 18:30:26 2023 +0200

Update git submodules

* Update helpcontent2 from branch 'libreoffice-7-6'
  to ef0e2a4bf333ba01d2e3fd81ad9e4b14fb205e4d
  - tdf#154131 Detect numbers in scientfic notation

Add a new option to CSV params
Add help to dialog

Change-Id: If812698a5083cc19431d6de6c2439d2879baa1f7
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/152407
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit a8a5edeadd66edfc0fb0747ba7f1251da1b2597c)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/152983

diff --git a/helpcontent2 b/helpcontent2
index 7eaf785f0e90..ef0e2a4bf333 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 7eaf785f0e905577cce77c82fa58f1dcefcd879e
+Subproject commit ef0e2a4bf333ba01d2e3fd81ad9e4b14fb205e4d

[Libreoffice-commits] core.git: helpcontent2

[Laurent Balland (via logerrit)]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3e3d6aeec92a7252d92243e2de34b424cf5f7cdf
Author: Laurent Balland 
AuthorDate: Tue Jun 13 11:40:47 2023 +0200
Commit: Gerrit Code Review 
CommitDate: Tue Jun 13 11:40:47 2023 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to a8a5edeadd66edfc0fb0747ba7f1251da1b2597c
  - tdf#154131 Detect numbers in scientfic notation

Add a new option to CSV params
Add help to dialog

Change-Id: If812698a5083cc19431d6de6c2439d2879baa1f7
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/152407
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 05cb445d5f27..a8a5edeadd66 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 05cb445d5f273ccbeb80b1af28bcb1a13e9b8b14
+Subproject commit a8a5edeadd66edfc0fb0747ba7f1251da1b2597c

[Libreoffice-commits] help.git: source/text

[Laurent Balland (via logerrit)]

 source/text/shared/00/0208.xhp  |   13 ++---
 source/text/shared/guide/csv_params.xhp |   15 +--
 2 files changed, 23 insertions(+), 5 deletions(-)

New commits:
commit a8a5edeadd66edfc0fb0747ba7f1251da1b2597c
Author: Laurent Balland 
AuthorDate: Tue May 30 21:46:27 2023 +0200
Commit: Laurent Balland 
CommitDate: Tue Jun 13 11:40:46 2023 +0200

tdf#154131 Detect numbers in scientfic notation

Add a new option to CSV params
Add help to dialog

Change-Id: If812698a5083cc19431d6de6c2439d2879baa1f7
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/152407
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/shared/00/0208.xhp 
b/source/text/shared/00/0208.xhp
index 0e6ce5b98e..38cdfd518b 100644
--- a/source/text/shared/00/0208.xhp
+++ b/source/text/shared/00/0208.xhp
@@ -108,11 +108,18 @@
 
 
 Detect special numbers
-When this option is enabled, Calc will automatically detect all number 
formats, including special number formats such as dates, time, and scientific 
notation.
+When this option is enabled, Calc will automatically detect all number 
formats, including special number formats such as dates and time. Scientific 
notation will also be detected as Detect scientific notation 
option must be enabled at the same time.
 The selected 
language influences how such special numbers are detected, since different 
languages and regions many have different conventions for such special 
numbers.
-When this 
option is disabled, Calc will detect and convert only numbers in decimal or 
scientific notation. The rest will be imported as text. A decimal number string 
can have digits 0-9, thousands separators, and a decimal separator. Thousands 
separators and decimal separators may vary with the selected language and 
region.
-
+When this 
option is disabled, Calc will detect and convert only numbers in decimal 
notation. Detection of numbers in scientific notation will depend on 
Detect scientific notation option. The rest will be imported as 
text. A decimal number string can have digits 0-9, thousands separators, and a 
decimal separator. Thousands separators and decimal separators may vary with 
the selected language and region.
+
+
+Detect scientific notation
+When this option is enabled, Calc will automatically detect numbers 
with scientific notation, like 5E2 for 500.
+The selected 
language influences how scientific notation is detected, since different 
languages and regions many have different decimal separator.
+This option 
can be be disabled only if Detect special numbers option is 
previously disabled.
+When this 
option is disabled, Calc will detect and convert only numbers in decimal 
notation. The rest will be imported as text. A decimal number string can have 
digits 0-9, thousands separators, and a decimal separator. Thousands separators 
and decimal separators may vary with the selected language and 
region.
 
+
 Skip empty cells
 Available when using Paste 
Special: when this option is enabled, Calc preserves previous 
content of cells when pasting empty ones. Otherwise, Calc deletes content of 
previous cells.
 In 
Text to Columns conversion, if cell content begins with a 
separator and this option is disabled, then first column will be 
emptied.
diff --git a/source/text/shared/guide/csv_params.xhp 
b/source/text/shared/guide/csv_params.xhp
index a6bcf26e46..4a695e793d 100644
--- a/source/text/shared/guide/csv_params.xhp
+++ b/source/text/shared/guide/csv_params.xhp
@@ -25,7 +25,7 @@
 
 
 CSV Filter 
Options
-The CSV filter accepts an option string containing five to 
thirteen tokens, separated by commas. Tokens 6 to 13 are optional.
+The CSV filter accepts an option string containing five to 
fifteen tokens, separated by commas. Tokens 6 to 15 are optional.
 
 
 Import from UTF-8, 
Language German, Comma separated, Text delimiter ", Quoted field as text. CSV 
file has columns formatted as date, number, number, number:
@@ -134,7 +134,7 @@
 
 
 Import: String, either 
false or true. Default value: 
false. This token is the equivalent of the check box "Detect 
special numbers".
-Export: String, either false or true. 
Default value: true. This token has no UI equivalent. If 
true, the number cells are stored as numbers. If 
false, the numbers are stored as text, with text 
delimiters.
+Export: String, either 
false or true. Default value: 
true. This token has no UI equivalent. If 
true, the number cells are stored as numbers. If 
false, the numbers are stored as text, with text 
delimiters.
 
 
 
@@ -219,6 +219,17 @@
 String, either false or 
true. Default value: false. If 
true include a byte-order-mark (BOM) in the export. If 
false the export does not include a BOM. If omitted (not 
present at all), the default value is false 

[Libreoffice-commits] core.git: sc/uiconfig

[Laurent Balland (via logerrit)]

 sc/uiconfig/scalc/ui/textimportcsv.ui |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 811e67eb45b1fc97d8c8cc9509acb33267a51aa4
Author: Laurent Balland 
AuthorDate: Tue May 30 21:26:29 2023 +0200
Commit: Laurent Balland 
CommitDate: Thu Jun 1 09:26:50 2023 +0200

tdf#154131 Update UI

Change "scientific numbers" to "scientific notation"

Change-Id: Ic895fda8fb98d0307d05c4a540b4ba43079f8682
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152405
Tested-by: Jenkins
Reviewed-by: Stéphane Guillou 
Reviewed-by: Laurent Balland 

diff --git a/sc/uiconfig/scalc/ui/textimportcsv.ui 
b/sc/uiconfig/scalc/ui/textimportcsv.ui
index 8f1da18b48e7..a7ab406a563c 100644
--- a/sc/uiconfig/scalc/ui/textimportcsv.ui
+++ b/sc/uiconfig/scalc/ui/textimportcsv.ui
@@ -587,7 +587,7 @@
 12
 
   
-F_ormat quoted field as 
text
+Format _quoted field as 
text
 True
 True
 False
@@ -665,7 +665,7 @@
 
 
   
-Detect scientific 
num_bers
+Detect scientific 
n_otation
 True
 True
 False

[Libreoffice-commits] core.git: officecfg/registry sc/inc sc/source sc/uiconfig uitest/libreoffice

[Laurent Balland (via logerrit)]

 officecfg/registry/schema/org/openoffice/Office/Calc.xcs |   14 +
 sc/inc/stringutil.hxx|   11 ++-
 sc/source/core/data/column3.cxx  |2 
 sc/source/core/tool/stringutil.cxx   |7 +-
 sc/source/ui/dbgui/asciiopt.cxx  |   14 -
 sc/source/ui/dbgui/scuiasciiopt.cxx  |   42 ---
 sc/source/ui/docshell/impex.cxx  |8 +-
 sc/source/ui/inc/asciiopt.hxx|3 +
 sc/source/ui/inc/scuiasciiopt.hxx|1 
 sc/uiconfig/scalc/ui/textimportcsv.ui|   21 +++
 uitest/libreoffice/calc/csv_dialog.py|   15 +
 11 files changed, 120 insertions(+), 18 deletions(-)

New commits:
commit 2b3b4026a5c6a1b92c0b29b94dd62a4c3c7b9fad
Author: Laurent Balland 
AuthorDate: Sat May 20 16:47:16 2023 +0200
Commit: Eike Rathke 
CommitDate: Fri May 26 23:57:16 2023 +0200

tdf#154131 Add Detect scientific number option

Add a sub case of Detect special numbers for import CSV (SC_IMPORTFILE),
paste unformated text (SC_PASTETEXT) and text to columns
(SC_TEXTTOCOLUMNS). Following cases are treated:
- If "Detect special numbers" is true, then "Detect scientific numbers"
  must be true and all special formats are treated (date, time,
scientific notation) in addition to basic decimal numbers.
- If "Detect special numbers" is false and "Detect scientific numbers" is
  true only scientific notation is treated in addition to basic decimal
numbers.
- If "Detect special numbers" and "Detect scientific numbers" are both
  false only basic decimal numbers are recognized as numbers. It is the
new case treated by this change
The new option bDetectScientificNumber is append to ASCII options

Change-Id: I73dff9f75d2c7b07ce155daa29dcc4ca9f288664
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152072
Tested-by: Jenkins
Reviewed-by: Eike Rathke 

diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index 7a18fb3381d2..d282ca681fa0 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -1032,6 +1032,13 @@
   
   false
 
+
+  
+If true, Calc tries to detect numbers in scientific 
notation.
+DetectScientificNumbers
+  
+  true
+
 
   
 Language to use for CSV import.  This determines how the 
numbers are parsed.
@@ -1121,6 +1128,13 @@
   
   true
 
+
+  
+If true, Calc tries to detect numbers in scientific 
notation.
+DetectScientificNumbers
+  
+  true
+
 
   
 If true, Calc preserves previous content of cells when 
pasting empty ones. If false, Calc delete content of previous cells.
diff --git a/sc/inc/stringutil.hxx b/sc/inc/stringutil.hxx
index b2b58f60fc5a..3d930dd359df 100644
--- a/sc/inc/stringutil.hxx
+++ b/sc/inc/stringutil.hxx
@@ -70,11 +70,14 @@ struct SAL_WARN_UNUSED SC_DLLPUBLIC ScSetStringParam
 SvNumberFormatter* mpNumFormatter;
 
 /**
- * When true, we try to detect special number format (dates etc) from the
- * input string, when false, we only try to detect a basic decimal number
- * format.
+ * Specify which number formats are detected:
+ * mbDetectNumberFormat=true && mbDetectScientificNumberFormat=true : 
detect all special number formats : basic decimal number, date, scientific 
notation, etc
+ * mbDetectNumberFormat=false && mbDetectScientificNumberFormat=true : 
detect scientific notation and basic decimal number, but not other special 
number formats (date etc)
+ * mbDetectNumberFormat=false && mbDetectScientificNumberFormat=false : 
detect only basic decimal number, but not scientific notation or other special 
number formats (date etc)
+ * Note: mbDetectNumberFormat=true && mbDetectScientificNumberFormat=false 
not allowed
  */
 bool mbDetectNumberFormat;
+bool mbDetectScientificNumberFormat;
 
 /**
  * Determine when to set the 'Text' number format to the cell where the
@@ -145,7 +148,7 @@ public:
  * @return true if the string is a valid number, false otherwise.
  */
 static bool parseSimpleNumber(
-const OUString& rStr, sal_Unicode dsep, sal_Unicode gsep, sal_Unicode 
dsepa, double& rVal);
+const OUString& rStr, sal_Unicode dsep, sal_Unicode gsep, sal_Unicode 
dsepa, double& rVal, bool bDetectScientificNumber = true);
 
 static bool parseSimpleNumber(
 const char* p, size_t n, char dsep, char gsep, double& rVal);
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx

[Libreoffice-commits] core.git: sc/qa svl/qa svl/source xmloff/source

[Laurent Balland (via logerrit)]

 sc/qa/unit/data/xlsx/seconds-without-truncate-and-decimals.xlsx |binary
 sc/qa/unit/subsequent_export_test4.cxx  |   18 
+++---
 svl/qa/unit/svl.cxx |   17 
+
 svl/source/numbers/zforscan.cxx |6 +++
 xmloff/source/style/xmlnumfe.cxx|8 ++--
 5 files changed, 42 insertions(+), 7 deletions(-)

New commits:
commit 6dd2ebbba23b20864d3cf74322540c628088375c
Author: Laurent Balland 
AuthorDate: Tue May 16 09:24:55 2023 +0200
Commit: Eike Rathke 
CommitDate: Fri May 26 18:20:26 2023 +0200

tdf#150028 Treat decimal separator after [SS]

Only decimal separator after S or SS was treated
This change adds [S] and [SS] to treat formats like
[SS].00
Update: correct export to XML
Add QA unit tests

Change-Id: I97ce4084d3caab2fcd18f1c70cd4221596290563
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151823
Tested-by: Jenkins
Reviewed-by: Eike Rathke 

diff --git a/sc/qa/unit/data/xlsx/seconds-without-truncate-and-decimals.xlsx 
b/sc/qa/unit/data/xlsx/seconds-without-truncate-and-decimals.xlsx
new file mode 100644
index ..a26b3630708e
Binary files /dev/null and 
b/sc/qa/unit/data/xlsx/seconds-without-truncate-and-decimals.xlsx differ
diff --git a/sc/qa/unit/subsequent_export_test4.cxx 
b/sc/qa/unit/subsequent_export_test4.cxx
index 9d7dddc99c78..b34a8fcdadf6 100644
--- a/sc/qa/unit/subsequent_export_test4.cxx
+++ b/sc/qa/unit/subsequent_export_test4.cxx
@@ -1460,24 +1460,34 @@ CPPUNIT_TEST_FIXTURE(ScExportTest4, testTdf148820)
 
 namespace
 {
-void lcl_TestEmbeddedTextInDecimal(ScDocument& rDoc)
+void lcl_TestNumberFormat(ScDocument& rDoc, const OUString& rFormatStrOK)
 {
 sal_uInt32 nNumberFormat = rDoc.GetNumberFormat(0, 0, 0);
 const SvNumberformat* pNumberFormat = 
rDoc.GetFormatTable()->GetEntry(nNumberFormat);
 const OUString& rFormatStr = pNumberFormat->GetFormatstring();
 
-CPPUNIT_ASSERT_EQUAL(OUString("#,##0.000\" \"###\" \"###"), rFormatStr);
+CPPUNIT_ASSERT_EQUAL(rFormatStrOK, rFormatStr);
 }
 }
 
+CPPUNIT_TEST_FIXTURE(ScExportTest4, testSecondsWithoutTruncateAndDecimals)
+{
+createScDoc("xlsx/seconds-without-truncate-and-decimals.xlsx");
+lcl_TestNumberFormat(*getScDoc(), "[SS].00");
+
+// save to ODS and reload
+saveAndReload("calc8");
+lcl_TestNumberFormat(*getScDoc(), "[SS].00");
+}
+
 CPPUNIT_TEST_FIXTURE(ScExportTest4, testEmbeddedTextInDecimal)
 {
 createScDoc("xlsx/embedded-text-in-decimal.xlsx");
-lcl_TestEmbeddedTextInDecimal(*getScDoc());
+lcl_TestNumberFormat(*getScDoc(), "#,##0.000\" \"###\" \"###");
 
 // save to ODS and reload
 saveAndReload("calc8");
-lcl_TestEmbeddedTextInDecimal(*getScDoc());
+lcl_TestNumberFormat(*getScDoc(), "#,##0.000\" \"###\" \"###");
 }
 
 CPPUNIT_TEST_FIXTURE(ScExportTest4, testTotalsRowFunction)
diff --git a/svl/qa/unit/svl.cxx b/svl/qa/unit/svl.cxx
index 06d018f3b624..8f5070c934bb 100644
--- a/svl/qa/unit/svl.cxx
+++ b/svl/qa/unit/svl.cxx
@@ -1728,6 +1728,23 @@ void Test::testUserDefinedNumberFormats()
 sExpected = "1900-01-02 23:53.605";
 checkPreviewString(aFormatter, sCode, M_PI, eLang, sExpected);
 }
+{   // tdf#150028 decimals of seconds fraction withtout truncate on 
overflow
+sCode = "[SS]";
+sExpected = "271434";
+checkPreviewString(aFormatter, sCode, M_PI, eLang, sExpected);
+// One decimal.
+sCode = "[SS].0";
+sExpected = "271433.6";
+checkPreviewString(aFormatter, sCode, M_PI, eLang, sExpected);
+// Two decimals.
+sCode = "[SS].00";
+sExpected = "271433.61";
+checkPreviewString(aFormatter, sCode, M_PI, eLang, sExpected);
+// Three decimals.
+sCode = "[SS].000";
+sExpected = "271433.605";
+checkPreviewString(aFormatter, sCode, M_PI, eLang, sExpected);
+}
 {   // tdf#33689 use English NfKeywords in non-English language
 eLang = LANGUAGE_DUTCH;
 sExpected = "Dutch: 1900/01/02 03:23:53";
diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index 10ff6a591b35..537c19415ff7 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -1467,6 +1467,11 @@ sal_Int32 ImpSvNumberformatScan::ScanType()
 }
 else if (pLoc->getTime100SecSep() == sStrArray[i])
 bDecSep = true;
+else if ( sStrArray[i][0] == ']' && i < nStringsCnt - 1 && 
pLoc->getTime100SecSep() == sStrArray[i+1] )
+{
+bDecSep = true;
+i++;
+}
 }
 eNewType = SvNumFormatType::UNDEFINED;
 break;
@@ -2592,6 +2597,7 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& 

[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - svl/qa svl/source

[Laurent Balland (via logerrit)]

 svl/qa/unit/svl.cxx|   12 
 svl/source/numbers/zformat.cxx |8 +---
 2 files changed, 17 insertions(+), 3 deletions(-)

New commits:
commit 40beefc591d8417f1291834fe66a348678241820
Author: Laurent Balland 
AuthorDate: Sun Mar 19 21:45:52 2023 +0100
Commit: Xisco Fauli 
CommitDate: Fri Apr 7 18:38:15 2023 +0200

tdf#153887 Fraction number format: avoid 0/0

If round value is an integer and there is no integer part in the number
format, then nDiv was wrongly forced to 0.
Add corresponding unit tests.

Change-Id: Ib69393eca8f6c2bdda0eacfc83637ab0c971ff2d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149118
Tested-by: Jenkins
Reviewed-by: Eike Rathke 
(cherry picked from commit dc9b8c31aaf72812dc205f610638098898a4cde7)
(cherry picked from commit 96fb093856dd84fdab6b8989884e5632139dec07)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150093
Reviewed-by: Xisco Fauli 

diff --git a/svl/qa/unit/svl.cxx b/svl/qa/unit/svl.cxx
index 19a8c2b3baab..1eab02ecd03e 100644
--- a/svl/qa/unit/svl.cxx
+++ b/svl/qa/unit/svl.cxx
@@ -1453,6 +1453,18 @@ void Test::testUserDefinedNumberFormats()
 sExpected = "-575 540/697";
 checkPreviewString(aFormatter, sCode, -575.774749601315, eLang, 
sExpected);
 }
+{  // tdf#153887: integer value without integer part displayed
+sCode = "#/?";
+sExpected = "2/1";
+checkPreviewString(aFormatter, sCode, 1.95, eLang, sExpected);
+checkPreviewString(aFormatter, sCode, 2.00, eLang, sExpected);
+checkPreviewString(aFormatter, sCode, 2.05, eLang, sExpected);
+sCode = "0/8";
+sExpected = "16/8";
+checkPreviewString(aFormatter, sCode, 1.95, eLang, sExpected);
+checkPreviewString(aFormatter, sCode, 2.00, eLang, sExpected);
+checkPreviewString(aFormatter, sCode, 2.05, eLang, sExpected);
+}
 {  // tdf#102507: left alignment of denominator
 sCode = "# ?/???";
 sExpected = "3 1/2  ";
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index a4756f4982b1..0ddd6e084271 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -2800,9 +2800,10 @@ void SvNumberformat::ImpGetFractionElements ( double& 
fNumber, sal_uInt16 nIx,
 fIntPart = floor(fNumber); // Integral part
 fNumber -= fIntPart; // Fractional part
 const ImpSvNumberformatInfo& rInfo = NumFor[nIx].Info();
-nDiv = lcl_GetDenominatorString( rInfo, NumFor[nIx].GetCount() ).toInt32();
-if( nDiv > 0 )
+sal_Int64 nForcedDiv = lcl_GetDenominatorString( rInfo, 
NumFor[nIx].GetCount() ).toInt32();
+if( nForcedDiv > 0 )
 {   // Forced Denominator
+nDiv = nForcedDiv;
 nFrac = static_cast(floor ( fNumber * nDiv ));
 double fFracNew = static_cast(nFrac) / 
static_cast(nDiv);
 double fFracNew1 = static_cast(nFrac + 1) / 
static_cast(nDiv);
@@ -2856,7 +2857,8 @@ void SvNumberformat::ImpGetFractionElements ( double& 
fNumber, sal_uInt16 nIx,
 if (nFrac >= nDiv)
 {
 ++fIntPart;
-nFrac = nDiv = 0;
+nFrac = 0;
+nDiv = ( nForcedDiv > 0 ) ? nForcedDiv : 1;
 }
 }
 

[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - svl/qa svl/source

[Laurent Balland (via logerrit)]

 svl/qa/unit/svl.cxx|   12 
 svl/source/numbers/zformat.cxx |8 +---
 2 files changed, 17 insertions(+), 3 deletions(-)

New commits:
commit 072f84001b2d28915085909a4d9a5a52bd7f6b61
Author: Laurent Balland 
AuthorDate: Sun Mar 19 21:45:52 2023 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Fri Apr 7 03:04:50 2023 +0200

tdf#153887 Fraction number format: avoid 0/0

If round value is an integer and there is no integer part in the number
format, then nDiv was wrongly forced to 0.
Add corresponding unit tests.

Change-Id: Ib69393eca8f6c2bdda0eacfc83637ab0c971ff2d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149118
Tested-by: Jenkins
Reviewed-by: Eike Rathke 
(cherry picked from commit dc9b8c31aaf72812dc205f610638098898a4cde7)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150085
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/svl/qa/unit/svl.cxx b/svl/qa/unit/svl.cxx
index 29bbde9b999d..2b9672d7602d 100644
--- a/svl/qa/unit/svl.cxx
+++ b/svl/qa/unit/svl.cxx
@@ -1448,6 +1448,18 @@ void Test::testUserDefinedNumberFormats()
 sExpected = "-575 540/697";
 checkPreviewString(aFormatter, sCode, -575.774749601315, eLang, 
sExpected);
 }
+{  // tdf#153887: integer value without integer part displayed
+sCode = "#/?";
+sExpected = "2/1";
+checkPreviewString(aFormatter, sCode, 1.95, eLang, sExpected);
+checkPreviewString(aFormatter, sCode, 2.00, eLang, sExpected);
+checkPreviewString(aFormatter, sCode, 2.05, eLang, sExpected);
+sCode = "0/8";
+sExpected = "16/8";
+checkPreviewString(aFormatter, sCode, 1.95, eLang, sExpected);
+checkPreviewString(aFormatter, sCode, 2.00, eLang, sExpected);
+checkPreviewString(aFormatter, sCode, 2.05, eLang, sExpected);
+}
 {  // tdf#102507: left alignment of denominator
 sCode = "# ?/???";
 sExpected = "3 1/2  ";
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index eb790ee425b0..a19b08375ecd 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -2835,9 +2835,10 @@ void SvNumberformat::ImpGetFractionElements ( double& 
fNumber, sal_uInt16 nIx,
 fIntPart = floor(fNumber); // Integral part
 fNumber -= fIntPart; // Fractional part
 const ImpSvNumberformatInfo& rInfo = NumFor[nIx].Info();
-nDiv = lcl_GetDenominatorString( rInfo, NumFor[nIx].GetCount() ).toInt32();
-if( nDiv > 0 )
+sal_Int64 nForcedDiv = lcl_GetDenominatorString( rInfo, 
NumFor[nIx].GetCount() ).toInt32();
+if( nForcedDiv > 0 )
 {   // Forced Denominator
+nDiv = nForcedDiv;
 nFrac = static_cast(floor ( fNumber * nDiv ));
 double fFracNew = static_cast(nFrac) / 
static_cast(nDiv);
 double fFracNew1 = static_cast(nFrac + 1) / 
static_cast(nDiv);
@@ -2891,7 +2892,8 @@ void SvNumberformat::ImpGetFractionElements ( double& 
fNumber, sal_uInt16 nIx,
 if (nFrac >= nDiv)
 {
 ++fIntPart;
-nFrac = nDiv = 0;
+nFrac = 0;
+nDiv = ( nForcedDiv > 0 ) ? nForcedDiv : 1;
 }
 }
 

[Libreoffice-commits] core.git: svl/qa svl/source

[Laurent Balland (via logerrit)]

 svl/qa/unit/svl.cxx|   12 
 svl/source/numbers/zformat.cxx |8 +---
 2 files changed, 17 insertions(+), 3 deletions(-)

New commits:
commit dc9b8c31aaf72812dc205f610638098898a4cde7
Author: Laurent Balland 
AuthorDate: Sun Mar 19 21:45:52 2023 +0100
Commit: Eike Rathke 
CommitDate: Thu Apr 6 18:00:12 2023 +0200

tdf#153887 Fraction number format: avoid 0/0

If round value is an integer and there is no integer part in the number
format, then nDiv was wrongly forced to 0.
Add corresponding unit tests.

Change-Id: Ib69393eca8f6c2bdda0eacfc83637ab0c971ff2d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149118
Tested-by: Jenkins
Reviewed-by: Eike Rathke 

diff --git a/svl/qa/unit/svl.cxx b/svl/qa/unit/svl.cxx
index 557c9be639e6..06d018f3b624 100644
--- a/svl/qa/unit/svl.cxx
+++ b/svl/qa/unit/svl.cxx
@@ -1449,6 +1449,18 @@ void Test::testUserDefinedNumberFormats()
 sExpected = "-575 540/697";
 checkPreviewString(aFormatter, sCode, -575.774749601315, eLang, 
sExpected);
 }
+{  // tdf#153887: integer value without integer part displayed
+sCode = "#/?";
+sExpected = "2/1";
+checkPreviewString(aFormatter, sCode, 1.95, eLang, sExpected);
+checkPreviewString(aFormatter, sCode, 2.00, eLang, sExpected);
+checkPreviewString(aFormatter, sCode, 2.05, eLang, sExpected);
+sCode = "0/8";
+sExpected = "16/8";
+checkPreviewString(aFormatter, sCode, 1.95, eLang, sExpected);
+checkPreviewString(aFormatter, sCode, 2.00, eLang, sExpected);
+checkPreviewString(aFormatter, sCode, 2.05, eLang, sExpected);
+}
 {  // tdf#102507: left alignment of denominator
 sCode = "# ?/???";
 sExpected = "3 1/2  ";
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 676692da6fdb..5128c5cca118 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -2830,9 +2830,10 @@ void SvNumberformat::ImpGetFractionElements ( double& 
fNumber, sal_uInt16 nIx,
 fIntPart = floor(fNumber); // Integral part
 fNumber -= fIntPart; // Fractional part
 const ImpSvNumberformatInfo& rInfo = NumFor[nIx].Info();
-nDiv = lcl_GetDenominatorString( rInfo, NumFor[nIx].GetCount() ).toInt32();
-if( nDiv > 0 )
+sal_Int64 nForcedDiv = lcl_GetDenominatorString( rInfo, 
NumFor[nIx].GetCount() ).toInt32();
+if( nForcedDiv > 0 )
 {   // Forced Denominator
+nDiv = nForcedDiv;
 nFrac = static_cast(floor ( fNumber * nDiv ));
 double fFracNew = static_cast(nFrac) / 
static_cast(nDiv);
 double fFracNew1 = static_cast(nFrac + 1) / 
static_cast(nDiv);
@@ -2886,7 +2887,8 @@ void SvNumberformat::ImpGetFractionElements ( double& 
fNumber, sal_uInt16 nIx,
 if (nFrac >= nDiv)
 {
 ++fIntPart;
-nFrac = nDiv = 0;
+nFrac = 0;
+nDiv = ( nForcedDiv > 0 ) ? nForcedDiv : 1;
 }
 }
 

[Libreoffice-commits] core.git: helpcontent2

[Laurent Balland (via logerrit)]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c1c2a6acf936a9568d8abf7ccaaa85e3532a3a6b
Author: Laurent Balland 
AuthorDate: Mon Mar 27 19:18:24 2023 +0100
Commit: Gerrit Code Review 
CommitDate: Mon Mar 27 18:18:24 2023 +

Update git submodules

* Update helpcontent2 from branch 'master'
  to e24ed3bc78751e931c81a98a542af71aa4a0f5b4
  - tdf#154131 Import text in Calc: Scientific numbers

Since LibO 3.6, numbers in scientific notation are always detected with 
or without the option "Detect special numbers".
This change update help for this "new" behavior.

Change-Id: I1fb033229f29f4cc850fe28ea51d89413e52ed58
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/149467
Tested-by: Jenkins
Reviewed-by: Stéphane Guillou 
Reviewed-by: Vernon, Stuart Foote 
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 68257fa55720..e24ed3bc7875 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 68257fa557206cc11dfcad9fdb037eaceb131217
+Subproject commit e24ed3bc78751e931c81a98a542af71aa4a0f5b4

[Libreoffice-commits] help.git: source/text

[Laurent Balland (via logerrit)]

 source/text/shared/00/0208.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e24ed3bc78751e931c81a98a542af71aa4a0f5b4
Author: Laurent Balland 
AuthorDate: Thu Mar 23 20:12:38 2023 +0100
Commit: Olivier Hallot 
CommitDate: Mon Mar 27 18:18:24 2023 +

tdf#154131 Import text in Calc: Scientific numbers

Since LibO 3.6, numbers in scientific notation are always detected with or 
without the option "Detect special numbers".
This change update help for this "new" behavior.

Change-Id: I1fb033229f29f4cc850fe28ea51d89413e52ed58
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/149467
Tested-by: Jenkins
Reviewed-by: Stéphane Guillou 
Reviewed-by: Vernon, Stuart Foote 
Reviewed-by: Olivier Hallot 

diff --git a/source/text/shared/00/0208.xhp 
b/source/text/shared/00/0208.xhp
index ec3395dff9..0e6ce5b98e 100644
--- a/source/text/shared/00/0208.xhp
+++ b/source/text/shared/00/0208.xhp
@@ -110,7 +110,7 @@
 Detect special numbers
 When this option is enabled, Calc will automatically detect all number 
formats, including special number formats such as dates, time, and scientific 
notation.
 The selected 
language influences how such special numbers are detected, since different 
languages and regions many have different conventions for such special 
numbers.
-When this 
option is disabled, Calc will detect and convert only decimal numbers. The 
rest, including numbers formatted in scientific notation, will be imported as 
text. A decimal number string can have digits 0-9, thousands separators, and a 
decimal separator. Thousands separators and decimal separators may vary with 
the selected language and region.
+When this 
option is disabled, Calc will detect and convert only numbers in decimal or 
scientific notation. The rest will be imported as text. A decimal number string 
can have digits 0-9, thousands separators, and a decimal separator. Thousands 
separators and decimal separators may vary with the selected language and 
region.
 
 
 Skip empty cells

[Libreoffice-commits] core.git: sc/inc sc/qa sc/source

[Laurent Balland (via logerrit)]

 sc/inc/globstr.hrc |8 ++-
 sc/qa/uitest/calc_tests/calcSheetDelete.py |9 +--
 sc/qa/uitest/calc_tests2/tdf114992.py  |3 -
 sc/qa/uitest/range_name/tdf150307.py   |3 -
 sc/source/ui/view/tabvwshf.cxx |   71 ++---
 5 files changed, 66 insertions(+), 28 deletions(-)

New commits:
commit 41b991ea0cf3f8ce36cbdbf16b9c2c6d2bb16b5d
Author: Laurent Balland 
AuthorDate: Mon Feb 20 08:46:23 2023 +0100
Commit: Laurent Balland 
CommitDate: Mon Feb 27 09:43:03 2023 +

tdf#153709 Adapt message for Delete Sheet

When deleting sheets, the message is adapted to the count of selected
sheets (singular or plural).
The confirmation message is skipped if selected sheets are empty
The message for pivot table data losing is replaced by regular
confirmation message if both pivot table and data are selected

Update UItests when there is no more confirmation

Change-Id: I5cbd6d7cbe271ad86c5c68820b23df5a2307f3bc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147309
Reviewed-by: Eike Rathke 
Tested-by: Jenkins
Reviewed-by: Laurent Balland 

diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index 19e99d1c47d0..95f7138c81c9 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -268,7 +268,9 @@
 #define STR_OPTIONALNC_("STR_OPTIONAL", 
"(optional)")
 #define STR_REQUIREDNC_("STR_REQUIRED", 
"(required)")
 #define STR_NOTES   NC_("STR_NOTES", "Comments")
-#define STR_QUERY_DELTABNC_("STR_QUERY_DELTAB", "Are 
you sure you want to delete the selected sheet(s)?")
+/* %d will be replaced by the number of selected sheets
+ e.g. Are you sure you want to delete the 3 selected sheets? */
+#define STR_QUERY_DELTABNNC_("STR_QUERY_DELTAB", "Are 
you sure you want to delete the selected sheet?", "Are you sure you want to 
delete the %d selected sheets?")
 #define STR_QUERY_DELSCENARIO   NC_("STR_QUERY_DELSCENARIO", 
"Are you sure you want to delete the selected scenario?")
 #define STR_EXPORT_ASCIINC_("STR_EXPORT_ASCII", 
"Export Text File")
 #define STR_IMPORT_LOTUSNC_("STR_IMPORT_LOTUS", 
"Import Lotus files")
@@ -533,7 +535,9 @@
 #define STR_FRACTIONNC_("STR_FRACTION", "Fraction")
 #define STR_BOOLEAN_VALUE   NC_("STR_BOOLEAN_VALUE", 
"Boolean Value")
 #define STR_TEXTNC_("STR_TEXT", "Text")
-#define STR_QUERY_PIVOTTABLE_DELTAB 
NC_("STR_QUERY_PIVOTTABLE_DELTAB", "The selected sheet(s) contain source data 
of related pivot tables that will be lost. Are you sure you want to delete the 
selected sheet(s)?")
+/* %d will be replaced by the number of selected sheets
+e.g. The 3 selected sheets contain source data of related pivot tables 
that will be lost. */
+#define STR_QUERY_PIVOTTABLE_DELTAB 
NNC_("STR_QUERY_PIVOTTABLE_DELTAB", "The selected sheet contains source data of 
related pivot tables that will be lost.", "The %d selected sheets contain 
source data of related pivot tables that will be lost.")
 #define STR_ERR_NAME_INVALID_CELL_REF   
NC_("STR_ERR_NAME_INVALID_CELL_REF", "Invalid name. Reference to a cell, or a 
range of cells not allowed.")
 #define STR_ERR_LONG_LINK_FORMULA_NEEDING_CHECK 
NC_("STR_ERR_LONG_LINK_FORMULA_NEEDING_CHECK", "External content disabled.")
 #define STR_TEXTORIENTANGLE NC_("STR_TEXTORIENTANGLE", 
"Text orientation angle")
diff --git a/sc/qa/uitest/calc_tests/calcSheetDelete.py 
b/sc/qa/uitest/calc_tests/calcSheetDelete.py
index 3e9da3f516d4..380d6766943e 100644
--- a/sc/qa/uitest/calc_tests/calcSheetDelete.py
+++ b/sc/qa/uitest/calc_tests/calcSheetDelete.py
@@ -28,8 +28,7 @@ class calcSheetDelete(UITestCase):
 
 self.assertEqual(document.Sheets.getCount(), nrSheets + 1)
 
-with self.ui_test.execute_dialog_through_command(".uno:Remove", 
close_button="yes"):
-pass
+self.xUITest.executeCommand(".uno:Remove")
 xToolkit = 
self.xContext.ServiceManager.createInstance('com.sun.star.awt.Toolkit')
 xToolkit.processEventsToIdle()
 
@@ -85,8 +84,7 @@ class calcSheetDelete(UITestCase):
 self.xUITest.executeCommand(".uno:JumpToNextTableSel")  
#select next sheet
 i = i + 1
 
-with self.ui_test.execute_dialog_through_command(".uno:Remove", 
close_button="yes"):
-pass
+self.xUITest.executeCommand(".uno:Remove")
 
 xToolkit = 
self.xContext.ServiceManager.createInstance('com.sun.star.awt.Toolkit')
 xToolkit.processEventsToIdle()
@@ -115,8 +113,7 @@ class calcSheetDelete(UITestCase):
 self.xUITest.executeCommand(".uno:JumpToNextTableSel")  
#select 

[Libreoffice-commits] core.git: sc/qa

[Laurent Balland (via logerrit)]

 sc/qa/uitest/calc_tests4/tdf152722_AddDecimalPlacesToNatNum.py |   39 
++
 1 file changed, 39 insertions(+)

New commits:
commit 69b9f50ee8c76fa6193165369ab8235cd125247e
Author: Laurent Balland 
AuthorDate: Fri Feb 3 22:10:09 2023 +0100
Commit: Xisco Fauli 
CommitDate: Mon Feb 13 09:20:59 2023 +

tdf#152722 tdf#153023 Add UITest

Test increment decimal places and negative in red for NatNum12 number
format
Test disable thousand separator and enable leading zeroes

Change-Id: Iff16be62cc7c52af91e04ed018f8cacc40e35568
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146550
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/sc/qa/uitest/calc_tests4/tdf152722_AddDecimalPlacesToNatNum.py 
b/sc/qa/uitest/calc_tests4/tdf152722_AddDecimalPlacesToNatNum.py
new file mode 100644
index ..e7fec74647fa
--- /dev/null
+++ b/sc/qa/uitest/calc_tests4/tdf152722_AddDecimalPlacesToNatNum.py
@@ -0,0 +1,39 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# 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/.
+#
+from uitest.framework import UITestCase
+from uitest.uihelper.common import get_state_as_dict
+from uitest.uihelper.common import select_pos
+from uitest.uihelper.calc import enter_text_to_cell
+from libreoffice.uno.propertyvalue import mkPropertyValues
+#Bug 152722 - NatNum12 number format (spell out): add/delete decimal places is 
loosing format
+
+class tdf152722(UITestCase):
+def test_tdf152722_NatNum_modifier_decimal_value(self):
+#numberingformatpage.ui
+with self.ui_test.create_doc_in_start_center("calc"):
+#format - cell
+with 
self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog") as xDialog:
+xTabs = xDialog.getChild("tabcontrol")
+select_pos(xTabs, "0")  #tab Numbers
+xdecimalsed  = xDialog.getChild( "decimalsed" )
+xleadzerosed = xDialog.getChild( "leadzerosed" )
+xnegnumred   = xDialog.getChild( "negnumred" )
+xthousands   = xDialog.getChild( "thousands" )
+xformatted   = xDialog.getChild( "formatted" )
+
+xformatted.executeAction( "CLEAR", tuple() )  #clear textbox
+xformatted.executeAction( "TYPE", 
mkPropertyValues({"TEXT":"[NatNum12 cardinal]0"}) )
+xdecimalsed.executeAction( "UP", tuple() )
+self.assertEqual( get_state_as_dict(xformatted)["Text"], 
"[NatNum12 cardinal]0.0" )
+xnegnumred.executeAction( "CLICK", tuple() )
+self.assertEqual( get_state_as_dict(xformatted)["Text"], 
"[NatNum12 cardinal]0.0;[RED][NatNum12 cardinal]-0.0" )
+#Bug 153023: disable Thousand separator for NatNum12 modifier
+self.assertEqual(get_state_as_dict(xthousands)["Enabled"], 
"false")
+#Leading zeroes can be 0 or 1
+self.assertEqual(get_state_as_dict(xleadzerosed)["Enabled"], 
"true")
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - 14 commits - cui/uiconfig helpcontent2 include/svl oox/qa oox/source sc/source svl/source sw/source ucb/source vcl/qt5 vcl/source v

[Laurent Balland (via logerrit)]

 cui/uiconfig/ui/qrcodegen.ui |1 
 helpcontent2 |2 
 include/svl/zformat.hxx  |3 
 oox/qa/unit/data/tdf153258_VML_import_WordArt_detection.docx |binary
 oox/qa/unit/vml.cxx  |   18 
 oox/source/vml/vmlshape.cxx  |7 
 sc/source/ui/app/inputwin.cxx|9 
 sc/source/ui/inc/inputwin.hxx|2 
 svl/source/numbers/zforlist.cxx  |   85 -
 svl/source/numbers/zformat.cxx   |   20 
 sw/source/core/doc/docedt.cxx|4 
 sw/source/core/unocore/unosrch.cxx   |   18 
 sw/source/filter/ww8/docxattributeoutput.cxx |   17 
 sw/source/uibase/inc/conttree.hxx|5 
 sw/source/uibase/utlui/content.cxx   |  670 +--
 ucb/source/ucp/webdav-curl/CurlSession.cxx   |   24 
 ucb/source/ucp/webdav-curl/DAVException.hxx  |1 
 vcl/qt5/QtGraphics_Controls.cxx  |1 
 vcl/source/control/PriorityMergedHBox.cxx|6 
 vcl/unx/gtk3/gtkframe.cxx|   10 
 vcl/win/window/salframe.cxx  |4 
 21 files changed, 510 insertions(+), 397 deletions(-)

New commits:
commit ae928386ece4708236038f0d14f0870c4ef01bf6
Author: Laurent Balland 
AuthorDate: Mon Jan 2 18:39:35 2023 +0100
Commit: Andras Timar 
CommitDate: Fri Feb 3 23:33:12 2023 +0100

tdf#152722 Number Format: keep NatNum modifiers

When modifying number format with UI (decimal places, negative in red...) 
NatNum modifiers must be preserved
Implement an helper to get NatNum string
As NatNum12 already inserts currency unit, do not treat it

Change-Id: I38be1da08a44d75ef663eaf50fccb3820ff9ed5e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144963
Tested-by: Jenkins
Reviewed-by: Eike Rathke 
(cherry picked from commit 8ba7657a9653f8ae5d1b865356d11138df7b2093)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146406

diff --git a/include/svl/zformat.hxx b/include/svl/zformat.hxx
index 43f6ad9775f4..ea08234e93a2 100644
--- a/include/svl/zformat.hxx
+++ b/include/svl/zformat.hxx
@@ -459,6 +459,9 @@ public:
 void GetNatNumXml(
 css::i18n::NativeNumberXmlAttributes2& rAttr,
 sal_uInt16 nNumFor ) const;
+/** Return empty string if no NatNum modifier or unvalid nNumFor
+otherwhise return "[NatNum1]" or "[NatNum12 ...]" */
+OUString GetNatNumModifierString( sal_uInt16 nNumFor = 0 ) const;
 
 /** Switches to the first non-"gregorian" calendar, but only if the current
 calendar is "gregorian"; original calendar name and date/time returned,
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index cee75fc9265e..ca8b6524b9e2 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -3231,6 +3231,15 @@ OUString SvNumberFormatter::GenerateFormat(sal_uInt32 
nIndex,
 sString.append(GetNumDecimalSep());
 padToLength(sString, sString.getLength() + nPrecision, '0');
 }
+
+// Native Number
+const OUString sPosNatNumModifier = pFormat ? 
pFormat->GetNatNumModifierString( 0 ) : "";
+const OUString sNegNatNumModifier = pFormat ?
+// if a negative format already exists, use its NatNum modifier
+// else use NatNum modifier of positive format
+( pFormat->GetNumForString( 1, 0 )  ? 
pFormat->GetNatNumModifierString( 1 ) : sPosNatNumModifier )
+: "";
+
 if (eType == SvNumFormatType::PERCENT)
 {
 sString.append( pFormat->GetPercentString() );
@@ -3254,50 +3263,62 @@ OUString SvNumberFormatter::GenerateFormat(sal_uInt32 
nIndex,
 OUString aCurr;
 const NfCurrencyEntry* pEntry;
 bool bBank;
-if ( GetNewCurrencySymbolString( nIndex, aCurr, ,  ) )
+bool isPosNatNum12 = sPosNatNumModifier.startsWith( "[NatNum12" );
+bool isNegNatNum12 = sNegNatNumModifier.startsWith( "[NatNum12" );
+if ( !isPosNatNum12 || !isNegNatNum12 )
 {
-if ( pEntry )
+if ( GetNewCurrencySymbolString( nIndex, aCurr, ,  ) )
 {
-sal_uInt16 nPosiForm = 
NfCurrencyEntry::GetEffectivePositiveFormat(
-xLocaleData->getCurrPositiveFormat(),
-pEntry->GetPositiveFormat(), bBank );
-sal_uInt16 nNegaForm = 
NfCurrencyEntry::GetEffectiveNegativeFormat(
-xLocaleData->getCurrNegativeFormat(),
-pEntry->GetNegativeFormat(), bBank );
-pEntry->CompletePositiveFormatString( 

[Libreoffice-commits] core.git: cui/source include/svl include/svx sc/source svl/source svx/source

[Laurent Balland (via logerrit)]

 cui/source/tabpages/numfmt.cxx |3 +-
 include/svl/numformat.hxx  |3 ++
 include/svx/numfmtsh.hxx   |   27 -
 sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx |   26 +++-
 sc/source/ui/view/formatsh.cxx |3 ++
 svl/source/numbers/zforlist.cxx|7 +
 svx/source/items/numfmtsh.cxx  |7 +
 7 files changed, 58 insertions(+), 18 deletions(-)

New commits:
commit bbd487dc26c7e37982f64f6e6159c65ac77a89f1
Author: Laurent Balland 
AuthorDate: Sat Jan 14 15:48:12 2023 +0100
Commit: Eike Rathke 
CommitDate: Fri Feb 3 17:57:01 2023 +

tdf#153023 Disable Thousand separator for NatNum12

Add some helper to get NatNum12 state
Modify both Number format dialog and Sidebar
Transform CAT_ defines in enum

Change-Id: Iaa3127bf07223caac60e409306a1bee2edc37428
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145513
Tested-by: Jenkins
Reviewed-by: Eike Rathke 

diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index e6e669de6422..63f9d5ce91f7 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -942,7 +942,8 @@ void SvxNumberFormatTabPage::UpdateOptions_Impl( bool 
bCheckCatChange /*= sal_Fa
 m_xBtnNegRed->set_active( bNegRed );
 if ( nCategory != CAT_SCIENTIFIC )
 {
-m_xBtnThousand->set_sensitive( nCategory != CAT_TIME );
+m_xBtnThousand->set_sensitive( nCategory != CAT_TIME
+&& !pNumFmtShell->IsNatNum12( 
theFormat ) );
 m_xBtnThousand->set_active( bThousand && nCategory != CAT_TIME 
);
 }
 break;
diff --git a/include/svl/numformat.hxx b/include/svl/numformat.hxx
index 6ff04837b0bb..0a374f3c3301 100644
--- a/include/svl/numformat.hxx
+++ b/include/svl/numformat.hxx
@@ -238,6 +238,9 @@ public:
 /// Whether format index nFIndex is of type text or not
 bool IsTextFormat(sal_uInt32 nFIndex) const;
 
+/// Whether format index nFIndex has NatNum12 modifier
+bool IsNatNum12(sal_uInt32 nFIndex) const;
+
 /// Get additional info of a format index, e.g. for dialog box
 void GetFormatSpecialInfo(sal_uInt32 nFormat, bool& bThousand, bool& IsRed,
   sal_uInt16& nPrecision, sal_uInt16& nLeadingCnt);
diff --git a/include/svx/numfmtsh.hxx b/include/svx/numfmtsh.hxx
index 360a067e06c9..db593eb8b77d 100644
--- a/include/svx/numfmtsh.hxx
+++ b/include/svx/numfmtsh.hxx
@@ -38,17 +38,20 @@ enum class SvxNumberValueType
 };
 
 // sort order of the category ListBox entries in the TabPage
-#define CAT_ALL 0
-#define CAT_USERDEFINED 1
-#define CAT_NUMBER  2
-#define CAT_PERCENT 3
-#define CAT_CURRENCY4
-#define CAT_DATE5
-#define CAT_TIME6
-#define CAT_SCIENTIFIC  7
-#define CAT_FRACTION8
-#define CAT_BOOLEAN 9
-#define CAT_TEXT10
+enum SvxNumberFormatCategory
+{
+CAT_ALL = 0,
+CAT_USERDEFINED,
+CAT_NUMBER,
+CAT_PERCENT,
+CAT_CURRENCY,
+CAT_DATE,
+CAT_TIME,
+CAT_SCIENTIFIC,
+CAT_FRACTION,
+CAT_BOOLEAN,
+CAT_TEXT
+};
 
 #define SELPOS_NONE -1
 
@@ -130,6 +133,8 @@ public:
 
 sal_uInt16  GetFormatIntegerDigits( std::u16string_view  rFormat ) 
const;
 
+boolIsNatNum12( std::u16string_view rFormat ) const;
+
 voidMakePreviewString( const OUString& rFormatStr,
OUString&   rPreviewStr,
const Color*& rpFontColor );
diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx 
b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
index c9910cc1db82..b2530df9838f 100644
--- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
+++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
@@ -23,6 +23,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -185,12 +186,17 @@ void NumberFormatPropertyPanel::NotifyItemUpdate(
 sal_uInt16 nVal = pItem->GetValue();
 mnCategorySelected = nVal;
 mxLbCategory->set_active(nVal);
-if (nVal < 8 &&  // General, Number, Percent, Currency, Time, 
Scientific, Fraction
-nVal != 4 )  // not Date
+// There is an offset between category list enum and listbox 
in side panel
+SvxNumberFormatCategory nCategory = static_cast< 
SvxNumberFormatCategory >( nVal + 1 );
+if (nCategory <= CAT_FRACTION &&  // General, Number, Percent, 
Currency, Time, Scientific, Fraction
+nCategory != CAT_DATE )   // not Date
 {
-bool bIsScientific ( nVal == 

[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - include/svl svl/source

[Laurent Balland (via logerrit)]

 include/svl/zformat.hxx |3 +
 svl/source/numbers/zforlist.cxx |   85 +---
 svl/source/numbers/zformat.cxx  |   20 +
 3 files changed, 77 insertions(+), 31 deletions(-)

New commits:
commit ac24b5992402c07eb71e99094d4be4ba667800ef
Author: Laurent Balland 
AuthorDate: Mon Jan 2 18:39:35 2023 +0100
Commit: Eike Rathke 
CommitDate: Fri Feb 3 16:05:58 2023 +

tdf#152722 Number Format: keep NatNum modifiers

When modifying number format with UI (decimal places, negative in red...) 
NatNum modifiers must be preserved
Implement an helper to get NatNum string
As NatNum12 already inserts currency unit, do not treat it

Change-Id: I38be1da08a44d75ef663eaf50fccb3820ff9ed5e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144963
Tested-by: Jenkins
Reviewed-by: Eike Rathke 
(cherry picked from commit 8ba7657a9653f8ae5d1b865356d11138df7b2093)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146406

diff --git a/include/svl/zformat.hxx b/include/svl/zformat.hxx
index 43f6ad9775f4..ea08234e93a2 100644
--- a/include/svl/zformat.hxx
+++ b/include/svl/zformat.hxx
@@ -459,6 +459,9 @@ public:
 void GetNatNumXml(
 css::i18n::NativeNumberXmlAttributes2& rAttr,
 sal_uInt16 nNumFor ) const;
+/** Return empty string if no NatNum modifier or unvalid nNumFor
+otherwhise return "[NatNum1]" or "[NatNum12 ...]" */
+OUString GetNatNumModifierString( sal_uInt16 nNumFor = 0 ) const;
 
 /** Switches to the first non-"gregorian" calendar, but only if the current
 calendar is "gregorian"; original calendar name and date/time returned,
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index cee75fc9265e..ca8b6524b9e2 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -3231,6 +3231,15 @@ OUString SvNumberFormatter::GenerateFormat(sal_uInt32 
nIndex,
 sString.append(GetNumDecimalSep());
 padToLength(sString, sString.getLength() + nPrecision, '0');
 }
+
+// Native Number
+const OUString sPosNatNumModifier = pFormat ? 
pFormat->GetNatNumModifierString( 0 ) : "";
+const OUString sNegNatNumModifier = pFormat ?
+// if a negative format already exists, use its NatNum modifier
+// else use NatNum modifier of positive format
+( pFormat->GetNumForString( 1, 0 )  ? 
pFormat->GetNatNumModifierString( 1 ) : sPosNatNumModifier )
+: "";
+
 if (eType == SvNumFormatType::PERCENT)
 {
 sString.append( pFormat->GetPercentString() );
@@ -3254,50 +3263,62 @@ OUString SvNumberFormatter::GenerateFormat(sal_uInt32 
nIndex,
 OUString aCurr;
 const NfCurrencyEntry* pEntry;
 bool bBank;
-if ( GetNewCurrencySymbolString( nIndex, aCurr, ,  ) )
+bool isPosNatNum12 = sPosNatNumModifier.startsWith( "[NatNum12" );
+bool isNegNatNum12 = sNegNatNumModifier.startsWith( "[NatNum12" );
+if ( !isPosNatNum12 || !isNegNatNum12 )
 {
-if ( pEntry )
+if ( GetNewCurrencySymbolString( nIndex, aCurr, ,  ) )
 {
-sal_uInt16 nPosiForm = 
NfCurrencyEntry::GetEffectivePositiveFormat(
-xLocaleData->getCurrPositiveFormat(),
-pEntry->GetPositiveFormat(), bBank );
-sal_uInt16 nNegaForm = 
NfCurrencyEntry::GetEffectiveNegativeFormat(
-xLocaleData->getCurrNegativeFormat(),
-pEntry->GetNegativeFormat(), bBank );
-pEntry->CompletePositiveFormatString( sString, bBank, 
nPosiForm );
-pEntry->CompleteNegativeFormatString( sNegStr, bBank, 
nNegaForm );
+if ( pEntry )
+{
+sal_uInt16 nPosiForm = 
NfCurrencyEntry::GetEffectivePositiveFormat(
+xLocaleData->getCurrPositiveFormat(),
+pEntry->GetPositiveFormat(), bBank );
+sal_uInt16 nNegaForm = 
NfCurrencyEntry::GetEffectiveNegativeFormat(
+xLocaleData->getCurrNegativeFormat(),
+pEntry->GetNegativeFormat(), bBank );
+if ( !isPosNatNum12 )
+pEntry->CompletePositiveFormatString( sString, bBank, 
nPosiForm );
+if ( !isNegNatNum12 )
+pEntry->CompleteNegativeFormatString( sNegStr, bBank, 
nNegaForm );
+}
+else
+{   // assume currency abbreviation (AKA banking symbol), not 
symbol
+sal_uInt16 nPosiForm = 
NfCurrencyEntry::GetEffectivePositiveFormat(
+xLocaleData->getCurrPositiveFormat(),
+xLocaleData->getCurrPositiveFormat(), true );
+sal_uInt16 nNegaForm = 
NfCurrencyEntry::GetEffectiveNegativeFormat(
+ 

[Libreoffice-commits] core.git: include/xmloff schema/libreoffice sc/qa svl/source xmloff/source

[Laurent Balland (via logerrit)]

 include/xmloff/xmlnumfe.hxx |7 
 include/xmloff/xmltoken.hxx |1 
 sc/qa/unit/data/contentCSV/testNumberFormats.csv|   32 +++
 sc/qa/unit/data/ods/testNumberFormats.ods   |binary
 sc/qa/unit/helper/qahelper.cxx  |5 
 sc/qa/unit/helper/qahelper.hxx  |2 
 sc/qa/unit/subsequent_export_test.cxx   |   31 +++
 schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng |9 +
 svl/source/numbers/zformat.cxx  |3 
 xmloff/source/core/xmltoken.cxx |1 
 xmloff/source/style/xmlnumfe.cxx|  101 ++--
 xmloff/source/style/xmlnumfi.cxx|   29 +++
 xmloff/source/token/tokens.txt  |1 
 13 files changed, 165 insertions(+), 57 deletions(-)

New commits:
commit 46b7fd59f9d0dfb5544df99494d3a3d3a372ae8b
Author: Laurent Balland 
AuthorDate: Sat Jan 14 15:48:12 2023 +0100
Commit: Eike Rathke 
CommitDate: Mon Jan 30 17:00:46 2023 +

tdf#118324 Treat blank ? in integer

Restore and update change 56352
Test of 
https://cgit.freedesktop.org/libreoffice/core/commit/?id=8ca6468f0f4900d4d3bb45e0e938fe35c308512c
 is now ok

Add disambiguation between '0' and '?' in integer part
XML_MAX_BLANK_INTEGER_DIGITS is added for the number of '?'
XML_MIN_INTEGER_DIGITS is the number of '?' and '0'
This preserve compatibility with previous versions:
in previous versions '?' will be transformed in '0'
It also applies to scientific and fraction numbers.
Integer part for number, scientific and fraction are
treated the same way

Include QA unit test

Change-Id: Iab3127bf07223caac60e409306a1bee2edc37428
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145932
Tested-by: Jenkins
Reviewed-by: Eike Rathke 

diff --git a/include/xmloff/xmlnumfe.hxx b/include/xmloff/xmlnumfe.hxx
index 5d971179bbd8..61836f534245 100644
--- a/include/xmloff/xmlnumfe.hxx
+++ b/include/xmloff/xmlnumfe.hxx
@@ -63,13 +63,14 @@ private:
 SAL_DLLPRIVATE void FinishTextElement_Impl(bool bUseExtensionNS = false);
 
 SAL_DLLPRIVATE void WriteColorElement_Impl( const Color& rColor );
+SAL_DLLPRIVATE void WriteIntegerElement_Impl( sal_Int32 nInteger, 
sal_Int32 nBlankInteger, bool bGrouping );
 SAL_DLLPRIVATE void WriteNumberElement_Impl( sal_Int32 nDecimals, 
sal_Int32 nMinDecimals,
-sal_Int32 nInteger, const OUString& 
rDashStr,
+sal_Int32 nInteger, sal_Int32 
nBlankInteger, const OUString& rDashStr,
 bool bGrouping, sal_Int32 
nTrailingThousands,
 const SvXMLEmbeddedTextEntryArr& 
rEmbeddedEntries );
-SAL_DLLPRIVATE void WriteScientificElement_Impl( sal_Int32 nDecimals, 
sal_Int32 nMinDecimals, sal_Int32 nInteger,
+SAL_DLLPRIVATE void WriteScientificElement_Impl( sal_Int32 nDecimals, 
sal_Int32 nMinDecimals, sal_Int32 nInteger, sal_Int32 nBlankInteger,
 bool bGrouping, sal_Int32 nExp, 
sal_Int32 nExpInterval, bool bExpSign );
-SAL_DLLPRIVATE void WriteFractionElement_Impl( sal_Int32 nInteger, bool 
bGrouping,
+SAL_DLLPRIVATE void WriteFractionElement_Impl( sal_Int32 nInteger, 
sal_Int32 nBlankInteger, bool bGrouping,
const SvNumberformat& 
rFormat, sal_uInt16 nPart );
 SAL_DLLPRIVATE void WriteCurrencyElement_Impl( const OUString& rString,
 std::u16string_view rExt );
diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index e33a39deb449..3b45568e7d24 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -3445,6 +3445,7 @@ namespace xmloff::token {
 XML_ZEROS_NUMERATOR_DIGITS,
 XML_ZEROS_DENOMINATOR_DIGITS,
 XML_INTEGER_FRACTION_DELIMITER,
+XML_MAX_BLANK_INTEGER_DIGITS,
 
 // tdf#115319
 XML_REFERENCE_LANGUAGE,
diff --git a/sc/qa/unit/data/contentCSV/testNumberFormats.csv 
b/sc/qa/unit/data/contentCSV/testNumberFormats.csv
new file mode 100644
index ..266f4baa8a46
--- /dev/null
+++ b/sc/qa/unit/data/contentCSV/testNumberFormats.csv
@@ -0,0 +1,32 @@
+;Integer;;;Thousand separator;;;Fraction;;;Fraction + Thousand 
separator;;;Scientific;;;Engineering;;
+Format;"""format=""00";"""format=""??";"""format=""??";"""format=""000,000";"""format=""???,???";"""format=""??0,000";"""format=""000
 ?/?";"""format=""??? ?/?";"""format=""?00 ?/?";"""format=""0,000 
?/?";"""format=""?,??? ?/?";"""format=""?,?00 

[Libreoffice-commits] core.git: include/svl svl/source

[Laurent Balland (via logerrit)]

 include/svl/zformat.hxx |3 +
 svl/source/numbers/zforlist.cxx |   85 +---
 svl/source/numbers/zformat.cxx  |   20 +
 3 files changed, 77 insertions(+), 31 deletions(-)

New commits:
commit 8ba7657a9653f8ae5d1b865356d11138df7b2093
Author: Laurent Balland 
AuthorDate: Mon Jan 2 18:39:35 2023 +0100
Commit: Eike Rathke 
CommitDate: Mon Jan 30 15:19:19 2023 +

tdf#152722 Number Format: keep NatNum modifiers

When modifying number format with UI (decimal places, negative in red...) 
NatNum modifiers must be preserved
Implement an helper to get NatNum string
As NatNum12 already inserts currency unit, do not treat it

Change-Id: I38be1da08a44d75ef663eaf50fccb3820ff9ed5e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144963
Tested-by: Jenkins
Reviewed-by: Eike Rathke 

diff --git a/include/svl/zformat.hxx b/include/svl/zformat.hxx
index 43f6ad9775f4..ea08234e93a2 100644
--- a/include/svl/zformat.hxx
+++ b/include/svl/zformat.hxx
@@ -459,6 +459,9 @@ public:
 void GetNatNumXml(
 css::i18n::NativeNumberXmlAttributes2& rAttr,
 sal_uInt16 nNumFor ) const;
+/** Return empty string if no NatNum modifier or unvalid nNumFor
+otherwhise return "[NatNum1]" or "[NatNum12 ...]" */
+OUString GetNatNumModifierString( sal_uInt16 nNumFor = 0 ) const;
 
 /** Switches to the first non-"gregorian" calendar, but only if the current
 calendar is "gregorian"; original calendar name and date/time returned,
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index cee75fc9265e..ca8b6524b9e2 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -3231,6 +3231,15 @@ OUString SvNumberFormatter::GenerateFormat(sal_uInt32 
nIndex,
 sString.append(GetNumDecimalSep());
 padToLength(sString, sString.getLength() + nPrecision, '0');
 }
+
+// Native Number
+const OUString sPosNatNumModifier = pFormat ? 
pFormat->GetNatNumModifierString( 0 ) : "";
+const OUString sNegNatNumModifier = pFormat ?
+// if a negative format already exists, use its NatNum modifier
+// else use NatNum modifier of positive format
+( pFormat->GetNumForString( 1, 0 )  ? 
pFormat->GetNatNumModifierString( 1 ) : sPosNatNumModifier )
+: "";
+
 if (eType == SvNumFormatType::PERCENT)
 {
 sString.append( pFormat->GetPercentString() );
@@ -3254,50 +3263,62 @@ OUString SvNumberFormatter::GenerateFormat(sal_uInt32 
nIndex,
 OUString aCurr;
 const NfCurrencyEntry* pEntry;
 bool bBank;
-if ( GetNewCurrencySymbolString( nIndex, aCurr, ,  ) )
+bool isPosNatNum12 = sPosNatNumModifier.startsWith( "[NatNum12" );
+bool isNegNatNum12 = sNegNatNumModifier.startsWith( "[NatNum12" );
+if ( !isPosNatNum12 || !isNegNatNum12 )
 {
-if ( pEntry )
+if ( GetNewCurrencySymbolString( nIndex, aCurr, ,  ) )
 {
-sal_uInt16 nPosiForm = 
NfCurrencyEntry::GetEffectivePositiveFormat(
-xLocaleData->getCurrPositiveFormat(),
-pEntry->GetPositiveFormat(), bBank );
-sal_uInt16 nNegaForm = 
NfCurrencyEntry::GetEffectiveNegativeFormat(
-xLocaleData->getCurrNegativeFormat(),
-pEntry->GetNegativeFormat(), bBank );
-pEntry->CompletePositiveFormatString( sString, bBank, 
nPosiForm );
-pEntry->CompleteNegativeFormatString( sNegStr, bBank, 
nNegaForm );
+if ( pEntry )
+{
+sal_uInt16 nPosiForm = 
NfCurrencyEntry::GetEffectivePositiveFormat(
+xLocaleData->getCurrPositiveFormat(),
+pEntry->GetPositiveFormat(), bBank );
+sal_uInt16 nNegaForm = 
NfCurrencyEntry::GetEffectiveNegativeFormat(
+xLocaleData->getCurrNegativeFormat(),
+pEntry->GetNegativeFormat(), bBank );
+if ( !isPosNatNum12 )
+pEntry->CompletePositiveFormatString( sString, bBank, 
nPosiForm );
+if ( !isNegNatNum12 )
+pEntry->CompleteNegativeFormatString( sNegStr, bBank, 
nNegaForm );
+}
+else
+{   // assume currency abbreviation (AKA banking symbol), not 
symbol
+sal_uInt16 nPosiForm = 
NfCurrencyEntry::GetEffectivePositiveFormat(
+xLocaleData->getCurrPositiveFormat(),
+xLocaleData->getCurrPositiveFormat(), true );
+sal_uInt16 nNegaForm = 
NfCurrencyEntry::GetEffectiveNegativeFormat(
+xLocaleData->getCurrNegativeFormat(),
+xLocaleData->getCurrNegativeFormat(), true );
+   

[Libreoffice-commits] core.git: extras/README.md

[Laurent Balland (via logerrit)]

 extras/README.md |   47 +--
 1 file changed, 17 insertions(+), 30 deletions(-)

New commits:
commit b4b4c53cf95142e450363ad241d7c65c62381b87
Author: Laurent Balland 
AuthorDate: Sat Sep 24 11:02:46 2022 +0200
Commit: Laurent Balland 
CommitDate: Tue Nov 1 19:59:31 2022 +0100

Update extras/README

Follow-up of simplifications of makefiles by Christian
and new merge makefiles for all templates

Change-Id: I37b81f1371c306c26dd2009835a616dab37ee726
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140537
Tested-by: Jenkins
Reviewed-by: Laurent Balland 

diff --git a/extras/README.md b/extras/README.md
index 7a4b34c798b0..4c5fbdd2da2b 100644
--- a/extras/README.md
+++ b/extras/README.md
@@ -24,35 +24,22 @@ Contains templates, clipart galleries, palettes, symbol 
font, autocorrections, a
+ in `extras/CustomTarget_autotextshare.mk`:
+ add all files of autotext in `extras_AUTOTEXTSHARE_XMLFILES`
 
-+ How-to add a new Impress template
++ How-to add a new template category
+   + add long category name in TEMPLATE_LONG_NAMES_ARY in 
sfx2/inc/doctempl.hrc
+   + add short category name in TEMPLATE_SHORT_NAMES_ARY in 
sfx2/source/doc/doctemplates.cxx
+
++ How-to add a new template to an existing category
+ clean-up template file as indicated on wiki 

+   + recommendation for settings.xml are given on wiki 

+ add `Foo` in `meta.xml` to make presentation 
name translatable
-   + unzip `Foo.otp` file in `extras/source/templates/presnt/Foo` (no 
space allowed in any file names)
-   + add `Foo.otp` in `Package_tplpresnt.mk`
-   + in `CustomTarget_tplpresnt.mk`:
-   + add `Foo /` in `extras_TEMPLATES_PRESENTATIONS`
-   + add files names contained in `Foo.otp` (except mimetype) in 
`extras_PRESENTATIONS_XMLFILES`
-   + if `Foo.otp` contains files with other extension than `.xml`, 
`.svm`, `.svg`, `.png` and `.jpg`
-   + add a `CPY` call at the end of file
-
-+ How-to add a new Writer template
-   + clean-up template file as much as possible, and choose a template 
category ``
-   + unzip `Foo.ott` in `extras/source/templates//Foo` (no space 
allowed in any file names)
-   + add `Foo.ott` in `Package_.mk`
-   + in `CustomTarget_.mk`:
-   + add `Foo /` in `extras_TEMPLATES_`
-   + add files names contained in `Foo.otp` (except mimetype) in 
`extras__XMLFILES`
-   + if `Foo.ott` contains files with other extension than `.xml`, 
`.rdf`, `.svm`, `.svg`, `.png` and `.jpg`
-   + add a `CPY` call at the end of file
-
-+ How-to add a new template category
-   + create a directory `extras/source/templates/foo/`
-   + unzip your foo0.ott template files in 
`extras/source/templates/foo/foo0`
-   + add `Package_tplfoo` and `CustomTarget_tplfoo` in `Module_extras.mk`
-   + use other category `Package_tplcategory.mk` to create 
`Package_tplfoo.mk`
-   + use other category `CustomTarget_tplcategory.mk` to create 
`CustomTarget_tplfoo.mk`
-   + replace all category by foo and `CATEGORY` by `FOO`
-   + add all files contained in `foo0.ott` (except mimetype) in 
`extras_FOO_XMLFILES`
-   + if `foo0.ott` contains files with other extension than 
`.xml`, `.rdf`, `.svm`, `.svg`, `.png` and `.jpg`
-   + add a `CPY` call at the end of the file
-   + optionally, replace extension ott (4 places)
+   + choose a template category ``
+   + unzip `Foo.ot?` (? = p, t, s or g) in 
`extras/source/templates//Foo` (no space allowed in any file names)
+   + add `/Foo.ot? /` in `Package_templates.mk` (or 
`Package_tplpresnt.mk` if it's a presentation)
+   + in `CustomTarget_templates.mk` (or `CustomTarget_tplpresnt.mk` if 
it's a presentation):
+   + add `/Foo/meta.xml /` and all files which are not 
automatically added in `extras_TEMPLATES_XMLFILES` (or 
`extras_PRESENTATIONS_XMLFILES` for presentation)
+   + for translation of template name
+   + define a new STR_TEMPLATE_NAMExx in include/sfx2/strings.hrc
+   + define a new STR_TEMPLATE_NAMExx_DEF in sfx2/inc/strings.hxx
+   + in sfx2/source/doc/doctempl.cxx
+   + add STR_TEMPLATE_NAMExx_DEF to aTemplateNames
+   + add STR_TEMPLATE_NAMExx to STR_TEMPLATE_NAME

[Libreoffice-commits] core.git: extras/source

[Laurent Balland (via logerrit)]

 extras/source/shellnew/soffice.odg |binary
 extras/source/shellnew/soffice.odp |binary
 extras/source/shellnew/soffice.ods |binary
 extras/source/shellnew/soffice.odt |binary
 4 files changed

New commits:
commit 567b4281b96f56ce48d3feb57522255b06816f9b
Author: Laurent Balland 
AuthorDate: Sat Sep 24 12:07:26 2022 +0200
Commit: Mike Kaganski 
CommitDate: Sun Sep 25 16:21:15 2022 +0200

tdf#139962 make shellnew files 0-bytes

To use implementation of tdf#139991, shellnew/soffice.* are now 0-bytes
files

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

diff --git a/extras/source/shellnew/soffice.odg 
b/extras/source/shellnew/soffice.odg
index 49fa7436a8cd..e69de29bb2d1 100644
Binary files a/extras/source/shellnew/soffice.odg and 
b/extras/source/shellnew/soffice.odg differ
diff --git a/extras/source/shellnew/soffice.odp 
b/extras/source/shellnew/soffice.odp
index f97540d868ce..e69de29bb2d1 100644
Binary files a/extras/source/shellnew/soffice.odp and 
b/extras/source/shellnew/soffice.odp differ
diff --git a/extras/source/shellnew/soffice.ods 
b/extras/source/shellnew/soffice.ods
index acb7e250eb42..e69de29bb2d1 100644
Binary files a/extras/source/shellnew/soffice.ods and 
b/extras/source/shellnew/soffice.ods differ
diff --git a/extras/source/shellnew/soffice.odt 
b/extras/source/shellnew/soffice.odt
index d2a8dc274c6c..e69de29bb2d1 100644
Binary files a/extras/source/shellnew/soffice.odt and 
b/extras/source/shellnew/soffice.odt differ

[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - helpcontent2

[Laurent Balland (via logerrit)]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 50e5d92a8a2cc8cdd972e0b602ccc31d4afdd72c
Author: Laurent Balland 
AuthorDate: Sun Jul 17 23:03:12 2022 -0300
Commit: Gerrit Code Review 
CommitDate: Mon Jul 18 04:03:12 2022 +0200

Update git submodules

* Update helpcontent2 from branch 'libreoffice-7-4'
  to 3aa14c1380baae3f739cddfde106764192c1bcb7
  - Update tdf#129679

Remove Apache license as it is a new file


Change-Id: I9cf2b707d32772017ab56f093115419ca020398a
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/136106
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 76523322affd4d47952dfcfe0a6822c3d746ffa5)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/136984
Reviewed-by: Martin Srebotnjak 
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/helpcontent2 b/helpcontent2
index 344b7233a1d0..3aa14c1380ba 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 344b7233a1d0e8ac4178fac064a76f0e746c11c5
+Subproject commit 3aa14c1380baae3f739cddfde106764192c1bcb7

[Libreoffice-commits] help.git: Branch 'libreoffice-7-4' - source/text

[Laurent Balland (via logerrit)]

 source/text/scalc/01/0222.xhp |   23 +++
 1 file changed, 7 insertions(+), 16 deletions(-)

New commits:
commit 3aa14c1380baae3f739cddfde106764192c1bcb7
Author: Laurent Balland 
AuthorDate: Sun Jun 19 15:38:09 2022 -0300
Commit: Adolfo Jayme Barrientos 
CommitDate: Mon Jul 18 04:03:09 2022 +0200

Update tdf#129679

Remove Apache license as it is a new file


Change-Id: I9cf2b707d32772017ab56f093115419ca020398a
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/136106
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 76523322affd4d47952dfcfe0a6822c3d746ffa5)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/136984
Reviewed-by: Martin Srebotnjak 
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/source/text/scalc/01/0222.xhp 
b/source/text/scalc/01/0222.xhp
index ef5aadf30..8d5ae097c 100644
--- a/source/text/scalc/01/0222.xhp
+++ b/source/text/scalc/01/0222.xhp
@@ -1,21 +1,12 @@
 
 
+* 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/.
+*
+-->
 
 
 

[Libreoffice-commits] core.git: helpcontent2

[Laurent Balland (via logerrit)]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6cbe52d4e90a21495ea20a82e31afb2b19d13377
Author: Laurent Balland 
AuthorDate: Sun Jun 19 15:41:54 2022 -0300
Commit: Gerrit Code Review 
CommitDate: Sun Jun 19 20:41:54 2022 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 76523322affd4d47952dfcfe0a6822c3d746ffa5
  - Update tdf#129679

Remove Apache license as it is a new file
Add some details.

Change-Id: I9cf2b707d32772017ab56f093115419ca020398a
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/136106
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index dc1fab4011de..76523322affd 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit dc1fab4011de88f60e5b8e6a3269971046e25c11
+Subproject commit 76523322affd4d47952dfcfe0a6822c3d746ffa5

[Libreoffice-commits] help.git: source/text

[Laurent Balland (via logerrit)]

 source/text/scalc/01/0222.xhp |   77 +-
 1 file changed, 36 insertions(+), 41 deletions(-)

New commits:
commit 76523322affd4d47952dfcfe0a6822c3d746ffa5
Author: Laurent Balland 
AuthorDate: Sun Jun 19 15:38:09 2022 -0300
Commit: Olivier Hallot 
CommitDate: Sun Jun 19 20:41:49 2022 +0200

Update tdf#129679

Remove Apache license as it is a new file
Add some details.

Change-Id: I9cf2b707d32772017ab56f093115419ca020398a
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/136106
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/scalc/01/0222.xhp 
b/source/text/scalc/01/0222.xhp
index ef5aadf30..914d3f12a 100644
--- a/source/text/scalc/01/0222.xhp
+++ b/source/text/scalc/01/0222.xhp
@@ -1,47 +1,42 @@
 
 
+* 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/.
+*
+-->
 
-
-
-Go to Sheet
-/text/scalc/01/0222.xhp
-
-
-LibreOffice
-
-
-
-
-
-
-
-Go to sheet
-jump; to given sheet
-sheet; go to directly
-sheet; search and go to
-
-Go to Sheet
-  Go to a 
specified sheet.
+  
+
+  Go to Sheet
+  /text/scalc/01/0222.xhp
+
+
+  LibreOffice
+
+  
+  
+  
+  
+  
+Go to sheet
+jump; to given sheet
+sheet; go to directly
+sheet; search and go to
+  
+  
+Go to 
Sheet
+Go to a 
specified sheet.
+  
+  
+Choose 
Sheet - Navigate - Go To Sheet.
+  
   
-Type a sheet name
-  Type some characters contained in the searched sheet 
name. List of sheets will be limited to the sheet names containing these 
characters.
-Sheets
+  Type a sheet name
+  Type some characters contained in the searched sheet 
name. List of sheets will be limited to the sheet names containing these 
characters. Search is case sensitive. If empty, all visible sheets are 
listed.
+  Sheets
   Lists the sheets in the current document. Hidden sheets 
are not listed. To select a sheet, press the up or down arrow keys to move to a 
sheet in the list. Double click on a name will directly jump to this 
sheet.
- 
+