[FIXED] Re: TB 77 Windows ARM fails because new lib "frozen" isn't taken into account

[Julien Nabet]

It's been fixed with fdfc6eb3fd37f87d51d1836d01259a14a4346a45

Thank you Christian!

[Libreoffice-commits] core.git: external/libtommath

[Taichi Haradaguchi (via logerrit)]

 external/libtommath/README |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d1ee7e816cc8f4edd146a035cd37ef848738bc21
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Thu Jun 29 23:31:13 2023 +0900
Commit: Julien Nabet 
CommitDate: Fri Jun 30 07:26:28 2023 +0200

Fix typos in external/libtommath/README

The LibTom Projects website is not "http://www.libtom.org/";
but "https://www.libtom.net/";

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

diff --git a/external/libtommath/README b/external/libtommath/README
index 0da3128c5404..a028ff733161 100644
--- a/external/libtommath/README
+++ b/external/libtommath/README
@@ -3,4 +3,4 @@ integer library written entirely in C.
 
 Used by embedded firebird (external/firebird).
 
-http://www.libtom.org/LibTomMath/
+https://www.libtom.net/LibTomMath/

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

[gilssonn (via logerrit)]

 drawinglayer/source/primitive2d/borderlineprimitive2d.cxx  |   21 ++---
 drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx |   10 +-
 2 files changed, 6 insertions(+), 25 deletions(-)

New commits:
commit d61baaff35e6b180c17b3d93309f00e0255e1a9b
Author: gilssonn 
AuthorDate: Sat Jun 10 21:45:48 2023 -0400
Commit: Ilmari Lauhakangas 
CommitDate: Fri Jun 30 06:53:33 2023 +0200

Corrective and refactoring changes in drawinglayer module

Correct and simplify comparison logic
and use std::transform for vector assignment.

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

diff --git a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx 
b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
index 45536a53124b..f54b71417735 100644
--- a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
@@ -282,23 +282,10 @@ namespace drawinglayer::primitive2d
 
 const BorderLinePrimitive2D& rCompare = static_cast(rPrimitive);
 
-if (getStart() == rCompare.getStart()
-&& getEnd() == rCompare.getEnd()
-&& getStrokeAttribute() == rCompare.getStrokeAttribute())
-{
-if (getBorderLines().size() == 
rCompare.getBorderLines().size())
-{
-for (size_t a(0); a < getBorderLines().size(); a++)
-{
-if (!(getBorderLines()[a] == 
rCompare.getBorderLines()[a]))
-{
-return false;
-}
-}
-}
-}
-
-return false;
+return (getStart() == rCompare.getStart()
+&& getEnd() == rCompare.getEnd()
+&& getStrokeAttribute() == rCompare.getStrokeAttribute()
+&& getBorderLines() == rCompare.getBorderLines());
 }
 
 // provide unique ID
diff --git a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx 
b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
index 955e6bd4f9ca..2b015fdad39b 100644
--- a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
@@ -485,10 +485,7 @@ namespace drawinglayer::primitive3d
 
 Primitive3DContainer aRetval(aResultVector.size());
 
-for(size_t a(0); a < aResultVector.size(); a++)
-{
-aRetval[a] = Primitive3DReference(aResultVector[a]);
-}
+std::transform(aResultVector.cbegin(), aResultVector.cend(), 
aRetval.begin(), [](auto &rResult){return Primitive3DReference(rResult);});
 
 return aRetval;
 }
@@ -707,10 +704,7 @@ using namespace com::sun::star;
 // prepare return value
 Primitive3DContainer aRetval(aResultVector.size());
 
-for(size_t a(0); a < aResultVector.size(); a++)
-{
-aRetval[a] = Primitive3DReference(aResultVector[a]);
-}
+std::transform(aResultVector.cbegin(), aResultVector.cend(), 
aRetval.begin(), [](auto &rResult){return Primitive3DReference(rResult);});
 
 return aRetval;
 }

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

[Mike Kaganski (via logerrit)]

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

New commits:
commit 4e20f95cf6744ca85bc8c090b926031729addc89
Author: Mike Kaganski 
AuthorDate: Thu Jun 29 23:58:32 2023 +0300
Commit: Mike Kaganski 
CommitDate: Fri Jun 30 01:03:29 2023 +0200

tdf#156091: handle OWN_ATTR_TEXTCOLUMNS in 
SdStyleSheet::getPropertyValue_Impl

Somehow I failed to implement this from start. In commit
95ebd24a629b4c8cd62cc20c0701683512cc8fa0 (editengine-columns:
ODF support [API CHANGE], 2021-06-08), I implemented its
support in SdStyleSheet::getPropertyState; then, in commit
f2ea39c70da3f82bb39f8b51b5484172360b1fc2 (Avoid crash getting
default item for OWN_ATTR_TEXTCOLUMNS, 2021-06-22), I added
its support in SdStyleSheet::setPropertyValue; and finally,
the time has come to support getting its value. Better late
than never.

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

diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index fe981d8bca45..4ea270b4f38e 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -51,6 +51,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -1146,6 +1147,19 @@ css::uno::Any SdStyleSheet::getPropertyValue_Impl(const 
OUString& PropertyName)
 {
 aAny <<= IsHidden( );
 }
+else if (pEntry->nWID == OWN_ATTR_TEXTCOLUMNS)
+{
+const SfxItemSet& rStyleSet = GetItemSet();
+
+auto xIf = SvxXTextColumns_createInstance();
+css::uno::Reference xCols(xIf, 
css::uno::UNO_QUERY_THROW);
+
xCols->setColumnCount(rStyleSet.Get(SDRATTR_TEXTCOLUMNS_NUMBER).GetValue());
+css::uno::Reference xProp(xIf, 
css::uno::UNO_QUERY_THROW);
+xProp->setPropertyValue(
+"AutomaticDistance",
+
css::uno::Any(rStyleSet.Get(SDRATTR_TEXTCOLUMNS_SPACING).GetValue()));
+aAny <<= xIf;
+}
 else
 {
 SfxItemSet aSet( GetPool()->GetPool(), pEntry->nWID, pEntry->nWID);

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - translations

[Christian Lohmaier (via logerrit)]

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

New commits:
commit a2ba85878bfbb05629a2d624bdc3cfa418f73923
Author: Christian Lohmaier 
AuthorDate: Fri Jun 30 00:55:14 2023 +0200
Commit: Gerrit Code Review 
CommitDate: Fri Jun 30 00:55:14 2023 +0200

Update git submodules

* Update translations from branch 'distro/collabora/co-23.05'
  to e29825d93a16003fbc89619b4f904a597244a1c7
  - update translations for 7.5.5 rc1

and force-fix errors using pocheck

Change-Id: Icc73b706f8853c092a5ed1c39c3c147ec4899c7f

  - update translations for 7.5.5 rc1

and force-fix errors using pocheck

Change-Id: Iaa3bbcd4bcbe2d339c002ccdafd63d52e3914e77

  - update translations for 7-5

and force-fix errors using pocheck

Change-Id: I12e673f8edd2fc4293de4c161c9afdeda3bffcdb

diff --git a/translations b/translations
index 06777a927707..e29825d93a16 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 06777a9277072ef5a3382b3168f3edf33d2aa511
+Subproject commit e29825d93a16003fbc89619b4f904a597244a1c7

[Libreoffice-commits] translations.git: Branch 'distro/collabora/co-23.05' - 3 commits - source/ab source/af source/an source/ar source/ast source/bg source/bo source/ca source/ckb source/cy source/da

[Christian Lohmaier (via logerrit)]

 source/ab/chart2/messages.po   
|   60 
 source/ab/cui/messages.po  
|   14 
 source/ab/extras/source/autocorr/emoji.po  
|   20 
 source/ab/filter/messages.po   
|  149 
 source/ab/filter/source/config/fragments/internalgraphicfilters.po 
|4 
 source/ab/formula/messages.po  
|6 
 source/ab/instsetoo_native/inc_openoffice/windows/msi_languages.po 
|8 
 source/ab/librelogo/source/pythonpath.po   
|6 
 source/ab/officecfg/registry/data/org/openoffice/Office.po 
|6 
 source/ab/officecfg/registry/data/org/openoffice/Office/UI.po  
|  106 
 source/ab/readlicense_oo/docs.po   
|   10 
 source/ab/sc/messages.po   
|  160 
 source/ab/scp2/source/ooo.po   
|   24 
 source/ab/sd/messages.po   
|  329 
 source/ab/sfx2/messages.po 
|  180 
 source/ab/svtools/messages.po  
|  128 
 source/ab/svx/messages.po  
|  290 
 source/ab/sw/messages.po   
|  116 
 source/ab/vcl/messages.po  
|  160 
 source/ab/wizards/source/resources.po  
|   34 
 source/ab/xmlsecurity/messages.po  
|4 
 source/af/officecfg/registry/data/org/openoffice/Office/UI.po  
|6 
 source/af/sw/messages.po   
|6 
 source/an/avmedia/messages.po  
|8 
 source/an/basctl/messages.po   
|   13 
 source/an/chart2/messages.po   
|4 
 source/an/cui/messages.po  
|   28 
 source/an/dbaccess/messages.po 
|8 
 source/an/extras/source/autocorr/emoji.po  
|4 
 source/an/filter/messages.po   
|4 
 source/an/formula/messages.po  
|6 
 source/an/fpicker/messages.po  
|4 
 source/an/framework/messages.po
|8 
 source/an/officecfg/registry/data/org/openoffice/Office.po 
|   12 
 source/an/officecfg/registry/data/org/openoffice/Office/UI.po  
|   70 
 source/an/reportdesign/messages.po 
|9 
 source/an/sc/messages.po   
|   26 
 source/an/sd/messages.po   
|8 
 source/an/sfx2/messages.po 
|8 
 source/an/svtools/messages.po  
|4 
 source/an/svx/messages.po  
|   29 
 source/an/sw/messages.po   
|   38 
 source/an/vcl/messages.po  
|6 
 source/ar/basctl/messages.po   
|   14 
 source/ar/chart2/messages.po   
|   22 
 source/ar/connectivity/registry/flat/org/openoffice/Office/DataAccess.po   
|   10 
 source/ar/connectivity/registry/mysqlc/org/openoffice/Office/DataAccess.po 
|   10 
 source/ar/cui/messages.po  
|  140 
 source/ar/dbaccess/messages.po 
|   24 
 source/ar/desktop/messages.po  
|   40 
 source/ar/dictionaries/fa_IR.po
|   12 
 source/ar/dictionaries/th_TH.po
|   10 
 source/ar/editeng/messages.po  
|   12 
 source/ar/extensions/messages.po   
|   30 
 source/ar/filter/messages.po   
|   10 
 source/ar/forms/messages.po
|   10 
 source/ar/inst

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - 10 commits - download.lst external/pdfium include/xmloff sc/inc sc/qa sc/source sd/qa sd/source svx/source sw/qa sw/source xmloff/q

[Czeber László Ádám (via logerrit)]

 download.lst|8 
 external/pdfium/Library_pdfium.mk   |1 
 external/pdfium/UnpackedTarball_pdfium.mk   |8 
 external/pdfium/abseil-trivial.patch|   31 ---
 external/pdfium/build.patch.1   |  170 ++--
 external/pdfium/inc/pch/precompiled_pdfium.hxx  |2 
 external/pdfium/include.patch   |   11 -
 include/xmloff/xmlimp.hxx   |1 
 sc/inc/column.hxx   |6 
 sc/qa/unit/ucalc_copypaste.cxx  |   45 +
 sc/source/core/data/table1.cxx  |5 
 sc/source/core/data/table2.cxx  |3 
 sc/source/ui/view/output2.cxx   |5 
 sd/qa/uitest/data/tdf155863.odp |binary
 sd/qa/uitest/impress_tests/tdf155863.py |   34 
 sd/source/filter/xml/sdxmlwrp.cxx   |2 
 svx/source/svdraw/svdograf.cxx  |   24 +-
 sw/qa/extras/layout/data/tox-update-wrong-pages.odt |binary
 sw/qa/extras/layout/layout.cxx  |   34 
 sw/source/core/inc/frmtool.hxx  |1 
 sw/source/core/layout/flowfrm.cxx   |   20 ++
 sw/source/core/layout/sectfrm.cxx   |3 
 xmloff/qa/unit/uxmloff.cxx  |   65 ---
 xmloff/source/core/xmlimp.cxx   |   80 ++---
 xmloff/source/meta/xmlmetai.cxx |4 
 25 files changed, 347 insertions(+), 216 deletions(-)

New commits:
commit 07f3199b06ef767c1d1378a6e4f270ef0f05f479
Author: Czeber László Ádám 
AuthorDate: Mon Jun 12 16:12:05 2023 +0200
Commit: Andras Timar 
CommitDate: Fri Jun 30 00:52:49 2023 +0200

tdf#122676 sc: fix format with * (filling) and NBSP thousand separator

Numbers containing no-break space (NBSP) thousand separator enabled
the EditEngine layout, losing filling e.g. for stretching spaces.
Enable EditEngine for NBSP characters only if there is no filling
in the number format code, fixing MSO interoperability, too.

In number format codes, asterisk (*) followed by a character is used
to fill the available space in the column with that character, e.g.
format code

[>0]" "* # ##0" € ";[<0]-* # ##0" € ";" "* -#" € ";" "@" "

put the minus sign at the left side of the column, while
the number at the right side of the column. Because of the NBSP
thousand separator, bigger numbers got different layout previously,
i.e. minus signs right next to the numbers.

Note: there is a better solution for the layout problem: using narrow
no-break space (U-202F), which is the proposed thousand separator in
typography, and it's back-compatible, because it doesn't enable the 
different layout.

Change-Id: Ia35f01733687ee6005f06ff3ab999b7a4b712ad4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152901
Reviewed-by: László Németh 
Tested-by: László Németh 
(cherry picked from commit 72e70088dc45fbe15f809abf5263247b13d937ac)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153337
Tested-by: Jenkins

diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index 649ccdd7349e..fe8d06684517 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -815,6 +815,11 @@ bool ScDrawStringsVars::HasEditCharacters() const
 switch(aString[nIdx])
 {
 case CHAR_NBSP:
+// tdf#122676: Ignore CHAR_NBSP (this is thousand separator in 
any number)
+// if repeat character is set
+if (nRepeatPos < 0)
+return true;
+break;
 case CHAR_SHY:
 case CHAR_ZWSP:
 case CHAR_LRM:
commit 738d7c7198a7697c9311343ebd10c7e56ac9f5d5
Author: Michael Stahl 
AuthorDate: Tue Jun 27 14:50:02 2023 +0200
Commit: Andras Timar 
CommitDate: Fri Jun 30 00:52:48 2023 +0200

xmloff: ODF import: adapt generator parsing to 2-digit major versions

DocumentInfo currently assumes that a LO version encoded in "BuildId"
property has only 1 digit major version, which is now wrong and would
start to give incorrect results when major version "30" will be detected
as LO_3x.

Add the dots as separators into the BuildId because it's not going to
work without.

Change-Id: I8918afe3642cbefa8488c57658f1505c9a20eddd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153649
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit b1ce8bb078904db1df542f7a1c2ed527dde1a2d3)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153689
Reviewed-by: Christian Lohmaier 

diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx
index 26873175268d..3684a7e087b5 100644
---

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - sw/uiconfig

[Aron Budea (via logerrit)]

 sw/uiconfig/swriter/ui/pagenumberdlg.ui |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit fd79d1169b608f461d4ea8df24f61f34b80401f5
Author: Aron Budea 
AuthorDate: Thu Jun 29 04:51:10 2023 +0200
Commit: Andras Timar 
CommitDate: Fri Jun 30 00:49:36 2023 +0200

tdf#155706 tdf#86630 sw page number wizard: make OK default

Change-Id: If1b902d34157be8c9eab2d5ec140f5e85dfc49e5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153731
Tested-by: Jenkins
Reviewed-by: Justin Luth 
(cherry picked from commit 19fbd6862302065cdf490085d1a8fea49f73d6ca)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153753
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/sw/uiconfig/swriter/ui/pagenumberdlg.ui 
b/sw/uiconfig/swriter/ui/pagenumberdlg.ui
index 27f9bbed1543..f014545da429 100644
--- a/sw/uiconfig/swriter/ui/pagenumberdlg.ui
+++ b/sw/uiconfig/swriter/ui/pagenumberdlg.ui
@@ -24,6 +24,8 @@
 _OK
 True
 True
+True
+True
 True
 True
   

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - download.lst

[Caolán McNamara (via logerrit)]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 43c8181b6555e1800afc177461542276c7298312
Author: Caolán McNamara 
AuthorDate: Sun Jun 25 20:04:39 2023 +0100
Commit: Andras Timar 
CommitDate: Fri Jun 30 00:47:03 2023 +0200

upgrade libtiff to 4.5.1

