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

[Bjoern Michaelsen (via logerrit)]

 sw/inc/swtable.hxx   |1 
 sw/source/core/doc/DocumentFieldsManager.cxx |2 -
 sw/source/core/docnode/ndtbl.cxx |6 
 sw/source/core/table/swtable.cxx |   35 +++
 4 files changed, 38 insertions(+), 6 deletions(-)

New commits:
commit 7c680a96122f7f90114932ef5fdb48328c327268
Author: Bjoern Michaelsen 
AuthorDate: Tue Mar 7 01:28:56 2023 +0100
Commit: Bjoern Michaelsen 
CommitDate: Mon Mar 27 06:20:28 2023 +

refactor table merge

Change-Id: Ia4d5b3fc04cc032a182b4bf7f7570fc250ed8504
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148739
Tested-by: Jenkins
Reviewed-by: Bjoern Michaelsen 

diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx
index 39e54edb2f33..f40059e3c986 100644
--- a/sw/inc/swtable.hxx
+++ b/sw/inc/swtable.hxx
@@ -365,6 +365,7 @@ public:
 { UpdateFields(TBL_RELBOXNAME); };
 void SwitchFormulasToInternalRepresentation()
 { UpdateFields(TBL_BOXPTR); }
+void Merge(SwTable& rTable, SwHistory* pHistory);
 
 void dumpAsXml(xmlTextWriterPtr pWriter) const;
 };
diff --git a/sw/source/core/doc/DocumentFieldsManager.cxx 
b/sw/source/core/doc/DocumentFieldsManager.cxx
index a395dc352392..3ba8c6314cea 100644
--- a/sw/source/core/doc/DocumentFieldsManager.cxx
+++ b/sw/source/core/doc/DocumentFieldsManager.cxx
@@ -602,7 +602,7 @@ void DocumentFieldsManager::UpdateTableFields( SfxPoolItem* 
pHt )
 if(pHt && RES_TABLEFML_UPDATE == pHt->Which())
 pUpdateField = static_cast(pHt);
 assert(!pHt || pUpdateField);
-assert(!pUpdateField || pUpdateField->m_eFlags == TBL_CALC || 
pUpdateField->m_eFlags == TBL_SPLITTBL || pUpdateField->m_eFlags == 
TBL_MERGETBL);
+assert(!pUpdateField || pUpdateField->m_eFlags == TBL_CALC || 
pUpdateField->m_eFlags == TBL_SPLITTBL);
 auto pFieldType = GetFieldType( SwFieldIds::Table, OUString(), false );
 if(pFieldType && (!pUpdateField || pUpdateField->m_eFlags == TBL_CALC))
 {
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 9f0a89ccad51..4526721a3250 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -3471,11 +3471,7 @@ bool SwDoc::MergeTable( const SwPosition& rPos, bool 
bWithPrev )
 }
 
 // Adapt all "TableFormulas"
-SwTableFormulaUpdate aMsgHint( &pTableNd->GetTable() );
-aMsgHint.m_aData.pDelTable = &pDelTableNd->GetTable();
-aMsgHint.m_eFlags = TBL_MERGETBL;
-aMsgHint.m_pHistory = pHistory.get();
-getIDocumentFieldsAccess().UpdateTableFields( &aMsgHint );
+pTableNd->GetTable().Merge(pDelTableNd->GetTable(), pHistory.get());
 
 // The actual merge
 bool bRet = rNds.MergeTable( bWithPrev ? *pTableNd : *pDelTableNd, 
!bWithPrev );
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index 867e76deed1c..96d3b4903255 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -62,6 +62,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #ifdef DBG_UTIL
 #define CHECK_TABLE(t) (t).CheckConsistency();
@@ -1613,6 +1614,40 @@ bool SwTable::IsDeleted() const
 return true;
 }
 
+void SwTable::Merge(SwTable& rTable, SwHistory* pHistory)
+{
+SwTableFormulaUpdate aHint(this);
+aHint.m_aData.pDelTable = &rTable;
+aHint.m_eFlags = TBL_MERGETBL;
+aHint.m_pHistory = pHistory;
+// process all table box formulas
+for(SfxPoolItem* pItem : 
GetFrameFormat()->GetDoc()->GetAttrPool().GetItemSurrogates(RES_BOXATR_FORMULA))
+{
+auto pBoxFormula = pItem->DynamicWhichCast(RES_BOXATR_FORMULA);
+assert(pBoxFormula);
+if(pBoxFormula->GetDefinedIn())
+{
+const SwNode* pNd = pBoxFormula->GetNodeOfFormula();
+// for a history record the unchanged formula is needed
+SwTableBoxFormula aCopy(*pBoxFormula);
+aHint.m_bModified = false;
+pBoxFormula->ToSplitMergeBoxNm(aHint);
+
+if(aHint.m_bModified)
+{
+// external rendering
+aCopy.PtrToBoxNm(this);
+aHint.m_pHistory->Add(
+&aCopy,
+&aCopy,
+pNd->FindTableBoxStartNode()->GetIndex());
+}
+}
+else
+pBoxFormula->ToSplitMergeBoxNm(aHint);
+}
+}
+
 void SwTable::UpdateFields(TableFormulaUpdateFlags eFlags)
 {
 auto pDoc = GetFrameFormat()->GetDoc();

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

[Rafael Lima (via logerrit)]

 sc/inc/scfuncs.hrc |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 998882138adf693b04a2061714fcc33646619912
Author: Rafael Lima 
AuthorDate: Mon Mar 27 00:07:29 2023 +
Commit: Adolfo Jayme Barrientos 
CommitDate: Mon Mar 27 04:25:17 2023 +

tdf#151309 Fix the use of t-test in the UI

As discussed in the ticket, we should use "t-test" instead of "T test".

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

diff --git a/sc/inc/scfuncs.hrc b/sc/inc/scfuncs.hrc
index 0e9d2b04ea12..cfb55d2be8bb 100644
--- a/sc/inc/scfuncs.hrc
+++ b/sc/inc/scfuncs.hrc
@@ -3002,7 +3002,7 @@ const TranslateId SC_OPCODE_F_TEST_MS_ARY[] =
 // -=*# Resource for function TTEST #*=-
 const TranslateId SC_OPCODE_T_TEST_ARY[] =
 {
-NC_("SC_OPCODE_T_TEST", "Calculates the T test."),
+NC_("SC_OPCODE_T_TEST", "Calculates the t-test."),
 NC_("SC_OPCODE_T_TEST", "Data 1"),
 NC_("SC_OPCODE_T_TEST", "The first record array."),
 NC_("SC_OPCODE_T_TEST", "Data 2"),
@@ -3010,13 +3010,13 @@ const TranslateId SC_OPCODE_T_TEST_ARY[] =
 NC_("SC_OPCODE_T_TEST", "Mode"),
 NC_("SC_OPCODE_T_TEST", "Mode specifies the number of distribution tails 
to return. 1 = one-tailed, 2 = two-tailed distribution"),
 NC_("SC_OPCODE_T_TEST", "Type"),
-NC_("SC_OPCODE_T_TEST", "The type of the T test.")
+NC_("SC_OPCODE_T_TEST", "The type of the t-test.")
 };
 
 // -=*# Resource for function T.TEST #*=-
 const TranslateId SC_OPCODE_T_TEST_MS_ARY[] =
 {
-NC_("SC_OPCODE_T_TEST_MS", "Calculates the T test."),
+NC_("SC_OPCODE_T_TEST_MS", "Calculates the t-test."),
 NC_("SC_OPCODE_T_TEST_MS", "Data 1"),
 NC_("SC_OPCODE_T_TEST_MS", "The first record array."),
 NC_("SC_OPCODE_T_TEST_MS", "Data 2"),
@@ -3024,7 +3024,7 @@ const TranslateId SC_OPCODE_T_TEST_MS_ARY[] =
 NC_("SC_OPCODE_T_TEST_MS", "Mode"),
 NC_("SC_OPCODE_T_TEST_MS", "Mode specifies the number of distribution 
tails to return. 1 = one-tailed, 2 = two-tailed distribution"),
 NC_("SC_OPCODE_T_TEST_MS", "Type"),
-NC_("SC_OPCODE_T_TEST_MS", "The type of the T test.")
+NC_("SC_OPCODE_T_TEST_MS", "The type of the t-test.")
 };
 
 // -=*# Resource for function RSQ #*=-

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

[Jim Raykowski (via logerrit)]

 vcl/source/control/tabctrl.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit e0daa98a802cc1f84ceb0f306f5d15fecabd62c1
Author: Jim Raykowski 
AuthorDate: Sat Mar 25 17:52:24 2023 -0800
Commit: Jim Raykowski 
CommitDate: Sun Mar 26 23:47:55 2023 +

tdf#126632 tdf#152908 Resize the notebook bar on context change

For other than gtk vcl backend the tabbed compact toolbar tabs do not
repaint correctly when the 'Table' tab is active and the cursor is move
outside of the table. This patch adds a Resize after the context is set
to make the tabs always show as expected.

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

diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index b2f86b3cd9a5..8cf999814820 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -2312,6 +2312,11 @@ void NotebookbarTabControlBase::SetContext( 
vcl::EnumContext::Context eContext )
 if (!bHandled)
 bLastContextWasSupported = false;
 eLastContext = eContext;
+
+// tdf#152908 Tabbed compact toolbar does not repaint itself when tabs 
getting removed
+// For unknown reason this is needed by the tabbed compact toolbar for 
other than gtk
+// vcl backends.
+Resize();
 }
 
 void NotebookbarTabControlBase::dispose()

[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-7-3' - 12 commits - configure.ac connectivity/source download.lst external/curl external/hsqldb formula/source RepositoryExternal.mk sc/source

[Andras Timar (via logerrit)]

 RepositoryExternal.mk |3 --
 configure.ac  |2 -
 connectivity/source/drivers/hsqldb/HDriver.cxx|   31 ++
 download.lst  |   16 +--
 external/curl/asan-poison-nsspem.patch.0  |2 -
 external/curl/curl-nss.patch.1|6 ++--
 external/hsqldb/UnpackedTarball_hsqldb.mk |1 
 external/hsqldb/patches/disable-dump-script.patch |   14 +
 formula/source/core/api/token.cxx |   13 +++--
 sc/source/core/inc/interpre.hxx   |   12 
 sc/source/core/tool/interpr1.cxx  |4 +-
 sc/source/core/tool/interpr3.cxx  |4 +-
 sc/source/core/tool/interpr4.cxx  |   10 ++-
 13 files changed, 90 insertions(+), 28 deletions(-)

New commits:
commit 6f8d96fb45a1aeed23320b329eb84f973332bb4d
Author: Andras Timar 
AuthorDate: Sun Mar 26 21:23:07 2023 +0200
Commit: Andras Timar 
CommitDate: Sun Mar 26 23:08:44 2023 +0200

Bump version to 7.3.7.2.M3

Change-Id: I558140c9cdd2cba55f0164db51686d0b972d66ae

diff --git a/configure.ac b/configure.ac
index 93758ed6b508..fac7acde7c2b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[7.3.7.2.M2],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.3.7.2.M3],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard
commit efb5a7cbe0729461ba51112cadd75237cf71ca2e
Author: Michael Stahl 
AuthorDate: Tue Mar 21 10:46:46 2023 +0100
Commit: Andras Timar 
CommitDate: Sun Mar 26 23:08:44 2023 +0200

curl: upgrade to release 8.0.1

Apparently 8.0.0 had a serious regression.

Change-Id: Icc761f5e5e01b5d9bebecc13f7cba608f5834f54
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149212
Tested-by: Andras Timar 
Reviewed-by: Andras Timar 

diff --git a/download.lst b/download.lst
index 2dbcb9871974..48cc3bc01199 100644
--- a/download.lst
+++ b/download.lst
@@ -37,8 +37,8 @@ export CPPUNIT_SHA256SUM := 
89c5c6665337f56fd2db36bc3805a5619709d51fb136e5193707
 export CPPUNIT_TARBALL := cppunit-1.15.1.tar.gz
 export CT2N_SHA256SUM := 
71b238efd2734be9800af07566daea8d6685aeed28db5eb5fa0e6453f4d85de3
 export CT2N_TARBALL := 
1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt
-export CURL_SHA256SUM := 
759690f9a375a720f8bcce9f953897b0d93f31eed9649b74f846d54bbf63bbcc
-export CURL_TARBALL := curl-8.0.0.tar.xz
+export CURL_SHA256SUM := 
0a381cd82f4d00a9a334438b8ca239afea5bfefcfa9a1025f2bf118e79e0b5f0
+export CURL_TARBALL := curl-8.0.1.tar.xz
 export EBOOK_SHA256SUM := 
7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9
 export EBOOK_TARBALL := libe-book-0.1.3.tar.xz
 export EPOXY_SHA256SUM := 
a7ced37f4102b745ac86d6a70a9da399cc139ff168ba6b8002b4d8d43c900c15
commit 93c5b2a3fb67611c2a985e59216c047bcdc4a6d8
Author: Michael Stahl 
AuthorDate: Mon Mar 20 11:52:22 2023 +0100
Commit: Andras Timar 
CommitDate: Sun Mar 26 23:08:44 2023 +0200

curl: upgrade to release 8.0.0

Fixes CVE-2023-27535.

Also hopefully fixes excessive storage consumption during build:
o build: drop the use of XC_AMEND_DISTCLEAN [62]

Change-Id: I8792e95bc7634ee496488e80fec5a1310b24a31c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149153
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149211
Tested-by: Andras Timar 
Reviewed-by: Andras Timar 

diff --git a/download.lst b/download.lst
index 24692deee9d0..2dbcb9871974 100644
--- a/download.lst
+++ b/download.lst
@@ -37,8 +37,8 @@ export CPPUNIT_SHA256SUM := 
89c5c6665337f56fd2db36bc3805a5619709d51fb136e5193707
 export CPPUNIT_TARBALL := cppunit-1.15.1.tar.gz
 export CT2N_SHA256SUM := 
71b238efd2734be9800af07566daea8d6685aeed28db5eb5fa0e6453f4d85de3
 export CT2N_TARBALL := 
1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt
-export CURL_SHA256SUM := 
1dae31b2a7c1fe269de99c0c31bb488346aab3459b5ffca909d6938249ae415f
-export CURL_TARBALL := curl-7.88.1.tar.xz
+export CURL_SHA256SUM := 
759690f9a375a720f8bcce9f953897b0d93f31eed9649b74f846d54bbf63bbcc
+export CURL_TARBALL := curl-8.0.0.tar.xz
 export EBOOK_SHA256SUM := 
7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9
 export EBOOK_TARBALL := libe-book-0.1.3.tar.xz
 export EPOXY_SHA256SUM := 
a7ced37f4102b745ac86d6a70a9da399cc139ff168ba6b8002b4d8d43c900c15
commit 8929a3d0ca095460ca46ed0319b92556456c9c44
Author: Taichi

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot (via logerrit)]

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

New commits:
commit 9917f1fa0e159b8d237639a99335b4cdb5e4fdc2
Author: Olivier Hallot 
AuthorDate: Sun Mar 26 17:50:47 2023 -0300
Commit: Gerrit Code Review 
CommitDate: Sun Mar 26 20:50:47 2023 +

Update git submodules

* Update helpcontent2 from branch 'master'
  to 802dff23502b199e496847b3091a557e8e4c793b
  - tdf#154364 (part) refactor "related topics" for simpress

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

diff --git a/helpcontent2 b/helpcontent2
index 7484a8aa5d9f..802dff23502b 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 7484a8aa5d9f1350d4272aa3a1ed894cc05e102e
+Subproject commit 802dff23502b199e496847b3091a557e8e4c793b

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

[Olivier Hallot (via logerrit)]

 source/text/simpress/01/0310.xhp |   13 --
 source/text/simpress/01/0604.xhp |6 +++-
 source/text/simpress/01/13180100.xhp |   10 ---
 source/text/simpress/01/13180200.xhp |   10 ---
 source/text/simpress/01/13180300.xhp |   10 ---
 source/text/simpress/02/0407.xhp |   29 +--
 source/text/simpress/02/1009.xhp |8 +++---
 source/text/simpress/02/1303.xhp |6 ++--
 source/text/simpress/guide/animated_gif_save.xhp |8 +++---
 source/text/simpress/guide/change_scale.xhp  |6 +++-
 source/text/simpress/guide/html_import.xhp   |8 +++---
 source/text/simpress/guide/line_arrow_styles.xhp |   13 +-
 source/text/simpress/guide/main.xhp  |   12 +
 source/text/simpress/guide/move_object.xhp   |8 +++---
 source/text/simpress/guide/print_tofit.xhp   |8 +++---
 source/text/simpress/guide/select_object.xhp |8 +++---
 source/text/simpress/guide/table_insert.xhp  |8 +++---
 17 files changed, 96 insertions(+), 75 deletions(-)

New commits:
commit 802dff23502b199e496847b3091a557e8e4c793b
Author: Olivier Hallot 
AuthorDate: Sun Mar 26 17:47:34 2023 -0300
Commit: Olivier Hallot 
CommitDate: Sun Mar 26 20:50:46 2023 +

tdf#154364 (part) refactor "related topics" for simpress

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

diff --git a/source/text/simpress/01/0310.xhp 
b/source/text/simpress/01/0310.xhp
index 88be4306a0..197401dbcc 100644
--- a/source/text/simpress/01/0310.xhp
+++ b/source/text/simpress/01/0310.xhp
@@ -24,10 +24,7 @@
 /text/simpress/01/0310.xhp
   
 
-
 
-
-
 
 
 
@@ -39,9 +36,11 @@
 
 
 
-
-
-
+
+
+  
+  
+
 
 
-
\ No newline at end of file
+
diff --git a/source/text/simpress/01/0604.xhp 
b/source/text/simpress/01/0604.xhp
index dc0fe82fd5..1bfd3838ba 100644
--- a/source/text/simpress/01/0604.xhp
+++ b/source/text/simpress/01/0604.xhp
@@ -73,8 +73,10 @@
 Shows the current slide transition as a preview.
 Automatic preview
 Select to see the slide transitions automatically in the 
document.
-
-
+
+
+  
 
+
 
 
diff --git a/source/text/simpress/01/13180100.xhp 
b/source/text/simpress/01/13180100.xhp
index 3216d1e042..f5a7612a9c 100644
--- a/source/text/simpress/01/13180100.xhp
+++ b/source/text/simpress/01/13180100.xhp
@@ -30,8 +30,8 @@
 
 
 
-  
-  
+
+
   
 
 Merge
@@ -41,7 +41,9 @@
   
 
   Any spaces 
that are visible between the objects are preserved.
-  
-  
+
+
+  
+  
  
 
diff --git a/source/text/simpress/01/13180200.xhp 
b/source/text/simpress/01/13180200.xhp
index 4a7432edab..a3cb6263be 100644
--- a/source/text/simpress/01/13180200.xhp
+++ b/source/text/simpress/01/13180200.xhp
@@ -30,8 +30,8 @@
 
 
 
-  
-  
+
+
   
 
 Subtract
@@ -41,7 +41,9 @@
   
 
   Any spaces 
between the objects are preserved.
-  
-  
+
+
+  
+  
  
 
diff --git a/source/text/simpress/01/13180300.xhp 
b/source/text/simpress/01/13180300.xhp
index 0ad5e9f864..ea1fca63ae 100644
--- a/source/text/simpress/01/13180300.xhp
+++ b/source/text/simpress/01/13180300.xhp
@@ -30,8 +30,8 @@
 
 
 
-  
-  
+
+
   
 
 Intersect
@@ -40,7 +40,9 @@
   
   
 
-  
-  
+
+
+
+  
  
 
diff --git a/source/text/simpress/02/0407.xhp 
b/source/text/simpress/02/0407.xhp
index e62910c64e..0dab58d21a 100644
--- a/source/text/simpress/02/0407.xhp
+++ b/source/text/simpress/02/0407.xhp
@@ -1,6 +1,4 @@
 
-
-
 
-
-   
 
 
 
-Rehearse Timings
+Rehearse Timings
 /text/simpress/02/0407.xhp
 
 
@@ -32,27 +28,26 @@
 
 
 
-
+
 Rehearse 
Timings
-Starts a slide show with a timer in the lower left 
corner.
+Starts a slide show with a timer in the lower left 
corner.
 
 
 
 
-
-
-Icon
-   
+
+
+Icon Rehearse 
Timings
 
-
-Rehearse 
Timings
+
+Rehearse Timings
 
 
 
-
 
-
-
-Slide Show Settings
+
+   
+Slide Show Settings
+
 
 
diff --git a/source/text/simpress/02/1009.xhp 
b/source/text/simpress/02/1009.xhp
index fe3c17bec8..f1828eb81f 100644
--- a/source/text/simpress/02/1009.xhp
+++ b/source/text/simpress/02/1009.xhp
@@ -162,7 +162,9 @@
   
 
   
-  
-  
+
+  
+
+  
 
-
\ No newline at end of file
+
diff --git a/source/text/simpress/02/1303.xhp 
b/source/text/simpress/02/1303.xhp
index 2e16786f26..cfe4958c20 100644
--- a/source/text/simpress/02/1303.xhp
+++ b/source/text/simpress/02/1303.xhp
@@ -48,9 +48,9 @@
 
 
 
-
-
-
+
+   
 
+
 
 
diff --git a/source/text/simpress/guide/animated_gif_save.xhp 
b/source/text/simpress/guide/animated_gif_save.xhp
index fa58b31303..5cb5d387c9 100644
--- a/source/text/simpress/guide/animated_gif_save.xhp
+++ b/source/text/simpress/guide/animated_gif_save.xhp
@@ -18,7 +18,7 @@
  *   except in compliance with the License. 

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot (via logerrit)]

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

New commits:
commit 98d4732ff7e315f82767be47ea71716f904d6940
Author: Olivier Hallot 
AuthorDate: Sun Mar 26 17:48:41 2023 -0300
Commit: Gerrit Code Review 
CommitDate: Sun Mar 26 20:48:41 2023 +

Update git submodules

* Update helpcontent2 from branch 'master'
  to 7484a8aa5d9f1350d4272aa3a1ed894cc05e102e
  - tdf#154364 (part) refactor "related topics" for smath

+ refactor

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

diff --git a/helpcontent2 b/helpcontent2
index 9c5ba9aeebcf..7484a8aa5d9f 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 9c5ba9aeebcfb261ea59f2a43e489884c04a2e88
+Subproject commit 7484a8aa5d9f1350d4272aa3a1ed894cc05e102e

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

[Olivier Hallot (via logerrit)]

 source/text/smath/guide/align.xhp|   27 +++-
 source/text/smath/guide/keyboard.xhp |   38 ++-
 source/text/smath/guide/newline.xhp  |   19 -
 3 files changed, 42 insertions(+), 42 deletions(-)

New commits:
commit 7484a8aa5d9f1350d4272aa3a1ed894cc05e102e
Author: Olivier Hallot 
AuthorDate: Sun Mar 26 17:13:42 2023 -0300
Commit: Olivier Hallot 
CommitDate: Sun Mar 26 20:48:41 2023 +

tdf#154364 (part) refactor "related topics" for smath

+ refactor

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

diff --git a/source/text/smath/guide/align.xhp 
b/source/text/smath/guide/align.xhp
index e8a14c28b3..60c4aeca75 100644
--- a/source/text/smath/guide/align.xhp
+++ b/source/text/smath/guide/align.xhp
@@ -1,6 +1,4 @@
 
-
-
 
-
 
 
 
-Manually Aligning Formula Parts
+Manually Aligning Formula Parts
 /text/smath/guide/align.xhp
 
 
@@ -30,18 +27,20 @@
 
 
 
-aligning; characters in %PRODUCTNAME 
Math
+aligning; 
characters in %PRODUCTNAME Math
 formula parts; manually aligning
 
-Manually 
Aligning Formula Parts
-
+Manually Aligning Formula Parts
+
 How do you align characters in $[officename] Math 
quickly and easily?
-To accomplish 
this, you must define empty groups and character strings. They do not require 
any space, but carry information that helps in the alignment 
process.
-To create 
empty groups, enter curly brackets {} in the Commands window. In 
the following example, the goal is to achieve a line break so that the plus 
signs are beneath one another, even though one less character is entered in the 
upper line:
-a+a+a+{} newline {}{}{}{}{}a+a+a+a
-Empty 
character strings are a simple way to ensure that texts and formulas are 
left-aligned. They are defined using double inverted commas "" . Make sure you 
do not use any typographic inverted commas. Example:
-"A further 
example." newline a+b newline ""c-d
-
-
+To accomplish this, you must 
define empty groups and character strings. They do not require any space, but 
carry information that helps in the alignment process.
+To create empty groups, enter 
curly brackets {} in the Commands window. In the following 
example, the goal is to achieve a line break so that the plus signs are beneath 
one another, even though one less character is entered in the upper 
line:
+a+a+a+{} 
newline {}{}{}{}{}a+a+a+a
+Empty character strings are a 
simple way to ensure that texts and formulas are left-aligned. They are defined 
using double inverted commas "" . Make sure you do not use any typographic 
inverted commas. Example:
+"A further example." newline 
a+b newline ""c-d
+
+
+
+
 
 
diff --git a/source/text/smath/guide/keyboard.xhp 
b/source/text/smath/guide/keyboard.xhp
index 97fdf5f825..67e92c6a7f 100644
--- a/source/text/smath/guide/keyboard.xhp
+++ b/source/text/smath/guide/keyboard.xhp
@@ -20,7 +20,7 @@
 
 
 
-Shortcuts ($[officename] Math 
Accessibility)
+Shortcuts ($[officename] Math Accessibility)
 /text/smath/guide/keyboard.xhp
 
 