Change-Id: Ia07f368a371930f655bdc3495e76295dad740d30
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153570
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
(cherry picked from commit 3b302b98795310befdae4a4f925ab9921682b79c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153652
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/download.lst b/download.lst
index 5a3a228e35d7..2c088d10cf1d 100644
--- a/download.lst
+++ b/download.lst
@@ -512,8 +512,8 @@ LIBPNG_TARBALL := libpng-1.6.39.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBTIFF_SHA256SUM := 
dafac979c5e7b6c650025569c5a4e720995ba5f17bc17e6276d1f12427be267c
-LIBTIFF_TARBALL := tiff-4.5.0rc3.tar.xz
+LIBTIFF_SHA256SUM := 
3c080867114c26edab3129644a63b708028a90514b7fe3126e38e11d24f9f88a
+LIBTIFF_TARBALL := tiff-4.5.1.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - editeng/source sc/source sd/qa

[Stephan Bergmann (via logerrit)]

 editeng/source/accessibility/AccessibleEditableTextPara.cxx |3 +--
 sc/source/ui/drawfunc/drtxtob.cxx   |3 ++-
 sc/source/ui/view/editsh.cxx|3 ++-
 sd/qa/unit/tiledrendering/tiledrendering.cxx|8 
 4 files changed, 9 insertions(+), 8 deletions(-)

New commits:
commit 67a663626d6a45acfad686f46686c356336f443a
Author: Stephan Bergmann 
AuthorDate: Thu Nov 3 09:14:18 2022 +0100
Commit: Andras Timar 
CommitDate: Fri Jun 30 00:46:10 2023 +0200

-Werror=dangling-reference

In


"c++: Implement -Wdangling-reference [PR106393]" grew a new warning, 
included in
-Wall, and based on some more-or-less shaky heuristics, that warns about
"possibly dangling reference to a temporary".  It produces quite a number of
false positives, but for these uses of SfxItemSet::Get it does look 
plausible
that the returned item references could, at least in theory, point at data 
that
is destroyed along with the temporary SfxItemSet.

Change-Id: I11afc4512db488f73170c6cfa706e9e094209550
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142217
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit e0121b2478526d803681d57d59af0cbf9cf602b4)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153583
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx 
b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index e547767911e2..d6df9f91cabc 100644
--- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@@ -1525,8 +1525,7 @@ namespace accessibility
 // NumberingLevel
 if (rRes.Name == "NumberingLevel")
 {
-const SvxNumBulletItem& rNumBullet = 
rCacheTF.GetParaAttribs(GetParagraphIndex()).Get(EE_PARA_NUMBULLET);
-if(rNumBullet.GetNumRule().GetLevelCount()==0)
+
if(rCacheTF.GetParaAttribs(GetParagraphIndex()).Get(EE_PARA_NUMBULLET).GetNumRule().GetLevelCount()==0)
 {
 rRes.Value <<= sal_Int16(-1);
 rRes.Handle = -1;
diff --git a/sc/source/ui/drawfunc/drtxtob.cxx 
b/sc/source/ui/drawfunc/drtxtob.cxx
index 9303380ca494..6d26bdcc6a4c 100644
--- a/sc/source/ui/drawfunc/drtxtob.cxx
+++ b/sc/source/ui/drawfunc/drtxtob.cxx
@@ -204,7 +204,8 @@ void ScDrawTextObjectBar::Execute( SfxRequest &rReq )
 
 case SID_CHARMAP:
 {
-const SvxFontItem& rItem = 
pOutView->GetAttribs().Get(EE_CHAR_FONTINFO);
+auto const attribs = pOutView->GetAttribs();
+const SvxFontItem& rItem = attribs.Get(EE_CHAR_FONTINFO);
 
 OUString aString;
 std::shared_ptr 
aNewItem(std::make_shared(EE_CHAR_FONTINFO));
diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx
index ba0abdc433c4..331b343950f6 100644
--- a/sc/source/ui/view/editsh.cxx
+++ b/sc/source/ui/view/editsh.cxx
@@ -382,8 +382,9 @@ void ScEditShell::Execute( SfxRequest& rReq )
 sal_uInt16 nFontWhich = ( nScript == SvtScriptType::ASIAN ) ? 
EE_CHAR_FONTINFO_CJK :
 ( ( nScript == SvtScriptType::COMPLEX ) ? 
EE_CHAR_FONTINFO_CTL :
 
EE_CHAR_FONTINFO );
+auto const attribs = pTableView->GetAttribs();
 const SvxFontItem& rItem = static_cast(
-pTableView->GetAttribs().Get(nFontWhich));
+attribs.Get(nFontWhich));
 
 OUString aString;
 std::shared_ptr 
aNewItem(std::make_shared(EE_CHAR_FONTINFO));
diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx 
b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index 3a449e76004d..ab2897b08441 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -1502,8 +1502,8 @@ void SdTiledRenderingTest::testTdf102223()
 EditView& rEditView = pView->GetTextEditOutlinerView()->GetEditView();
 rEditView.SetSelection(ESelection(0, 0, 0, 3)); // start para, start char, 
end para, end char.
 CPPUNIT_ASSERT_EQUAL(OUString("Red"), rEditView.GetSelected());
-const SvxFontHeightItem& rItem = 
rEditView.GetAttribs().Get(EE_CHAR_FONTHEIGHT);
-CPPUNIT_ASSERT_EQUAL(int(1411), static_cast(rItem.GetHeight()));
+CPPUNIT_ASSERT_EQUAL(
+int(1411), 
static_cast(rEditView.GetAttribs().Get(EE_CHAR_FONTHEIGHT).GetHeight()));
 
 // cut contents of cell
 uno::Sequence aArgs;
@@ -1514,8 +1514,8 @@ void SdTiledRenderingTest::testTdf102223()
 CPPUNIT_ASSERT(pView->GetTextEditObject());
   

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

[Justin Luth (via logerrit)]

 sw/source/filter/ww8/ww8par6.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 7afa9ba25311e70d31cd5bce66191c3d785630cc
Author: Justin Luth 
AuthorDate: Thu Jun 29 16:49:11 2023 -0400
Commit: Justin Luth 
CommitDate: Fri Jun 30 00:09:54 2023 +0200

sw doc import: suggest setting ADD_EXT_LEADING = false might be wrong

Historically, it switched from forcing on to forcing off.
A bug report suggests it shouldn't do either one...

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

diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 4758c4646286..fbcf566a0897 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -263,6 +263,7 @@ void SwWW8ImplReader::SetDocumentGrid(SwFrameFormat 
&rFormat, const wwSection &r
 
 // seem to not add external leading in word, or the character would run 
across
 // two line in some cases.
+// TODO: tdf#85435 suggests that this is wrong
 if (eType != GRID_NONE)
 
m_rDoc.getIDocumentSettingAccess().set(DocumentSettingId::ADD_EXT_LEADING, 
false);
 

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

[Xisco Fauli (via logerrit)]

 svgio/inc/svgimagenode.hxx  |1 -
 svgio/inc/svgtools.hxx  |2 +-
 svgio/source/svgreader/svgimagenode.cxx |4 ++--
 svgio/source/svgreader/svgtools.cxx |9 -
 4 files changed, 7 insertions(+), 9 deletions(-)

New commits:
commit 104a252dfafc2edc59a9aad30a34f032b749c526
Author: Xisco Fauli 
AuthorDate: Thu Jun 29 17:42:19 2023 +0200
Commit: Xisco Fauli 
CommitDate: Thu Jun 29 23:23:04 2023 +0200

svgio: simplify code

Change-Id: I18c4179c36c052cc0ed5b416125e72d542cb7407
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153749
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 
(cherry picked from commit 210f2345c2eea2c52b673e2327a2ed096d9a888a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153757

diff --git a/svgio/inc/svgimagenode.hxx b/svgio/inc/svgimagenode.hxx
index 171a863d8fd0..074b659783b3 100644
--- a/svgio/inc/svgimagenode.hxx
+++ b/svgio/inc/svgimagenode.hxx
@@ -43,7 +43,6 @@ namespace svgio::svgreader
 OUString   maXLink;// internal link
 OUString   maUrl;  // external link
 
-OUString   maMimeType; // mimetype and
 OUString   maData; // base64 data
 
 public:
diff --git a/svgio/inc/svgtools.hxx b/svgio/inc/svgtools.hxx
index 1bca409001b6..f556ed6cde02 100644
--- a/svgio/inc/svgtools.hxx
+++ b/svgio/inc/svgtools.hxx
@@ -125,7 +125,7 @@ namespace svgio::svgreader
 typedef ::std::vector< OUString > SvgStringVector;
 bool readSvgStringVector(std::u16string_view rCandidate, 
SvgStringVector& rSvgStringVector);
 
-void readImageLink(const OUString& rCandidate, OUString& rXLink, 
OUString& rUrl, OUString& rMimeType, OUString& rData);
+void readImageLink(const OUString& rCandidate, OUString& rXLink, 
OUString& rUrl, OUString& rData);
 
 OUString consolidateContiguousSpace(const OUString& rCandidate);
 OUString xmlSpaceHandling(const OUString& rCandidate, bool bIsDefault);
diff --git a/svgio/source/svgreader/svgimagenode.cxx 
b/svgio/source/svgreader/svgimagenode.cxx
index d0e821a52092..fa7cbe675a13 100644
--- a/svgio/source/svgreader/svgimagenode.cxx
+++ b/svgio/source/svgreader/svgimagenode.cxx
@@ -141,7 +141,7 @@ namespace svgio::svgreader
 
 if(nLen)
 {
-readImageLink(aContent, maXLink, maUrl, maMimeType, 
maData);
+readImageLink(aContent, maXLink, maUrl, maData);
 }
 break;
 }
@@ -204,7 +204,7 @@ namespace svgio::svgreader
 const basegfx::B2DRange aTarget(fX, fY, fX + fWidth, fY + fHeight);
 basegfx::B2DRange aViewBox(aTarget);
 
-if(!maMimeType.isEmpty() && !maData.isEmpty())
+if(!maData.isEmpty())
 {
 // use embedded base64 encoded data
 css::uno::Sequence< sal_Int8 > aPass;
diff --git a/svgio/source/svgreader/svgtools.cxx 
b/svgio/source/svgreader/svgtools.cxx
index c45f4c5e9c61..9539fcf618b9 100644
--- a/svgio/source/svgreader/svgtools.cxx
+++ b/svgio/source/svgreader/svgtools.cxx
@@ -1354,11 +1354,10 @@ namespace svgio::svgreader
 return !rSvgStringVector.empty();
 }
 
-void readImageLink(const OUString& rCandidate, OUString& rXLink, 
OUString& rUrl, OUString& rMimeType, OUString& rData)
+void readImageLink(const OUString& rCandidate, OUString& rXLink, 
OUString& rUrl, OUString& rData)
 {
 rXLink.clear();
 rUrl.clear();
-rMimeType.clear();
 rData.clear();
 
 if(!readLocalLink(rCandidate, rXLink))
@@ -1376,11 +1375,11 @@ namespace svgio::svgreader
 skip_char(rCandidate, ' ', nPos, nLen);
 copyToLimiter(rCandidate, ';', nPos, aBuffer, nLen);
 skip_char(rCandidate, ' ', ';', nPos, nLen);
-rMimeType = aBuffer.makeStringAndClear();
+const OUString aMimeType = aBuffer.makeStringAndClear();
 
-if(!rMimeType.isEmpty() && nPos < nLen)
+if(!aMimeType.isEmpty() && nPos < nLen)
 {
-if(rMimeType.startsWith("image"))
+if(aMimeType.startsWith("image"))
 {
 // image data
 std::u16string_view 
aData(rCandidate.subView(nPos));

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

[László Németh (via logerrit)]

 sw/qa/extras/ooxmlexport/ooxmlexport14.cxx |   10 ++
 1 file changed, 10 insertions(+)

New commits:
commit 7520349b61a74e93a1d5d992f41b60631c3c5937
Author: László Németh 
AuthorDate: Thu Jun 29 11:13:28 2023 +0200
Commit: László Németh 
CommitDate: Thu Jun 29 23:18:44 2023 +0200

tdf#146346 fix unit test & extend it to empty multi-page footnote

Implementing multi-page floating tables resulted a partial
regression here: not last table of the footnote, but empty
paragraph under it resulted an empty split footnote on the
second page, without noticing the problem.

Problem with the previous unit test of tdf#146346 was
reported by Mike Kaganski: "using getPages, does *not*
fail when there are two pages - because getPages is
(problematically) implemented as jumping to the end of
the document (body!), and texting which page is this; and
for the original problem, only a part of footnotes moved
to the second page, while all the body text was on the page 1."

Add unit test to catch the original problem (all tables of the
footnote must be on the first page), which fix likely wasn't
tested correctly using only getPages(), also add a (disabled) test
for the new regression, too.

Follow-up to commit d1ac8df139a2a65db45d1970ccc0b80e17d827f6
"tdf#146346 DOCX import: fix table margins in footnotes".

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

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
index 204ab670dd6a..5edb4dcdcd11 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
@@ -1358,6 +1358,16 @@ DECLARE_OOXMLEXPORT_TEST(testTdf146346, "tdf146346.docx")
 {
 // This was 2 (by bad docDefault vertical margins around tables in 
footnotes)
 CPPUNIT_ASSERT_EQUAL(1, getPages());
+
+// only first page has table
+xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+
+// check first page: all tables on the first page
+assertXPath(pXmlDoc, "/root/page[1]//anchored/fly", 8);
+assertXPath(pXmlDoc, "/root/page[1]//anchored/fly/tab", 8);
+
+// FIXME no second page (regression since multi-page floating tables?)
+//assertXPath(pXmlDoc, "/root/page[2]", 0);
 }
 #endif
 

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

[Justin Luth (via logerrit)]

 sw/uiconfig/sglobal/popupmenu/preview.xml  |2 +-
 sw/uiconfig/sweb/popupmenu/preview.xml |2 +-
 sw/uiconfig/swform/popupmenu/preview.xml   |2 +-
 sw/uiconfig/swreport/popupmenu/preview.xml |2 +-
 sw/uiconfig/swriter/popupmenu/preview.xml  |2 +-
 sw/uiconfig/swxform/popupmenu/preview.xml  |2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 736cf835b9edb7a18fa52a12b03c252a9b63ff7c
Author: Justin Luth 
AuthorDate: Wed Jun 28 20:52:14 2023 -0400
Commit: Justin Luth 
CommitDate: Thu Jun 29 23:16:15 2023 +0200

tdf#118335 use .uno:ClosePreview instead of PrintPreview

in contexts where only closing the preview is useful.

Doing this will allow us to get rid of the PopupLabel on PrintPreview

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

diff --git a/sw/uiconfig/sglobal/popupmenu/preview.xml 
b/sw/uiconfig/sglobal/popupmenu/preview.xml
index 9581b125c69e..44b80e255092 100644
--- a/sw/uiconfig/sglobal/popupmenu/preview.xml
+++ b/sw/uiconfig/sglobal/popupmenu/preview.xml
@@ -14,5 +14,5 @@
   
   
   
-  
+  
 
diff --git a/sw/uiconfig/sweb/popupmenu/preview.xml 
b/sw/uiconfig/sweb/popupmenu/preview.xml
index 9581b125c69e..44b80e255092 100644
--- a/sw/uiconfig/sweb/popupmenu/preview.xml
+++ b/sw/uiconfig/sweb/popupmenu/preview.xml
@@ -14,5 +14,5 @@
   
   
   
-  
+  
 
diff --git a/sw/uiconfig/swform/popupmenu/preview.xml 
b/sw/uiconfig/swform/popupmenu/preview.xml
index 9581b125c69e..44b80e255092 100644
--- a/sw/uiconfig/swform/popupmenu/preview.xml
+++ b/sw/uiconfig/swform/popupmenu/preview.xml
@@ -14,5 +14,5 @@
   
   
   
-  
+  
 
diff --git a/sw/uiconfig/swreport/popupmenu/preview.xml 
b/sw/uiconfig/swreport/popupmenu/preview.xml
index 9581b125c69e..44b80e255092 100644
--- a/sw/uiconfig/swreport/popupmenu/preview.xml
+++ b/sw/uiconfig/swreport/popupmenu/preview.xml
@@ -14,5 +14,5 @@
   
   
   
-  
+  
 
diff --git a/sw/uiconfig/swriter/popupmenu/preview.xml 
b/sw/uiconfig/swriter/popupmenu/preview.xml
index 9581b125c69e..44b80e255092 100644
--- a/sw/uiconfig/swriter/popupmenu/preview.xml
+++ b/sw/uiconfig/swriter/popupmenu/preview.xml
@@ -14,5 +14,5 @@
   
   
   
-  
+  
 
diff --git a/sw/uiconfig/swxform/popupmenu/preview.xml 
b/sw/uiconfig/swxform/popupmenu/preview.xml
index 9581b125c69e..44b80e255092 100644
--- a/sw/uiconfig/swxform/popupmenu/preview.xml
+++ b/sw/uiconfig/swxform/popupmenu/preview.xml
@@ -14,5 +14,5 @@
   
   
   
-  
+  
 

[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-7.5.5.1'

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-7.5.5.1' created by Christian Lohmaier 
 at 2023-06-29 21:05 +

Tag libreoffice-7.5.5.1
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmSd8jcACgkQ9DSh76/u
rqN4Dg//VZOxadum5IWmraS5OIe58/2ImFz8oZYK1dBN/rMLPKfC8FcCwh0FHT37
9yn0TZO5rwHdSgFYgTUirYt8K5JTT1kuXZM06eBkSAm7BGh+JnmblAlVAU9StusF
PCg4JYMbRd10YnosJp//AuGZytKO++mRJvvT3AS3wKCnuL+Dg3JcSKKaJ4uZly2k
n78OdLu8YfYcoDXvASZAWzwZuPDfM17ecOirac02vjC+EyDYS/6HGO/IzwVgVp/2
V49HZFeK3vzfVMvA9dJvSQnEz+SWVT/N3v78JDXOmA7ExG3YDoLAFv+Z9uxpLFwD
PTBguRn1Y9349p0VElMduP71c8Bd0aiiuf3SX8e6TQ7lG3KFsWWeiudjsizlAK7a
7ztBunwLeBA6c4F8dj8qbsPN9wZjg4d8K5KyJ9dl0bwzfaAoFAxWaEtM85odUWS6
NMR0NFP6j3KAhmrawIncJKVYSV41Jx/fcAWLHO/k+AL8qYUzNSq8pTWcHFtzpvx/
0iqHDwNZ43rvoTTfVRevmMgZ1fsYNRblQGWXZn8bLWoMS9CuBslFRsewVslynY3C
6F0nHY6syzFZojNFJlzgDYG4J1nZ8LQ9XgBmIeJM9j8QKD2NmOCO90OhbHKBSieR
IMPVER3LatIefV4pKr+Se05OIfSvV7ZdK0mteb+PIXVP6mV0Lyg=
=hvg2
-END PGP SIGNATURE-

Changes since cp-23.05.1-2-4:
---
 0 files changed
---

[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-7.5.5.1'

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-7.5.5.1' created by Christian Lohmaier 
 at 2023-06-29 21:05 +

Tag libreoffice-7.5.5.1
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmSd8jcACgkQ9DSh76/u
rqNntRAAvt+C/+xRky6aw4dPq8U/bW9+d1P4F1x6KcBBiZYp74CTHkshowiwUAEL
Z7dtCgvwPZkFK8EvR80gHulLTaVIelgPEdQmGxQzn5Mq3cPQ9O2xXrcwg/rxtQeh
FZdraB51VQQfIxbec+SqsytrXbtiEkWz8C/hpyoFA1Ci1fJQbdwJWd75VYlh94XN
+MLc/JzYnRjZiKjlU56DrJGc+IcpthCg1ljuxnNZurKjuoi8Res5ZcuEvN4ugh1O
dhVdaofyUyOauA/4Z2c58gUON0ApkXmkIOaUc7ivV3/3Q/FZkkMyMwVXIRDghSm7
tsi7EN3bJhpyw7WQNkjCVLjLzX/mV2xWqmW+OgQlUKh1dEggTzg2OZ88K2dO0cov
21BCVWzwcwTyppXPQo/UyFFq65hUOBseco4XkAFnVHAEburGrQ3Um2MTLMHpO+pL
SnuPSwZnh9w+JhdplD2EjaPIqUz94peT6gcLsfjYTtZhhqrWFQ/oH0WRcESCqfrO
uFCOsB81RvJWas/c3Q13BSh6Su15Zpf4i3wPmu6HyK1IJu8GB4+O5ZiTRrI85pJT
zKlURFVyQuaSDVyk2/KqiHHrifT8nG4uA8hAXrd/84h7KAdLzRQixog/oew3oVOp
+YmCfdQKDjNpCniIQvId+dAeY2YhQBME/t9fSwu0/X43/KwDvug=
=3bc6
-END PGP SIGNATURE-

Changes since co-23.05-branch-point-723:
---
 0 files changed
---

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-7.5.5.1'

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-7.5.5.1' created by Christian Lohmaier 
 at 2023-06-29 21:05 +

Tag libreoffice-7.5.5.1
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmSd8jQACgkQ9DSh76/u
rqNTgRAAydBhoHxDeIqBvsHrHSPnRRQRNh+UBIAAH3lIEoHlP1K38XwvtNBhNXYK
DzpktiRZygMH13a4keR8h0suKoLXo1+Wy6k66zZDCNleQPhzG5D1cfwco5aVGjhq
rb9ZgSqoByQU6TG8NX7Lnn84sBpNEaRLJnQpsAzEwIrrBydf0E8mBoMbhjvolrf/
sjEVPc/YKh697f87r7SshDxJpP2OJG96Nk/inqJrWq7CAR3iSuoyAsryW4QL6hCQ
wmzHsklBfnljcH1x+0JV3Et7yhjPH2AXaavSXyU2zJNrE0Uo5iVCeYTHQ9w/bgIq
4g8xbBTh1qDqdCFL+h0QZFwYoLrYADkQmAgHesf5sLDjwmBhJWRYyTQCy+OsOasB
Bt/JfLbLVkTp1VVkPHCSSh/cse629nWiHjUgKSvhAzdQUp2m8ADlEY/AlrV9Trui
/9psCkhCsOcPs9sb5NPW4DAnbM1oOi9WkghcBT9/57wXtZyWFXhOjzqDtbn07caV
36S6p533nvOuftS/NAWc+rch2rAlnrShxxzaBB3Q7/jhQ1XSnpJCjAEchgqq54Ep
HSG+v0HiGsSNfYL+V9M79qWkmTOaWezejO8O6CCENpOKKW2AtQlGKRBEqXrZlMQc
k9isg7XaVbC5NDZaY9iif4sl9hc0mrkvNfpErDQpX6DyCJ4QCYg=
=Gg1a
-END PGP SIGNATURE-

Changes since co-23.05-branch-point-1:
---
 0 files changed
---

[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-7.5.5.1'

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-7.5.5.1' created by Christian Lohmaier 
 at 2023-06-29 21:05 +

Tag libreoffice-7.5.5.1
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmSd8jcACgkQ9DSh76/u
rqM5iw/+OL5r8QspeYq02kFO4psnyiPnxBbhwOku+k47GnV+/lOozJNwp9WONJby
QdrqZx6Cyjh1wZQvCRLAxRR2FS6vneu9zjbF6A7caq3Up2t2YWVGDwXi28DodU/s
MVSrIAaGl8UXXC9kE2z+a22XwhAKzHXKyIYBS8UgynXa+3D6w9zJy5//iOZp/yAR
5WPFhpnqlkpaAsG9doqtHS/JhQXFt1Q0agUCFIlmR2MpycOPWGwO2z5y4egF7Kor
YVM0oBvuK3IdDTmAm7E5VHQX/+iVt7IuhZj1uBX3pXuWtFdl0LplHo0prIzlne8d
yK5uJ+gYVMuM700tj1K4rdVc8tfzFganLP/8fwT3WcbNUY97gLxJ70w904jp/ixV
xm4nqMhp2WaTnA6wqJouGVN3dMLKaHzsyNtlTTYZMf8HfCbLKZtR02C2ercgsTAd
QDcQJNBXBeXyX+VwQemEW4CP5atTCh8S/b+0et9+soRcpAUjPi1/tD942R1DJnLq
j1jZoUaxfEjEjzCr7fmUN2FYivprS2ijlDgTXBFPQSDvoLfsHS6BjNqa6XtQo54v
Xict/RfS191YbhP67+TcjXY+cX2OuTfhwZ4T1ofR/8bHK8Gq4Td1iRc89IDFZGFA
vdoI51EvF5gJIvKEv9KbI86GI77WeEwAiA97JxumJbUXyptJE5w=
=noSn
-END PGP SIGNATURE-

Changes since co-23.05-branch-point-5:
---
 0 files changed
---

[Libreoffice-commits] core.git: Branch 'libreoffice-7-5-5' - configure.ac

[Christian Lohmaier (via logerrit)]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5840c143b1295fabbcd906ee00418fd287f13a02
Author: Christian Lohmaier 
AuthorDate: Thu Jun 29 23:06:21 2023 +0200
Commit: Christian Lohmaier 
CommitDate: Thu Jun 29 23:06:21 2023 +0200

bump product version to 7.5.5.1.0+

Change-Id: Ib02e70dc29f7d66bd58daa1153b6c9eea274abf3

diff --git a/configure.ac b/configure.ac
index cbd5bd3d9179..24abd369bd6e 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.5.5.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.5.5.1.0+],[],[],[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

[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - configure.ac

[Christian Lohmaier (via logerrit)]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 18f35f1d7670b32f5008dbf2057dfd36171b440e
Author: Christian Lohmaier 
AuthorDate: Thu Jun 29 23:04:09 2023 +0200
Commit: Christian Lohmaier 
CommitDate: Thu Jun 29 23:04:09 2023 +0200

bump product version to 7.5.6.0.0+

Change-Id: I5f0aa17106da8aaa9a70f102286fb6dac861639d

diff --git a/configure.ac b/configure.ac
index cbd5bd3d9179..4bd273f026ca 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.5.5.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.5.6.0.0+],[],[],[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

[Libreoffice-commits] core.git: Changes to 'libreoffice-7-5-5'

[Christian Lohmaier (via logerrit)]

New branch 'libreoffice-7-5-5' available with the following commits:
commit d0e9744e48cf63a743f2148b6a185c2e2cd3d5f7
Author: Christian Lohmaier 
Date:   Thu Jun 29 23:03:32 2023 +0200

Branch libreoffice-7-5-5

This is 'libreoffice-7-5-5' - the stable branch for the 7.5.5 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 7.5.x release,
please use the 'libreoffice-7-5' branch.

If you want to build something cool, unstable, and risky, use master.

[Libreoffice-commits] translations.git: Changes to 'libreoffice-7-5-5'

[Christian Lohmaier (via logerrit)]

New branch 'libreoffice-7-5-5' available with the following commits:
commit 803d4ddfbf89f03eaf28cbc4784a8fa4df7b1cc3
Author: Christian Lohmaier 
Date:   Thu Jun 29 23:03:18 2023 +0200

Branch libreoffice-7-5-5

This is 'libreoffice-7-5-5' - the stable branch for the 7.5.5 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 7.5.x release,
please use the 'libreoffice-7-5' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I9dd9c4a73fbf5b1964aa95290885f21496c3b20a

[Libreoffice-commits] dictionaries.git: Changes to 'libreoffice-7-5-5'

[Christian Lohmaier (via logerrit)]

New branch 'libreoffice-7-5-5' available with the following commits:
commit b7188aa9234e4dba53a890fc180ed84f097bdede
Author: Christian Lohmaier 
Date:   Thu Jun 29 23:03:18 2023 +0200

Branch libreoffice-7-5-5

This is 'libreoffice-7-5-5' - the stable branch for the 7.5.5 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 7.5.x release,
please use the 'libreoffice-7-5' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I41b79ee597dbc7c5c8b5d64a2f3adf04cca28e2d

[Libreoffice-commits] help.git: Changes to 'libreoffice-7-5-5'

[Christian Lohmaier (via logerrit)]

New branch 'libreoffice-7-5-5' available with the following commits:
commit 6a4db9647059b805fa7db6a8881273ab802cd71d
Author: Christian Lohmaier 
Date:   Thu Jun 29 23:03:18 2023 +0200

Branch libreoffice-7-5-5

This is 'libreoffice-7-5-5' - the stable branch for the 7.5.5 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 7.5.x release,
please use the 'libreoffice-7-5' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I3ee539925c5fe87dfc26e4db558eff96f0b24b00

[Libreoffice-commits] translations.git: Branch 'libreoffice-7-5' - source/ab source/de source/dsb source/eo source/es source/fa source/fi source/gug source/he source/hsb source/it source/ko source/lt

[Christian Lohmaier (via logerrit)]

 source/ab/chart2/messages.po   |   60 
 source/de/helpcontent2/source/text/shared/07.po|   10 
 source/de/helpcontent2/source/text/shared/guide.po |6 
 source/de/helpcontent2/source/text/swriter/00.po   |   10 
 source/de/helpcontent2/source/text/swriter/01.po   |   10 
 source/de/officecfg/registry/data/org/openoffice/Office/UI.po  |8 
 source/de/svtools/messages.po  |6 
 source/dsb/helpcontent2/source/text/sdatabase.po   |   12 
 source/dsb/helpcontent2/source/text/shared/00.po   |  650 
+-
 source/dsb/helpcontent2/source/text/simpress.po|4 
 source/dsb/officecfg/registry/data/org/openoffice/Office/UI.po |8 
 source/eo/cui/messages.po  |8 
 source/eo/sw/messages.po   |6 
 source/es/cui/messages.po  |   14 
 source/es/helpcontent2/source/text/scalc/01.po |   11 
 source/es/helpcontent2/source/text/shared/00.po|8 
 source/es/helpcontent2/source/text/shared/01.po|6 
 source/es/helpcontent2/source/text/swriter/guide.po|   10 
 source/es/svx/messages.po  |8 
 source/fa/basctl/messages.po   |   28 
 source/fi/cui/messages.po  |4 
 source/fi/starmath/messages.po |8 
 source/fi/vcl/messages.po  |   14 
 source/gug/helpcontent2/source/text/scalc/01.po|   11 
 source/gug/helpcontent2/source/text/shared/00.po   |8 
 source/gug/helpcontent2/source/text/shared/01.po   |6 
 source/gug/helpcontent2/source/text/swriter/guide.po   |   10 
 source/he/sc/messages.po   |  234 +--
 source/hsb/helpcontent2/source/text/sdatabase.po   |   80 -
 source/hsb/helpcontent2/source/text/shared/00.po   |   20 
 source/it/cui/messages.po  |6 
 source/ko/sw/messages.po   |  142 +-
 source/lt/helpcontent2/source/text/sdraw/guide.po  |   36 
 source/lt/officecfg/registry/data/org/openoffice/Office/UI.po  |   10 
 source/pl/helpcontent2/source/text/sbasic/shared.po|   90 -
 source/th/officecfg/registry/data/org/openoffice/Office/UI.po  |   10 
 36 files changed, 761 insertions(+), 811 deletions(-)

New commits:
commit e29825d93a16003fbc89619b4f904a597244a1c7
Author: Christian Lohmaier 
AuthorDate: Thu Jun 29 22:59:07 2023 +0200
Commit: Christian Lohmaier 
CommitDate: Thu Jun 29 22:59:07 2023 +0200

update translations for 7.5.5 rc1

and force-fix errors using pocheck

Change-Id: Icc73b706f8853c092a5ed1c39c3c147ec4899c7f

diff --git a/source/ab/chart2/messages.po b/source/ab/chart2/messages.po
index 544f831eb6e..967bbe372f0 100644
--- a/source/ab/chart2/messages.po
+++ b/source/ab/chart2/messages.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
 "POT-Creation-Date: 2022-11-22 14:43+0100\n"
-"PO-Revision-Date: 2023-05-31 10:35+\n"
+"PO-Revision-Date: 2023-06-29 20:37+\n"
 "Last-Translator: Андрей Абухба \n"
 "Language-Team: Abkhazian 
\n"
 "Language: ab\n"
@@ -199,7 +199,7 @@ msgstr "Аҭыҧ"
 #: chart2/inc/strings.hrc:39
 msgctxt "STR_PAGE_LAYOUT"
 msgid "Layout"
-msgstr ""
+msgstr "Адырганҵа"
 
 #. 4Gz8K
 #: chart2/inc/strings.hrc:40
@@ -265,7 +265,7 @@ msgstr "Арлашара"
 #: chart2/inc/strings.hrc:50
 msgctxt "STR_PAGE_ASIAN"
 msgid "Asian Typography"
-msgstr ""
+msgstr "Мрагылара-азиатәи акьыԥхьра аԥҟарақәа"
 
 #. 6xo4a
 #: chart2/inc/strings.hrc:51
@@ -673,7 +673,7 @@ msgstr "Автоматикала адыргахҵара"
 #: chart2/inc/strings.hrc:118
 msgctxt "STR_ACTION_NOTPOSSIBLE"
 msgid "This function cannot be completed with the selected objects."
-msgstr ""
+msgstr "Ари аоперациа анагӡара ауам иалкаау аобиект азы."
 
 #. GaEzn
 #: chart2/inc/strings.hrc:119
@@ -715,7 +715,7 @@ msgstr "Y аҵакы"
 #: chart2/inc/strings.hrc:125
 msgctxt "STR_DATA_ROLE_SIZE"
 msgid "Bubble Sizes"
-msgstr ""
+msgstr "Акакаҷқәа рышәагаа"
 
 #. pMGL4
 #: chart2/inc/strings.hrc:126
@@ -855,7 +855,7 @@ msgstr "Аҿыкәырша аԥштәы"
 #: chart2/inc/strings.hrc:148
 msgctxt "STR_DATA_TABLE"
 msgid "Data Table"
-msgstr ""
+msgstr "Адырқәа ртаблица"
 
 #. TuRxr
 #: chart2/inc/strings.hrc:150
@@ -1011,7 +1011,7 @@ msgstr ""
 #: chart2/inc/strings.hrc:176
 msgctxt "STR_TYPE_STOCK"
 msgid "Stock"
-msgstr ""
+msgstr "Абиржатә"
 
 #. oG4gw
 #: chart2/inc/strings.hrc:177
@@ -1

[Libreoffice-commits] core.git: odk/docs

[Samuel Mehrbrodt (via logerrit)]

 odk/docs/tools.html |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1b4f40165850ffdc0399d39390878925ef5e9be4
Author: Samuel Mehrbrodt 
AuthorDate: Thu Jun 29 22:13:40 2023 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Thu Jun 29 23:00:22 2023 +0200

Point to LO DevGuide instead of OOo

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

diff --git a/odk/docs/tools.html b/odk/docs/tools.html
index d71d36f2401d..f9edc69c9394 100644
--- a/odk/docs/tools.html
+++ b/odk/docs/tools.html
@@ -141,7 +141,7 @@
  SDK but comes with the office directly and is a development 
tool as well
  as an end user tool to deploy extension into an office 
installation.
  More details concerning deployment and this tool can be 
found in the
- Developer's Guide: http://wiki.openoffice.org/wiki/Documentation/DevGuide/Extensions/unopkg"; 
title="link to the "Extension Manager - unopkg" chapter in the 
Developer's Guide">Extension Manager - unopkg.
+ Developer's Guide: https://wiki.documentfoundation.org/Documentation/DevGuide/Extensions#unopkg";
 title="link to the "Extension Manager - unopkg" chapter in the 
Developer's Guide">Extension Manager - unopkg.
  Note: This tool works only in the 
/program
  directory!
  Usage:
@@ -333,7 +333,7 @@
  to check UNODL type definitions and transform valid type 
definitions
  into a binary type library format, which is later used by all 
codemaker
  tools. It is also used as a dynamic type library for UNO at 
runtime.
- You can find a syntax description for UNOIDL http://wiki.openoffice.org/wiki/Documentation/DevGuide/AppendixD/UNOIDL_Syntax_Specification";
 title="link to the "UNOIDL Syntax Specification" chapter in the 
Developer's Guide">here.
+ You can find a syntax description for UNOIDL https://wiki.documentfoundation.org/Documentation/DevGuide/UNOIDL_Syntax_Specification";
 title="link to the "UNOIDL Syntax Specification" chapter in the 
Developer's Guide">here.
  Note: unoidl-write produces a new binary type 
library format that is
  different from the legacy format that was produced by idlc 
and regmerge.  While
  recent versions of LibreOffice are still able to read the old 
format, versions of

[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - translations

[Christian Lohmaier (via logerrit)]

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

New commits:
commit c16d0d3004fdd95e5ea45c90486f340fd55b2836
Author: Christian Lohmaier 
AuthorDate: Thu Jun 29 23:00:25 2023 +0200
Commit: Gerrit Code Review 
CommitDate: Thu Jun 29 23:00:25 2023 +0200

Update git submodules

* Update translations from branch 'libreoffice-7-5'
  to e29825d93a16003fbc89619b4f904a597244a1c7
  - update translations for 7.5.5 rc1

and force-fix errors using pocheck

Change-Id: Icc73b706f8853c092a5ed1c39c3c147ec4899c7f

diff --git a/translations b/translations
index 25499f95b8bb..e29825d93a16 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 25499f95b8bbef13aeb34e1246cb59543f9a8e52
+Subproject commit e29825d93a16003fbc89619b4f904a597244a1c7

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

[Mike Kaganski (via logerrit)]

 svx/source/accessibility/AccessibleShape.cxx   |   
 4 +-
 svx/source/accessibility/GraphCtlAccessibleContext.cxx |   
 2 -
 svx/source/fmcomp/fmgridif.cxx |   
10 +++
 svx/source/form/fmdmod.cxx |   
 2 -
 svx/source/form/formcontroller.cxx |   
 2 -
 svx/source/svdraw/svdmodel.cxx |   
 2 -
 svx/source/svdraw/svdpage.cxx  |   
 4 --
 svx/source/table/accessiblecell.cxx|   
 2 -
 svx/source/table/cell.cxx  |   
10 +++
 svx/source/table/propertyset.cxx   |   
 2 -
 svx/source/table/tablecolumn.cxx   |   
 4 +-
 svx/source/table/tabledesign.cxx   |   
 8 ++---
 svx/source/table/tablemodel.cxx|   
 2 -
 svx/source/table/tablerow.cxx  |   
 4 +-
 svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx |   
 2 -
 svx/source/unodraw/SvxXTextColumns.cxx |   
 8 ++---
 svx/source/unodraw/UnoNamespaceMap.cxx |   
 2 -
 svx/source/unodraw/unomod.cxx  |   
10 ++-
 svx/source/unodraw/unopool.cxx |   
 4 +-
 svx/source/unodraw/unoshap2.cxx|   
 2 -
 svx/source/unodraw/unoshap4.cxx|   
 8 ++---
 svx/source/unodraw/unoshape.cxx|   
14 +-
 svx/source/unodraw/unoshcol.cxx|   
 2 -
 svx/source/xml/xmleohlp.cxx|   
 2 -
 24 files changed, 54 insertions(+), 58 deletions(-)

New commits:
commit 7881ae1ee91b5739f8d6b8adfac04bc432717a9a
Author: Mike Kaganski 
AuthorDate: Sun Apr 23 20:15:04 2023 +0300
Commit: Mike Kaganski 
CommitDate: Thu Jun 29 22:43:57 2023 +0200

Use getXWeak in svx

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

diff --git a/svx/source/accessibility/AccessibleShape.cxx 
b/svx/source/accessibility/AccessibleShape.cxx
index e3116a9762b7..ba8b7fd7f6f8 100644
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -345,7 +345,7 @@ uno::Reference SAL_CALL
 else
 throw lang::IndexOutOfBoundsException (
 "shape has no child with index " + OUString::number(nIndex),
-static_cast(this));
+getXWeak());
 
 return xChild;
 }
@@ -534,7 +534,7 @@ awt::Rectangle SAL_CALL AccessibleShape::getBounds()
 if (maShapeTreeInfo.GetViewForwarder() == nullptr)
 throw uno::RuntimeException (
 "AccessibleShape has no valid view forwarder",
-static_cast(this));
+getXWeak());
 ::Size aPixelSize = maShapeTreeInfo.GetViewForwarder()->LogicToPixel (
 ::Size (aBoundingBox.Width, aBoundingBox.Height));
 ::Point aPixelPosition = 
maShapeTreeInfo.GetViewForwarder()->LogicToPixel (
diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx 
b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
index 989d5b4650cd..c30756804b49 100644
--- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx
+++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
@@ -302,7 +302,7 @@ void SvxGraphCtrlAccessibleContext::CommitChange (
 const uno::Any& rOldValue)
 {
 AccessibleEventObject aEvent (
-static_cast(this),
+getXWeak(),
 nEventId,
 rNewValue,
 rOldValue, -1);
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index 5fe9c608bbbd..d7fe7c9c23dd 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -391,7 +391,7 @@ void SAL_CALL FmXGridControl::dispose()
 SolarMutexGuard aGuard;
 
 EventObject aEvt;
-aEvt.Source = static_cast< ::cppu::OWeakObject* >(this);
+aEvt.Source = getXWeak();
 m_aModifyListeners.disposeAndClear(aEvt);
 m_aUpdateListeners.disposeAndClear(aEvt);
 m_aContainerListeners.disposeAndClear(aEvt);
@@ -1022,7 +1022,7 @@ void FmXGridPeer::selectionChanged()
 {
 std::unique_lock g(m_aMutex);
 EventObject aSource;
-aSource.Source = static_cast< ::cppu::OWeakObject* >(this);
+aSource.Source = getXWeak();
 m_aSelectionListeners.notifyEach( g, 
&XSelectionChangeListener::select

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - sw/uiconfig

[Aron Budea (via logerrit)]

 sw/uiconfig/swriter/ui/pagenumberdlg.ui |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit db1cdc6be062cd6c4240a1ec4d96c0ef613e2b27
Author: Aron Budea 
AuthorDate: Thu Jun 29 04:51:10 2023 +0200
Commit: Justin Luth 
CommitDate: Thu Jun 29 22:15:00 2023 +0200

tdf#155706 tdf#86630 sw page number wizard: make OK default

Change-Id: If1b902d34157be8c9eab2d5ec140f5e85dfc49e5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153731
Tested-by: Jenkins
Reviewed-by: Justin Luth 
(cherry picked from commit b336512318947fb863d9aadec91ccf6316b8d39a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153752

diff --git a/sw/uiconfig/swriter/ui/pagenumberdlg.ui 
b/sw/uiconfig/swriter/ui/pagenumberdlg.ui
index 27f9bbed1543..f014545da429 100644
--- a/sw/uiconfig/swriter/ui/pagenumberdlg.ui
+++ b/sw/uiconfig/swriter/ui/pagenumberdlg.ui
@@ -24,6 +24,8 @@
 _OK
 True
 True
+True
+True
 True
 True
   

[Libreoffice-commits] core.git: svgio/inc svgio/Library_svgio.mk svgio/qa svgio/source

[Xisco Fauli (via logerrit)]

 svgio/Library_svgio.mk|1 
 svgio/inc/svgfeimagenode.hxx  |   45 
 svgio/inc/svgtoken.hxx|1 
 svgio/qa/cppunit/SvgImportTest.cxx|   13 ++
 svgio/qa/cppunit/data/filterFeImage.svg   |   16 +++
 svgio/source/svgreader/svgdocumenthandler.cxx |9 +
 svgio/source/svgreader/svgfeimagenode.cxx |  134 ++
 svgio/source/svgreader/svgfilternode.cxx  |6 +
 svgio/source/svgreader/svgtoken.cxx   |3 
 9 files changed, 227 insertions(+), 1 deletion(-)

New commits:
commit 74c9fd3ae5b63981fb256e019f0cf974329157f0
Author: Xisco Fauli 
AuthorDate: Thu Jun 29 15:46:42 2023 +0200
Commit: Xisco Fauli 
CommitDate: Thu Jun 29 21:35:17 2023 +0200

tdf#156066: Add support for feImage filter

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

diff --git a/svgio/Library_svgio.mk b/svgio/Library_svgio.mk
index 56d1f8dc1ae3..c25077ed94d3 100644
--- a/svgio/Library_svgio.mk
+++ b/svgio/Library_svgio.mk
@@ -63,6 +63,7 @@ $(eval $(call gb_Library_add_exception_objects,svgio,\
 svgio/source/svgreader/svgfecolormatrixnode \
 svgio/source/svgreader/svgfedropshadownode \
 svgio/source/svgreader/svgfefloodnode \
+svgio/source/svgreader/svgfeimagenode \
 svgio/source/svgreader/svgfegaussianblurnode \
 svgio/source/svgreader/svgfeoffsetnode \
 svgio/source/svgreader/svgfilternode \
diff --git a/svgio/inc/svgfeimagenode.hxx b/svgio/inc/svgfeimagenode.hxx
new file mode 100644
index ..ff3c87930a6c
--- /dev/null
+++ b/svgio/inc/svgfeimagenode.hxx
@@ -0,0 +1,45 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#pragma once
+
+#include "svgnode.hxx"
+#include "svgstyleattributes.hxx"
+
+namespace svgio::svgreader
+{
+class SvgFeImageNode final : public SvgNode
+{
+private:
+OUString maUrl; // external link
+OUString maData; // base64 data
+
+public:
+SvgFeImageNode(SvgDocument& rDocument, SvgNode* pParent);
+virtual ~SvgFeImageNode() override;
+
+virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken,
+const OUString& aContent) override;
+
+void apply(drawinglayer::primitive2d::Primitive2DContainer& rTarget) const;
+};
+
+} // end of namespace svgio::svgreader
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/inc/svgtoken.hxx b/svgio/inc/svgtoken.hxx
index 7d75a0e097a5..61abd28f11e8 100644
--- a/svgio/inc/svgtoken.hxx
+++ b/svgio/inc/svgtoken.hxx
@@ -83,6 +83,7 @@ namespace svgio::svgreader
 FeColorMatrix,
 FeDropShadow,
 FeFlood,
+FeImage,
 FeGaussianBlur,
 FeOffset,
 Filter,
diff --git a/svgio/qa/cppunit/SvgImportTest.cxx 
b/svgio/qa/cppunit/SvgImportTest.cxx
index 5aa25aed5b1e..6827d4f81d39 100644
--- a/svgio/qa/cppunit/SvgImportTest.cxx
+++ b/svgio/qa/cppunit/SvgImportTest.cxx
@@ -238,6 +238,19 @@ CPPUNIT_TEST_FIXTURE(Test, testFilterFeDropShadow)
 assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor", "color", 
"#ffc0cb");
 }
 
+CPPUNIT_TEST_FIXTURE(Test, testFilterFeImage)
+{
+Primitive2DSequence aSequenceTdf132246 = 
parseSvg(u"/svgio/qa/cppunit/data/filterFeImage.svg");
+CPPUNIT_ASSERT_EQUAL(1, static_cast(aSequenceTdf132246.getLength()));
+
+drawinglayer::Primitive2dXmlDump dumper;
+xmlDocUniquePtr pDocument = dumper.dumpAndParse(aSequenceTdf132246);
+
+CPPUNIT_ASSERT (pDocument);
+
+assertXPath(pDocument, "/primitive2D/transform/transform/bitmap");
+}
+
 CPPUNIT_TEST_FIXTURE(Test, testTdf87309)
 {
 Primitive2DSequence aSequenceTdf87309 = 
parseSvg(u"/svgio/qa/cppunit/data/tdf87309.svg");
diff --git a/svgio/qa/cppunit/data/filterFeImage.svg 
b/svgio/qa/cppunit/data/filterFeImage.svg
new file mode 100644
index ..5682dbf4692c
--- /dev/null
+++ b/svgio/qa/cppunit/data/filterFeImage.svg
@@ -0,0 +1,16 @@
+http://www.w3.org/2000/svg";
+  x

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

[Xisco Fauli (via logerrit)]

 svgio/inc/svgimagenode.hxx  |1 -
 svgio/inc/svgtools.hxx  |2 +-
 svgio/source/svgreader/svgimagenode.cxx |4 ++--
 svgio/source/svgreader/svgtools.cxx |9 -
 4 files changed, 7 insertions(+), 9 deletions(-)

New commits:
commit 210f2345c2eea2c52b673e2327a2ed096d9a888a
Author: Xisco Fauli 
AuthorDate: Thu Jun 29 17:42:19 2023 +0200
Commit: Xisco Fauli 
CommitDate: Thu Jun 29 21:13:13 2023 +0200

svgio: simplify code

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

diff --git a/svgio/inc/svgimagenode.hxx b/svgio/inc/svgimagenode.hxx
index 171a863d8fd0..074b659783b3 100644
--- a/svgio/inc/svgimagenode.hxx
+++ b/svgio/inc/svgimagenode.hxx
@@ -43,7 +43,6 @@ namespace svgio::svgreader
 OUString   maXLink;// internal link
 OUString   maUrl;  // external link
 
-OUString   maMimeType; // mimetype and
 OUString   maData; // base64 data
 
 public:
diff --git a/svgio/inc/svgtools.hxx b/svgio/inc/svgtools.hxx
index 1bca409001b6..f556ed6cde02 100644
--- a/svgio/inc/svgtools.hxx
+++ b/svgio/inc/svgtools.hxx
@@ -125,7 +125,7 @@ namespace svgio::svgreader
 typedef ::std::vector< OUString > SvgStringVector;
 bool readSvgStringVector(std::u16string_view rCandidate, 
SvgStringVector& rSvgStringVector);
 
-void readImageLink(const OUString& rCandidate, OUString& rXLink, 
OUString& rUrl, OUString& rMimeType, OUString& rData);
+void readImageLink(const OUString& rCandidate, OUString& rXLink, 
OUString& rUrl, OUString& rData);
 
 OUString consolidateContiguousSpace(const OUString& rCandidate);
 OUString xmlSpaceHandling(const OUString& rCandidate, bool bIsDefault);
diff --git a/svgio/source/svgreader/svgimagenode.cxx 
b/svgio/source/svgreader/svgimagenode.cxx
index d0e821a52092..fa7cbe675a13 100644
--- a/svgio/source/svgreader/svgimagenode.cxx
+++ b/svgio/source/svgreader/svgimagenode.cxx
@@ -141,7 +141,7 @@ namespace svgio::svgreader
 
 if(nLen)
 {
-readImageLink(aContent, maXLink, maUrl, maMimeType, 
maData);
+readImageLink(aContent, maXLink, maUrl, maData);
 }
 break;
 }
@@ -204,7 +204,7 @@ namespace svgio::svgreader
 const basegfx::B2DRange aTarget(fX, fY, fX + fWidth, fY + fHeight);
 basegfx::B2DRange aViewBox(aTarget);
 
-if(!maMimeType.isEmpty() && !maData.isEmpty())
+if(!maData.isEmpty())
 {
 // use embedded base64 encoded data
 css::uno::Sequence< sal_Int8 > aPass;
diff --git a/svgio/source/svgreader/svgtools.cxx 
b/svgio/source/svgreader/svgtools.cxx
index c45f4c5e9c61..9539fcf618b9 100644
--- a/svgio/source/svgreader/svgtools.cxx
+++ b/svgio/source/svgreader/svgtools.cxx
@@ -1354,11 +1354,10 @@ namespace svgio::svgreader
 return !rSvgStringVector.empty();
 }
 
-void readImageLink(const OUString& rCandidate, OUString& rXLink, 
OUString& rUrl, OUString& rMimeType, OUString& rData)
+void readImageLink(const OUString& rCandidate, OUString& rXLink, 
OUString& rUrl, OUString& rData)
 {
 rXLink.clear();
 rUrl.clear();
-rMimeType.clear();
 rData.clear();
 
 if(!readLocalLink(rCandidate, rXLink))
@@ -1376,11 +1375,11 @@ namespace svgio::svgreader
 skip_char(rCandidate, ' ', nPos, nLen);
 copyToLimiter(rCandidate, ';', nPos, aBuffer, nLen);
 skip_char(rCandidate, ' ', ';', nPos, nLen);
-rMimeType = aBuffer.makeStringAndClear();
+const OUString aMimeType = aBuffer.makeStringAndClear();
 
-if(!rMimeType.isEmpty() && nPos < nLen)
+if(!aMimeType.isEmpty() && nPos < nLen)
 {
-if(rMimeType.startsWith("image"))
+if(aMimeType.startsWith("image"))
 {
 // image data
 std::u16string_view 
aData(rCandidate.subView(nPos));

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

[Henry Castro (via logerrit)]

 sc/source/filter/html/htmlexp.cxx |   23 ++-
 1 file changed, 22 insertions(+), 1 deletion(-)

New commits:
commit 87d1e49f0cdbff6023bc6083a561c96192eb1eed
Author: Henry Castro 
AuthorDate: Thu May 11 16:29:55 2023 -0400
Commit: Henry Castro 
CommitDate: Thu Jun 29 19:30:40 2023 +0200

tdf#154477: sc: filter: html: fix missing color scale conditional format

When copying a range cell to an external application that request
html data, the color scale conditional format does not have an
associate a set attribute.

Signed-off-by: Henry Castro 
Change-Id: I82b466a2100abc5070e92f844dc706d9b015c2e1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151837
Tested-by: Jenkins
(cherry picked from commit 604c27f7c382bdd6baea73e60eed6525b9bfbd3d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152522

diff --git a/sc/source/filter/html/htmlexp.cxx 
b/sc/source/filter/html/htmlexp.cxx
index 16db15316121..98b2c980f304 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -65,6 +65,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 #include 
 
 #include 
@@ -881,10 +883,27 @@ void ScHTMLExport::WriteTables()
 
 void ScHTMLExport::WriteCell( sc::ColumnBlockPosition& rBlockPos, SCCOL nCol, 
SCROW nRow, SCTAB nTab )
 {
+std::optional aColorScale;
 ScAddress aPos( nCol, nRow, nTab );
 ScRefCellValue aCell(*pDoc, aPos, rBlockPos);
 const ScPatternAttr* pAttr = pDoc->GetPattern( nCol, nRow, nTab );
 const SfxItemSet* pCondItemSet = pDoc->GetCondResult( nCol, nRow, nTab, 
&aCell );
+if (!pCondItemSet)
+{
+ScConditionalFormatList* pCondList = pDoc->GetCondFormList(nTab);
+const ScCondFormatItem& rCondItem = pAttr->GetItem(ATTR_CONDITIONAL);
+const ScCondFormatIndexes& rCondIndex = rCondItem.GetCondFormatData();
+if (rCondIndex.size() > 0)
+{
+ScConditionalFormat* pCondFmt = 
pCondList->GetFormat(rCondIndex[0]);
+if (pCondFmt)
+{
+const ScColorScaleFormat* pEntry = dynamic_cast(pCondFmt->GetEntry(0));
+if (pEntry)
+aColorScale = pEntry->GetColor(aPos);
+}
+}
+}
 
 const ScMergeFlagAttr& rMergeFlagAttr = pAttr->GetItem( ATTR_MERGE_FLAG, 
pCondItemSet );
 if ( rMergeFlagAttr.IsOverlapped() )
@@ -1023,7 +1042,9 @@ void ScHTMLExport::WriteCell( sc::ColumnBlockPosition& 
rBlockPos, SCCOL nCol, SC
 ATTR_BACKGROUND, pCondItemSet );
 
 Color aBgColor;
-if ( rBrushItem.GetColor().GetAlpha() == 0 )
+if ( aColorScale )
+aBgColor = *aColorScale;
+else if ( rBrushItem.GetColor().GetAlpha() == 0 )
 aBgColor = aHTMLStyle.aBackgroundColor; // No unwanted background color
 else
 aBgColor = rBrushItem.GetColor();

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

[Henry Castro (via logerrit)]

 sc/inc/colorscale.hxx  |1 +
 sc/inc/conditio.hxx|5 +
 sc/source/core/data/colorscale.cxx |6 ++
 sc/source/core/data/conditio.cxx   |   20 
 sc/source/core/data/table2.cxx |3 +++
 5 files changed, 35 insertions(+)

New commits:
commit e4010b7d83244d9d51f36e22c9d9cd63eda870cb
Author: Henry Castro 
AuthorDate: Thu May 11 16:07:10 2023 -0400
Commit: Henry Castro 
CommitDate: Thu Jun 29 19:30:14 2023 +0200

tdf#154477: sc: add "updateValues" method to conditional format list

When copying a range cells to a clipboard, if exists a
color scale conditional format from different ranges,
it should update the min and max values, otherwise
the color scale conditional format could not calculate
min and max values due to limiting range cell copied.

Signed-off-by: Henry Castro 
Change-Id: I660e18090a60b99ddf2b55ce1f713fd41121290e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151835
Tested-by: Jenkins
(cherry picked from commit fcb348da642f7e5c41fe495cf6289f9992bfa1b9)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152520

diff --git a/sc/inc/colorscale.hxx b/sc/inc/colorscale.hxx
index fb987f5af1b5..6652e224fe67 100644
--- a/sc/inc/colorscale.hxx
+++ b/sc/inc/colorscale.hxx
@@ -231,6 +231,7 @@ public:
 
 virtual void startRendering() override;
 virtual void endRendering() override;
+virtual void updateValues() override;
 
 protected:
 std::vector& getValues() const;
diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx
index 50b74bd8721c..47f5fdb3addb 100644
--- a/sc/inc/conditio.hxx
+++ b/sc/inc/conditio.hxx
@@ -251,6 +251,7 @@ public:
 
 virtual void startRendering();
 virtual void endRendering();
+virtual void updateValues();
 protected:
 ScDocument* mpDoc;
 
@@ -598,6 +599,8 @@ public:
 void startRendering();
 void endRendering();
 
+void updateValues();
+
 // Forced recalculation for formulas
 void CalcAll();
 };
@@ -683,6 +686,8 @@ public:
 void startRendering();
 void endRendering();
 
+void updateValues();
+
 sal_uInt32 getMaxKey() const;
 
 /// Forced recalculation of formulas
diff --git a/sc/source/core/data/colorscale.cxx 
b/sc/source/core/data/colorscale.cxx
index e3c3780971fb..4e61dbdbc228 100644
--- a/sc/source/core/data/colorscale.cxx
+++ b/sc/source/core/data/colorscale.cxx
@@ -544,6 +544,12 @@ void ScColorFormat::endRendering()
 mpCache.reset();
 }
 
+void ScColorFormat::updateValues()
+{
+getMinValue();
+getMaxValue();
+}
+
 namespace {
 
 sal_uInt8 GetColorValue( double nVal, double nVal1, sal_uInt8 nColVal1, double 
nVal2, sal_uInt8 nColVal2 )
diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index 54f89dd3a7b3..b70f9579d0e8 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -74,6 +74,10 @@ void ScFormatEntry::endRendering()
 {
 }
 
+void ScFormatEntry::updateValues()
+{
+}
+
 static bool lcl_HasRelRef( ScDocument* pDoc, const ScTokenArray* pFormula, 
sal_uInt16 nRecursion = 0 )
 {
 if (pFormula)
@@ -2053,6 +2057,14 @@ void ScConditionalFormat::endRendering()
 }
 }
 
+void ScConditionalFormat::updateValues()
+{
+for(auto& rxEntry : maEntries)
+{
+rxEntry->updateValues();
+}
+}
+
 void ScConditionalFormat::CalcAll()
 {
 for(const auto& rxEntry : maEntries)
@@ -2300,6 +2312,14 @@ void ScConditionalFormatList::endRendering()
 }
 }
 
+void ScConditionalFormatList::updateValues()
+{
+for (auto const& it : m_ConditionalFormats)
+{
+it->updateValues();
+}
+}
+
 void ScConditionalFormatList::clear()
 {
 m_ConditionalFormats.clear();
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 91f90dbb1ae4..910568d35720 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -532,7 +532,10 @@ void ScTable::CopyToClip(
 for (SCCOL i = nCol1; i <= nCol2; i++)
 pTable->aCol[i].RemoveProtected(nRow1, nRow2);
 
+mpCondFormatList->startRendering();
+mpCondFormatList->updateValues();
 pTable->mpCondFormatList.reset(new 
ScConditionalFormatList(pTable->rDocument, *mpCondFormatList));
+mpCondFormatList->endRendering();
 }
 
 void ScTable::CopyToClip(

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

[Henry Castro (via logerrit)]

 sc/inc/colorscale.hxx  |2 ++
 sc/source/core/data/colorscale.cxx |   15 +++
 2 files changed, 17 insertions(+)

New commits:
commit 284ac82b1af70c8734bae6eb841ae01735bb6b41
Author: Henry Castro 
AuthorDate: Thu May 11 16:23:03 2023 -0400
Commit: Henry Castro 
CommitDate: Thu Jun 29 19:29:56 2023 +0200

tdf#154477: sc: copy cache values when clone color conditional format

When clone a conditional format list, also copy the cache
values that hold the min and max values, otherwise if clone
occurs when copying to the clipboard the values have wrong
data due to limiting range cells copied.

Signed-off-by: Henry Castro 
Change-Id: Id9085a1488a3bde24842e0d2e062c9b425074157
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151836
Tested-by: Jenkins
(cherry picked from commit c85255fd7a62bec9342fa6f2a79d1395979d54be)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152521

diff --git a/sc/inc/colorscale.hxx b/sc/inc/colorscale.hxx
index 88e35775419a..fb987f5af1b5 100644
--- a/sc/inc/colorscale.hxx
+++ b/sc/inc/colorscale.hxx
@@ -224,6 +224,8 @@ public:
 virtual ~ScColorFormat() override;
 
 const ScRangeList& GetRange() const;
+void SetCache(const std::vector& aValues);
+std::vector GetCache() const;
 
 virtual void SetParent(ScConditionalFormat* pParent) override;
 
diff --git a/sc/source/core/data/colorscale.cxx 
b/sc/source/core/data/colorscale.cxx
index 876d100840bf..e3c3780971fb 100644
--- a/sc/source/core/data/colorscale.cxx
+++ b/sc/source/core/data/colorscale.cxx
@@ -378,6 +378,9 @@ ScColorScaleFormat::ScColorScaleFormat(ScDocument* pDoc, 
const ScColorScaleForma
 {
 maColorScales.emplace_back(new ScColorScaleEntry(pDoc, *rxEntry));
 }
+
+auto aCache = rFormat.GetCache();
+SetCache(aCache);
 }
 
 ScColorFormat* ScColorScaleFormat::Clone(ScDocument* pDoc) const
@@ -457,6 +460,18 @@ const ScRangeList& ScColorFormat::GetRange() const
 return mpParent->GetRange();
 }
 
+std::vector ScColorFormat::GetCache() const
+{
+std::vector empty;
+return mpCache ? mpCache->maValues : empty;
+}
+
+void ScColorFormat::SetCache(const std::vector& aValues)
+{
+mpCache.reset(new ScColorFormatCache);
+mpCache->maValues = aValues;
+}
+
 std::vector& ScColorFormat::getValues() const
 {
 if(!mpCache)

[Libreoffice-commits] core.git: officecfg/files.mk officecfg/registry postprocess/CustomTarget_registry.mk

[Gabor Kelemen (via logerrit)]

 officecfg/files.mk  |1 
 officecfg/registry/schema/org/openoffice/ucb/InteractionHandler.xcs |   43 
--
 postprocess/CustomTarget_registry.mk|1 
 3 files changed, 45 deletions(-)

New commits:
commit c48e810f1a856d392b2ffce6b343082406644ab8
Author: Gabor Kelemen 
AuthorDate: Thu May 11 13:24:36 2023 +0200
Commit: Thorsten Behrens 
CommitDate: Thu Jun 29 18:58:53 2023 +0200

[API CHANGE] Drop deprecated org/openoffice/ucb/InteractionHandler.xcs file

Deprecated in 2010 by
commit af66a011a47f673a9a0ee2c6a0b27e23b11b6ebf

Change-Id: I805f9771fe3730f3e186162cab9ea192517a4f2c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152401
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/officecfg/files.mk b/officecfg/files.mk
index 5244654af01c..cd5843e2d8cc 100644
--- a/officecfg/files.mk
+++ b/officecfg/files.mk
@@ -108,6 +108,5 @@ officecfg_XCSFILES := \
 VCL \
 ucb/Configuration \
 ucb/Hierarchy \
-ucb/InteractionHandler \
 ucb/Store \
 
diff --git 
a/officecfg/registry/schema/org/openoffice/ucb/InteractionHandler.xcs 
b/officecfg/registry/schema/org/openoffice/ucb/InteractionHandler.xcs
deleted file mode 100644
index 975bd3975fcc..
--- a/officecfg/registry/schema/org/openoffice/ucb/InteractionHandler.xcs
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
-http://openoffice.org/2001/registry"; 
xmlns:xs="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
oor:name="InteractionHandler" oor:package="org.openoffice.ucb" xml:lang="en-US">
-  
-Deprecated. Use org.openoffice.Interaction instead.
-  
-  
-
-  
-Deprecated. Use org.openoffice.Interaction instead.
-  
-  
-
-  Deprecated. Use org.openoffice.Interaction instead.
-
-  
-
-  
-  
-
-  
-Deprecated. Use org.openoffice.Interaction instead.
-  
-
-  
-
diff --git a/postprocess/CustomTarget_registry.mk 
b/postprocess/CustomTarget_registry.mk
index f192cc1bcb31..b0bc7a4320f2 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -201,7 +201,6 @@ postprocess_FILES_main := \
$(postprocess_XCS)/VCL.xcs \
$(postprocess_XCS)/ucb/Configuration.xcs \
$(postprocess_XCS)/ucb/Hierarchy.xcs \
-   $(postprocess_XCS)/ucb/InteractionHandler.xcs \
$(postprocess_XCS)/ucb/Store.xcs \
$(postprocess_XCU)/Inet.xcu \
$(postprocess_XCU)/Interaction.xcu \

[Libreoffice-commits] core.git: officecfg/registry

[Gabor Kelemen (via logerrit)]

 officecfg/registry/schema/org/openoffice/Office/Calc.xcs |   24 ---
 1 file changed, 24 deletions(-)

New commits:
commit 29d91a668c86a61bc406f34bcb36d8dc9d9bc6b6
Author: Gabor Kelemen 
AuthorDate: Fri May 12 22:57:21 2023 +0200
Commit: Thorsten Behrens 
CommitDate: Thu Jun 29 18:58:20 2023 +0200

[API CHANGE] Drop deprecated FormulaSyntax property

It was marked as deprecated when added in 2010
commit 81571e00b1b423929459ffdb34fd519e7f3d0961
could not find whether it was used ever since

Change-Id: I2c14c923f07d97d1df0604b95b3c65b350248029
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152403
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index d282ca681fa0..d861f56e81d7 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -1347,30 +1347,6 @@
   
   true
 
-
-  
-  
-  
-Specifies what formula syntax type to use.
-  
-  
-
-  
-Calc A1
-  
-
-
-  
-Excel A1
-  
-
-
-  
-Excel R1C1
-  
-
-  
-
 
   
 Specifies the date that is represented by the number 
0.

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - sc/source

[Henry Castro (via logerrit)]

 sc/source/ui/inc/select.hxx  |   10 -
 sc/source/ui/view/select.cxx |  266 +--
 2 files changed, 138 insertions(+), 138 deletions(-)

New commits:
commit 184b91d397e80bf0ce987e227ec6a561fe6fbe6a
Author: Henry Castro 
AuthorDate: Wed Jun 21 11:15:58 2023 -0400
Commit: Henry Castro 
CommitDate: Thu Jun 29 18:18:23 2023 +0200

sc: prefix m_* ScViewFunctionSet class members

..

Change-Id: Ic16ae0fc6580e350444576a087c333d52296ec5e
Signed-off-by: Henry Castro 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153405
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Caolán McNamara 
(cherry picked from commit 8276b9593a2a9e3a0d5aaeaadd64369667120303)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153658

diff --git a/sc/source/ui/inc/select.hxx b/sc/source/ui/inc/select.hxx
index ea3082f972c6..e1223f91e793 100644
--- a/sc/source/ui/inc/select.hxx
+++ b/sc/source/ui/inc/select.hxx
@@ -40,12 +40,12 @@ public:
 class ScViewFunctionSet : public FunctionSet// View (Gridwin / 
keyboard)
 {
 private:
-ScViewData* pViewData;
-ScViewSelectionEngine*  pEngine;
+ScViewData* m_pViewData;
+ScViewSelectionEngine*  m_pEngine;
 
-boolbAnchor;
-boolbStarted;
-ScAddress   aAnchorPos;
+boolm_bAnchor;
+boolm_bStarted;
+ScAddress   m_aAnchorPos;
 
 ScSplitPos  GetWhich() const;
 
diff --git a/sc/source/ui/view/select.cxx b/sc/source/ui/view/select.cxx
index 772d86df1c66..51ccc7d25a2b 100644
--- a/sc/source/ui/view/select.cxx
+++ b/sc/source/ui/view/select.cxx
@@ -44,27 +44,27 @@ static bool bDidSwitch = false;
 
 // View (Gridwin / keyboard)
 ScViewFunctionSet::ScViewFunctionSet( ScViewData* pNewViewData ) :
-pViewData( pNewViewData ),
-pEngine( nullptr ),
-bAnchor( false ),
-bStarted( false )
+m_pViewData( pNewViewData ),
+m_pEngine( nullptr ),
+m_bAnchor( false ),
+m_bStarted( false )
 {
-OSL_ENSURE(pViewData, "ViewData==0 at FunctionSet");
+OSL_ENSURE(m_pViewData, "ViewData==0 at FunctionSet");
 }
 
 ScSplitPos ScViewFunctionSet::GetWhich() const
 {
-if (pEngine)
-return pEngine->GetWhich();
+if (m_pEngine)
+return m_pEngine->GetWhich();
 else
-return pViewData->GetActivePart();
+return m_pViewData->GetActivePart();
 }
 
 sal_uLong ScViewFunctionSet::CalcUpdateInterval( const Size& rWinSize, const 
Point& rEffPos,
  bool bLeftScroll, bool 
bTopScroll, bool bRightScroll, bool bBottomScroll )
 {
 sal_uLong nUpdateInterval = SELENG_AUTOREPEAT_INTERVAL_MAX;
-vcl::Window* pWin = pEngine->GetWindow();
+vcl::Window* pWin = m_pEngine->GetWindow();
 tools::Rectangle aScrRect = pWin->GetDesktopRectPixel();
 Point aRootPos = pWin->OutputToAbsoluteScreenPixel(Point(0,0));
 if (bRightScroll)
@@ -124,7 +124,7 @@ sal_uLong ScViewFunctionSet::CalcUpdateInterval( const 
Size& rWinSize, const Poi
 }
 
 #ifdef _WIN32
-ScTabViewShell* pViewShell = pViewData->GetViewShell();
+ScTabViewShell* pViewShell = m_pViewData->GetViewShell();
 bool bRefMode = pViewShell && pViewShell->IsRefInputMode();
 if (bRefMode && nUpdateInterval < SC_SELENG_REFMODE_UPDATE_INTERVAL_MIN)
 // Lower the update interval during ref mode, because re-draw can be
@@ -139,25 +139,25 @@ sal_uLong ScViewFunctionSet::CalcUpdateInterval( const 
Size& rWinSize, const Poi
 
 void ScViewFunctionSet::SetSelectionEngine( ScViewSelectionEngine* pSelEngine )
 {
-pEngine = pSelEngine;
+m_pEngine = pSelEngine;
 }
 
 // Drag & Drop
 void ScViewFunctionSet::BeginDrag()
 {
-SCTAB nTab = pViewData->GetTabNo();
+SCTAB nTab = m_pViewData->GetTabNo();
 
 SCCOL nPosX;
 SCROW nPosY;
-if (pEngine)
+if (m_pEngine)
 {
-Point aMPos = pEngine->GetMousePosPixel();
-pViewData->GetPosFromPixel( aMPos.X(), aMPos.Y(), GetWhich(), nPosX, 
nPosY );
+Point aMPos = m_pEngine->GetMousePosPixel();
+m_pViewData->GetPosFromPixel( aMPos.X(), aMPos.Y(), GetWhich(), nPosX, 
nPosY );
 }
 else
 {
-nPosX = pViewData->GetCurX();
-nPosY = pViewData->GetCurY();
+nPosX = m_pViewData->GetCurX();
+nPosY = m_pViewData->GetCurY();
 }
 
 ScModule* pScMod = SC_MOD();
@@ -165,24 +165,24 @@ void ScViewFunctionSet::BeginDrag()
 if (bRefMode)
 return;
 
-pViewData->GetView()->FakeButtonUp( GetWhich() );   // ButtonUp is 
swallowed
+m_pViewData->GetView()->FakeButtonUp( GetWhich() );   // ButtonUp is 
swallowed
 
-ScMarkData& rMark = pViewData->GetMarkData();
+ScMarkData& rMark = m_pViewData->GetMarkData();
 rMark.MarkToSimple();
 if ( !rMark.IsMarked() || rMark.IsMultiMarked() )
 return;
 
 ScDocumentUniquePtr pClipDoc(new ScDocum

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

[Noel Grandin (via logerrit)]

 include/sfx2/charwin.hxx   |2 --
 sfx2/source/control/charmapcontrol.cxx |5 -
 2 files changed, 7 deletions(-)

New commits:
commit 26d191e8ee53a38d350c10d5666c6dd8629c8ab2
Author: Noel Grandin 
AuthorDate: Thu Jun 29 12:55:02 2023 +0200
Commit: Noel Grandin 
CommitDate: Thu Jun 29 17:45:42 2023 +0200

m_aMouseClickHdl is dead

It was added in

commit c706fde1c4ecc6974bcf32ce33aacf3093355ae1
Resolves: tdf#156067 merge special char dialog/popup logic

But is never assigned a useful value

Change-Id: I476b00a96c53298414239509b2ca5452f0bf08c5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153743
Reviewed-by: Caolán McNamara 
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/include/sfx2/charwin.hxx b/include/sfx2/charwin.hxx
index 515aa64a4acb..1e3672a9de4e 100644
--- a/include/sfx2/charwin.hxx
+++ b/include/sfx2/charwin.hxx
@@ -83,11 +83,9 @@ class SFX2_DLLPUBLIC SfxCharmapContainer
 std::unique_ptr m_xRecentGrid;
 std::unique_ptr m_xFavGrid;
 
-Link m_aMouseClickHdl;
 Link m_aUpdateFavHdl;
 Link m_aUpdateRecentHdl;
 
-DECL_DLLPRIVATE_LINK(CharClickHdl, SvxCharView*, void);
 DECL_DLLPRIVATE_LINK(RecentClearClickHdl, SvxCharView*, void);
 DECL_DLLPRIVATE_LINK(FavClearClickHdl, SvxCharView*, void);
 DECL_DLLPRIVATE_LINK(RecentClearAllClickHdl, SvxCharView*, void);
diff --git a/sfx2/source/control/charmapcontrol.cxx 
b/sfx2/source/control/charmapcontrol.cxx
index 359b81c49330..ae3018ecd089 100644
--- a/sfx2/source/control/charmapcontrol.cxx
+++ b/sfx2/source/control/charmapcontrol.cxx
@@ -394,11 +394,6 @@ bool SfxCharmapContainer::isFavChar(std::u16string_view 
sTitle, std::u16string_v
 return itChar != m_aFavCharList.end() && itFont != 
m_aFavCharFontList.end();
 }
 
-IMPL_LINK(SfxCharmapContainer, CharClickHdl, SvxCharView*, pView, void)
-{
-m_aMouseClickHdl.Call(pView);
-}
-
 IMPL_LINK(SfxCharmapContainer, RecentClearClickHdl, SvxCharView*, rView, void)
 {
 const OUString& sTitle = rView->GetText();

[Libreoffice-commits] core.git: configure.ac

[Christian Lohmaier (via logerrit)]

 configure.ac |1 +
 1 file changed, 1 insertion(+)

New commits:
commit fdfc6eb3fd37f87d51d1836d01259a14a4346a45
Author: Christian Lohmaier 
AuthorDate: Thu Jun 29 14:59:38 2023 +0200
Commit: Christian Lohmaier 
CommitDate: Thu Jun 29 17:39:11 2023 +0200

fix cross-compilation with frozen headers

FROZEN wasn't part of the PERMITTED_BUILD_TARGETS in configure.ac, that
in turn means it is not part of BUILD_TYPE when building the crossbuild
build-tools.
That in turn means gb_Helper_optional in external/Module_external.mk
doesn't add it to the external module dirs, and that means the makefiles
from external/frozen aren't read, more specifically there won't be any
gb_UnpackedTarball_UnpackedTarball,frozen definition.

The UnpackedTarball definitions don't error out in this case, and the
gb_Library_use_extenals,module,frozen then doesn't work as expected. It
happily depends on the UnpackedTarball_get_final_target for frozen, but
since there is nothing to unpack (since the makefiles with the
definitions are skipped) that is a noop/it goes straight to just touch
workdir_for_build/UnpackedTarball/frozen.update to fulfill the
dependency without actually extracting any files.

This patch deals with the first problem only, adding it to the
PERMITTED_BUILD_TARGETS will allow the mechanism to work as intended.

Change-Id: Ie9e8ad47ba4c281fb3246daf67450a16f792b908
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153747
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/configure.ac b/configure.ac
index eca7a5ad5cad..59703a6932e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5789,6 +5789,7 @@ if test "$cross_compiling" = "yes"; then
 DYNLOADING
 EPOXY
 EXPAT
+FROZEN
 GLM
 GRAPHITE
 HARFBUZZ

[Libreoffice-commits] core.git: 2 commits - compilerplugins/clang dbaccess/source editeng/source i18npool/source include/editeng include/sfx2 include/svl include/svx include/vcl sc/inc sc/source sd/so

[Noel Grandin (via logerrit)]

 compilerplugins/clang/unusedmethods.results|  308 ++
 compilerplugins/clang/unusedmethods.unused-returns.results |   34 -
 dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx  |8 
 dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx  |2 
 editeng/source/outliner/outlin2.cxx|5 
 i18npool/source/localedata/LocaleNode.hxx  |1 
 i18npool/source/localedata/filewriter.cxx  |5 
 include/editeng/outliner.hxx   |1 
 include/sfx2/thumbnailviewitem.hxx |2 
 include/svl/SfxBroadcaster.hxx |4 
 include/svx/svdview.hxx|2 
 include/vcl/menubarupdateicon.hxx  |   93 ---
 sc/inc/scmod.hxx   |2 
 sc/inc/table.hxx   |2 
 sc/source/core/data/table5.cxx |   42 -
 sc/source/ui/app/scmod.cxx |   22 
 sc/source/ui/drawfunc/fusel2.cxx   |   10 
 sc/source/ui/inc/fusel.hxx |2 
 sd/source/ui/inc/DrawViewShell.hxx |1 
 sd/source/ui/inc/SlideSorter.hxx   |2 
 sd/source/ui/slidesorter/shell/SlideSorter.cxx |7 
 sd/source/ui/view/drviews1.cxx |   10 
 sfx2/source/control/thumbnailviewitem.cxx  |5 
 svgio/inc/svgstyleattributes.hxx   |6 
 svgio/source/svgreader/svgstyleattributes.cxx  |   90 +--
 svl/source/notify/SfxBroadcaster.cxx   |   12 
 sw/inc/ndgrf.hxx   |4 
 sw/inc/swmodule.hxx|2 
 sw/source/core/graphic/ndgrf.cxx   |   15 
 sw/source/uibase/app/apphdl.cxx|   20 
 sw/source/uibase/inc/shdwcrsr.hxx  |2 
 sw/source/uibase/utlui/shdwcrsr.cxx|   21 
 vcl/inc/bitmap/BitmapWriteAccess.hxx   |7 
 vcl/inc/svdata.hxx |2 
 vcl/inc/unx/saldisp.hxx|1 
 vcl/source/app/svapp.cxx   |   17 
 vcl/source/window/bubblewindow.cxx |  374 -
 vcl/unx/generic/app/saldisp.cxx|  104 ---
 38 files changed, 222 insertions(+), 1025 deletions(-)

New commits:
commit 74cd0d0b281f8df75612bfb600df2eae62c4d21d
Author: Noel Grandin 
AuthorDate: Thu Jun 29 13:53:30 2023 +0200
Commit: Noel Grandin 
CommitDate: Thu Jun 29 17:34:00 2023 +0200

loplugin:unusedmethods

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

diff --git a/compilerplugins/clang/unusedmethods.results 
b/compilerplugins/clang/unusedmethods.results
index fcda4538fe36..4296a0144afd 100644
--- a/compilerplugins/clang/unusedmethods.results
+++ b/compilerplugins/clang/unusedmethods.results
@@ -1,7 +1,5 @@
 basegfx/source/range/b2drangeclipper.cxx:686
 type-parameter-?-? basegfx::(anonymous 
namespace)::eraseFromList(type-parameter-?-? &,const type-parameter-?-? &)
-basegfx/test/boxclipper.hxx:28
-double basegfx2d::getRandomOrdinal(const unsigned long)
 basic/source/inc/buffer.hxx:40
 void SbiBuffer::operator+=(signed char)
 basic/source/inc/buffer.hxx:41
@@ -134,20 +132,14 @@ cui/source/inc/GraphicsTestsDialog.hxx:48
 void GraphicsTestsDialog::HandleResultViewRequest(weld::Button &)
 cui/source/inc/GraphicsTestsDialog.hxx:48
 void GraphicsTestsDialog::LinkStubHandleResultViewRequest(void 
*,weld::Button &)
-cui/source/inc/optdict.hxx:92
-_Bool SvxEditDictionaryDialog::InsertTextHdl(SvxEditDictionaryDialog 
*,rtl::OUString &)
-cui/source/inc/optdict.hxx:92
-_Bool SvxEditDictionaryDialog::LinkStubInsertTextHdl(void *,rtl::OUString 
&)
 cui/source/inc/SvxNotebookbarConfigPage.hxx:40
 void SvxNotebookbarConfigPage::SetElement()
 dbaccess/source/filter/hsqldb/fbalterparser.hxx:19
 void dbahsql::FbAlterStmtParser::ensureProperTableLengths() const
 dbaccess/source/filter/hsqldb/parseschema.hxx:80
 const std::map > & 
dbahsql::SchemaParser::getPrimaryKeys() const
-dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx:235
-void dbaui::OPostgresConnectionPageSetup::LinkStubOnEditModified(void 
*,weld::Entry &)
-dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx:264
-rtl::OUString dbaui::OPostgresConnectionPageSetup::getURLNoPrefix() const
+dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx:252
+rtl::OUString dbaui::OPostgresConnectionPageSetup::impl_getURL() const
 dbaccess/source/ui/inc/dsmeta

[Libreoffice-commits] core.git: 2 commits - compilerplugins/clang dbaccess/source sd/source sfx2/source svx/source sw/source

[Noel Grandin (via logerrit)]

 compilerplugins/clang/test/unusedfields.cxx   |   44 ++
 compilerplugins/clang/unusedfields.cxx|   44 +++---
 dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx |1 
 sd/source/filter/eppt/pptx-animations-nodectx.cxx |5 -
 sd/source/filter/eppt/pptx-animations-nodectx.hxx |1 
 sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx |3 
 sd/source/ui/slidesorter/controller/SlsProperties.cxx |3 
 sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx  |   18 
 sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx |6 -
 sfx2/source/control/recentdocsviewitem.cxx|3 
 sfx2/source/control/recentdocsviewitem.hxx|1 
 svx/source/dialog/framelinkarray.cxx  |5 -
 sw/source/uibase/docvw/edtwin.cxx |3 
 sw/source/uibase/inc/shdwcrsr.hxx |5 -
 14 files changed, 88 insertions(+), 54 deletions(-)

New commits:
commit 3d24564ef01396f1a66dcd971f11e34d84d65d7d
Author: Noel Grandin 
AuthorDate: Thu Jun 29 13:01:07 2023 +0200
Commit: Noel Grandin 
CommitDate: Thu Jun 29 17:33:40 2023 +0200

mbIsUIReadOnly is dead

after I removed SetUIReadOnly in
commit e2c7a6bd572644b928704f6cb3696b568ac0aba1
loplugin::unusedmethods

and that was dead because of
commit cb32938d572777c9a5d75007cc76ba50c5a698eb
[API CHANGE] remove unused SlideSorterService

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

diff --git a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx 
b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx
index f447c565639e..b635accc5535 100644
--- a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx
@@ -74,9 +74,6 @@ void DragAndDropContext::UpdatePosition (
 if (mpTargetSlideSorter == nullptr)
 return;
 
-if (mpTargetSlideSorter->GetProperties()->IsUIReadOnly())
-return;
-
 // Convert window coordinates into model coordinates (we need the
 // window coordinates for auto-scrolling because that remains
 // constant while scrolling.)
diff --git a/sd/source/ui/slidesorter/controller/SlsProperties.cxx 
b/sd/source/ui/slidesorter/controller/SlsProperties.cxx
index 908f3031d2be..cbe0d6e0ea7a 100644
--- a/sd/source/ui/slidesorter/controller/SlsProperties.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsProperties.cxx
@@ -25,8 +25,7 @@ namespace sd::slidesorter::controller {
 
 Properties::Properties()
 : 
maBackgroundColor(Application::GetSettings().GetStyleSettings().GetWindowColor()),
-  
maSelectionColor(Application::GetSettings().GetStyleSettings().GetHighlightColor()),
-  mbIsUIReadOnly(false)
+  
maSelectionColor(Application::GetSettings().GetStyleSettings().GetHighlightColor())
 {
 }
 
diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx 
b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
index 450fdd294a55..f8376ec409fd 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
@@ -466,9 +466,6 @@ bool SelectionFunction::KeyInput (const KeyEvent& rEvent)
 case KEY_DELETE:
 case KEY_BACKSPACE:
 {
-if (mrSlideSorter.GetProperties()->IsUIReadOnly())
-break;
-
 
mrController.GetSelectionManager()->DeleteSelectedPages(rCode.GetCode()==KEY_DELETE);
 
 mnShiftKeySelectionAnchor = -1;
@@ -560,10 +557,7 @@ void SelectionFunction::MoveFocus (
 
 void SelectionFunction::DoCut()
 {
-if ( ! mrSlideSorter.GetProperties()->IsUIReadOnly())
-{
-mrController.GetClipboard().DoCut();
-}
+mrController.GetClipboard().DoCut();
 }
 
 void SelectionFunction::DoCopy()
@@ -573,10 +567,7 @@ void SelectionFunction::DoCopy()
 
 void SelectionFunction::DoPaste()
 {
-if ( ! mrSlideSorter.GetProperties()->IsUIReadOnly())
-{
-mrController.GetClipboard().DoPaste();
-}
+mrController.GetClipboard().DoPaste();
 }
 
 bool SelectionFunction::cancel()
@@ -950,10 +941,7 @@ void SelectionFunction::ModeHandler::StartDrag (
 if (SD_MOD()->pTransferDrag != nullptr)
 return;
 
-if ( ! mrSlideSorter.GetProperties()->IsUIReadOnly())
-{
-mrSelectionFunction.SwitchToDragAndDropMode(rMousePosition);
-}
+mrSelectionFunction.SwitchToDragAndDropMode(rMousePosition);
 }
 
 //= NormalModeHandler =
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx 
b/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx
index cd1914fe07

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

[Noel Grandin (via logerrit)]

 sfx2/source/view/viewsh.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit c89b7f4a31298360e14663f3c192e4e832759a1f
Author: Noel Grandin 
AuthorDate: Thu Jun 29 12:40:42 2023 +0200
Commit: Noel Grandin 
CommitDate: Thu Jun 29 17:15:50 2023 +0200

set->unordered_set

which is more efficient, and we don't need ordering here

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

diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index acdfd3d8f9dd..0d7d7f14ff99 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -107,6 +107,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -242,7 +243,7 @@ class LOKDocumentFocusListener :
 static constexpr sal_Int64 MAX_ATTACHABLE_CHILDREN = 30;
 
 const SfxViewShell* m_pViewShell;
-std::set< uno::Reference< uno::XInterface > > m_aRefList;
+std::unordered_set< uno::Reference< uno::XInterface > > m_aRefList;
 OUString m_sFocusedParagraph;
 bool m_bFocusedParagraphNotified;
 sal_Int32 m_nCaretPosition;

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

[Balazs Varga (via logerrit)]

 editeng/source/uno/unotext.cxx   |   38 +++-
 sc/source/core/data/postit.cxx   |   84 +++
 test/source/sheet/xsheetannotationanchor.cxx |2 
 3 files changed, 97 insertions(+), 27 deletions(-)

New commits:
commit 2f76c9a2aff418f7c908c4494a05f5e859a83746
Author: Balazs Varga 
AuthorDate: Tue Jun 20 19:26:50 2023 +0200
Commit: Thorsten Behrens 
CommitDate: Thu Jun 29 16:58:16 2023 +0200

tdf#73537 - sc: show author and creation date in calc comments

in temporory mode. Show the author and creation/modification
date of the the comment only in temporory mode. In edit mode, or
visible mode, shows only the original text.

Change-Id: I2c5856e4c6a813dbef4ad55de319f922daa57f67
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153358
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky 
Reviewed-by: Balazs Varga 
(cherry picked from commit da8dead8e9282010893cbd12519e107baf03cd1a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153705
Reviewed-by: Thorsten Behrens 

diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index 6f78a4a66878..1eb84a177f44 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -2078,11 +2078,43 @@ uno::Reference< text::XTextRange > SAL_CALL 
SvxUnoTextBase::finishParagraph(
 }
 
 uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextBase::insertTextPortion(
-const OUString& /*rText*/,
-const uno::Sequence< beans::PropertyValue >& /*rCharAndParaProps*/,
-const uno::Reference< text::XTextRange>& /*rTextRange*/ )
+const OUString& rText,
+const uno::Sequence< beans::PropertyValue >& rCharAndParaProps,
+const uno::Reference< text::XTextRange>& rTextRange )
 {
+SolarMutexGuard aGuard;
+
 uno::Reference< text::XTextRange > xRet;
+
+if (!rTextRange.is())
+return xRet;
+
+SvxUnoTextRangeBase* pRange = 
comphelper::getFromUnoTunnel(rTextRange);
+if (!pRange)
+return xRet;
+
+SvxEditSource *pEditSource = GetEditSource();
+SvxTextForwarder *pTextForwarder = pEditSource ? 
pEditSource->GetTextForwarder() : nullptr;
+
+if (pTextForwarder)
+{
+pRange->setString(rText);
+
+ESelection aSelection(pRange->GetSelection());
+
+pTextForwarder->RemoveAttribs(aSelection);
+pEditSource->UpdateData();
+
+SfxItemSet aItemSet( *pTextForwarder->GetEmptyItemSetPtr() );
+SvxPropertyValuesToItemSet( aItemSet, rCharAndParaProps,
+ImplGetSvxTextPortionSfxPropertySet(), pTextForwarder, 
aSelection.nStartPara );
+pTextForwarder->QuickSetAttribs( aItemSet, aSelection);
+rtl::Reference pNewRange = new SvxUnoTextRange( *this 
);
+xRet = pNewRange;
+pNewRange->SetSelection(aSelection);
+for( const beans::PropertyValue& rProp : rCharAndParaProps )
+pNewRange->setPropertyValue( rProp.Name, rProp.Value );
+}
 return xRet;
 }
 
diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx
index dd1a023445e2..106a249e5666 100644
--- a/sc/source/core/data/postit.cxx
+++ b/sc/source/core/data/postit.cxx
@@ -57,6 +57,13 @@
 #include 
 #include 
 #include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
 
 using namespace com::sun::star;
 
@@ -493,8 +500,10 @@ void ScPostIt::SetAuthor( const OUString& rAuthor )
 
 void ScPostIt::AutoStamp()
 {
-maNoteData.maDate = ScGlobal::getLocaleData().getDate( Date( Date::SYSTEM 
) );
-maNoteData.maAuthor = SvtUserOptions().GetID();
+maNoteData.maDate = ScGlobal::getLocaleData().getDate( Date( Date::SYSTEM 
) ) + " " +
+ScGlobal::getLocaleData().getTime(DateTime(DateTime::SYSTEM), false);
+const OUString aAuthor = SvtUserOptions().GetFullName();
+maNoteData.maAuthor = !aAuthor.isEmpty() ? aAuthor : 
ScResId(STR_CHG_UNKNOWN_AUTHOR);
 }
 
 const OutlinerParaObject* ScPostIt::GetOutlinerObject() const
@@ -793,25 +802,55 @@ void ScPostIt::RemoveCaption()
 }
 }
 
+static void lcl_FormatAndInsertAuthorAndDatepara(SdrCaptionObj* pCaption, 
OUStringBuffer& aUserData, bool bUserWithTrackText)
+{
+uno::Reference xShape = pCaption->getUnoShape();
+uno::Reference xText(xShape, uno::UNO_QUERY);
+uno::Reference xBodyTextAppend(xText, uno::UNO_QUERY);
+
+if (xBodyTextAppend.is())
+{
+uno::Sequence< beans::PropertyValue > aArgs;
+if (bUserWithTrackText)
+{
+xBodyTextAppend->insertTextPortion(aUserData.makeStringAndClear(), 
aArgs, xText->getStart());
+}
+else
+{
+xBodyTextAppend->insertTextPortion("\n\n", aArgs, 
xText->getStart());
+aArgs = {
+comphelper::makePropertyValue("CharWeight", 
uno::Any(awt::FontWeight::BOLD)),
+};
+xBodyTextAppend->insertTextPortion(aUserData.makeStringAndClear(), 
aArgs,

ESC meeting minutes: 2023-06-29

[Stephan Bergmann]

* Present:
+ Affiliated with TDF: Florian Effenberger, Mike Saunders, Juan 
Jose Gonzales,  Stephane Guillou, Xisco Fauli, Hossein Nourikhah, 
Christian Lohmaier, Michael Weghorn (City of Munich until 2023-06-30), 
Stephan Ficht, Olivier Hallot, Heiko Tietze, Sophie Gautier, Ilmari 
Lauhakangas

+ Affiliated with Hideas: Italo Vignoli
+ Affiliated with Collabora: Caolan McNamara
+ Affiliated with allotropia: Thorsten Behrens
+ Affiliated with Red Hat: Stephan Bergmann
+ Unaffiliated: Regina Henschel

* Completed Action Items:

* Pending Action Items:

* ESC budget voting (Ilmari)
* Preparations
* blogpost with call for proposals was published with more than 15
days deadline
* wiki page was available for everyone to edit
* ESC minutes were shared publicly and sent to mailing lists
* today's call was announced publicly
* ranking spreadsheet was always public in an up to date version
* updated ESC tendering process draft:
  https://nextcloud.documentfoundation.org/s/ysttSYyRnyM6QYF

* Pending items
* transparency section of the website must be in place before
tendering starts, Italo is working on it
* blogpost with ranking spreadsheet must be published as soon 
as that

one is finalized

* Proposals
* No paid external expert was requested.
* No urgency request was made.
* Do all proposals on today's list have a sufficient 
description and

cost estimate? Yes.
* Have all cost estimates been re-evaluated by only non-conflicted
members of the ESC? Yes.

* Ranking
* ALL proposals must be ranked.
* Proposal by a committee that has a majority of non-Conflicted 
members.

* Decision then by CONSENSUS of only the non-Conflicted members.
* Failing that, majority VOTE by only non-Conflicted members.

* Spreadsheet with comments from TDF staff:
https://nextcloud.documentfoundation.org/s/i9CSEs2gjFisc2y

* Budget pages for reference:
+ https://wiki.documentfoundation.org/Development/Budget2020
+ https://wiki.documentfoundation.org/Development/Budget2021
+ https://wiki.documentfoundation.org/Development/Budget2022
+ https://wiki.documentfoundation.org/Development/Budget2023

* Propose to drop it
+ GraphicFilter clean-up (2020)
  + Done by Tomaž (thanks!)
+ Text runs of RTL scripts (e.g. Arabic, Hebrew, Persian)
from imported PDF are reversed, PDFIProcessor::mirrorString not 
behaving (2022)

  + Fixed by Kevin Suo (thanks!)
+ UNO API changes subscription/feedback channel (2022)
  + TDF infra team will be able to implement this
+ Regular scan-build reports like we do with CppCheck (2022)
  + Cloph can do it, just hook up existing cppcheck as jenkins job
https://dev-builds.libreoffice.org/cppcheck_reports/master/
+ Multi-color gradient (2022)
  + allotropia already working on this / done for 7.6
+ Fix accessibility issues (2022)
  + Description too vague, now TDF has hired an accessibility 
developer

+ Automated test tools for finding text rendering defects
  + Khaled is already working on it
+ Improve the experience of the CPP SDK
  + Hossein working on it

* Propose to put it on hold for now
+ Bitmaps in vcl: Use a native format/depth (2022)
  + Lacked time to estimate
+ Table Styles improvements (2022)
  + Lacked time to estimate
+ Unify Writer and Draw Images (2022)
  + Lacked time to estimate
+ Decouple master slide and layouts (2022)
  + Lacked time to estimate
+ Missing ODF Features: Concentric gradient fill of 
custom-shapes (2022)

  + Lacked time to estimate
+ Bridge the gap between drawinglayer and VCL (2022)
  + Lacked time to estimate
+ Rolling Release: Finish MAR-based autoupdater for Windows (2021)
  + Very large size and large maintenance cost for infra. 
Partially addressed with the app stores.

+ Stabilize cross-page table layouting (2022)
  + The selection of bugs seems random
+ XLSX Aggressive Competitors tracker: table styles (ranked 6 
in Feb 2023)

  + has a dependency which needs to be completed first
+ Power optimization research (ranked 43 in Feb 2023)
  + We are working with KDE regarding the Blue Angel certificate

* Reviewed items to be voted on
+ Cleanup & further improve ODF conformance (2021)
+ Convert Impress slideshow to drawinglayer primitives (2021)
+ Writer tables: support cell margins (next to cell padding) (2021)
+ Font subsetter for font embedding (2022)
+ XLSX Aggressive Competitors tracker: gridlines for 3d line 
charts (2022)

+ Look-ahead styleref field for Writer (2022)

Re: New Defects reported by Coverity Scan for LibreOffice

[Caolán McNamara]

On Thu, 2023-06-29 at 12:42 +, scan-ad...@coverity.com wrote:
> Hi,
> 
> Please find the latest report on new defect(s) introduced to
> LibreOffice found with Coverity Scan.
> 
> 123 new defect(s) introduced to LibreOffice found with Coverity Scan.
> 565 defect(s), reported by Coverity Scan earlier, were marked fixed
> in the recent build analyzed by Coverity Scan.

I mixed up my upload links :-) Fixed build due tomorrow.

[Libreoffice-commits] core.git: Branch 'distro/vector/vector-7.5' - 4 commits - desktop/source include/comphelper include/vcl sd/source sw/qa sw/source vcl/source

[Mike Kaganski (via logerrit)]

 desktop/source/deployment/registry/configuration/dp_configuration.cxx |   36 
-
 include/comphelper/xmlencode.hxx  |   62 
++
 include/vcl/pdfwriter.hxx |2 
 sd/source/filter/html/htmlex.cxx  |5 
 sw/qa/extras/htmlexport/data/frameWithText.fodt   |   25 

 sw/qa/extras/htmlexport/htmlexport.cxx|   19 
+++
 sw/source/filter/html/css1atr.cxx |3 
 sw/source/filter/html/htmlfldw.cxx|3 
 sw/source/filter/html/htmlflywriter.cxx   |   39 
+-
 vcl/source/gdi/pdfwriter_impl.cxx |   39 
--
 10 files changed, 156 insertions(+), 77 deletions(-)

New commits:
commit a259e8396c611250346492ed9d48e367d48d8d8e
Author: Mike Kaganski 
AuthorDate: Thu Jun 29 12:22:55 2023 +0300
Commit: Mike Kaganski 
CommitDate: Thu Jun 29 15:51:53 2023 +0300

XML-encode text that will appear in ReqIF

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

diff --git a/sw/qa/extras/htmlexport/data/frameWithText.fodt 
b/sw/qa/extras/htmlexport/data/frameWithText.fodt
index 3c4635b14a78..97ee5b105984 100644
--- a/sw/qa/extras/htmlexport/data/frameWithText.fodt
+++ b/sw/qa/extras/htmlexport/data/frameWithText.fodt
@@ -16,7 +16,7 @@
A frame with text below

  
-  Some text in frame
+  Some text in frame & 

  
 
A text after the frame
diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx 
b/sw/qa/extras/htmlexport/htmlexport.cxx
index 30337cc14320..7400eb34c556 100644
--- a/sw/qa/extras/htmlexport/htmlexport.cxx
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -2587,12 +2587,12 @@ CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, 
testReqIF_FrameTextAsObjectAltText)
 CPPUNIT_ASSERT(pDoc);
 
 // Without the fix, this would fail with
-// - Expected: Some text in frame
+// - Expected: Some text in frame & 
 // - Actual  : Frame1
 // i.e., frame name was used as the object element content, not frame text
 assertXPathContent(pDoc,

"/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:p[2]/reqif-xhtml:object",
-   "Some text in frame");
+   "Some text in frame & ");
 }
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/html/htmlflywriter.cxx 
b/sw/source/filter/html/htmlflywriter.cxx
index ff74ff1301b5..14f04ff35742 100644
--- a/sw/source/filter/html/htmlflywriter.cxx
+++ b/sw/source/filter/html/htmlflywriter.cxx
@@ -42,6 +42,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -1246,10 +1247,10 @@ OUString getFrameFormatText(const SwFrameFormat& 
rFrameFormat)
 {
 if (!result.isEmpty())
 result.append("\n");
-result.append(pTextNd->GetExpandText(
+
result.append(comphelper::string::encodeForXml(pTextNd->GetExpandText(
 nullptr, 0, -1, true, true, false,
 ExpandMode::ExpandFields | ExpandMode::HideInvisible | 
ExpandMode::HideDeletions
-| ExpandMode::HideFieldmarkCommands));
+| ExpandMode::HideFieldmarkCommands)));
 }
 }
 
commit 92feb18da130a3b9b1b841f661cd8a0b007ae402
Author: Szymon Kłos 
AuthorDate: Fri Apr 7 09:48:41 2023 +0200
Commit: Mike Kaganski 
CommitDate: Thu Jun 29 15:51:45 2023 +0300

Make encodeForXml accessible for other modules

and share similar code

Change-Id: I7729a46d40845893f577c273c1ab340f69ebb51b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151230
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151754
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git 
a/desktop/source/deployment/registry/configuration/dp_configuration.cxx 
b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
index 1f4ba053ec55..622814248670 100644
--- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx
+++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
@@ -37,6 +37,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -566,39 +567,6 @@ BackendImpl::PackageImpl::isRegistered_(
 }
 
 
-OUString encodeForXml( std::u16string_view text )
-{
-// encode conforming xml:
-size_t len = text.size();
-OUStringBuffer buf;
-for ( size_t pos = 0; pos < len; ++pos )
-{
-sal_Unicode c = text[ pos ];
-switch (c) {
-case '<':
-buf.append( "<" );
-break;
-case '>':
-buf.append( ">" );
-break;
-

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

[Paris Oplopoios (via logerrit)]

 drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx |   14 ---
 include/vcl/animate/AnimationFrame.hxx   |   14 +--
 vcl/source/animate/AnimationFrame.cxx|3 ++
 vcl/source/filter/png/PngImageReader.cxx |6 +++-
 4 files changed, 30 insertions(+), 7 deletions(-)

New commits:
commit 8dfde7d69a8bbdc8ce88aefded231b94e30271d6
Author: Paris Oplopoios 
AuthorDate: Sat Jun 24 17:36:09 2023 +0300
Commit: Tomaž Vajngerl 
CommitDate: Thu Jun 29 15:19:54 2023 +0200

tdf#104877 Implement APNG blending modes

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

diff --git a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx 
b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
index a95df2474744..f3c4cf69911c 100644
--- a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
+++ b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
@@ -252,6 +252,15 @@ namespace drawinglayer::primitive2d
 // prepare step
 const AnimationFrame& rAnimationFrame = 
maAnimation.Get(sal_uInt16(mnNextFrameToPrepare));
 
+bool bSourceBlending = rAnimationFrame.meBlend == 
Blend::Source;
+
+if (bSourceBlending)
+{
+tools::Rectangle 
aArea(rAnimationFrame.maPositionPixel, 
rAnimationFrame.maBitmapEx.GetSizePixel());
+maVirtualDevice->Erase(aArea);
+maVirtualDeviceMask->Erase(aArea);
+}
+
 switch (rAnimationFrame.meDisposal)
 {
 case Disposal::Not:
@@ -278,14 +287,13 @@ namespace drawinglayer::primitive2d
 {
 // #i70772# react on no mask, for primitives, too.
 const AlphaMask & 
rMask(rAnimationFrame.maBitmapEx.GetAlphaMask());
-const Bitmap & 
rContent(rAnimationFrame.maBitmapEx.GetBitmap());
 
 maVirtualDeviceMask->Erase();
-
maVirtualDevice->DrawBitmap(rAnimationFrame.maPositionPixel, rContent);
+
maVirtualDevice->DrawBitmapEx(rAnimationFrame.maPositionPixel, 
rAnimationFrame.maBitmapEx);
 
 if (rMask.IsEmpty())
 {
-const ::tools::Rectangle 
aRect(rAnimationFrame.maPositionPixel, rContent.GetSizePixel());
+const ::tools::Rectangle 
aRect(rAnimationFrame.maPositionPixel, 
rAnimationFrame.maBitmapEx.GetSizePixel());
 maVirtualDeviceMask->SetFillColor(COL_BLACK);
 maVirtualDeviceMask->SetLineColor();
 maVirtualDeviceMask->DrawRect(aRect);
diff --git a/include/vcl/animate/AnimationFrame.hxx 
b/include/vcl/animate/AnimationFrame.hxx
index 7aa6f0d54a2b..3e9a4b21d168 100644
--- a/include/vcl/animate/AnimationFrame.hxx
+++ b/include/vcl/animate/AnimationFrame.hxx
@@ -28,6 +28,12 @@ enum class Disposal
 Previous
 };
 
+enum class Blend
+{
+Source,
+Over
+};
+
 struct AnimationFrame
 {
 BitmapEx maBitmapEx;
@@ -35,22 +41,26 @@ struct AnimationFrame
 Size maSizePixel;
 tools::Long mnWait;
 Disposal meDisposal;
+Blend meBlend;
 bool mbUserInput;
 
 AnimationFrame()
 : mnWait(0)
 , meDisposal(Disposal::Not)
+, meBlend(Blend::Over)
 , mbUserInput(false)
 {
 }
 
 AnimationFrame(const BitmapEx& rBitmapEx, const Point& rPositionPixel, 
const Size& rSizePixel,
-   tools::Long nWait = 0, Disposal eDisposal = Disposal::Not)
+   tools::Long nWait = 0, Disposal eDisposal = Disposal::Not,
+   Blend eBlend = Blend::Over)
 : maBitmapEx(rBitmapEx)
 , maPositionPixel(rPositionPixel)
 , maSizePixel(rSizePixel)
 , mnWait(nWait)
 , meDisposal(eDisposal)
+, meBlend(eBlend)
 , mbUserInput(false)
 {
 }
@@ -60,7 +70,7 @@ struct AnimationFrame
 return (rAnimationFrame.maBitmapEx == maBitmapEx
 && rAnimationFrame.maPositionPixel == maPositionPixel
 && rAnimationFrame.maSizePixel == maSizePixel && 
rAnimationFrame.mnWait == mnWait
-&& rAnimationFrame.meDisposal == meDisposal
+&& rAnimationFrame.meDisposal == meDisposal && 
rAnimationFrame.meBlend == meBlend
 && rAnimationFrame.mbUserInput == mbUserInput);
 }
 
diff --git a/vcl/source/animate/AnimationFrame.cxx 
b/vcl/source/animate/AnimationFrame.cxx
index e2f9bae931fb..3593a0ab17e1 100644
--- a/vcl/source/animate/AnimationFra

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

[Laurent Balland (via logerrit)]

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

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

tdf#155526 Restore status bar for moving average

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

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

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

New Defects reported by Coverity Scan for LibreOffice

[scan-admin]

Hi,

Please find the latest report on new defect(s) introduced to LibreOffice found 
with Coverity Scan.

123 new defect(s) introduced to LibreOffice found with Coverity Scan.
565 defect(s), reported by Coverity Scan earlier, were marked fixed in the 
recent build analyzed by Coverity Scan.

New defect(s) Reported-by: Coverity Scan
Showing 20 of 123 defect(s)


** CID 1533655:  Security best practices violations  (DC.WEAK_CRYPTO)
/tools/Replay.hpp: 214 in StressSocketHandler::StressSocketHandler(SocketPoll 
&, std::shared_ptr, const std::__cxx11::basic_string, std::allocator> &, const 
std::__cxx11::basic_string, std::allocator> 
&, int)()



*** CID 1533655:  Security best practices violations  (DC.WEAK_CRYPTO)
/tools/Replay.hpp: 214 in StressSocketHandler::StressSocketHandler(SocketPoll 
&, std::shared_ptr, const std::__cxx11::basic_string, std::allocator> &, const 
std::__cxx11::basic_string, std::allocator> 
&, int)()
208 {
209 static std::atomic number;
210 _logPre = "[" + std::to_string(++number) + "] ";
211 std::cerr << "Attempt connect to " << uri << " for trace " << 
_trace << "\n";
212 getNextRecord();
213 _start = std::chrono::steady_clock::now() + 
std::chrono::milliseconds(delayMs);
>>> CID 1533655:  Security best practices violations  (DC.WEAK_CRYPTO)
>>> "rand" should not be used for security-related applications, because 
>>> linear congruential algorithms are too easy to break.
214 _nextPing = _start + 
std::chrono::milliseconds((long)(std::rand() * 1000.0) / RAND_MAX);
215 _lastTile = _start;
216 }
217 
218 void gotPing(WSOpCode /* code */, int pingTimeUs) override
219 {

** CID 1533654:  API usage errors  (INVALIDATE_ITERATOR)
/test/WopiTestServer.hpp: 519 in WopiTestServer::assertTargetTest(const 
Poco::URI &)()



*** CID 1533654:  API usage errors  (INVALIDATE_ITERATOR)
/test/WopiTestServer.hpp: 519 in WopiTestServer::assertTargetTest(const 
Poco::URI &)()
513 const auto testnameIt = std::find_if(params.begin(), 
params.end(),
514  [](const 
std::pair& pair)
515  { return pair.first == 
"testname"; });
516 
517 LOK_ASSERT_MESSAGE_SILENT("Request belongs to an unknown test", 
testnameIt != params.end());
518 
>>> CID 1533654:  API usage errors  (INVALIDATE_ITERATOR)
>>> Dereferencing iterator "testnameIt" though it is already past the end 
>>> of its container.
519 const std::string target = 
StringVector::tokenize(testnameIt->second, '/')[0];
520 LOK_ASSERT_EQUAL_MESSAGE("Request belongs to a different test", 
getTestname(), target);
521 }
522 
523 /// Here we act as a WOPI server, so that we have a server that 
responds to
524 /// the wopi requests without additional expensive setup.

** CID 1533653:  Performance inefficiencies  (COPY_INSTEAD_OF_MOVE)
/wsd/DocumentBroker.cpp: 3944 in RenderSearchResultBroker::handleInput(const 
std::shared_ptr &)()



*** CID 1533653:  Performance inefficiencies  (COPY_INSTEAD_OF_MOVE)
/wsd/DocumentBroker.cpp: 3944 in RenderSearchResultBroker::handleInput(const 
std::shared_ptr &)()
3938 _aResposeData.resize(messageData.size() - 
commandStringVector.size());
3939 std::copy(messageData.begin() + 
commandStringVector.size(), messageData.end(), _aResposeData.begin());
3940 
3941 std::string aDataString(_aResposeData.data(), 
_aResposeData.size());
3942 // really not ideal that the response works only with 
std::string
3943 http::Response httpResponse(http::StatusCode::OK);
>>> CID 1533653:  Performance inefficiencies  (COPY_INSTEAD_OF_MOVE)
>>> "aDataString" is passed-by-value as parameter to "setBody" when it 
>>> could be moved instead.
3944 httpResponse.setBody(aDataString, "image/png");
3945 httpResponse.set("Connection", "close");
3946 _socket->sendAndShutdown(httpResponse);
3947 
3948 removeSession(_clientSession);
3949 stop("Finished RenderSearchResult handler.");

** CID 1533652:  Performance inefficiencies  (PASS_BY_VALUE)
/wsd/Storage.hpp: 440 in StorageBase::sanitizeUri(Poco::URI)()



*** CID 1533652:  Performance inefficiencies  (PASS_BY_VALUE)
/wsd/Storage.hpp: 440 in StorageBase::sanitizeUri(Poco::URI)()
434 

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

[Mike Kaganski (via logerrit)]

 sw/qa/extras/htmlexport/data/frameWithText.fodt |   25 
 sw/qa/extras/htmlexport/htmlexport.cxx  |   19 ++
 sw/source/filter/html/htmlflywriter.cxx |5 ++--
 3 files changed, 47 insertions(+), 2 deletions(-)

New commits:
commit 532e37c8127c9ae8bc1c455ef2d582e6d2252fb5
Author: Mike Kaganski 
AuthorDate: Thu Jun 29 12:22:55 2023 +0300
Commit: Mike Kaganski 
CommitDate: Thu Jun 29 14:36:11 2023 +0200

XML-encode text that will appear in ReqIF

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

diff --git a/sw/qa/extras/htmlexport/data/frameWithText.fodt 
b/sw/qa/extras/htmlexport/data/frameWithText.fodt
index 3c4635b14a78..97ee5b105984 100644
--- a/sw/qa/extras/htmlexport/data/frameWithText.fodt
+++ b/sw/qa/extras/htmlexport/data/frameWithText.fodt
@@ -16,7 +16,7 @@
A frame with text below

  
-  Some text in frame
+  Some text in frame & 

  
 
A text after the frame
diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx 
b/sw/qa/extras/htmlexport/htmlexport.cxx
index 04f8f0d164dc..f83f446f9589 100644
--- a/sw/qa/extras/htmlexport/htmlexport.cxx
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -2728,12 +2728,12 @@ CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, 
testReqIF_FrameTextAsObjectAltText)
 CPPUNIT_ASSERT(pDoc);
 
 // Without the fix, this would fail with
-// - Expected: Some text in frame
+// - Expected: Some text in frame & 
 // - Actual  : Frame1
 // i.e., frame name was used as the object element content, not frame text
 assertXPathContent(pDoc,

"/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:p[2]/reqif-xhtml:object",
-   "Some text in frame");
+   "Some text in frame & ");
 }
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/html/htmlflywriter.cxx 
b/sw/source/filter/html/htmlflywriter.cxx
index d404e305e172..6aafdeaa0f2f 100644
--- a/sw/source/filter/html/htmlflywriter.cxx
+++ b/sw/source/filter/html/htmlflywriter.cxx
@@ -42,6 +42,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -1245,10 +1246,10 @@ OUString getFrameFormatText(const SwFrameFormat& 
rFrameFormat)
 {
 if (!result.isEmpty())
 result.append("\n");
-result.append(pTextNd->GetExpandText(
+
result.append(comphelper::string::encodeForXml(pTextNd->GetExpandText(
 nullptr, 0, -1, true, true, false,
 ExpandMode::ExpandFields | ExpandMode::HideInvisible | 
ExpandMode::HideDeletions
-| ExpandMode::HideFieldmarkCommands));
+| ExpandMode::HideFieldmarkCommands)));
 }
 }
 
commit 2d8e0ce32d6dccc3441c25dc29bb60489f886ea0
Author: Mike Kaganski 
AuthorDate: Thu Jun 29 12:00:31 2023 +0300
Commit: Mike Kaganski 
CommitDate: Thu Jun 29 14:36:00 2023 +0200

ReqIF: add unit test for frame text in 'object' elements' alt text

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

diff --git a/sw/qa/extras/htmlexport/data/frameWithText.fodt 
b/sw/qa/extras/htmlexport/data/frameWithText.fodt
new file mode 100644
index ..3c4635b14a78
--- /dev/null
+++ b/sw/qa/extras/htmlexport/data/frameWithText.fodt
@@ -0,0 +1,25 @@
+
+
+
+ 
+  
+   
+  
+ 
+ 
+  
+   
+  
+ 
+ 
+  
+   A frame with text below
+   
+ 
+  Some text in frame
+ 
+
+   A text after the frame
+  
+ 
+
\ No newline at end of file
diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx 
b/sw/qa/extras/htmlexport/htmlexport.cxx
index 6fdb67f68eb7..04f8f0d164dc 100644
--- a/sw/qa/extras/htmlexport/htmlexport.cxx
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -2717,6 +2717,25 @@ CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, 
testReqIF_ListsNoStartAttribute)
 assertXPath(pDoc, "//reqif-xhtml:ol[@start]", 0);
 }
 
+CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testReqIF_FrameTextAsObjectAltText)
+{
+createSwDoc("frameWithText.fodt");
+ExportToReqif();
+
+SvMemoryStream aStream;
+WrapReqifFromTempFile(aStream);
+xmlDocUniquePtr pDoc = parseXmlStream(&aStream);
+CPPUNIT_ASSERT(pDoc);
+
+// Without the fix, this would fail with
+// - Expected: Some text in frame
+// - Actual  : Frame1
+// i.e., frame name was used as the object element content, not frame text
+assertXPathContent(pDoc,
+   
"/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:p[2]/reqif-xhtml:object",
+   "Some text in frame");
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

[Libreoffice-commits] core.git: officecfg/registry

[Gabor Kelemen (via logerrit)]

 officecfg/registry/schema/org/openoffice/LDAP.xcs |5 -
 1 file changed, 5 deletions(-)

New commits:
commit 95e5001d934fb2e27173087c64443b160bf0593f
Author: Gabor Kelemen 
AuthorDate: Fri May 12 22:55:07 2023 +0200
Commit: Thorsten Behrens 
CommitDate: Thu Jun 29 14:28:26 2023 +0200

[API CHANGE] Drop obsolete Mapping config key

Obsoleted in 2010 by
commit c79b576a3dbbbce2a67c6215a4180ac060131790

Change-Id: Iaca64f7560d485338d9de9be19e09d69a83c0d8d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152402
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/officecfg/registry/schema/org/openoffice/LDAP.xcs 
b/officecfg/registry/schema/org/openoffice/LDAP.xcs
index 18db511ab297..18304a1d1f50 100644
--- a/officecfg/registry/schema/org/openoffice/LDAP.xcs
+++ b/officecfg/registry/schema/org/openoffice/LDAP.xcs
@@ -69,11 +69,6 @@
   Name of User entity unique attribute in LDAP repository
 
   
-  
-
-  Obsolete and unused
-
-  
   
 
   Specifies the LDAP related settings

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

[Balazs Varga (via logerrit)]

 sw/source/uibase/sidebar/A11yCheckIssuesPanel.cxx |   39 +-
 sw/source/uibase/sidebar/A11yCheckIssuesPanel.hxx |1 
 2 files changed, 32 insertions(+), 8 deletions(-)

New commits:
commit a2389bcd630b8c011e3dc236a33c7d2de43fd2be
Author: Balazs Varga 
AuthorDate: Wed Jun 28 19:44:54 2023 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Thu Jun 29 14:18:28 2023 +0200

tdf#156032 - A11Y: fix remove of empty issue sections

Remove issue categories if there is no more issue in it.

Change-Id: Ic5dddf3db59c574d1e8712d79bdf203a6b637eb0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153724
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Jenkins
(cherry picked from commit 3b250bcd95f6be183b2694c57512eba9b1a0ca67)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153708

diff --git a/sw/source/uibase/sidebar/A11yCheckIssuesPanel.cxx 
b/sw/source/uibase/sidebar/A11yCheckIssuesPanel.cxx
index 123ce7e1fa57..162724a1035c 100644
--- a/sw/source/uibase/sidebar/A11yCheckIssuesPanel.cxx
+++ b/sw/source/uibase/sidebar/A11yCheckIssuesPanel.cxx
@@ -159,31 +159,54 @@ void A11yCheckIssuesPanel::ImplDestroy()
 
 A11yCheckIssuesPanel::~A11yCheckIssuesPanel() { 
suppress_fun_call_w_exception(ImplDestroy()); }
 
-void A11yCheckIssuesPanel::populateIssues()
+void A11yCheckIssuesPanel::removeOldWidgets()
 {
-if (!mpDoc)
-return;
-sw::AccessibilityCheck aCheck(mpDoc);
-aCheck.check();
-m_aIssueCollection = aCheck.getIssueCollection();
-
-// Remove old issue widgets
 for (auto const& xEntry : m_aDocumentEntries)
 m_xBoxDocument->move(xEntry->get_widget(), nullptr);
+m_xExpanderDocument->set_visible(false);
+
 for (auto const& xEntry : m_aStylesEntries)
 m_xBoxStyles->move(xEntry->get_widget(), nullptr);
+m_xExpanderStyles->set_visible(false);
+
 for (auto const& xEntry : m_aNoAltEntries)
 m_xBoxNoAlt->move(xEntry->get_widget(), nullptr);
+m_xExpanderNoAlt->set_visible(false);
+
 for (auto const& xEntry : m_aTableEntries)
 m_xBoxTable->move(xEntry->get_widget(), nullptr);
+m_xExpanderTable->set_visible(false);
+
 for (auto const& xEntry : m_aFormattingEntries)
 m_xBoxFormatting->move(xEntry->get_widget(), nullptr);
+m_xExpanderFormatting->set_visible(false);
+
 for (auto const& xEntry : m_aHyperlinkEntries)
 m_xBoxHyperlink->move(xEntry->get_widget(), nullptr);
+m_xExpanderHyperlink->set_visible(false);
+
 for (auto const& xEntry : m_aFakesEntries)
 m_xBoxFakes->move(xEntry->get_widget(), nullptr);
+m_xExpanderFakes->set_visible(false);
+
 for (auto const& xEntry : m_aNumberingEntries)
 m_xBoxNumbering->move(xEntry->get_widget(), nullptr);
+m_xExpanderNumbering->set_visible(false);
+
+for (auto const& xEntry : m_aOtherEntries)
+m_xBoxOther->move(xEntry->get_widget(), nullptr);
+m_xExpanderOther->set_visible(false);
+}
+
+void A11yCheckIssuesPanel::populateIssues()
+{
+if (!mpDoc)
+return;
+sw::AccessibilityCheck aCheck(mpDoc);
+aCheck.check();
+m_aIssueCollection = aCheck.getIssueCollection();
+
+removeOldWidgets();
 
 sal_Int32 iDocument = 0;
 sal_Int32 iStyles = 0;
diff --git a/sw/source/uibase/sidebar/A11yCheckIssuesPanel.hxx 
b/sw/source/uibase/sidebar/A11yCheckIssuesPanel.hxx
index d48f4cae2906..54e5ad560bdf 100644
--- a/sw/source/uibase/sidebar/A11yCheckIssuesPanel.hxx
+++ b/sw/source/uibase/sidebar/A11yCheckIssuesPanel.hxx
@@ -89,6 +89,7 @@ private:
 std::unique_ptr m_xBoxOther;
 sfx::AccessibilityIssueCollection m_aIssueCollection;
 std::function m_getIssueCollection;
+void removeOldWidgets();
 void populateIssues();
 
 SfxBindings* mpBindings;

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - sfx2/source

[Caolán McNamara (via logerrit)]

 sfx2/source/doc/iframe.cxx |   16 ++--
 1 file changed, 10 insertions(+), 6 deletions(-)

New commits:
commit 28338b9bab0bde32374fb408dba5100cc99a20d2
Author: Caolán McNamara 
AuthorDate: Tue Jun 20 10:20:36 2023 +0100
Commit: Andras Timar 
CommitDate: Thu Jun 29 13:54:58 2023 +0200

Resolves: tdf#155750 allow private:factory urls in floating frames

they create a new document so there isn't an associated location
which would trigger the prompt to allow it so just allow factory
urls

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

diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx
index 4f3b414d5d69..150218b436e9 100644
--- a/sfx2/source/doc/iframe.cxx
+++ b/sfx2/source/doc/iframe.cxx
@@ -174,14 +174,18 @@ sal_Bool SAL_CALL IFrameObject::load(
 uno::Reference xParentFrame = 
xFrame->getCreator();
 SfxObjectShell* pDoc = SfxMacroLoader::GetObjectShell(xParentFrame);
 
-bool bUpdateAllowed(true);
-if (pDoc)
+const bool bIsFactoryURL = 
aTargetURL.Complete.startsWith("private:factory/");
+if (!bIsFactoryURL)
 {
-comphelper::EmbeddedObjectContainer& rEmbeddedObjectContainer = 
pDoc->getEmbeddedObjectContainer();
-bUpdateAllowed = 
rEmbeddedObjectContainer.getUserAllowsLinkUpdate();
+bool bUpdateAllowed(true);
+if (pDoc)
+{
+comphelper::EmbeddedObjectContainer& rEmbeddedObjectContainer 
= pDoc->getEmbeddedObjectContainer();
+bUpdateAllowed = 
rEmbeddedObjectContainer.getUserAllowsLinkUpdate();
+}
+if (!bUpdateAllowed)
+return false;
 }
-if (!bUpdateAllowed)
-return false;
 
 OUString sReferer;
 if (pDoc && pDoc->HasName())

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - vcl/source

[Paris Oplopoios (via logerrit)]

 vcl/source/filter/GraphicFormatDetector.cxx |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit a1d9d090338009c3fdc4dcb8d6dc0dfb6c13e582
Author: Paris Oplopoios 
AuthorDate: Sat Jun 24 03:48:32 2023 +0300
Commit: Andras Timar 
CommitDate: Thu Jun 29 13:50:35 2023 +0200

tdf#156016 Fix bug where SVG check size would be 0

Change-Id: I1c4adf75bbfbce7cb6b779375714b1c1bc7ec50d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153543
Tested-by: Jenkins
Reviewed-by: Paris Oplopoios 
(cherry picked from commit 85013c57dd29e32ec0411c159ea72824ebca5aa9)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153528
Reviewed-by: Michael Stahl 

diff --git a/vcl/source/filter/GraphicFormatDetector.cxx 
b/vcl/source/filter/GraphicFormatDetector.cxx
index a0cdd2416c57..fc43cdd963ab 100644
--- a/vcl/source/filter/GraphicFormatDetector.cxx
+++ b/vcl/source/filter/GraphicFormatDetector.cxx
@@ -1249,7 +1249,7 @@ bool GraphicFormatDetector::checkSVG()
   SVG_CHECK_SIZE, 
nDecompressedSize);
 nCheckSize = std::min(nDecompressedSize, 256);
 bool bIsSvg(false);
-bool bIsGZip = (nDecompressedSize > 0);
+bool bIsGZip = mbWasCompressed;
 const char* pCheckArrayAsCharArray = reinterpret_cast(pCheckArray);
 // check for XML
 // #119176# SVG files which have no xml header at all have shown up this 
is optional
@@ -1279,11 +1279,11 @@ bool GraphicFormatDetector::checkSVG()
 
 if (bIsGZip)
 {
-nCheckSize = std::min(nDecompressedSize, 2048);
+nCheckSize = std::min(nDecompressedSize, 
SVG_CHECK_SIZE);
 }
 else
 {
-nCheckSize = std::min(mnStreamLength, 2048);
+nCheckSize = std::min(mnStreamLength, SVG_CHECK_SIZE);
 mrStream.Seek(mnStreamPosition);
 nCheckSize = mrStream.ReadBytes(sExtendedOrDecompressedFirstBytes, 
nCheckSize);
 }
@@ -1400,7 +1400,6 @@ sal_uInt8* 
GraphicFormatDetector::checkAndUncompressBuffer(sal_uInt8* aUncompres
 mbWasCompressed = true;
 return aUncompressedBuffer;
 }
-nRetSize = 0;
 mbWasCompressed = false;
 return maFirstBytes.data();
 }

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - svx/source

[Khaled Hosny (via logerrit)]

 svx/source/svdraw/svdotextdecomposition.cxx |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 4feaac8430f75e2bf0c1b9a94a0d30ef568d5ba1
Author: Khaled Hosny 
AuthorDate: Mon Jun 26 11:18:58 2023 +0300
Commit: Andras Timar 
CommitDate: Thu Jun 29 13:40:51 2023 +0200

tdf#156050: Fix how misspelling line is calculated for RTL text

Partially revert:

commit 74b6c5ea3c333de7c5e7ef8636732edadd9083f2
Author: Khaled Hosny 
Date:   Thu Jun 8 16:41:18 2023 +0300

tdf#151968: Fix vertical position of RTL spelling wavy line

Instead of changing how fStart and fEnd are calculated, calculate them
like before then swap them. This seems to be more reliable, and matches
what we do in Writer.

Change-Id: Ia15408881666a86151a12fcf016cc81c1568f7e5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153572
Tested-by: Jenkins
Reviewed-by: خالد حسني 
(cherry picked from commit 2ef138de767c312188d41a7f206234eafac3108b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153597
Reviewed-by: Michael Stahl 

diff --git a/svx/source/svdraw/svdotextdecomposition.cxx 
b/svx/source/svdraw/svdotextdecomposition.cxx
index 726ee850eb8b..5d7c51208154 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -427,12 +427,14 @@ namespace
 // full portion width
 const double fTextWidth(aDXArray[aDXArray.size() - 1]);
 
+fStart = fTextWidth - fStart;
+fEnd = fTextWidth - fEnd;
+
 // tdf#151968
 // if start < end, OutputDevice::DrawWaveLine() will
 // think it is a rotated line, so we swap fStart and
 // fEnd to avoid this.
-fStart = fTextWidth - fEnd;
-fEnd = fTextWidth - fStart;
+std::swap(fStart, fEnd);
 }
 
 // need to take FontScaling out of values; it's already 
part of

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

[Julien Nabet (via logerrit)]

 i18npool/source/nativenumber/nativenumbersupplier.cxx |6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 1cf6762b595f8efeb1f84b10a712a4613f6aaffb
Author: Julien Nabet 
AuthorDate: Thu Jun 29 08:34:51 2023 +0200
Commit: Julien Nabet 
CommitDate: Thu Jun 29 13:35:52 2023 +0200

tdf#152723: NatNum12 modifier, keep decimal separator from local settings

Change-Id: If49e7b42ac37eead4ef0a902b2e56735bb4017bb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153732
Reviewed-by: Julien Nabet 
Tested-by: Jenkins
(cherry picked from commit 67972ae450f6a20b7f21b7fe3a83f50990a5faf8)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153709
Reviewed-by: Mike Kaganski 

diff --git a/i18npool/source/nativenumber/nativenumbersupplier.cxx 
b/i18npool/source/nativenumber/nativenumbersupplier.cxx
index 756866ad846e..62a7e75278bf 100644
--- a/i18npool/source/nativenumber/nativenumbersupplier.cxx
+++ b/i18npool/source/nativenumber/nativenumbersupplier.cxx
@@ -586,15 +586,11 @@ OUString getNumberText(const Locale& rLocale, const 
OUString& rNumberString,
 for (i = 0; i < len; i++)
 {
 sal_Unicode ch = src[i];
-if (isNumber(ch))
+if (isNumber(ch) || ch == aSeparators.DecimalSeparator)
 {
 ++count;
 sBuf.append(ch);
 }
-else if (ch == aSeparators.DecimalSeparator)
-// Convert any decimal separator to point - in case libnumbertext 
has a different one
-// for this locale (it seems that point is supported for all 
locales in libnumbertext)
-sBuf.append('.');
 else if (ch == aSeparators.ThousandSeparator && count > 0)
 continue;
 else if (isMinus(ch) && count == 0)

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

[Aron Budea (via logerrit)]

 sw/uiconfig/swriter/ui/pagenumberdlg.ui |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 19fbd6862302065cdf490085d1a8fea49f73d6ca
Author: Aron Budea 
AuthorDate: Thu Jun 29 04:51:10 2023 +0200
Commit: Justin Luth 
CommitDate: Thu Jun 29 13:16:52 2023 +0200

tdf#155706 tdf#86630 sw page number wizard: make OK default

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

diff --git a/sw/uiconfig/swriter/ui/pagenumberdlg.ui 
b/sw/uiconfig/swriter/ui/pagenumberdlg.ui
index 27f9bbed1543..f014545da429 100644
--- a/sw/uiconfig/swriter/ui/pagenumberdlg.ui
+++ b/sw/uiconfig/swriter/ui/pagenumberdlg.ui
@@ -24,6 +24,8 @@
 _OK
 True
 True
+True
+True
 True
 True
   

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - include/LibreOfficeKit sw/source

[Paris Oplopoios (via logerrit)]

 include/LibreOfficeKit/LibreOfficeKitEnums.h |3 +--
 sw/source/uibase/app/apphdl.cxx  |2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit f8e75b5c4511bc7633a646abace0e57ae0121242
Author: Paris Oplopoios 
AuthorDate: Wed Jun 28 15:50:06 2023 +0300
Commit: Paris Oplopoios 
CommitDate: Thu Jun 29 13:01:03 2023 +0200

Send writer document background color on theme change

Send the doc background color to the kit on theme change

Change-Id: Ibbcd8d20c8cfce4918544716ffbdf374a1f06e5d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153712
Tested-by: Paris Oplopoios 
Reviewed-by: Paris Oplopoios 

diff --git a/include/LibreOfficeKit/LibreOfficeKitEnums.h 
b/include/LibreOfficeKit/LibreOfficeKitEnums.h
index d2a03c8ce9b6..c7e65a63c796 100644
--- a/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -774,8 +774,7 @@ typedef enum
 LOK_CALLBACK_VALIDITY_INPUT_HELP = 51,
 
 /**
- * This is currently Calc only. Indicates the document background
- * color in the payload as a RGB hex string (RRGGBB).
+ * Indicates the document background color in the payload as a RGB hex 
string (RRGGBB).
  */
 LOK_CALLBACK_DOCUMENT_BACKGROUND_COLOR = 52,
 
diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx
index 7e9b6e650b32..d7a452f5cc50 100644
--- a/sw/source/uibase/app/apphdl.cxx
+++ b/sw/source/uibase/app/apphdl.cxx
@@ -998,6 +998,8 @@ void SwModule::ConfigurationChanged( 
utl::ConfigurationBroadcaster* pBrdCst, Con
 {
 
pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_APPLICATION_BACKGROUND_COLOR,
 
aViewColors.m_aAppBackgroundColor.AsRGBHexString().toUtf8().getStr());
+
pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_DOCUMENT_BACKGROUND_COLOR,
+
aViewColors.m_aDocColor.AsRGBHexString().toUtf8().getStr());
 }
 }
 }

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

[Balazs Varga (via logerrit)]

 sw/source/core/access/AccessibilityIssue.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 97ff86d26d4eb47f43e174c94f06dee37bc8a4b7
Author: Balazs Varga 
AuthorDate: Tue Jun 27 13:35:14 2023 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Thu Jun 29 12:56:35 2023 +0200

tdf#156023 - A11Y: Add visual hints when fixing an accessibility check issue

Go to the issue object and select it, before fixing the issue.

Change-Id: I0217922c91045c288df7e48965be259e4d4f7ac0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153642
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 
(cherry picked from commit 4a08c79919efffd40c765c41bc06322a2ea83c59)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153701

diff --git a/sw/source/core/access/AccessibilityIssue.cxx 
b/sw/source/core/access/AccessibilityIssue.cxx
index d0366b1ef3e2..c7332f919cf5 100644
--- a/sw/source/core/access/AccessibilityIssue.cxx
+++ b/sw/source/core/access/AccessibilityIssue.cxx
@@ -131,6 +131,9 @@ void AccessibilityIssue::quickFixIssue() const
 if (!m_pDoc)
 return;
 
+if (m_eIssueObject != IssueObject::UNKNOWN)
+gotoIssue();
+
 switch (m_eIssueObject)
 {
 case IssueObject::GRAPHIC:

[Libreoffice-commits] core.git: include/editeng

[Mike Kaganski (via logerrit)]

 include/editeng/brushitem.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3eba3f6c22b9de02b22a2e3fe3d348940db81e13
Author: Mike Kaganski 
AuthorDate: Thu Jun 29 12:05:34 2023 +0300
Commit: Mike Kaganski 
CommitDate: Thu Jun 29 12:55:38 2023 +0200

getComplexColor: return a const reference, to avoid an extra copy

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

diff --git a/include/editeng/brushitem.hxx b/include/editeng/brushitem.hxx
index b995c7fa0637..26e5458bc5bf 100644
--- a/include/editeng/brushitem.hxx
+++ b/include/editeng/brushitem.hxx
@@ -91,7 +91,7 @@ public:
 Color&  GetColor()  { return aColor; }
 voidSetColor( const Color& rCol){ aColor = rCol; }
 
-model::ComplexColor getComplexColor() const
+const model::ComplexColor& getComplexColor() const
 {
 return maComplexColor;
 }

[Libreoffice-commits] core.git: Branch 'private/tvajngerl/staging' - 447 commits - accessibility/source avmedia/source basctl/source basegfx/CppunitTest_basegfx.mk basegfx/source basegfx/test basic/so

[Tomaž Vajngerl (via logerrit)]

Rebased ref, commits from common ancestor:
commit b9755a6e9cbfbcb6f4d422b9a9e7c6d8a0963d17
Author: Tomaž Vajngerl 
AuthorDate: Sun Mar 5 18:48:23 2023 +0900
Commit: Tomaž Vajngerl 
CommitDate: Thu Jun 29 19:50:50 2023 +0900

svx: use gfx::Length based types directly in SdrTextObj::NbcResize

Change-Id: I839430b30685994e1767998b353c63b97f461284

diff --git a/svx/source/svdraw/svdotxtr.cxx b/svx/source/svdraw/svdotxtr.cxx
index 74afe966425f..60c968bc1847 100644
--- a/svx/source/svdraw/svdotxtr.cxx
+++ b/svx/source/svdraw/svdotxtr.cxx
@@ -122,81 +122,103 @@ void SdrTextObj::NbcMove(const Size& rSize)
 
 void SdrTextObj::NbcResize(const Point& rRef, const Fraction& xFact, const 
Fraction& yFact)
 {
-bool bNotSheared=maGeo.nShearAngle==0_deg100;
-bool bRotate90=bNotSheared && maGeo.nRotationAngle.get() % 9000 ==0;
-bool bXMirr=(xFact.GetNumerator()<0) != (xFact.GetDenominator()<0);
-bool bYMirr=(yFact.GetNumerator()<0) != (yFact.GetDenominator()<0);
-if (bXMirr || bYMirr) {
+bool bNotSheared = maGeo.nShearAngle == 0_deg100;
+bool bRotate90 = bNotSheared && maGeo.nRotationAngle.get() % 9000 == 0;
+
+bool bXMirrored = (xFact.GetNumerator() < 0) != (xFact.GetDenominator() < 
0);
+bool bYMirrored = (yFact.GetNumerator() < 0) != (yFact.GetDenominator() < 
0);
+
+double fFactorX = xFact.IsValid() ? double(xFact) : 1.0;
+double fFactorY = yFact.IsValid() ? double(yFact) : 1.0;
+
+if (bXMirrored || bYMirrored)
+{
 Point aRef1(GetSnapRect().Center());
-if (bXMirr) {
+if (bXMirrored)
+{
 Point aRef2(aRef1);
 aRef2.AdjustY( 1 );
 NbcMirrorGluePoints(aRef1,aRef2);
 }
-if (bYMirr) {
+if (bYMirrored)
+{
 Point aRef2(aRef1);
 aRef2.AdjustX( 1 );
 NbcMirrorGluePoints(aRef1,aRef2);
 }
 }
 
-if (maGeo.nRotationAngle==0_deg100 && maGeo.nShearAngle==0_deg100) {
-auto aRectangle = getRectangle();
-ResizeRect(aRectangle, rRef, xFact, yFact);
-setRectangle(aRectangle);
-if (bYMirr)
+if (maGeo.nRotationAngle == 0_deg100 && maGeo.nShearAngle == 0_deg100)
+{
+auto eUnit = getSdrModelFromSdrObject().getUnit();
+gfx::Tuple2DL aReference = createTupleFromPoint(rRef, eUnit);
+svx::resizeRange(maRectangleRange, aReference, fFactorX, fFactorY);
+
+if (bYMirrored)
 {
-//maRectangle.Normalize();
-moveRectangle(aRectangle.Right() - aRectangle.Left(), 
aRectangle.Bottom() - aRectangle.Top());
-maGeo.nRotationAngle=18000_deg100;
+maRectangleRange.shift(maRectangleRange.getWidth(), 
maRectangleRange.getHeight());
+maGeo.nRotationAngle = 18000_deg100;
 maGeo.RecalcSinCos();
 }
 }
 else
 {
-tools::Polygon aPol(Rect2Poly(getRectangle(), maGeo));
+tools::Polygon aPolygon(Rect2Poly(getRectangle(), maGeo));
 
-for(sal_uInt16 a(0); a < aPol.GetSize(); a++)
+for (sal_uInt16 a(0); a < aPolygon.GetSize(); a++)
 {
- ResizePoint(aPol[a], rRef, xFact, yFact);
+ ResizePoint(aPolygon[a], rRef, xFact, yFact);
 }
 
-if(bXMirr != bYMirr)
+if (bXMirrored != bYMirrored)
 {
 // turn polygon and move it a little
-tools::Polygon aPol0(aPol);
+tools::Polygon aPol0(aPolygon);
 
-aPol[0] = aPol0[1];
-aPol[1] = aPol0[0];
-aPol[2] = aPol0[3];
-aPol[3] = aPol0[2];
-aPol[4] = aPol0[1];
+aPolygon[0] = aPol0[1];
+aPolygon[1] = aPol0[0];
+aPolygon[2] = aPol0[3];
+aPolygon[3] = aPol0[2];
+aPolygon[4] = aPol0[1];
 }
-tools::Rectangle aRectangle = svx::polygonToRectangle(aPol, maGeo);
+tools::Rectangle aRectangle = svx::polygonToRectangle(aPolygon, maGeo);
 setRectangle(aRectangle);
 }
 
-if (bRotate90) {
-bool bRota90=maGeo.nRotationAngle.get() % 9000 ==0;
-if (!bRota90) { // there's seems to be a rounding error occurring: 
correct it
-Degree100 a=NormAngle36000(maGeo.nRotationAngle);
-if (a<4500_deg100) a=0_deg100;
-else if (a<13500_deg100) a=9000_deg100;
-else if (a<22500_deg100) a=18000_deg100;
-else if (a<31500_deg100) a=27000_deg100;
-else a=0_deg100;
-maGeo.nRotationAngle=a;
+if (bRotate90)
+{
+bool bRota90 = maGeo.nRotationAngle.get() % 9000 == 0;
+if (!bRota90)
+{
+// there's seems to be a rounding error occurring: correct it
+
+Degree100 angle = NormAngle36000(maGeo.nRotationAngle);
+if (angle < 4500_deg100)
+angle = 0_deg100;
+else if (angle < 13500_deg100)
+angle = 9000_deg100;
+  

[Libreoffice-commits] core.git: sc/CppunitTest_sc_theme_import_export_test.mk

[Mike Kaganski (via logerrit)]

 sc/CppunitTest_sc_theme_import_export_test.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 64ecbdd1e56982b4dc72eb97016bb39e472a21d9
Author: Mike Kaganski 
AuthorDate: Thu Jun 29 12:04:02 2023 +0300
Commit: Mike Kaganski 
CommitDate: Thu Jun 29 12:38:09 2023 +0200

Fix build

Failing like

  ThemeImportExportTest.o : error LNK2019: unresolved external symbol 
"__declspec(dllimport) public: class Color const & __cdecl 
SvxBrushItem::GetColor(void)const " 
(__imp_?GetColor@SvxBrushItem@@QEBAAEBVColor@@XZ) referenced in function 
"public: void __cdecl testCellBackgroundThemeColor::TestBody(void)" 
(?TestBody@testCellBackgroundThemeColor@@QEAAXXZ)
  ThemeImportExportTest.o : error LNK2019: unresolved external symbol 
"__declspec(dllimport) public: class model::ComplexColor const & __cdecl 
SvxBrushItem::getComplexColor(void)const " 
(__imp_?getComplexColor@SvxBrushItem@@QEBAAEBVComplexColor@model@@XZ) 
referenced in function "public: void __cdecl 
testCellBackgroundThemeColor::TestBody(void)" 
(?TestBody@testCellBackgroundThemeColor@@QEAAXXZ)
  
C:\lo\src\build\workdir\LinkTarget\CppunitTest\test_sc_theme_import_export_test.dll
 : fatal error LNK1120: 2 unresolved externals

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

diff --git a/sc/CppunitTest_sc_theme_import_export_test.mk 
b/sc/CppunitTest_sc_theme_import_export_test.mk
index 22b0a2eea6a2..9b2ce60f595f 100644
--- a/sc/CppunitTest_sc_theme_import_export_test.mk
+++ b/sc/CppunitTest_sc_theme_import_export_test.mk
@@ -29,6 +29,7 @@ $(eval $(call 
gb_CppunitTest_use_libraries,sc_theme_import_export_test, \
 comphelper \
 cppu \
 cppuhelper \
+editeng \
 sal \
 salhelper \
 sax \

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

[Laurent Balland (via logerrit)]

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

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

tdf#155526 Add Period to trend line equation

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

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

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

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

[Mike Kaganski (via logerrit)]

 sw/inc/node.hxx |   78 ++--
 1 file changed, 20 insertions(+), 58 deletions(-)

New commits:
commit 429d26a7386413ebccdedf72f9ac0115b1b6db1b
Author: Mike Kaganski 
AuthorDate: Thu Jun 29 12:03:33 2023 +0300
Commit: Mike Kaganski 
CommitDate: Thu Jun 29 12:21:28 2023 +0200

Simplify a bit

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

diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index a6a7dc603a27..84e466dfefa0 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -184,15 +184,15 @@ public:
 inline   SwSectionNode *GetSectionNode();
 inline const SwSectionNode *GetSectionNode() const;
 
-inline bool IsStartNode() const;
-inline bool IsContentNode() const;
-inline bool IsEndNode() const;
-inline bool IsTextNode() const;
-inline bool IsTableNode() const;
-inline bool IsSectionNode() const;
-inline bool IsOLENode() const;
-inline bool IsNoTextNode() const;
-inline bool IsGrfNode() const;
+bool IsStartNode() const { return bool(SwNodeType::Start & m_nNodeType); }
+bool IsContentNode() const { return bool(SwNodeType::ContentMask & 
m_nNodeType); }
+bool IsEndNode() const { return SwNodeType::End == m_nNodeType; }
+bool IsTextNode() const { return SwNodeType::Text == m_nNodeType; }
+bool IsTableNode() const { return SwNodeType::Table == m_nNodeType; }
+bool IsSectionNode() const { return SwNodeType::Section == m_nNodeType; }
+bool IsOLENode() const { return SwNodeType::Ole == m_nNodeType; }
+bool IsNoTextNode() const { return bool(SwNodeType::NoTextMask & 
m_nNodeType); }
+bool IsGrfNode() const { return SwNodeType::Grf == m_nNodeType; }
 
 /**
Checks if this node is in redlines.
@@ -633,80 +633,43 @@ private:
 
 inline   SwEndNode   *SwNode::GetEndNode()
 {
- return SwNodeType::End == m_nNodeType ? static_cast(this) : 
nullptr;
+ return IsEndNode() ? static_cast(this) : nullptr;
 }
 inline const SwEndNode   *SwNode::GetEndNode() const
 {
- return SwNodeType::End == m_nNodeType ? static_cast(this) : nullptr;
+ return IsEndNode() ? static_cast(this) : nullptr;
 }
 inline   SwStartNode *SwNode::GetStartNode()
 {
- return SwNodeType::Start & m_nNodeType ? static_cast(this) 
: nullptr;
+ return IsStartNode() ? static_cast(this) : nullptr;
 }
 inline const SwStartNode *SwNode::GetStartNode() const
 {
- return SwNodeType::Start & m_nNodeType ? static_cast(this) : nullptr;
+ return IsStartNode() ? static_cast(this) : nullptr;
 }
 inline   SwTableNode *SwNode::GetTableNode()
 {
- return SwNodeType::Table == m_nNodeType ? static_cast(this) 
: nullptr;
+ return IsTableNode() ? static_cast(this) : nullptr;
 }
 inline const SwTableNode *SwNode::GetTableNode() const
 {
- return SwNodeType::Table == m_nNodeType ? static_cast(this) : nullptr;
+ return IsTableNode() ? static_cast(this) : nullptr;
 }
 inline   SwSectionNode *SwNode::GetSectionNode()
 {
- return SwNodeType::Section == m_nNodeType ? 
static_cast(this) : nullptr;
+ return IsSectionNode() ? static_cast(this) : nullptr;
 }
 inline const SwSectionNode *SwNode::GetSectionNode() const
 {
- return SwNodeType::Section == m_nNodeType ? static_cast(this) : nullptr;
+ return IsSectionNode() ? static_cast(this) : 
nullptr;
 }
 inline   SwContentNode *SwNode::GetContentNode()
 {
- return SwNodeType::ContentMask & m_nNodeType ? 
static_cast(this) : nullptr;
+ return IsContentNode() ? static_cast(this) : nullptr;
 }
 inline const SwContentNode *SwNode::GetContentNode() const
 {
- return SwNodeType::ContentMask & m_nNodeType ? static_cast(this) : nullptr;
-}
-
-inline bool SwNode::IsStartNode() const
-{
-return bool(SwNodeType::Start & m_nNodeType);
-}
-inline bool SwNode::IsContentNode() const
-{
-return bool(SwNodeType::ContentMask & m_nNodeType);
-}
-inline bool SwNode::IsEndNode() const
-{
-return SwNodeType::End == m_nNodeType;
-}
-inline bool SwNode::IsTextNode() const
-{
-return SwNodeType::Text == m_nNodeType;
-}
-inline bool SwNode::IsTableNode() const
-{
-return SwNodeType::Table == m_nNodeType;
-}
-inline bool SwNode::IsSectionNode() const
-{
-return SwNodeType::Section == m_nNodeType;
-}
-inline bool SwNode::IsNoTextNode() const
-{
-return bool(SwNodeType::NoTextMask & m_nNodeType);
-}
-inline bool SwNode::IsOLENode() const
-{
-return SwNodeType::Ole == m_nNodeType;
-}
-inline bool SwNode::IsGrfNode() const
-{
-return SwNodeType::Grf == m_nNodeType;
+ return IsContentNode() ? static_cast(this) : 
nullptr;
 }
 
 inline const SwStartNode* SwNode::FindSttNodeByType( SwStartNodeType eTyp ) 
const
@@ -727,8 +690,7 @@ inline SwNodeOffset SwNode::StartOfSectionIndex() const
 }
 inline SwNodeOffset SwNode::EndOfSectionIndex() const
 {
-const SwSta

Re: [Libreoffice-qa] ESC budget ranking final approval: 2023-06-29 16:00 CEST

[Thorsten Behrens]

Hi y'all,

Ilmari Lauhakangas wrote:
> some tweaks were still needed to the ranking, apologies for the hassle.
> Let's decide on the final ranking in the ESC meeting tomorrow:
> 
> https://pad.documentfoundation.org/p/esc
> 
Quick heads-up: I've added a link to the latest draft of the ESC
tendering process document to the pad (under preparations).

Cheers,

-- Thorsten


signature.asc
Description: PGP signature

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

[Seth Chaiklin (via logerrit)]

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

New commits:
commit 913ba281e023e03916d84ba26d094e8cc857f55f
Author: Seth Chaiklin 
AuthorDate: Thu Jun 29 12:15:20 2023 +0200
Commit: Gerrit Code Review 
CommitDate: Thu Jun 29 12:15:20 2023 +0200

Update git submodules

* Update helpcontent2 from branch 'libreoffice-7-6'
  to f51d4267471199f2df1dda83a5928ed2981c11c2
  - related tdf#153721 new command names: move/delete "chapter" -> "heading"

Change-Id: I7415fec49fec0319583a5f87e44e7bd3ee96ef4a
(cherry picked from commit b1df184dcfc989767d2aef0152930ce9a2c94ac8)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/153751
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin 

diff --git a/helpcontent2 b/helpcontent2
index 2c6962858e4e..f51d42674711 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 2c6962858e4e4a5018940456a30fa2bd716313e5
+Subproject commit f51d4267471199f2df1dda83a5928ed2981c11c2

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

[Seth Chaiklin (via logerrit)]

 source/text/swriter/01/0211.xhp|   20 ++--
 source/text/swriter/guide/arrange_chapters.xhp |8 
 2 files changed, 14 insertions(+), 14 deletions(-)

New commits:
commit f51d4267471199f2df1dda83a5928ed2981c11c2
Author: Seth Chaiklin 
AuthorDate: Tue Jun 27 12:42:08 2023 +0200
Commit: Seth Chaiklin 
CommitDate: Thu Jun 29 12:15:19 2023 +0200

related tdf#153721 new command names: move/delete "chapter" -> "heading"

Change-Id: I7415fec49fec0319583a5f87e44e7bd3ee96ef4a
(cherry picked from commit b1df184dcfc989767d2aef0152930ce9a2c94ac8)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/153751
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin 

diff --git a/source/text/swriter/01/0211.xhp 
b/source/text/swriter/01/0211.xhp
index 26fcf8c2b1..c4e95a68ec 100644
--- a/source/text/swriter/01/0211.xhp
+++ b/source/text/swriter/01/0211.xhp
@@ -260,32 +260,32 @@
 
 
 
-Move Chapter 
Up
+Move Heading 
Up
 Moves the selected heading, 
and the text below the heading, up one heading position in the Navigator and in 
the document. To move only the selected heading and not the text associated 
with the heading, hold down CommandCtrl,
 and then click this icon.
 
 
   
 
-   Icon Move Chapter Up
+   Icon Move Heading Up
 
 
-  Move Chapter 
Up
+  Move Heading 
Up
 
   
 
 
 
 
-Move Chapter 
Down
+Move Heading 
Down
 Moves the selected heading, 
and the text below the heading, down one heading position in the Navigator and 
in the document. To move only the selected heading and not the text associated 
with the heading, hold down CommandCtrl,
 and then click this icon.
 
 
   
 
-   Icon Move Chapter Down
+   Icon Move Heading Down
 
 
-  Move Chapter 
Down
+  Move Heading 
Down
 
   
 
@@ -336,14 +336,14 @@
 
 
 Copy
-Copies the heading and 
all contents that belongs to the chapter, including level-less contents and 
headings with levels above the copied heading level. Sibling headings, with 
same heading level, are not copied. You can paste the contents in another place 
in the document.
+Copies the heading and 
the contents that follow the heading until the next heading with the same 
outline level. These contents include paragraphs with outline level “None” and 
headings with an outline level greater than the copied heading. You can paste 
the contents in another place in the document.
 
-Delete 
Chapter
-Deletes the heading and 
all contents that belongs to the chapter, including level-less contents and 
headings with levels above the deleted heading level. Sibling headings, with 
same heading level, are not deleted.
+Delete 
Heading
+Deletes the heading and 
the contents that follow the heading until the next heading with the same 
outline level. These contents include paragraphs with outline level “None” and 
headings with an outline level greater than the deleted heading.
 
 
 Select
-Selects the heading and 
all contents that belongs to the chapter, including level-less contents and 
headings with levels above the selected heading level. Sibling headings, with 
same heading level, are not selected.
+Selects the heading and 
the contents that follow the heading until the next heading with the same 
outline level. These contents include paragraphs with outline level “None” and 
headings with an outline level greater than the selected heading.
 
 Display
 Select the document that you 
want to view.
diff --git a/source/text/swriter/guide/arrange_chapters.xhp 
b/source/text/swriter/guide/arrange_chapters.xhp
index 8bdf7baf37..53b2d3efb0 100644
--- a/source/text/swriter/guide/arrange_chapters.xhp
+++ b/source/text/swriter/guide/arrange_chapters.xhp
@@ -33,9 +33,9 @@
 moving;headings
 demoting outline levels
 promoting outline levels
-Navigator;outline levels and chapters
+Navigator;outline levels and headings
 arranging;headings
-outlines;arranging chapters
+outlines;arranging headings
 
 
 Arranging Headings in the 
Navigator 
@@ -63,10 +63,10 @@
 Drag a 
heading to a new location in the Navigator list.
   
   
-Click a 
heading in the Navigator list, and then click the Move 
Chapter Up Icon 
promote or Move Chapter Down icon Icon demote.
+Click a 
heading in the Navigator list, and then click the Move 
Heading Up Icon 
promote or Move Heading Down icon Icon demote.
   
 
-To move the heading without the subordinate text, 
hold down CommandCtrl
 while you drag or click the Move Chapter Up or 
Move Chapter Down icons.
+To move the heading without the subordinate text, 
hold down CommandCtrl
 while you drag or click the Move Heading Up or 
Move Heading Down icons.
 
 To Promote or Demote the Outline Level of a Heading
 

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

[Balazs Varga (via logerrit)]

 sw/source/uibase/uiview/view2.cxx |8 
 1 file changed, 8 insertions(+)

New commits:
commit 4d4238c92b1155fa425d48637fa290a1d2eb
Author: Balazs Varga 
AuthorDate: Wed Jun 28 18:27:48 2023 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Thu Jun 29 11:54:01 2023 +0200

tdf#156031 - UX/A11Y: Clicking on a11y check status bar icon opening a11y

check sidebar deck.

Clicing on the a11y check status bar icon, the a11y check sidebar
deck will be opened.

Change-Id: Iee2e0e9345ed47dd971a9a61e55471d082d5461d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153723
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 
(cherry picked from commit cec1aa29b5a2e11d162bda8f3a4faea4f75e4a23)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153702

diff --git a/sw/source/uibase/uiview/view2.cxx 
b/sw/source/uibase/uiview/view2.cxx
index ed0982f037dc..f7cfb6563803 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -2188,6 +2188,14 @@ void SwView::ExecuteStatusLine(SfxRequest &rReq)
 }
 break;
 
+case FN_STAT_ACCESSIBILITY_CHECK:
+{
+const SfxStringItem sDeckName(SID_SIDEBAR_DECK, "A11yCheckDeck");
+GetViewFrame().GetDispatcher()->ExecuteList(SID_SIDEBAR_DECK, 
SfxCallMode::RECORD,
+{ &sDeckName });
+}
+break;
+
 case FN_STAT_BOOKMARK:
 if ( pArgs )
 {

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

[Balazs Varga (via logerrit)]

 sw/source/core/access/AccessibilityCheck.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 18d650a29e93fdb868b1bd6d8cd768c42659fd61
Author: Balazs Varga 
AuthorDate: Wed Jun 7 15:41:23 2023 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Thu Jun 29 11:48:47 2023 +0200

tdf#154981 - A11Y sidebar: fix warning missing signature line desc

Add graphic shape objects to "Go to" and "Fix" functions.

Change-Id: I258d3664613cbd53b7b26aaa8d88715660d921dc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152707
Tested-by: Jenkins
Tested-by: Gabor Kelemen 
Reviewed-by: Samuel Mehrbrodt 
(cherry picked from commit b3594e01ec6d0156277f354efe5cacc04b33c4b6)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153704

diff --git a/sw/source/core/access/AccessibilityCheck.cxx 
b/sw/source/core/access/AccessibilityCheck.cxx
index b9eeaafc6171..45dd076e99ce 100644
--- a/sw/source/core/access/AccessibilityCheck.cxx
+++ b/sw/source/core/access/AccessibilityCheck.cxx
@@ -1365,7 +1365,7 @@ void AccessibilityCheck::checkObject(SwNode* pCurrent, 
SdrObject* pObject)
 
 if (nObjId == SdrObjKind::CustomShape || nObjId == SdrObjKind::Text
 || nObjId == SdrObjKind::Media || nObjId == SdrObjKind::Group
-|| nInv == SdrInventor::FmForm)
+|| nObjId == SdrObjKind::Graphic || nInv == SdrInventor::FmForm)
 {
 OUString sAlternative = pObject->GetTitle();
 if (sAlternative.isEmpty())

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

[Noel Grandin (via logerrit)]

 vcl/source/control/tabctrl.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8863ca276efd7f915b7e3584172a1adb09643237
Author: Noel Grandin 
AuthorDate: Wed Jun 28 15:52:29 2023 +0200
Commit: Noel Grandin 
CommitDate: Thu Jun 29 11:10:22 2023 +0200

increase space around tabbed pane titles

Tabbed pane titles are currently incredibly cramped,
increase the space a little to make them match better
with current OS layouts (all of the different OSes
we support use quite a lot of space around the
titles)

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

diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index a2461c5a0f80..cafbae98623c 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -46,7 +46,7 @@
 
 #define TAB_OFFSET  3
 /// Space to the left and right of the tabitem
-#define TAB_ITEM_OFFSET_X 3
+#define TAB_ITEM_OFFSET_X 10
 /// Space to the top and bottom of the tabitem
 #define TAB_ITEM_OFFSET_Y 3
 #define TAB_EXTRASPACE_X6

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

[Czeber László Ádám (via logerrit)]

 sc/source/ui/view/output2.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 56c965372e2de4ea53b1ab09056906c85fbff06b
Author: Czeber László Ádám 
AuthorDate: Mon Jun 12 16:12:05 2023 +0200
Commit: László Németh 
CommitDate: Thu Jun 29 10:54:19 2023 +0200

tdf#122676 sc: fix format with * (filling) and NBSP thousand separator

Numbers containing no-break space (NBSP) thousand separator enabled
the EditEngine layout, losing filling e.g. for stretching spaces.
Enable EditEngine for NBSP characters only if there is no filling
in the number format code, fixing MSO interoperability, too.

In number format codes, asterisk (*) followed by a character is used
to fill the available space in the column with that character, e.g.
format code

[>0]" "* # ##0" € ";[<0]-* # ##0" € ";" "* -#" € ";" "@" "

put the minus sign at the left side of the column, while
the number at the right side of the column. Because of the NBSP
thousand separator, bigger numbers got different layout previously,
i.e. minus signs right next to the numbers.

Note: there is a better solution for the layout problem: using narrow
no-break space (U-202F), which is the proposed thousand separator in
typography, and it's back-compatible, because it doesn't enable the 
different layout.

Change-Id: Ia35f01733687ee6005f06ff3ab999b7a4b712ad4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152901
Reviewed-by: László Németh 
Tested-by: László Németh 
(cherry picked from commit 72e70088dc45fbe15f809abf5263247b13d937ac)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153337
Tested-by: Jenkins

diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index 649ccdd7349e..fe8d06684517 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -815,6 +815,11 @@ bool ScDrawStringsVars::HasEditCharacters() const
 switch(aString[nIdx])
 {
 case CHAR_NBSP:
+// tdf#122676: Ignore CHAR_NBSP (this is thousand separator in 
any number)
+// if repeat character is set
+if (nRepeatPos < 0)
+return true;
+break;
 case CHAR_SHY:
 case CHAR_ZWSP:
 case CHAR_LRM:

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - sw/source

[Mike Kaganski (via logerrit)]

 sw/source/core/text/itrpaint.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 97436f1487f647ed16228f7f7c3a5533981dc018
Author: Mike Kaganski 
AuthorDate: Wed Jun 28 18:54:43 2023 +0300
Commit: Mike Kaganski 
CommitDate: Thu Jun 29 10:49:03 2023 +0200

tdf#156078: Use TabOverSpacing compat option instead of TabOverflow

As Justin Luth noted, "TabOverflow is basically always true", and
using it basically equal to making the test always true. On the
other hand, TabOverSpacing is accurate for the task.

Change-Id: I608b200dac0169cbafc935a03452aac9ba0527a6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153722
Tested-by: Jenkins
Reviewed-by: Justin Luth 
(cherry picked from commit e24a3a3c339d7a175ebfeef31a280becda9d5950)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153703
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Mike Kaganski 

diff --git a/sw/source/core/text/itrpaint.cxx b/sw/source/core/text/itrpaint.cxx
index 3709e4a56869..7f61a27a412b 100644
--- a/sw/source/core/text/itrpaint.cxx
+++ b/sw/source/core/text/itrpaint.cxx
@@ -149,8 +149,8 @@ void SwTextPainter::DrawTextLine( const SwRect &rPaint, 
SwSaveClip &rClip,
 //compatibility settings: allow tabstop text to exceed right margin
 const auto& iDSA = 
GetInfo().GetTextFrame()->GetDoc().getIDocumentSettingAccess();
 const bool bTabOverMargin = iDSA.get(DocumentSettingId::TAB_OVER_MARGIN);
-const bool bTabOverflow = iDSA.get(DocumentSettingId::TAB_OVERFLOW);
-if (bTabOverMargin || bTabOverflow)
+const bool bTabOverSpacing = iDSA.get(DocumentSettingId::TAB_OVER_SPACING);
+if (bTabOverMargin || bTabOverSpacing)
 {
 SwLinePortion* pPorIter = pPor;
 while( pPorIter )

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

[Michael Stahl (via logerrit)]

 sw/qa/extras/layout/data/s4_min2.fodt |  360 ++
 sw/qa/extras/layout/layout.cxx|   12 +
 sw/source/core/layout/newfrm.cxx  |4 
 3 files changed, 376 insertions(+)

New commits:
commit 23eadd873de2e56d1e5f866fefae25c648f302f9
Author: Michael Stahl 
AuthorDate: Wed Jun 28 17:19:02 2023 +0200
Commit: Michael Stahl 
CommitDate: Thu Jun 29 10:40:30 2023 +0200

tdf#156077 sw: layout: call AssertFlyPages() in Init()

The bugdoc has 3 pages, and there are at-page flys anchored to the 3rd
page, and these are not displayed - simply missing from the layout.

In LO 6.1, this worked because the layout-cache was read from the file,
and 3 pages were created in SwRootFrame::Init() calling InsertCnt_().

But now this creates only 2 pages, and later SwLayAction creates the 2nd
page between the existing ones on some MoveFwd(), but despite page nr 2
becoming page nr 3 nothing attaches the at-page flys to the now-page-3.

If a document is loaded containing at-page flys, then all pages that
have flys anchored to them should be created in SwRootFrame::Init()
already.

(regression from commit 7e8b4756d95057f069467b34e7849f9354856578)

Change-Id: I4792c483a7620efd81211e6ad0d9220152367d68
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153720
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit ff8ec4cfe5df1e15c3e9f6adc843dfe31358e097)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153698

diff --git a/sw/qa/extras/layout/data/s4_min2.fodt 
b/sw/qa/extras/layout/data/s4_min2.fodt
new file mode 100644
index ..e1317de597d8
--- /dev/null
+++ b/sw/qa/extras/layout/data/s4_min2.fodt
@@ -0,0 +1,360 @@
+
+http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
+ CIB_OfficeDev/6.1.7.41$Linux_X86_64 
LibreOffice_project/1df0ab666a1bb346850daa72aaa2e29a697a252c2023-06-26T22:28:03.054604345de-DE11PT14M3S2023-06-26T23:06:43.147312212
+ 
+  
+  
+  
+  
+  
+ 
+ 
+  
+   
+   
+
+   
+   
+  
+  
+   
+   
+  
+  
+   
+  
+  
+   
+  
+  
+   
+   
+  
+  
+   
+   
+  
+  
+   
+
+ 
+ 
+
+   
+  
+  
+  
+  
+   
+   
+  
+  
+   
+   
+  
+  
+   
+   
+  
+  
+   
+   
+  
+  
+   
+   
+  
+  
+   
+   
+  
+  
+   
+   
+  
+  
+   
+   
+  
+  
+   
+  
+  
+   
+  
+  
+  
+  
+   
+  
+  
+   
+  
+  
+   
+  
+  
+   
+
+   
+  
+  
+   
+
+   
+   
+
+   
+   
+
+   
+   
+
+   
+   
+
+   
+   
+
+   
+   
+
+   
+   
+
+   
+   
+
+   
+   
+
+   
+  
+  
+  
+  
+ 
+ 
+  
+   
+  
+  
+   
+  
+  
+   
+  
+  
+   
+   
+  
+  
+   
+   
+  
+  
+   
+   
+  
+  
+   
+  
+  
+   
+  
+  
+   
+  
+  
+   
+  
+  
+   
+   
+  
+  
+   
+  
+  
+   
+  
+  
+   
+  
+  
+   
+
+   
+  
+  
+   
+  
+  
+   
+  
+  
+   
+
+   
+  
+  
+   
+
+   
+  
+  
+   
+
+   
+  
+  
+   
+
+
+   
+   
+   
+  
+  
+   
+
+
+   
+   
+
+   
+   
+  
+  
+   
+
+
+   
+   
+   
+  
+  
+   
+
+   
+   
+   
+  
+  
+   
+
+
+   
+   
+
+   
+   
+  
+  
+   
+
+
+   
+   
+   
+
+   
+  
+ 
+ 
+  

[Libreoffice-commits] core.git: drawinglayer/source svgio/inc svgio/Library_svgio.mk svgio/qa svgio/source

[Xisco Fauli (via logerrit)]

 drawinglayer/source/tools/primitive2dxmldump.cxx |   15 +-
 svgio/Library_svgio.mk   |1 
 svgio/inc/svgfedropshadownode.hxx|   48 +++
 svgio/inc/svgtoken.hxx   |1 
 svgio/qa/cppunit/SvgImportTest.cxx   |   17 ++
 svgio/qa/cppunit/data/filterFeDropShadow.svg |   10 +
 svgio/source/svgreader/svgdocumenthandler.cxx|9 +
 svgio/source/svgreader/svgfedropshadownode.cxx   |  147 +++
 svgio/source/svgreader/svgfilternode.cxx |7 +
 svgio/source/svgreader/svgtoken.cxx  |3 
 10 files changed, 253 insertions(+), 5 deletions(-)

New commits:
commit 14c40c460526f2e4ed2c24a3f50baae25a43a8f2
Author: Xisco Fauli 
AuthorDate: Wed Jun 28 23:46:37 2023 +0200
Commit: Xisco Fauli 
CommitDate: Thu Jun 29 10:40:06 2023 +0200

tdf#156066: Add support for feDropShadow filter

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

diff --git a/drawinglayer/source/tools/primitive2dxmldump.cxx 
b/drawinglayer/source/tools/primitive2dxmldump.cxx
index 37ea828a6fbb..8adaf82327d3 100644
--- a/drawinglayer/source/tools/primitive2dxmldump.cxx
+++ b/drawinglayer/source/tools/primitive2dxmldump.cxx
@@ -40,6 +40,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -1116,11 +1117,17 @@ void Primitive2dXmlDump::decomposeAndWrite(
 case PRIMITIVE2D_ID_SHADOWPRIMITIVE2D:
 {
 // ShadowPrimitive2D.
+const ShadowPrimitive2D& rShadowPrimitive2D
+= dynamic_cast(*pBasePrimitive);
 rWriter.startElement("shadow");
-drawinglayer::primitive2d::Primitive2DContainer 
aPrimitiveContainer;
-pBasePrimitive->get2DDecomposition(aPrimitiveContainer,
-   
drawinglayer::geometry::ViewInformation2D());
-decomposeAndWrite(aPrimitiveContainer, rWriter);
+rWriter.attribute("color",
+  
convertColorToString(rShadowPrimitive2D.getShadowColor()));
+rWriter.attributeDouble("blur", 
rShadowPrimitive2D.getShadowBlur());
+
+rWriter.startElement("transform");
+writeMatrix(rWriter, rShadowPrimitive2D.getShadowTransform());
+rWriter.endElement();
+
 rWriter.endElement();
 break;
 }
diff --git a/svgio/Library_svgio.mk b/svgio/Library_svgio.mk
index 20797e339a81..56d1f8dc1ae3 100644
--- a/svgio/Library_svgio.mk
+++ b/svgio/Library_svgio.mk
@@ -61,6 +61,7 @@ $(eval $(call gb_Library_add_exception_objects,svgio,\
 svgio/source/svgreader/svggnode \
 svgio/source/svgreader/svganode \
 svgio/source/svgreader/svgfecolormatrixnode \
+svgio/source/svgreader/svgfedropshadownode \
 svgio/source/svgreader/svgfefloodnode \
 svgio/source/svgreader/svgfegaussianblurnode \
 svgio/source/svgreader/svgfeoffsetnode \
diff --git a/svgio/inc/svgfedropshadownode.hxx 
b/svgio/inc/svgfedropshadownode.hxx
new file mode 100644
index ..5cc4b51ed797
--- /dev/null
+++ b/svgio/inc/svgfedropshadownode.hxx
@@ -0,0 +1,48 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#pragma once
+
+#include "svgnode.hxx"
+#include "svgstyleattributes.hxx"
+
+namespace svgio::svgreader
+{
+class SvgFeDropShadowNode final : public SvgNode
+{
+private:
+SvgNumber maDx;
+SvgNumber maDy;
+SvgNumber maStdDeviation;
+SvgPaint maFloodColor;
+SvgNumber maFloodOpacity;
+
+public:
+SvgFeDropShadowNode(SvgDocument& rDocument, SvgNode* pParent);
+virtual ~SvgFeDropShadowNode() override;
+
+virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken,
+const OUString& aContent) override;
+
+void apply(drawinglayer::primitive2d::Primitive2DContainer& rTarget) const;
+};
+
+} // end of namespace svgio::svgreader
+
+/* v

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

[Julien Nabet (via logerrit)]

 i18npool/source/nativenumber/nativenumbersupplier.cxx |6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit db591df99424dd7e1837946b36ca0658a02d520c
Author: Julien Nabet 
AuthorDate: Thu Jun 29 08:34:51 2023 +0200
Commit: Julien Nabet 
CommitDate: Thu Jun 29 10:27:08 2023 +0200

tdf#152723: NatNum12 modifier, keep decimal separator from local settings

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

diff --git a/i18npool/source/nativenumber/nativenumbersupplier.cxx 
b/i18npool/source/nativenumber/nativenumbersupplier.cxx
index 756866ad846e..62a7e75278bf 100644
--- a/i18npool/source/nativenumber/nativenumbersupplier.cxx
+++ b/i18npool/source/nativenumber/nativenumbersupplier.cxx
@@ -586,15 +586,11 @@ OUString getNumberText(const Locale& rLocale, const 
OUString& rNumberString,
 for (i = 0; i < len; i++)
 {
 sal_Unicode ch = src[i];
-if (isNumber(ch))
+if (isNumber(ch) || ch == aSeparators.DecimalSeparator)
 {
 ++count;
 sBuf.append(ch);
 }
-else if (ch == aSeparators.DecimalSeparator)
-// Convert any decimal separator to point - in case libnumbertext 
has a different one
-// for this locale (it seems that point is supported for all 
locales in libnumbertext)
-sBuf.append('.');
 else if (ch == aSeparators.ThousandSeparator && count > 0)
 continue;
 else if (isMinus(ch) && count == 0)

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

[Balazs Varga (via logerrit)]

 sw/source/uibase/sidebar/A11yCheckIssuesPanel.cxx |   39 +-
 sw/source/uibase/sidebar/A11yCheckIssuesPanel.hxx |1 
 2 files changed, 32 insertions(+), 8 deletions(-)

New commits:
commit 3b250bcd95f6be183b2694c57512eba9b1a0ca67
Author: Balazs Varga 
AuthorDate: Wed Jun 28 19:44:54 2023 +0200
Commit: Balazs Varga 
CommitDate: Thu Jun 29 10:01:47 2023 +0200

tdf#156032 - A11Y: fix remove of empty issue sections

Remove issue categories if there is no more issue in it.

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

diff --git a/sw/source/uibase/sidebar/A11yCheckIssuesPanel.cxx 
b/sw/source/uibase/sidebar/A11yCheckIssuesPanel.cxx
index 123ce7e1fa57..162724a1035c 100644
--- a/sw/source/uibase/sidebar/A11yCheckIssuesPanel.cxx
+++ b/sw/source/uibase/sidebar/A11yCheckIssuesPanel.cxx
@@ -159,31 +159,54 @@ void A11yCheckIssuesPanel::ImplDestroy()
 
 A11yCheckIssuesPanel::~A11yCheckIssuesPanel() { 
suppress_fun_call_w_exception(ImplDestroy()); }
 
-void A11yCheckIssuesPanel::populateIssues()
+void A11yCheckIssuesPanel::removeOldWidgets()
 {
-if (!mpDoc)
-return;
-sw::AccessibilityCheck aCheck(mpDoc);
-aCheck.check();
-m_aIssueCollection = aCheck.getIssueCollection();
-
-// Remove old issue widgets
 for (auto const& xEntry : m_aDocumentEntries)
 m_xBoxDocument->move(xEntry->get_widget(), nullptr);
+m_xExpanderDocument->set_visible(false);
+
 for (auto const& xEntry : m_aStylesEntries)
 m_xBoxStyles->move(xEntry->get_widget(), nullptr);
+m_xExpanderStyles->set_visible(false);
+
 for (auto const& xEntry : m_aNoAltEntries)
 m_xBoxNoAlt->move(xEntry->get_widget(), nullptr);
+m_xExpanderNoAlt->set_visible(false);
+
 for (auto const& xEntry : m_aTableEntries)
 m_xBoxTable->move(xEntry->get_widget(), nullptr);
+m_xExpanderTable->set_visible(false);
+
 for (auto const& xEntry : m_aFormattingEntries)
 m_xBoxFormatting->move(xEntry->get_widget(), nullptr);
+m_xExpanderFormatting->set_visible(false);
+
 for (auto const& xEntry : m_aHyperlinkEntries)
 m_xBoxHyperlink->move(xEntry->get_widget(), nullptr);
+m_xExpanderHyperlink->set_visible(false);
+
 for (auto const& xEntry : m_aFakesEntries)
 m_xBoxFakes->move(xEntry->get_widget(), nullptr);
+m_xExpanderFakes->set_visible(false);
+
 for (auto const& xEntry : m_aNumberingEntries)
 m_xBoxNumbering->move(xEntry->get_widget(), nullptr);
+m_xExpanderNumbering->set_visible(false);
+
+for (auto const& xEntry : m_aOtherEntries)
+m_xBoxOther->move(xEntry->get_widget(), nullptr);
+m_xExpanderOther->set_visible(false);
+}
+
+void A11yCheckIssuesPanel::populateIssues()
+{
+if (!mpDoc)
+return;
+sw::AccessibilityCheck aCheck(mpDoc);
+aCheck.check();
+m_aIssueCollection = aCheck.getIssueCollection();
+
+removeOldWidgets();
 
 sal_Int32 iDocument = 0;
 sal_Int32 iStyles = 0;
diff --git a/sw/source/uibase/sidebar/A11yCheckIssuesPanel.hxx 
b/sw/source/uibase/sidebar/A11yCheckIssuesPanel.hxx
index d48f4cae2906..54e5ad560bdf 100644
--- a/sw/source/uibase/sidebar/A11yCheckIssuesPanel.hxx
+++ b/sw/source/uibase/sidebar/A11yCheckIssuesPanel.hxx
@@ -89,6 +89,7 @@ private:
 std::unique_ptr m_xBoxOther;
 sfx::AccessibilityIssueCollection m_aIssueCollection;
 std::function m_getIssueCollection;
+void removeOldWidgets();
 void populateIssues();
 
 SfxBindings* mpBindings;

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

[Laurent Balland (via logerrit)]

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

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

tdf#155526 Moving average: remove Insert R2

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

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

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

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

[Mike Kaganski (via logerrit)]

 sw/source/filter/html/htmlflywriter.cxx |   38 ++--
 1 file changed, 36 insertions(+), 2 deletions(-)

New commits:
commit e2ee51b6b2aa2cbb347f99b8c7b1aee0ad8e5f9c
Author: Mike Kaganski 
AuthorDate: Wed Jun 28 18:50:48 2023 +0300
Commit: Mike Kaganski 
CommitDate: Thu Jun 29 09:37:10 2023 +0200

ReqIF: output frame text instead of name in 'object' elements' alt text

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

diff --git a/sw/source/filter/html/htmlflywriter.cxx 
b/sw/source/filter/html/htmlflywriter.cxx
index 4dcd5129ca2e..d404e305e172 100644
--- a/sw/source/filter/html/htmlflywriter.cxx
+++ b/sw/source/filter/html/htmlflywriter.cxx
@@ -1227,6 +1227,34 @@ OUString lclWriteOutImap(SwHTMLWriter& rWrt, const 
SfxItemSet& rItemSet, const S
 return aIMapName;
 }
 
+OUString getFrameFormatText(const SwFrameFormat& rFrameFormat)
+{
+const SwFormatContent& rFlyContent = rFrameFormat.GetContent();
+const SwNodeIndex* pSttIx = rFlyContent.GetContentIdx();
+if (!pSttIx)
+return {};
+
+const SwNodeOffset nStt = pSttIx->GetIndex();
+const auto& nodes = rFrameFormat.GetDoc()->GetNodes();
+const SwNodeOffset nEnd = nodes[nStt]->EndOfSectionIndex();
+
+OUStringBuffer result;
+for (SwNodeOffset i = nStt + 1; i < nEnd; ++i)
+{
+if (const auto* pTextNd = nodes[i]->GetTextNode())
+{
+if (!result.isEmpty())
+result.append("\n");
+result.append(pTextNd->GetExpandText(
+nullptr, 0, -1, true, true, false,
+ExpandMode::ExpandFields | ExpandMode::HideInvisible | 
ExpandMode::HideDeletions
+| ExpandMode::HideFieldmarkCommands));
+}
+}
+
+return result.makeStringAndClear();
+}
+
 }
 
 SwHTMLWriter& OutHTML_ImageStart( HtmlWriter& rHtml, SwHTMLWriter& rWrt, const 
SwFrameFormat &rFrameFormat,
@@ -1449,13 +1477,19 @@ SwHTMLWriter& OutHTML_ImageStart( HtmlWriter& rHtml, 
SwHTMLWriter& rWrt, const S
 
 if (bReplacement)
 {
+OUString aAltText = rAlternateText;
+// In ReqIF mode, output text from the frame instead
+if (rWrt.mbReqIF)
+if (OUString aFrameText = getFrameFormatText(rFrameFormat); 
!aFrameText.isEmpty())
+aAltText = aFrameText;
+
 // XHTML object replacement image's alternate text doesn't use the
 // "alt" attribute.
-if (rAlternateText.isEmpty())
+if (aAltText.isEmpty())
 // Empty alternate text is not valid.
 rHtml.characters(" ");
 else
-rHtml.characters(rAlternateText.toUtf8());
+rHtml.characters(aAltText.toUtf8());
 }
 
 return rWrt;

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

[Balazs Varga (via logerrit)]

 editeng/source/uno/unotext.cxx   |   38 +++-
 sc/source/core/data/postit.cxx   |   84 +++
 test/source/sheet/xsheetannotationanchor.cxx |2 
 3 files changed, 97 insertions(+), 27 deletions(-)

New commits:
commit da8dead8e9282010893cbd12519e107baf03cd1a
Author: Balazs Varga 
AuthorDate: Tue Jun 20 19:26:50 2023 +0200
Commit: Balazs Varga 
CommitDate: Thu Jun 29 09:29:34 2023 +0200

tdf#73537 - sc: show author and creation date in calc comments

in temporory mode. Show the author and creation/modification
date of the the comment only in temporory mode. In edit mode, or
visible mode, shows only the original text.

Change-Id: I2c5856e4c6a813dbef4ad55de319f922daa57f67
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153358
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky 
Reviewed-by: Balazs Varga 

diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index 881cfa32cd89..ee66097f7ec9 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -2117,11 +2117,43 @@ uno::Reference< text::XTextRange > SAL_CALL 
SvxUnoTextBase::finishParagraph(
 }
 
 uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextBase::insertTextPortion(
-const OUString& /*rText*/,
-const uno::Sequence< beans::PropertyValue >& /*rCharAndParaProps*/,
-const uno::Reference< text::XTextRange>& /*rTextRange*/ )
+const OUString& rText,
+const uno::Sequence< beans::PropertyValue >& rCharAndParaProps,
+const uno::Reference< text::XTextRange>& rTextRange )
 {
+SolarMutexGuard aGuard;
+
 uno::Reference< text::XTextRange > xRet;
+
+if (!rTextRange.is())
+return xRet;
+
+SvxUnoTextRangeBase* pRange = 
comphelper::getFromUnoTunnel(rTextRange);
+if (!pRange)
+return xRet;
+
+SvxEditSource *pEditSource = GetEditSource();
+SvxTextForwarder *pTextForwarder = pEditSource ? 
pEditSource->GetTextForwarder() : nullptr;
+
+if (pTextForwarder)
+{
+pRange->setString(rText);
+
+ESelection aSelection(pRange->GetSelection());
+
+pTextForwarder->RemoveAttribs(aSelection);
+pEditSource->UpdateData();
+
+SfxItemSet aItemSet( *pTextForwarder->GetEmptyItemSetPtr() );
+SvxPropertyValuesToItemSet( aItemSet, rCharAndParaProps,
+ImplGetSvxTextPortionSfxPropertySet(), pTextForwarder, 
aSelection.nStartPara );
+pTextForwarder->QuickSetAttribs( aItemSet, aSelection);
+rtl::Reference pNewRange = new SvxUnoTextRange( *this 
);
+xRet = pNewRange;
+pNewRange->SetSelection(aSelection);
+for( const beans::PropertyValue& rProp : rCharAndParaProps )
+pNewRange->setPropertyValue( rProp.Name, rProp.Value );
+}
 return xRet;
 }
 
diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx
index dd1a023445e2..106a249e5666 100644
--- a/sc/source/core/data/postit.cxx
+++ b/sc/source/core/data/postit.cxx
@@ -57,6 +57,13 @@
 #include 
 #include 
 #include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
 
 using namespace com::sun::star;
 
@@ -493,8 +500,10 @@ void ScPostIt::SetAuthor( const OUString& rAuthor )
 
 void ScPostIt::AutoStamp()
 {
-maNoteData.maDate = ScGlobal::getLocaleData().getDate( Date( Date::SYSTEM 
) );
-maNoteData.maAuthor = SvtUserOptions().GetID();
+maNoteData.maDate = ScGlobal::getLocaleData().getDate( Date( Date::SYSTEM 
) ) + " " +
+ScGlobal::getLocaleData().getTime(DateTime(DateTime::SYSTEM), false);
+const OUString aAuthor = SvtUserOptions().GetFullName();
+maNoteData.maAuthor = !aAuthor.isEmpty() ? aAuthor : 
ScResId(STR_CHG_UNKNOWN_AUTHOR);
 }
 
 const OutlinerParaObject* ScPostIt::GetOutlinerObject() const
@@ -793,25 +802,55 @@ void ScPostIt::RemoveCaption()
 }
 }
 
+static void lcl_FormatAndInsertAuthorAndDatepara(SdrCaptionObj* pCaption, 
OUStringBuffer& aUserData, bool bUserWithTrackText)
+{
+uno::Reference xShape = pCaption->getUnoShape();
+uno::Reference xText(xShape, uno::UNO_QUERY);
+uno::Reference xBodyTextAppend(xText, uno::UNO_QUERY);
+
+if (xBodyTextAppend.is())
+{
+uno::Sequence< beans::PropertyValue > aArgs;
+if (bUserWithTrackText)
+{
+xBodyTextAppend->insertTextPortion(aUserData.makeStringAndClear(), 
aArgs, xText->getStart());
+}
+else
+{
+xBodyTextAppend->insertTextPortion("\n\n", aArgs, 
xText->getStart());
+aArgs = {
+comphelper::makePropertyValue("CharWeight", 
uno::Any(awt::FontWeight::BOLD)),
+};
+xBodyTextAppend->insertTextPortion(aUserData.makeStringAndClear(), 
aArgs, xText->getStart());
+}
+}
+}
+
 rtl::Reference ScNoteUtil::CreateTempCaption(
 ScDocument& rDoc, const ScAddress& rPos, SdrPage& rDrawPage,
 std::u

Re: thesaurus.dic Workday 1

[Németh László]

Hi,

Andras Timar  ezt írta (időpont: 2023. jún. 28., Sze,
17:55):

> Hi Alex,
>
> On Wed, Jun 28, 2023 at 5:15 PM Alex  wrote:
>
>> Hi everyone
>>
>> Today I try to determine how to remove two unwanted wordbook files from
>> libreoffice/extras/source/wordbook:
>> hu_AkH11.dic and sl.dic.
>> These foreign language (incomplete) dics should be removed, unless they
>> are used in some unit test.
>> Bug 139961, 68576 etc
>>
>> Can be removed? OK?
>>
>>
>
> I'm not sure, if it's OK. We added these dictionaries for a reason. It's
> better to ask the maintainers first (I CC-ed them).
> From the technical point of view, if you remove the files from source, and
> all references to them, the build should pass. Maybe you need a clean build
> from scratch. Use "git grep sl.dic" and "git grep hu_AkH11.dic" commands,
> they are more reliable than opengrok.
>

You can remove hu_AkH11.dic with the following git command:

$ git revert 6247c966942a0e43320a234302a67c1f92c2eea7

 Because this was added with that commit:

$ git log libreoffice/extras/source/wordbook/hu_AkH11.dic
commit 6247c966942a0e43320a234302a67c1f92c2eea7

But these are not unwanted dictionaries, as András wrote.

In theory, they are packaged only with their language builds, sl-SI and
hu-HU. If not, i.e. en_US or other language builds get these files
unnecessarily, the only task is fixing our packaging. If the packaging
problem is related to some Linux distributions, I believe, our task is only
to report that in their bug trackers.

Is this a GSoC project? I haven't found information about the planned
improvement of the (en_US?) thesaurus or the thesaurus code base.
(By the way, I had an interesting improvement here: English stemming and
affixation during thesaurus usage by adding extra language data to the
en_US spelling dictionary. Unfortunately, by accident this was removed by
the recent maintainer.)

Best regards,
László



>
> Best regards,
> Andras
>
>
>

Re: thesaurus.dic Workday 1, background

[Martin Srebotnjak]

Hi,

please do not remove the Slovenian thesaurus just for the purposes of
cleaning the folders/files, please act according to Laszslo's instructions.

Lp, m.


V V čet., 29. jun. 2023 ob 07:28 je oseba Alex 
napisala:

> Hi
>
> I have no affiliation with GSoc or any other code program
>
> I am looking at the thesaurus files (as «I am not a coder»), with a view
> to providing an updated technical.dic thesaurus with many new terms and «a
> clear upgrade/merge/integrate path from an external data source»
> (wikipedia).
> 603 lines of references as opposed to the current 378 lines, each term
> (possibly) searchable directly on wikipedia .Then maybe I will see about
> concept/design to integrate (hypothetical) web search in xml  (help,
> thesaurus) interface. Right click on an item in help or Bayram Cicek’s
> search interface and you get an option to search the internet, or wikipedia
> article… (as concept).
>
> Anyway, I deleted the two foreign language thesaurus files hu_AkH11.dic
> and sl.dic, looking at the bug reports mentioned below, but I quickly
> realized the dic files were needed when compiling. But blank placeholders
> (empty text files) are good too.
>
> I have edited code references to remove hu_AkH11.dic, and it compiles OK
> without even a placeholder (empty) file.
> Aside from Linguistic.backup..xcs, line 217, where else is hu_AkH11.dic
> referenced. I looked in the references below and I believe that it is
> bloat. I will try compiling HU language support if people think it is
> useful.
> I would expect then that even with HU language and dictionary support
> installed, the (original) hu_AkH11.dic thesaurus will not exist or be
> called for. I don’t speak Hungarian though.
>
> sl.dic is integrated to the unit test, I can see. Not touching it today. I
> will put the text back into the placeholder file for my next build.
>
> «en_US or other language builds get these files unnecessarily, the only
> task is fixing our packaging.»   OK, how can I help with packaging?
>
> Laszlo do you have a local repo for your lo code, the en_US spelling
> dictionary? Your language code is different to this specific technical.dic
> thesaurus, yes?
>
> Thanks
>
> Alex Tao
> Tao Submarines and Systems
> Chios, Aegean Sea
>
>
> Thursday, June 29, 2023 1:44 AM +03:00 from Németh László <
> nem...@numbertext.org >:
>
> Hi,
>
> Andras Timar  > ezt írta
> (időpont: 2023. jún. 28., Sze, 17:55):
>
> Hi Alex,
>
> On Wed, Jun 28, 2023 at 5:15PM Alex  > wrote:
>
> Hi everyone
>
> Today I try to determine how to remove two unwanted wordbook files from
> libreoffice/extras/source/wordbook:
> hu_AkH11.dic and sl.dic.
> These foreign language (incomplete) dics should be removed, unless they
> are used in some unit test.
> Bug 139961, 68576 etc
>
> Can be removed? OK?
>
>
>
> I'm not sure, if it's OK. We added these dictionaries for a reason. It's
> better to ask the maintainers first (I CC-ed them).
> From the technical point of view, if you remove the files from source, and
> all references to them, the build should pass. Maybe you need a clean build
> from scratch. Use "git grep sl.dic" and "git grep hu_AkH11.dic" commands,
> they are more reliable than opengrok.
>
>
> You can remove hu_AkH11.dic with the following git command:
>
> $ git revert 6247c966942a0e43320a234302a67c1f92c2eea7
>
>  Because this was added with that commit:
>
> $ git log libreoffice/extras/source/wordbook/hu_AkH11.dic
> commit 6247c966942a0e43320a234302a67c1f92c2eea7
>
> But these are not unwanted dictionaries, as András wrote.
>
> In theory, they are packaged only with their language builds, sl-SI and
> hu-HU. If not, i.e. en_US or other language builds get these files
> unnecessarily, the only task is fixing our packaging. If the packaging
> problem is related to some Linux distributions, I believe, our task is only
> to report that in their bug trackers.
>
> Is this a GSoC project? I haven't found information about the planned
> improvement of the (en_US?) thesaurus or the thesaurus code base.
> (By the way, I had an interesting improvement here: English stemming and
> affixation during thesaurus usage by adding extra language data to the
> en_US spelling dictionary. Unfortunately, by accident this was removed by
> the recent maintainer.)
>
> Best regards,
> László
>
>
>
>
> Best regards,
> Andras
>
>
>
>
>

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

[Balazs Varga (via logerrit)]

 sw/source/core/access/AccessibilityCheck.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b3594e01ec6d0156277f354efe5cacc04b33c4b6
Author: Balazs Varga 
AuthorDate: Wed Jun 7 15:41:23 2023 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Thu Jun 29 09:12:46 2023 +0200

tdf#154981 - A11Y sidebar: fix warning missing signature line desc

Add graphic shape objects to "Go to" and "Fix" functions.

Change-Id: I258d3664613cbd53b7b26aaa8d88715660d921dc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152707
Tested-by: Jenkins
Tested-by: Gabor Kelemen 
Reviewed-by: Samuel Mehrbrodt 

diff --git a/sw/source/core/access/AccessibilityCheck.cxx 
b/sw/source/core/access/AccessibilityCheck.cxx
index b9eeaafc6171..45dd076e99ce 100644
--- a/sw/source/core/access/AccessibilityCheck.cxx
+++ b/sw/source/core/access/AccessibilityCheck.cxx
@@ -1365,7 +1365,7 @@ void AccessibilityCheck::checkObject(SwNode* pCurrent, 
SdrObject* pObject)
 
 if (nObjId == SdrObjKind::CustomShape || nObjId == SdrObjKind::Text
 || nObjId == SdrObjKind::Media || nObjId == SdrObjKind::Group
-|| nInv == SdrInventor::FmForm)
+|| nObjId == SdrObjKind::Graphic || nInv == SdrInventor::FmForm)
 {
 OUString sAlternative = pObject->GetTitle();
 if (sAlternative.isEmpty())