@@ -28,45 +28,47 @@
 
 
 
-accessibility; $[officename] Math 
shortcuts
+accessibility; 
$[officename] Math shortcuts
 
-Shortcuts ($[officename] Math 
Accessibility)
-You can 
control $[officename] Math without a mouse.
-Inserting a Formula Directly
-If you want to 
insert a formula into a text document, and you already know the correct 
writing, you can proceed as follows:
+Shortcuts ($[officename] Math 
Accessibility)
+You can control $[officename] 
Math without a mouse.
+Inserting a Formula Directly
+If you want to insert a formula 
into a text document, and you already know the correct writing, you can proceed 
as follows:
 
 
-Write the 
formula into your text
+Write the formula into your 
text
 
 
-Select the 
formula
+Select the formula
 
 
-Choose the 
command Insert - OLE Object - Formula Object.
+Choose the command 
Insert - OLE Object - Formula Object.
 
 
-Inserting a Formula using a Window
+Inserting a Formula using a Window
 
 
-If you want to 
use the $[officename] Math interface to edit a formula, choose the command 
Insert - OLE Object - Formula Object without any text 
selected.
+If you want to use the 
$[officename] Math interface to edit a formula, choose the command 
Insert - OLE Object - Formula Object without any text 
selected.
 
 
-The cursor 
waits in the Commands window and you can type the formula.
+The cursor waits in the Commands 
window and you can type the formula.
 
 
-You can compose 
formulas using the Elements pane. Open it with the menu View - 
Elements if it is not already open.
+You can compose formulas using 
the Elements pane. Open it with the menu View - Elements if it is 
not already open.
 
 
-If the Elements 
pane is open, use F6 to switch from the Commands window to the Elements pane 
and back.
+If the Elements pane is open, 
use F6 to switch from the C

Re: paste html using API

[Zorg]

Thanks

Ok  it seem a goot way

maybe it is obvious but how can i paste the clipboard in my odt without 
using dispatch




Le 26/03/2023 à 21:20, Caolán McNamara a écrit :

On Sun, 2023-03-26 at 12:06 +0200, Zorg wrote:

... We have try using XTransferable but without any success.

I think it should be possible in headless mode to use the clipboard
apis to copy and paste within LibreOffice. But in this case the
clipboard is basically a fake clipboard only for the headless
libreoffice instance, one which doesn't interact with any real system
clipboard.

So for example in your current code I see that copy_with_format copies
into a true X clipboard via xclip so in headless more we can't paste
from there and it has to be non headless to get that to work.

But if the LibreOffice apis to put something into the clipboard are
used then I think it should work to "Paste" within LibreOffice and get
that content back out, even in headless more.

f.e. in this example at
https://ask.libreoffice.org/t/is-there-any-way-to-copy-calc-cell-content-and-paste-something-else/32173/11
there is:

oClip =
ctx.getServiceManager().createInstanceWithContext("com.sun.star.datatra
nsfer.clipboard.SystemClipboard", ctx)
oClip.setContents(transferable, None)

where "transferable" is implemented in that example as something that
only supports "text/plain;charset=utf-16" so if you change
copy_with_format to something that follow the model of the above
example implementation of an XTransferable to set a transferable that
provides the data and its mimetype as text/html I would expect it to
work.

Re: paste html using API

[Caolán McNamara]

On Sun, 2023-03-26 at 12:06 +0200, Zorg wrote:
> ... We have try using XTransferable but without any success.

I think it should be possible in headless mode to use the clipboard
apis to copy and paste within LibreOffice. But in this case the
clipboard is basically a fake clipboard only for the headless
libreoffice instance, one which doesn't interact with any real system
clipboard.

So for example in your current code I see that copy_with_format copies
into a true X clipboard via xclip so in headless more we can't paste
from there and it has to be non headless to get that to work.

But if the LibreOffice apis to put something into the clipboard are
used then I think it should work to "Paste" within LibreOffice and get
that content back out, even in headless more. 

f.e. in this example at
https://ask.libreoffice.org/t/is-there-any-way-to-copy-calc-cell-content-and-paste-something-else/32173/11
there is:

oClip =
ctx.getServiceManager().createInstanceWithContext("com.sun.star.datatra
nsfer.clipboard.SystemClipboard", ctx)
oClip.setContents(transferable, None)

where "transferable" is implemented in that example as something that
only supports "text/plain;charset=utf-16" so if you change
copy_with_format to something that follow the model of the above
example implementation of an XTransferable to set a transferable that
provides the data and its mimetype as text/html I would expect it to
work.

Re: paste html using API

[Zorg]

Hello

Thanks for your help but it won't really help me

it's doesn't matter the language,  I could translate in python.

The main problem is to start from a variable (a html string)

Var1="Lorem Ipsum?Le Lorem Ipsum est 
simplement du faux texte employé dans la composition et la mise en page 
avant impression. Le Lorem Ipsum "


and you want to paste it in a odt and keep the format

If I want to use only headless mode, i must find a solution without 
using the SystemClipboard because the clipboard does not seem to be 
accessible





Le 26/03/2023 à 19:33, Andrew Pitonyak a écrit :

I have no idea if this will be of any use to you or not, but...

I do not generally use the API using Python so I cannot comment on 
using Python.


I have also not used headless mode so I cannot comment on what is and 
is not available other than knowing that dispatches are not available.


Finally, I have done almost nothing using the clipboard, but...

First note that the clipboard should have content of different 
varieties. I assume that you are aware of this because you have a line 
as follows:


 copy_with_format(value, 'text/html')

 And if I look at the clipboard I see this as an available type

   Dim sClipName As String
  Dim oClip As Object
  Dim oFlavors As Variant
  Dim oFlavor As Variant
  Dim i as Integer
  Dim s as String

  sClipName = "com.sun.star.datatransfer.clipboard.SystemClipboard"
  oClip = createUnoService(sClipName)
  oFlavors = oClip.getContents().getTransferDataFlavors()
  s = ""
  For i = LBound(oFlavors) To UBound(oFlavors)
    oFlavor = oFlavors(i)
    s = s & i & " : " & oFlavor.MimeType
    s = s & CHR$(10)
  Next
  MsgBox s


  I see that method defined in this code here:

https://github.com/Probesys/lotemplate/blob/html_formatting/lotemplate/utils.py

  I see that you open a pipe.

  I did some experiments and I am extracting the actual HTML. I assume 
that this is not really what you want, but this is how I extract it 
and display it. I was simply playing around with it out of curiousity.


    Dim sClipName As String
  Dim oClip As Object
  Dim oFlavors As Variant
  Dim oFlavor As Variant
  Dim i as Integer
  Dim idx as Integer
  Dim s as String

  sClipName = "com.sun.star.datatransfer.clipboard.SystemClipboard"
  oClip = createUnoService(sClipName)
  oFlavors = oClip.getContents().getTransferDataFlavors()
  s = ""
  idx = -1
  For i = LBound(oFlavors) To UBound(oFlavors)
    oFlavor = oFlavors(i)
    s = s & i & " : " & oFlavor.MimeType
    If oFlavor.MimeType = "text/html" Then
      idx = i
    End If
    s = s & CHR$(10)
  Next
  'MsgBox s

  If idx < 0 Then
    Print "text/html mime type not found"
    Exit Sub
   End If

  ' Now print the actual HMTL as a string!
  Dim oData As Variant
  oData = oClip.getContents().getTransferData(oFlavors(idx))
  s = ""
  For i = LBound(oData) To UBound(oData)
    s = s & CHR$(oData(i))
  Next
  MsgBox s

If I kept going, then I would attempt to then use the transferable 
content directly, which is obtained from oClip.getContents() I 
believe. But, one of the real questions is Does the clipboard have 
the contents shown in the correct format? I assume it does.


So, perhaps this helps a little anyway.

Andrew Pitonyak


On Sunday, March 26, 2023 06:06 EDT, Zorg  wrote:

Hello

Hope some can help me here

Here is my  problem


We are developing our software using the uno api python

We re trying to to copy a string formatted in html in a libreoffice odt

We manage to do it but using dispatcher
The problem is that dispatcher not working in headless mode so il 
force us to use a xserver (xvfb) et Xclip.


It work but it's far from being optimized.

here is the code 
https://github.com/Probesys/lotemplate/blob/html_formatting/lotemplate/classes.py 
line 349-355


We have try using XTransferable but without any success.

Thanks in advance for your help

Sorg

Re: paste html using API

[Andrew Pitonyak]

I have no idea if this will be of any use to you or not, but...

I do not generally use the API using Python so I cannot comment on using 
Python. 

I have also not used headless mode so I cannot comment on what is and is not 
available other than knowing that dispatches are not available. 

Finally, I have done almost nothing using the clipboard, but... 

First note that the clipboard should have content of different varieties. I 
assume that you are aware of this because you have a line as follows: 

 copy_with_format(value, 'text/html')
 
 And if I look at the clipboard I see this as an available type
 
   Dim sClipName As String
  Dim oClip As Object
  Dim oFlavors As Variant
  Dim oFlavor As Variant
  Dim i as Integer
  Dim s as String
  
  sClipName = "com.sun.star.datatransfer.clipboard.SystemClipboard"
  oClip = createUnoService(sClipName)
  oFlavors = oClip.getContents().getTransferDataFlavors()
  s = ""
  For i = LBound(oFlavors) To UBound(oFlavors)
    oFlavor = oFlavors(i)
    s = s & i & " : " & oFlavor.MimeType
    s = s & CHR$(10)
  Next
  MsgBox s
  
  
  I see that method defined in this code here: 
  
  
https://github.com/Probesys/lotemplate/blob/html_formatting/lotemplate/utils.py
  
  I see that you open a pipe. 
  
  I did some experiments and I am extracting the actual HTML. I assume that 
this is not really what you want, but this is how I extract it and display it. 
I was simply playing around with it out of curiousity.
  
    Dim sClipName As String
  Dim oClip As Object
  Dim oFlavors As Variant
  Dim oFlavor As Variant
  Dim i as Integer
  Dim idx as Integer
  Dim s as String
  
  sClipName = "com.sun.star.datatransfer.clipboard.SystemClipboard"
  oClip = createUnoService(sClipName)
  oFlavors = oClip.getContents().getTransferDataFlavors()
  s = ""
  idx = -1
  For i = LBound(oFlavors) To UBound(oFlavors)
    oFlavor = oFlavors(i)
    s = s & i & " : " & oFlavor.MimeType
    If oFlavor.MimeType = "text/html" Then
      idx = i
    End If
    s = s & CHR$(10)
  Next
  'MsgBox s
  
  If idx < 0 Then
    Print "text/html mime type not found"
    Exit Sub
   End If
  
  ' Now print the actual HMTL as a string!
  Dim oData As Variant
  oData = oClip.getContents().getTransferData(oFlavors(idx))
  s = ""
  For i = LBound(oData) To UBound(oData)
    s = s & CHR$(oData(i))
  Next
  MsgBox s

If I kept going, then I would attempt to then use the transferable content 
directly, which is obtained from oClip.getContents() I believe. But, one of the 
real questions is Does the clipboard have the contents shown in the correct 
format? I assume it does. 

So, perhaps this helps a little anyway. 

Andrew Pitonyak


On Sunday, March 26, 2023 06:06 EDT, Zorg  wrote:
  
Hello
Hope some can help me here
Here is my  problem

We are developing our software using the uno api python
We re trying to to copy a string formatted in html in a libreoffice odt
We manage to do it but using dispatcher
The problem is that dispatcher not working in headless mode so il force us to 
use a xserver (xvfb) et Xclip.
It work but it's far from being optimized.
here is the code 
https://github.com/Probesys/lotemplate/blob/html_formatting/lotemplate/classes.py
 line 349-355
We have try using XTransferable but without any success.
Thanks in advance for your help
Sorg   

 

[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-7-2' - 5 commits - configure.ac connectivity/source external/hsqldb formula/source sc/source

[Andras Timar (via logerrit)]

Rebased ref, commits from common ancestor:
commit 9a6e3f349ad33df76b7b82d8ac646e4d2d5aaa83
Author: Andras Timar 
AuthorDate: Sun Mar 26 17:27:33 2023 +0200
Commit: Andras Timar 
CommitDate: Sun Mar 26 19:24:25 2023 +0200

Bump version to 7.2.7.2.M11

Change-Id: Id6824d6808964f5bc090ab534dd32d1f2bc12963

diff --git a/configure.ac b/configure.ac
index f8ae44a0c56f..d6d8d9d9ac73 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[7.2.7.2.M10],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.2.7.2.M11],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard
commit e304569f8815f493689d012b9998c985c2fb0e03
Author: Caolán McNamara 
AuthorDate: Mon Feb 13 13:56:10 2023 +
Commit: Andras Timar 
CommitDate: Sun Mar 26 19:24:25 2023 +0200

disable script dump

Change-Id: I04d740cc0fcf87daa192a0a6af34138278043a19
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146986
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147051
Tested-by: Thorsten Behrens 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147256
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx 
b/connectivity/source/drivers/hsqldb/HDriver.cxx
index e4d4e399ba2a..1027b689b532 100644
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -290,6 +290,37 @@ namespace connectivity
 } // if ( xStream.is() )
 ::comphelper::disposeComponent(xStream);
 }
+
+// disallow any database/script files that contain a 
"SCRIPT[.*]" entry (this is belt and braces
+// in that bundled hsqldb 1.8.0 is patched to also reject 
them)
+//
+// hsqldb 2.6.0 release notes have: added system role 
SCRIPT_OPS for export / import of database structure and data
+// which seems to provide a builtin way to do this with 
contemporary hsqldb
+const OUString sScript( "script" );
+if (!bIsNewDatabase && xStorage->isStreamElement(sScript))
+{
+Reference xStream = 
xStorage->openStreamElement(sScript, ElementModes::READ);
+if (xStream.is())
+{
+std::unique_ptr 
pStream(::utl::UcbStreamHelper::CreateStream(xStream));
+if (pStream)
+{
+OString sLine;
+while (pStream->ReadLine(sLine))
+{
+OString sText = sLine.trim();
+if 
(sText.startsWithIgnoreAsciiCase("SCRIPT"))
+{
+::connectivity::SharedResources 
aResources;
+sMessage = 
aResources.getResourceString(STR_COULD_NOT_LOAD_FILE).replaceFirst("$filename$",
 sSystemPath);
+break;
+}
+}
+}
+} // if ( xStream.is() )
+::comphelper::disposeComponent(xStream);
+}
+
 }
 catch(Exception&)
 {
diff --git a/external/hsqldb/UnpackedTarball_hsqldb.mk 
b/external/hsqldb/UnpackedTarball_hsqldb.mk
index cbba770f19a0..ed262cccf4ca 100644
--- a/external/hsqldb/UnpackedTarball_hsqldb.mk
+++ b/external/hsqldb/UnpackedTarball_hsqldb.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,hsqldb,\
external/hsqldb/patches/jdbc-4.1.patch \
external/hsqldb/patches/multipleResultSets.patch \
) \
+   external/hsqldb/patches/disable-dump-script.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/hsqldb/patches/disable-dump-script.patch 
b/external/hsqldb/patches/disable-dump-script.patch
new file mode 100644
index ..401dd38abc9a
--- /dev/null
+++ b/external/hsqldb/patches/disable-dump-script.patch
@@ -0,0 +1,14 @@
+--- a/hsqldb/src/org/hsqldb/DatabaseCommandInterpreter.java2023-02-13 
11:08:11.297243034 +
 b/hsqldb/src/org/hsqldb/DatabaseCommandInterpreter.java2023-02-13 
13:49:17.973089433 +00

[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-7-1' - 6 commits - bin/lo-all-static-libs config_host.mk.in configure.ac download.lst external/curl external/expat external/libetonyek external

[Andras Timar (via logerrit)]

Rebased ref, commits from common ancestor:
commit 67460281822f405b7e6774f67275f2d9dfcd2dc2
Author: Andras Timar 
AuthorDate: Sun Mar 26 17:05:03 2023 +0200
Commit: Andras Timar 
CommitDate: Sun Mar 26 18:53:16 2023 +0200

Bump version to 7.1.8.1.M4

Change-Id: Ieb57d1bf8350cf8f8992cc7a4450c813704e94d7

diff --git a/configure.ac b/configure.ac
index c52fc3a62804..e9cc927a1a26 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[7.1.8.1.M3],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.1.8.1.M4],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard
commit f2817be29cc849fc074215b97e5759471b75bf9d
Author: Michael Stahl 
AuthorDate: Tue Mar 21 10:46:46 2023 +0100
Commit: Andras Timar 
CommitDate: Sun Mar 26 18:53:16 2023 +0200

curl: upgrade to release 8.0.1

Apparently 8.0.0 had a serious regression.

Change-Id: Icc761f5e5e01b5d9bebecc13f7cba608f5834f54
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149212
Tested-by: Andras Timar 
Reviewed-by: Andras Timar 

diff --git a/download.lst b/download.lst
index 032997018ccf..1bc9b4b7f4e1 100644
--- a/download.lst
+++ b/download.lst
@@ -39,8 +39,8 @@ export CPPUNIT_SHA256SUM := 
89c5c6665337f56fd2db36bc3805a5619709d51fb136e5193707
 export CPPUNIT_TARBALL := cppunit-1.15.1.tar.gz
 export CT2N_SHA256SUM := 
71b238efd2734be9800af07566daea8d6685aeed28db5eb5fa0e6453f4d85de3
 export CT2N_TARBALL := 
1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt
-export CURL_SHA256SUM := 
759690f9a375a720f8bcce9f953897b0d93f31eed9649b74f846d54bbf63bbcc
-export CURL_TARBALL := curl-8.0.0.tar.xz
+export CURL_SHA256SUM := 
0a381cd82f4d00a9a334438b8ca239afea5bfefcfa9a1025f2bf118e79e0b5f0
+export CURL_TARBALL := curl-8.0.1.tar.xz
 export EBOOK_SHA256SUM := 
7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9
 export EBOOK_TARBALL := libe-book-0.1.3.tar.xz
 export EPOXY_SHA256SUM := 
002958c5528321edd53440235d3c44e71b5b1e09b9177e8daf677450b6c4433d
commit 968c5d3288f3f65bc5115108267f02931fc71a42
Author: Michael Stahl 
AuthorDate: Mon Mar 20 11:52:22 2023 +0100
Commit: Andras Timar 
CommitDate: Sun Mar 26 18:53:16 2023 +0200

curl: upgrade to release 8.0.0

Fixes CVE-2023-27535.

Also hopefully fixes excessive storage consumption during build:
o build: drop the use of XC_AMEND_DISTCLEAN [62]

Change-Id: I8792e95bc7634ee496488e80fec5a1310b24a31c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149153
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149211
Tested-by: Andras Timar 
Reviewed-by: Andras Timar 

diff --git a/download.lst b/download.lst
index 504c5d862f2a..032997018ccf 100644
--- a/download.lst
+++ b/download.lst
@@ -39,8 +39,8 @@ export CPPUNIT_SHA256SUM := 
89c5c6665337f56fd2db36bc3805a5619709d51fb136e5193707
 export CPPUNIT_TARBALL := cppunit-1.15.1.tar.gz
 export CT2N_SHA256SUM := 
71b238efd2734be9800af07566daea8d6685aeed28db5eb5fa0e6453f4d85de3
 export CT2N_TARBALL := 
1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt
-export CURL_SHA256SUM := 
1dae31b2a7c1fe269de99c0c31bb488346aab3459b5ffca909d6938249ae415f
-export CURL_TARBALL := curl-7.88.1.tar.xz
+export CURL_SHA256SUM := 
759690f9a375a720f8bcce9f953897b0d93f31eed9649b74f846d54bbf63bbcc
+export CURL_TARBALL := curl-8.0.0.tar.xz
 export EBOOK_SHA256SUM := 
7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9
 export EBOOK_TARBALL := libe-book-0.1.3.tar.xz
 export EPOXY_SHA256SUM := 
002958c5528321edd53440235d3c44e71b5b1e09b9177e8daf677450b6c4433d
commit b8d52062234393c710e4aeda5e6709b25f656f81
Author: Stephan Bergmann 
AuthorDate: Mon Feb 21 11:55:21 2022 +0100
Commit: Andras Timar 
CommitDate: Sun Mar 26 18:53:15 2023 +0200

Avoid unnecessary empty -Djava.class.path=

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130242
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit 5e8f64e50f97d39e83a3358697be14db03566878)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130265
Reviewed-by: Caolán McNamara 
(cherry picked from commit 04bb6f736f92b93497bed28b7420fac97753f95e)

Change-Id: Idcfe7321077b60381c0273910b1faeb444ef1fd8

diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx 
b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index f47b0a3ee4fd..843f6d19ccec 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunja

[Libreoffice-commits] core.git: helpcontent2

[Seth Chaiklin (via logerrit)]

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

New commits:
commit 46bac65b3e2d8e22f161d3fa88507355cacb0cb1
Author: Seth Chaiklin 
AuthorDate: Sun Mar 26 17:09:17 2023 +
Commit: Gerrit Code Review 
CommitDate: Sun Mar 26 17:09:17 2023 +

Update git submodules

* Update helpcontent2 from branch 'master'
  to 9c5ba9aeebcfb261ea59f2a43e489884c04a2e88
  - tdf#154234 clarify meaning of A,B,C (a,b,c) and A,AA,AAA (a,aa,aaa)

   definitions are in text/shared/01/06050500.xhp
   then embedded in other relevant files

Change-Id: Ibf23f6271d804e199a9606a4c18d10eae6a8c557
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/149028
Tested-by: Jenkins
Reviewed-by: Stéphane Guillou 
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/helpcontent2 b/helpcontent2
index 2e3d807ec068..9c5ba9aeebcf 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 2e3d807ec068688bbca1c3c384fa6ecda196fc59
+Subproject commit 9c5ba9aeebcfb261ea59f2a43e489884c04a2e88

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

[Seth Chaiklin (via logerrit)]

 source/text/shared/01/06050500.xhp  |   16 +++
 source/text/swriter/01/06060100.xhp |   79 ++--
 source/text/swriter/01/06080100.xhp |   48 ++---
 3 files changed, 72 insertions(+), 71 deletions(-)

New commits:
commit 9c5ba9aeebcfb261ea59f2a43e489884c04a2e88
Author: Seth Chaiklin 
AuthorDate: Fri Mar 17 15:15:32 2023 +
Commit: Adolfo Jayme Barrientos 
CommitDate: Sun Mar 26 17:09:16 2023 +

tdf#154234 clarify meaning of A,B,C (a,b,c) and A,AA,AAA (a,aa,aaa)

   definitions are in text/shared/01/06050500.xhp
   then embedded in other relevant files

Change-Id: Ibf23f6271d804e199a9606a4c18d10eae6a8c557
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/149028
Tested-by: Jenkins
Reviewed-by: Stéphane Guillou 
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/source/text/shared/01/06050500.xhp 
b/source/text/shared/01/06050500.xhp
index c495298c81..08b82d72c9 100644
--- a/source/text/shared/01/06050500.xhp
+++ b/source/text/shared/01/06050500.xhp
@@ -65,18 +65,18 @@
  
  
 
-A, B, C, ...
+A, B, C, 
...
 
 
-   Capital letters
+   Alphabetical numbering with uppercase letters A–ZAfter 
item 26, numbering continues AA, AB, AC, ...
 
  
  
 
-a, b, c, ...
+a, b, c, 
...
 
 
-   Lowercase letters
+   Alphabetical numbering with lowercase letters a–zAfter 
item 26, numbering continues aa, ab, ac, ...
 
  
  
@@ -113,18 +113,18 @@
  
   
 
-   A,... AA,... AAA,...
+   A,... AA,... 
AAA,...
 
 
-   Alphabetical numbering with uppercase letters
+   Alphabetical numbering with uppercase letters A–ZAfter 
item 26, numbering continues AA, BB, CC, ...
 
  
  
 
-   a,... aa,... aaa,...
+   a,... aa,... 
aaa,...
 
 
-   Alphabetical numbering with lowercase letters
+   Alphabetical numbering with lowercase letters a–zAfter 
item 26, numbering continues aa, bb, cc, ...
 
  
  
diff --git a/source/text/swriter/01/06060100.xhp 
b/source/text/swriter/01/06060100.xhp
index 57d149b02e..a9b76e745b 100644
--- a/source/text/swriter/01/06060100.xhp
+++ b/source/text/swriter/01/06060100.xhp
@@ -20,17 +20,17 @@
 
 
   
-Numbering
+Numbering
 /text/swriter/01/06060100.xhp
   
 
 
 
 
-Numbering
+Numbering
 
 
-Specifies the 
number format for heading numbering in the current document.
+Specifies the number format for 
heading numbering in the current document.
 
 
 
@@ -38,115 +38,116 @@
 
 
 
-Level
-Click the outline level 
that you want to modify, and then specify the numbering options for the 
level. To apply the numbering options, except for paragraph style, to 
all the levels, click “1–10”.
+Level
+Click the outline level 
that you want to modify, and then specify the numbering options for the 
level. To apply the numbering options, except for paragraph style, to 
all the levels, click “1–10”.
 
 
-Numbering
-Specify the 
formatting for the selected outline level.
+Numbering
+Specify the formatting for the 
selected outline level.
 
-Number
-Select the numbering 
scheme that you want to apply to the selected outline level.
+Number
+Select the numbering 
scheme that you want to apply to the selected outline level.
 
 
   
 
-   
Selection 
+   Selection 

 
 
-   
Description 
+   Description 

 
   
   
 
-  1, 2, 3, ...
+  1, 2, 
3, ...
 
 
-  Arabic numerals
+  Arabic 
numerals
 
   
   
 
-  A, B, C, ...
+  A, B, 
C, ...
 
 
-  Capital letters
+  
 
   
   
 
-  a, b, c, ...
+  a, b, 
c, ...
 
 
-  Lowercase letters
+  
 
   
   
 
-  I, II, III, ...
+  I, 
II, III, ...
 
 
-  Roman 
numerals (upper)
+  Roman numerals 
(upper)
 
   
   
 
-  i, ii, iii, ...
+  i, 
ii, iii, ...
 
 
-  Roman 
numerals (lower)
+  Roman numerals 
(lower)
 
   
   
 
-  A,... AA,... AAA,...
+  A,... 
AA,... AAA,...
 
 
-  Alphabetical numbering with identical capital letters, where 
the number of letters indicates the chapter level. For example, the second 
number in level three is "BBB".
+  
+
 
   
   
 
-  a,... aa,... aaa,...
+  a,... 
aa,... aaa,...
 
 
-  Alphabetical numbering with identical lower case letters, 
where the number of letters indicates the chapter level. For example, the third 
number in level two is "cc".
+  embedvar 
href="text/shared/01/06050500.xhp#aaanumberi

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

[Balazs Varga (via logerrit)]

 sc/inc/document.hxx  |3 +-
 sc/inc/table.hxx |2 +
 sc/source/core/data/document.cxx |   12 +--
 sc/source/core/data/drwlayer.cxx |7 +-
 sc/source/core/data/table5.cxx   |   42 +++
 5 files changed, 58 insertions(+), 8 deletions(-)

New commits:
commit 69cc8bdd5f9109804d912b52d5ee1040d6e1868f
Author: Balazs Varga 
AuthorDate: Sat Mar 25 18:57:08 2023 +0100
Commit: Balazs Varga 
CommitDate: Sun Mar 26 16:37:32 2023 +

Related: tdf#154005 sc ods fileopen: fix dropdown form control size

Fixing the crashtesting assert/crash after the original change.
Also a little clean-up.

Change-Id: I35453fbc55b3d5d4064179e84755334c2d3a01ca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149583
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Reviewed-by: Balazs Varga 

diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index f044eaf77f78..285fcf1a7d31 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -2036,7 +2036,8 @@ public:
 SC_DLLPUBLIC SCROW  FirstVisibleRow(SCROW nStartRow, SCROW 
nEndRow, SCTAB nTab) const;
 SC_DLLPUBLIC SCROW  LastVisibleRow(SCROW nStartRow, SCROW nEndRow, 
SCTAB nTab) const;
 SCROW   CountVisibleRows(SCROW nStartRow, SCROW 
nEndRow, SCTAB nTab) const;
-SCCOL   CountVisibleCols(SCROW nStartCol, SCROW 
nEndCol, SCTAB nTab) const;
+SCROW   CountHiddenRows(SCROW nStartRow, SCROW 
nEndRow, SCTAB nTab) const;
+SCCOL   CountHiddenCols(SCROW nStartCol, SCROW 
nEndCol, SCTAB nTab) const;
 
 SC_DLLPUBLIC bool   RowFiltered(SCROW nRow, SCTAB nTab, SCROW* 
pFirstRow = nullptr, SCROW* pLastRow = nullptr) const;
 boolHasFilteredRows(SCROW nStartRow, SCROW 
nEndRow, SCTAB nTab) const;
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 5eefb5f95c38..cbce92da3998 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -971,9 +971,11 @@ public:
 SCROW   FirstVisibleRow(SCROW nStartRow, SCROW nEndRow) const;
 SCROW   LastVisibleRow(SCROW nStartRow, SCROW nEndRow) const;
 SCROW   CountVisibleRows(SCROW nStartRow, SCROW nEndRow) const;
+SCROW   CountHiddenRows(SCROW nStartRow, SCROW nEndRow) const;
 tools::Long GetTotalRowHeight(SCROW nStartRow, SCROW nEndRow, bool 
bHiddenAsZero = true) const;
 
 SCCOL   CountVisibleCols(SCCOL nStartCol, SCCOL nEndCol) const;
+SCCOL   CountHiddenCols(SCCOL nStartCol, SCCOL nEndCol) const;
 
 SCCOLROWLastHiddenColRow(SCCOLROW nPos, bool bCol) const;
 
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index b295e68f69e0..afec7f072b3c 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -4561,12 +4561,20 @@ SCROW ScDocument::CountVisibleRows(SCROW nStartRow, 
SCROW nEndRow, SCTAB nTab) c
 return maTabs[nTab]->CountVisibleRows(nStartRow, nEndRow);
 }
 
-SCCOL ScDocument::CountVisibleCols(SCROW nStartCol, SCROW nEndCol, SCTAB nTab) 
const
+SCROW ScDocument::CountHiddenRows(SCROW nStartRow, SCROW nEndRow, SCTAB nTab) 
const
 {
 if (!ValidTab(nTab) || nTab >= static_cast(maTabs.size()) || 
!maTabs[nTab])
 return 0;
 
-return maTabs[nTab]->CountVisibleCols(nStartCol, nEndCol);
+return maTabs[nTab]->CountHiddenRows(nStartRow, nEndRow);
+}
+
+SCCOL ScDocument::CountHiddenCols(SCROW nStartCol, SCROW nEndCol, SCTAB nTab) 
const
+{
+if (!ValidTab(nTab) || nTab >= static_cast(maTabs.size()) || 
!maTabs[nTab])
+return 0;
+
+return maTabs[nTab]->CountHiddenCols(nStartCol, nEndCol);
 }
 
 bool ScDocument::RowFiltered(SCROW nRow, SCTAB nTab, SCROW* pFirstRow, SCROW* 
pLastRow) const
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index 653571cabd38..359bf3b1e7be 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -713,11 +713,8 @@ void lcl_SetLogicRectFromAnchor(SdrObject* pObj, const 
ScDrawObjData& rAnchor, c
 // tdf#154005: Handle hidden row/col: remove hidden row/cols size from the 
ScDrawObjData shape size in case of forms
 if (pObj->GetObjIdentifier() == SdrObjKind::UNO && pObj->GetObjInventor() 
== SdrInventor::FmForm)
 {
-nHiddenRows = ((rAnchor.maEnd.Row() - rAnchor.maStart.Row()) + 1) -
-(pDoc->CountVisibleRows(rAnchor.maStart.Row(), 
rAnchor.maEnd.Row(), rAnchor.maStart.Tab()));
-
-nHiddenCols = ((rAnchor.maEnd.Col() - rAnchor.maStart.Col()) + 1) -
-(pDoc->CountVisibleCols(rAnchor.maStart.Col(), 
rAnchor.maEnd.Col(), rAnchor.maStart.Tab()));
+nHiddenRows = pDoc->CountHiddenRows(rAnchor.maStart.Row(), 
rAnchor.maEnd.Row(), rAnchor.maStart.Tab());
+nHiddenCols = pDoc->CountHiddenCols(rAnchor.maStart.Col(), 
rAnchor.maEnd.Col(), rAnchor.maStart.Tab());
 }
 
 // In case

[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-7-2' - 9 commits - configure.ac connectivity/source download.lst external/curl external/hsqldb formula/source sc/source

[Andras Timar (via logerrit)]

 configure.ac  |2 -
 connectivity/source/drivers/hsqldb/HDriver.cxx|   31 ++
 download.lst  |8 ++--
 external/curl/asan-poison-nsspem.patch.0  |2 -
 external/curl/curl-nss.patch.1|6 +--
 external/hsqldb/UnpackedTarball_hsqldb.mk |1 
 external/hsqldb/patches/disable-dump-script.patch |   36 ++
 formula/source/core/api/token.cxx |   13 +++
 sc/source/core/inc/interpre.hxx   |   12 +++
 sc/source/core/tool/interpr1.cxx  |4 +-
 sc/source/core/tool/interpr3.cxx  |4 +-
 sc/source/core/tool/interpr4.cxx  |   10 +-
 12 files changed, 107 insertions(+), 22 deletions(-)

New commits:
commit 5e841d59848e240e5294b222f29e8f55021ca429
Author: Andras Timar 
AuthorDate: Sun Mar 26 17:27:33 2023 +0200
Commit: Andras Timar 
CommitDate: Sun Mar 26 17:27:33 2023 +0200

Bump version to 7.2.7.2.M11

Change-Id: Id6824d6808964f5bc090ab534dd32d1f2bc12963

diff --git a/configure.ac b/configure.ac
index f8ae44a0c56f..d6d8d9d9ac73 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[7.2.7.2.M10],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.2.7.2.M11],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard
commit a56063c15f60a64cab007bf03dc506dd8ff4758f
Author: Eike Rathke 
AuthorDate: Mon Feb 27 16:10:06 2023 +0100
Commit: Andras Timar 
CommitDate: Sun Mar 26 17:23:52 2023 +0200

Always push a result, even if it's only an error

PERCENTILE() and QUARTILE() if an error was passed as argument (or
an error encountered during obtaining arguments) omitted to push
an error result, only setting the error.

Fallout from

commit f336f63da900d76c2bf6e5690f1c8a7bd15a0aa2
CommitDate: Thu Mar 3 16:28:59 2016 +

tdf#94635 Add FORECAST.ETS functions to Calc

Change-Id: I23e276fb0ce735cfd6383cc963446499dcf819f4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147922
Reviewed-by: Eike Rathke 
Tested-by: Jenkins
(cherry picked from commit 64914560e279c71ff1233f4bab851e2a292797e6)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147900
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit da8ca6920b78addc827171f53a42abdd59da9f9c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148326
Tested-by: Andras Timar 
Reviewed-by: Andras Timar 

diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx
index 9f5812a787a1..43c35cc7ac1a 100644
--- a/sc/source/core/tool/interpr3.cxx
+++ b/sc/source/core/tool/interpr3.cxx
@@ -3466,7 +3466,7 @@ void ScInterpreter::ScPercentile( bool bInclusive )
 GetNumberSequenceArray( 1, aArray, false );
 if ( aArray.empty() || nGlobalError != FormulaError::NONE )
 {
-SetError( FormulaError::NoValue );
+PushNoValue();
 return;
 }
 if ( bInclusive )
@@ -3489,7 +3489,7 @@ void ScInterpreter::ScQuartile( bool bInclusive )
 GetNumberSequenceArray( 1, aArray, false );
 if ( aArray.empty() || nGlobalError != FormulaError::NONE )
 {
-SetError( FormulaError::NoValue );
+PushNoValue();
 return;
 }
 if ( bInclusive )
commit e1f403815ad96b7b29bcb55715264cfb13bf78f4
Author: Eike Rathke 
AuthorDate: Fri Feb 17 12:03:54 2023 +0100
Commit: Andras Timar 
CommitDate: Sun Mar 26 17:23:43 2023 +0200

Stack check safety belt before fishing in muddy waters

Have it hit hard in debug builds.

Change-Id: I9ea54844a0661fd7a75616a2876983a74b2d5bad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147205
Reviewed-by: Eike Rathke 
Tested-by: Jenkins
(cherry picked from commit 9d91fbba6f374fa1c10b38eae003da89bd4e6d4b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147902
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index c7b93798bc58..c80ec572f1b5 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -231,6 +231,7 @@ private:
 inline bool MustHaveParamCount( short nAct, short nMust );
 inline bool MustHaveParamCount( short nAct, short nMust, short nMax );
 inline bool MustHaveParamCountMin( short nAct, short nMin );
+inline bool MustHaveParamCountMinWithStackCh

[Libreoffice-commits] core.git: editeng/source include/editeng include/oox include/svx oox/inc oox/source sd/qa sd/source svx/source

[Tomaž Vajngerl (via logerrit)]

 editeng/source/editeng/editeng.cxx   |   23 ++-
 editeng/source/editeng/editobj.cxx   |   11 +
 editeng/source/editeng/editobj2.hxx  |   14 +-
 editeng/source/editeng/impedit.hxx   |   98 +++
 editeng/source/editeng/impedit2.cxx  |   29 ++--
 editeng/source/editeng/impedit3.cxx  |  148 ++-
 editeng/source/editeng/impedit4.cxx  |   24 +++
 editeng/source/outliner/outlin2.cxx  |   14 +-
 editeng/source/outliner/outliner.cxx |   23 ++-
 include/editeng/editeng.hxx  |8 -
 include/editeng/outliner.hxx |6 
 include/oox/export/drawingml.hxx |2 
 include/svx/sdtfsitm.hxx |   20 +--
 include/svx/svdotext.hxx |6 
 include/svx/unoshprp.hxx |2 
 oox/inc/drawingml/textparagraph.hxx  |3 
 oox/inc/drawingml/textparagraphproperties.hxx|1 
 oox/source/drawingml/diagram/diagram.cxx |6 
 oox/source/drawingml/textbody.cxx|4 
 oox/source/drawingml/textparagraph.cxx   |4 
 oox/source/drawingml/textparagraphproperties.cxx |   10 -
 oox/source/export/drawingml.cxx  |   45 +++---
 sd/qa/unit/export-tests-ooxml2.cxx   |   16 +-
 sd/qa/unit/export-tests-ooxml3.cxx   |   11 -
 sd/qa/unit/import-tests-smartart.cxx |8 -
 sd/qa/unit/import-tests2.cxx |   14 +-
 sd/source/ui/view/drtxtob.cxx|   10 -
 svx/source/svdraw/svdotext.cxx   |  137 +++--
 svx/source/svdraw/svdotextdecomposition.cxx  |2 
 svx/source/svdraw/svdoutl.cxx|2 
 svx/source/unodraw/unoshape.cxx  |9 -
 31 files changed, 452 insertions(+), 258 deletions(-)

New commits:
commit 628275acb1b9652e65b8c5c013549dce5ad6f5bf
Author: Tomaž Vajngerl 
AuthorDate: Thu Mar 23 11:24:30 2023 +0900
Commit: Tomaž Vajngerl 
CommitDate: Sun Mar 26 15:07:39 2023 +

tdf#90407 Change the auto-fit alg. to match better with OOXML

The auto-fit algorithm has been tweaked to be more in-line with
the expectations of OOXML. This means a couple of changes to what
properties are scaled by the algorithm have been made:
- most properties that influence the X axis position or size (for
example indent) are not scaled down or changed by scaling.
- properties that influence y axis position and size are scaled
by a separate parameter (like in the OOXML). This is used in the
auto-fit algorithm in a different way.
- if line spacing is proportional, it is now scaled with the
spacing parameter. Fixed line spacing doesn't get scaled.
- the main scaling X,Y parameter only scales the fonts.
- trying hard to scale the fonts to the nearest pt (point) value

With this change the scaling is much more stable than it was
before - for example it doesn't matter what the unscaled font
size is, when it is scaled down to the text box size, it (should)
always look the same (for example scaling from 32pt -> 10pt or
64pt -> 10pt or even 999pt -> 10pt).

The algorithm is also rewritten to be better at finding a fit and
is also better at find a good fit, but it can take more iterations
by doing so (there are ways to improve it however). Previous
algorithm used a linear search to converge to the best fit in less
iterations, but the issue with that was that it could in some cases
miss a solution (especially since change to floating point scaling
parameter). The new algorithm now uses a binary search - always
trying the middle of the search space.

OOXML export and import was also changed to take advantage of the
font scaling and spacing scaling parameters. The additional
scaling at export that was needed to have consistent OOXML support
was removed.

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

diff --git a/editeng/source/editeng/editeng.cxx 
b/editeng/source/editeng/editeng.cxx
index 32fad4d8fc35..69fef679c7f3 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -2006,14 +2006,13 @@ Point EditEngine::GetDocPosTopLeft( sal_Int32 
nParagraph )
 else
 {
 const SvxLRSpaceItem& rLRItem = pImpEditEngine->GetLRSpaceItem( 
pPPortion->GetNode() );
-// TL_NF_LR aPoint.X() = pImpEditEngine->GetXValue( 
(short)(rLRItem.GetTextLeft() + rLRItem.GetTextFirstLineOffset()) );
 sal_Int32 nSpaceBefore = 0;
 pImpEditEngine->GetSpaceBeforeAndMinLabelWidth( 
pPPortion->GetNode(), &nSpaceBefore );
 short nX = static_cast(rLRItem.GetTextLeft(

[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-7-1' - 10 commits - bin/lo-all-static-libs config_host.mk.in configure.ac connectivity/source download.lst external/curl external/expat externa

[Andras Timar (via logerrit)]

 RepositoryExternal.mk|   13 
 bin/lo-all-static-libs   |1 
 config_host.mk.in|2 
 configure.ac |   36 +-
 connectivity/source/drivers/hsqldb/HDriver.cxx   |   31 ++
 download.lst |   58 ++--
 external/curl/ExternalPackage_curl.mk|2 
 external/curl/ExternalProject_curl.mk|5 
 external/curl/UnpackedTarball_curl.mk|9 
 external/curl/asan-poison-nsspem.patch.0 |   11 
 external/curl/clang-cl.patch.0   |2 
 external/curl/configurable-z-option.patch.0  |   20 +
 external/curl/curl-7.26.0_win-proxy.patch|  121 
 external/curl/curl-msvc-disable-protocols.patch.1|4 
 external/curl/curl-msvc-zlib.patch.1 |   16 +
 external/curl/curl-msvc.patch.1  |4 
 external/curl/curl-nss.patch.1   |   15 -
 external/curl/zlib.patch.0   |   20 -
 external/expat/expat-winapi.patch|   13 
 external/hsqldb/UnpackedTarball_hsqldb.mk|1 
 external/hsqldb/patches/disable-dump-script.patch|   14 
 external/libjpeg-turbo/ExternalProject_libjpeg-turbo.mk  |   43 ---
 external/libjpeg-turbo/Module_libjpeg-turbo.mk   |2 
 external/libjpeg-turbo/StaticLibrary_libjpeg-turbo.mk|  214 +++
 external/libjpeg-turbo/UnpackedTarball_libjpeg-turbo.mk  |   13 
 external/libjpeg-turbo/jconfig.h |   86 ++
 external/libjpeg-turbo/jconfigint.h  |   51 +++
 external/libjpeg-turbo/jpeg-turbo.build.patch.1  |   58 
 external/libjpeg-turbo/jpeg-turbo.win_build.patch.1  |   54 ---
 external/libjpeg-turbo/ubsan.patch   |   39 --
 external/libxml2/ExternalPackage_libxml2.mk  |2 
 external/libxml2/UnpackedTarball_libxml2.mk  |3 
 external/libxml2/libxml2-android.patch   |6 
 external/libxml2/libxml2-config.patch.1  |   43 ---
 external/libxml2/xml2-config.in  |   28 +
 external/nss/UnpackedTarball_nss.mk  |3 
 external/nss/asan.patch.1|6 
 external/nss/clang-cl.patch.0|   23 +
 external/nss/macos-dlopen.patch.0|2 
 external/nss/nss-3.13.5-zlib-werror.patch|   13 
 external/nss/nss-android.patch.1 |8 
 external/nss/nss-bz1646594.patch.1   |2 
 external/nss/nss-ios.patch   |   44 +--
 external/nss/nss-restore-manual-pre-dependencies.patch.1 |2 
 external/nss/nss-win32-make.patch.1  |4 
 external/nss/nss.aix.patch   |   10 
 external/nss/nss.bzmozilla1238154.patch  |2 
 external/nss/nss.cygwin64.in32bit.patch  |2 
 external/nss/nss.nowerror.patch  |2 
 external/nss/nss.patch   |   22 -
 external/nss/nss.utf8bom.patch.1 |4 
 external/nss/nss.vs2015.patch|2 
 external/nss/nss.vs2015.pdb.patch|2 
 external/nss/nss.windows.patch   |6 
 external/nss/nss_macosx.patch|   12 
 external/nss/ubsan.patch.0   |   11 
 external/openssl/UnpackedTarball_openssl.mk  |2 
 external/openssl/configurable-z-option.patch.0   |   34 ++
 external/openssl/openssl-no-_umul128-on-aarch64.patch.1  |   58 
 external/openssl/openssl-no-multilib.patch.0 |4 
 external/openssl/opensslios.patch|   12 
 formula/source/core/api/token.cxx|   13 
 jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx  |   16 -
 jvmfwk/source/framework.cxx  |8 
 jvmfwk/source/fwkbase.cxx|6 
 sc/source/core/inc/interpre.hxx  |   12 
 sc/source/core/tool/interpr1.cxx |4 
 sc/source/core/tool/interpr3.cxx |4 
 sc/source/core/tool/interpr4.cxx |   10 
 sc/source/core/tool/interpr7.cxx |2 
 solenv/bin/concat-deps.c |5 
 solenv/gbuild/LinkTarget.mk  |   77 +
 solenv/gbuild/StaticLibrary.mk   |2 
 solenv/gbuild/TargetLocations.mk |3 
 solenv/gbuild/platform/android.mk

paste html using API

[Zorg]

Hello

Hope some can help me here

Here is my  problem


We are developing our software using the uno api python

We re trying to to copy a string formatted in html in a libreoffice odt

We manage to do it but using dispatcher
The problem is that dispatcher not working in headless mode so il force 
us to use a xserver (xvfb) et Xclip.


It work but it's far from being optimized.

here is the code 
https://github.com/Probesys/lotemplate/blob/html_formatting/lotemplate/classes.py 
line 349-355


We have try using XTransferable but without any success.

Thanks in advance for your help

Sorg

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot (via logerrit)]

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

New commits:
commit a5fde5d749d27b0da216da4412f8b750178b1b08
Author: Olivier Hallot 
AuthorDate: Sun Mar 26 12:12:59 2023 +
Commit: Gerrit Code Review 
CommitDate: Sun Mar 26 12:12:59 2023 +

Update git submodules

* Update helpcontent2 from branch 'master'
  to 2e3d807ec068688bbca1c3c384fa6ecda196fc59
  - Fix XHP tag

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

diff --git a/helpcontent2 b/helpcontent2
index 7062dbc3016b..2e3d807ec068 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 7062dbc3016bf22b8294a7d6998e0441523f1895
+Subproject commit 2e3d807ec068688bbca1c3c384fa6ecda196fc59

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

[Olivier Hallot (via logerrit)]

 source/text/scalc/01/func_style.xhp |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2e3d807ec068688bbca1c3c384fa6ecda196fc59
Author: Olivier Hallot 
AuthorDate: Sun Mar 26 10:56:17 2023 +
Commit: Olivier Hallot 
CommitDate: Sun Mar 26 12:12:59 2023 +

Fix XHP tag

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

diff --git a/source/text/scalc/01/func_style.xhp 
b/source/text/scalc/01/func_style.xhp
index 22b002d4f1..30b30c7237 100644
--- a/source/text/scalc/01/func_style.xhp
+++ b/source/text/scalc/01/func_style.xhp
@@ -28,8 +28,8 @@
   This function always 
returns the numeric value 0, which allows to use it by adding the 
STYLE function to other functions in the same cell without 
changing its value.
 
   
-  
-STYLE("Style" [; Time [; "Style2"]])
+  
+STYLE("Style" [; Time [; "Style2"]])
   
   
 Style is the name of the cell style to be applied to the 
cell. Style names are not case-sensitive and must be entered in quotation marks.

[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - download.lst external/libjpeg-turbo

[Taichi Haradaguchi (via logerrit)]

 download.lst  |4 ++--
 external/libjpeg-turbo/README |2 +-
 external/libjpeg-turbo/StaticLibrary_libjpeg-turbo.mk |   10 +-
 external/libjpeg-turbo/jconfig.h  |4 ++--
 external/libjpeg-turbo/jconfigint.h   |4 ++--
 external/libjpeg-turbo/jversion.h |6 +++---
 6 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit 5e80f82ae4380e01437a0802938fa98ef484a1f2
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Wed Mar 15 23:22:33 2023 +0900
Commit: Caolán McNamara 
CommitDate: Sun Mar 26 12:01:24 2023 +

libjpeg-turbo: upgrade to release 2.1.5.1

Fixes a serious regression that 2.1.5 had.[1]

[1] "Release 2.1.5.1 · libjpeg-turbo/libjpeg-turbo"


Change-Id: I0586d735e17789482e0e8e667aafd2b5613a1232
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149308
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/download.lst b/download.lst
index cd1046402046..e4332f8de06c 100644
--- a/download.lst
+++ b/download.lst
@@ -270,8 +270,8 @@ JFREEREPORT_SAC_TARBALL := 
39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBJPEG_TURBO_SHA256SUM := 
bc12bc9dce55300c6bf4342bc233bcc26bd38bf289eedf147360d731c668ddaf
-LIBJPEG_TURBO_TARBALL := libjpeg-turbo-2.1.5.tar.gz
+LIBJPEG_TURBO_SHA256SUM := 
2fdc3feb6e9deb17adec9bafa3321419aa19f8f4e5dea7bf8486844ca22207bf
+LIBJPEG_TURBO_TARBALL := libjpeg-turbo-2.1.5.1.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/libjpeg-turbo/README b/external/libjpeg-turbo/README
index 46eff7cb7487..66ab7ad9660d 100644
--- a/external/libjpeg-turbo/README
+++ b/external/libjpeg-turbo/README
@@ -3,4 +3,4 @@ External library for reading/writing jpegs
 This is only used by the jpeg import filter that is provided
 for use by VCL see [[vcl/source/filter/jpeg]]
 
-From [http://www.libjpeg-turbo.org/].
+From [https://www.libjpeg-turbo.org/].
diff --git a/external/libjpeg-turbo/StaticLibrary_libjpeg-turbo.mk 
b/external/libjpeg-turbo/StaticLibrary_libjpeg-turbo.mk
index 0b6b3044d1b2..ace14fd8fc5d 100644
--- a/external/libjpeg-turbo/StaticLibrary_libjpeg-turbo.mk
+++ b/external/libjpeg-turbo/StaticLibrary_libjpeg-turbo.mk
@@ -37,8 +37,10 @@ endif
 endif
 
 $(eval $(call gb_StaticLibrary_add_generated_cobjects,libjpeg-turbo,\
+UnpackedTarball/libjpeg-turbo/jaricom \
 UnpackedTarball/libjpeg-turbo/jcapimin \
 UnpackedTarball/libjpeg-turbo/jcapistd \
+UnpackedTarball/libjpeg-turbo/jcarith \
 UnpackedTarball/libjpeg-turbo/jccoefct \
 UnpackedTarball/libjpeg-turbo/jccolor \
 UnpackedTarball/libjpeg-turbo/jcdctmgr \
@@ -56,6 +58,7 @@ $(eval $(call 
gb_StaticLibrary_add_generated_cobjects,libjpeg-turbo,\
 UnpackedTarball/libjpeg-turbo/jctrans \
 UnpackedTarball/libjpeg-turbo/jdapimin \
 UnpackedTarball/libjpeg-turbo/jdapistd \
+UnpackedTarball/libjpeg-turbo/jdarith \
 UnpackedTarball/libjpeg-turbo/jdatadst \
 UnpackedTarball/libjpeg-turbo/jdatasrc \
 UnpackedTarball/libjpeg-turbo/jdcoefct \
@@ -80,14 +83,11 @@ $(eval $(call 
gb_StaticLibrary_add_generated_cobjects,libjpeg-turbo,\
 UnpackedTarball/libjpeg-turbo/jidctfst \
 UnpackedTarball/libjpeg-turbo/jidctint \
 UnpackedTarball/libjpeg-turbo/jidctred \
+UnpackedTarball/libjpeg-turbo/jmemmgr \
+UnpackedTarball/libjpeg-turbo/jmemnobs \
 UnpackedTarball/libjpeg-turbo/jquant1 \
 UnpackedTarball/libjpeg-turbo/jquant2 \
 UnpackedTarball/libjpeg-turbo/jutils \
-UnpackedTarball/libjpeg-turbo/jmemmgr \
-UnpackedTarball/libjpeg-turbo/jmemnobs \
-UnpackedTarball/libjpeg-turbo/jaricom \
-UnpackedTarball/libjpeg-turbo/jcarith \
-UnpackedTarball/libjpeg-turbo/jdarith \
 ))
 
 ifneq ($(NASM),)
diff --git a/external/libjpeg-turbo/jconfig.h b/external/libjpeg-turbo/jconfig.h
index 65151c1422ad..3855ccec9cfd 100644
--- a/external/libjpeg-turbo/jconfig.h
+++ b/external/libjpeg-turbo/jconfig.h
@@ -4,10 +4,10 @@
 #define JPEG_LIB_VERSION  62
 
 /* libjpeg-turbo version */
-#define LIBJPEG_TURBO_VERSION  2.1.4
+#define LIBJPEG_TURBO_VERSION  2.1.5.1
 
 /* libjpeg-turbo version in integer form */
-#define LIBJPEG_TURBO_VERSION_NUMBER  2001004
+#define LIBJPEG_TURBO_VERSION_NUMBER  2001005
 
 /* Support arithmetic encoding */
 #define C_ARITH_CODING_SUPPORTED 1
diff --git a/external/libjpeg-turbo/jconfigint.h 
b/external/libjpeg-turbo/jconfigint.h
index 6cd960a03368..b7644cbac90e 100644
--- a/external/libjpeg-turbo/jconfigint.h
+++ b/external/libjpeg-turbo/jconfigint.h
@@ -1,7 +1,7 @@
 #include 
 
 /* libjpeg-turbo build number */
-#define BUILD  "20230228"
+#define BUILD  "20230315"
 
 /* Compiler's inline keyword */
 #undef inline
@@ -19,7 

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

[Noel Grandin (via logerrit)]

 sc/qa/unit/helper/qahelper.cxx   |6 -
 sc/qa/unit/subsequent_export_test3.cxx   |   21 +
 sc/source/core/data/documen4.cxx |   39 +-
 sc/source/core/data/document.cxx |   10 +-
 sc/source/core/data/documentimport.cxx   |   39 +-
 sc/source/core/data/funcdesc.cxx |   61 +---
 sc/source/core/tool/address.cxx  |4 -
 sc/source/core/tool/chgtrack.cxx |   16 +---
 sc/source/core/tool/compiler.cxx |4 -
 sc/source/core/tool/formulalogger.cxx|   41 --
 sc/source/core/tool/rangeutl.cxx |3 
 sc/source/core/tool/reffind.cxx  |3 
 sc/source/filter/dif/difexp.cxx  |   55 ++
 sc/source/filter/excel/read.cxx  |5 -
 sc/source/filter/excel/xecontent.cxx |   10 --
 sc/source/filter/excel/xetable.cxx   |6 -
 sc/source/filter/excel/xipivot.cxx   |3 
 sc/source/filter/html/htmlexp.cxx|   29 +++
 sc/source/filter/oox/formulabase.cxx |3 
 sc/source/filter/xml/xmlexprt.cxx|  102 ---
 sc/source/ui/app/inputhdl.cxx|   23 ++
 sc/source/ui/condformat/condformathelper.cxx |   38 --
 sc/source/ui/dbgui/asciiopt.cxx  |3 
 sc/source/ui/dbgui/csvruler.cxx  |3 
 sc/source/ui/dbgui/dbnamdlg.cxx  |9 --
 sc/source/ui/view/cellsh3.cxx|   40 +-
 sc/source/ui/view/dbfunc3.cxx|6 -
 sc/source/ui/view/gridwin.cxx|8 --
 sc/source/ui/view/viewfun2.cxx   |4 -
 29 files changed, 252 insertions(+), 342 deletions(-)

New commits:
commit 86313f053315cd0ba896e494d7bac14d2279c9b4
Author: Noel Grandin 
AuthorDate: Sat Mar 25 19:30:24 2023 +0200
Commit: Noel Grandin 
CommitDate: Sun Mar 26 11:24:13 2023 +

loplugin:stringadd in sc

after my patch to merge the bufferadd loplugin into stringadd

Change-Id: Ifa70db5be4719fe66d3043e5e49403246f6aa8bd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149582
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/sc/qa/unit/helper/qahelper.cxx b/sc/qa/unit/helper/qahelper.cxx
index 27230e0d2b43..dbfb6af398f2 100644
--- a/sc/qa/unit/helper/qahelper.cxx
+++ b/sc/qa/unit/helper/qahelper.cxx
@@ -131,8 +131,7 @@ void ScModelTestBase::testFile(const OUString& aFileName, 
ScDocument& rDoc, SCTA
 catch (const orcus::parse_error& e)
 {
 std::cout << "reading csv content file failed: " << e.what() << 
std::endl;
-OStringBuffer aErrorMsg("csv parser error: ");
-aErrorMsg.append(e.what());
+OString aErrorMsg = OString::Concat("csv parser error: ") + e.what();
 CPPUNIT_ASSERT_MESSAGE(aErrorMsg.getStr(), false);
 }
 }
@@ -155,8 +154,7 @@ void ScModelTestBase::testCondFile( const OUString& 
aFileName, ScDocument* pDoc,
 catch (const orcus::parse_error& e)
 {
 std::cout << "reading csv content file failed: " << e.what() << 
std::endl;
-OStringBuffer aErrorMsg("csv parser error: ");
-aErrorMsg.append(e.what());
+OString aErrorMsg = OString::Concat("csv parser error: ") + e.what();
 CPPUNIT_ASSERT_MESSAGE(aErrorMsg.getStr(), false);
 }
 }
diff --git a/sc/qa/unit/subsequent_export_test3.cxx 
b/sc/qa/unit/subsequent_export_test3.cxx
index f07f25b2e3a7..4039f54547ef 100644
--- a/sc/qa/unit/subsequent_export_test3.cxx
+++ b/sc/qa/unit/subsequent_export_test3.cxx
@@ -264,22 +264,11 @@ CPPUNIT_TEST_FIXTURE(ScExportTest3, 
testBordersExchangeXLSX)
 
 static OUString toString(const ScBigRange& rRange)
 {
-OUStringBuffer aBuf;
-aBuf.append("(columns:");
-aBuf.append(rRange.aStart.Col());
-aBuf.append('-');
-aBuf.append(rRange.aEnd.Col());
-aBuf.append(";rows:");
-aBuf.append(rRange.aStart.Row());
-aBuf.append('-');
-aBuf.append(rRange.aEnd.Row());
-aBuf.append(";sheets:");
-aBuf.append(rRange.aStart.Tab());
-aBuf.append('-');
-aBuf.append(rRange.aEnd.Tab());
-aBuf.append(')');
-
-return aBuf.makeStringAndClear();
+return "(columns:" + OUString::number(rRange.aStart.Col()) + "-"
+   + OUString::number(rRange.aEnd.Col()) + ";rows:" + 
OUString::number(rRange.aStart.Row())
+   + "-" + OUString::number(rRange.aEnd.Row())
+   + ";sheets:" + OUString::number(rRange.aStart.Tab()) + "-"
+   + OUString::number(rRange.aEnd.Tab()) + ")";
 }
 
 CPPUNIT_TEST_FIXTURE(ScExportTest3, testTrackChangesSimpleXLSX)
diff --git a/sc/source/core/data/documen4.cxx b/sc/source/core/data/documen4.cxx
index e7945b773d9d..0db93c0aeb5b 100644
--- a/sc/source/core/data/documen4.cxx
+++ b/sc/source/core/data/documen4.cxx
@@ -386,19 +386,18 @@ void ScDocument::InsertTableOp(const ScTabOpParam& 
rParam,  // multiple (repeate
 }
 
 ScRefAddress aRef;
-   

[Libreoffice-commits] core.git: vcl/skia

[Julien Nabet (via logerrit)]

 vcl/skia/skia_denylist_vulkan.xml |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 4938bbcd64e95c9b494bcc32e8a5be3706f00cfa
Author: Julien Nabet 
AuthorDate: Sun Mar 26 11:23:48 2023 +0200
Commit: Tomaž Vajngerl 
CommitDate: Sun Mar 26 10:28:34 2023 +

tdf#154378: blacklist GeForce RTX 3080 for Skia hardware rendering

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

diff --git a/vcl/skia/skia_denylist_vulkan.xml 
b/vcl/skia/skia_denylist_vulkan.xml
index 3c77f3c5ad59..ee79abe6a61f 100644
--- a/vcl/skia/skia_denylist_vulkan.xml
+++ b/vcl/skia/skia_denylist_vulkan.xml
@@ -48,6 +48,9 @@
  
 
 
+ 
+
+
 
 
 

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

[Maxim Monastirsky (via logerrit)]

 svx/source/unodraw/unoshtxt.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit f0287aad967761d46cb6903fc0d985a536408176
Author: Maxim Monastirsky 
AuthorDate: Sun Mar 26 09:59:09 2023 +0300
Commit: Maxim Monastirsky 
CommitDate: Sun Mar 26 10:25:36 2023 +

svx: don't overwrite the first cell's style

i.e. new Draw document, change the char formatting in the
default drawing style (e.g. font size), insert a table and
fill its cells with text. Save and reload. After reload the
first cell inherits the formatting of the default DS,
instead of its assigned cell style. But dragging the table
around shows the correct formatting in the dragging overlay,
and it's also correct when copy & pasting the table.

This is caused by the order of things at import, as a table
is created initially with a single cell at least, and it
gets its cell style assignment too early. There is also
similar code to what is changed here in SdrTextObj::
BegTextEdit, and it's rightfully overridden by SdrTableObj.

This appears to be a regression from 4-0, but I'm not sure
which commit and what exactly changed there.

Change-Id: Id096c7b5f330d6abd8f5b01c96448a9d8aac8001
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149616
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky 

diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx
index 525ee88abd77..580b3c2f65a0 100644
--- a/svx/source/unodraw/unoshtxt.cxx
+++ b/svx/source/unodraw/unoshtxt.cxx
@@ -588,7 +588,10 @@ SvxTextForwarder* 
SvxTextEditSourceImpl::GetBackgroundTextForwarder()
 // its empty, so we have to force the outliner to initialise 
itself
 mpOutliner->SetText( "", mpOutliner->GetParagraph( 0 ) );
 
-if(mpObject->GetStyleSheet())
+auto pCell = dynamic_cast(mpText);
+if (pCell && pCell->GetStyleSheet())
+mpOutliner->SetStyleSheet( 0, pCell->GetStyleSheet());
+else if (mpObject->GetStyleSheet())
 mpOutliner->SetStyleSheet( 0, mpObject->GetStyleSheet());
 }
 }

[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - officecfg/registry sw/source

[Xisco Fauli (via logerrit)]

 officecfg/registry/schema/org/openoffice/Office/Writer.xcs |8 
 sw/source/uibase/config/usrpref.cxx|5 --
 sw/source/uibase/uiview/view.cxx   |   22 -
 3 files changed, 2 insertions(+), 33 deletions(-)

New commits:
commit a3d1ace9e8a36820acef3b9d2a02e4b3c304d455
Author: Xisco Fauli 
AuthorDate: Fri Mar 24 11:46:22 2023 +0100
Commit: Caolán McNamara 
CommitDate: Sun Mar 26 10:10:39 2023 +

tdf#149485: Revert "tdf#142450 add code to store showing whitespace"

This reverts commit 5b07acbf3345918f450fccf7ee243ad5bcb3fd67.

The reverted commit claims that
"This option is stored at the document level like the other
layout options."
which is not true. The option is saved in the user profile,
which makes other documents to look wrong.
Reverting for now until it's implemented at document level
as the commit suggests

Change-Id: I2ae0daeb410090949f1b6cfc8245b711fe518216
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149541
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 
(cherry picked from commit 3795729fd0f4bc4769d69b45d3536c7b01692b92)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149521
Reviewed-by: Caolán McNamara 

diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
index 520737ab7e24..d30424946523 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
@@ -1610,14 +1610,6 @@
   
   false
 
-
-  
-  
-Specifies whether to hide whitespace.
-View Layout Hide Whitespace
-  
-  false
-
   
 
 
diff --git a/sw/source/uibase/config/usrpref.cxx 
b/sw/source/uibase/config/usrpref.cxx
index 45590d5e0b8a..e2599f4092b3 100644
--- a/sw/source/uibase/config/usrpref.cxx
+++ b/sw/source/uibase/config/usrpref.cxx
@@ -271,9 +271,8 @@ Sequence SwLayoutViewConfig::GetPropertyNames() 
const
 "Other/IsSquaredPageMode",  //17
 "Other/ApplyCharUnit",  //18
 "Window/ShowScrollBarTips", //19
-"ViewLayout/HideWhitespace",//20
 };
-const int nCount = m_bWeb ? 13 : 21;
+const int nCount = m_bWeb ? 13 : 20;
 Sequence aNames(nCount);
 OUString* pNames = aNames.getArray();
 for(int i = 0; i < nCount; i++)
@@ -335,7 +334,6 @@ void SwLayoutViewConfig::ImplCommit()
 case 17: rVal <<= m_rParent.IsSquaredPageMode(); break;
   // "Other/IsSquaredPageMode",
 case 18: rVal <<= m_rParent.IsApplyCharUnit(); break;  
   // "Other/ApplyCharUnit",
 case 19: rVal <<= m_rParent.IsShowScrollBarTips(); break;  
   // "Window/ShowScrollBarTips",
-case 20: rVal <<= m_rParent.IsHideWhitespaceMode(); break; 
   // "ViewLayout/HideWhitespace"
 }
 }
 PutProperties(aNames, aValues);
@@ -391,7 +389,6 @@ void SwLayoutViewConfig::Load()
 case 17: m_rParent.SetDefaultPageMode(bSet,true); break;// 
"Other/IsSquaredPageMode",
 case 18: m_rParent.SetApplyCharUnit(bSet, true); break;// 
"Other/ApplyUserChar"
 case 29: m_rParent.SetShowScrollBarTips(bSet); break;// 
"Window/ShowScrollBarTips",
-case 20: m_rParent.SetHideWhitespaceMode(bSet); break;// 
"ViewLayout/HideWhitespace"
 }
 }
 }
diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx
index 0808b37a71f8..ceb0de4c39ca 100644
--- a/sw/source/uibase/uiview/view.cxx
+++ b/sw/source/uibase/uiview/view.cxx
@@ -1352,7 +1352,6 @@ void SwView::ReadUserDataSequence ( const uno::Sequence < 
beans::PropertyValue >
 sal_Int16 nZoomFactor = static_cast < sal_Int16 > (pVOpt->GetZoom());
 bool bViewLayoutBookMode = pVOpt->IsViewLayoutBookMode();
 sal_Int16 nViewLayoutColumns = pVOpt->GetViewLayoutColumns();
-bool bHideWhitespace = pVOpt->IsHideWhitespaceMode();
 
 bool bSelectedFrame = ( m_pWrtShell->GetSelFrameType() != 
FrameTypeFlags::NONE ),
  bGotVisibleLeft = false,
@@ -1360,7 +1359,6 @@ void SwView::ReadUserDataSequence ( const uno::Sequence < 
beans::PropertyValue >
  bGotVisibleBottom = false, bGotZoomType = false,
  bGotZoomFactor = false, bGotIsSelectedFrame = false,
  bGotViewLayoutColumns = false, bGotViewLayoutBookMode = false,
- bGotHideWhitespace = false,
  bBrowseMode = false, bGotBrowseMode = false;
 bool bKeepRatio = pVOpt->IsKeepRatio();
 bool bGotKeepRatio = false;
@@ -1436,11 +1434,6 @@ void SwView::ReadUserDataSequence ( const uno::Sequence 
< beans::PropertyValue >
 rValue.Value >>= bKeepRatio;
 bGotKeepRatio = true;
 

Re: ESC meeting minutes: 2023-03-09

[Julien Nabet]

Well one thing we could do to improve the situation is to get the graphic
backend tests up and working for Skia (on the first run and every time the
LO version changes - maybe we could also track the vulkan driver version?
would need some work I guess), and if the backend tests fail with the Skia
vulkan backend, we could revert to the raster one and automatically restart
LO. This could probably prevent users from getting corrupted UI or similar
issues and blacklist wouldn't probably be needed anymore. I may look into
this when I have some free time...


It would be great indeed!

Meanwhile, just for the record I've submitted a new blacklist patch for 
https://bugs.documentfoundation.org/show_bug.cgi?id=154378


https://gerrit.libreoffice.org/c/core/+/149617

(in this one I included the graphic driver version in the xml).

Re: ESC meeting minutes: 2023-03-09

[Julien Nabet]

Much of the initial Skia work was done by Lubos, who isn't really active
these days. So I'm afraid we don't have an obvious expert for Skia right
now, it's more like if people run into problems, they fix it, like so
many other areas of the codebase.
Yeah I know it was Luboš but I didn't want to name him in order to avoid 
people think I consider he's the culprit, to put it clearly, I do not 
think so. He made a great job but badfully and as I had feared, he had 
no backup, here too, the culprit is not a person but rather the 
organization and I got no solution here.


I'm not sure to understand the sentence "if people run into problems, 
they fix it".


When users runned LO smoothly in older LO versions and encounter Skia pb 
in a recent LO version, it's a kind of regression for them and I don't 
think it's their job to fix it.


First thing is I'm not sure non-dev people know about Skia so we can't 
expect people to think about disabling hardware Skia renderer when 
having a crash or some graphical glitch.


If we can't properly fix the pb, we can at least blacklist the card for 
Skia hardware rendering.

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

[Andrea Gelmini (via logerrit)]

 drawinglayer/source/processor2d/vclpixelprocessor2d.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8361cef32d54d2dec32e22c35c6d77ca792ae90a
Author: Andrea Gelmini 
AuthorDate: Fri Mar 24 11:36:38 2023 +0100
Commit: Julien Nabet 
CommitDate: Sun Mar 26 08:09:32 2023 +

Fix typos

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

diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx 
b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
index 0f77b4eada3a..d6da12a1e32e 100644
--- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
@@ -1003,7 +1003,7 @@ void VclPixelProcessor2D::processFillGradientPrimitive2D(
 if (bTryDirectRender)
 {
 // MCGR: Avoid one level of primitive creation, use 
FillGradientPrimitive2D
-// tooling to directly create needed geoemtry & color for getting 
better
+// tooling to directly create needed geometry & color for getting 
better
 // performance (partially compensate for potentially more 
expensive multi
 // color gradients).
 // To handle a primitive that needs paint, either use decompose, 
or - when you
@@ -1012,7 +1012,7 @@ void VclPixelProcessor2D::processFillGradientPrimitive2D(
 // since primitives by definition are self-contained what means 
they have all
 // needed data locally available to do so.
 // The question is the complexity to invest - the implemented 
decompose
-// is always a good hint what is neeed to do this. In this case I 
decided
+// is always a good hint of what is needed to do this. In this 
case I decided
 // to add some tooling methods to the primitive itself to support 
this. These
 // are used in decompose and can be used - as here now - for 
direct handling,
 // too. This is always a possibility in primitive handling - you 
can, but do not

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

[Mike Kaganski (via logerrit)]

 dbaccess/source/filter/hsqldb/fbcreateparser.cxx |   33 ---
 1 file changed, 12 insertions(+), 21 deletions(-)

New commits:
commit b6dc6712aef820c2d296101961b163d665633d9a
Author: Mike Kaganski 
AuthorDate: Sun Mar 26 10:02:26 2023 +0300
Commit: Mike Kaganski 
CommitDate: Sun Mar 26 08:04:42 2023 +

Simplify FbCreateStmtParser::compose

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

diff --git a/dbaccess/source/filter/hsqldb/fbcreateparser.cxx 
b/dbaccess/source/filter/hsqldb/fbcreateparser.cxx
index 1740998c62d2..5d4244f8085b 100644
--- a/dbaccess/source/filter/hsqldb/fbcreateparser.cxx
+++ b/dbaccess/source/filter/hsqldb/fbcreateparser.cxx
@@ -29,12 +29,6 @@ using namespace css::sdbc;
 
 namespace
 {
-void lcl_appendWithSpace(OUStringBuffer& sBuff, std::u16string_view sStr)
-{
-sBuff.append(" ");
-sBuff.append(sStr);
-}
-
 OUString lcl_DataTypetoFbTypeName(sal_Int32 eType)
 {
 switch (eType)
@@ -110,8 +104,7 @@ void 
FbCreateStmtParser::appendPrimaryKeyPart(OUStringBuffer& rSql) const
 if (sPrimaryKeys.empty())
 return; // no primary key specified
 
-rSql.append(",");
-rSql.append("PRIMARY KEY(");
+rSql.append(",PRIMARY KEY(");
 auto it = sPrimaryKeys.cbegin();
 while (it != sPrimaryKeys.end())
 {
@@ -135,15 +128,14 @@ OUString FbCreateStmtParser::compose() const
 {
 ensureProperTableLengths();
 OUStringBuffer sSql(128);
-sSql.append("CREATE TABLE " + getTableName());
+sSql.append("CREATE TABLE " + getTableName() + " ("); // column declaration
 
-lcl_appendWithSpace(sSql, u"("); // column declaration
 auto& rColumns = getColumnDef();
 auto columnIter = rColumns.cbegin();
 while (columnIter != rColumns.end())
 {
-lcl_appendWithSpace(sSql, columnIter->getName());
-lcl_appendWithSpace(sSql, 
lcl_DataTypetoFbTypeName(columnIter->getDataType()));
+sSql.append(" " + columnIter->getName() + " "
++ lcl_DataTypetoFbTypeName(columnIter->getDataType()));
 
 std::vector params{ columnIter->getParams() };
 
@@ -173,31 +165,30 @@ OUString FbCreateStmtParser::compose() const
 // special modifiers here, based on type (e.g. charset, subtype)
 OUString sModifier = lcl_getTypeModifier(columnIter->getDataType());
 if (!sModifier.isEmpty())
-lcl_appendWithSpace(sSql, sModifier);
+sSql.append(" " + sModifier);
 
 if (columnIter->isAutoIncremental())
 {
-lcl_appendWithSpace(sSql, u"GENERATED BY DEFAULT AS IDENTITY 
(START WITH ");
-
 // start with 0:
 // HSQLDB: first value will be 0.
 // Firebird: first value will be 1.
-sSql.append(OUString::number(columnIter->getStartValue() - 1) + 
")");
+sSql.append(" GENERATED BY DEFAULT AS IDENTITY (START WITH "
++ OUString::number(columnIter->getStartValue() - 1) + 
")");
 }
 else if (!columnIter->isNullable())
-lcl_appendWithSpace(sSql, u"NOT NULL");
+sSql.append(" NOT NULL");
 
 if (columnIter->isCaseInsensitive())
-lcl_appendWithSpace(sSql, u"COLLATE UNICODE_CI");
+sSql.append(" COLLATE UNICODE_CI");
 
 const OUString& sDefaultVal = columnIter->getDefault();
 if (!sDefaultVal.isEmpty())
 {
-lcl_appendWithSpace(sSql, u"DEFAULT");
+sSql.append(" DEFAULT ");
 if (sDefaultVal.equalsIgnoreAsciiCase("NOW"))
-lcl_appendWithSpace(sSql, u"\'NOW\'"); // Fb likes it single 
quoted
+sSql.append("'NOW'"); // Fb likes it single quoted
 else
-lcl_appendWithSpace(sSql, sDefaultVal);
+sSql.append(sDefaultVal);
 }
 
 ++columnIter;