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

2024-05-16 Thread Xisco Fauli (via logerrit)
 sw/source/core/draw/dview.cxx|   31 +--
 sw/source/core/frmedt/fefly1.cxx |4 ++--
 2 files changed, 19 insertions(+), 16 deletions(-)

New commits:
commit 79be57a37c5db33dc25f22d90e5fe54cca1e0bd8
Author: Xisco Fauli 
AuthorDate: Tue Apr 30 10:07:23 2024 +0200
Commit: Christian Lohmaier 
CommitDate: Thu May 16 19:59:08 2024 +0200

Fix UBSan failure (part 2)

Introduced by 495b5db74f0db59395ff68bacc8d8ca67595b66e
"sw: check GetUserCall"

https: //gerrit.libreoffice.org/c/core/+/166824/comments/8db24a41_2f4e7e4e
Change-Id: Ib6f981aa3055f0d37d0b83e3284842d310fe6ef0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166913
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 
Signed-off-by: Xisco Fauli 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167002
Reviewed-by: Christian Lohmaier 

diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx
index 644c5ccf0e40..d6ff8b296908 100644
--- a/sw/source/core/frmedt/fefly1.cxx
+++ b/sw/source/core/frmedt/fefly1.cxx
@@ -386,7 +386,7 @@ const SwFrameFormat* SwFEShell::IsFlyInFly()
 return nullptr;
 
 SdrObject *pObj = rMrkList.GetMark( 0 )->GetMarkedSdrObj();
-SwDrawContact *pContact = static_cast(GetUserCall(pObj));
+SwContact* pContact = GetUserCall( pObj );
 if (!pContact)
 return nullptr;
 
@@ -400,7 +400,7 @@ const SwFrameFormat* SwFEShell::IsFlyInFly()
 }
 else
 {
-pFly = pContact->GetAnchorFrame(pObj);
+pFly = static_cast(pContact)->GetAnchorFrame(pObj);
 }
 
 OSL_ENSURE( pFly, "IsFlyInFly: Where's my anchor?" );
commit 118bde319d10c54a3a6ee53077740406fb07fc13
Author: Xisco Fauli 
AuthorDate: Mon Apr 29 09:54:12 2024 +0200
Commit: Christian Lohmaier 
CommitDate: Thu May 16 19:58:56 2024 +0200

Fix UBSan failure

Introduced by 495b5db74f0db59395ff68bacc8d8ca67595b66e
"sw: check GetUserCall"


https://ci.libreoffice.org/job/lo_ubsan/3154/consoleFull#-1571115798d893063f-7f3d-4b7e-b56f-4e0f225817cd
Change-Id: Ifc80312890f2e6b82dcc9419b5b7e8bfcd5340a5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166824
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 
Signed-off-by: Xisco Fauli 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167001
Reviewed-by: Christian Lohmaier 

diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx
index 39ecb982c00c..5499dad7c9ca 100644
--- a/sw/source/core/draw/dview.cxx
+++ b/sw/source/core/draw/dview.cxx
@@ -706,13 +706,10 @@ const SwFrame* SwDrawView::CalcAnchor()
 return nullptr;
 
 SdrObject* pObj = rMrkList.GetMark( 0 )->GetMarkedSdrObj();
-SwDrawContact* pContact = static_cast(GetUserCall(pObj));
-if (!pContact)
-return nullptr;
 
 //Search for paragraph bound objects, otherwise only the
 //current anchor. Search only if we currently drag.
-const SwFrame* pAnch;
+const SwFrame* pAnch = nullptr;
 tools::Rectangle aMyRect;
 auto pFlyDrawObj = dynamic_cast( pObj );
 if ( pFlyDrawObj )
@@ -724,13 +721,16 @@ const SwFrame* SwDrawView::CalcAnchor()
 {
 // determine correct anchor position for 'virtual' drawing objects.
 // #i26791#
-pAnch = pContact->GetAnchorFrame( pObj );
-if( !pAnch )
+if (SwDrawContact* pContact = 
static_cast(GetUserCall(pObj)))
 {
-pContact->ConnectToLayout();
-// determine correct anchor position for 'virtual' drawing objects.
-// #i26791#
 pAnch = pContact->GetAnchorFrame( pObj );
+if( !pAnch )
+{
+pContact->ConnectToLayout();
+// determine correct anchor position for 'virtual' drawing 
objects.
+// #i26791#
+pAnch = pContact->GetAnchorFrame( pObj );
+}
 }
 aMyRect = pObj->GetSnapRect();
 }
@@ -765,11 +765,14 @@ const SwFrame* SwDrawView::CalcAnchor()
 {
 const SwRect aRect( aPt.getX(), aPt.getY(), 1, 1 );
 
-if ( pContact->GetAnchorFrame( pObj ) &&
- pContact->GetAnchorFrame( pObj )->IsPageFrame() )
-pAnch = pContact->GetPageFrame();
-else
-pAnch = pContact->FindPage( aRect );
+if (SwDrawContact* pContact = 
static_cast(GetUserCall(pObj)))
+{
+if ( pContact->GetAnchorFrame( pObj ) &&
+ pContact->GetAnchorFrame( pObj )->IsPageFrame() )
+pAnch = pContact->GetPageFrame();
+else
+pAnch = pContact->FindPage( aRect );
+}
 }
 }
 if( pAnch && !pAnch->IsProtected() )


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

2024-05-16 Thread Xisco Fauli (via logerrit)
 sw/source/core/access/accfrmobj.cxx  |   15 ++-
 sw/source/core/doc/docdraw.cxx   |   12 +++
 sw/source/core/draw/dview.cxx|  108 ---
 sw/source/core/frmedt/fecopy.cxx |   25 +++---
 sw/source/core/frmedt/fefly1.cxx |   13 ++-
 sw/source/core/frmedt/feshview.cxx   |   37 ++---
 sw/source/core/layout/anchoreddrawobject.cxx |4 +
 sw/source/core/layout/anchoredobject.cxx |   11 +-
 sw/source/core/layout/fly.cxx|4 -
 sw/source/core/layout/flylay.cxx |   41 +-
 sw/source/core/layout/frmtool.cxx|   40 ++
 sw/source/core/layout/pagechg.cxx|   19 ++--
 sw/source/core/layout/trvlfrm.cxx|   39 +
 sw/source/core/txtnode/atrflyin.cxx  |3 
 sw/source/core/undo/undraw.cxx   |   31 ---
 15 files changed, 242 insertions(+), 160 deletions(-)

New commits:
commit 67af2cc487450a274ae7ba988249c9c362eaa95d
Author: Xisco Fauli 
AuthorDate: Thu Apr 25 18:15:12 2024 +0200
Commit: Christian Lohmaier 
CommitDate: Thu May 16 19:58:34 2024 +0200

sw: check GetUserCall

It might return nullptr
See 
https://crashreport.libreoffice.org/stats/signature/SwFEShell::ShouldObjectBeSelected(Point%20const%20&)

Change-Id: Ia0ed355a7eb9084b9f57163ffbfe6b549c8bdb3f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166642
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 
(cherry picked from commit 495b5db74f0db59395ff68bacc8d8ca67595b66e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166710
Reviewed-by: Christian Lohmaier 

diff --git a/sw/source/core/access/accfrmobj.cxx 
b/sw/source/core/access/accfrmobj.cxx
index f78dc2d155db..004ca4ab94e0 100644
--- a/sw/source/core/access/accfrmobj.cxx
+++ b/sw/source/core/access/accfrmobj.cxx
@@ -240,13 +240,16 @@ SwRect SwAccessibleChild::GetBox( const SwAccessibleMap& 
rAccMap ) const
 // by the mpFrame case above b) for genuine SdrObject this must be set
 // if it's connected to layout
 assert(dynamic_cast(pContact));
-SwPageFrame const*const pPage(const_cast(
-pContact->GetAnchoredObj(mpDrawObj))->FindPageFrameOfAnchor());
-if (pPage) // may end up here with partial layout -> not visible
+if (pContact)
 {
-aBox = SwRect( mpDrawObj->GetCurrentBoundRect() );
-// tdf#91260 drawing object may be partially off-page
-aBox.Intersection(pPage->getFrameArea());
+SwPageFrame const*const pPage(const_cast(
+pContact->GetAnchoredObj(mpDrawObj))->FindPageFrameOfAnchor());
+if (pPage) // may end up here with partial layout -> not visible
+{
+aBox = SwRect( mpDrawObj->GetCurrentBoundRect() );
+// tdf#91260 drawing object may be partially off-page
+aBox.Intersection(pPage->getFrameArea());
+}
 }
 }
 else if ( mpWindow )
diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx
index 521ca2b0ba15..09b1d9afb697 100644
--- a/sw/source/core/doc/docdraw.cxx
+++ b/sw/source/core/doc/docdraw.cxx
@@ -68,6 +68,9 @@ static void lcl_AdjustPositioningAttr( SwDrawFrameFormat* 
_pFrameFormat,
 const SwContact* pContact = GetUserCall( &_rSdrObj );
 OSL_ENSURE( pContact, " - missing contact 
object." );
 
+if (!pContact)
+return;
+
 // determine position of new group object relative to its anchor frame 
position
 SwTwips nHoriRelPos = 0;
 SwTwips nVertRelPos = 0;
@@ -195,6 +198,9 @@ SwDrawContact* SwDoc::GroupSelection( SdrView& rDrawView )
 
 // Revoke anchor attribute.
 SwDrawContact *pMyContact = 
static_cast(GetUserCall(pObj));
+if (!pMyContact)
+return pNewContact;
+
 const SwFormatAnchor aAnch( pMyContact->GetFormat()->GetAnchor() );
 
 std::unique_ptr pUndo;
@@ -216,6 +222,9 @@ SwDrawContact* SwDoc::GroupSelection( SdrView& rDrawView )
 pObj = rMrkList.GetMark( i )->GetMarkedSdrObj();
 SwDrawContact *pContact = 
static_cast(GetUserCall(pObj));
 
+if (!pContact)
+continue;
+
 // #i53320#
 #if OSL_DEBUG_LEVEL > 0
 SwAnchoredDrawObject* pAnchoredDrawObj =
@@ -352,6 +361,9 @@ void SwDoc::UnGroupSelection( SdrView& rDrawView )
 {
 SwDrawContact *pContact = 
static_cast(GetUserCall(pObj));
 
+if (!pContact)
+continue;
+
 std::shared_ptr pTextBoxNode;
 if (auto pGroupFormat = pContact->GetFormat())
 pTextBoxNode = pGroupFormat->GetOtherTextBoxFormats();
diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx
index fe0db61925c4..39ecb982c00c 100644
--- a/sw/source/core/draw/dview.cxx
+++ 

core.git: external/lpsolve

2024-05-15 Thread Xisco Fauli (via logerrit)
 external/lpsolve/UnpackedTarball_lpsolve.mk |1 
 external/lpsolve/lp_solve-fixed-warn.patch  |   84 
 2 files changed, 85 deletions(-)

New commits:
commit f85f2a1fffaeb9fdd0ec5247dd3a414133d5991b
Author: Xisco Fauli 
AuthorDate: Wed May 15 18:11:27 2024 +0200
Commit: Xisco Fauli 
CommitDate: Wed May 15 21:28:22 2024 +0200

lpsolve: remove obsolete dmake patch

Added with 249a4da9cd5217b0c340edd779bd17e44e21d678
"warn free build of dmake, concat-deps and lpsolve"

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

diff --git a/external/lpsolve/UnpackedTarball_lpsolve.mk 
b/external/lpsolve/UnpackedTarball_lpsolve.mk
index 62a182dc7517..bcb885fb9186 100644
--- a/external/lpsolve/UnpackedTarball_lpsolve.mk
+++ b/external/lpsolve/UnpackedTarball_lpsolve.mk
@@ -23,7 +23,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,lpsolve,\
 else
 
 $(eval $(call gb_UnpackedTarball_add_patches,lpsolve,\
-   external/lpsolve/lp_solve-fixed-warn.patch \
external/lpsolve/lp_solve_5.5.patch \
external/lpsolve/lpsolve-ubsan.patch.0 \
 ))
diff --git a/external/lpsolve/lp_solve-fixed-warn.patch 
b/external/lpsolve/lp_solve-fixed-warn.patch
deleted file mode 100644
index 46742887a85f..
--- a/external/lpsolve/lp_solve-fixed-warn.patch
+++ /dev/null
@@ -1,84 +0,0 @@
 misc/build/lp_solve_5.5/lp_report.c2007-01-14 10:31:34.0 
-0800
-+++ misc/build/lp_solve_5.5/lp_report.c2007-01-14 10:31:34.0 
-0800
-@@ -160,7 +160,7 @@
- {
-   int i, k = 0;
- 
--  fprintf(output, label);
-+  fputs(label, output);
-   fprintf(output, "
");
-   for(i = first; i <= last; i++) {
- fprintf(output, " %18g", vector[i]);
-@@ -189,7 +189,7 @@
-   if(last < 0)
- last = lp->rows;
- 
--  fprintf(output, label);
-+  fputs(label, output);
-   fprintf(output, "
");
- 
-   if(first == 0) {
-@@ -254,7 +254,7 @@
-   if(last < 0)
- last = lp->rows;
- 
--  fprintf(output, label);
-+  fputs(label, output);
-   fprintf(output, "
");
- 
-   for(i = first; i <= last; i++) {
 misc/build/lp_solve_5.5/lp_rlp.h   2007-01-14 10:31:52.0 -0800
-+++ misc/build/lp_solve_5.5/lp_rlp.h   2007-01-14 10:31:52.0 -0800
-@@ -615,7 +615,7 @@
- /* This used to be an fputs(), but since the string might contain NUL's,
-  * we now use fwrite().
-  */
--#define ECHO (void) fwrite( lp_yytext, lp_yyleng, 1, lp_yyout )
-+#define ECHO if(fwrite( lp_yytext, lp_yyleng, 1, lp_yyout ) != 1) 
YY_FATAL_ERROR( "can't write into lp_yytext" )
- #endif
- 
- /* Gets input and stuffs it into "buf".  number of characters read, or 
YY_NULL,
 misc/build/lp_solve_5.5/shared/commonlib.c 2007-01-14 10:33:14.0 
-0800
-+++ misc/build/lp_solve_5.5/shared/commonlib.c 2007-01-14 10:33:14.0 
-0800
-@@ -715,7 +715,7 @@
- {
-   int i, k = 0;
- 
--  fprintf(output, label);
-+  fputs(label, output);
-   fprintf(output, "
");
-   for(i = first; i <= last; i++) {
- fprintf(output, " %5d", myvector[i]);
-@@ -734,7 +734,7 @@
- {
-   int i, k = 0;
- 
--  fprintf(output, label);
-+  fputs(label, output);
-   fprintf(output, "
");
-   for(i = first; i <= last; i++) {
- if(asRaw)
-@@ -756,7 +756,7 @@
- {
-   int i, k = 0;
- 
--  fprintf(output, label);
-+  fputs(label, output);
-   fprintf(output, "
");
-   for(i = first; i <= last; i++) {
- fprintf(output, " %18g", myvector[i]);
 misc/build/lp_solve_5.5/shared/mmio.c  2007-01-14 10:33:14.0 
-0800
-+++ misc/build/lp_solve_5.5/shared/mmio.c  2007-01-14 10:33:14.0 
-0800
-@@ -74,7 +74,11 @@
-  
- for (i=0; i

core.git: download.lst external/java_websocket

2024-05-15 Thread Xisco Fauli (via logerrit)
 download.lst   |4 ++--
 external/java_websocket/patches/no-slf4j.patch |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 4527af4388dae61c4cc5feabd40c0a04e32c8a98
Author: Xisco Fauli 
AuthorDate: Wed May 15 13:03:48 2024 +0200
Commit: Xisco Fauli 
CommitDate: Wed May 15 18:17:25 2024 +0200

Java-WebSocket: Upgrade to 1.5.6

Downloaded from 
https://github.com/TooTallNate/Java-WebSocket/archive/refs/tags/v1.5.6.tar.gz

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

diff --git a/download.lst b/download.lst
index b03b332fcd70..de788488bbc6 100644
--- a/download.lst
+++ b/download.lst
@@ -324,8 +324,8 @@ ICU_DATA_TARBALL := icu4c-74_1-data.zip
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-JAVA_WEBSOCKET_SHA256SUM := 
a6828b35d1f938fee2335945f3d3c563cbbfa58ce7eb0bf72778d0fa7a550720
-JAVA_WEBSOCKET_TARBALL := Java-WebSocket-1.5.4.tar.gz
+JAVA_WEBSOCKET_SHA256SUM := 
167e86561cd7b5ed21b67d7543536134edcb14b373892739b28c417566a3832f
+JAVA_WEBSOCKET_TARBALL := Java-WebSocket-1.5.6.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/java_websocket/patches/no-slf4j.patch 
b/external/java_websocket/patches/no-slf4j.patch
index 27296071eff7..cb6788b53405 100644
--- a/external/java_websocket/patches/no-slf4j.patch
+++ b/external/java_websocket/patches/no-slf4j.patch
@@ -326,7 +326,7 @@ diff -ru 
a/src/main/java/org/java_websocket/server/WebSocketServer.java b/src/ma
 +import java.util.logging.Logger;
  
  /**
-  * WebSocketServer is an abstract class that only takes care of the
+  * WebSocketServer is an abstract class that only takes care of 
the
 @@ -84,7 +83,7 @@
 *
 * @since 1.4.0


core.git: download.lst

2024-05-14 Thread Xisco Fauli (via logerrit)
 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit bb2655206a1a2684ead8038601c70f4389a5d7aa
Author: Xisco Fauli 
AuthorDate: Tue May 14 09:53:07 2024 +0200
Commit: Xisco Fauli 
CommitDate: Tue May 14 16:09:31 2024 +0200

libcmis: upgrade to 0.6.2

Downloaded from 
https://github.com/tdf/libcmis/releases/download/v0.6.2/libcmis-0.6.2.tar.xz

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

diff --git a/download.lst b/download.lst
index 19b2a9315ec9..b03b332fcd70 100644
--- a/download.lst
+++ b/download.lst
@@ -65,8 +65,8 @@ DTOA_TARBALL := dtoa-20180411.tgz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBCMIS_SHA256SUM := 
d54d19d86153dbc88e2d468f7136269a2cfe71b73227e12fded01d29ac268074
-LIBCMIS_TARBALL := libcmis-0.6.1.tar.xz
+LIBCMIS_SHA256SUM := 
1b5c2d7258ff93eb5f9958ff0e4dfd7332dc75a071bb717dde2217a26602a644
+LIBCMIS_TARBALL := libcmis-0.6.2.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts


core.git: download.lst

2024-05-14 Thread Xisco Fauli (via logerrit)
 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 461dac862c6e8ceb71d4b46ae43c9073b344fcea
Author: Xisco Fauli 
AuthorDate: Tue May 14 09:33:15 2024 +0200
Commit: Xisco Fauli 
CommitDate: Tue May 14 14:19:38 2024 +0200

harfbuzz: Upgrade to 8.5.0

Downloaded from 
https://github.com/harfbuzz/harfbuzz/releases/download/8.5.0/harfbuzz-8.5.0.tar.xz

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

diff --git a/download.lst b/download.lst
index 30346ac91206..19b2a9315ec9 100644
--- a/download.lst
+++ b/download.lst
@@ -292,8 +292,8 @@ GRAPHITE_TARBALL := graphite2-minimal-1.3.14.tgz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-HARFBUZZ_SHA256SUM := 
af4ea73e25ab748c8c063b78c2f88e48833db9b2ac369e29bd115702e789755e
-HARFBUZZ_TARBALL := harfbuzz-8.4.0.tar.xz
+HARFBUZZ_SHA256SUM := 
77e4f7f98f3d86bf8788b53e6832fb96279956e1c3961988ea3d4b7ca41ddc27
+HARFBUZZ_TARBALL := harfbuzz-8.5.0.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts


core.git: Branch 'libreoffice-24-2' - download.lst

2024-05-14 Thread Xisco Fauli (via logerrit)
 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2041013fd9759fdd7fc242ee4ae870175bab4801
Author: Xisco Fauli 
AuthorDate: Wed May 8 12:15:59 2024 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Tue May 14 08:06:50 2024 +0200

Update language-subtag-registry to 2024-03-07

How the file was created:
mkdir data
cd data
wget

https://www.iana.org/assignments/language-subtag-registry/language-subtag-registry
cd ..
tar -cvjSf language-subtag-registry-2024-03-07.tar.bz2 data

Change-Id: If1bdeab0ee5853855949dcbbfb00170e897c80e1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167341
Tested-by: Jenkins
Reviewed-by: Eike Rathke 
(cherry picked from commit 96698d3a72d8496358786ffedc7b6eb22af3648c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167461
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/download.lst b/download.lst
index 690e4c73b6be..03075fb36e83 100644
--- a/download.lst
+++ b/download.lst
@@ -359,8 +359,8 @@ LIBJPEG_TURBO_TARBALL := libjpeg-turbo-2.1.5.1.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LANGTAGREG_SHA256SUM := 
59fdc026b5088e7947e1e6add482d2a40e1f7e25c50f198b456954216462c2eb
-LANGTAGREG_TARBALL := language-subtag-registry-2023-08-02.tar.bz2
+LANGTAGREG_SHA256SUM := 
642c1c8e08aa79884f3d0fe15c0f5866e6fb6828af22c3c9c1fe3827f99e58cc
+LANGTAGREG_TARBALL := language-subtag-registry-2024-03-07.tar.bz2
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts


core.git: download.lst external/poppler

2024-05-13 Thread Xisco Fauli (via logerrit)
 download.lst |4 +-
 external/poppler/UnpackedTarball_poppler.mk  |1 
 external/poppler/char_traits.patch   |   11 -
 external/poppler/disable-freetype.patch.1|4 +-
 external/poppler/disable-nss-and-gpgmepp.patch.1 |   45 +--
 5 files changed, 39 insertions(+), 26 deletions(-)

New commits:
commit 5265c69ed6aa2a5f88cf939c64683552e587e575
Author: Xisco Fauli 
AuthorDate: Mon May 13 11:14:06 2024 +0200
Commit: Xisco Fauli 
CommitDate: Mon May 13 22:41:45 2024 +0200

poppler: Upgrade 24.05.0

* external/poppler/char_traits.patch is no longer neeeded
after 
https://cgit.freedesktop.org/poppler/poppler/commit/cpp/poppler-global.h?id=b4ac7d9af7cb5edfcfcbda035ed8b8c218ba8564

* Adapt external/poppler/disable-nss-and-gpgmepp.patch.1
after 
https://cgit.freedesktop.org/poppler/poppler/commit/?id=d40bb7e308c9e3299e50d3e2880229cd6272587e

Downloaded from https://poppler.freedesktop.org/poppler-24.05.0.tar.xz

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

diff --git a/download.lst b/download.lst
index cf648eb74e60..30346ac91206 100644
--- a/download.lst
+++ b/download.lst
@@ -543,8 +543,8 @@ LIBTIFF_TARBALL := tiff-4.6.0.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-POPPLER_SHA256SUM := 
bafbf0db5713dec25b5d16eb2cd87e4a62351cdc40f050c3937cd8dd6882d446
-POPPLER_TARBALL := poppler-24.03.0.tar.xz
+POPPLER_SHA256SUM := 
d8c5eb30b50285ad9f0af8c6335cc2d3b9597fca475cbc2598a5479fa379f779
+POPPLER_TARBALL := poppler-24.05.0.tar.xz
 POPPLER_DATA_SHA256SUM := 
c835b640a40ce357e1b83666aabd95edffa24d49b8daff63adb851cdab74
 POPPLER_DATA_TARBALL := poppler-data-0.4.12.tar.gz
 # three static lines
diff --git a/external/poppler/UnpackedTarball_poppler.mk 
b/external/poppler/UnpackedTarball_poppler.mk
index c6ddbf9785d3..784fc768e2a7 100644
--- a/external/poppler/UnpackedTarball_poppler.mk
+++ b/external/poppler/UnpackedTarball_poppler.mk
@@ -14,7 +14,6 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,poppler,$(POPPLER_TARBALL),,poppler
 $(eval $(call gb_UnpackedTarball_set_patchlevel,poppler,0))
 
 $(eval $(call gb_UnpackedTarball_add_patches,poppler,\
-   external/poppler/char_traits.patch \
external/poppler/disable-freetype.patch.1 \
external/poppler/disable-nss-and-gpgmepp.patch.1 \
external/poppler/poppler-config.patch.1 \
diff --git a/external/poppler/char_traits.patch 
b/external/poppler/char_traits.patch
deleted file mode 100644
index 3483f2fe22d8..
--- a/external/poppler/char_traits.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 cpp/poppler-global.h
-+++ cpp/poppler-global.h
-@@ -98,7 +98,7 @@
- #pragma warning(push)
- #pragma warning(disable : 4251) /* class 'A' needs to have dll interface 
for to be used by clients of class 'B'. */
- #endif
--class POPPLER_CPP_EXPORT ustring : public std::basic_string
-+class POPPLER_CPP_EXPORT ustring : public std::u16string
- {
- public:
- ustring();
diff --git a/external/poppler/disable-freetype.patch.1 
b/external/poppler/disable-freetype.patch.1
index d12374f088f9..2d4ce2f69c9c 100644
--- a/external/poppler/disable-freetype.patch.1
+++ b/external/poppler/disable-freetype.patch.1
@@ -22,13 +22,13 @@ disable freetype dependent code
  #include 
  
  // helper for using std::visit to get a dependent false for static_asserts
-@@ -2760,6 +2760,8 @@
+@@ -2840,6 +2840,8 @@
  
  Form::AddFontResult Form::addFontToDefaultResources(const std::string 
, int faceIndex, const std::string , const std::string 
, bool forceName)
  {
 +return {};
 +#if 0
- if (!GooString::endsWith(filepath, ".ttf") && 
!GooString::endsWith(filepath, ".ttc") && !GooString::endsWith(filepath, 
".otf")) {
+ if (!filepath.ends_with(".ttf") && !filepath.ends_with(".ttc") && 
!filepath.ends_with(".otf")) {
  error(errIO, -1, "We only support embedding ttf/ttc/otf fonts for 
now. The font file for {0:s} {1:s} was {2:s}", fontFamily.c_str(), 
fontStyle.c_str(), filepath.c_str());
  return {};
 @@ -2994,6 +2996,7 @@
diff --git a/external/poppler/disable-nss-and-gpgmepp.patch.1 
b/external/poppler/disable-nss-and-gpgmepp.patch.1
index 1d7f7f933433..1fc9ede6035c 100644
--- a/external/poppler/disable-nss-and-gpgmepp.patch.1
+++ b/external/poppler/disable-nss-and-gpgmepp.patch.1
@@ -11,9 +11,9 @@ disable NSS/GPGMEPP dependent code.
  #include "SignatureInfo.h"
  #include "CertificateInfo.h"
  #include "XRef.h"
-@@ -578,7 +578,7 @@
+@@ -584,7 +584,7 @@
  {
- return static_cast(field)->validateSignature(doVerifyCert, forceRevalidation, validationTime, 
ocspRevocationCheck, enableAIA);
+ return static_cast(field)->validateSignatureResult();
  }
 -
 +#if 0
@@ -60,19 +60,44 @@ disable NSS/GPGMEPP dependent code.
  }
 
  FormSignatureType 

core.git: Branch 'libreoffice-24-2' - download.lst

2024-05-13 Thread Xisco Fauli (via logerrit)
 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a4c2c23cbb77a2d821e71e6a51f8e6d1779f1e3e
Author: Xisco Fauli 
AuthorDate: Mon May 13 12:45:05 2024 +0200
Commit: Caolán McNamara 
CommitDate: Mon May 13 20:26:35 2024 +0200

libxml2: upgrade to 2.12.7

* Fixes CVE-2024-34459

Downloaded from 
https://download.gnome.org/sources/libxml2/2.12/libxml2-2.12.7.tar.xz

Change-Id: Ie45ad54b3f781a54a278e2542fccafb8d06542bb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167585
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 
(cherry picked from commit 02dc762466c655e9ca6fb7cef92b1495915b34ed)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167460
Reviewed-by: Caolán McNamara 

diff --git a/download.lst b/download.lst
index 40384de2b66d..690e4c73b6be 100644
--- a/download.lst
+++ b/download.lst
@@ -424,8 +424,8 @@ XMLSEC_TARBALL := xmlsec1-1.3.2.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBXML_SHA256SUM := 
889c593a881a3db5fdd96cc9318c87df34eb648edfc458272ad46fd607353fbb
-LIBXML_VERSION_MICRO := 6
+LIBXML_SHA256SUM := 
24ae78ff1363a973e6d8beba941a7945da2ac056e19b53956aeb6927fd6cfb56
+LIBXML_VERSION_MICRO := 7
 LIBXML_TARBALL := libxml2-2.12.$(LIBXML_VERSION_MICRO).tar.xz
 # three static lines
 # so that git cherry-pick


core.git: download.lst

2024-05-13 Thread Xisco Fauli (via logerrit)
 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4133e187c99b19bd5986d0c8af923e9f1400f82b
Author: Xisco Fauli 
AuthorDate: Mon May 13 17:49:48 2024 +0200
Commit: Xisco Fauli 
CommitDate: Mon May 13 18:12:26 2024 +0200

lxml: fix --enable-python=fully-internal

Originally I downloaded the tar file from 
https://github.com/lxml/lxml/releases/download/lxml-5.2.2/lxml-5.2.2.tar.gz
and pushed it to extern
https://gerrit.libreoffice.org/c/extern/+/167571
Later I realized the lxml website was pointing to
another file https://lxml.de/files/lxml-5.2.2.tgz
which I also changed in extern 
https://gerrit.libreoffice.org/c/extern/+/167588
But make fails with

tar: This does not look like a tar archive
tar: Skipping to next header
tar: Exiting with failure status due to previous errors

so change download.lst back to point to the first tar file

The commit is extern was also reverted with
https://gerrit.libreoffice.org/c/extern/+/167606

Change-Id: I8f335d4a0b9d9b41c9c596f188f63bb0691ae11b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167607
Tested-by: Xisco Fauli 
Reviewed-by: Xisco Fauli 

diff --git a/download.lst b/download.lst
index da9a25814123..cf648eb74e60 100644
--- a/download.lst
+++ b/download.lst
@@ -441,8 +441,8 @@ LPSOLVE_TARBALL := 
26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LXML_SHA256SUM := 
0e963eecfb0efa22ca826fd558d5701eb53a574811d2499f4d1a8c582007c83f
-LXML_TARBALL := lxml-5.2.2.tgz
+LXML_SHA256SUM := 
bb2dc4898180bea79863d5487e5f9c7c34297414bad54bcd0f0852aee9cfdb87
+LXML_TARBALL := lxml-5.2.2.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts


core.git: download.lst

2024-05-13 Thread Xisco Fauli (via logerrit)
 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 96f74d85983fd693d349d593c4389a8f990fdaaa
Author: Xisco Fauli 
AuthorDate: Mon May 13 09:44:02 2024 +0200
Commit: Xisco Fauli 
CommitDate: Mon May 13 17:01:33 2024 +0200

lxml: Upgrade to 5.2.2

Downloaded from https://lxml.de/files/lxml-5.2.2.tgz

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

diff --git a/download.lst b/download.lst
index 0c4553a37dd7..da9a25814123 100644
--- a/download.lst
+++ b/download.lst
@@ -441,8 +441,8 @@ LPSOLVE_TARBALL := 
26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LXML_SHA256SUM := 
3f7765e69bbce0906a7c74d5fe46d2c7a7596147318dbc08e4a2431f3060e306
-LXML_TARBALL := lxml-5.2.1.tar.gz
+LXML_SHA256SUM := 
0e963eecfb0efa22ca826fd558d5701eb53a574811d2499f4d1a8c582007c83f
+LXML_TARBALL := lxml-5.2.2.tgz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts


core.git: download.lst

2024-05-13 Thread Xisco Fauli (via logerrit)
 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b6f9caeb081da2004f067ad9216875c86eead8b1
Author: Xisco Fauli 
AuthorDate: Mon May 13 13:27:33 2024 +0200
Commit: Xisco Fauli 
CommitDate: Mon May 13 16:42:41 2024 +0200

postgresql: Upgrade to 13.15

Downloaded from 
https://ftp.postgresql.org/pub/source/v13.15/postgresql-13.15.tar.bz2

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

diff --git a/download.lst b/download.lst
index b0a13eb37690..59d7ae0ee360 100644
--- a/download.lst
+++ b/download.lst
@@ -550,8 +550,8 @@ POPPLER_DATA_TARBALL := poppler-data-0.4.12.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-POSTGRESQL_SHA256SUM := 
b8df078551898960bd500dc5d38a177e9905376df81fe7f2b660a1407fa6a5ed
-POSTGRESQL_TARBALL := postgresql-13.14.tar.bz2
+POSTGRESQL_SHA256SUM := 
42edd415446d33b8c242be76d1ad057531b2264b2e86939339b7075c6e4ec925
+POSTGRESQL_TARBALL := postgresql-13.15.tar.bz2
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts


core.git: download.lst

2024-05-13 Thread Xisco Fauli (via logerrit)
 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 96698d3a72d8496358786ffedc7b6eb22af3648c
Author: Xisco Fauli 
AuthorDate: Wed May 8 12:15:59 2024 +0200
Commit: Eike Rathke 
CommitDate: Mon May 13 16:40:18 2024 +0200

Update language-subtag-registry to 2024-03-07

How the file was created:
mkdir data
cd data
wget

https://www.iana.org/assignments/language-subtag-registry/language-subtag-registry
cd ..
tar -cvjSf language-subtag-registry-2024-03-07.tar.bz2 data

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

diff --git a/download.lst b/download.lst
index 5acd40480231..b0a13eb37690 100644
--- a/download.lst
+++ b/download.lst
@@ -359,8 +359,8 @@ LIBJPEG_TURBO_TARBALL := libjpeg-turbo-2.1.5.1.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LANGTAGREG_SHA256SUM := 
59fdc026b5088e7947e1e6add482d2a40e1f7e25c50f198b456954216462c2eb
-LANGTAGREG_TARBALL := language-subtag-registry-2023-08-02.tar.bz2
+LANGTAGREG_SHA256SUM := 
642c1c8e08aa79884f3d0fe15c0f5866e6fb6828af22c3c9c1fe3827f99e58cc
+LANGTAGREG_TARBALL := language-subtag-registry-2024-03-07.tar.bz2
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts


core.git: download.lst

2024-05-13 Thread Xisco Fauli (via logerrit)
 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 02dc762466c655e9ca6fb7cef92b1495915b34ed
Author: Xisco Fauli 
AuthorDate: Mon May 13 12:45:05 2024 +0200
Commit: Xisco Fauli 
CommitDate: Mon May 13 15:46:05 2024 +0200

libxml2: upgrade to 2.12.7

* Fixes CVE-2024-34459

Downloaded from 
https://download.gnome.org/sources/libxml2/2.12/libxml2-2.12.7.tar.xz

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

diff --git a/download.lst b/download.lst
index aa98bee9730b..5acd40480231 100644
--- a/download.lst
+++ b/download.lst
@@ -424,8 +424,8 @@ XMLSEC_TARBALL := xmlsec1-1.3.4.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBXML_SHA256SUM := 
889c593a881a3db5fdd96cc9318c87df34eb648edfc458272ad46fd607353fbb
-LIBXML_VERSION_MICRO := 6
+LIBXML_SHA256SUM := 
24ae78ff1363a973e6d8beba941a7945da2ac056e19b53956aeb6927fd6cfb56
+LIBXML_VERSION_MICRO := 7
 LIBXML_TARBALL := libxml2-2.12.$(LIBXML_VERSION_MICRO).tar.xz
 # three static lines
 # so that git cherry-pick


core.git: download.lst external/libmwaw

2024-05-10 Thread Xisco Fauli (via logerrit)
 download.lst |4 ++--
 external/libmwaw/Library_mwaw.mk |3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 16357c68bdb2fb9c1b7eb77fdbcb50c41948c6db
Author: Xisco Fauli 
AuthorDate: Fri May 10 14:28:41 2024 +0200
Commit: Xisco Fauli 
CommitDate: Fri May 10 21:52:28 2024 +0200

libmwaw: Upgrade to 0.3.22

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

diff --git a/download.lst b/download.lst
index c8146984bbf3..aa98bee9730b 100644
--- a/download.lst
+++ b/download.lst
@@ -466,8 +466,8 @@ MSPUB_TARBALL := libmspub-0.1.4.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-MWAW_SHA256SUM := 
e8750123a78d61b943cef78b7736c8a7f20bb0a649aa112402124fba794fc21c
-MWAW_VERSION_MICRO := 21
+MWAW_SHA256SUM := 
a1a39ffcea3ff2a7a7aae0c23877ddf4918b554bf82b0de5d7ce8e7f61ea8e32
+MWAW_VERSION_MICRO := 22
 MWAW_TARBALL := libmwaw-0.3.$(MWAW_VERSION_MICRO).tar.xz
 # three static lines
 # so that git cherry-pick
diff --git a/external/libmwaw/Library_mwaw.mk b/external/libmwaw/Library_mwaw.mk
index 30e71443f5a0..2b7c2286fa51 100644
--- a/external/libmwaw/Library_mwaw.mk
+++ b/external/libmwaw/Library_mwaw.mk
@@ -201,9 +201,12 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,mwaw,\
UnpackedTarball/libmwaw/src/lib/RagTimeSpreadsheet \
UnpackedTarball/libmwaw/src/lib/RagTimeStruct \
UnpackedTarball/libmwaw/src/lib/RagTimeText \
+   UnpackedTarball/libmwaw/src/lib/ReadySetGoGraph \
UnpackedTarball/libmwaw/src/lib/ReadySetGoParser \
+   UnpackedTarball/libmwaw/src/lib/ReadySetGoStyleManager \
UnpackedTarball/libmwaw/src/lib/ScoopParser \
UnpackedTarball/libmwaw/src/lib/ScriptWriterParser \
+   UnpackedTarball/libmwaw/src/lib/SpringBoardParser \
UnpackedTarball/libmwaw/src/lib/StudentWritingCParser \
UnpackedTarball/libmwaw/src/lib/StyleParser \
UnpackedTarball/libmwaw/src/lib/SuperPaintParser \


core.git: download.lst external/librevenge

2024-05-10 Thread Xisco Fauli (via logerrit)
 download.lst|4 ++--
 external/librevenge/C2039-unique-shared_ptr.patch.0 |   11 +++
 external/librevenge/UnpackedTarball_librevenge.mk   |1 +
 external/librevenge/tdf63130-improve-perf.patch.0   |   16 
 4 files changed, 22 insertions(+), 10 deletions(-)

New commits:
commit 49a0203e7aa3a98bbed4412ab4364614505f88eb
Author: Xisco Fauli 
AuthorDate: Thu May 9 18:02:59 2024 +0200
Commit: Xisco Fauli 
CommitDate: Fri May 10 15:27:16 2024 +0200

librevenge: upgrade to 0.0.5

* Add C2039-unique-shared_ptr.patch.0 to fix


C:/cygwin/home/tdf/lode/jenkins/workspace/gerrit_windows/workdir/UnpackedTarball/librevenge/src/lib/RVNGBinaryData.cpp(96):
 error C2039: 'unique': is not a member of 
'std::shared_ptr'

C:/cygwin/home/tdf/lode/jenkins/workspace/gerrit_windows/workdir/UnpackedTarball/librevenge/src/lib/RVNGBinaryData.cpp(86):
 note: see declaration of 
'std::shared_ptr'
make[1]: *** 
[C:/cygwin/home/tdf/lode/jenkins/workspace/gerrit_windows/solenv/gbuild/LinkTarget.mk:398:
 
C:/cygwin/home/tdf/lode/jenkins/workspace/gerrit_windows/workdir/GenCxxObject/UnpackedTarball/librevenge/src/lib/RVNGBinaryData.o]
 Error 2

on Windows

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

diff --git a/download.lst b/download.lst
index a7874c271ab2..c8146984bbf3 100644
--- a/download.lst
+++ b/download.lst
@@ -580,8 +580,8 @@ REDLAND_TARBALL := 
e5be03eda13ef68aabab6e42aa67715e-redland-1.0.17.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-REVENGE_SHA256SUM := 
c51601cd08320b75702812c64aae0653409164da7825fd0f451ac2c5dbe77cbf
-REVENGE_VERSION_MICRO := 4
+REVENGE_SHA256SUM := 
5892ca6796f7a2a93d580832e907e849b19d980b40d326a283b18877ab6de0c5
+REVENGE_VERSION_MICRO := 5
 REVENGE_TARBALL := librevenge-0.0.$(REVENGE_VERSION_MICRO).tar.bz2
 # three static lines
 # so that git cherry-pick
diff --git a/external/librevenge/C2039-unique-shared_ptr.patch.0 
b/external/librevenge/C2039-unique-shared_ptr.patch.0
new file mode 100644
index ..0dcec5058e89
--- /dev/null
+++ b/external/librevenge/C2039-unique-shared_ptr.patch.0
@@ -0,0 +1,11 @@
+--- src/lib/RVNGBinaryData.cpp 2024-05-10 13:20:09.278288686 +0200
 src/lib/RVNGBinaryData.cpp 2024-05-10 13:23:14.365139906 +0200
+@@ -93,7 +93,7 @@
+ 
+ void RVNGBinaryDataImpl::makeUnique()
+ {
+-  if (!m_ptr.unique())
++  if (!(m_ptr.use_count() == 1))
+   {
+   std::shared_ptr ptr(new DataImpl());
+   ptr->m_buf = m_ptr->m_buf;
diff --git a/external/librevenge/UnpackedTarball_librevenge.mk 
b/external/librevenge/UnpackedTarball_librevenge.mk
index 5fcc2e33b060..316e961bd1ba 100644
--- a/external/librevenge/UnpackedTarball_librevenge.mk
+++ b/external/librevenge/UnpackedTarball_librevenge.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,librevenge,0))
 $(eval $(call gb_UnpackedTarball_add_patches,librevenge, \
 external/librevenge/rpath.patch \
 external/librevenge/tdf63130-improve-perf.patch.0 \
+external/librevenge/C2039-unique-shared_ptr.patch.0 \
 ))
 
 ifneq ($(OS),MACOSX)
diff --git a/external/librevenge/tdf63130-improve-perf.patch.0 
b/external/librevenge/tdf63130-improve-perf.patch.0
index 02a8a6e1f94b..f8b972217c76 100644
--- a/external/librevenge/tdf63130-improve-perf.patch.0
+++ b/external/librevenge/tdf63130-improve-perf.patch.0
@@ -18,7 +18,7 @@
/** Create a new string from  s as escaped XML.
 --- src/lib/RVNGBinaryData.cpp 2023-05-17 15:48:15.373159469 +0200
 +++ src/lib/RVNGBinaryData.cpp 2023-05-17 15:49:00.773411873 +0200
-@@ -67,9 +67,9 @@
+@@ -68,9 +68,9 @@
boost::archive::iterators::transform_width::const_iterator, 6, 8 > > base64_encoder;
  
// Encode the buffer and create a string
@@ -30,14 +30,14 @@
  
result.append(numPadding, '=');  // add '=' for each padded character
  }
-@@ -150,10 +150,10 @@
+@@ -153,10 +153,10 @@
  {
m_binaryDataImpl->makeUnique();
  
 -  unsigned long previousSize = m_binaryDataImpl->m_ptr->m_buf.size();
 -  m_binaryDataImpl->m_ptr->m_buf.reserve(previousSize + 
data.m_binaryDataImpl->m_ptr->m_buf.size());
--  for (unsigned long i = 0; i < 
data.m_binaryDataImpl->m_ptr->m_buf.size(); i++)
--  
m_binaryDataImpl->m_ptr->m_buf.push_back(data.m_binaryDataImpl->m_ptr->m_buf[i]);
+-  const auto  = data.m_binaryDataImpl->m_ptr->m_buf;
+-  std::copy(src.begin(), src.end(), 
std::back_inserter(m_binaryDataImpl->m_ptr->m_buf));
 +  m_binaryDataImpl->m_ptr->m_buf.insert(
 +  m_binaryDataImpl->m_ptr->m_buf.end(),
 +  data.m_binaryDataImpl->m_ptr->m_buf.begin(),
@@ -45,7 +45,7 @@
  }
  
  void RVNGBinaryData::appendBase64Data(const RVNGString )
-@@ -231,8 +231,9 @@
+@@ -234,8 +234,9 @@
  const 

core.git: Branch 'feature/cib_contract49c' - sw/qa

2024-05-10 Thread Xisco Fauli (via logerrit)
 sw/qa/extras/ooxmlexport/data/tdf156484.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport13.cxx   |   14 ++
 2 files changed, 14 insertions(+)

New commits:
commit decde4da4f4ab3a9bdc565ebc1e11c145ec4295a
Author: Xisco Fauli 
AuthorDate: Fri May 10 12:33:40 2024 +0200
Commit: Thorsten Behrens 
CommitDate: Fri May 10 14:58:58 2024 +0200

tdf#156484: sw_ooxmlexport13: Add unittest

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

diff --git a/sw/qa/extras/ooxmlexport/data/tdf156484.docx 
b/sw/qa/extras/ooxmlexport/data/tdf156484.docx
new file mode 100644
index ..73a61738f681
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf156484.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
index c7c670fe30ad..1f41e35f6877 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
@@ -709,6 +709,20 @@ DECLARE_OOXMLEXPORT_TEST(testTdf119201, "tdf119201.docx")
 CPPUNIT_ASSERT_MESSAGE("Third shape should be printable.", 
getProperty(xShape, "Printable"));
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf156484, "tdf156484.docx")
+{
+auto xShape(getShape(1));
+// Without the fix in place, this test would have failed here
+CPPUNIT_ASSERT_MESSAGE("First shape should not be visible.", 
!getProperty(xShape, "Visible"));
+CPPUNIT_ASSERT_MESSAGE("First shape should not be printable.", 
!getProperty(xShape, "Printable"));
+xShape = getShape(2);
+CPPUNIT_ASSERT_MESSAGE("Second shape should not be visible.", 
!getProperty(xShape, "Visible"));
+CPPUNIT_ASSERT_MESSAGE("Second shape should not be printable.", 
!getProperty(xShape, "Printable"));
+xShape = getShape(3);
+CPPUNIT_ASSERT_MESSAGE("Third shape should not be visible.", 
!getProperty(xShape, "Visible"));
+CPPUNIT_ASSERT_MESSAGE("Third shape should not be printable.", 
!getProperty(xShape, "Printable"));
+}
+
 DECLARE_OOXMLEXPORT_TEST(testTdf124594, "tdf124594.docx")
 {
 xmlDocUniquePtr pDump = parseLayoutDump();


core.git: sw/qa

2024-05-10 Thread Xisco Fauli (via logerrit)
 sw/qa/extras/ooxmlexport/data/tdf156484.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport13.cxx   |   14 ++
 2 files changed, 14 insertions(+)

New commits:
commit b27a39e26bdb1178c6d6a3f6880b9d40a1f9b1ab
Author: Xisco Fauli 
AuthorDate: Fri May 10 12:33:40 2024 +0200
Commit: Xisco Fauli 
CommitDate: Fri May 10 14:08:41 2024 +0200

tdf#156484: sw_ooxmlexport13: Add unittest

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

diff --git a/sw/qa/extras/ooxmlexport/data/tdf156484.docx 
b/sw/qa/extras/ooxmlexport/data/tdf156484.docx
new file mode 100644
index ..73a61738f681
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf156484.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
index 9f0420354e9b..281981e9a51a 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
@@ -711,6 +711,20 @@ DECLARE_OOXMLEXPORT_TEST(testTdf119201, "tdf119201.docx")
 CPPUNIT_ASSERT_MESSAGE("Third shape should be printable.", 
getProperty(xShape, "Printable"));
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf156484, "tdf156484.docx")
+{
+auto xShape(getShape(1));
+// Without the fix in place, this test would have failed here
+CPPUNIT_ASSERT_MESSAGE("First shape should not be visible.", 
!getProperty(xShape, "Visible"));
+CPPUNIT_ASSERT_MESSAGE("First shape should not be printable.", 
!getProperty(xShape, "Printable"));
+xShape = getShape(2);
+CPPUNIT_ASSERT_MESSAGE("Second shape should not be visible.", 
!getProperty(xShape, "Visible"));
+CPPUNIT_ASSERT_MESSAGE("Second shape should not be printable.", 
!getProperty(xShape, "Printable"));
+xShape = getShape(3);
+CPPUNIT_ASSERT_MESSAGE("Third shape should not be visible.", 
!getProperty(xShape, "Visible"));
+CPPUNIT_ASSERT_MESSAGE("Third shape should not be printable.", 
!getProperty(xShape, "Printable"));
+}
+
 DECLARE_OOXMLEXPORT_TEST(testTdf124594, "tdf124594.docx")
 {
 xmlDocUniquePtr pDump = parseLayoutDump();


core.git: sw/qa

2024-05-09 Thread Xisco Fauli (via logerrit)
 sw/qa/extras/htmlimport/data/tdf154581.html |8 
 sw/qa/extras/htmlimport/htmlimport.cxx  |   15 +++
 2 files changed, 23 insertions(+)

New commits:
commit 0479f870e05d5d231d2d57aaeedff11544bd370c
Author: Xisco Fauli 
AuthorDate: Thu May 9 11:27:03 2024 +0200
Commit: Xisco Fauli 
CommitDate: Thu May 9 12:39:51 2024 +0200

tdf#154581 tdf#157411 tdf#158549: sw_htmlimport: Add unittest

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

diff --git a/sw/qa/extras/htmlimport/data/tdf154581.html 
b/sw/qa/extras/htmlimport/data/tdf154581.html
new file mode 100644
index ..b82947bc0eed
--- /dev/null
+++ b/sw/qa/extras/htmlimport/data/tdf154581.html
@@ -0,0 +1,8 @@
+http://www.w3.org/TR/1998/REC-html40-19980424/loose.dtd;>
+
+
+Bold
+underline
+italic
+
+
diff --git a/sw/qa/extras/htmlimport/htmlimport.cxx 
b/sw/qa/extras/htmlimport/htmlimport.cxx
index e0859b872f91..e7880c3427e9 100644
--- a/sw/qa/extras/htmlimport/htmlimport.cxx
+++ b/sw/qa/extras/htmlimport/htmlimport.cxx
@@ -9,6 +9,9 @@
 
 #include 
 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -594,6 +597,18 @@ CPPUNIT_TEST_FIXTURE(HtmlImportTest, testRGBAColor)
 CPPUNIT_ASSERT_EQUAL(nBackColor, getProperty(xRun, 
"CharBackColor"));
 }
 
+CPPUNIT_TEST_FIXTURE(HtmlImportTest, testTdf154581)
+{
+createSwWebDoc("tdf154581.html");
+
+// Without the fix in place, this test would have failed with
+// - Expected: 150
+// - Actual  : 100
+CPPUNIT_ASSERT_EQUAL(awt::FontWeight::BOLD, 
getProperty(getRun(getParagraph(1), 1), "CharWeight"));
+CPPUNIT_ASSERT_EQUAL(sal_Int16(awt::FontUnderline::SINGLE), 
getProperty(getRun(getParagraph(2), 1), "CharUnderline"));
+CPPUNIT_ASSERT_EQUAL(awt::FontSlant_ITALIC, 
getProperty(getRun(getParagraph(3), 1), "CharPosture"));
+}
+
 CPPUNIT_TEST_FIXTURE(HtmlImportTest, testTdf153341)
 {
 createSwWebDoc("tdf153341.html");


core.git: Branch 'libreoffice-7-6-7' - dictionaries

2024-05-07 Thread Xisco Fauli (via logerrit)
 dictionaries |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7b1944c9141fb26d519076f680b0837d89099a64
Author: Xisco Fauli 
AuthorDate: Tue May 7 18:28:12 2024 +0200
Commit: Gerrit Code Review 
CommitDate: Tue May 7 18:28:12 2024 +0200

Update git submodules

* Update dictionaries from branch 'libreoffice-7-6-7'
  to c2812ca5c0d0b6eddf451b98186691c7ab75ddb2
  - upgrade Ukrainian dictionaries to 6.4.4

Change-Id: Idf246940bdf58844212420975ab52c19b08327ec
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/166872
Tested-by: Xisco Fauli 
Reviewed-by: Xisco Fauli 
Reviewed-by: Andriy Rysin 
(cherry picked from commit 0ca7301c3c00d6e7936fd912ba775d0008f7fee4)
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/166907
Tested-by: Christian Lohmaier 
Reviewed-by: Christian Lohmaier 
(cherry picked from commit 0c5d6db9f4d3e465547e3a177360662e0f475d62)
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/166909
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/dictionaries b/dictionaries
index f747c9370dcb..c2812ca5c0d0 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit f747c9370dcb6991d216368f598504208ac151b0
+Subproject commit c2812ca5c0d0b6eddf451b98186691c7ab75ddb2


dictionaries.git: Branch 'libreoffice-7-6-7' - uk_UA/description.xml uk_UA/uk_UA.aff uk_UA/uk_UA.dic

2024-05-07 Thread Xisco Fauli (via logerrit)
 uk_UA/description.xml |2 
 uk_UA/uk_UA.aff   | 2459 
 uk_UA/uk_UA.dic   |142223 
+-
 3 files changed, 74844 insertions(+), 69840 deletions(-)

New commits:
commit c2812ca5c0d0b6eddf451b98186691c7ab75ddb2
Author: Xisco Fauli 
AuthorDate: Mon Apr 29 18:14:57 2024 +0200
Commit: Christian Lohmaier 
CommitDate: Tue May 7 18:28:12 2024 +0200

upgrade Ukrainian dictionaries to 6.4.4

Change-Id: Idf246940bdf58844212420975ab52c19b08327ec
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/166872
Tested-by: Xisco Fauli 
Reviewed-by: Xisco Fauli 
Reviewed-by: Andriy Rysin 
(cherry picked from commit 0ca7301c3c00d6e7936fd912ba775d0008f7fee4)
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/166907
Tested-by: Christian Lohmaier 
Reviewed-by: Christian Lohmaier 
(cherry picked from commit 0c5d6db9f4d3e465547e3a177360662e0f475d62)
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/166909
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/uk_UA/description.xml b/uk_UA/description.xml
index 4941499..f221da9 100644
--- a/uk_UA/description.xml
+++ b/uk_UA/description.xml
@@ -1,6 +1,6 @@
 
 http://openoffice.org/extensions/description/2006; 
xmlns:d="http://openoffice.org/extensions/description/2006;  
xmlns:xlink="http://www.w3.org/1999/xlink;>
-
+
 
 
 Ukrainian spelling dictionary, hyphenation rules, 
and thesaurus
diff --git a/uk_UA/uk_UA.aff b/uk_UA/uk_UA.aff
index 3faea89..2343c2a 100644
--- a/uk_UA/uk_UA.aff
+++ b/uk_UA/uk_UA.aff
@@ -287,12 +287,12 @@ SFX ( ін ьонах лін
 SFX ( ір ьорах лір
 SFX ( іт ьотах літ
 SFX ) Y 6
+SFX ) сти дучи [аея]сти
 SFX ) атися учись жатися
 SFX ) атися учися жатися ###
-SFX ) стися дучись ястися
-SFX ) стися дучися ястися ###
 SFX ) ати учи жати
-SFX ) сти дучи ясти
+SFX ) стися дучись [аея]стися
+SFX ) стися дучися [аея]стися ###
 SFX * Y 3
 SFX * ік оці ік
 SFX * іг озі іг
@@ -326,126 +326,126 @@ SFX - ь ей ь
 SFX - ь ям ь
 SFX - ь ями ь
 SFX - ь ях ь
-SFX . Y 5
-SFX . е а ще
-SFX . е 0 ще
-SFX . е ам ще
-SFX . е ами ще
-SFX . е ах ще
-SFX 0 Y 113
-SFX 0 ій ою ій
-SFX 0 ій оєві ій
-SFX 0 ій оєм ій
-SFX 0 ій ої ій
-SFX 0 іб обі .іб
-SFX 0 ів ові .ів
-SFX 0 ід оді .ід
-SFX 0 іж ожі .іж
-SFX 0 із озі .із
-SFX 0 ім омі .ім
-SFX 0 ін оні .ін
-SFX 0 іп опі .іп
-SFX 0 ір орі .ір
-SFX 0 іс осі .іс
-SFX 0 іт оті .іт
-SFX 0 іш оші .іш
-SFX 0 ізд озді ізд
-SFX 0 ізт озті ізт
-SFX 0 ірд орді ірд
-SFX 0 ірт орті ірт
-SFX 0 ісд осді ісд
-SFX 0 іст ості іст
-SFX 0 ізд озду ізд
-SFX 0 ізк озку ізк
-SFX 0 ізт озту ізт
-SFX 0 ірд орду ірд
-SFX 0 ірк орку ірк
-SFX 0 ірт орту ірт
-SFX 0 ісд осду ісд
-SFX 0 іск оску іск
-SFX 0 іст осту іст
-SFX 0 ізд оздові ізд
-SFX 0 ізк озкові ізк
-SFX 0 ізт озтові ізт
-SFX 0 ірд ордові ірд
-SFX 0 ірк оркові ірк
-SFX 0 ірт ортові ірт
-SFX 0 ісд осдові ісд
-SFX 0 іск оскові іск
-SFX 0 іст остові іст
-SFX 0 ізд оздом ізд
-SFX 0 ізк озком ізк
-SFX 0 ізт озтом ізт
-SFX 0 ірд ордом ірд
-SFX 0 ірк орком ірк
-SFX 0 ірт ортом ірт
-SFX 0 ісд осдом ісд
-SFX 0 іск оском іск
-SFX 0 іст остом іст
-SFX 0 іб обові іб
-SFX 0 ід одові ід
-SFX 0 іг огові іг
-SFX 0 із озові із
-SFX 0 ік окові ік
-SFX 0 іл олові іл
-SFX 0 ім омові ім
-SFX 0 ін онові ін
-SFX 0 іп опові іп
-SFX 0 ір орові ір
-SFX 0 іс осові іс
-SFX 0 іт отові іт
-SFX 0 ік оці потік
-SFX 0 іж ожу іж
-SFX 0 іш ошу іш
-SFX 0 іж ожем іж
-SFX 0 іш ошем іш
-SFX 0 іж ожеві іж
-SFX 0 іш ошеві іш
-SFX 0 інь оню інь
-SFX 0 інь оневі інь
-SFX 0 інь онем інь
-SFX 0 інь оні інь
-SFX 0 іль олю іль
-SFX 0 іль олеві іль
-SFX 0 іль олем іль
-SFX 0 іль олі іль
-SFX 0 іб обу іб
-SFX 0 ів ову ів
-SFX 0 ід оду ід
-SFX 0 іг огу іг
-SFX 0 із озу із
-SFX 0 ік оку ік
-SFX 0 іл олу іл
-SFX 0 ім ому ім
-SFX 0 ін ону ін
-SFX 0 іп опу іп
-SFX 0 ір ору ір
-SFX 0 іс осу іс
-SFX 0 іт оту іт
-SFX 0 іч очу іч
-SFX 0 іб обом іб
-SFX 0 ів овом ів
-SFX 0 ід одом ід
-SFX 0 іг огом іг
-SFX 0 із озом із
-SFX 0 ік оком ік
-SFX 0 іл олом іл
-SFX 0 ім омом ім
-SFX 0 ін оном ін
-SFX 0 іп опом іп
-SFX 0 ір ором ір
-SFX 0 іс осом іс
-SFX 0 іт отом іт
-SFX 0 іч очом іч
-SFX 0 ік оці стік
-SFX 0 івш овшу івш
-SFX 0 івш овшеві івш
-SFX 0 івш овшем івш
-SFX 0 івш овші івш
-SFX 0 ість остю ість
-SFX 0 ість остеві ість
-SFX 0 ість остем ість
-SFX 0 ість ості ість
+SFX . Y 113
+SFX . ій ою ій
+SFX . ій оєві ій
+SFX . ій оєм ій
+SFX . ій ої ій
+SFX . іб обі .іб
+SFX . ів ові .ів
+SFX . ід оді .ід
+SFX . іж ожі .іж
+SFX . із озі .із
+SFX . ім омі .ім
+SFX . ін оні .ін
+SFX . іп опі .іп
+SFX . ір орі .ір
+SFX . іс осі .іс
+SFX . іт оті .іт
+SFX . іш оші .іш
+SFX . ізд озді ізд
+SFX . ізт озті ізт
+SFX . ірд орді ірд
+SFX . ірт орті ірт
+SFX . ісд осді ісд
+SFX . іст ості іст
+SFX . ізд озду ізд
+SFX . ізк озку ізк
+SFX . ізт озту ізт
+SFX . ірд орду ірд
+SFX . ірк орку ірк
+SFX . ірт орту ірт
+SFX . ісд осду ісд
+SFX . іск оску іск
+SFX . іст осту іст
+SFX . ізд оздові ізд
+SFX . ізк озкові ізк
+SFX . 

core.git: download.lst

2024-05-07 Thread Xisco Fauli (via logerrit)
 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0c7c6ba98fba651c8ae4015dbbf450c23611667a
Author: Xisco Fauli 
AuthorDate: Tue May 7 16:16:33 2024 +0200
Commit: Xisco Fauli 
CommitDate: Tue May 7 18:11:11 2024 +0200

libatomic_ops: Upgrade to 7.8.2

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

diff --git a/download.lst b/download.lst
index e0f142b4d63d..a7874c271ab2 100644
--- a/download.lst
+++ b/download.lst
@@ -374,8 +374,8 @@ LIBASSUAN_TARBALL := libassuan-2.5.7.tar.bz2
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBATOMIC_OPS_SHA256SUM := 
15676e7674e11bda5a7e50a73f4d9e7d60452271b8acf6fd39a71fefdf89fa31
-LIBATOMIC_OPS_TARBALL := libatomic_ops-7.8.0.tar.gz
+LIBATOMIC_OPS_SHA256SUM := 
d305207fe207f2b3fb5cb4c019da12b44ce3fcbc593dfd5080d867b1a2419b51
+LIBATOMIC_OPS_TARBALL := libatomic_ops-7.8.2.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts


core.git: download.lst external/lxml

2024-05-07 Thread Xisco Fauli (via logerrit)
 download.lst   
 |4 
 
external/lxml/0001-Make-regexp-string-raw-to-correct-its-escape-sequenc.patch.1 
|   31 ---
 external/lxml/UnpackedTarball_lxml.mk  
 |3 
 external/lxml/Wincompatible-function-pointer-types.patch   
 |   83 --
 external/lxml/Wincompatible-pointer-types.patch
 |   65 ---
 5 files changed, 2 insertions(+), 184 deletions(-)

New commits:
commit 606623d0fc5321754d9a054881ae9cac94cd9f04
Author: Xisco Fauli 
AuthorDate: Tue May 7 14:07:14 2024 +0200
Commit: Xisco Fauli 
CommitDate: Tue May 7 15:38:36 2024 +0200

lxml: upgrade to 5.2.1

* 0001-Make-regexp-string-raw-to-correct-its-escape-sequenc.patch.1 got
  obsoleted with 
https://github.com/lxml/lxml/commit/9686dd9c7670d18acff6360c8444520273d5f1b2

* Wincompatible-function-pointer-types.patch and
Wincompatible-pointer-types.patch got obsoleted with
https://github.com/lxml/lxml/commit/6bdf4c321b92e002123b4c162c75524dbeb4d54d

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

diff --git a/download.lst b/download.lst
index 27ffbbb97306..e0f142b4d63d 100644
--- a/download.lst
+++ b/download.lst
@@ -441,8 +441,8 @@ LPSOLVE_TARBALL := 
26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LXML_SHA256SUM := 
2455cfaeb7ac70338b3257f41e21f0724f4b5b0c0e7702da67ee6c3640835b67
-LXML_TARBALL := lxml-4.9.2.tgz
+LXML_SHA256SUM := 
3f7765e69bbce0906a7c74d5fe46d2c7a7596147318dbc08e4a2431f3060e306
+LXML_TARBALL := lxml-5.2.1.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git 
a/external/lxml/0001-Make-regexp-string-raw-to-correct-its-escape-sequenc.patch.1
 
b/external/lxml/0001-Make-regexp-string-raw-to-correct-its-escape-sequenc.patch.1
deleted file mode 100644
index ce1ec383cc63..
--- 
a/external/lxml/0001-Make-regexp-string-raw-to-correct-its-escape-sequenc.patch.1
+++ /dev/null
@@ -1,31 +0,0 @@
-From 9686dd9c7670d18acff6360c8444520273d5f1b2 Mon Sep 17 00:00:00 2001
-From: Jakub Wilk 
-Date: Fri, 16 Jun 2023 09:24:21 +0200
-Subject: [PATCH] Make regexp string raw to correct its escape sequence usage
- (GH-371)
-
-Fixes:
-
-$ python3 -Wd setup.py
-setup.py:117: DeprecationWarning: invalid escape sequence \.
-...

- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index 709cbc68..7a3f46e5 100644
 a/setup.py
-+++ b/setup.py
-@@ -114,7 +114,7 @@ extra_options['packages'] = [
- 
- def setup_extra_options():
- is_interesting_package = re.compile('^(libxml|libxslt|libexslt)$').match
--is_interesting_header = re.compile('^(zconf|zlib|.*charset)\.h$').match
-+is_interesting_header = re.compile(r'^(zconf|zlib|.*charset)\.h$').match
- 
- def extract_files(directories, pattern='*'):
- def get_files(root, dir_path, files):
--- 
-2.39.2
-
diff --git a/external/lxml/UnpackedTarball_lxml.mk 
b/external/lxml/UnpackedTarball_lxml.mk
index 58905943c7ee..0216801cb1a8 100644
--- a/external/lxml/UnpackedTarball_lxml.mk
+++ b/external/lxml/UnpackedTarball_lxml.mk
@@ -14,10 +14,7 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,lxml,$(LXML_TARBALL)))
 $(eval $(call gb_UnpackedTarball_set_patchlevel,lxml,0))
 
 $(eval $(call gb_UnpackedTarball_add_patches,lxml, \
-   
external/lxml/0001-Make-regexp-string-raw-to-correct-its-escape-sequenc.patch.1 
\
external/lxml/replace-setuptools-with-distutils.patch.1 \
-   external/lxml/Wincompatible-function-pointer-types.patch \
-   external/lxml/Wincompatible-pointer-types.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/lxml/Wincompatible-function-pointer-types.patch 
b/external/lxml/Wincompatible-function-pointer-types.patch
deleted file mode 100644
index 644082fdc8bc..
--- a/external/lxml/Wincompatible-function-pointer-types.patch
+++ /dev/null
@@ -1,83 +0,0 @@
 src/lxml/etree.c
-+++ src/lxml/etree.c
-@@ -113118,7 +113118,7 @@
-  * self._orig_loader = _register_document_loader() if 
set_document_loader else NULL
-  * if self._validator is not None:
-  */
--  __pyx_v_self->_c_ctxt->sax->serror = 
__pyx_f_4lxml_5etree__receiveParserError;
-+  __pyx_v_self->_c_ctxt->sax->serror = 
(xmlStructuredErrorFunc)__pyx_f_4lxml_5etree__receiveParserError;
- 
-   /* "src/lxml/parser.pxi":587
-  * self._doc = None
-@@ -117606,7 +117606,7 @@
-  * sax.startElementNs = NULL
-  * sax.endElementNs = NULL
-  */
--__pyx_v_sax->serror = __pyx_f_4lxml_5etree__receiveParserError;
-+__pyx_v_sax->serror = 
(xmlStructuredErrorFunc)__pyx_f_4lxml_5etree__receiveParserError;
- 
- /* 

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

2024-05-06 Thread Xisco Fauli (via logerrit)
 svx/source/dialog/svxruler.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 96ec4e649ac9eb0528281e08f9a13e20545dd9f6
Author: Xisco Fauli 
AuthorDate: Thu Apr 25 15:52:29 2024 +0200
Commit: Michael Weghorn 
CommitDate: Tue May 7 07:46:11 2024 +0200

svx: Avoid divide by 0

See 
https://crashreport.libreoffice.org/stats/signature/SvxRuler::UpdateTabs()

Change-Id: Ie08c54d1a1b40bcc42da9f81c893f496fff433a8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166626
Tested-by: Jenkins
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 
(cherry picked from commit 90548039f09d4bc773bf6879a62d544adfa175db)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167214
Reviewed-by: Aron Budea 
Tested-by: Michael Weghorn 
Reviewed-by: Ilmari Lauhakangas 
Reviewed-by: Michael Weghorn 

diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index ffc34cd5bfb5..8c787b68706e 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -1032,7 +1032,7 @@ void SvxRuler::UpdateTabs()
 lCurrentDefTabDist = mxTabStopItem->GetDefaultDistance();
 tools::Long nDefTabDist = ConvertHPosPixel(lCurrentDefTabDist);
 
-const sal_uInt16 nDefTabBuf = lPosPixel > lRightIndent || lLastTab > 
lRightIndent
+const sal_uInt16 nDefTabBuf = lPosPixel > lRightIndent || lLastTab > 
lRightIndent || nDefTabDist == 0
 ? 0
 : static_cast( (lRightIndent - lPosPixel) / 
nDefTabDist );
 


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

2024-05-06 Thread Xisco Fauli (via logerrit)
 svx/source/dialog/svxruler.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 07c517f5ebaac271fddd03db3adf5d4887a6ad23
Author: Xisco Fauli 
AuthorDate: Thu Apr 25 15:52:29 2024 +0200
Commit: Aron Budea 
CommitDate: Tue May 7 03:44:18 2024 +0200

svx: Avoid divide by 0

See 
https://crashreport.libreoffice.org/stats/signature/SvxRuler::UpdateTabs()

Change-Id: Ie08c54d1a1b40bcc42da9f81c893f496fff433a8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166626
Tested-by: Jenkins
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 
(cherry picked from commit 90548039f09d4bc773bf6879a62d544adfa175db)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166675
Reviewed-by: Aron Budea 

diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index ffc34cd5bfb5..8c787b68706e 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -1032,7 +1032,7 @@ void SvxRuler::UpdateTabs()
 lCurrentDefTabDist = mxTabStopItem->GetDefaultDistance();
 tools::Long nDefTabDist = ConvertHPosPixel(lCurrentDefTabDist);
 
-const sal_uInt16 nDefTabBuf = lPosPixel > lRightIndent || lLastTab > 
lRightIndent
+const sal_uInt16 nDefTabBuf = lPosPixel > lRightIndent || lLastTab > 
lRightIndent || nDefTabDist == 0
 ? 0
 : static_cast( (lRightIndent - lPosPixel) / 
nDefTabDist );
 


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

2024-05-06 Thread Xisco Fauli (via logerrit)
 svx/source/dialog/svxruler.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 35c0afcf0a0428670e3e1998f222440b504ae0c8
Author: Xisco Fauli 
AuthorDate: Thu Apr 25 15:52:29 2024 +0200
Commit: Aron Budea 
CommitDate: Tue May 7 03:42:38 2024 +0200

svx: Avoid divide by 0

See 
https://crashreport.libreoffice.org/stats/signature/SvxRuler::UpdateTabs()

Change-Id: Ie08c54d1a1b40bcc42da9f81c893f496fff433a8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166626
Tested-by: Jenkins
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 
(cherry picked from commit 90548039f09d4bc773bf6879a62d544adfa175db)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166674
Reviewed-by: Aron Budea 

diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index 6323583fd271..17c4edaa930d 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -1033,7 +1033,7 @@ void SvxRuler::UpdateTabs()
 lCurrentDefTabDist = mxTabStopItem->GetDefaultDistance();
 tools::Long nDefTabDist = ConvertHPosPixel(lCurrentDefTabDist);
 
-const sal_uInt16 nDefTabBuf = lPosPixel > lRightIndent || lLastTab > 
lRightIndent
+const sal_uInt16 nDefTabBuf = lPosPixel > lRightIndent || lLastTab > 
lRightIndent || nDefTabDist == 0
 ? 0
 : static_cast( (lRightIndent - lPosPixel) / 
nDefTabDist );
 


core.git: svgio/inc svgio/qa svgio/source

2024-05-06 Thread Xisco Fauli (via logerrit)
 svgio/inc/svgstyleattributes.hxx  |7 +
 svgio/qa/cppunit/SvgImportTest.cxx|8 +
 svgio/qa/cppunit/data/contextFill.svg |8 +
 svgio/source/svgreader/svgstyleattributes.cxx |   36 --
 4 files changed, 57 insertions(+), 2 deletions(-)

New commits:
commit 3b0f96a0773f19f7d5bdb5725ff9667eb4809215
Author: Xisco Fauli 
AuthorDate: Mon May 6 17:15:59 2024 +0200
Commit: Xisco Fauli 
CommitDate: Mon May 6 22:02:01 2024 +0200

tdf#155651: Add support for "context-fill"

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

diff --git a/svgio/inc/svgstyleattributes.hxx b/svgio/inc/svgstyleattributes.hxx
index 61a3816e82cb..30cbab965644 100644
--- a/svgio/inc/svgstyleattributes.hxx
+++ b/svgio/inc/svgstyleattributes.hxx
@@ -247,6 +247,9 @@ namespace svgio::svgreader
 // #121221# Defines if evtl. an empty array *is* set
 boolmbStrokeDasharraySet : 1;
 
+// tdf#155651 Defines if 'context-fill' is used in fill
+boolmbContextFill : 1;
+
 // tdf#155651 Defines if 'context-stroke' is used in stroke
 boolmbContextStroke : 1;
 
@@ -254,6 +257,7 @@ namespace svgio::svgreader
 OUStringmaNodeFillURL;
 OUStringmaNodeStrokeURL;
 
+const basegfx::BColor*  maContextFill;
 const basegfx::BColor*  maContextStroke;
 
 /// internal helpers
@@ -332,6 +336,9 @@ namespace svgio::svgreader
 /// stroke content
 const basegfx::BColor* getStroke() const;
 
+/// context fill content
+const basegfx::BColor* getContextFill() const;
+
 /// context stroke content
 const basegfx::BColor* getContextStroke() const;
 
diff --git a/svgio/qa/cppunit/SvgImportTest.cxx 
b/svgio/qa/cppunit/SvgImportTest.cxx
index c12f5abaaf16..dc2aa1a6eaf4 100644
--- a/svgio/qa/cppunit/SvgImportTest.cxx
+++ b/svgio/qa/cppunit/SvgImportTest.cxx
@@ -646,6 +646,14 @@ CPPUNIT_TEST_FIXTURE(Test, testMarkerOrient)
 assertXPath(pDocument, "/primitive2D/transform/transform[2]"_ostr, 
"xy33"_ostr, "1");
 }
 
+CPPUNIT_TEST_FIXTURE(Test, testContextFill)
+{
+xmlDocUniquePtr pDocument = 
dumpAndParseSvg(u"/svgio/qa/cppunit/data/contextFill.svg");
+
+assertXPath(pDocument, 
"/primitive2D/transform/polypolygonstroke/line"_ostr, "color"_ostr, "#ff");
+assertXPath(pDocument, 
"/primitive2D/transform/transform/polypolygoncolor"_ostr, "color"_ostr, 
"#ff");
+}
+
 CPPUNIT_TEST_FIXTURE(Test, testContextStroke)
 {
 xmlDocUniquePtr pDocument = 
dumpAndParseSvg(u"/svgio/qa/cppunit/data/contextStroke.svg");
diff --git a/svgio/qa/cppunit/data/contextFill.svg 
b/svgio/qa/cppunit/data/contextFill.svg
new file mode 100644
index ..399d3c16b09e
--- /dev/null
+++ b/svgio/qa/cppunit/data/contextFill.svg
@@ -0,0 +1,8 @@
+http://www.w3.org/2000/svg;>
+
+
+   
+
+
+
+
diff --git a/svgio/source/svgreader/svgstyleattributes.cxx 
b/svgio/source/svgreader/svgstyleattributes.cxx
index f694d8b1cfd9..cd6a705114a9 100644
--- a/svgio/source/svgreader/svgstyleattributes.cxx
+++ b/svgio/source/svgreader/svgstyleattributes.cxx
@@ -823,6 +823,11 @@ namespace svgio::svgreader
 rMarkerTransform.identity();
 rClipRange.reset();
 
+// Set the current fill to the marker before calling 
getMarkerPrimitives,
+// which calls decomposeSvgNode to decompose the children of the 
marker.
+// If any of the children uses 'fill="context-fill"', then it will 
use it
+
const_cast(rMarker.getSvgStyleAttributes())->maContextFill 
= getFill();
+
 // Set the current stroke to the marker before calling 
getMarkerPrimitives,
 // which calls decomposeSvgNode to decompose the children of the 
marker.
 // If any of the children uses 'stroke="context-stroke"', then it 
will use it
@@ -1298,9 +1303,11 @@ namespace svgio::svgreader
 maBaselineShift(BaselineShift::Baseline),
 maBaselineShiftNumber(0),
 maDominantBaseline(DominantBaseline::Auto),
-maResolvingParent(33, 0),
+maResolvingParent(34, 0),
 mbStrokeDasharraySet(false),
+mbContextFill(false),
 mbContextStroke(false),
+maContextFill(nullptr),
 maContextStroke(nullptr)
 {
 }
@@ -1321,7 +1328,11 @@ namespace svgio::svgreader
 OUString aURL;
 SvgNumber aOpacity;
 
-if(readSvgPaint(aContent, aSvgPaint, aURL, aOpacity))
+if(o3tl::equalsIgnoreAsciiCase(o3tl::trim(aContent), 
u"context-fill"))
+   

core.git: Branch 'libreoffice-24-2' - dictionaries

2024-05-06 Thread Xisco Fauli (via logerrit)
 dictionaries |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2165fa986408a2ee53c56ee18936f69ed97d40e3
Author: Xisco Fauli 
AuthorDate: Mon May 6 18:36:21 2024 +0200
Commit: Gerrit Code Review 
CommitDate: Mon May 6 18:36:21 2024 +0200

Update git submodules

* Update dictionaries from branch 'libreoffice-24-2'
  to 43715e23e6ff1f153689950db0ea1273b6a7bf3f
  - upgrade Ukrainian dictionaries to 6.4.4

Change-Id: Idf246940bdf58844212420975ab52c19b08327ec
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/166872
Tested-by: Xisco Fauli 
Reviewed-by: Xisco Fauli 
Reviewed-by: Andriy Rysin 
(cherry picked from commit 0ca7301c3c00d6e7936fd912ba775d0008f7fee4)
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/166906
Tested-by: Adolfo Jayme Barrientos 
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/dictionaries b/dictionaries
index a62f9b3e6b2d..43715e23e6ff 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit a62f9b3e6b2de1366d826a5bacf19ae63e527ead
+Subproject commit 43715e23e6ff1f153689950db0ea1273b6a7bf3f


dictionaries.git: Branch 'libreoffice-24-2' - uk_UA/description.xml uk_UA/uk_UA.aff uk_UA/uk_UA.dic

2024-05-06 Thread Xisco Fauli (via logerrit)
 uk_UA/description.xml |2 
 uk_UA/uk_UA.aff   | 2459 
 uk_UA/uk_UA.dic   |142223 
+-
 3 files changed, 74844 insertions(+), 69840 deletions(-)

New commits:
commit 43715e23e6ff1f153689950db0ea1273b6a7bf3f
Author: Xisco Fauli 
AuthorDate: Mon Apr 29 18:14:57 2024 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Mon May 6 18:36:21 2024 +0200

upgrade Ukrainian dictionaries to 6.4.4

Change-Id: Idf246940bdf58844212420975ab52c19b08327ec
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/166872
Tested-by: Xisco Fauli 
Reviewed-by: Xisco Fauli 
Reviewed-by: Andriy Rysin 
(cherry picked from commit 0ca7301c3c00d6e7936fd912ba775d0008f7fee4)
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/166906
Tested-by: Adolfo Jayme Barrientos 
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/uk_UA/description.xml b/uk_UA/description.xml
index 4941499..f221da9 100644
--- a/uk_UA/description.xml
+++ b/uk_UA/description.xml
@@ -1,6 +1,6 @@
 
 http://openoffice.org/extensions/description/2006; 
xmlns:d="http://openoffice.org/extensions/description/2006;  
xmlns:xlink="http://www.w3.org/1999/xlink;>
-
+
 
 
 Ukrainian spelling dictionary, hyphenation rules, 
and thesaurus
diff --git a/uk_UA/uk_UA.aff b/uk_UA/uk_UA.aff
index 3faea89..2343c2a 100644
--- a/uk_UA/uk_UA.aff
+++ b/uk_UA/uk_UA.aff
@@ -287,12 +287,12 @@ SFX ( ін ьонах лін
 SFX ( ір ьорах лір
 SFX ( іт ьотах літ
 SFX ) Y 6
+SFX ) сти дучи [аея]сти
 SFX ) атися учись жатися
 SFX ) атися учися жатися ###
-SFX ) стися дучись ястися
-SFX ) стися дучися ястися ###
 SFX ) ати учи жати
-SFX ) сти дучи ясти
+SFX ) стися дучись [аея]стися
+SFX ) стися дучися [аея]стися ###
 SFX * Y 3
 SFX * ік оці ік
 SFX * іг озі іг
@@ -326,126 +326,126 @@ SFX - ь ей ь
 SFX - ь ям ь
 SFX - ь ями ь
 SFX - ь ях ь
-SFX . Y 5
-SFX . е а ще
-SFX . е 0 ще
-SFX . е ам ще
-SFX . е ами ще
-SFX . е ах ще
-SFX 0 Y 113
-SFX 0 ій ою ій
-SFX 0 ій оєві ій
-SFX 0 ій оєм ій
-SFX 0 ій ої ій
-SFX 0 іб обі .іб
-SFX 0 ів ові .ів
-SFX 0 ід оді .ід
-SFX 0 іж ожі .іж
-SFX 0 із озі .із
-SFX 0 ім омі .ім
-SFX 0 ін оні .ін
-SFX 0 іп опі .іп
-SFX 0 ір орі .ір
-SFX 0 іс осі .іс
-SFX 0 іт оті .іт
-SFX 0 іш оші .іш
-SFX 0 ізд озді ізд
-SFX 0 ізт озті ізт
-SFX 0 ірд орді ірд
-SFX 0 ірт орті ірт
-SFX 0 ісд осді ісд
-SFX 0 іст ості іст
-SFX 0 ізд озду ізд
-SFX 0 ізк озку ізк
-SFX 0 ізт озту ізт
-SFX 0 ірд орду ірд
-SFX 0 ірк орку ірк
-SFX 0 ірт орту ірт
-SFX 0 ісд осду ісд
-SFX 0 іск оску іск
-SFX 0 іст осту іст
-SFX 0 ізд оздові ізд
-SFX 0 ізк озкові ізк
-SFX 0 ізт озтові ізт
-SFX 0 ірд ордові ірд
-SFX 0 ірк оркові ірк
-SFX 0 ірт ортові ірт
-SFX 0 ісд осдові ісд
-SFX 0 іск оскові іск
-SFX 0 іст остові іст
-SFX 0 ізд оздом ізд
-SFX 0 ізк озком ізк
-SFX 0 ізт озтом ізт
-SFX 0 ірд ордом ірд
-SFX 0 ірк орком ірк
-SFX 0 ірт ортом ірт
-SFX 0 ісд осдом ісд
-SFX 0 іск оском іск
-SFX 0 іст остом іст
-SFX 0 іб обові іб
-SFX 0 ід одові ід
-SFX 0 іг огові іг
-SFX 0 із озові із
-SFX 0 ік окові ік
-SFX 0 іл олові іл
-SFX 0 ім омові ім
-SFX 0 ін онові ін
-SFX 0 іп опові іп
-SFX 0 ір орові ір
-SFX 0 іс осові іс
-SFX 0 іт отові іт
-SFX 0 ік оці потік
-SFX 0 іж ожу іж
-SFX 0 іш ошу іш
-SFX 0 іж ожем іж
-SFX 0 іш ошем іш
-SFX 0 іж ожеві іж
-SFX 0 іш ошеві іш
-SFX 0 інь оню інь
-SFX 0 інь оневі інь
-SFX 0 інь онем інь
-SFX 0 інь оні інь
-SFX 0 іль олю іль
-SFX 0 іль олеві іль
-SFX 0 іль олем іль
-SFX 0 іль олі іль
-SFX 0 іб обу іб
-SFX 0 ів ову ів
-SFX 0 ід оду ід
-SFX 0 іг огу іг
-SFX 0 із озу із
-SFX 0 ік оку ік
-SFX 0 іл олу іл
-SFX 0 ім ому ім
-SFX 0 ін ону ін
-SFX 0 іп опу іп
-SFX 0 ір ору ір
-SFX 0 іс осу іс
-SFX 0 іт оту іт
-SFX 0 іч очу іч
-SFX 0 іб обом іб
-SFX 0 ів овом ів
-SFX 0 ід одом ід
-SFX 0 іг огом іг
-SFX 0 із озом із
-SFX 0 ік оком ік
-SFX 0 іл олом іл
-SFX 0 ім омом ім
-SFX 0 ін оном ін
-SFX 0 іп опом іп
-SFX 0 ір ором ір
-SFX 0 іс осом іс
-SFX 0 іт отом іт
-SFX 0 іч очом іч
-SFX 0 ік оці стік
-SFX 0 івш овшу івш
-SFX 0 івш овшеві івш
-SFX 0 івш овшем івш
-SFX 0 івш овші івш
-SFX 0 ість остю ість
-SFX 0 ість остеві ість
-SFX 0 ість остем ість
-SFX 0 ість ості ість
+SFX . Y 113
+SFX . ій ою ій
+SFX . ій оєві ій
+SFX . ій оєм ій
+SFX . ій ої ій
+SFX . іб обі .іб
+SFX . ів ові .ів
+SFX . ід оді .ід
+SFX . іж ожі .іж
+SFX . із озі .із
+SFX . ім омі .ім
+SFX . ін оні .ін
+SFX . іп опі .іп
+SFX . ір орі .ір
+SFX . іс осі .іс
+SFX . іт оті .іт
+SFX . іш оші .іш
+SFX . ізд озді ізд
+SFX . ізт озті ізт
+SFX . ірд орді ірд
+SFX . ірт орті ірт
+SFX . ісд осді ісд
+SFX . іст ості іст
+SFX . ізд озду ізд
+SFX . ізк озку ізк
+SFX . ізт озту ізт
+SFX . ірд орду ірд
+SFX . ірк орку ірк
+SFX . ірт орту ірт
+SFX . ісд осду ісд
+SFX . іск оску іск
+SFX . іст осту іст
+SFX . ізд оздові ізд
+SFX . ізк озкові ізк
+SFX . ізт озтові ізт
+SFX . ірд ордові ірд
+SFX . ірк оркові ірк
+SFX . ірт ортові ірт
+SFX . ісд осдові ісд
+SFX . іск оскові іск
+SFX . іст остові іст
+SFX . ізд оздом ізд
+SFX . 

core.git: Branch 'libreoffice-24-2' - 2 commits - editeng/source sd/qa svgio/qa

2024-05-06 Thread Xisco Fauli (via logerrit)
 editeng/source/editeng/impedit3.cxx|2 -
 sd/qa/unit/data/odg/adjust-to-contour.fodg |   52 +
 sd/qa/unit/layout-tests.cxx|   48 ++
 svgio/qa/cppunit/SvgImportTest.cxx |   16 
 svgio/qa/cppunit/data/tdf160773.svg|5 ++
 5 files changed, 122 insertions(+), 1 deletion(-)

New commits:
commit b2dc48571714a84b1eeff127e86c07b29b579e43
Author: Xisco Fauli 
AuthorDate: Tue Apr 23 11:54:47 2024 +0200
Commit: Xisco Fauli 
CommitDate: Mon May 6 15:44:53 2024 +0200

tdf#159661, tdf#160773: svgio: Add unittest

Change-Id: I2d0b96f13e02ac81b97ea347889c76770c22a989
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166509
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 
Signed-off-by: Xisco Fauli 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167053

diff --git a/svgio/qa/cppunit/SvgImportTest.cxx 
b/svgio/qa/cppunit/SvgImportTest.cxx
index 407e8aa0c3bb..b4aa5250f5ec 100644
--- a/svgio/qa/cppunit/SvgImportTest.cxx
+++ b/svgio/qa/cppunit/SvgImportTest.cxx
@@ -1960,6 +1960,22 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf156837)
 assertXPath(pDocument, "/primitive2D/transform/textsimpleportion[2]"_ostr, 
"text"_ostr, "3");
 }
 
+CPPUNIT_TEST_FIXTURE(Test, testTdf160773)
+{
+xmlDocUniquePtr pDocument = 
dumpAndParseSvg(u"/svgio/qa/cppunit/data/tdf160773.svg");
+
+// tdf#160773 Check there is a rectangle
+assertXPath(pDocument, 
"/primitive2D/transform/mask/transform/polypolygoncolor"_ostr, "color"_ostr, 
"#ff");
+
+// tdf#159661 Check there is text in the right position
+assertXPath(pDocument, 
"/primitive2D/transform/mask/transform/textsimpleportion"_ostr, 1);
+assertXPath(pDocument, 
"/primitive2D/transform/mask/transform/textsimpleportion"_ostr, "x"_ostr, "0");
+assertXPath(pDocument, 
"/primitive2D/transform/mask/transform/textsimpleportion"_ostr, "y"_ostr, "0");
+assertXPath(pDocument, 
"/primitive2D/transform/mask/transform/textsimpleportion"_ostr, "height"_ostr, 
"0");
+assertXPath(pDocument, 
"/primitive2D/transform/mask/transform/textsimpleportion"_ostr, "width"_ostr, 
"0");
+assertXPath(pDocument, 
"/primitive2D/transform/mask/transform/textsimpleportion"_ostr, "text"_ostr, 
"Red");
+}
+
 CPPUNIT_TEST_FIXTURE(Test, testTdf156271)
 {
 Primitive2DSequence aSequence = 
parseSvg(u"/svgio/qa/cppunit/data/tdf156271.svg");
diff --git a/svgio/qa/cppunit/data/tdf160773.svg 
b/svgio/qa/cppunit/data/tdf160773.svg
new file mode 100644
index ..812c0824862c
--- /dev/null
+++ b/svgio/qa/cppunit/data/tdf160773.svg
@@ -0,0 +1,5 @@
+
+http://www.w3.org/2000/svg;>
+   Red
+   
+
commit 9f5664f4d34e8f04cc18dc252cad4b3b853db882
Author: Mike Kaganski 
AuthorDate: Fri May 3 14:14:26 2024 +0500
Commit: Xisco Fauli 
CommitDate: Mon May 6 15:44:40 2024 +0200

tdf#152906: use correct Y offset

GetEditCursor now returns the position relative to the line, not
to the whole text. In ImpEditEngine::CreateLines, its use wasn't
fixed, and so the Y position of all lines in the calculation was
the same, thus adjusting to the same contour's horizontal stripe.

Change-Id: I16362bab47f3064281eefb45a12834d836a8ada3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167042
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
Signed-off-by: Xisco Fauli 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167188

diff --git a/editeng/source/editeng/impedit3.cxx 
b/editeng/source/editeng/impedit3.cxx
index b24cc004011c..9817cf9441e3 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -866,7 +866,7 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara, 
sal_uInt32 nStartPosY )
 {
 GetTextRanger()->SetVertical( IsEffectivelyVertical() );
 
-tools::Long nTextY = nStartPosY + GetEditCursor( pParaPortion, 
pLine, pLine->GetStart(), GetCursorFlags::NONE ).Top();
+tools::Long nTextY = nCurrentPosY + GetEditCursor( pParaPortion, 
pLine, pLine->GetStart(), GetCursorFlags::NONE ).Top();
 if ( !bSameLineAgain )
 {
 SeekCursor( pNode, nTmpPos+1, aTmpFont );
diff --git a/sd/qa/unit/data/odg/adjust-to-contour.fodg 
b/sd/qa/unit/data/odg/adjust-to-contour.fodg
new file mode 100644
index ..a5ec6fed74fc
--- /dev/null
+++ b/sd/qa/unit/data/odg/adjust-to-contour.fodg
@@ -0,0 +1,52 @@
+
+
+
+ 
+  
+ 
+ 
+  
+   
+   
+
+   
+  
+  
+   
+   
+   
+  
+ 
+ 
+  
+   
+  
+  
+  
+   
+  
+  
+   
+   
+  
+ 
+ 
+  
+   
+   
+   
+   
+   
+  
+  
+ 
+ 
+  
+   
+
+ Lorem ipsum dolor sit amet, consectetur 
adipiscing elit. Vestibulum consequat mi quis pretium semper. Proin luctus orci 
ac neque venenatis, quis commodo dolor posuere. Curabitur dignissim sapien quis 
cursus egestas. Donec blandit auctor arcu, nec pellentesque eros molestie eget. 
In consectetur 

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

2024-05-03 Thread Xisco Fauli (via logerrit)
 svgio/inc/svgstyleattributes.hxx  |8 +
 svgio/qa/cppunit/SvgImportTest.cxx|   11 +++
 svgio/qa/cppunit/data/contextStroke.svg   |   14 +
 svgio/source/svgreader/svgmarkernode.cxx  |2 -
 svgio/source/svgreader/svgstyleattributes.cxx |   37 +++---
 5 files changed, 68 insertions(+), 4 deletions(-)

New commits:
commit f4a868ce3b7e5fe6e708f2c795402d646e0746d5
Author: Xisco Fauli 
AuthorDate: Thu May 2 22:16:36 2024 +0200
Commit: Xisco Fauli 
CommitDate: Fri May 3 18:26:48 2024 +0200

tdf#155651: Add support for "context-stroke"

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

diff --git a/svgio/inc/svgstyleattributes.hxx b/svgio/inc/svgstyleattributes.hxx
index c5c095462f3d..61a3816e82cb 100644
--- a/svgio/inc/svgstyleattributes.hxx
+++ b/svgio/inc/svgstyleattributes.hxx
@@ -247,10 +247,15 @@ namespace svgio::svgreader
 // #121221# Defines if evtl. an empty array *is* set
 boolmbStrokeDasharraySet : 1;
 
+// tdf#155651 Defines if 'context-stroke' is used in stroke
+boolmbContextStroke : 1;
+
 // tdf#94765 Check id references in gradient/pattern getters
 OUStringmaNodeFillURL;
 OUStringmaNodeStrokeURL;
 
+const basegfx::BColor*  maContextStroke;
+
 /// internal helpers
 void add_fillGradient(
 const basegfx::B2DPolyPolygon& rPath,
@@ -327,6 +332,9 @@ namespace svgio::svgreader
 /// stroke content
 const basegfx::BColor* getStroke() const;
 
+/// context stroke content
+const basegfx::BColor* getContextStroke() const;
+
 /// stop color content
 const basegfx::BColor& getStopColor() const;
 
diff --git a/svgio/qa/cppunit/SvgImportTest.cxx 
b/svgio/qa/cppunit/SvgImportTest.cxx
index 2c9f9ea72485..407e8aa0c3bb 100644
--- a/svgio/qa/cppunit/SvgImportTest.cxx
+++ b/svgio/qa/cppunit/SvgImportTest.cxx
@@ -669,6 +669,17 @@ CPPUNIT_TEST_FIXTURE(Test, testMarkerOrient)
 assertXPath(pDocument, "/primitive2D/transform/transform[2]"_ostr, 
"xy33"_ostr, "1");
 }
 
+CPPUNIT_TEST_FIXTURE(Test, testContextStroke)
+{
+xmlDocUniquePtr pDocument = 
dumpAndParseSvg(u"/svgio/qa/cppunit/data/contextStroke.svg");
+
+assertXPath(pDocument, 
"/primitive2D/transform/polypolygonstroke/line"_ostr, "color"_ostr, "#ff");
+assertXPath(pDocument, 
"/primitive2D/transform/transform[1]/polypolygonstroke/line"_ostr, 
"color"_ostr, "#ff");
+assertXPath(pDocument, 
"/primitive2D/transform/transform[2]/polypolygonstroke/line"_ostr, 
"color"_ostr, "#ff");
+assertXPath(pDocument, 
"/primitive2D/transform/transform[3]/polypolygonstroke/line"_ostr, 
"color"_ostr, "#ff");
+assertXPath(pDocument, 
"/primitive2D/transform/transform[4]/polypolygonstroke/line"_ostr, 
"color"_ostr, "#ff");
+}
+
 CPPUNIT_TEST_FIXTURE(Test, testMarkerInPresentation)
 {
 Primitive2DSequence aSequence = 
parseSvg(u"/svgio/qa/cppunit/data/markerInPresentation.svg");
diff --git a/svgio/qa/cppunit/data/contextStroke.svg 
b/svgio/qa/cppunit/data/contextStroke.svg
new file mode 100644
index ..5a9b27d69c84
--- /dev/null
+++ b/svgio/qa/cppunit/data/contextStroke.svg
@@ -0,0 +1,14 @@
+http://www.w3.org/2000/svg; viewBox="0 0 100 100">
+  
+path {
+  fill: none;
+  stroke-width: 4px;
+  marker: url(#diamond);
+}
+  
+  
+
+  
+
+  
+
diff --git a/svgio/source/svgreader/svgmarkernode.cxx 
b/svgio/source/svgreader/svgmarkernode.cxx
index 083471b49c6b..2279920634a6 100644
--- a/svgio/source/svgreader/svgmarkernode.cxx
+++ b/svgio/source/svgreader/svgmarkernode.cxx
@@ -174,7 +174,7 @@ namespace svgio::svgreader
 
 const drawinglayer::primitive2d::Primitive2DContainer& 
SvgMarkerNode::getMarkerPrimitives() const
 {
-if(aPrimitives.empty() && Display::None != getDisplay())
+if(Display::None != getDisplay())
 {
 decomposeSvgNode(const_cast< SvgMarkerNode* 
>(this)->aPrimitives, true);
 }
diff --git a/svgio/source/svgreader/svgstyleattributes.cxx 
b/svgio/source/svgreader/svgstyleattributes.cxx
index 50f72199e40b..81ef74d62f63 100644
--- a/svgio/source/svgreader/svgstyleattributes.cxx
+++ b/svgio/source/svgreader/svgstyleattributes.cxx
@@ -817,6 +817,11 @@ namespace svgio::svgreader
 rMarkerTransform.identity();
 rClipRange.reset();
 
+// Set the current stroke to the marker before calling 
getMarkerPrimitives,
+// which calls decomposeSvgNode to decompose the children of the 
marker.
+// If any of the children uses 'stroke="context-stroke"', then it 
will use it
+  

core.git: Branch 'libreoffice-7-6' - dictionaries

2024-05-03 Thread Xisco Fauli (via logerrit)
 dictionaries |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a542a01832f63016b99b453c90ec4bbe3e86c8e7
Author: Xisco Fauli 
AuthorDate: Fri May 3 12:06:28 2024 +0200
Commit: Gerrit Code Review 
CommitDate: Fri May 3 12:06:28 2024 +0200

Update git submodules

* Update dictionaries from branch 'libreoffice-7-6'
  to 0c5d6db9f4d3e465547e3a177360662e0f475d62
  - upgrade Ukrainian dictionaries to 6.4.4

Change-Id: Idf246940bdf58844212420975ab52c19b08327ec
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/166872
Tested-by: Xisco Fauli 
Reviewed-by: Xisco Fauli 
Reviewed-by: Andriy Rysin 
(cherry picked from commit 0ca7301c3c00d6e7936fd912ba775d0008f7fee4)
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/166907
Tested-by: Christian Lohmaier 
Reviewed-by: Christian Lohmaier 

diff --git a/dictionaries b/dictionaries
index 7aa013596e97..0c5d6db9f4d3 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 7aa013596e97ce58bb4def48e6952062ae52cf5f
+Subproject commit 0c5d6db9f4d3e465547e3a177360662e0f475d62


dictionaries.git: Branch 'libreoffice-7-6' - uk_UA/description.xml uk_UA/uk_UA.aff uk_UA/uk_UA.dic

2024-05-03 Thread Xisco Fauli (via logerrit)
 uk_UA/description.xml |2 
 uk_UA/uk_UA.aff   | 2459 
 uk_UA/uk_UA.dic   |142223 
+-
 3 files changed, 74844 insertions(+), 69840 deletions(-)

New commits:
commit 0c5d6db9f4d3e465547e3a177360662e0f475d62
Author: Xisco Fauli 
AuthorDate: Mon Apr 29 18:14:57 2024 +0200
Commit: Christian Lohmaier 
CommitDate: Fri May 3 12:06:27 2024 +0200

upgrade Ukrainian dictionaries to 6.4.4

Change-Id: Idf246940bdf58844212420975ab52c19b08327ec
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/166872
Tested-by: Xisco Fauli 
Reviewed-by: Xisco Fauli 
Reviewed-by: Andriy Rysin 
(cherry picked from commit 0ca7301c3c00d6e7936fd912ba775d0008f7fee4)
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/166907
Tested-by: Christian Lohmaier 
Reviewed-by: Christian Lohmaier 

diff --git a/uk_UA/description.xml b/uk_UA/description.xml
index 4941499..f221da9 100644
--- a/uk_UA/description.xml
+++ b/uk_UA/description.xml
@@ -1,6 +1,6 @@
 
 http://openoffice.org/extensions/description/2006; 
xmlns:d="http://openoffice.org/extensions/description/2006;  
xmlns:xlink="http://www.w3.org/1999/xlink;>
-
+
 
 
 Ukrainian spelling dictionary, hyphenation rules, 
and thesaurus
diff --git a/uk_UA/uk_UA.aff b/uk_UA/uk_UA.aff
index 3faea89..2343c2a 100644
--- a/uk_UA/uk_UA.aff
+++ b/uk_UA/uk_UA.aff
@@ -287,12 +287,12 @@ SFX ( ін ьонах лін
 SFX ( ір ьорах лір
 SFX ( іт ьотах літ
 SFX ) Y 6
+SFX ) сти дучи [аея]сти
 SFX ) атися учись жатися
 SFX ) атися учися жатися ###
-SFX ) стися дучись ястися
-SFX ) стися дучися ястися ###
 SFX ) ати учи жати
-SFX ) сти дучи ясти
+SFX ) стися дучись [аея]стися
+SFX ) стися дучися [аея]стися ###
 SFX * Y 3
 SFX * ік оці ік
 SFX * іг озі іг
@@ -326,126 +326,126 @@ SFX - ь ей ь
 SFX - ь ям ь
 SFX - ь ями ь
 SFX - ь ях ь
-SFX . Y 5
-SFX . е а ще
-SFX . е 0 ще
-SFX . е ам ще
-SFX . е ами ще
-SFX . е ах ще
-SFX 0 Y 113
-SFX 0 ій ою ій
-SFX 0 ій оєві ій
-SFX 0 ій оєм ій
-SFX 0 ій ої ій
-SFX 0 іб обі .іб
-SFX 0 ів ові .ів
-SFX 0 ід оді .ід
-SFX 0 іж ожі .іж
-SFX 0 із озі .із
-SFX 0 ім омі .ім
-SFX 0 ін оні .ін
-SFX 0 іп опі .іп
-SFX 0 ір орі .ір
-SFX 0 іс осі .іс
-SFX 0 іт оті .іт
-SFX 0 іш оші .іш
-SFX 0 ізд озді ізд
-SFX 0 ізт озті ізт
-SFX 0 ірд орді ірд
-SFX 0 ірт орті ірт
-SFX 0 ісд осді ісд
-SFX 0 іст ості іст
-SFX 0 ізд озду ізд
-SFX 0 ізк озку ізк
-SFX 0 ізт озту ізт
-SFX 0 ірд орду ірд
-SFX 0 ірк орку ірк
-SFX 0 ірт орту ірт
-SFX 0 ісд осду ісд
-SFX 0 іск оску іск
-SFX 0 іст осту іст
-SFX 0 ізд оздові ізд
-SFX 0 ізк озкові ізк
-SFX 0 ізт озтові ізт
-SFX 0 ірд ордові ірд
-SFX 0 ірк оркові ірк
-SFX 0 ірт ортові ірт
-SFX 0 ісд осдові ісд
-SFX 0 іск оскові іск
-SFX 0 іст остові іст
-SFX 0 ізд оздом ізд
-SFX 0 ізк озком ізк
-SFX 0 ізт озтом ізт
-SFX 0 ірд ордом ірд
-SFX 0 ірк орком ірк
-SFX 0 ірт ортом ірт
-SFX 0 ісд осдом ісд
-SFX 0 іск оском іск
-SFX 0 іст остом іст
-SFX 0 іб обові іб
-SFX 0 ід одові ід
-SFX 0 іг огові іг
-SFX 0 із озові із
-SFX 0 ік окові ік
-SFX 0 іл олові іл
-SFX 0 ім омові ім
-SFX 0 ін онові ін
-SFX 0 іп опові іп
-SFX 0 ір орові ір
-SFX 0 іс осові іс
-SFX 0 іт отові іт
-SFX 0 ік оці потік
-SFX 0 іж ожу іж
-SFX 0 іш ошу іш
-SFX 0 іж ожем іж
-SFX 0 іш ошем іш
-SFX 0 іж ожеві іж
-SFX 0 іш ошеві іш
-SFX 0 інь оню інь
-SFX 0 інь оневі інь
-SFX 0 інь онем інь
-SFX 0 інь оні інь
-SFX 0 іль олю іль
-SFX 0 іль олеві іль
-SFX 0 іль олем іль
-SFX 0 іль олі іль
-SFX 0 іб обу іб
-SFX 0 ів ову ів
-SFX 0 ід оду ід
-SFX 0 іг огу іг
-SFX 0 із озу із
-SFX 0 ік оку ік
-SFX 0 іл олу іл
-SFX 0 ім ому ім
-SFX 0 ін ону ін
-SFX 0 іп опу іп
-SFX 0 ір ору ір
-SFX 0 іс осу іс
-SFX 0 іт оту іт
-SFX 0 іч очу іч
-SFX 0 іб обом іб
-SFX 0 ів овом ів
-SFX 0 ід одом ід
-SFX 0 іг огом іг
-SFX 0 із озом із
-SFX 0 ік оком ік
-SFX 0 іл олом іл
-SFX 0 ім омом ім
-SFX 0 ін оном ін
-SFX 0 іп опом іп
-SFX 0 ір ором ір
-SFX 0 іс осом іс
-SFX 0 іт отом іт
-SFX 0 іч очом іч
-SFX 0 ік оці стік
-SFX 0 івш овшу івш
-SFX 0 івш овшеві івш
-SFX 0 івш овшем івш
-SFX 0 івш овші івш
-SFX 0 ість остю ість
-SFX 0 ість остеві ість
-SFX 0 ість остем ість
-SFX 0 ість ості ість
+SFX . Y 113
+SFX . ій ою ій
+SFX . ій оєві ій
+SFX . ій оєм ій
+SFX . ій ої ій
+SFX . іб обі .іб
+SFX . ів ові .ів
+SFX . ід оді .ід
+SFX . іж ожі .іж
+SFX . із озі .із
+SFX . ім омі .ім
+SFX . ін оні .ін
+SFX . іп опі .іп
+SFX . ір орі .ір
+SFX . іс осі .іс
+SFX . іт оті .іт
+SFX . іш оші .іш
+SFX . ізд озді ізд
+SFX . ізт озті ізт
+SFX . ірд орді ірд
+SFX . ірт орті ірт
+SFX . ісд осді ісд
+SFX . іст ості іст
+SFX . ізд озду ізд
+SFX . ізк озку ізк
+SFX . ізт озту ізт
+SFX . ірд орду ірд
+SFX . ірк орку ірк
+SFX . ірт орту ірт
+SFX . ісд осду ісд
+SFX . іск оску іск
+SFX . іст осту іст
+SFX . ізд оздові ізд
+SFX . ізк озкові ізк
+SFX . ізт озтові ізт
+SFX . ірд ордові ірд
+SFX . ірк оркові ірк
+SFX . ірт ортові ірт
+SFX . ісд осдові ісд
+SFX . іск оскові іск
+SFX . іст остові іст
+SFX . ізд оздом ізд
+SFX . ізк озком ізк

core.git: svgio/inc svgio/qa svgio/source

2024-05-03 Thread Xisco Fauli (via logerrit)
 svgio/inc/svgstyleattributes.hxx  |8 +
 svgio/qa/cppunit/SvgImportTest.cxx|   11 +++
 svgio/qa/cppunit/data/contextStroke.svg   |   14 +
 svgio/source/svgreader/svgmarkernode.cxx  |2 -
 svgio/source/svgreader/svgstyleattributes.cxx |   37 +++---
 5 files changed, 68 insertions(+), 4 deletions(-)

New commits:
commit d75a37a5829dfcb915f7190d4453c4d4fa25e579
Author: Xisco Fauli 
AuthorDate: Thu May 2 22:16:36 2024 +0200
Commit: Xisco Fauli 
CommitDate: Fri May 3 11:50:42 2024 +0200

tdf#155651: Add support for "context-stroke"

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

diff --git a/svgio/inc/svgstyleattributes.hxx b/svgio/inc/svgstyleattributes.hxx
index c5c095462f3d..61a3816e82cb 100644
--- a/svgio/inc/svgstyleattributes.hxx
+++ b/svgio/inc/svgstyleattributes.hxx
@@ -247,10 +247,15 @@ namespace svgio::svgreader
 // #121221# Defines if evtl. an empty array *is* set
 boolmbStrokeDasharraySet : 1;
 
+// tdf#155651 Defines if 'context-stroke' is used in stroke
+boolmbContextStroke : 1;
+
 // tdf#94765 Check id references in gradient/pattern getters
 OUStringmaNodeFillURL;
 OUStringmaNodeStrokeURL;
 
+const basegfx::BColor*  maContextStroke;
+
 /// internal helpers
 void add_fillGradient(
 const basegfx::B2DPolyPolygon& rPath,
@@ -327,6 +332,9 @@ namespace svgio::svgreader
 /// stroke content
 const basegfx::BColor* getStroke() const;
 
+/// context stroke content
+const basegfx::BColor* getContextStroke() const;
+
 /// stop color content
 const basegfx::BColor& getStopColor() const;
 
diff --git a/svgio/qa/cppunit/SvgImportTest.cxx 
b/svgio/qa/cppunit/SvgImportTest.cxx
index 01463a894dd5..c12f5abaaf16 100644
--- a/svgio/qa/cppunit/SvgImportTest.cxx
+++ b/svgio/qa/cppunit/SvgImportTest.cxx
@@ -646,6 +646,17 @@ CPPUNIT_TEST_FIXTURE(Test, testMarkerOrient)
 assertXPath(pDocument, "/primitive2D/transform/transform[2]"_ostr, 
"xy33"_ostr, "1");
 }
 
+CPPUNIT_TEST_FIXTURE(Test, testContextStroke)
+{
+xmlDocUniquePtr pDocument = 
dumpAndParseSvg(u"/svgio/qa/cppunit/data/contextStroke.svg");
+
+assertXPath(pDocument, 
"/primitive2D/transform/polypolygonstroke/line"_ostr, "color"_ostr, "#ff");
+assertXPath(pDocument, 
"/primitive2D/transform/transform[1]/polypolygonstroke/line"_ostr, 
"color"_ostr, "#ff");
+assertXPath(pDocument, 
"/primitive2D/transform/transform[2]/polypolygonstroke/line"_ostr, 
"color"_ostr, "#ff");
+assertXPath(pDocument, 
"/primitive2D/transform/transform[3]/polypolygonstroke/line"_ostr, 
"color"_ostr, "#ff");
+assertXPath(pDocument, 
"/primitive2D/transform/transform[4]/polypolygonstroke/line"_ostr, 
"color"_ostr, "#ff");
+}
+
 CPPUNIT_TEST_FIXTURE(Test, testMarkerInPresentation)
 {
 xmlDocUniquePtr pDocument = 
dumpAndParseSvg(u"/svgio/qa/cppunit/data/markerInPresentation.svg");
diff --git a/svgio/qa/cppunit/data/contextStroke.svg 
b/svgio/qa/cppunit/data/contextStroke.svg
new file mode 100644
index ..5a9b27d69c84
--- /dev/null
+++ b/svgio/qa/cppunit/data/contextStroke.svg
@@ -0,0 +1,14 @@
+http://www.w3.org/2000/svg; viewBox="0 0 100 100">
+  
+path {
+  fill: none;
+  stroke-width: 4px;
+  marker: url(#diamond);
+}
+  
+  
+
+  
+
+  
+
diff --git a/svgio/source/svgreader/svgmarkernode.cxx 
b/svgio/source/svgreader/svgmarkernode.cxx
index 083471b49c6b..2279920634a6 100644
--- a/svgio/source/svgreader/svgmarkernode.cxx
+++ b/svgio/source/svgreader/svgmarkernode.cxx
@@ -174,7 +174,7 @@ namespace svgio::svgreader
 
 const drawinglayer::primitive2d::Primitive2DContainer& 
SvgMarkerNode::getMarkerPrimitives() const
 {
-if(aPrimitives.empty() && Display::None != getDisplay())
+if(Display::None != getDisplay())
 {
 decomposeSvgNode(const_cast< SvgMarkerNode* 
>(this)->aPrimitives, true);
 }
diff --git a/svgio/source/svgreader/svgstyleattributes.cxx 
b/svgio/source/svgreader/svgstyleattributes.cxx
index 763a7a3cdd96..0253aa42e071 100644
--- a/svgio/source/svgreader/svgstyleattributes.cxx
+++ b/svgio/source/svgreader/svgstyleattributes.cxx
@@ -817,6 +817,11 @@ namespace svgio::svgreader
 rMarkerTransform.identity();
 rClipRange.reset();
 
+// Set the current stroke to the marker before calling 
getMarkerPrimitives,
+// which calls decomposeSvgNode to decompose the children of the 
marker.
+// If any of the children uses 'stroke="context-stroke"', then it 
will use it

dictionaries.git: uk_UA/description.xml uk_UA/uk_UA.aff uk_UA/uk_UA.dic

2024-05-03 Thread Xisco Fauli (via logerrit)
 uk_UA/description.xml |2 
 uk_UA/uk_UA.aff   | 2459 
 uk_UA/uk_UA.dic   |142223 
+-
 3 files changed, 74844 insertions(+), 69840 deletions(-)

New commits:
commit 0ca7301c3c00d6e7936fd912ba775d0008f7fee4
Author: Xisco Fauli 
AuthorDate: Mon Apr 29 18:14:57 2024 +0200
Commit: Xisco Fauli 
CommitDate: Fri May 3 10:44:03 2024 +0200

upgrade Ukrainian dictionaries to 6.4.4

Change-Id: Idf246940bdf58844212420975ab52c19b08327ec
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/166872
Tested-by: Xisco Fauli 
Reviewed-by: Xisco Fauli 
Reviewed-by: Andriy Rysin 

diff --git a/uk_UA/description.xml b/uk_UA/description.xml
index 4941499..f221da9 100644
--- a/uk_UA/description.xml
+++ b/uk_UA/description.xml
@@ -1,6 +1,6 @@
 
 http://openoffice.org/extensions/description/2006; 
xmlns:d="http://openoffice.org/extensions/description/2006;  
xmlns:xlink="http://www.w3.org/1999/xlink;>
-
+
 
 
 Ukrainian spelling dictionary, hyphenation rules, 
and thesaurus
diff --git a/uk_UA/uk_UA.aff b/uk_UA/uk_UA.aff
index 3faea89..2343c2a 100644
--- a/uk_UA/uk_UA.aff
+++ b/uk_UA/uk_UA.aff
@@ -287,12 +287,12 @@ SFX ( ін ьонах лін
 SFX ( ір ьорах лір
 SFX ( іт ьотах літ
 SFX ) Y 6
+SFX ) сти дучи [аея]сти
 SFX ) атися учись жатися
 SFX ) атися учися жатися ###
-SFX ) стися дучись ястися
-SFX ) стися дучися ястися ###
 SFX ) ати учи жати
-SFX ) сти дучи ясти
+SFX ) стися дучись [аея]стися
+SFX ) стися дучися [аея]стися ###
 SFX * Y 3
 SFX * ік оці ік
 SFX * іг озі іг
@@ -326,126 +326,126 @@ SFX - ь ей ь
 SFX - ь ям ь
 SFX - ь ями ь
 SFX - ь ях ь
-SFX . Y 5
-SFX . е а ще
-SFX . е 0 ще
-SFX . е ам ще
-SFX . е ами ще
-SFX . е ах ще
-SFX 0 Y 113
-SFX 0 ій ою ій
-SFX 0 ій оєві ій
-SFX 0 ій оєм ій
-SFX 0 ій ої ій
-SFX 0 іб обі .іб
-SFX 0 ів ові .ів
-SFX 0 ід оді .ід
-SFX 0 іж ожі .іж
-SFX 0 із озі .із
-SFX 0 ім омі .ім
-SFX 0 ін оні .ін
-SFX 0 іп опі .іп
-SFX 0 ір орі .ір
-SFX 0 іс осі .іс
-SFX 0 іт оті .іт
-SFX 0 іш оші .іш
-SFX 0 ізд озді ізд
-SFX 0 ізт озті ізт
-SFX 0 ірд орді ірд
-SFX 0 ірт орті ірт
-SFX 0 ісд осді ісд
-SFX 0 іст ості іст
-SFX 0 ізд озду ізд
-SFX 0 ізк озку ізк
-SFX 0 ізт озту ізт
-SFX 0 ірд орду ірд
-SFX 0 ірк орку ірк
-SFX 0 ірт орту ірт
-SFX 0 ісд осду ісд
-SFX 0 іск оску іск
-SFX 0 іст осту іст
-SFX 0 ізд оздові ізд
-SFX 0 ізк озкові ізк
-SFX 0 ізт озтові ізт
-SFX 0 ірд ордові ірд
-SFX 0 ірк оркові ірк
-SFX 0 ірт ортові ірт
-SFX 0 ісд осдові ісд
-SFX 0 іск оскові іск
-SFX 0 іст остові іст
-SFX 0 ізд оздом ізд
-SFX 0 ізк озком ізк
-SFX 0 ізт озтом ізт
-SFX 0 ірд ордом ірд
-SFX 0 ірк орком ірк
-SFX 0 ірт ортом ірт
-SFX 0 ісд осдом ісд
-SFX 0 іск оском іск
-SFX 0 іст остом іст
-SFX 0 іб обові іб
-SFX 0 ід одові ід
-SFX 0 іг огові іг
-SFX 0 із озові із
-SFX 0 ік окові ік
-SFX 0 іл олові іл
-SFX 0 ім омові ім
-SFX 0 ін онові ін
-SFX 0 іп опові іп
-SFX 0 ір орові ір
-SFX 0 іс осові іс
-SFX 0 іт отові іт
-SFX 0 ік оці потік
-SFX 0 іж ожу іж
-SFX 0 іш ошу іш
-SFX 0 іж ожем іж
-SFX 0 іш ошем іш
-SFX 0 іж ожеві іж
-SFX 0 іш ошеві іш
-SFX 0 інь оню інь
-SFX 0 інь оневі інь
-SFX 0 інь онем інь
-SFX 0 інь оні інь
-SFX 0 іль олю іль
-SFX 0 іль олеві іль
-SFX 0 іль олем іль
-SFX 0 іль олі іль
-SFX 0 іб обу іб
-SFX 0 ів ову ів
-SFX 0 ід оду ід
-SFX 0 іг огу іг
-SFX 0 із озу із
-SFX 0 ік оку ік
-SFX 0 іл олу іл
-SFX 0 ім ому ім
-SFX 0 ін ону ін
-SFX 0 іп опу іп
-SFX 0 ір ору ір
-SFX 0 іс осу іс
-SFX 0 іт оту іт
-SFX 0 іч очу іч
-SFX 0 іб обом іб
-SFX 0 ів овом ів
-SFX 0 ід одом ід
-SFX 0 іг огом іг
-SFX 0 із озом із
-SFX 0 ік оком ік
-SFX 0 іл олом іл
-SFX 0 ім омом ім
-SFX 0 ін оном ін
-SFX 0 іп опом іп
-SFX 0 ір ором ір
-SFX 0 іс осом іс
-SFX 0 іт отом іт
-SFX 0 іч очом іч
-SFX 0 ік оці стік
-SFX 0 івш овшу івш
-SFX 0 івш овшеві івш
-SFX 0 івш овшем івш
-SFX 0 івш овші івш
-SFX 0 ість остю ість
-SFX 0 ість остеві ість
-SFX 0 ість остем ість
-SFX 0 ість ості ість
+SFX . Y 113
+SFX . ій ою ій
+SFX . ій оєві ій
+SFX . ій оєм ій
+SFX . ій ої ій
+SFX . іб обі .іб
+SFX . ів ові .ів
+SFX . ід оді .ід
+SFX . іж ожі .іж
+SFX . із озі .із
+SFX . ім омі .ім
+SFX . ін оні .ін
+SFX . іп опі .іп
+SFX . ір орі .ір
+SFX . іс осі .іс
+SFX . іт оті .іт
+SFX . іш оші .іш
+SFX . ізд озді ізд
+SFX . ізт озті ізт
+SFX . ірд орді ірд
+SFX . ірт орті ірт
+SFX . ісд осді ісд
+SFX . іст ості іст
+SFX . ізд озду ізд
+SFX . ізк озку ізк
+SFX . ізт озту ізт
+SFX . ірд орду ірд
+SFX . ірк орку ірк
+SFX . ірт орту ірт
+SFX . ісд осду ісд
+SFX . іск оску іск
+SFX . іст осту іст
+SFX . ізд оздові ізд
+SFX . ізк озкові ізк
+SFX . ізт озтові ізт
+SFX . ірд ордові ірд
+SFX . ірк оркові ірк
+SFX . ірт ортові ірт
+SFX . ісд осдові ісд
+SFX . іск оскові іск
+SFX . іст остові іст
+SFX . ізд оздом ізд
+SFX . ізк озком ізк
+SFX . ізт озтом ізт
+SFX . ірд ордом ірд
+SFX . ірк орком ірк
+SFX . ірт ортом ірт
+SFX . ісд осдом ісд
+SFX . іск оском іск
+SFX . іст остом іст
+SFX . іб обові іб
+SFX . ід одові ід
+SFX . іг огові іг
+SFX . із озові із

core.git: dictionaries

2024-05-03 Thread Xisco Fauli (via logerrit)
 dictionaries |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9490972c04b79065f247b3076a7c53c9ec4fad67
Author: Xisco Fauli 
AuthorDate: Fri May 3 10:44:03 2024 +0200
Commit: Gerrit Code Review 
CommitDate: Fri May 3 10:44:03 2024 +0200

Update git submodules

* Update dictionaries from branch 'master'
  to 0ca7301c3c00d6e7936fd912ba775d0008f7fee4
  - upgrade Ukrainian dictionaries to 6.4.4

Change-Id: Idf246940bdf58844212420975ab52c19b08327ec
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/166872
Tested-by: Xisco Fauli 
Reviewed-by: Xisco Fauli 
Reviewed-by: Andriy Rysin 

diff --git a/dictionaries b/dictionaries
index 8c5b63124f5c..0ca7301c3c00 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 8c5b63124f5cedf97ed4799560fdd1202f039511
+Subproject commit 0ca7301c3c00d6e7936fd912ba775d0008f7fee4


core.git: sw/qa

2024-05-02 Thread Xisco Fauli (via logerrit)
 sw/qa/extras/uiwriter/uiwriter4.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 01f19161e9a8e957028d5378e48929e82fed159c
Author: Xisco Fauli 
AuthorDate: Thu May 2 10:42:18 2024 +0200
Commit: Xisco Fauli 
CommitDate: Thu May 2 19:10:28 2024 +0200

CppunitTest_sw_uiwriter4: remove unneded Scheduler::ProcessEventsToIdle()

Added with 17b2f3d96fb21dcfc2fb8e54ca9670a8c58840f1
"tdf#143320, tdf#143387: sw_uiwriter4: Add unittest"

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

diff --git a/sw/qa/extras/uiwriter/uiwriter4.cxx 
b/sw/qa/extras/uiwriter/uiwriter4.cxx
index c361ddfb80e0..654bb33ae92c 100644
--- a/sw/qa/extras/uiwriter/uiwriter4.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter4.cxx
@@ -2597,7 +2597,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testTdf143320)
 CPPUNIT_ASSERT(getParagraph(1)->getString().startsWith("x"));
 
 dispatchCommand(mxComponent, ".uno:Undo", {});
-Scheduler::ProcessEventsToIdle();
 
 CPPUNIT_ASSERT_EQUAL(1, getPages());
 CPPUNIT_ASSERT_EQUAL(OUString(""), getParagraph(1)->getString());


core.git: 2 commits - sw/qa sw/source

2024-04-30 Thread Xisco Fauli (via logerrit)
 sw/qa/extras/uiwriter/data/tdf143320.odt |binary
 sw/qa/extras/uiwriter/uiwriter4.cxx  |   37 +++
 sw/source/core/frmedt/fefly1.cxx |4 +--
 3 files changed, 39 insertions(+), 2 deletions(-)

New commits:
commit 17b2f3d96fb21dcfc2fb8e54ca9670a8c58840f1
Author: Xisco Fauli 
AuthorDate: Wed Jul 14 14:41:24 2021 +0200
Commit: Xisco Fauli 
CommitDate: Tue Apr 30 21:14:00 2024 +0200

tdf#143320, tdf#143387: sw_uiwriter4: Add unittest

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

diff --git a/sw/qa/extras/uiwriter/data/tdf143320.odt 
b/sw/qa/extras/uiwriter/data/tdf143320.odt
new file mode 100644
index ..b7aef0c34bb0
Binary files /dev/null and b/sw/qa/extras/uiwriter/data/tdf143320.odt differ
diff --git a/sw/qa/extras/uiwriter/uiwriter4.cxx 
b/sw/qa/extras/uiwriter/uiwriter4.cxx
index 7757ceb9701e..c361ddfb80e0 100644
--- a/sw/qa/extras/uiwriter/uiwriter4.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter4.cxx
@@ -2572,6 +2572,43 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testTdf142157)
 CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xSections->getCount());
 }
 
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testTdf143320)
+{
+createSwDoc("tdf143320.odt");
+SwDoc* pDoc = getSwDoc();
+SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
+
+CPPUNIT_ASSERT_EQUAL(1, getPages());
+CPPUNIT_ASSERT(getParagraph(1)->getString().startsWith("x"));
+
+dispatchCommand(mxComponent, ".uno:SelectAll", {});
+
+dispatchCommand(mxComponent, ".uno:Copy", {});
+
+// Create a new document
+createSwDoc();
+pDoc = getSwDoc();
+pWrtShell = pDoc->GetDocShell()->GetWrtShell();
+CPPUNIT_ASSERT(pWrtShell);
+
+dispatchCommand(mxComponent, ".uno:Paste", {});
+
+CPPUNIT_ASSERT_EQUAL(1, getPages());
+CPPUNIT_ASSERT(getParagraph(1)->getString().startsWith("x"));
+
+dispatchCommand(mxComponent, ".uno:Undo", {});
+Scheduler::ProcessEventsToIdle();
+
+CPPUNIT_ASSERT_EQUAL(1, getPages());
+CPPUNIT_ASSERT_EQUAL(OUString(""), getParagraph(1)->getString());
+
+// Without the fix in place, this test would have crashed here
+dispatchCommand(mxComponent, ".uno:Paste", {});
+
+CPPUNIT_ASSERT_EQUAL(1, getPages());
+CPPUNIT_ASSERT(getParagraph(1)->getString().startsWith("x"));
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit acad40220d21e73b5fb699404ae1a2dc29218faa
Author: Xisco Fauli 
AuthorDate: Tue Apr 30 10:07:23 2024 +0200
Commit: Xisco Fauli 
CommitDate: Tue Apr 30 21:13:52 2024 +0200

Fix UBSan failure (part 2)

Introduced by 495b5db74f0db59395ff68bacc8d8ca67595b66e
"sw: check GetUserCall"

https: //gerrit.libreoffice.org/c/core/+/166824/comments/8db24a41_2f4e7e4e
Change-Id: Ib6f981aa3055f0d37d0b83e3284842d310fe6ef0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166913
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx
index 280166ed888b..eca71843557b 100644
--- a/sw/source/core/frmedt/fefly1.cxx
+++ b/sw/source/core/frmedt/fefly1.cxx
@@ -386,7 +386,7 @@ const SwFrameFormat* SwFEShell::IsFlyInFly()
 return nullptr;
 
 SdrObject *pObj = rMrkList.GetMark( 0 )->GetMarkedSdrObj();
-SwDrawContact *pContact = static_cast(GetUserCall(pObj));
+SwContact* pContact = GetUserCall( pObj );
 if (!pContact)
 return nullptr;
 
@@ -400,7 +400,7 @@ const SwFrameFormat* SwFEShell::IsFlyInFly()
 }
 else
 {
-pFly = pContact->GetAnchorFrame(pObj);
+pFly = static_cast(pContact)->GetAnchorFrame(pObj);
 }
 
 OSL_ENSURE( pFly, "IsFlyInFly: Where's my anchor?" );


core.git: sw/qa

2024-04-30 Thread Xisco Fauli (via logerrit)
 sw/qa/extras/ooxmlexport/data/tdf160827.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport20.cxx   |8 
 2 files changed, 8 insertions(+)

New commits:
commit bb55430412a9a0e211482ee853f78ea35989e92a
Author: Xisco Fauli 
AuthorDate: Mon Apr 29 17:21:52 2024 +0200
Commit: Xisco Fauli 
CommitDate: Tue Apr 30 09:37:01 2024 +0200

tdf#160827: sw_ooxmlexport20: Add unittest

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

diff --git a/sw/qa/extras/ooxmlexport/data/tdf160827.docx 
b/sw/qa/extras/ooxmlexport/data/tdf160827.docx
new file mode 100644
index ..5f2b76a3d429
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf160827.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport20.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport20.cxx
index 94f8872f263a..7418c2665bac 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport20.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport20.cxx
@@ -1123,6 +1123,14 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf158451)
  getProperty(getShape(1), 
"AnchorType"));
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf160827, "tdf160827.docx")
+{
+// it crashes at import time
+SwXTextDocument* pTextDoc = 
dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pTextDoc);
+CPPUNIT_ASSERT(pTextDoc->GetDocShell()->IsSecurityOptOpenReadOnly());
+}
+
 CPPUNIT_TEST_FIXTURE(Test, testTdf159110)
 {
 // Given a text with an URL with multiple spaces


core.git: sw/source

2024-04-29 Thread Xisco Fauli (via logerrit)
 sw/source/core/draw/dview.cxx |   31 +--
 1 file changed, 17 insertions(+), 14 deletions(-)

New commits:
commit 0627386e924279e1de75210cf6b144303fccbe7f
Author: Xisco Fauli 
AuthorDate: Mon Apr 29 09:54:12 2024 +0200
Commit: Xisco Fauli 
CommitDate: Mon Apr 29 15:42:25 2024 +0200

Fix UBSan failure

Introduced by 495b5db74f0db59395ff68bacc8d8ca67595b66e
"sw: check GetUserCall"


https://ci.libreoffice.org/job/lo_ubsan/3154/consoleFull#-1571115798d893063f-7f3d-4b7e-b56f-4e0f225817cd
Change-Id: Ifc80312890f2e6b82dcc9419b5b7e8bfcd5340a5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166824
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx
index d95dc0d17af9..de84660ca94a 100644
--- a/sw/source/core/draw/dview.cxx
+++ b/sw/source/core/draw/dview.cxx
@@ -708,13 +708,10 @@ const SwFrame* SwDrawView::CalcAnchor()
 return nullptr;
 
 SdrObject* pObj = rMrkList.GetMark( 0 )->GetMarkedSdrObj();
-SwDrawContact* pContact = static_cast(GetUserCall(pObj));
-if (!pContact)
-return nullptr;
 
 //Search for paragraph bound objects, otherwise only the
 //current anchor. Search only if we currently drag.
-const SwFrame* pAnch;
+const SwFrame* pAnch = nullptr;
 tools::Rectangle aMyRect;
 auto pFlyDrawObj = dynamic_cast( pObj );
 if ( pFlyDrawObj )
@@ -726,13 +723,16 @@ const SwFrame* SwDrawView::CalcAnchor()
 {
 // determine correct anchor position for 'virtual' drawing objects.
 // #i26791#
-pAnch = pContact->GetAnchorFrame( pObj );
-if( !pAnch )
+if (SwDrawContact* pContact = 
static_cast(GetUserCall(pObj)))
 {
-pContact->ConnectToLayout();
-// determine correct anchor position for 'virtual' drawing objects.
-// #i26791#
 pAnch = pContact->GetAnchorFrame( pObj );
+if( !pAnch )
+{
+pContact->ConnectToLayout();
+// determine correct anchor position for 'virtual' drawing 
objects.
+// #i26791#
+pAnch = pContact->GetAnchorFrame( pObj );
+}
 }
 aMyRect = pObj->GetSnapRect();
 }
@@ -767,11 +767,14 @@ const SwFrame* SwDrawView::CalcAnchor()
 {
 const SwRect aRect( aPt.getX(), aPt.getY(), 1, 1 );
 
-if ( pContact->GetAnchorFrame( pObj ) &&
- pContact->GetAnchorFrame( pObj )->IsPageFrame() )
-pAnch = pContact->GetPageFrame();
-else
-pAnch = pContact->FindPage( aRect );
+if (SwDrawContact* pContact = 
static_cast(GetUserCall(pObj)))
+{
+if ( pContact->GetAnchorFrame( pObj ) &&
+ pContact->GetAnchorFrame( pObj )->IsPageFrame() )
+pAnch = pContact->GetPageFrame();
+else
+pAnch = pContact->FindPage( aRect );
+}
 }
 }
 if( pAnch && !pAnch->IsProtected() )


core.git: download.lst external/libgpg-error

2024-04-26 Thread Xisco Fauli (via logerrit)
 download.lst  |4 ++--
 external/libgpg-error/ExternalPackage_libgpg-error.mk |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit a5d75f487592d17c02fccbf21a0edef437067f30
Author: Xisco Fauli 
AuthorDate: Fri Apr 26 09:50:09 2024 +0200
Commit: Xisco Fauli 
CommitDate: Fri Apr 26 12:47:24 2024 +0200

libgpg-error: Upgrade to 1.49

Change-Id: I1bd83294e58952ebdbaaf0362bd8675c1911b9be
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166697
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>

diff --git a/download.lst b/download.lst
index df1a213bbb95..28538879f5ec 100644
--- a/download.lst
+++ b/download.lst
@@ -394,8 +394,8 @@ LIBFFI_TARBALL := libffi-3.4.4.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBGPGERROR_SHA256SUM := 
89ce1ae893e122924b858de84dc4f67aae29ffa610ebf668d5aa539045663d6f
-LIBGPGERROR_TARBALL := libgpg-error-1.48.tar.bz2
+LIBGPGERROR_SHA256SUM := 
8b79d54639dbf4abc08b5406fb2f37e669a2dec091dd024fb87dd367131c63a9
+LIBGPGERROR_TARBALL := libgpg-error-1.49.tar.bz2
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/libgpg-error/ExternalPackage_libgpg-error.mk 
b/external/libgpg-error/ExternalPackage_libgpg-error.mk
index 2c64ba3b5cc6..262675acf6e6 100644
--- a/external/libgpg-error/ExternalPackage_libgpg-error.mk
+++ b/external/libgpg-error/ExternalPackage_libgpg-error.mk
@@ -15,7 +15,7 @@ ifneq ($(DISABLE_DYNLOADING),TRUE)
 
 ifeq ($(OS),LINUX)
 
-$(eval $(call 
gb_ExternalPackage_add_file,libgpg-error,$(LIBO_LIB_FOLDER)/libgpg-error-lo.so.0,src/.libs/libgpg-error-lo.so.0.35.0))
+$(eval $(call 
gb_ExternalPackage_add_file,libgpg-error,$(LIBO_LIB_FOLDER)/libgpg-error-lo.so.0,src/.libs/libgpg-error-lo.so.0.36.0))
 
 else ifeq ($(OS),MACOSX)
 


core.git: sw/source

2024-04-26 Thread Xisco Fauli (via logerrit)
 sw/source/core/access/accfrmobj.cxx  |   15 ++-
 sw/source/core/doc/docdraw.cxx   |   12 +++
 sw/source/core/draw/dview.cxx|  108 ---
 sw/source/core/frmedt/fecopy.cxx |   25 +++---
 sw/source/core/frmedt/fefly1.cxx |   13 ++-
 sw/source/core/frmedt/feshview.cxx   |   37 ++---
 sw/source/core/layout/anchoreddrawobject.cxx |4 +
 sw/source/core/layout/anchoredobject.cxx |   11 +-
 sw/source/core/layout/fly.cxx|4 -
 sw/source/core/layout/flylay.cxx |   41 +-
 sw/source/core/layout/frmtool.cxx|   40 ++
 sw/source/core/layout/pagechg.cxx|   19 ++--
 sw/source/core/layout/trvlfrm.cxx|   39 +
 sw/source/core/txtnode/atrflyin.cxx  |3 
 sw/source/core/undo/undraw.cxx   |   31 ---
 15 files changed, 242 insertions(+), 160 deletions(-)

New commits:
commit 495b5db74f0db59395ff68bacc8d8ca67595b66e
Author: Xisco Fauli 
AuthorDate: Thu Apr 25 18:15:12 2024 +0200
Commit: Xisco Fauli 
CommitDate: Fri Apr 26 09:25:23 2024 +0200

sw: check GetUserCall

It might return nullptr
See 
https://crashreport.libreoffice.org/stats/signature/SwFEShell::ShouldObjectBeSelected(Point%20const%20&)

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

diff --git a/sw/source/core/access/accfrmobj.cxx 
b/sw/source/core/access/accfrmobj.cxx
index f78dc2d155db..004ca4ab94e0 100644
--- a/sw/source/core/access/accfrmobj.cxx
+++ b/sw/source/core/access/accfrmobj.cxx
@@ -240,13 +240,16 @@ SwRect SwAccessibleChild::GetBox( const SwAccessibleMap& 
rAccMap ) const
 // by the mpFrame case above b) for genuine SdrObject this must be set
 // if it's connected to layout
 assert(dynamic_cast(pContact));
-SwPageFrame const*const pPage(const_cast(
-pContact->GetAnchoredObj(mpDrawObj))->FindPageFrameOfAnchor());
-if (pPage) // may end up here with partial layout -> not visible
+if (pContact)
 {
-aBox = SwRect( mpDrawObj->GetCurrentBoundRect() );
-// tdf#91260 drawing object may be partially off-page
-aBox.Intersection(pPage->getFrameArea());
+SwPageFrame const*const pPage(const_cast(
+pContact->GetAnchoredObj(mpDrawObj))->FindPageFrameOfAnchor());
+if (pPage) // may end up here with partial layout -> not visible
+{
+aBox = SwRect( mpDrawObj->GetCurrentBoundRect() );
+// tdf#91260 drawing object may be partially off-page
+aBox.Intersection(pPage->getFrameArea());
+}
 }
 }
 else if ( mpWindow )
diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx
index f5a37d00ab21..1a3bed4e4c0c 100644
--- a/sw/source/core/doc/docdraw.cxx
+++ b/sw/source/core/doc/docdraw.cxx
@@ -67,6 +67,9 @@ static void lcl_AdjustPositioningAttr( SwDrawFrameFormat* 
_pFrameFormat,
 const SwContact* pContact = GetUserCall( &_rSdrObj );
 OSL_ENSURE( pContact, " - missing contact 
object." );
 
+if (!pContact)
+return;
+
 // determine position of new group object relative to its anchor frame 
position
 SwTwips nHoriRelPos = 0;
 SwTwips nVertRelPos = 0;
@@ -194,6 +197,9 @@ SwDrawContact* SwDoc::GroupSelection( SdrView& rDrawView )
 
 // Revoke anchor attribute.
 SwDrawContact *pMyContact = 
static_cast(GetUserCall(pObj));
+if (!pMyContact)
+return pNewContact;
+
 const SwFormatAnchor aAnch( pMyContact->GetFormat()->GetAnchor() );
 
 std::unique_ptr pUndo;
@@ -215,6 +221,9 @@ SwDrawContact* SwDoc::GroupSelection( SdrView& rDrawView )
 pObj = rMrkList.GetMark( i )->GetMarkedSdrObj();
 SwDrawContact *pContact = 
static_cast(GetUserCall(pObj));
 
+if (!pContact)
+continue;
+
 // #i53320#
 #if OSL_DEBUG_LEVEL > 0
 SwAnchoredDrawObject* pAnchoredDrawObj =
@@ -351,6 +360,9 @@ void SwDoc::UnGroupSelection( SdrView& rDrawView )
 {
 SwDrawContact *pContact = 
static_cast(GetUserCall(pObj));
 
+if (!pContact)
+continue;
+
 std::shared_ptr pTextBoxNode;
 if (auto pGroupFormat = pContact->GetFormat())
 pTextBoxNode = pGroupFormat->GetOtherTextBoxFormats();
diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx
index 21e557b886e4..d95dc0d17af9 100644
--- a/sw/source/core/draw/dview.cxx
+++ b/sw/source/core/draw/dview.cxx
@@ -212,10 +212,14 @@ void SwDrawView::AddCustomHdl()
 {
 const SdrMarkList  = GetMarkedObjectList();
 
-if(rMrkList.GetMarkCount() != 1 || 

core.git: Branch 'libreoffice-24-2' - download.lst

2024-04-26 Thread Xisco Fauli (via logerrit)
 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2dd760424554d597eb93fb6bc96ffddc9c5f1b18
Author: Xisco Fauli 
AuthorDate: Wed Apr 24 18:26:20 2024 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Fri Apr 26 09:13:13 2024 +0200

NotoSansHebrew: upgrade to v2.004

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

diff --git a/download.lst b/download.lst
index a84796bd26e0..40384de2b66d 100644
--- a/download.lst
+++ b/download.lst
@@ -192,8 +192,8 @@ FONT_NOTO_NASKH_ARABIC_TARBALL := NotoNaskhArabic-v2.016.zip
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-FONT_NOTO_SANS_HEBREW_SHA256SUM := 
ded809309ff924bc45834bf19afaa5693cadf17580972468f6041f5e599ddb8a
-FONT_NOTO_SANS_HEBREW_TARBALL := NotoSansHebrew-v2.003.zip
+FONT_NOTO_SANS_HEBREW_SHA256SUM := 
54b5b06b466f4de8ec8e8f988877e297ead271419f6646527046638e434815fe
+FONT_NOTO_SANS_HEBREW_TARBALL := NotoSansHebrew-v2.004.zip
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts


core.git: svx/source

2024-04-25 Thread Xisco Fauli (via logerrit)
 svx/source/dialog/svxruler.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 90548039f09d4bc773bf6879a62d544adfa175db
Author: Xisco Fauli 
AuthorDate: Thu Apr 25 15:52:29 2024 +0200
Commit: Caolán McNamara 
CommitDate: Thu Apr 25 20:47:41 2024 +0200

svx: Avoid divide by 0

See 
https://crashreport.libreoffice.org/stats/signature/SvxRuler::UpdateTabs()

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

diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index 6323583fd271..17c4edaa930d 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -1033,7 +1033,7 @@ void SvxRuler::UpdateTabs()
 lCurrentDefTabDist = mxTabStopItem->GetDefaultDistance();
 tools::Long nDefTabDist = ConvertHPosPixel(lCurrentDefTabDist);
 
-const sal_uInt16 nDefTabBuf = lPosPixel > lRightIndent || lLastTab > 
lRightIndent
+const sal_uInt16 nDefTabBuf = lPosPixel > lRightIndent || lLastTab > 
lRightIndent || nDefTabDist == 0
 ? 0
 : static_cast( (lRightIndent - lPosPixel) / 
nDefTabDist );
 


core.git: 2 commits - download.lst svgio/qa

2024-04-25 Thread Xisco Fauli (via logerrit)
 download.lst   |4 ++--
 svgio/qa/cppunit/SvgImportTest.cxx |   18 +++---
 2 files changed, 9 insertions(+), 13 deletions(-)

New commits:
commit 0669ab8167fdbe759061d5f8a230560392b53811
Author: Xisco Fauli 
AuthorDate: Wed Apr 24 18:26:20 2024 +0200
Commit: Xisco Fauli 
CommitDate: Thu Apr 25 09:21:09 2024 +0200

NotoSansHebrew: upgrade to v2.004

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

diff --git a/download.lst b/download.lst
index cf984726c09e..9989521f9094 100644
--- a/download.lst
+++ b/download.lst
@@ -192,8 +192,8 @@ FONT_NOTO_NASKH_ARABIC_TARBALL := NotoNaskhArabic-v2.018.zip
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-FONT_NOTO_SANS_HEBREW_SHA256SUM := 
ded809309ff924bc45834bf19afaa5693cadf17580972468f6041f5e599ddb8a
-FONT_NOTO_SANS_HEBREW_TARBALL := NotoSansHebrew-v2.003.zip
+FONT_NOTO_SANS_HEBREW_SHA256SUM := 
54b5b06b466f4de8ec8e8f988877e297ead271419f6646527046638e434815fe
+FONT_NOTO_SANS_HEBREW_TARBALL := NotoSansHebrew-v2.004.zip
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
commit 99757f5e3a0a56370e035c14f38f5ccde3902e2c
Author: Xisco Fauli 
AuthorDate: Wed Apr 24 17:50:23 2024 +0200
Commit: Xisco Fauli 
CommitDate: Thu Apr 25 09:21:03 2024 +0200

CppunitTest_svgio: fix mid-air collision

it was caused by 98935eef13c7d755221d79fe7d3c5869a40a7c37
"tdf#159661, tdf#160773: svgio: Add unittest"
and 7f64148507a360825e9c28ddb7077996df9fa092
"Fix a thinko in 8a97f1ba8d9ccb65b2c89106de20666311d90c30"

This partially reverts d984836834e67b5bcd618ebd5d1633138985a881
"Fix unit test after commit 98935eef13c7d755221d79fe7d3c5869a40a7c37"

Kudos to Mike for keeping Jenkins happy

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

diff --git a/svgio/qa/cppunit/SvgImportTest.cxx 
b/svgio/qa/cppunit/SvgImportTest.cxx
index 080580fd8589..01463a894dd5 100644
--- a/svgio/qa/cppunit/SvgImportTest.cxx
+++ b/svgio/qa/cppunit/SvgImportTest.cxx
@@ -1585,20 +1585,16 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf160773)
 {
 xmlDocUniquePtr pDocument = 
dumpAndParseSvg(u"/svgio/qa/cppunit/data/tdf160773.svg");
 
-const bool hasMask = countXPathNodes(pDocument, 
"/primitive2D/transform/mask"_ostr) > 0;
-const OString aXPath = hasMask ? 
"/primitive2D/transform/mask/transform"_ostr
-   : "/primitive2D/transform/transform"_ostr;
-
 // tdf#160773 Check there is a rectangle
-assertXPath(pDocument, aXPath + "/polypolygoncolor", "color"_ostr, 
"#ff");
+assertXPath(pDocument, 
"/primitive2D/transform/mask/transform/polypolygoncolor"_ostr, "color"_ostr, 
"#ff");
 
 // tdf#159661 Check there is text in the right position
-assertXPath(pDocument, aXPath + "/textsimpleportion"_ostr, 1);
-assertXPath(pDocument, aXPath + "/textsimpleportion"_ostr, "x"_ostr, "0");
-assertXPath(pDocument, aXPath + "/textsimpleportion"_ostr, "y"_ostr, "1");
-assertXPath(pDocument, aXPath + "/textsimpleportion"_ostr, "height"_ostr, 
"0");
-assertXPath(pDocument, aXPath + "/textsimpleportion"_ostr, "width"_ostr, 
"0");
-assertXPath(pDocument, aXPath + "/textsimpleportion"_ostr, "text"_ostr, 
"Red");
+assertXPath(pDocument, 
"/primitive2D/transform/mask/transform/textsimpleportion"_ostr, 1);
+assertXPath(pDocument, 
"/primitive2D/transform/mask/transform/textsimpleportion"_ostr, "x"_ostr, "0");
+assertXPath(pDocument, 
"/primitive2D/transform/mask/transform/textsimpleportion"_ostr, "y"_ostr, "1");
+assertXPath(pDocument, 
"/primitive2D/transform/mask/transform/textsimpleportion"_ostr, "height"_ostr, 
"0");
+assertXPath(pDocument, 
"/primitive2D/transform/mask/transform/textsimpleportion"_ostr, "width"_ostr, 
"0");
+assertXPath(pDocument, 
"/primitive2D/transform/mask/transform/textsimpleportion"_ostr, "text"_ostr, 
"Red");
 }
 
 CPPUNIT_TEST_FIXTURE(Test, testTdf156271)


core.git: Branch 'libreoffice-24-2' - download.lst

2024-04-25 Thread Xisco Fauli (via logerrit)
 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 644450951361025398cc8a4aeaab670eb33b0131
Author: Xisco Fauli 
AuthorDate: Wed Apr 24 17:43:27 2024 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Thu Apr 25 08:59:42 2024 +0200

NotoSerifHebrew: upgrade to v2.004

Change-Id: I857889598ad68902635e2dd349118c503a4fa70f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166590
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 
(cherry picked from commit e835642a93b6e63f168333dea1b4bc8c26275218)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166521
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/download.lst b/download.lst
index 0f16c450c5cd..a84796bd26e0 100644
--- a/download.lst
+++ b/download.lst
@@ -177,8 +177,8 @@ FONT_NOTO_SERIF_TARBALL := NotoSerif-v2.012.zip
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-FONT_NOTO_SERIF_HEBREW_SHA256SUM := 
e45c149d6c29b38b8981401f875ab4304e73a366312783c41c082eb5366d3921
-FONT_NOTO_SERIF_HEBREW_TARBALL := NotoSerifHebrew-v2.003.zip
+FONT_NOTO_SERIF_HEBREW_SHA256SUM := 
99523f4f21051495f18cbd5169ed0d1e9b395eefe770fece1844a4a7a00c46da
+FONT_NOTO_SERIF_HEBREW_TARBALL := NotoSerifHebrew-v2.004.zip
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts


core.git: download.lst

2024-04-24 Thread Xisco Fauli (via logerrit)
 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e835642a93b6e63f168333dea1b4bc8c26275218
Author: Xisco Fauli 
AuthorDate: Wed Apr 24 17:43:27 2024 +0200
Commit: Xisco Fauli 
CommitDate: Wed Apr 24 19:07:28 2024 +0200

NotoSerifHebrew: upgrade to v2.004

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

diff --git a/download.lst b/download.lst
index f3086c5cc3cb..cf984726c09e 100644
--- a/download.lst
+++ b/download.lst
@@ -177,8 +177,8 @@ FONT_NOTO_SERIF_TARBALL := NotoSerif-v2.013.zip
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-FONT_NOTO_SERIF_HEBREW_SHA256SUM := 
e45c149d6c29b38b8981401f875ab4304e73a366312783c41c082eb5366d3921
-FONT_NOTO_SERIF_HEBREW_TARBALL := NotoSerifHebrew-v2.003.zip
+FONT_NOTO_SERIF_HEBREW_SHA256SUM := 
99523f4f21051495f18cbd5169ed0d1e9b395eefe770fece1844a4a7a00c46da
+FONT_NOTO_SERIF_HEBREW_TARBALL := NotoSerifHebrew-v2.004.zip
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts


core.git: include/vcl vcl/source

2024-04-24 Thread Xisco Fauli (via logerrit)
 include/vcl/BitmapTools.hxx   |3 
 vcl/source/bitmap/BitmapArithmeticBlendFilter.cxx |   71 ++---
 vcl/source/bitmap/BitmapDarkenBlendFilter.cxx |   73 ++
 vcl/source/bitmap/BitmapLightenBlendFilter.cxx|   73 ++
 vcl/source/bitmap/BitmapMultiplyBlendFilter.cxx   |   73 ++
 vcl/source/bitmap/BitmapNormalBlendFilter.cxx |   69 ++--
 vcl/source/bitmap/BitmapScreenBlendFilter.cxx |   69 ++--
 vcl/source/bitmap/BitmapTools.cxx |   14 
 8 files changed, 138 insertions(+), 307 deletions(-)

New commits:
commit 9c079eec689c9df295d8eb1770e90cca2060b98b
Author: Xisco Fauli 
AuthorDate: Wed Apr 24 13:23:11 2024 +0200
Commit: Xisco Fauli 
CommitDate: Wed Apr 24 15:28:45 2024 +0200

vcl: Factor out common code and simplify

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

diff --git a/include/vcl/BitmapTools.hxx b/include/vcl/BitmapTools.hxx
index d321d2be79a3..4582f7305ee9 100644
--- a/include/vcl/BitmapTools.hxx
+++ b/include/vcl/BitmapTools.hxx
@@ -97,6 +97,9 @@ VCL_DLLPUBLIC bool convertBitmap32To24Plus8(BitmapEx const & 
rInput, BitmapEx &
 VCL_DLLPUBLIC Bitmap GetDownsampledBitmap(Size const& rDstSizeTwip, Point 
const& rSrcPt, Size const& rSrcSz,
 Bitmap const& rBmp, tools::Long nMaxBmpDPIX, 
tools::Long nMaxBmpDPIY);
 
+BitmapColor premultiply(const BitmapColor c);
+BitmapColor unpremultiply(const BitmapColor c);
+
 } // end vcl::bitmap
 
 #endif // INCLUDED_VCL_BITMAP_TOOLS_HXX
diff --git a/vcl/source/bitmap/BitmapArithmeticBlendFilter.cxx 
b/vcl/source/bitmap/BitmapArithmeticBlendFilter.cxx
index da52a436b6f6..d46b7bc9bd74 100644
--- a/vcl/source/bitmap/BitmapArithmeticBlendFilter.cxx
+++ b/vcl/source/bitmap/BitmapArithmeticBlendFilter.cxx
@@ -32,20 +32,6 @@ static sal_uInt8 lcl_calculate(sal_uInt8 aColor, sal_uInt8 
aColor2, double aK1,
 return std::clamp(result, 0.0, 1.0) * 255.0;
 }
 
-static BitmapColor premultiply(const BitmapColor c)
-{
-return BitmapColor(ColorAlpha, vcl::bitmap::premultiply(c.GetRed(), 
c.GetAlpha()),
-   vcl::bitmap::premultiply(c.GetGreen(), c.GetAlpha()),
-   vcl::bitmap::premultiply(c.GetBlue(), c.GetAlpha()), 
c.GetAlpha());
-}
-
-static BitmapColor unpremultiply(const BitmapColor c)
-{
-return BitmapColor(ColorAlpha, vcl::bitmap::unpremultiply(c.GetRed(), 
c.GetAlpha()),
-   vcl::bitmap::unpremultiply(c.GetGreen(), c.GetAlpha()),
-   vcl::bitmap::unpremultiply(c.GetBlue(), c.GetAlpha()), 
c.GetAlpha());
-}
-
 BitmapEx BitmapArithmeticBlendFilter::execute(double aK1, double aK2, double 
aK3, double aK4)
 {
 if (maBitmapEx.IsEmpty() || maBitmapEx2.IsEmpty())
@@ -56,49 +42,34 @@ BitmapEx BitmapArithmeticBlendFilter::execute(double aK1, 
double aK2, double aK3
 sal_Int32 nHeight = std::min(aSize.getHeight(), aSize2.getHeight());
 sal_Int32 nWidth = std::min(aSize.getWidth(), aSize2.getWidth());
 
-BitmapScopedReadAccess pReadAccess(maBitmapEx.GetBitmap());
-Bitmap aDstBitmap(Size(nWidth, nHeight), 
maBitmapEx.GetBitmap().getPixelFormat(),
-  >GetPalette());
+Bitmap aDstBitmap(Size(nWidth, nHeight), vcl::PixelFormat::N24_BPP);
 Bitmap aDstAlpha(AlphaMask(Size(nWidth, nHeight)).GetBitmap());
 
-{
-// just to be on the safe side: let the
-// ScopedAccessors get destructed before
-// copy-constructing the resulting bitmap. This will
-// rule out the possibility that cached accessor data
-// is not yet written back.
+BitmapScopedWriteAccess pWriteAccess(aDstBitmap);
+BitmapScopedWriteAccess pAlphaWriteAccess(aDstAlpha);
 
-BitmapScopedWriteAccess pWriteAccess(aDstBitmap);
-BitmapScopedWriteAccess pAlphaWriteAccess(aDstAlpha);
-
-if (pWriteAccess.get() != nullptr && pAlphaWriteAccess.get() != 
nullptr)
-{
-for (tools::Long y(0); y < nHeight; ++y)
-{
-Scanline pScanline = pWriteAccess->GetScanline(y);
-Scanline pScanAlpha = pAlphaWriteAccess->GetScanline(y);
-for (tools::Long x(0); x < nWidth; ++x)
-{
-BitmapColor i1 = premultiply(maBitmapEx.GetPixelColor(x, 
y));
-BitmapColor i2 = premultiply(maBitmapEx2.GetPixelColor(x, 
y));
-sal_uInt8 r(lcl_calculate(i1.GetRed(), i2.GetRed(), aK1, 
aK2, aK3, aK4));
-sal_uInt8 g(lcl_calculate(i1.GetGreen(), i2.GetGreen(), 
aK1, aK2, aK3, aK4));
-sal_uInt8 b(lcl_calculate(i1.GetBlue(), i2.GetBlue(), aK1, 
aK2, aK3, aK4));
-sal_uInt8 a(lcl_calculate(i1.GetAlpha(), i2.GetAlpha(), 
aK1, aK2, aK3, 

core.git: svgio/qa

2024-04-23 Thread Xisco Fauli (via logerrit)
 svgio/qa/cppunit/SvgImportTest.cxx  |   16 
 svgio/qa/cppunit/data/tdf160773.svg |5 +
 2 files changed, 21 insertions(+)

New commits:
commit 98935eef13c7d755221d79fe7d3c5869a40a7c37
Author: Xisco Fauli 
AuthorDate: Tue Apr 23 11:54:47 2024 +0200
Commit: Xisco Fauli 
CommitDate: Tue Apr 23 14:05:04 2024 +0200

tdf#159661, tdf#160773: svgio: Add unittest

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

diff --git a/svgio/qa/cppunit/SvgImportTest.cxx 
b/svgio/qa/cppunit/SvgImportTest.cxx
index 817980d00421..ee9a61deebc3 100644
--- a/svgio/qa/cppunit/SvgImportTest.cxx
+++ b/svgio/qa/cppunit/SvgImportTest.cxx
@@ -1581,6 +1581,22 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf156837)
 assertXPath(pDocument, "/primitive2D/transform/textsimpleportion[2]"_ostr, 
"text"_ostr, "3");
 }
 
+CPPUNIT_TEST_FIXTURE(Test, testTdf160773)
+{
+xmlDocUniquePtr pDocument = 
dumpAndParseSvg(u"/svgio/qa/cppunit/data/tdf160773.svg");
+
+// tdf#160773 Check there is a rectangle
+assertXPath(pDocument, 
"/primitive2D/transform/transform/polypolygoncolor"_ostr, "color"_ostr, 
"#ff");
+
+// tdf#159661 Check there is text in the right position
+assertXPath(pDocument, 
"/primitive2D/transform/transform/textsimpleportion"_ostr, 1);
+assertXPath(pDocument, 
"/primitive2D/transform/transform/textsimpleportion"_ostr, "x"_ostr, "0");
+assertXPath(pDocument, 
"/primitive2D/transform/transform/textsimpleportion"_ostr, "y"_ostr, "1");
+assertXPath(pDocument, 
"/primitive2D/transform/transform/textsimpleportion"_ostr, "height"_ostr, "0");
+assertXPath(pDocument, 
"/primitive2D/transform/transform/textsimpleportion"_ostr, "width"_ostr, "0");
+assertXPath(pDocument, 
"/primitive2D/transform/transform/textsimpleportion"_ostr, "text"_ostr, "Red");
+}
+
 CPPUNIT_TEST_FIXTURE(Test, testTdf156271)
 {
 xmlDocUniquePtr pDocument = 
dumpAndParseSvg(u"/svgio/qa/cppunit/data/tdf156271.svg");
diff --git a/svgio/qa/cppunit/data/tdf160773.svg 
b/svgio/qa/cppunit/data/tdf160773.svg
new file mode 100644
index ..812c0824862c
--- /dev/null
+++ b/svgio/qa/cppunit/data/tdf160773.svg
@@ -0,0 +1,5 @@
+
+http://www.w3.org/2000/svg;>
+   Red
+   
+


core.git: include/vcl svgio/qa svgio/source vcl/Library_vcl.mk vcl/qa vcl/source

2024-04-22 Thread Xisco Fauli (via logerrit)
 include/vcl/BitmapNormalBlendFilter.hxx   |   29 ++
 svgio/qa/cppunit/SvgImportTest.cxx|   60 
 svgio/source/svgreader/svgfeblendnode.cxx |  124 --
 vcl/Library_vcl.mk|1 
 vcl/qa/cppunit/BitmapFilterTest.cxx   |   57 +++
 vcl/source/bitmap/BitmapNormalBlendFilter.cxx |  104 +
 6 files changed, 294 insertions(+), 81 deletions(-)

New commits:
commit 851f60697d32849454528e5f14ed80446b330e0c
Author: Xisco Fauli 
AuthorDate: Mon Apr 22 16:38:35 2024 +0200
Commit: Xisco Fauli 
CommitDate: Mon Apr 22 18:43:08 2024 +0200

tdf#159660: also add normal blend filter

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

diff --git a/include/vcl/BitmapNormalBlendFilter.hxx 
b/include/vcl/BitmapNormalBlendFilter.hxx
new file mode 100644
index ..f89ea848d5cc
--- /dev/null
+++ b/include/vcl/BitmapNormalBlendFilter.hxx
@@ -0,0 +1,29 @@
+/* -*- 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/.
+ *
+ */
+
+#ifndef INCLUDED_VCL_BITMAPNORMALBLENDFILTER_HXX
+#define INCLUDED_VCL_BITMAPNORMALBLENDFILTER_HXX
+
+#include 
+
+class VCL_DLLPUBLIC BitmapNormalBlendFilter
+{
+private:
+BitmapEx maBitmapEx;
+BitmapEx maBitmapEx2;
+
+public:
+BitmapNormalBlendFilter(BitmapEx const& rBmpEx, BitmapEx const& rBmpEx2);
+
+virtual ~BitmapNormalBlendFilter();
+BitmapEx execute();
+};
+#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/qa/cppunit/SvgImportTest.cxx 
b/svgio/qa/cppunit/SvgImportTest.cxx
index 31eb63c6075b..817980d00421 100644
--- a/svgio/qa/cppunit/SvgImportTest.cxx
+++ b/svgio/qa/cppunit/SvgImportTest.cxx
@@ -176,24 +176,48 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf155819)
 assertXPath(pDocument, "/primitive2D/transform/transform"_ostr, 4);
 }
 
-CPPUNIT_TEST_FIXTURE(Test, testFilterFeBlend)
-{
-xmlDocUniquePtr pDocument = 
dumpAndParseSvg(u"/svgio/qa/cppunit/data/filterFeBlend.svg");
-
-assertXPath(pDocument, 
"/primitive2D/transform/transform/polypolygoncolor[1]"_ostr, "color"_ostr, 
"#8a2be2");
-assertXPath(pDocument, 
"/primitive2D/transform/transform/polypolygoncolor[1]/polypolygon"_ostr, 
"height"_ostr, "100");
-assertXPath(pDocument, 
"/primitive2D/transform/transform/polypolygoncolor[1]/polypolygon"_ostr, 
"width"_ostr, "100");
-assertXPath(pDocument, 
"/primitive2D/transform/transform/polypolygoncolor[1]/polypolygon"_ostr, 
"minx"_ostr, "70");
-assertXPath(pDocument, 
"/primitive2D/transform/transform/polypolygoncolor[1]/polypolygon"_ostr, 
"miny"_ostr, "70");
-assertXPath(pDocument, 
"/primitive2D/transform/transform/polypolygoncolor[1]/polypolygon"_ostr, 
"maxx"_ostr, "170");
-assertXPath(pDocument, 
"/primitive2D/transform/transform/polypolygoncolor[1]/polypolygon"_ostr, 
"maxy"_ostr, "170");
-assertXPath(pDocument, 
"/primitive2D/transform/transform/polypolygoncolor[2]"_ostr, "color"_ostr, 
"#ffd700");
-assertXPath(pDocument, 
"/primitive2D/transform/transform/polypolygoncolor[2]/polypolygon"_ostr, 
"height"_ostr, "100");
-assertXPath(pDocument, 
"/primitive2D/transform/transform/polypolygoncolor[2]/polypolygon"_ostr, 
"width"_ostr, "100");
-assertXPath(pDocument, 
"/primitive2D/transform/transform/polypolygoncolor[2]/polypolygon"_ostr, 
"minx"_ostr, "30");
-assertXPath(pDocument, 
"/primitive2D/transform/transform/polypolygoncolor[2]/polypolygon"_ostr, 
"miny"_ostr, "30");
-assertXPath(pDocument, 
"/primitive2D/transform/transform/polypolygoncolor[2]/polypolygon"_ostr, 
"maxx"_ostr, "130");
-assertXPath(pDocument, 
"/primitive2D/transform/transform/polypolygoncolor[2]/polypolygon"_ostr, 
"maxy"_ostr, "130");
+CPPUNIT_TEST_FIXTURE(Test, testNormalBlend)
+{
+xmlDocUniquePtr pDocument = 
dumpAndParseSvg(u"/svgio/qa/cppunit/data/normalBlend.svg");
+
+assertXPath(pDocument,
+"/primitive2D/transform/transform/bitmap"_ostr, "height"_ostr, 
"170");
+assertXPath(pDocument,
+"/primitive2D/transform/transform/bitmap"_ostr, "width"_ostr, 
"170");
+assertXPath(pDocument,
+"/primitive2D/transform/transform/bitmap/data"_ostr, 170);
+
+assertXPath(pDocument,
+"/primitive2D/transform/transform/bitmap"_ostr, "xy11"_ostr, 
"170");
+assertXPath(pDocument,
+"/primitive2D/transform/transform/bitmap"_ostr, "xy12"_ostr, "0");
+assertXPath(pDocument,
+"/primitive2D/transform/transform/bitmap"_ostr, "xy13"_ostr, "0");
+assertXPath(pDocument,
+

core.git: drawinglayer/source include/drawinglayer svgio/qa svgio/source

2024-04-22 Thread Xisco Fauli (via logerrit)
 drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx |3 
 drawinglayer/source/primitive2d/glowprimitive2d.cxx  |3 
 drawinglayer/source/primitive2d/patternfillprimitive2d.cxx   |6 
 drawinglayer/source/primitive2d/shadowprimitive2d.cxx|3 
 drawinglayer/source/primitive2d/softedgeprimitive2d.cxx  |3 
 drawinglayer/source/processor2d/d2dpixelprocessor2d.cxx  |5 
 drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx   |8 -
 drawinglayer/source/tools/converters.cxx |   24 +--
 include/drawinglayer/converters.hxx  |8 -
 svgio/qa/cppunit/SvgImportTest.cxx   |   76 ---
 svgio/qa/cppunit/data/tdf160782.svg  |   43 ++
 svgio/source/svgreader/svgfeblendnode.cxx|   24 +--
 svgio/source/svgreader/svgfecompositenode.cxx|   24 +--
 13 files changed, 151 insertions(+), 79 deletions(-)

New commits:
commit 1097686ebddd48b78816d87524caadd17b788c23
Author: Xisco Fauli 
AuthorDate: Mon Apr 22 15:30:05 2024 +0200
Commit: Xisco Fauli 
CommitDate: Mon Apr 22 17:38:15 2024 +0200

tdf#160782: convert to bitmapEx from 0,0 to width,height

This is the way it's done everywhere.
Partially revert 4b6e0f2c88debaedb514c868e061c21e15215b6e
"tdf#160726, tdf#48062: Simplify how BitmapExs are created"

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

diff --git a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx 
b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
index e50e59a1d76d..22a20f095d24 100644
--- a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
+++ b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
@@ -147,7 +147,8 @@ namespace drawinglayer::unorenderer
 convertToBitmapEx(
 std::move(xEmbedSeq),
 aViewInformation2D,
-basegfx::B2DRange(0, 0, nDiscreteWidth, 
nDiscreteHeight),
+nDiscreteWidth,
+nDiscreteHeight,
 MaximumQuadraticPixels));
 
 if(!aBitmapEx.IsEmpty())
diff --git a/drawinglayer/source/primitive2d/glowprimitive2d.cxx 
b/drawinglayer/source/primitive2d/glowprimitive2d.cxx
index 5cec7a46f532..6bf9dea8af83 100644
--- a/drawinglayer/source/primitive2d/glowprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/glowprimitive2d.cxx
@@ -176,8 +176,7 @@ void GlowPrimitive2D::create2DDecomposition(
 // I have now added a helper that just creates the mask without having
 // to render the content, use it, it's faster
 const AlphaMask aAlpha(::drawinglayer::createAlphaMask(
-std::move(xEmbedSeq), aViewInformation2D,
-basegfx::B2DRange(0, 0, nDiscreteClippedWidth, nDiscreteClippedHeight),
+std::move(xEmbedSeq), aViewInformation2D, nDiscreteClippedWidth, 
nDiscreteClippedHeight,
 nMaximumQuadraticPixels));
 
 if (aAlpha.IsEmpty())
diff --git a/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx 
b/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx
index 8068a386970c..516b0042d960 100644
--- a/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx
@@ -136,7 +136,8 @@ namespace drawinglayer::primitive2d
 convertToBitmapEx(
 std::move(xEmbedSeq),
 aViewInformation2D,
-basegfx::B2DRange(0, 0, mnDiscreteWidth, 
mnDiscreteHeight),
+mnDiscreteWidth,
+mnDiscreteHeight,
 mnDiscreteWidth * mnDiscreteHeight));
 
 if(!aBitmapEx.IsEmpty())
@@ -196,7 +197,8 @@ namespace drawinglayer::primitive2d
 return convertToBitmapEx(
 std::move(xEmbedSeq),
 aViewInformation2D,
-basegfx::B2DRange(0, 0, nWidth, nHeight),
+nWidth,
+nHeight,
 nWidth * nHeight);
 }
 
diff --git a/drawinglayer/source/primitive2d/shadowprimitive2d.cxx 
b/drawinglayer/source/primitive2d/shadowprimitive2d.cxx
index c32f37bd9e8e..5de34c5440b6 100644
--- a/drawinglayer/source/primitive2d/shadowprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/shadowprimitive2d.cxx
@@ -217,8 +217,7 @@ void ShadowPrimitive2D::create2DDecomposition(
 // I have now added a helper that just creates the mask without having
 // to render the content, use it, it's faster
 const AlphaMask aAlpha(::drawinglayer::createAlphaMask(
-std::move(xEmbedSeq), aViewInformation2D,
-basegfx::B2DRange(0, 0, 

core.git: include/vcl svgio/inc svgio/qa svgio/source vcl/Library_vcl.mk vcl/qa vcl/source

2024-04-22 Thread Xisco Fauli (via logerrit)
 include/vcl/BitmapLightenBlendFilter.hxx   |   29 ++
 svgio/inc/svgfeblendnode.hxx   |1 
 svgio/qa/cppunit/SvgImportTest.cxx |   44 ++
 svgio/qa/cppunit/data/lightenBlend.svg |8 +
 svgio/source/svgreader/svgfeblendnode.cxx  |   10 ++
 vcl/Library_vcl.mk |1 
 vcl/qa/cppunit/BitmapFilterTest.cxx|   57 +
 vcl/source/bitmap/BitmapLightenBlendFilter.cxx |  109 +
 8 files changed, 259 insertions(+)

New commits:
commit 41368edc6e2b16d4e0ea89b822064bb75dfadc01
Author: Xisco Fauli 
AuthorDate: Mon Apr 22 13:49:45 2024 +0200
Commit: Xisco Fauli 
CommitDate: Mon Apr 22 15:20:16 2024 +0200

tdf#159660: Add support for lighten mode in feBlend

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

diff --git a/include/vcl/BitmapLightenBlendFilter.hxx 
b/include/vcl/BitmapLightenBlendFilter.hxx
new file mode 100644
index ..e17a34dc8efd
--- /dev/null
+++ b/include/vcl/BitmapLightenBlendFilter.hxx
@@ -0,0 +1,29 @@
+/* -*- 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/.
+ *
+ */
+
+#ifndef INCLUDED_VCL_BITMAPLIGHTENBLENDFILTER_HXX
+#define INCLUDED_VCL_BITMAPLIGHTENBLENDFILTER_HXX
+
+#include 
+
+class VCL_DLLPUBLIC BitmapLightenBlendFilter
+{
+private:
+BitmapEx maBitmapEx;
+BitmapEx maBitmapEx2;
+
+public:
+BitmapLightenBlendFilter(BitmapEx const& rBmpEx, BitmapEx const& rBmpEx2);
+
+virtual ~BitmapLightenBlendFilter();
+BitmapEx execute();
+};
+#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/inc/svgfeblendnode.hxx b/svgio/inc/svgfeblendnode.hxx
index 7e6a6c747ea4..ef0a1952b1e6 100644
--- a/svgio/inc/svgfeblendnode.hxx
+++ b/svgio/inc/svgfeblendnode.hxx
@@ -27,6 +27,7 @@ namespace svgio::svgreader
 enum class Mode
 {
 Darken,
+Lighten,
 Multiply,
 Normal,
 Screen
diff --git a/svgio/qa/cppunit/SvgImportTest.cxx 
b/svgio/qa/cppunit/SvgImportTest.cxx
index 87aa04887d2f..abf7f58c848b 100644
--- a/svgio/qa/cppunit/SvgImportTest.cxx
+++ b/svgio/qa/cppunit/SvgImportTest.cxx
@@ -1909,6 +1909,50 @@ CPPUNIT_TEST_FIXTURE(Test, testDarkenBlend)
 CPPUNIT_ASSERT_EQUAL(OUString("008000"), aPixels[125]);
 }
 
+CPPUNIT_TEST_FIXTURE(Test, testLightenBlend)
+{
+xmlDocUniquePtr pDocument = 
dumpAndParseSvg(u"/svgio/qa/cppunit/data/lightenBlend.svg");
+
+assertXPath(pDocument,
+"/primitive2D/transform/transform/bitmap"_ostr, "height"_ostr, 
"150");
+assertXPath(pDocument,
+"/primitive2D/transform/transform/bitmap"_ostr, "width"_ostr, 
"150");
+assertXPath(pDocument,
+"/primitive2D/transform/transform/bitmap/data"_ostr, 150);
+
+assertXPath(pDocument,
+"/primitive2D/transform/transform/bitmap"_ostr, "xy11"_ostr, 
"150");
+assertXPath(pDocument,
+"/primitive2D/transform/transform/bitmap"_ostr, "xy12"_ostr, "0");
+assertXPath(pDocument,
+"/primitive2D/transform/transform/bitmap"_ostr, "xy13"_ostr, "20");
+assertXPath(pDocument,
+"/primitive2D/transform/transform/bitmap"_ostr, "xy21"_ostr, "0");
+assertXPath(pDocument,
+"/primitive2D/transform/transform/bitmap"_ostr, "xy22"_ostr, 
"150");
+assertXPath(pDocument,
+"/primitive2D/transform/transform/bitmap"_ostr, "xy23"_ostr, "20");
+assertXPath(pDocument,
+"/primitive2D/transform/transform/bitmap"_ostr, "xy31"_ostr, "0");
+assertXPath(pDocument,
+"/primitive2D/transform/transform/bitmap"_ostr, "xy32"_ostr, "0");
+assertXPath(pDocument,
+"/primitive2D/transform/transform/bitmap"_ostr, "xy33"_ostr, "1");
+
+// Check the colors in the diagonal
+OUString sDataRow = getXPath(pDocument, 
"/primitive2D/transform/transform/bitmap/data[25]"_ostr, "row"_ostr);
+std::vector aPixels = comphelper::string::split(sDataRow, ',');
+CPPUNIT_ASSERT_EQUAL(OUString("ff"), aPixels[25]);
+
+sDataRow = getXPath(pDocument, 
"/primitive2D/transform/transform/bitmap/data[75]"_ostr, "row"_ostr);
+aPixels = comphelper::string::split(sDataRow, ',');
+CPPUNIT_ASSERT_EQUAL(OUString("ff8000"), aPixels[75]);
+
+sDataRow = getXPath(pDocument, 
"/primitive2D/transform/transform/bitmap/data[125]"_ostr, "row"_ostr);
+aPixels = comphelper::string::split(sDataRow, ',');
+CPPUNIT_ASSERT_EQUAL(OUString("008000"), aPixels[125]);
+}
+
 CPPUNIT_TEST_FIXTURE(Test, testTdf149880)
 {
 xmlDocUniquePtr pDocument = 

core.git: 2 commits - include/vcl svgio/inc svgio/qa svgio/source vcl/Library_vcl.mk vcl/qa vcl/source

2024-04-22 Thread Xisco Fauli (via logerrit)
 include/vcl/BitmapDarkenBlendFilter.hxx |   29 ++
 include/vcl/BitmapMultiplyBlendFilter.hxx   |   29 ++
 svgio/inc/svgfeblendnode.hxx|2 
 svgio/qa/cppunit/SvgImportTest.cxx  |   88 ++
 svgio/qa/cppunit/data/darkenBlend.svg   |8 +
 svgio/qa/cppunit/data/multiplyBlend.svg |8 +
 svgio/source/svgreader/svgfeblendnode.cxx   |   30 +-
 vcl/Library_vcl.mk  |2 
 vcl/qa/cppunit/BitmapFilterTest.cxx |  114 
 vcl/source/bitmap/BitmapDarkenBlendFilter.cxx   |  109 ++
 vcl/source/bitmap/BitmapMultiplyBlendFilter.cxx |  109 ++
 11 files changed, 525 insertions(+), 3 deletions(-)

New commits:
commit a9f1b705275ef9abbcf17366d8f3713235dd4675
Author: Xisco Fauli 
AuthorDate: Mon Apr 22 13:32:15 2024 +0200
Commit: Xisco Fauli 
CommitDate: Mon Apr 22 14:55:44 2024 +0200

tdf#159660: Add support for darken mode in feBlend

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

diff --git a/include/vcl/BitmapDarkenBlendFilter.hxx 
b/include/vcl/BitmapDarkenBlendFilter.hxx
new file mode 100644
index ..ea017e13e0fa
--- /dev/null
+++ b/include/vcl/BitmapDarkenBlendFilter.hxx
@@ -0,0 +1,29 @@
+/* -*- 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/.
+ *
+ */
+
+#ifndef INCLUDED_VCL_BITMAPDARKENBLENDFILTER_HXX
+#define INCLUDED_VCL_BITMAPDARKENBLENDFILTER_HXX
+
+#include 
+
+class VCL_DLLPUBLIC BitmapDarkenBlendFilter
+{
+private:
+BitmapEx maBitmapEx;
+BitmapEx maBitmapEx2;
+
+public:
+BitmapDarkenBlendFilter(BitmapEx const& rBmpEx, BitmapEx const& rBmpEx2);
+
+virtual ~BitmapDarkenBlendFilter();
+BitmapEx execute();
+};
+#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/inc/svgfeblendnode.hxx b/svgio/inc/svgfeblendnode.hxx
index 86c79a4d353a..7e6a6c747ea4 100644
--- a/svgio/inc/svgfeblendnode.hxx
+++ b/svgio/inc/svgfeblendnode.hxx
@@ -26,6 +26,7 @@ namespace svgio::svgreader
 {
 enum class Mode
 {
+Darken,
 Multiply,
 Normal,
 Screen
diff --git a/svgio/qa/cppunit/SvgImportTest.cxx 
b/svgio/qa/cppunit/SvgImportTest.cxx
index 8a97d5b93302..87aa04887d2f 100644
--- a/svgio/qa/cppunit/SvgImportTest.cxx
+++ b/svgio/qa/cppunit/SvgImportTest.cxx
@@ -1865,6 +1865,50 @@ CPPUNIT_TEST_FIXTURE(Test, testMultiplyBlend)
 CPPUNIT_ASSERT_EQUAL(OUString("008000"), aPixels[125]);
 }
 
+CPPUNIT_TEST_FIXTURE(Test, testDarkenBlend)
+{
+xmlDocUniquePtr pDocument = 
dumpAndParseSvg(u"/svgio/qa/cppunit/data/darkenBlend.svg");
+
+assertXPath(pDocument,
+"/primitive2D/transform/transform/bitmap"_ostr, "height"_ostr, 
"150");
+assertXPath(pDocument,
+"/primitive2D/transform/transform/bitmap"_ostr, "width"_ostr, 
"150");
+assertXPath(pDocument,
+"/primitive2D/transform/transform/bitmap/data"_ostr, 150);
+
+assertXPath(pDocument,
+"/primitive2D/transform/transform/bitmap"_ostr, "xy11"_ostr, 
"150");
+assertXPath(pDocument,
+"/primitive2D/transform/transform/bitmap"_ostr, "xy12"_ostr, "0");
+assertXPath(pDocument,
+"/primitive2D/transform/transform/bitmap"_ostr, "xy13"_ostr, "20");
+assertXPath(pDocument,
+"/primitive2D/transform/transform/bitmap"_ostr, "xy21"_ostr, "0");
+assertXPath(pDocument,
+"/primitive2D/transform/transform/bitmap"_ostr, "xy22"_ostr, 
"150");
+assertXPath(pDocument,
+"/primitive2D/transform/transform/bitmap"_ostr, "xy23"_ostr, "20");
+assertXPath(pDocument,
+"/primitive2D/transform/transform/bitmap"_ostr, "xy31"_ostr, "0");
+assertXPath(pDocument,
+"/primitive2D/transform/transform/bitmap"_ostr, "xy32"_ostr, "0");
+assertXPath(pDocument,
+"/primitive2D/transform/transform/bitmap"_ostr, "xy33"_ostr, "1");
+
+// Check the colors in the diagonal
+OUString sDataRow = getXPath(pDocument, 
"/primitive2D/transform/transform/bitmap/data[25]"_ostr, "row"_ostr);
+std::vector aPixels = comphelper::string::split(sDataRow, ',');
+CPPUNIT_ASSERT_EQUAL(OUString("ff"), aPixels[25]);
+
+sDataRow = getXPath(pDocument, 
"/primitive2D/transform/transform/bitmap/data[75]"_ostr, "row"_ostr);
+aPixels = comphelper::string::split(sDataRow, ',');
+CPPUNIT_ASSERT_EQUAL(OUString("00"), aPixels[75]);
+
+sDataRow = getXPath(pDocument, 
"/primitive2D/transform/transform/bitmap/data[125]"_ostr, "row"_ostr);
+aPixels = 

core.git: Branch 'libreoffice-7-6' - 2 commits - download.lst framework/source

2024-04-22 Thread Xisco Fauli (via logerrit)
 download.lst  |4 ++--
 framework/source/uielement/menubarmanager.cxx |   11 ++-
 2 files changed, 12 insertions(+), 3 deletions(-)

New commits:
commit 6c8e7c60bd2b213ba3021eeacfb93f08a86d660c
Author: Xisco Fauli 
AuthorDate: Mon Mar 25 11:23:27 2024 +0100
Commit: Christian Lohmaier 
CommitDate: Mon Apr 22 14:09:08 2024 +0200

postgresql: upgrade to release 13.14

Change-Id: Ia9607fd9c8dad9d5936e867ad76b18a476f1057f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165278
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 
(cherry picked from commit e311a6a09d753fb566f248d653434f10a4645e63)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165238
Reviewed-by: Christian Lohmaier 

diff --git a/download.lst b/download.lst
index 5294f74dc6aa..b50ccbe3ebb2 100644
--- a/download.lst
+++ b/download.lst
@@ -465,8 +465,8 @@ POPPLER_DATA_TARBALL := poppler-data-0.4.12.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-POSTGRESQL_SHA256SUM := 
4992ff647203566b670d4e54dc5317499a26856c93576d0ea951bdf6bee50bfb
-POSTGRESQL_TARBALL := postgresql-13.11.tar.bz2
+POSTGRESQL_SHA256SUM := 
b8df078551898960bd500dc5d38a177e9905376df81fe7f2b660a1407fa6a5ed
+POSTGRESQL_TARBALL := postgresql-13.14.tar.bz2
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
commit 83ac63d00243467ddaa9ed8031a8fa8ada20d1fb
Author: Michael Stahl 
AuthorDate: Wed Mar 20 21:42:50 2024 +0100
Commit: Christian Lohmaier 
CommitDate: Mon Apr 22 14:08:56 2024 +0200

framework: MenuBarManager: fix WNT crash if queryDispatch() throws

a Java extension throws RuntimeException from queryDispatch(), which is
translated to a C++ exception and thrown by the mscx_uno bridge, and this
is apparently not handled anywhere (Visual Studio says "Unhandled
Exception"), and what happens then apparently is the exception goes poof
and vanishes, and normal return from the mscx_uno bridge code happens,
but the out parameter used for the return value is never initialised, and
then the uno::Reference move assignment operator crashes.

Change-Id: I21535fcf0ab4ec30a712d01b5039b7e2fb7b09d7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165081
Tested-by: Michael Stahl 
Reviewed-by: Michael Stahl 
(cherry picked from commit 447a15f4772bcbc9366cfa43b92c55ae644e9b03)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165114
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/framework/source/uielement/menubarmanager.cxx 
b/framework/source/uielement/menubarmanager.cxx
index edbd88d2250c..fce1929d28e7 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -664,7 +664,16 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu, bool )
 if ( aTargetURL.Complete.startsWith( ".uno:StyleApply?" ) )
 xMenuItemDispatch = new StyleDispatcher( m_xFrame, 
m_xURLTransformer, aTargetURL );
 else
-xMenuItemDispatch = xDispatchProvider->queryDispatch( 
aTargetURL, menuItemHandler->aTargetFrame, 0 );
+{
+try
+{
+xMenuItemDispatch = xDispatchProvider->queryDispatch( 
aTargetURL, menuItemHandler->aTargetFrame, 0 );
+}
+catch (uno::Exception const&)
+{
+TOOLS_WARN_EXCEPTION("fwk.uielement", 
"MenuBarManager::Activate(): exception from queryDispatch()");
+}
+}
 
 bool bPopupMenu( false );
 if ( !menuItemHandler->xPopupMenuController.is() &&


core.git: svgio/qa vcl/source

2024-04-22 Thread Xisco Fauli (via logerrit)
 svgio/qa/cppunit/SvgImportTest.cxx|   44 ++
 svgio/qa/cppunit/data/screenBlend.svg |8 
 vcl/source/bitmap/BitmapScreenBlendFilter.cxx |   21 ++--
 3 files changed, 70 insertions(+), 3 deletions(-)

New commits:
commit 357e390be47f774aab8ffb09015aaf312abff06b
Author: Xisco Fauli 
AuthorDate: Mon Apr 22 12:00:55 2024 +0200
Commit: Xisco Fauli 
CommitDate: Mon Apr 22 13:31:44 2024 +0200

tdf#159660: premultiply colors for screen blend

This is needed after 4b6e0f2c88debaedb514c868e061c21e15215b6e
"tdf#160726, tdf#48062: Simplify how BitmapExs are created"
Otherwise, only the common area is displayed

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

diff --git a/svgio/qa/cppunit/SvgImportTest.cxx 
b/svgio/qa/cppunit/SvgImportTest.cxx
index 93d43fae85e2..c336458df004 100644
--- a/svgio/qa/cppunit/SvgImportTest.cxx
+++ b/svgio/qa/cppunit/SvgImportTest.cxx
@@ -1777,6 +1777,50 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf160726)
 CPPUNIT_ASSERT_EQUAL(OUString("00"), aPixels[200]);
 }
 
+CPPUNIT_TEST_FIXTURE(Test, testScreenBlend)
+{
+xmlDocUniquePtr pDocument = 
dumpAndParseSvg(u"/svgio/qa/cppunit/data/screenBlend.svg");
+
+assertXPath(pDocument,
+"/primitive2D/transform/transform/bitmap"_ostr, "height"_ostr, 
"150");
+assertXPath(pDocument,
+"/primitive2D/transform/transform/bitmap"_ostr, "width"_ostr, 
"150");
+assertXPath(pDocument,
+"/primitive2D/transform/transform/bitmap/data"_ostr, 150);
+
+assertXPath(pDocument,
+"/primitive2D/transform/transform/bitmap"_ostr, "xy11"_ostr, 
"150");
+assertXPath(pDocument,
+"/primitive2D/transform/transform/bitmap"_ostr, "xy12"_ostr, "0");
+assertXPath(pDocument,
+"/primitive2D/transform/transform/bitmap"_ostr, "xy13"_ostr, "20");
+assertXPath(pDocument,
+"/primitive2D/transform/transform/bitmap"_ostr, "xy21"_ostr, "0");
+assertXPath(pDocument,
+"/primitive2D/transform/transform/bitmap"_ostr, "xy22"_ostr, 
"150");
+assertXPath(pDocument,
+"/primitive2D/transform/transform/bitmap"_ostr, "xy23"_ostr, "20");
+assertXPath(pDocument,
+"/primitive2D/transform/transform/bitmap"_ostr, "xy31"_ostr, "0");
+assertXPath(pDocument,
+"/primitive2D/transform/transform/bitmap"_ostr, "xy32"_ostr, "0");
+assertXPath(pDocument,
+"/primitive2D/transform/transform/bitmap"_ostr, "xy33"_ostr, "1");
+
+// Check the colors in the diagonal
+OUString sDataRow = getXPath(pDocument, 
"/primitive2D/transform/transform/bitmap/data[25]"_ostr, "row"_ostr);
+std::vector aPixels = comphelper::string::split(sDataRow, ',');
+CPPUNIT_ASSERT_EQUAL(OUString("ff"), aPixels[25]);
+
+sDataRow = getXPath(pDocument, 
"/primitive2D/transform/transform/bitmap/data[75]"_ostr, "row"_ostr);
+aPixels = comphelper::string::split(sDataRow, ',');
+CPPUNIT_ASSERT_EQUAL(OUString("ff8000"), aPixels[75]);
+
+sDataRow = getXPath(pDocument, 
"/primitive2D/transform/transform/bitmap/data[125]"_ostr, "row"_ostr);
+aPixels = comphelper::string::split(sDataRow, ',');
+CPPUNIT_ASSERT_EQUAL(OUString("008000"), aPixels[125]);
+}
+
 CPPUNIT_TEST_FIXTURE(Test, testTdf149880)
 {
 xmlDocUniquePtr pDocument = 
dumpAndParseSvg(u"/svgio/qa/cppunit/data/tdf149880.svg");
diff --git a/svgio/qa/cppunit/data/screenBlend.svg 
b/svgio/qa/cppunit/data/screenBlend.svg
new file mode 100644
index ..6f1490983f68
--- /dev/null
+++ b/svgio/qa/cppunit/data/screenBlend.svg
@@ -0,0 +1,8 @@
+http://www.w3.org/2000/svg;>
+  
+
+
+
+  
+  
+
diff --git a/vcl/source/bitmap/BitmapScreenBlendFilter.cxx 
b/vcl/source/bitmap/BitmapScreenBlendFilter.cxx
index 67525a24cdf9..0964c519571d 100644
--- a/vcl/source/bitmap/BitmapScreenBlendFilter.cxx
+++ b/vcl/source/bitmap/BitmapScreenBlendFilter.cxx
@@ -30,6 +30,20 @@ static sal_uInt8 lcl_calculate(const sal_uInt8 aColor, const 
sal_uInt8 aColor2)
 return result * 255.0;
 }
 
+static BitmapColor premultiply(const BitmapColor c)
+{
+return BitmapColor(ColorAlpha, vcl::bitmap::premultiply(c.GetRed(), 
c.GetAlpha()),
+   vcl::bitmap::premultiply(c.GetGreen(), c.GetAlpha()),
+   vcl::bitmap::premultiply(c.GetBlue(), c.GetAlpha()), 
c.GetAlpha());
+}
+
+static BitmapColor unpremultiply(const BitmapColor c)
+{
+return BitmapColor(ColorAlpha, vcl::bitmap::unpremultiply(c.GetRed(), 
c.GetAlpha()),
+   vcl::bitmap::unpremultiply(c.GetGreen(), c.GetAlpha()),
+   vcl::bitmap::unpremultiply(c.GetBlue(), c.GetAlpha()), 
c.GetAlpha());
+}
+
 BitmapEx BitmapScreenBlendFilter::execute()
 {
 if (maBitmapEx.IsEmpty() || maBitmapEx2.IsEmpty())
@@ -63,14 +77,15 @@ BitmapEx 

core.git: drawinglayer/source include/drawinglayer include/vcl svgio/inc svgio/qa svgio/source vcl/source

2024-04-22 Thread Xisco Fauli (via logerrit)
 drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx |3 
 drawinglayer/source/primitive2d/glowprimitive2d.cxx  |3 
 drawinglayer/source/primitive2d/patternfillprimitive2d.cxx   |6 
 drawinglayer/source/primitive2d/shadowprimitive2d.cxx|3 
 drawinglayer/source/primitive2d/softedgeprimitive2d.cxx  |3 
 drawinglayer/source/processor2d/d2dpixelprocessor2d.cxx  |5 
 drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx   |8 
 drawinglayer/source/tools/converters.cxx |   24 -
 include/drawinglayer/converters.hxx  |8 
 include/vcl/BitmapTools.hxx  |4 
 svgio/inc/svgfilternode.hxx  |3 
 svgio/qa/cppunit/SvgImportTest.cxx   |  161 ++-
 svgio/qa/cppunit/data/arithmetic.svg |8 
 svgio/qa/cppunit/data/arithmetic2.svg|8 
 svgio/qa/cppunit/data/tdf160726.svg  |   43 ++
 svgio/source/svgreader/svgfeblendnode.cxx|   72 +++-
 svgio/source/svgreader/svgfecompositenode.cxx|   67 +++-
 svgio/source/svgreader/svgfilternode.cxx |   21 -
 vcl/source/bitmap/BitmapTools.cxx|  114 ---
 19 files changed, 345 insertions(+), 219 deletions(-)

New commits:
commit 4b6e0f2c88debaedb514c868e061c21e15215b6e
Author: Xisco Fauli 
AuthorDate: Sun Apr 21 20:41:55 2024 +0200
Commit: Xisco Fauli 
CommitDate: Mon Apr 22 11:53:41 2024 +0200

tdf#160726, tdf#48062: Simplify how BitmapExs are created

In my initial approach, I tranformed the primitive2DContainers
before converting them to BitmapEx. This caused circles like
https://bugs.documentfoundation.org/attachment.cgi?id=193790
not to be displayed.
Simplify how BitmapExs are created by just using the range both
primitive2DContainers have in common. This way, DrawBitmapInRect
can be dropped now

Change-Id: I2401dc87b98e04b9cf9f5ebade2b5622d884fc3a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166391
Tested-by: Xisco Fauli 
Reviewed-by: Xisco Fauli 

diff --git a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx 
b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
index 22a20f095d24..e50e59a1d76d 100644
--- a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
+++ b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
@@ -147,8 +147,7 @@ namespace drawinglayer::unorenderer
 convertToBitmapEx(
 std::move(xEmbedSeq),
 aViewInformation2D,
-nDiscreteWidth,
-nDiscreteHeight,
+basegfx::B2DRange(0, 0, nDiscreteWidth, 
nDiscreteHeight),
 MaximumQuadraticPixels));
 
 if(!aBitmapEx.IsEmpty())
diff --git a/drawinglayer/source/primitive2d/glowprimitive2d.cxx 
b/drawinglayer/source/primitive2d/glowprimitive2d.cxx
index 6bf9dea8af83..5cec7a46f532 100644
--- a/drawinglayer/source/primitive2d/glowprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/glowprimitive2d.cxx
@@ -176,7 +176,8 @@ void GlowPrimitive2D::create2DDecomposition(
 // I have now added a helper that just creates the mask without having
 // to render the content, use it, it's faster
 const AlphaMask aAlpha(::drawinglayer::createAlphaMask(
-std::move(xEmbedSeq), aViewInformation2D, nDiscreteClippedWidth, 
nDiscreteClippedHeight,
+std::move(xEmbedSeq), aViewInformation2D,
+basegfx::B2DRange(0, 0, nDiscreteClippedWidth, nDiscreteClippedHeight),
 nMaximumQuadraticPixels));
 
 if (aAlpha.IsEmpty())
diff --git a/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx 
b/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx
index 516b0042d960..8068a386970c 100644
--- a/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx
@@ -136,8 +136,7 @@ namespace drawinglayer::primitive2d
 convertToBitmapEx(
 std::move(xEmbedSeq),
 aViewInformation2D,
-mnDiscreteWidth,
-mnDiscreteHeight,
+basegfx::B2DRange(0, 0, mnDiscreteWidth, 
mnDiscreteHeight),
 mnDiscreteWidth * mnDiscreteHeight));
 
 if(!aBitmapEx.IsEmpty())
@@ -197,8 +196,7 @@ namespace drawinglayer::primitive2d
 return convertToBitmapEx(
 std::move(xEmbedSeq),
 aViewInformation2D,
-nWidth,
-nHeight,
+basegfx::B2DRange(0, 0, nWidth, nHeight),
 nWidth * 

core.git: svgio/inc svgio/source

2024-04-21 Thread Xisco Fauli (via logerrit)
 svgio/inc/svgfefloodnode.hxx  |1 -
 svgio/inc/svgfeimagenode.hxx  |1 -
 svgio/source/svgreader/svgfefloodnode.cxx |   11 ---
 svgio/source/svgreader/svgfeimagenode.cxx |   11 ---
 4 files changed, 24 deletions(-)

New commits:
commit ae5e743f90fbb4e7016d6d9f4c22bce971a5f5cb
Author: Xisco Fauli 
AuthorDate: Sun Apr 21 19:04:08 2024 +0200
Commit: Xisco Fauli 
CommitDate: Sun Apr 21 22:34:44 2024 +0200

svgio: feImage and feFlood don't support the in attribute

Added by mistake in b22039cff8380b158307e75762bd3e4ca045d77b
"related: tdf#159947: only parse in/result if the element supports them"

See https://developer.mozilla.org/en-US/docs/Web/SVG/Attribute/in

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

diff --git a/svgio/inc/svgfefloodnode.hxx b/svgio/inc/svgfefloodnode.hxx
index 8aba2c3b0340..39e5cb6b1890 100644
--- a/svgio/inc/svgfefloodnode.hxx
+++ b/svgio/inc/svgfefloodnode.hxx
@@ -27,7 +27,6 @@ namespace svgio::svgreader
 class SvgFeFloodNode final : public SvgFilterNode
 {
 private:
-OUString maIn;
 OUString maResult;
 SvgNumber maX;
 SvgNumber maY;
diff --git a/svgio/inc/svgfeimagenode.hxx b/svgio/inc/svgfeimagenode.hxx
index ab303fdc92fe..743568fa65ce 100644
--- a/svgio/inc/svgfeimagenode.hxx
+++ b/svgio/inc/svgfeimagenode.hxx
@@ -27,7 +27,6 @@ namespace svgio::svgreader
 class SvgFeImageNode final : public SvgFilterNode
 {
 private:
-OUString maIn;
 OUString maResult;
 OUString maUrl; // external link
 OUString maData; // base64 data
diff --git a/svgio/source/svgreader/svgfefloodnode.cxx 
b/svgio/source/svgreader/svgfefloodnode.cxx
index ede285b6d756..8ac62d79c8d9 100644
--- a/svgio/source/svgreader/svgfefloodnode.cxx
+++ b/svgio/source/svgreader/svgfefloodnode.cxx
@@ -49,11 +49,6 @@ void SvgFeFloodNode::parseAttribute(SVGToken aSVGToken, 
const OUString& aContent
 readLocalCssStyle(aContent);
 break;
 }
-case SVGToken::In:
-{
-maIn = aContent.trim();
-break;
-}
 case SVGToken::Result:
 {
 maResult = aContent.trim();
@@ -145,12 +140,6 @@ void 
SvgFeFloodNode::apply(drawinglayer::primitive2d::Primitive2DContainer& rTar
 if (fWidth <= 0.0 || fHeight <= 0.0)
 return;
 
-if (const drawinglayer::primitive2d::Primitive2DContainer* rSource
-= pParent->findGraphicSource(maIn))
-{
-rTarget = *rSource;
-}
-
 const double fX(maX.solve(*this, NumberType::xcoordinate));
 const double fY(maY.solve(*this, NumberType::ycoordinate));
 const basegfx::B2DRange aRange(fX, fY, fX + fWidth, fY + fHeight);
diff --git a/svgio/source/svgreader/svgfeimagenode.cxx 
b/svgio/source/svgreader/svgfeimagenode.cxx
index c7b1f65b8f2d..6a7e5dd9d9c3 100644
--- a/svgio/source/svgreader/svgfeimagenode.cxx
+++ b/svgio/source/svgreader/svgfeimagenode.cxx
@@ -46,11 +46,6 @@ void SvgFeImageNode::parseAttribute(SVGToken aSVGToken, 
const OUString& aContent
 readLocalCssStyle(aContent);
 break;
 }
-case SVGToken::In:
-{
-maIn = aContent.trim();
-break;
-}
 case SVGToken::Result:
 {
 maResult = aContent.trim();
@@ -79,12 +74,6 @@ void SvgFeImageNode::parseAttribute(SVGToken aSVGToken, 
const OUString& aContent
 void SvgFeImageNode::apply(drawinglayer::primitive2d::Primitive2DContainer& 
rTarget,
const SvgFilterNode* pParent) const
 {
-if (const drawinglayer::primitive2d::Primitive2DContainer* rSource
-= pParent->findGraphicSource(maIn))
-{
-rTarget = *rSource;
-}
-
 BitmapEx aBitmapEx;
 
 if (!maData.isEmpty())


core.git: svgio/qa

2024-04-20 Thread Xisco Fauli (via logerrit)
 svgio/qa/cppunit/SvgImportTest.cxx |   11 +--
 1 file changed, 1 insertion(+), 10 deletions(-)

New commits:
commit 7e0b8e74dd6de7a337ab08a8be2921aeef765117
Author: Xisco Fauli 
AuthorDate: Fri Apr 19 17:59:33 2024 +0200
Commit: Mike Kaganski 
CommitDate: Sat Apr 20 08:55:18 2024 +0200

svgio: remove duplicated assertXPathDouble

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

diff --git a/svgio/qa/cppunit/SvgImportTest.cxx 
b/svgio/qa/cppunit/SvgImportTest.cxx
index 8831dc5c9058..03daa49ff9b1 100644
--- a/svgio/qa/cppunit/SvgImportTest.cxx
+++ b/svgio/qa/cppunit/SvgImportTest.cxx
@@ -41,8 +41,6 @@ protected:
 
 Primitive2DSequence parseSvg(std::u16string_view aSource);
 xmlDocUniquePtr dumpAndParseSvg(std::u16string_view aSource);
-void assertXPathDouble(const xmlDocUniquePtr& pXmlDoc, const OString& 
rXPath,
-   const OString& rAttribute, double nExpectedValue, 
double delta);
 };
 
 Primitive2DSequence Test::parseSvg(std::u16string_view aSource)
@@ -93,13 +91,6 @@ void Test::checkRectPrimitive(Primitive2DSequence const & 
rPrimitive)
 assertXPath(pDocument, 
"/primitive2D/transform/polypolygonstroke/line"_ostr, "width"_ostr, "3"); // 
rect stroke width
 }
 
-void Test::assertXPathDouble(const xmlDocUniquePtr& pXmlDoc, const OString& 
rXPath,
- const OString& rAttribute, double nExpectedValue, 
double delta)
-{
-auto sVal = getXPath(pXmlDoc, rXPath, rAttribute);
-CPPUNIT_ASSERT_DOUBLES_EQUAL(nExpectedValue, sVal.toDouble(), delta);
-}
-
 namespace
 {
 bool arePrimitive2DSequencesEqual(const Primitive2DSequence& rA, const 
Primitive2DSequence& rB)
@@ -735,7 +726,7 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf156834)
 
 assertXPath(pDocument, "/primitive2D/transform/textsimpleportion[3]"_ostr, 
"text"_ostr, "Hanging");
 assertXPath(pDocument, "/primitive2D/transform/textsimpleportion[3]"_ostr, 
"x"_ostr, "30");
-assertXPathDouble(pDocument, 
"/primitive2D/transform/textsimpleportion[3]"_ostr, "y"_ostr, 93.5, 0.5);
+assertXPathDoubleValue(pDocument, 
"/primitive2D/transform/textsimpleportion[3]"_ostr, "y"_ostr, 93.5, 0.5);
 
 assertXPath(pDocument, "/primitive2D/transform/textsimpleportion[4]"_ostr, 
"text"_ostr, "Central");
 assertXPath(pDocument, "/primitive2D/transform/textsimpleportion[4]"_ostr, 
"x"_ostr, "30");


core.git: 2 commits - svgio/qa sw/qa vcl/source

2024-04-19 Thread Xisco Fauli (via logerrit)
 svgio/qa/cppunit/SvgImportTest.cxx   |   18 ++
 svgio/qa/cppunit/data/tdf160517.svg  |   11 +++
 sw/qa/extras/ooxmlexport/data/tdf158451.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport20.cxx   |   12 
 vcl/source/bitmap/BitmapTools.cxx|   11 ++-
 5 files changed, 43 insertions(+), 9 deletions(-)

New commits:
commit 01479c742f2680d004ea8e133e56133870023b43
Author: Xisco Fauli 
AuthorDate: Thu Apr 18 22:10:43 2024 +0200
Commit: Xisco Fauli 
CommitDate: Fri Apr 19 09:08:25 2024 +0200

tdf#160721: nothing is displayed in case of wrong 'in' reference

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

diff --git a/svgio/qa/cppunit/SvgImportTest.cxx 
b/svgio/qa/cppunit/SvgImportTest.cxx
index 3d6ef34d5857..8831dc5c9058 100644
--- a/svgio/qa/cppunit/SvgImportTest.cxx
+++ b/svgio/qa/cppunit/SvgImportTest.cxx
@@ -14,6 +14,7 @@
 #include 
 
 #include 
+#include 
 
 #include 
 #include 
@@ -1617,6 +1618,23 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf159968)
 
"/primitive2D/transform/transform/transform/transform/polypolygoncolor/polypolygon/polygon/point"_ostr,
 5);
 }
 
+CPPUNIT_TEST_FIXTURE(Test, testTdf160517)
+{
+xmlDocUniquePtr pDocument = 
dumpAndParseSvg(u"/svgio/qa/cppunit/data/tdf160517.svg");
+
+assertXPath(pDocument,
+"/primitive2D/transform/bitmap"_ostr, "height"_ostr, "100");
+assertXPath(pDocument,
+"/primitive2D/transform/bitmap"_ostr, "width"_ostr, "100");
+assertXPath(pDocument,
+"/primitive2D/transform/bitmap/data"_ostr, 100);
+
+// Check the color of a pixel in the middle
+const OUString sDataRow = getXPath(pDocument, 
"/primitive2D/transform/bitmap/data[50]"_ostr, "row"_ostr);
+std::vector aPixels = comphelper::string::split(sDataRow, ',');
+CPPUNIT_ASSERT_EQUAL(OUString("008100"), aPixels[50]);
+}
+
 CPPUNIT_TEST_FIXTURE(Test, testTdf149880)
 {
 xmlDocUniquePtr pDocument = 
dumpAndParseSvg(u"/svgio/qa/cppunit/data/tdf149880.svg");
diff --git a/svgio/qa/cppunit/data/tdf160517.svg 
b/svgio/qa/cppunit/data/tdf160517.svg
new file mode 100644
index ..ea0750c8af48
--- /dev/null
+++ b/svgio/qa/cppunit/data/tdf160517.svg
@@ -0,0 +1,11 @@
+http://www.w3.org/2000/svg; 
xmlns:xlink="http://www.w3.org/1999/xlink;>
+  
+
+  
+  
+
+
diff --git a/vcl/source/bitmap/BitmapTools.cxx 
b/vcl/source/bitmap/BitmapTools.cxx
index 204e61b57073..b5186616bb5c 100644
--- a/vcl/source/bitmap/BitmapTools.cxx
+++ b/vcl/source/bitmap/BitmapTools.cxx
@@ -516,7 +516,7 @@ BitmapEx DrawBitmapInRect( const BitmapEx& rBitmap,
 ::basegfx::B2DRectangle const & rBitmapRect,
 ::basegfx::B2DRectangle const & rDestRect )
 {
-if( rBitmapRect.isEmpty() || rDestRect.isEmpty() )
+if( rDestRect.isEmpty() )
 return BitmapEx();
 
 const Size aDestBmpSize( ::basegfx::fround( 
rDestRect.getWidth() ),
@@ -537,13 +537,6 @@ BitmapEx DrawBitmapInRect( const BitmapEx& rBitmap,
 if (rBitmap.IsAlpha())
 pAlphaReadAccess = aSrcAlpha;
 
-if( !pReadAccess || (!pAlphaReadAccess && rBitmap.IsAlpha()) )
-{
-// TODO(E2): Error handling!
-ENSURE_OR_THROW( false,
-  "DrawBitmapInRect(): could not access source bitmap" 
);
-}
-
 // mapping table, to translate pAlphaReadAccess' pixel
 // values into destination alpha values (needed e.g. for
 // paletted 1-bit masks).
@@ -561,7 +554,7 @@ BitmapEx DrawBitmapInRect( const BitmapEx& rBitmap,
 }
 // else: mapping table is not used
 
-Bitmap aDstBitmap(aDestBmpSize, aSrcBitmap.getPixelFormat(), 
>GetPalette());
+Bitmap aDstBitmap(aDestBmpSize, vcl::PixelFormat::N24_BPP);
 Bitmap aDstAlpha( AlphaMask( aDestBmpSize ).GetBitmap() );
 
 {
commit e75899a25921aa8fc7857c154326a9aca4648c27
Author: Kira Tubo 
AuthorDate: Wed Apr 3 21:17:11 2024 -0700
Commit: Xisco Fauli 
CommitDate: Fri Apr 19 09:08:14 2024 +0200

tdf#158451 - sw unit test - FILEOPEN DOCX crash

Unit text checks if DOCX file crashes when opened. Document contains grouped
shapes that is anchored "As character".

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

diff --git a/sw/qa/extras/ooxmlexport/data/tdf158451.docx 
b/sw/qa/extras/ooxmlexport/data/tdf158451.docx
new file mode 100755
index ..e206cecd556c
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf158451.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport20.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport20.cxx
index be378107df04..94f8872f263a 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport20.cxx
+++ 

core.git: svgio/inc svgio/source

2024-04-18 Thread Xisco Fauli (via logerrit)
 svgio/inc/svgfilternode.hxx   |3 ++
 svgio/source/svgreader/svgfeblendnode.cxx |   21 +---
 svgio/source/svgreader/svgfecompositenode.cxx |   27 +-
 svgio/source/svgreader/svgfilternode.cxx  |   21 
 4 files changed, 28 insertions(+), 44 deletions(-)

New commits:
commit 176406a07edc29f59a67464c7812358f46421f4d
Author: Xisco Fauli 
AuthorDate: Wed Apr 17 22:08:31 2024 +0200
Commit: Xisco Fauli 
CommitDate: Thu Apr 18 17:24:10 2024 +0200

svgio: factor out common code

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

diff --git a/svgio/inc/svgfilternode.hxx b/svgio/inc/svgfilternode.hxx
index 7aa522173a87..ec42d3c52df4 100644
--- a/svgio/inc/svgfilternode.hxx
+++ b/svgio/inc/svgfilternode.hxx
@@ -23,6 +23,7 @@
 #include "svgnode.hxx"
 #include "svgstyleattributes.hxx"
 #include 
+#include 
 
 typedef std::unordered_map
 IdGraphicSourceMapper;
@@ -46,6 +47,8 @@ public:
  drawinglayer::primitive2d::Primitive2DContainer 
pGraphicSource) const;
 const drawinglayer::primitive2d::Primitive2DContainer*
 findGraphicSource(const OUString& rStr) const;
+
+static BitmapEx convertToBitmapEx(const 
drawinglayer::primitive2d::Primitive2DContainer* pSeq);
 };
 
 } // end of namespace svgio::svgreader
diff --git a/svgio/source/svgreader/svgfeblendnode.cxx 
b/svgio/source/svgreader/svgfeblendnode.cxx
index d106ea6e643b..e1440185ff23 100644
--- a/svgio/source/svgreader/svgfeblendnode.cxx
+++ b/svgio/source/svgreader/svgfeblendnode.cxx
@@ -111,15 +111,7 @@ void 
SvgFeBlendNode::apply(drawinglayer::primitive2d::Primitive2DContainer& rTar
 {
 const drawinglayer::geometry::ViewInformation2D aViewInformation2D;
 aRange = pSource->getB2DRange(aViewInformation2D);
-basegfx::B2DHomMatrix aEmbedding(
-basegfx::utils::createTranslateB2DHomMatrix(-aRange.getMinX(), 
-aRange.getMinY()));
-aEmbedding.scale(aRange.getWidth(), aRange.getHeight());
-const drawinglayer::primitive2d::Primitive2DReference xEmbedRef(
-new drawinglayer::primitive2d::TransformPrimitive2D(
-aEmbedding, 
drawinglayer::primitive2d::Primitive2DContainer(*pSource)));
-drawinglayer::primitive2d::Primitive2DContainer xEmbedSeq{ 
xEmbedRef };
-aBmpEx = drawinglayer::convertToBitmapEx(std::move(xEmbedSeq), 
aViewInformation2D,
- aRange.getWidth(), 
aRange.getHeight(), 50);
+aBmpEx = convertToBitmapEx(pSource);
 }
 
 if (const drawinglayer::primitive2d::Primitive2DContainer* pSource2
@@ -127,16 +119,7 @@ void 
SvgFeBlendNode::apply(drawinglayer::primitive2d::Primitive2DContainer& rTar
 {
 const drawinglayer::geometry::ViewInformation2D aViewInformation2D;
 aRange2 = pSource2->getB2DRange(aViewInformation2D);
-basegfx::B2DHomMatrix 
aEmbedding(basegfx::utils::createTranslateB2DHomMatrix(
--aRange2.getMinX(), -aRange2.getMinY()));
-aEmbedding.scale(aRange2.getWidth(), aRange2.getHeight());
-const drawinglayer::primitive2d::Primitive2DReference xEmbedRef(
-new drawinglayer::primitive2d::TransformPrimitive2D(
-aEmbedding, 
drawinglayer::primitive2d::Primitive2DContainer(*pSource2)));
-drawinglayer::primitive2d::Primitive2DContainer xEmbedSeq{ 
xEmbedRef };
-aBmpEx2
-= drawinglayer::convertToBitmapEx(std::move(xEmbedSeq), 
aViewInformation2D,
-  aRange2.getWidth(), 
aRange2.getHeight(), 50);
+aBmpEx2 = convertToBitmapEx(pSource2);
 }
 
 basegfx::B2DRectangle aBaseRect(std::min(aRange.getMinX(), 
aRange2.getMinX()),
diff --git a/svgio/source/svgreader/svgfecompositenode.cxx 
b/svgio/source/svgreader/svgfecompositenode.cxx
index 28f161d7b6ce..c396eec78c0a 100644
--- a/svgio/source/svgreader/svgfecompositenode.cxx
+++ b/svgio/source/svgreader/svgfecompositenode.cxx
@@ -216,18 +216,7 @@ void 
SvgFeCompositeNode::apply(drawinglayer::primitive2d::Primitive2DContainer&
 {
 const drawinglayer::geometry::ViewInformation2D aViewInformation2D;
 aRange = pSource->getB2DRange(aViewInformation2D);
-basegfx::B2DHomMatrix aEmbedding(
-basegfx::utils::createTranslateB2DHomMatrix(-aRange.getMinX(), 
-aRange.getMinY()));
-
-aEmbedding.scale(aRange.getWidth(), aRange.getHeight());
-
-const drawinglayer::primitive2d::Primitive2DReference xEmbedRef(
-new drawinglayer::primitive2d::TransformPrimitive2D(
-aEmbedding, 

core.git: download.lst external/libwebp

2024-04-18 Thread Xisco Fauli (via logerrit)
 download.lst   |4 ++--
 external/libwebp/Makefile.vc.patch |   21 -
 2 files changed, 14 insertions(+), 11 deletions(-)

New commits:
commit f1c880463666149bcb82a2f76a1f27db71b2ae52
Author: Xisco Fauli 
AuthorDate: Wed Apr 17 16:54:13 2024 +0200
Commit: Xisco Fauli 
CommitDate: Thu Apr 18 09:47:21 2024 +0200

libwebp: Upgrade to 1.4.0

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

diff --git a/download.lst b/download.lst
index f36b5fe0da10..48e1cbde01a4 100644
--- a/download.lst
+++ b/download.lst
@@ -414,8 +414,8 @@ LIBTOMMATH_TARBALL := ltm-1.3.0.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBWEBP_SHA256SUM := 
2a499607df669e40258e53d0ade8035ba4ec0175244869d1025d460562aa09b4
-LIBWEBP_TARBALL := libwebp-1.3.2.tar.gz
+LIBWEBP_SHA256SUM := 
61f873ec69e3be1b99535634340d5bde750b2e4447caa1db9f61be3fd49ab1e5
+LIBWEBP_TARBALL := libwebp-1.4.0.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/libwebp/Makefile.vc.patch 
b/external/libwebp/Makefile.vc.patch
index 41c899921a1c..412ccf60b901 100644
--- a/external/libwebp/Makefile.vc.patch
+++ b/external/libwebp/Makefile.vc.patch
@@ -1,6 +1,6 @@
 --- Makefile.vc.sav2021-07-30 00:55:37.0 +0200
 +++ Makefile.vc2022-01-25 17:35:30.206117700 +0100
-@@ -8,11 +8,11 @@
+@@ -8,13 +8,13 @@
  LIBSHARPYUV_BASENAME = libsharpyuv
  
  !IFNDEF ARCH
@@ -10,12 +10,15 @@
 -!ELSE IF ! [ cl 2>&1 | find "x64" > NUL ]
 +!ELSE IF ! [ $(CC) 2>&1 | grep -q "x64" > NUL ]
  ARCH = x64
+-!ELSE IF ! [ cl 2>&1 | find "ARM64" > NUL ]
++!ELSE IF ! [ $(CC) 2>&1 | grep -q "ARM64" > NUL ]
+ ARCH = ARM64
 -!ELSE IF ! [ cl 2>&1 | find "ARM" > NUL ]
 +!ELSE IF ! [ $(CC) 2>&1 | grep -q "ARM" > NUL ]
  ARCH = ARM
  !ELSE
  !ERROR Unable to auto-detect toolchain architecture! \
-@@ -28,8 +28,8 @@
+@@ -30,8 +30,8 @@
  ## Nothing more to do below this line!
  
  NOLOGO = /nologo
@@ -26,7 +29,7 @@
  CFLAGS = /I. /Isrc $(NOLOGO) /W3 /EHsc /c
  CFLAGS = $(CFLAGS) /DWIN32 /D_CRT_SECURE_NO_WARNINGS /DWIN32_LEAN_AND_MEAN
  LDFLAGS= /LARGEADDRESSAWARE /MANIFEST:EMBED /NXCOMPAT /DYNAMICBASE
-@@ -67,7 +67,7 @@
+@@ -69,7 +69,7 @@
  RTLIB   = /MD
  RTLIBD  = /MDd
  !ENDIF
@@ -35,7 +38,7 @@
  DIROBJ = $(DIRBASE)\obj
  DIRLIB = $(DIRBASE)\lib
  DIRINC = $(DIRBASE)\include
-@@ -87,10 +87,10 @@
+@@ -89,10 +89,10 @@
  
  # Target configuration
  !IF "$(CFG)" == "release-static"
@@ -48,7 +51,7 @@
  RTLIB  = $(RTLIBD)
  STATICLIBBUILD = TRUE
  LIBWEBPDECODER_BASENAME = $(LIBWEBPDECODER_BASENAME)_debug
-@@ -99,11 +99,11 @@
+@@ -101,11 +101,11 @@
  LIBWEBPDEMUX_BASENAME = $(LIBWEBPDEMUX_BASENAME)_debug
  LIBSHARPYUV_BASENAME = $(LIBSHARPYUV_BASENAME)_debug
  !ELSE IF "$(CFG)" == "release-dynamic"
@@ -62,7 +65,7 @@
  RC= $(RCDEBUG)
  RTLIB = $(RTLIBD)
  DLLBUILD  = TRUE
-@@ -115,7 +115,7 @@
+@@ -117,7 +117,7 @@
  !ENDIF
  
  !IF "$(STATICLIBBUILD)" == "TRUE"
@@ -71,7 +74,7 @@
  CFGSET = TRUE
  LIBWEBPDECODER = $(DIRLIB)\$(LIBWEBPDECODER_BASENAME).lib
  LIBWEBP = $(DIRLIB)\$(LIBWEBP_BASENAME).lib
-@@ -123,7 +123,7 @@
+@@ -125,7 +125,7 @@
  LIBWEBPDEMUX = $(DIRLIB)\$(LIBWEBPDEMUX_BASENAME).lib
  LIBSHARPYUV = $(DIRLIB)\$(LIBSHARPYUV_BASENAME).lib
  !ELSE IF "$(DLLBUILD)" == "TRUE"
@@ -80,7 +83,7 @@
  LIBWEBPDECODER = $(DIRLIB)\$(LIBWEBPDECODER_BASENAME)_dll.lib
  LIBWEBP = $(DIRLIB)\$(LIBWEBP_BASENAME)_dll.lib
  LIBWEBPMUX = $(DIRLIB)\$(LIBWEBPMUX_BASENAME)_dll.lib
-@@ -434,7 +434,7 @@
+@@ -438,7 +438,7 @@
  
  !IF "$(DLLBUILD)" == "TRUE"
  {$(DIROBJ)}.c{$(DIROBJ)}.obj:
@@ -89,7 +92,7 @@
  
  {src}.rc{$(DIROBJ)}.res:
$(RC) /fo$@ $<
-@@ -467,41 +467,41 @@
+@@ -471,41 +471,41 @@
  # File-specific flag builds. Note batch rules take precedence over wildcards,
  # so for now name each file individually.
  $(DIROBJ)xamplesnim_diff.obj: examplesnim_diff.c


core.git: svgio/source

2024-04-17 Thread Xisco Fauli (via logerrit)
 svgio/source/svgreader/svgfilternode.cxx |   10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

New commits:
commit c61aeb5b87d1a69745617b1368a86b70d798ba30
Author: Xisco Fauli 
AuthorDate: Tue Apr 16 12:31:29 2024 +0200
Commit: Xisco Fauli 
CommitDate: Wed Apr 17 09:22:44 2024 +0200

svgio: map all 'in' keywords to target for now

Change-Id: I18d6c839c4005e4052397c4f6682d78c664d25ee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166145
Tested-by: Xisco Fauli 
Reviewed-by: Xisco Fauli 

diff --git a/svgio/source/svgreader/svgfilternode.cxx 
b/svgio/source/svgreader/svgfilternode.cxx
index 168d7c50d608..5b2f7e867523 100644
--- a/svgio/source/svgreader/svgfilternode.cxx
+++ b/svgio/source/svgreader/svgfilternode.cxx
@@ -44,7 +44,15 @@ void 
SvgFilterNode::apply(drawinglayer::primitive2d::Primitive2DContainer& rTarg
 const sal_uInt32 nCount(rChildren.size());
 
 addGraphicSourceToMapper("SourceGraphic", rTarget);
-//TODO: Add SourceAlpha, BackgroundImage, BackgroundAlpha, FillPaint, 
StrokePaint ??
+
+// TODO: For now, map SourceAlpha, BackgroundImage,
+// BackgroundAlpha, FillPaint and StrokePaint to rTarget
+// so at least something is displayed
+addGraphicSourceToMapper("SourceAlpha", rTarget);
+addGraphicSourceToMapper("BackgroundImage", rTarget);
+addGraphicSourceToMapper("BackgroundAlpha", rTarget);
+addGraphicSourceToMapper("FillPaint", rTarget);
+addGraphicSourceToMapper("StrokePaint", rTarget);
 
 // apply children's filters
 for (sal_uInt32 a(0); a < nCount; a++)


core.git: include/vcl svgio/inc svgio/source vcl/Library_vcl.mk vcl/qa vcl/source

2024-04-16 Thread Xisco Fauli (via logerrit)
 include/vcl/BitmapArithmeticBlendFilter.hxx   |   31 +++
 svgio/inc/svgfecompositenode.hxx  |6 
 svgio/inc/svgtoken.hxx|4 
 svgio/source/svgreader/svgfecompositenode.cxx |  214 +-
 svgio/source/svgreader/svgtoken.cxx   |4 
 vcl/Library_vcl.mk|1 
 vcl/qa/cppunit/BitmapFilterTest.cxx   |  122 
 vcl/source/bitmap/BitmapArithmeticBlendFilter.cxx |  105 ++
 8 files changed, 439 insertions(+), 48 deletions(-)

New commits:
commit cb4698626f17e005c820a7138c63a03c21120ecd
Author: Xisco Fauli 
AuthorDate: Fri Apr 5 10:08:36 2024 +0200
Commit: Xisco Fauli 
CommitDate: Tue Apr 16 09:36:37 2024 +0200

tdf#48062: Add support for arithmetic in feComposite

Took https://github.com/w3c/csswg-drafts/issues/3831
as a reference

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

diff --git a/include/vcl/BitmapArithmeticBlendFilter.hxx 
b/include/vcl/BitmapArithmeticBlendFilter.hxx
new file mode 100644
index ..a2de3ae28c19
--- /dev/null
+++ b/include/vcl/BitmapArithmeticBlendFilter.hxx
@@ -0,0 +1,31 @@
+/* -*- 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/.
+ *
+ */
+
+#ifndef INCLUDED_VCL_BITMAPARITHMETICBLENDFILTER_HXX
+#define INCLUDED_VCL_BITMAPARITHMETICBLENDFILTER_HXX
+
+#include 
+
+class VCL_DLLPUBLIC BitmapArithmeticBlendFilter
+{
+private:
+BitmapEx maBitmapEx;
+BitmapEx maBitmapEx2;
+
+public:
+BitmapArithmeticBlendFilter(BitmapEx const& rBmpEx, BitmapEx const& 
rBmpEx2);
+virtual ~BitmapArithmeticBlendFilter();
+
+BitmapEx execute(double aK1, double aK2, double aK3, double aK4);
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/inc/svgfecompositenode.hxx b/svgio/inc/svgfecompositenode.hxx
index fcbc24ecc8ff..8a34851c08d0 100644
--- a/svgio/inc/svgfecompositenode.hxx
+++ b/svgio/inc/svgfecompositenode.hxx
@@ -31,6 +31,7 @@ enum class Operator
 Out,
 Xor,
 Atop,
+Arithmetic
 };
 
 class SvgFeCompositeNode : public SvgFilterNode
@@ -41,6 +42,11 @@ private:
 OUString maResult;
 Operator maOperator;
 
+SvgNumber maK1;
+SvgNumber maK2;
+SvgNumber maK3;
+SvgNumber maK4;
+
 public:
 SvgFeCompositeNode(SvgDocument& rDocument, SvgNode* pParent);
 virtual ~SvgFeCompositeNode() override;
diff --git a/svgio/inc/svgtoken.hxx b/svgio/inc/svgtoken.hxx
index 9e6945859cd4..401a4667154e 100644
--- a/svgio/inc/svgtoken.hxx
+++ b/svgio/inc/svgtoken.hxx
@@ -122,6 +122,10 @@ namespace svgio::svgreader
 Title,
 Desc,
 Overflow,
+K1,
+K2,
+K3,
+K4,
 
 // AspectRatio and params
 PreserveAspectRatio,
diff --git a/svgio/source/svgreader/svgfecompositenode.cxx 
b/svgio/source/svgreader/svgfecompositenode.cxx
index 88ba5c62df68..28f161d7b6ce 100644
--- a/svgio/source/svgreader/svgfecompositenode.cxx
+++ b/svgio/source/svgreader/svgfecompositenode.cxx
@@ -23,6 +23,14 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 namespace svgio::svgreader
 {
@@ -83,6 +91,50 @@ void SvgFeCompositeNode::parseAttribute(SVGToken aSVGToken, 
const OUString& aCon
 {
 maOperator = Operator::Atop;
 }
+else if (o3tl::equalsIgnoreAsciiCase(o3tl::trim(aContent), 
u"arithmetic"))
+{
+maOperator = Operator::Arithmetic;
+}
+}
+break;
+}
+case SVGToken::K1:
+{
+SvgNumber aNum;
+
+if (readSingleNumber(aContent, aNum))
+{
+maK1 = aNum;
+}
+break;
+}
+case SVGToken::K2:
+{
+SvgNumber aNum;
+
+if (readSingleNumber(aContent, aNum))
+{
+maK2 = aNum;
+}
+break;
+}
+case SVGToken::K3:
+{
+SvgNumber aNum;
+
+if (readSingleNumber(aContent, aNum))
+{
+maK3 = aNum;
+}
+break;
+}
+case SVGToken::K4:
+{
+SvgNumber aNum;
+
+if (readSingleNumber(aContent, aNum))
+{
+maK4 = aNum;
 }
 break;
 }
@@ -96,61 +148,127 @@ void 

core.git: Branch 'feature/cib_contract49' - sw/qa

2024-04-15 Thread Xisco Fauli (via logerrit)
Rebased ref, commits from common ancestor:
commit e7eb2ff2f1f9ec2699a7222ad4e12dd1bdfc9b9f
Author: Xisco Fauli 
AuthorDate: Wed Feb 21 15:49:56 2024 +0100
Commit: Thorsten Behrens 
CommitDate: Mon Apr 15 18:20:36 2024 +0200

tdf#159797: sw_uiwriter6: Add unittest

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

diff --git a/sw/qa/extras/uiwriter/uiwriter6.cxx 
b/sw/qa/extras/uiwriter/uiwriter6.cxx
index db63836f67cf..bb51b96d8137 100644
--- a/sw/qa/extras/uiwriter/uiwriter6.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter6.cxx
@@ -2880,6 +2880,19 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest6, testTdf146178)
 CPPUNIT_ASSERT_EQUAL(sal_Int32(0), pCursor->GetPoint()->GetContentIndex());
 }
 
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest6, testTdf159797)
+{
+createSwDoc();
+SwXTextDocument& rTextDoc = dynamic_cast(*mxComponent);
+
+emulateTyping(rTextDoc, u"This - is replaced. - But this is not 
replaced.");
+// Without the fix in place, this would fail with
+// - Expected: This – is replaced. – But this is not replaced.
+// - Actual  : This – is replaced. - But this is not replaced.
+CPPUNIT_ASSERT_EQUAL(OUString(u"This – is replaced. – But this is not 
replaced."),
+ getParagraph(1)->getString());
+}
+
 CPPUNIT_TEST_FIXTURE(SwUiWriterTest6, testTdf155407)
 {
 createSwDoc();


core.git: Branch 'feature/cib_contract49' - sw/qa

2024-04-15 Thread Xisco Fauli (via logerrit)
 sw/qa/extras/uiwriter/uiwriter6.cxx |   13 +
 1 file changed, 13 insertions(+)

New commits:
commit cca5ad01548485db7b0dcbbaa5b0d9a0184d42fb
Author: Xisco Fauli 
AuthorDate: Wed Feb 21 15:49:56 2024 +0100
Commit: Thorsten Behrens 
CommitDate: Mon Apr 15 17:45:49 2024 +0200

tdf#159797: sw_uiwriter6: Add unittest

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

diff --git a/sw/qa/extras/uiwriter/uiwriter6.cxx 
b/sw/qa/extras/uiwriter/uiwriter6.cxx
index db63836f67cf..c7b92dca5362 100644
--- a/sw/qa/extras/uiwriter/uiwriter6.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter6.cxx
@@ -2880,6 +2880,19 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest6, testTdf146178)
 CPPUNIT_ASSERT_EQUAL(sal_Int32(0), pCursor->GetPoint()->GetContentIndex());
 }
 
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest6, testTdf159797)
+{
+createSwDoc();
+SwXTextDocument& rTextDoc = dynamic_cast(*mxComponent);
+
+emulateTyping(rTextDoc, u"This - is replaced. - But this is not 
replaced.");
+// Without the fix in place, this would fail with
+// - Expected: This – is replaced. – But this is not replaced.
+// - Actual  : This – is replaced. - But this is not replaced.
+CPPUNIT_ASSERT_EQUAL(u"This – is replaced. – But this is not 
replaced."_ustr,
+ getParagraph(1)->getString());
+}
+
 CPPUNIT_TEST_FIXTURE(SwUiWriterTest6, testTdf155407)
 {
 createSwDoc();


core.git: include/vcl svgio/inc svgio/source vcl/Library_vcl.mk vcl/qa vcl/source

2024-04-12 Thread Xisco Fauli (via logerrit)
 include/vcl/BitmapScreenBlendFilter.hxx   |   29 ++
 include/vcl/BitmapTools.hxx   |4 
 svgio/inc/svgfeblendnode.hxx  |7 +
 svgio/inc/svgtoken.hxx|1 
 svgio/source/svgreader/svgfeblendnode.cxx |   96 +++-
 svgio/source/svgreader/svgtoken.cxx   |1 
 vcl/Library_vcl.mk|1 
 vcl/qa/cppunit/BitmapFilterTest.cxx   |   57 
 vcl/source/bitmap/BitmapScreenBlendFilter.cxx |   87 ++
 vcl/source/bitmap/BitmapTools.cxx |  121 +-
 10 files changed, 396 insertions(+), 8 deletions(-)

New commits:
commit 732ca4879b7e49b171c5930166e4dba7be451841
Author: Xisco Fauli 
AuthorDate: Wed Apr 10 18:05:00 2024 +0200
Commit: Xisco Fauli 
CommitDate: Fri Apr 12 10:47:56 2024 +0200

tdf#159660: Add support for screen mode in feBlend

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

diff --git a/include/vcl/BitmapScreenBlendFilter.hxx 
b/include/vcl/BitmapScreenBlendFilter.hxx
new file mode 100644
index ..a8f816936f49
--- /dev/null
+++ b/include/vcl/BitmapScreenBlendFilter.hxx
@@ -0,0 +1,29 @@
+/* -*- 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/.
+ *
+ */
+
+#ifndef INCLUDED_VCL_BITMAPSCREENBLENDFILTER_HXX
+#define INCLUDED_VCL_BITMAPSCREENBLENDFILTER_HXX
+
+#include 
+
+class VCL_DLLPUBLIC BitmapScreenBlendFilter
+{
+private:
+BitmapEx maBitmapEx;
+BitmapEx maBitmapEx2;
+
+public:
+BitmapScreenBlendFilter(BitmapEx const& rBmpEx, BitmapEx const& rBmpEx2);
+
+virtual ~BitmapScreenBlendFilter();
+BitmapEx execute();
+};
+#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/BitmapTools.hxx b/include/vcl/BitmapTools.hxx
index d321d2be79a3..de0ad84ea3da 100644
--- a/include/vcl/BitmapTools.hxx
+++ b/include/vcl/BitmapTools.hxx
@@ -66,6 +66,10 @@ VCL_DLLPUBLIC BitmapEx CanvasTransformBitmap( const 
BitmapEx& rBitmap,
   ::basegfx::B2DRectangle const & rDestRect,
   ::basegfx::B2DHomMatrix const & 
rLocalTransform );
 
+VCL_DLLPUBLIC BitmapEx DrawBitmapInRect( const BitmapEx& rBitmap,
+::basegfx::B2DRectangle const & rBitmapRect,
+::basegfx::B2DRectangle const & rDestRect );
+
 VCL_DLLPUBLIC void DrawAlphaBitmapAndAlphaGradient(BitmapEx & rBitmapEx, bool 
bFixedTransparence, float fTransparence, AlphaMask & rNewMask);
 
 VCL_DLLPUBLIC void DrawAndClipBitmap(const Point& rPos, const Size& rSize, 
const BitmapEx& rBitmap, BitmapEx & aBmpEx, basegfx::B2DPolyPolygon const & 
rClipPath);
diff --git a/svgio/inc/svgfeblendnode.hxx b/svgio/inc/svgfeblendnode.hxx
index 8ff46adf15ff..5881959ad418 100644
--- a/svgio/inc/svgfeblendnode.hxx
+++ b/svgio/inc/svgfeblendnode.hxx
@@ -24,12 +24,19 @@
 
 namespace svgio::svgreader
 {
+enum class Mode
+{
+Normal,
+Screen
+};
+
 class SvgFeBlendNode : public SvgFilterNode
 {
 private:
 OUString maIn;
 OUString maIn2;
 OUString maResult;
+Mode maMode;
 
 public:
 SvgFeBlendNode(SvgDocument& rDocument, SvgNode* pParent);
diff --git a/svgio/inc/svgtoken.hxx b/svgio/inc/svgtoken.hxx
index d988f4b2d993..9e6945859cd4 100644
--- a/svgio/inc/svgtoken.hxx
+++ b/svgio/inc/svgtoken.hxx
@@ -97,6 +97,7 @@ namespace svgio::svgreader
 FloodOpacity,
 Operator,
 Mask,
+Mode,
 ClipPathUnits,
 MaskUnits,
 MaskContentUnits,
diff --git a/svgio/source/svgreader/svgfeblendnode.cxx 
b/svgio/source/svgreader/svgfeblendnode.cxx
index 6adc0e8e139e..918912fa54d8 100644
--- a/svgio/source/svgreader/svgfeblendnode.cxx
+++ b/svgio/source/svgreader/svgfeblendnode.cxx
@@ -19,10 +19,19 @@
 #include 
 #include 
 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
 namespace svgio::svgreader
 {
 SvgFeBlendNode::SvgFeBlendNode(SvgDocument& rDocument, SvgNode* pParent)
 : SvgFilterNode(SVGToken::FeBlend, rDocument, pParent)
+, maMode(Mode::Normal)
 {
 }
 
@@ -53,6 +62,21 @@ void SvgFeBlendNode::parseAttribute(SVGToken aSVGToken, 
const OUString& aContent
 maResult = aContent.trim();
 break;
 }
+case SVGToken::Mode:
+{
+if (!aContent.isEmpty())
+{
+if (o3tl::equalsIgnoreAsciiCase(o3tl::trim(aContent), 
u"normal"))
+{
+maMode = Mode::Normal;
+}
+   

core.git: vcl/source

2024-04-10 Thread Xisco Fauli (via logerrit)
 vcl/source/bitmap/BitmapTools.cxx |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit e1f3120ce83c113d7dc91b60f50344f63f1c41f0
Author: Xisco Fauli 
AuthorDate: Wed Apr 10 16:20:09 2024 +0200
Commit: Xisco Fauli 
CommitDate: Wed Apr 10 17:42:03 2024 +0200

vcl: return earlier if size is empty

Change-Id: I96bcd47d93e0e4d05e33d3ad3eca86c6edcf87ac
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165950
Reviewed-by: Noel Grandin 
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/vcl/source/bitmap/BitmapTools.cxx 
b/vcl/source/bitmap/BitmapTools.cxx
index ee0134a90010..2330483bb98b 100644
--- a/vcl/source/bitmap/BitmapTools.cxx
+++ b/vcl/source/bitmap/BitmapTools.cxx
@@ -376,6 +376,12 @@ BitmapEx CanvasTransformBitmap( const BitmapEx&
 rBitmap,
 ::basegfx::B2DRectangle const & rDestRect,
 ::basegfx::B2DHomMatrix const & 
rLocalTransform )
 {
+const Size aDestBmpSize( ::basegfx::fround( rDestRect.getWidth() ),
+ ::basegfx::fround( rDestRect.getHeight() ) );
+
+if( aDestBmpSize.IsEmpty() )
+return BitmapEx();
+
 const Size aBmpSize( rBitmap.GetSizePixel() );
 Bitmap aSrcBitmap( rBitmap.GetBitmap() );
 Bitmap aSrcAlpha;
@@ -416,12 +422,6 @@ BitmapEx CanvasTransformBitmap( const BitmapEx&
 rBitmap,
 }
 // else: mapping table is not used
 
-const Size aDestBmpSize( ::basegfx::fround( rDestRect.getWidth() ),
- ::basegfx::fround( rDestRect.getHeight() ) );
-
-if( aDestBmpSize.IsEmpty() )
-return BitmapEx();
-
 Bitmap aDstBitmap(aDestBmpSize, aSrcBitmap.getPixelFormat(), 
>GetPalette());
 Bitmap aDstAlpha( AlphaMask( aDestBmpSize ).GetBitmap() );
 


core.git: Branch 'libreoffice-24-2' - download.lst

2024-04-04 Thread Xisco Fauli (via logerrit)
 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ae8ee986617832ae7ffd853279d6b898386a51dd
Author: Xisco Fauli 
AuthorDate: Mon Mar 25 13:45:24 2024 +0100
Commit: Michael Stahl 
CommitDate: Thu Apr 4 11:17:25 2024 +0200

mariadb connector: upgrade to release 3.3.8

Change-Id: I21cf511a2b6c040d4a64ca720606af9312130045
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165284
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 
(cherry picked from commit e201b8916decefe4e5ad62718d33eb1ec1de4306)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165244
Reviewed-by: Michael Stahl 

diff --git a/download.lst b/download.lst
index 9eb6e0e56d99..0f16c450c5cd 100644
--- a/download.lst
+++ b/download.lst
@@ -446,8 +446,8 @@ LXML_TARBALL := lxml-4.9.2.tgz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-MARIADB_CONNECTOR_C_SHA256SUM := 
975a9a862fed80f84e0206373f7ef05537aada5b65d99b71b36ab892b44240bf
-MARIADB_CONNECTOR_C_TARBALL := mariadb-connector-c-3.3.7-src.tar.gz
+MARIADB_CONNECTOR_C_SHA256SUM := 
f9f076b4aa9fb22cc94b24f82c80f9ef063805ecd6533a2eb5d5060cf93833e8
+MARIADB_CONNECTOR_C_TARBALL := mariadb-connector-c-3.3.8-src.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts


core.git: desktop/source

2024-04-03 Thread Xisco Fauli (via logerrit)
 desktop/source/app/app.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 374ac88c2cab8065eca3b9479c0039f6893fedf0
Author: Xisco Fauli 
AuthorDate: Wed Apr 3 10:50:11 2024 +0200
Commit: Xisco Fauli 
CommitDate: Wed Apr 3 18:51:18 2024 +0200

desktop: fix build with enable-online-update

Regression from 75706c003c3e224047e2f5b079aebde4e3d40d74
"tdf#146619 Remove unused #includes from C/C++ files"

See https://ci.libreoffice.org/job/lo_daily_tb_win/1718/console

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

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index d02041c220a2..0e529e071427 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -127,6 +127,10 @@
 #include "langselect.hxx"
 #include 
 
+#if HAVE_FEATURE_UPDATE_MAR
+#include 
+#endif
+
 #if defined MACOSX
 #include 
 #include 


core.git: Branch 'libreoffice-24-2' - download.lst

2024-04-02 Thread Xisco Fauli (via logerrit)
 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 26b1dadc3f254cef8c7b9e12e8c7c58f8ee9118a
Author: Xisco Fauli 
AuthorDate: Mon Mar 25 11:23:27 2024 +0100
Commit: Michael Stahl 
CommitDate: Tue Apr 2 15:00:21 2024 +0200

postgresql: upgrade to release 13.14

Change-Id: Ia9607fd9c8dad9d5936e867ad76b18a476f1057f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165278
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 
(cherry picked from commit e311a6a09d753fb566f248d653434f10a4645e63)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165237
Reviewed-by: Michael Stahl 

diff --git a/download.lst b/download.lst
index f6cbeec85530..7759ea2c73d8 100644
--- a/download.lst
+++ b/download.lst
@@ -550,8 +550,8 @@ POPPLER_DATA_TARBALL := poppler-data-0.4.12.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-POSTGRESQL_SHA256SUM := 
4992ff647203566b670d4e54dc5317499a26856c93576d0ea951bdf6bee50bfb
-POSTGRESQL_TARBALL := postgresql-13.11.tar.bz2
+POSTGRESQL_SHA256SUM := 
b8df078551898960bd500dc5d38a177e9905376df81fe7f2b660a1407fa6a5ed
+POSTGRESQL_TARBALL := postgresql-13.14.tar.bz2
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts


core.git: download.lst

2024-04-01 Thread Xisco Fauli (via logerrit)
 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6027c219444ade7274841a5ba45e62bdc1ea3238
Author: Xisco Fauli 
AuthorDate: Mon Apr 1 21:16:19 2024 +0200
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Tue Apr 2 02:27:46 2024 +0200

harfbuzz: upgrade to 8.4.0

Change-Id: Ie9b5e2fc85c3be588217a166f4230c87c3cb122e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165652
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>

diff --git a/download.lst b/download.lst
index 705d349ea566..f0ab55c21f1c 100644
--- a/download.lst
+++ b/download.lst
@@ -292,8 +292,8 @@ GRAPHITE_TARBALL := graphite2-minimal-1.3.14.tgz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-HARFBUZZ_SHA256SUM := 
f73e1eacd7e2ffae687bc3f056bb0c705b7a05aee86337686e09da8fc1c2030c
-HARFBUZZ_TARBALL := harfbuzz-8.3.1.tar.xz
+HARFBUZZ_SHA256SUM := 
af4ea73e25ab748c8c063b78c2f88e48833db9b2ac369e29bd115702e789755e
+HARFBUZZ_TARBALL := harfbuzz-8.4.0.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts


core.git: Branch 'libreoffice-24-2' - download.lst

2024-04-01 Thread Xisco Fauli (via logerrit)
 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 46906884b5eefb551d7d3d00420709475962df92
Author: Xisco Fauli 
AuthorDate: Mon Apr 1 12:59:17 2024 +0200
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Tue Apr 2 01:28:11 2024 +0200

libtommath: upgrade to 1.3.0

Change-Id: Ica9e2520c7c70a21721f7f389fd3cd8138bf550c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165609
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 
(cherry picked from commit 45f7af713b303643f524ac9ae7fd41ac56d96bf2)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165624
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>

diff --git a/download.lst b/download.lst
index 95ae9c41f3d4..f6cbeec85530 100644
--- a/download.lst
+++ b/download.lst
@@ -409,8 +409,8 @@ LIBNUMBERTEXT_TARBALL := libnumbertext-1.0.11.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBTOMMATH_SHA256SUM := 
986025d7b374276fee2e30e99f3649e4ac0db8a02257a37ee10eae72abed0d1f
-LIBTOMMATH_TARBALL := ltm-1.2.1.tar.xz
+LIBTOMMATH_SHA256SUM := 
296272d93435991308eb73607600c034b558807a07e829e751142e65ccfa9d08
+LIBTOMMATH_TARBALL := ltm-1.3.0.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts


core.git: download.lst

2024-04-01 Thread Xisco Fauli (via logerrit)
 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 3227466e7dc8bb247618a1d27126b4ab02f45672
Author: Xisco Fauli 
AuthorDate: Mon Apr 1 12:59:17 2024 +0200
Commit: Xisco Fauli 
CommitDate: Mon Apr 1 19:30:26 2024 +0200

libtommath: upgrade to 1.3.0

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

diff --git a/download.lst b/download.lst
index c872b55c92df..705d349ea566 100644
--- a/download.lst
+++ b/download.lst
@@ -409,8 +409,8 @@ LIBNUMBERTEXT_TARBALL := libnumbertext-1.0.11.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBTOMMATH_SHA256SUM := 
986025d7b374276fee2e30e99f3649e4ac0db8a02257a37ee10eae72abed0d1f
-LIBTOMMATH_TARBALL := ltm-1.2.1.tar.xz
+LIBTOMMATH_SHA256SUM := 
296272d93435991308eb73607600c034b558807a07e829e751142e65ccfa9d08
+LIBTOMMATH_TARBALL := ltm-1.3.0.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts


core.git: Branch 'libreoffice-24-2' - download.lst

2024-03-31 Thread Xisco Fauli (via logerrit)
 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c3020e41cf95e974f0ff12c78ca841eb8cc4e9f3
Author: Xisco Fauli 
AuthorDate: Thu Mar 28 11:40:25 2024 +0100
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Mon Apr 1 00:59:23 2024 +0200

curl: upgrade to release 8.7.1

Change-Id: I0064b4cf6baf1ccd951c95945539961fe72c2a28
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165455
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 
(cherry picked from commit 2c1a7cb13629177f824ed35138907aef10714e89)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165489
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>

diff --git a/download.lst b/download.lst
index 245cc68d424b..95ae9c41f3d4 100644
--- a/download.lst
+++ b/download.lst
@@ -80,8 +80,8 @@ CPPUNIT_TARBALL := cppunit-1.15.1.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-CURL_SHA256SUM := 
3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15
-CURL_TARBALL := curl-8.6.0.tar.xz
+CURL_SHA256SUM := 
6fea2aac6a4610fbd0400afb0bcddbe7258a64c63f1f68e5855ebc0c659710cd
+CURL_TARBALL := curl-8.7.1.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts


core.git: Branch 'libreoffice-24-2' - download.lst

2024-03-29 Thread Xisco Fauli (via logerrit)
 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9e3b18de8d948782438ae9cc095b3aa07767b1ff
Author: Xisco Fauli 
AuthorDate: Mon Mar 25 10:56:38 2024 +0100
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Sat Mar 30 04:45:11 2024 +0100

nss: upgrade to release 3.99

Change-Id: I77ccc45854b2d0aecc288f471d94c81ad9089f85
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165273
Tested-by: Xisco Fauli 
Reviewed-by: Xisco Fauli 
(cherry picked from commit c6d791e3d2577498affec491876a0afa441be002)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165245
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>

diff --git a/download.lst b/download.lst
index 584efc99baca..245cc68d424b 100644
--- a/download.lst
+++ b/download.lst
@@ -477,8 +477,8 @@ MYTHES_TARBALL := mythes-1.2.5.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-NSS_SHA256SUM := 
59bb55a59b02e4004fc26ad0aa1a13fe8d73c6c90c447dd2f2efb73fb81083ed
-NSS_TARBALL := nss-3.98-with-nspr-4.35.tar.gz
+NSS_SHA256SUM := 
5f29fea64b3234b33a615b6df40469e239a4168ac0909106bd00e6490b274c31
+NSS_TARBALL := nss-3.99-with-nspr-4.35.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts


core.git: Branch 'libreoffice-24-2' - download.lst external/libgpg-error

2024-03-29 Thread Xisco Fauli (via logerrit)
 download.lst  |4 ++--
 external/libgpg-error/ExternalPackage_libgpg-error.mk |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit efa4104726496c10c1a23b24cbf26edf3f25a6c5
Author: Xisco Fauli 
AuthorDate: Thu Mar 28 12:10:17 2024 +0100
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Sat Mar 30 02:46:50 2024 +0100

libgpg-error: upgrade to release 1.48

Change-Id: I3920d10657a91b56f484a5a61017d2e2ba3291b0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165457
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 
(cherry picked from commit 65bee6317eafd4d0e449c779c160e9b3017b57ce)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165471
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>

diff --git a/download.lst b/download.lst
index 48e6bc72b088..584efc99baca 100644
--- a/download.lst
+++ b/download.lst
@@ -394,8 +394,8 @@ LIBFFI_TARBALL := libffi-3.4.4.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBGPGERROR_SHA256SUM := 
9e3c670966b96ecc746c28c2c419541e3bcb787d1a73930f5e5f5e1bcbbb9bdb
-LIBGPGERROR_TARBALL := libgpg-error-1.47.tar.bz2
+LIBGPGERROR_SHA256SUM := 
89ce1ae893e122924b858de84dc4f67aae29ffa610ebf668d5aa539045663d6f
+LIBGPGERROR_TARBALL := libgpg-error-1.48.tar.bz2
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/libgpg-error/ExternalPackage_libgpg-error.mk 
b/external/libgpg-error/ExternalPackage_libgpg-error.mk
index fd887fb5776d..2c64ba3b5cc6 100644
--- a/external/libgpg-error/ExternalPackage_libgpg-error.mk
+++ b/external/libgpg-error/ExternalPackage_libgpg-error.mk
@@ -15,7 +15,7 @@ ifneq ($(DISABLE_DYNLOADING),TRUE)
 
 ifeq ($(OS),LINUX)
 
-$(eval $(call 
gb_ExternalPackage_add_file,libgpg-error,$(LIBO_LIB_FOLDER)/libgpg-error-lo.so.0,src/.libs/libgpg-error-lo.so.0.34.0))
+$(eval $(call 
gb_ExternalPackage_add_file,libgpg-error,$(LIBO_LIB_FOLDER)/libgpg-error-lo.so.0,src/.libs/libgpg-error-lo.so.0.35.0))
 
 else ifeq ($(OS),MACOSX)
 


core.git: Branch 'libreoffice-24-2' - download.lst external/libassuan

2024-03-29 Thread Xisco Fauli (via logerrit)
 download.lst|4 ++--
 external/libassuan/ExternalPackage_libassuan.mk |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 904501114d8b6754ab65bb11c08c145f02fab8fe
Author: Xisco Fauli 
AuthorDate: Thu Mar 28 11:49:58 2024 +0100
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Fri Mar 29 14:23:23 2024 +0100

libassuan: upgrade to 2.5.7

Change-Id: I6114c7a77395f14e83d2315ac6f9b6829ddb1c6a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165456
Tested-by: Xisco Fauli 
Reviewed-by: Xisco Fauli 
(cherry picked from commit 0343d7153e77ba79a59bc5f6c51159af9010813e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165472
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>

diff --git a/download.lst b/download.lst
index 19286d1d0e32..48e6bc72b088 100644
--- a/download.lst
+++ b/download.lst
@@ -369,8 +369,8 @@ LCMS2_TARBALL := lcms2-2.15.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBASSUAN_SHA256SUM := 
e9fd27218d5394904e4e39788f9b1742711c3e6b41689a31aa3380bd5aa4f426
-LIBASSUAN_TARBALL := libassuan-2.5.6.tar.bz2
+LIBASSUAN_SHA256SUM := 
0103081ffc27838a2e50479153ca105e873d3d65d8a9593282e9c94c7e6afb76
+LIBASSUAN_TARBALL := libassuan-2.5.7.tar.bz2
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/libassuan/ExternalPackage_libassuan.mk 
b/external/libassuan/ExternalPackage_libassuan.mk
index 2df7b562d584..77dc05a665f1 100644
--- a/external/libassuan/ExternalPackage_libassuan.mk
+++ b/external/libassuan/ExternalPackage_libassuan.mk
@@ -15,7 +15,7 @@ ifneq ($(DISABLE_DYNLOADING),TRUE)
 
 ifeq ($(OS),LINUX)
 
-$(eval $(call 
gb_ExternalPackage_add_file,libassuan,$(LIBO_LIB_FOLDER)/libassuan.so.0,src/.libs/libassuan.so.0.8.6))
+$(eval $(call 
gb_ExternalPackage_add_file,libassuan,$(LIBO_LIB_FOLDER)/libassuan.so.0,src/.libs/libassuan.so.0.8.7))
 
 else ifeq ($(OS),MACOSX)
 


core.git: svgio/inc svgio/source

2024-03-28 Thread Xisco Fauli (via logerrit)
 svgio/inc/svgnode.hxx |4 +--
 svgio/inc/svgtools.hxx|2 -
 svgio/source/svgreader/svgnode.cxx|   34 +++---
 svgio/source/svgreader/svgstyleattributes.cxx |2 -
 svgio/source/svgreader/svgstylenode.cxx   |   31 +--
 svgio/source/svgreader/svgtools.cxx   |6 ++--
 6 files changed, 13 insertions(+), 66 deletions(-)

New commits:
commit 128274d59847288d4c3463fea42b6f57ec089ec0
Author: Xisco Fauli 
AuthorDate: Thu Mar 28 11:02:50 2024 +0100
Commit: Xisco Fauli 
CommitDate: Thu Mar 28 19:42:54 2024 +0100

svgio: simplify code

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

diff --git a/svgio/inc/svgnode.hxx b/svgio/inc/svgnode.hxx
index 16c1f50bc3db..073b011c5f6c 100644
--- a/svgio/inc/svgnode.hxx
+++ b/svgio/inc/svgnode.hxx
@@ -21,6 +21,7 @@
 
 #include "SvgNumber.hxx"
 #include "svgtoken.hxx"
+#include "svgtools.hxx"
 #include 
 #include 
 #include 
@@ -96,7 +97,7 @@ namespace svgio::svgreader
 std::optional   mpClass;
 
 /// systemLanguage values
-std::vector  maSystemLanguage;
+SvgStringVector  maSystemLanguage;
 
 /// XmlSpace value
 XmlSpacemaXmlSpace;
@@ -179,7 +180,6 @@ namespace svgio::svgreader
 
 /// SystemLanguage access
 std::vector const & getSystemLanguage() const { return 
maSystemLanguage; }
-void setSystemLanguage(OUString const &);
 
 /// XmlSpace access
 XmlSpace getXmlSpace() const;
diff --git a/svgio/inc/svgtools.hxx b/svgio/inc/svgtools.hxx
index 6dc882b6afb2..dfeb12d9ea49 100644
--- a/svgio/inc/svgtools.hxx
+++ b/svgio/inc/svgtools.hxx
@@ -122,7 +122,7 @@ namespace svgio::svgreader
 SvgAspectRatio readSvgAspectRatio(std::u16string_view rCandidate);
 
 typedef ::std::vector< OUString > SvgStringVector;
-bool readSvgStringVector(std::u16string_view rCandidate, 
SvgStringVector& rSvgStringVector);
+bool readSvgStringVector(std::u16string_view rCandidate, 
SvgStringVector& rSvgStringVector, sal_Unicode nSeparator);
 
 void readImageLink(const OUString& rCandidate, OUString& rXLink, 
OUString& rUrl, OUString& rData);
 
diff --git a/svgio/source/svgreader/svgnode.cxx 
b/svgio/source/svgreader/svgnode.cxx
index 20a48de25977..781faaf4b2a7 100644
--- a/svgio/source/svgreader/svgnode.cxx
+++ b/svgio/source/svgreader/svgnode.cxx
@@ -525,9 +525,11 @@ namespace {
 }
 case SVGToken::SystemLanguage:
 {
-if(!aContent.isEmpty())
+SvgStringVector aSvgStringVector;
+
+if(readSvgStringVector(aContent, aSvgStringVector, ','))
 {
-setSystemLanguage(aContent);
+maSystemLanguage = aSvgStringVector;
 }
 break;
 }
@@ -755,34 +757,6 @@ namespace {
 mrDocument.addSvgNodeToMapper(*mpClass, *this);
 }
 
-void SvgNode::setSystemLanguage(OUString const & rSystemClass)
-{
-const sal_Int32 nLen(rSystemClass.getLength());
-sal_Int32 nPos(0);
-OUStringBuffer aToken;
-
-// split into single tokens (currently only comma separator)
-while(nPos < nLen)
-{
-const sal_Int32 nInitPos(nPos);
-copyToLimiter(rSystemClass, u',', nPos, aToken, nLen);
-skip_char(rSystemClass, u',', nPos, nLen);
-const OUString aLang(o3tl::trim(aToken));
-aToken.setLength(0);
-
-if(!aLang.isEmpty())
-{
-maSystemLanguage.push_back(aLang);
-}
-
-if(nInitPos == nPos)
-{
-OSL_ENSURE(false, "Could not interpret on current position 
(!)");
-nPos++;
-}
-}
-}
-
 XmlSpace SvgNode::getXmlSpace() const
 {
 if(maXmlSpace != XmlSpace::NotSet)
diff --git a/svgio/source/svgreader/svgstyleattributes.cxx 
b/svgio/source/svgreader/svgstyleattributes.cxx
index 0ae986f010cd..63be6afe270c 100644
--- a/svgio/source/svgreader/svgstyleattributes.cxx
+++ b/svgio/source/svgreader/svgstyleattributes.cxx
@@ -1513,7 +1513,7 @@ namespace svgio::svgreader
 {
 SvgStringVector aSvgStringVector;
 
-if(readSvgStringVector(aContent, aSvgStringVector))
+if(readSvgStringVector(aContent, aSvgStringVector, ','))
 {
 maFontFamily = aSvgStringVector;
 }
diff --git 

core.git: download.lst external/libgpg-error

2024-03-28 Thread Xisco Fauli (via logerrit)
 download.lst  |4 ++--
 external/libgpg-error/ExternalPackage_libgpg-error.mk |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 65bee6317eafd4d0e449c779c160e9b3017b57ce
Author: Xisco Fauli 
AuthorDate: Thu Mar 28 12:10:17 2024 +0100
Commit: Xisco Fauli 
CommitDate: Thu Mar 28 16:31:03 2024 +0100

libgpg-error: upgrade to release 1.48

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

diff --git a/download.lst b/download.lst
index b9cc043b434e..6e60d5f53234 100644
--- a/download.lst
+++ b/download.lst
@@ -394,8 +394,8 @@ LIBFFI_TARBALL := libffi-3.4.4.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBGPGERROR_SHA256SUM := 
9e3c670966b96ecc746c28c2c419541e3bcb787d1a73930f5e5f5e1bcbbb9bdb
-LIBGPGERROR_TARBALL := libgpg-error-1.47.tar.bz2
+LIBGPGERROR_SHA256SUM := 
89ce1ae893e122924b858de84dc4f67aae29ffa610ebf668d5aa539045663d6f
+LIBGPGERROR_TARBALL := libgpg-error-1.48.tar.bz2
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/libgpg-error/ExternalPackage_libgpg-error.mk 
b/external/libgpg-error/ExternalPackage_libgpg-error.mk
index fd887fb5776d..2c64ba3b5cc6 100644
--- a/external/libgpg-error/ExternalPackage_libgpg-error.mk
+++ b/external/libgpg-error/ExternalPackage_libgpg-error.mk
@@ -15,7 +15,7 @@ ifneq ($(DISABLE_DYNLOADING),TRUE)
 
 ifeq ($(OS),LINUX)
 
-$(eval $(call 
gb_ExternalPackage_add_file,libgpg-error,$(LIBO_LIB_FOLDER)/libgpg-error-lo.so.0,src/.libs/libgpg-error-lo.so.0.34.0))
+$(eval $(call 
gb_ExternalPackage_add_file,libgpg-error,$(LIBO_LIB_FOLDER)/libgpg-error-lo.so.0,src/.libs/libgpg-error-lo.so.0.35.0))
 
 else ifeq ($(OS),MACOSX)
 


core.git: download.lst external/libassuan

2024-03-28 Thread Xisco Fauli (via logerrit)
 download.lst|4 ++--
 external/libassuan/ExternalPackage_libassuan.mk |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 0343d7153e77ba79a59bc5f6c51159af9010813e
Author: Xisco Fauli 
AuthorDate: Thu Mar 28 11:49:58 2024 +0100
Commit: Xisco Fauli 
CommitDate: Thu Mar 28 15:44:42 2024 +0100

libassuan: upgrade to 2.5.7

Change-Id: I6114c7a77395f14e83d2315ac6f9b6829ddb1c6a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165456
Tested-by: Xisco Fauli 
Reviewed-by: Xisco Fauli 

diff --git a/download.lst b/download.lst
index 67021f67c762..b9cc043b434e 100644
--- a/download.lst
+++ b/download.lst
@@ -369,8 +369,8 @@ LCMS2_TARBALL := lcms2-2.15.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBASSUAN_SHA256SUM := 
e9fd27218d5394904e4e39788f9b1742711c3e6b41689a31aa3380bd5aa4f426
-LIBASSUAN_TARBALL := libassuan-2.5.6.tar.bz2
+LIBASSUAN_SHA256SUM := 
0103081ffc27838a2e50479153ca105e873d3d65d8a9593282e9c94c7e6afb76
+LIBASSUAN_TARBALL := libassuan-2.5.7.tar.bz2
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/libassuan/ExternalPackage_libassuan.mk 
b/external/libassuan/ExternalPackage_libassuan.mk
index 2df7b562d584..77dc05a665f1 100644
--- a/external/libassuan/ExternalPackage_libassuan.mk
+++ b/external/libassuan/ExternalPackage_libassuan.mk
@@ -15,7 +15,7 @@ ifneq ($(DISABLE_DYNLOADING),TRUE)
 
 ifeq ($(OS),LINUX)
 
-$(eval $(call 
gb_ExternalPackage_add_file,libassuan,$(LIBO_LIB_FOLDER)/libassuan.so.0,src/.libs/libassuan.so.0.8.6))
+$(eval $(call 
gb_ExternalPackage_add_file,libassuan,$(LIBO_LIB_FOLDER)/libassuan.so.0,src/.libs/libassuan.so.0.8.7))
 
 else ifeq ($(OS),MACOSX)
 


core.git: download.lst

2024-03-28 Thread Xisco Fauli (via logerrit)
 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2c1a7cb13629177f824ed35138907aef10714e89
Author: Xisco Fauli 
AuthorDate: Thu Mar 28 11:40:25 2024 +0100
Commit: Xisco Fauli 
CommitDate: Thu Mar 28 15:44:01 2024 +0100

curl: upgrade to release 8.7.1

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

diff --git a/download.lst b/download.lst
index 4f1f4ffe97bb..67021f67c762 100644
--- a/download.lst
+++ b/download.lst
@@ -80,8 +80,8 @@ CPPUNIT_TARBALL := cppunit-1.15.1.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-CURL_SHA256SUM := 
3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15
-CURL_TARBALL := curl-8.6.0.tar.xz
+CURL_SHA256SUM := 
6fea2aac6a4610fbd0400afb0bcddbe7258a64c63f1f68e5855ebc0c659710cd
+CURL_TARBALL := curl-8.7.1.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts


core.git: svgio/CppunitTest_svgio.mk svgio/CppunitTest_svgio_tools.mk svgio/inc svgio/Library_svgio.mk svgio/qa svgio/source

2024-03-27 Thread Xisco Fauli (via logerrit)
 svgio/CppunitTest_svgio.mk|1 
 svgio/CppunitTest_svgio_tools.mk  |1 
 svgio/Library_svgio.mk|2 
 svgio/inc/svgdocument.hxx |6 -
 svgio/inc/svgnode.hxx |7 +
 svgio/inc/svgswitchnode.hxx   |   55 +++
 svgio/inc/svgtoken.hxx|1 
 svgio/qa/cppunit/SvgImportTest.cxx|   11 ++
 svgio/qa/cppunit/data/tdf160386.svg   |   16 +++
 svgio/source/svgreader/svgdocumenthandler.cxx |9 +
 svgio/source/svgreader/svgnode.cxx|   44 +++-
 svgio/source/svgreader/svgswitchnode.cxx  |  129 ++
 svgio/source/svgreader/svgtoken.cxx   |1 
 13 files changed, 270 insertions(+), 13 deletions(-)

New commits:
commit 0a2535ceb06bb9233bc29158d4c9d2513abd
Author: Xisco Fauli 
AuthorDate: Wed Mar 27 11:38:44 2024 +0100
Commit: Xisco Fauli 
CommitDate: Wed Mar 27 23:44:40 2024 +0100

tdf#160386: Add support for switch element

For now, only use language tag, meaning if
there is a file like in the unittest with

Howdy!
Wotcha!
G'day!
Hello!

"Hello!" with be displayed in a en_AU system locale

This patch partially reverts 13a41e7a12598c7896d6dc8d34aba6af5b80b83c
"tdf#150124: do nothing when parent is of unkown type"
making 0dfd8288a87b58e503bb3a41be6137485fbf3f68
"ofz#60384 Direct-leak" no longer necessary

Change-Id: Ifc73bc69aa997088dc0a2b11d7d30446303fa3b3

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

diff --git a/svgio/CppunitTest_svgio.mk b/svgio/CppunitTest_svgio.mk
index 9309f5dcb9b8..a179d6af30fa 100644
--- a/svgio/CppunitTest_svgio.mk
+++ b/svgio/CppunitTest_svgio.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_CppunitTest_use_libraries,svgio,\
 cppu \
 cppuhelper \
 comphelper \
+i18nlangtag \
 sal \
 salhelper \
 sax \
diff --git a/svgio/CppunitTest_svgio_tools.mk b/svgio/CppunitTest_svgio_tools.mk
index abb6bb6e0fc7..5f4d7adbe523 100644
--- a/svgio/CppunitTest_svgio_tools.mk
+++ b/svgio/CppunitTest_svgio_tools.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_CppunitTest_use_libraries,svgio_tools,\
 comphelper \
 cppu \
 cppuhelper \
+i18nlangtag \
 sal \
 salhelper \
 sax \
diff --git a/svgio/Library_svgio.mk b/svgio/Library_svgio.mk
index 7bc518c71b93..8686792ca52a 100644
--- a/svgio/Library_svgio.mk
+++ b/svgio/Library_svgio.mk
@@ -41,6 +41,7 @@ $(eval $(call gb_Library_use_libraries,svgio,\
 comphelper \
 cppu \
 cppuhelper \
+i18nlangtag \
 sal \
 salhelper \
 tk \
@@ -87,6 +88,7 @@ $(eval $(call gb_Library_add_exception_objects,svgio,\
 svgio/source/svgreader/svgstyleattributes \
 svgio/source/svgreader/svgstylenode \
 svgio/source/svgreader/svgsvgnode \
+svgio/source/svgreader/svgswitchnode \
 svgio/source/svgreader/svgsymbolnode \
 svgio/source/svgreader/svgtextnode \
 svgio/source/svgreader/svgtextposition \
diff --git a/svgio/inc/svgdocument.hxx b/svgio/inc/svgdocument.hxx
index 77b4d3891179..9f79342c0c55 100644
--- a/svgio/inc/svgdocument.hxx
+++ b/svgio/inc/svgdocument.hxx
@@ -34,9 +34,6 @@ namespace svgio::svgreader
 /// the document hierarchy with all root nodes
 SvgNodeVector   maNodes;
 
-/// invalid nodes that have no parent
-SvgNodeVector   maOrphanNodes;
-
 /// the absolute path of the Svg file in progress (if available)
 const OUString maAbsolutePath;
 
@@ -75,9 +72,6 @@ namespace svgio::svgreader
 /// data read access
 const SvgNodeVector& getSvgNodeVector() const { return maNodes; }
 const OUString& getAbsolutePath() const { return maAbsolutePath; }
-
-/// invalid nodes that have no parent
-void addOrphanNode(SvgNode* pOrphan) { 
maOrphanNodes.emplace_back(pOrphan); }
 };
 
 } // end of namespace svgio::svgreader
diff --git a/svgio/inc/svgnode.hxx b/svgio/inc/svgnode.hxx
index 63abc4f8cb0a..16c1f50bc3db 100644
--- a/svgio/inc/svgnode.hxx
+++ b/svgio/inc/svgnode.hxx
@@ -95,6 +95,9 @@ namespace svgio::svgreader
 /// Class svan value
 std::optional   mpClass;
 
+/// systemLanguage values
+std::vector  maSystemLanguage;
+
 /// XmlSpace value
 XmlSpacemaXmlSpace;
 
@@ -174,6 +177,10 @@ namespace svgio::svgreader
 std::optional const & getClass() const { return mpClass; 
}
 void setClass(OUString const &);
 
+/// SystemLanguage access
+std::vector const & getSystemLanguage() const { return 
maSystemLanguage; }
+void setSystemLanguage(OUString const &);
+
   

core.git: svgio/qa

2024-03-27 Thread Xisco Fauli (via logerrit)
 svgio/qa/cppunit/SvgImportTest.cxx  |8 
 svgio/qa/cppunit/data/tdf156579.svg |8 
 2 files changed, 16 insertions(+)

New commits:
commit 6b15374d1850de13e977cf4bb2106d38e74a030a
Author: Xisco Fauli 
AuthorDate: Wed Mar 27 16:12:41 2024 +0100
Commit: Xisco Fauli 
CommitDate: Wed Mar 27 22:03:09 2024 +0100

tdf#156579: svgio: Add unittest

Change-Id: I77ab0c72209fa02c6e463351e8cda09213d47ac3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165399
Tested-by: Xisco Fauli 
Reviewed-by: Xisco Fauli 

diff --git a/svgio/qa/cppunit/SvgImportTest.cxx 
b/svgio/qa/cppunit/SvgImportTest.cxx
index 8256f6392725..4cab973b5003 100644
--- a/svgio/qa/cppunit/SvgImportTest.cxx
+++ b/svgio/qa/cppunit/SvgImportTest.cxx
@@ -434,6 +434,14 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf145896)
 assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor[3]"_ostr, 
"color"_ostr, "#ff");
 }
 
+CPPUNIT_TEST_FIXTURE(Test, testTdf156579)
+{
+xmlDocUniquePtr pDocument = 
dumpAndParseSvg(u"/svgio/qa/cppunit/data/tdf156579.svg");
+
+// Without the fix in place, nothing would be displayed
+assertXPath(pDocument, 
"/primitive2D/transform/mask/transform/polypolygoncolor[1]"_ostr, "color"_ostr, 
"#ff");
+}
+
 CPPUNIT_TEST_FIXTURE(Test, testTdf156168)
 {
 xmlDocUniquePtr pDocument = 
dumpAndParseSvg(u"/svgio/qa/cppunit/data/tdf156168.svg");
diff --git a/svgio/qa/cppunit/data/tdf156579.svg 
b/svgio/qa/cppunit/data/tdf156579.svg
new file mode 100644
index ..27610784dd87
--- /dev/null
+++ b/svgio/qa/cppunit/data/tdf156579.svg
@@ -0,0 +1,8 @@
+
+
+   
+   
+   
+   
+   
+


core.git: svgio/qa

2024-03-27 Thread Xisco Fauli (via logerrit)
 svgio/qa/cppunit/SvgImportTest.cxx |  753 +
 1 file changed, 107 insertions(+), 646 deletions(-)

New commits:
commit 7fa2a81f2f00fdad570a98f33acc45cd95af5ae6
Author: Xisco Fauli 
AuthorDate: Wed Mar 27 17:41:53 2024 +0100
Commit: Xisco Fauli 
CommitDate: Wed Mar 27 20:46:03 2024 +0100

CppunitTest_svgio: factor out common code

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

diff --git a/svgio/qa/cppunit/SvgImportTest.cxx 
b/svgio/qa/cppunit/SvgImportTest.cxx
index b0dd84706207..8256f6392725 100644
--- a/svgio/qa/cppunit/SvgImportTest.cxx
+++ b/svgio/qa/cppunit/SvgImportTest.cxx
@@ -39,6 +39,7 @@ protected:
 void checkRectPrimitive(Primitive2DSequence const & rPrimitive);
 
 Primitive2DSequence parseSvg(std::u16string_view aSource);
+xmlDocUniquePtr dumpAndParseSvg(std::u16string_view aSource);
 };
 
 Primitive2DSequence Test::parseSvg(std::u16string_view aSource)
@@ -60,6 +61,17 @@ Primitive2DSequence Test::parseSvg(std::u16string_view 
aSource)
 return xSvgParser->getDecomposition(aInputStream, aPath);
 }
 
+xmlDocUniquePtr Test::dumpAndParseSvg(std::u16string_view aSource)
+{
+Primitive2DSequence aSequence = parseSvg(aSource);
+
+drawinglayer::Primitive2dXmlDump dumper;
+xmlDocUniquePtr pDocument = dumper.dumpAndParse(aSequence);
+
+CPPUNIT_ASSERT (pDocument);
+return pDocument;
+}
+
 void Test::checkRectPrimitive(Primitive2DSequence const & rPrimitive)
 {
 drawinglayer::Primitive2dXmlDump dumper;
@@ -76,8 +88,6 @@ void Test::checkRectPrimitive(Primitive2DSequence const & 
rPrimitive)
 assertXPath(pDocument, 
"/primitive2D/transform/polypolygoncolor/polypolygon"_ostr, "maxy"_ostr, "110");
 assertXPath(pDocument, 
"/primitive2D/transform/polypolygonstroke/line"_ostr, "color"_ostr, "#ff"); 
// rect stroke color
 assertXPath(pDocument, 
"/primitive2D/transform/polypolygonstroke/line"_ostr, "width"_ostr, "3"); // 
rect stroke width
-
-
 }
 
 namespace
@@ -136,13 +146,7 @@ CPPUNIT_TEST_FIXTURE(Test, testStyles)
 
 CPPUNIT_TEST_FIXTURE(Test, testSymbol)
 {
-Primitive2DSequence aSequenceTdf87309 = 
parseSvg(u"/svgio/qa/cppunit/data/symbol.svg");
-CPPUNIT_ASSERT_EQUAL(1, static_cast(aSequenceTdf87309.getLength()));
-
-drawinglayer::Primitive2dXmlDump dumper;
-xmlDocUniquePtr pDocument = dumper.dumpAndParse(aSequenceTdf87309);
-
-CPPUNIT_ASSERT (pDocument);
+xmlDocUniquePtr pDocument = 
dumpAndParseSvg(u"/svgio/qa/cppunit/data/symbol.svg");
 
 // tdf#126330: Without the fix in place, this test would have failed with
 // - Expected: 1
@@ -153,13 +157,7 @@ CPPUNIT_TEST_FIXTURE(Test, testSymbol)
 
 CPPUNIT_TEST_FIXTURE(Test, testTdf150124)
 {
-Primitive2DSequence aSequence = 
parseSvg(u"/svgio/qa/cppunit/data/tdf150124.svg");
-CPPUNIT_ASSERT_EQUAL(1, static_cast(aSequence.getLength()));
-
-drawinglayer::Primitive2dXmlDump dumper;
-xmlDocUniquePtr pDocument = dumper.dumpAndParse(aSequence);
-
-CPPUNIT_ASSERT (pDocument);
+xmlDocUniquePtr pDocument = 
dumpAndParseSvg(u"/svgio/qa/cppunit/data/tdf150124.svg");
 
 assertXPathChildren(pDocument, "/primitive2D"_ostr, 1);
 assertXPath(pDocument, "/primitive2D/hiddengeometry"_ostr, 1);
@@ -167,13 +165,7 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf150124)
 
 CPPUNIT_TEST_FIXTURE(Test, testTdf155819)
 {
-Primitive2DSequence aSequence = 
parseSvg(u"/svgio/qa/cppunit/data/tdf155819.svg");
-CPPUNIT_ASSERT_EQUAL(1, static_cast(aSequence.getLength()));
-
-drawinglayer::Primitive2dXmlDump dumper;
-xmlDocUniquePtr pDocument = dumper.dumpAndParse(aSequence);
-
-CPPUNIT_ASSERT (pDocument);
+xmlDocUniquePtr pDocument = 
dumpAndParseSvg(u"/svgio/qa/cppunit/data/tdf155819.svg");
 
 assertXPath(pDocument, 
"/primitive2D/transform/polypolygonstroke/line"_ostr, 1);
 assertXPath(pDocument, 
"/primitive2D/transform/polypolygonstroke/polypolygon"_ostr, 1);
@@ -185,13 +177,7 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf155819)
 
 CPPUNIT_TEST_FIXTURE(Test, testFilterFeBlend)
 {
-Primitive2DSequence aSequence = 
parseSvg(u"/svgio/qa/cppunit/data/filterFeBlend.svg");
-CPPUNIT_ASSERT_EQUAL(1, static_cast(aSequence.getLength()));
-
-drawinglayer::Primitive2dXmlDump dumper;
-xmlDocUniquePtr pDocument = dumper.dumpAndParse(aSequence);
-
-CPPUNIT_ASSERT (pDocument);
+xmlDocUniquePtr pDocument = 
dumpAndParseSvg(u"/svgio/qa/cppunit/data/filterFeBlend.svg");
 
 assertXPath(pDocument, 
"/primitive2D/transform/transform/polypolygoncolor[1]"_ostr, "color"_ostr, 
"#8a2be2");
 assertXPath(pDocument, 
"/primitive2D/transform/transform/polypolygoncolor[1]/polypolygon"_ostr, 
"height"_ostr, "100");
@@ -211,13 +197,7 @@ CPPUNIT_TEST_FIXTURE(Test, testFilterFeBlend)
 
 CPPUNIT_TEST_FIXTURE(Test, testFeColorMatrix)
 {
-Primitive2DSequence aSequence = 

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

2024-03-27 Thread Xisco Fauli (via logerrit)
 svgio/inc/svgstyleattributes.hxx  |9 +++---
 svgio/qa/cppunit/SvgImportTest.cxx|   14 ++
 svgio/qa/cppunit/data/tdf160373.svg   |   14 ++
 svgio/source/svgreader/svgstyleattributes.cxx |   36 +++---
 4 files changed, 55 insertions(+), 18 deletions(-)

New commits:
commit d6d502f41346b021d369c27c9ed969d75d680986
Author: Xisco Fauli 
AuthorDate: Tue Mar 26 14:13:21 2024 +0100
Commit: Xisco Fauli 
CommitDate: Wed Mar 27 08:51:49 2024 +0100

tdf#160373: Iterate over all parents to check whether it's a clipPath 
content

Change-Id: I383ec264e4c88ebcee2ae6a839b762bba8abfc12
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165347
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 
(cherry picked from commit 261985b6936ede212852e806c4b140ea634a5af3)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165318
Reviewed-by: Stéphane Guillou 

diff --git a/svgio/inc/svgstyleattributes.hxx b/svgio/inc/svgstyleattributes.hxx
index 4e55ab3fc644..1b5db09eb687 100644
--- a/svgio/inc/svgstyleattributes.hxx
+++ b/svgio/inc/svgstyleattributes.hxx
@@ -241,10 +241,6 @@ namespace svgio::svgreader
 
 mutable std::vector maResolvingParent;
 
-// defines if this attributes are part of a ClipPath. If yes,
-// rough geometry will be created on decomposition by patching
-// values for fill, stroke, strokeWidth and others
-boolmbIsClipPathContent : 1;
 
 // #121221# Defines if evtl. an empty array *is* set
 boolmbStrokeDasharraySet : 1;
@@ -316,6 +312,11 @@ namespace svgio::svgreader
 SvgStyleAttributes(SvgNode& rOwner);
 ~SvgStyleAttributes();
 
+// Check if this attribute is part of a ClipPath.
+// If so, rough geometry will be created on decomposition by 
patching
+// values for fill, stroke, strokeWidth and others
+bool isClipPathContent() const;
+
 /// fill content
 bool isFillSet() const; // #i125258# ask if fill is a direct hard 
attribute (no hierarchy)
 const basegfx::BColor* getFill() const;
diff --git a/svgio/qa/cppunit/SvgImportTest.cxx 
b/svgio/qa/cppunit/SvgImportTest.cxx
index 90b62bcce7ff..262c5cadcc68 100644
--- a/svgio/qa/cppunit/SvgImportTest.cxx
+++ b/svgio/qa/cppunit/SvgImportTest.cxx
@@ -441,6 +441,20 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf156168)
 assertXPath(pDocument, "/primitive2D/transform/polypolygonstroke[4]/line", 
"color", "#00ff00");
 }
 
+CPPUNIT_TEST_FIXTURE(Test, testTdf160373)
+{
+Primitive2DSequence aSequence = 
parseSvg(u"/svgio/qa/cppunit/data/tdf160373.svg");
+CPPUNIT_ASSERT_EQUAL(1, static_cast(aSequence.getLength()));
+
+drawinglayer::Primitive2dXmlDump dumper;
+xmlDocUniquePtr pDocument = dumper.dumpAndParse(aSequence);
+
+CPPUNIT_ASSERT (pDocument);
+
+// Without the fix in place, nothing would be displayed
+assertXPath(pDocument, 
"/primitive2D/transform/transform/polypolygoncolor", "color", "#ff");
+}
+
 CPPUNIT_TEST_FIXTURE(Test, testTdf129356)
 {
 Primitive2DSequence aSequence = 
parseSvg(u"/svgio/qa/cppunit/data/tdf129356.svg");
diff --git a/svgio/qa/cppunit/data/tdf160373.svg 
b/svgio/qa/cppunit/data/tdf160373.svg
new file mode 100644
index ..73b18bb2ea61
--- /dev/null
+++ b/svgio/qa/cppunit/data/tdf160373.svg
@@ -0,0 +1,14 @@
+
+
+
+  
+
+  
+
+  
+
+
+
+
diff --git a/svgio/source/svgreader/svgstyleattributes.cxx 
b/svgio/source/svgreader/svgstyleattributes.cxx
index b0fd42303976..826f00b6687a 100644
--- a/svgio/source/svgreader/svgstyleattributes.cxx
+++ b/svgio/source/svgreader/svgstyleattributes.cxx
@@ -1292,18 +1292,9 @@ namespace svgio::svgreader
 maBaselineShift(BaselineShift::Baseline),
 maBaselineShiftNumber(0),
 maDominantBaseline(DominantBaseline::Auto),
-maResolvingParent(31, 0),
-mbIsClipPathContent(SVGToken::ClipPathNode == mrOwner.getType()),
+maResolvingParent(32, 0),
 mbStrokeDasharraySet(false)
 {
-const SvgStyleAttributes* pParentStyle = getParentStyle();
-if(!mbIsClipPathContent)
-{
-if(pParentStyle)
-{
-mbIsClipPathContent = pParentStyle->mbIsClipPathContent;
-}
-}
 }
 
 SvgStyleAttributes::~SvgStyleAttributes()
@@ -1995,10 +1986,27 @@ namespace svgio::svgreader
 }
 }
 
+bool SvgStyleAttributes::isClipPathContent() const
+{
+if (SVGToken::ClipPathNode == mrOwner.getType())
+return true;
+
+const SvgStyleAttributes* pSvgStyleAttributes = getParentStyle();
+if (pSvgStyleAttributes && maResolvingParent[31] < 

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

2024-03-27 Thread Xisco Fauli (via logerrit)
 svgio/inc/svgstyleattributes.hxx  |9 +++---
 svgio/qa/cppunit/SvgImportTest.cxx|   14 ++
 svgio/qa/cppunit/data/tdf160373.svg   |   14 ++
 svgio/source/svgreader/svgstyleattributes.cxx |   36 +++---
 4 files changed, 55 insertions(+), 18 deletions(-)

New commits:
commit ea3d61886a2b420b985bed162c28b94698283c76
Author: Xisco Fauli 
AuthorDate: Tue Mar 26 14:13:21 2024 +0100
Commit: Xisco Fauli 
CommitDate: Wed Mar 27 08:51:39 2024 +0100

tdf#160373: Iterate over all parents to check whether it's a clipPath 
content

Change-Id: I383ec264e4c88ebcee2ae6a839b762bba8abfc12
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165347
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 
(cherry picked from commit 261985b6936ede212852e806c4b140ea634a5af3)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165317
Reviewed-by: Stéphane Guillou 

diff --git a/svgio/inc/svgstyleattributes.hxx b/svgio/inc/svgstyleattributes.hxx
index bf921f8b1bb0..c5c095462f3d 100644
--- a/svgio/inc/svgstyleattributes.hxx
+++ b/svgio/inc/svgstyleattributes.hxx
@@ -243,10 +243,6 @@ namespace svgio::svgreader
 
 mutable std::vector maResolvingParent;
 
-// defines if this attributes are part of a ClipPath. If yes,
-// rough geometry will be created on decomposition by patching
-// values for fill, stroke, strokeWidth and others
-boolmbIsClipPathContent : 1;
 
 // #121221# Defines if evtl. an empty array *is* set
 boolmbStrokeDasharraySet : 1;
@@ -318,6 +314,11 @@ namespace svgio::svgreader
 SvgStyleAttributes(SvgNode& rOwner);
 ~SvgStyleAttributes();
 
+// Check if this attribute is part of a ClipPath.
+// If so, rough geometry will be created on decomposition by 
patching
+// values for fill, stroke, strokeWidth and others
+bool isClipPathContent() const;
+
 /// fill content
 bool isFillSet() const; // #i125258# ask if fill is a direct hard 
attribute (no hierarchy)
 const basegfx::BColor* getFill() const;
diff --git a/svgio/qa/cppunit/SvgImportTest.cxx 
b/svgio/qa/cppunit/SvgImportTest.cxx
index 326e8f38ffb6..c7188dedd7c0 100644
--- a/svgio/qa/cppunit/SvgImportTest.cxx
+++ b/svgio/qa/cppunit/SvgImportTest.cxx
@@ -441,6 +441,20 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf156168)
 assertXPath(pDocument, 
"/primitive2D/transform/polypolygonstroke[4]/line"_ostr, "color"_ostr, 
"#00ff00");
 }
 
+CPPUNIT_TEST_FIXTURE(Test, testTdf160373)
+{
+Primitive2DSequence aSequence = 
parseSvg(u"/svgio/qa/cppunit/data/tdf160373.svg");
+CPPUNIT_ASSERT_EQUAL(1, static_cast(aSequence.getLength()));
+
+drawinglayer::Primitive2dXmlDump dumper;
+xmlDocUniquePtr pDocument = dumper.dumpAndParse(aSequence);
+
+CPPUNIT_ASSERT (pDocument);
+
+// Without the fix in place, nothing would be displayed
+assertXPath(pDocument, 
"/primitive2D/transform/transform/polypolygoncolor"_ostr, "color"_ostr, 
"#ff");
+}
+
 CPPUNIT_TEST_FIXTURE(Test, testTdf129356)
 {
 Primitive2DSequence aSequence = 
parseSvg(u"/svgio/qa/cppunit/data/tdf129356.svg");
diff --git a/svgio/qa/cppunit/data/tdf160373.svg 
b/svgio/qa/cppunit/data/tdf160373.svg
new file mode 100644
index ..73b18bb2ea61
--- /dev/null
+++ b/svgio/qa/cppunit/data/tdf160373.svg
@@ -0,0 +1,14 @@
+
+
+
+  
+
+  
+
+  
+
+
+
+
diff --git a/svgio/source/svgreader/svgstyleattributes.cxx 
b/svgio/source/svgreader/svgstyleattributes.cxx
index 19070989bb55..58bdb9add84b 100644
--- a/svgio/source/svgreader/svgstyleattributes.cxx
+++ b/svgio/source/svgreader/svgstyleattributes.cxx
@@ -1287,18 +1287,9 @@ namespace svgio::svgreader
 maBaselineShift(BaselineShift::Baseline),
 maBaselineShiftNumber(0),
 maDominantBaseline(DominantBaseline::Auto),
-maResolvingParent(31, 0),
-mbIsClipPathContent(SVGToken::ClipPathNode == mrOwner.getType()),
+maResolvingParent(32, 0),
 mbStrokeDasharraySet(false)
 {
-const SvgStyleAttributes* pParentStyle = getParentStyle();
-if(!mbIsClipPathContent)
-{
-if(pParentStyle)
-{
-mbIsClipPathContent = pParentStyle->mbIsClipPathContent;
-}
-}
 }
 
 SvgStyleAttributes::~SvgStyleAttributes()
@@ -2005,10 +1996,27 @@ namespace svgio::svgreader
 }
 }
 
+bool SvgStyleAttributes::isClipPathContent() const
+{
+if (SVGToken::ClipPathNode == mrOwner.getType())
+return true;
+
+const SvgStyleAttributes* pSvgStyleAttributes = getParentStyle();
+if (pSvgStyleAttributes && 

core.git: svgio/inc svgio/qa svgio/source

2024-03-26 Thread Xisco Fauli (via logerrit)
 svgio/inc/svgstyleattributes.hxx  |9 +++---
 svgio/qa/cppunit/SvgImportTest.cxx|   14 ++
 svgio/qa/cppunit/data/tdf160373.svg   |   14 ++
 svgio/source/svgreader/svgstyleattributes.cxx |   36 +++---
 4 files changed, 55 insertions(+), 18 deletions(-)

New commits:
commit feb4e0890b883940ec6964375293727ac6229f1c
Author: Xisco Fauli 
AuthorDate: Tue Mar 26 14:13:21 2024 +0100
Commit: Xisco Fauli 
CommitDate: Tue Mar 26 18:38:59 2024 +0100

tdf#160373: Iterate over all parents to check whether it's a clipPath 
content

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

diff --git a/svgio/inc/svgstyleattributes.hxx b/svgio/inc/svgstyleattributes.hxx
index bf921f8b1bb0..c5c095462f3d 100644
--- a/svgio/inc/svgstyleattributes.hxx
+++ b/svgio/inc/svgstyleattributes.hxx
@@ -243,10 +243,6 @@ namespace svgio::svgreader
 
 mutable std::vector maResolvingParent;
 
-// defines if this attributes are part of a ClipPath. If yes,
-// rough geometry will be created on decomposition by patching
-// values for fill, stroke, strokeWidth and others
-boolmbIsClipPathContent : 1;
 
 // #121221# Defines if evtl. an empty array *is* set
 boolmbStrokeDasharraySet : 1;
@@ -318,6 +314,11 @@ namespace svgio::svgreader
 SvgStyleAttributes(SvgNode& rOwner);
 ~SvgStyleAttributes();
 
+// Check if this attribute is part of a ClipPath.
+// If so, rough geometry will be created on decomposition by 
patching
+// values for fill, stroke, strokeWidth and others
+bool isClipPathContent() const;
+
 /// fill content
 bool isFillSet() const; // #i125258# ask if fill is a direct hard 
attribute (no hierarchy)
 const basegfx::BColor* getFill() const;
diff --git a/svgio/qa/cppunit/SvgImportTest.cxx 
b/svgio/qa/cppunit/SvgImportTest.cxx
index 88bf4bc1a4e7..b0dd84706207 100644
--- a/svgio/qa/cppunit/SvgImportTest.cxx
+++ b/svgio/qa/cppunit/SvgImportTest.cxx
@@ -576,6 +576,20 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf156168)
 assertXPath(pDocument, 
"/primitive2D/transform/polypolygonstroke[4]/line"_ostr, "color"_ostr, 
"#00ff00");
 }
 
+CPPUNIT_TEST_FIXTURE(Test, testTdf160373)
+{
+Primitive2DSequence aSequence = 
parseSvg(u"/svgio/qa/cppunit/data/tdf160373.svg");
+CPPUNIT_ASSERT_EQUAL(1, static_cast(aSequence.getLength()));
+
+drawinglayer::Primitive2dXmlDump dumper;
+xmlDocUniquePtr pDocument = dumper.dumpAndParse(aSequence);
+
+CPPUNIT_ASSERT (pDocument);
+
+// Without the fix in place, nothing would be displayed
+assertXPath(pDocument, 
"/primitive2D/transform/transform/polypolygoncolor"_ostr, "color"_ostr, 
"#ff");
+}
+
 CPPUNIT_TEST_FIXTURE(Test, testTdf129356)
 {
 Primitive2DSequence aSequence = 
parseSvg(u"/svgio/qa/cppunit/data/tdf129356.svg");
diff --git a/svgio/qa/cppunit/data/tdf160373.svg 
b/svgio/qa/cppunit/data/tdf160373.svg
new file mode 100644
index ..73b18bb2ea61
--- /dev/null
+++ b/svgio/qa/cppunit/data/tdf160373.svg
@@ -0,0 +1,14 @@
+
+
+
+  
+
+  
+
+  
+
+
+
+
diff --git a/svgio/source/svgreader/svgstyleattributes.cxx 
b/svgio/source/svgreader/svgstyleattributes.cxx
index d5e3ad33209e..0ae986f010cd 100644
--- a/svgio/source/svgreader/svgstyleattributes.cxx
+++ b/svgio/source/svgreader/svgstyleattributes.cxx
@@ -1287,18 +1287,9 @@ namespace svgio::svgreader
 maBaselineShift(BaselineShift::Baseline),
 maBaselineShiftNumber(0),
 maDominantBaseline(DominantBaseline::Auto),
-maResolvingParent(31, 0),
-mbIsClipPathContent(SVGToken::ClipPathNode == mrOwner.getType()),
+maResolvingParent(32, 0),
 mbStrokeDasharraySet(false)
 {
-const SvgStyleAttributes* pParentStyle = getParentStyle();
-if(!mbIsClipPathContent)
-{
-if(pParentStyle)
-{
-mbIsClipPathContent = pParentStyle->mbIsClipPathContent;
-}
-}
 }
 
 SvgStyleAttributes::~SvgStyleAttributes()
@@ -2005,10 +1996,27 @@ namespace svgio::svgreader
 }
 }
 
+bool SvgStyleAttributes::isClipPathContent() const
+{
+if (SVGToken::ClipPathNode == mrOwner.getType())
+return true;
+
+const SvgStyleAttributes* pSvgStyleAttributes = getParentStyle();
+if (pSvgStyleAttributes && maResolvingParent[31] < 
nStyleDepthLimit)
+{
+++maResolvingParent[31];
+bool ret = pSvgStyleAttributes->isClipPathContent();
+   

core.git: download.lst external/poppler

2024-03-26 Thread Xisco Fauli (via logerrit)
 download.lst |4 +-
 external/poppler/disable-nss-and-gpgmepp.patch.1 |   36 ---
 2 files changed, 21 insertions(+), 19 deletions(-)

New commits:
commit a3eefc0fbe7d9a9ed946979c97a41181cd043593
Author: Xisco Fauli 
AuthorDate: Mon Mar 25 20:59:08 2024 +0100
Commit: Xisco Fauli 
CommitDate: Tue Mar 26 09:25:55 2024 +0100

poppler: upgrade to release 24.03.0

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

diff --git a/download.lst b/download.lst
index 2b033727c322..4f1f4ffe97bb 100644
--- a/download.lst
+++ b/download.lst
@@ -543,8 +543,8 @@ LIBTIFF_TARBALL := tiff-4.6.0.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-POPPLER_SHA256SUM := 
80d1d44dd8bdf4ac1a47d56c5065075eb9991790974b1ed7d14b972acde88e55
-POPPLER_TARBALL := poppler-23.09.0.tar.xz
+POPPLER_SHA256SUM := 
bafbf0db5713dec25b5d16eb2cd87e4a62351cdc40f050c3937cd8dd6882d446
+POPPLER_TARBALL := poppler-24.03.0.tar.xz
 POPPLER_DATA_SHA256SUM := 
c835b640a40ce357e1b83666aabd95edffa24d49b8daff63adb851cdab74
 POPPLER_DATA_TARBALL := poppler-data-0.4.12.tar.gz
 # three static lines
diff --git a/external/poppler/disable-nss-and-gpgmepp.patch.1 
b/external/poppler/disable-nss-and-gpgmepp.patch.1
index 01b442f53a1c..1d7f7f933433 100644
--- a/external/poppler/disable-nss-and-gpgmepp.patch.1
+++ b/external/poppler/disable-nss-and-gpgmepp.patch.1
@@ -11,7 +11,7 @@ disable NSS/GPGMEPP dependent code.
  #include "SignatureInfo.h"
  #include "CertificateInfo.h"
  #include "XRef.h"
-@@ -577,7 +577,7 @@
+@@ -578,7 +578,7 @@
  {
  return static_cast(field)->validateSignature(doVerifyCert, forceRevalidation, validationTime, 
ocspRevocationCheck, enableAIA);
  }
@@ -20,12 +20,12 @@ disable NSS/GPGMEPP dependent code.
  // update hash with the specified range of data from the file
  static bool hashFileRange(FILE *f, CryptoSign::SigningInterface *handler, 
Goffset start, Goffset end)
  {
-@@ -607,10 +607,12 @@
+@@ -608,10 +608,12 @@
  delete[] buf;
  return true;
  }
 +#endif
- 
+
  bool FormWidgetSignature::signDocument(const std::string , const 
std::string , const std::string , const GooString 
*reason, const GooString *location, const std::optional 
,
 const std::optional 
)
  {
@@ -33,44 +33,46 @@ disable NSS/GPGMEPP dependent code.
  auto backend = CryptoSign::Factory::createActive();
  if (!backend) {
  return false;
-@@ -698,6 +700,8 @@
+@@ -697,8 +699,8 @@
+ signatureField->setSignature(*signature);
+
  fclose(file);
- 
- return true;
+-
+-return true;
 +#endif
 +return false;
  }
- 
- bool FormWidgetSignature::signDocumentWithAppearance(const std::string 
, const std::string , const std::string , 
const GooString *reason, const GooString *location,
-@@ -2316,6 +2320,7 @@
- 
+
+ static std::tuple calculateDxDy(int rot, const PDFRectangle 
*rect)
+@@ -2355,6 +2357,7 @@
+
  void 
FormFieldSignature::hashSignedDataBlock(CryptoSign::VerificationInterface 
*handler, Goffset block_len)
  {
 +#if 0
  if (!handler) {
  return;
  }
-@@ -2335,6 +2340,7 @@
+@@ -2374,6 +2377,7 @@
  i += BLOCK_SIZE;
  }
  }
 +#endif
  }
- 
+
  FormSignatureType FormWidgetSignature::signatureType() const
-@@ -2349,6 +2355,7 @@
- 
+@@ -2388,6 +2392,7 @@
+
  SignatureInfo *FormFieldSignature::validateSignature(bool doVerifyCert, bool 
forceRevalidation, time_t validationTime, bool ocspRevocationCheck, bool 
enableAIA)
  {
 +#if 0
  auto backend = CryptoSign::Factory::createActive();
  if (!backend) {
  return signature_info;
-@@ -2425,6 +2432,7 @@
+@@ -2464,6 +2469,7 @@
  const CertificateValidationStatus cert_val_state = 
signature_handler->validateCertificate(std::chrono::system_clock::from_time_t(validationTime),
 ocspRevocationCheck, enableAIA);
  signature_info->setCertificateValStatus(cert_val_state);
- 
+
 +#endif
  return signature_info;
  }
- 
+


core.git: Branch 'libreoffice-24-2' - download.lst

2024-03-26 Thread Xisco Fauli (via logerrit)
 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 999d14c0e4dc8063d7afd5a6c216b1842ef5a171
Author: Xisco Fauli 
AuthorDate: Mon Mar 25 12:14:07 2024 +0100
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Tue Mar 26 09:14:16 2024 +0100

openldap: upgrade to release 2.6.7

Change-Id: I7716a41114442ba7a57d81192b01cbeaaeca08b6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165280
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 
(cherry picked from commit 9a0b37a5337faee5634cc9fce4955da204b95bf4)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165247
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>

diff --git a/download.lst b/download.lst
index 6b38df3ce30b..19286d1d0e32 100644
--- a/download.lst
+++ b/download.lst
@@ -503,8 +503,8 @@ ONLINEUPDATE_TARBALL := 
onlineupdate-c003be8b9727672e7d30972983b375f4c200233f-2.
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-OPENLDAP_SHA256SUM := 
082e998cf542984d43634442dbe11da860759e510907152ea579bdc42fe39ea0
-OPENLDAP_TARBALL := openldap-2.6.6.tgz
+OPENLDAP_SHA256SUM := 
cd775f625c944ed78a3da18a03b03b08eea73c8aabc97b41bb336e9a10954930
+OPENLDAP_TARBALL := openldap-2.6.7.tgz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts


core.git: download.lst

2024-03-25 Thread Xisco Fauli (via logerrit)
 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a80258e11282c78ab3867c96e4c2575e83c5482b
Author: Xisco Fauli 
AuthorDate: Mon Mar 25 13:45:24 2024 +0100
Commit: Xisco Fauli 
CommitDate: Mon Mar 25 20:43:29 2024 +0100

mariadb connector: upgrade to release 3.3.8

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

diff --git a/download.lst b/download.lst
index d35bd6300748..2b033727c322 100644
--- a/download.lst
+++ b/download.lst
@@ -446,8 +446,8 @@ LXML_TARBALL := lxml-4.9.2.tgz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-MARIADB_CONNECTOR_C_SHA256SUM := 
975a9a862fed80f84e0206373f7ef05537aada5b65d99b71b36ab892b44240bf
-MARIADB_CONNECTOR_C_TARBALL := mariadb-connector-c-3.3.7-src.tar.gz
+MARIADB_CONNECTOR_C_SHA256SUM := 
f9f076b4aa9fb22cc94b24f82c80f9ef063805ecd6533a2eb5d5060cf93833e8
+MARIADB_CONNECTOR_C_TARBALL := mariadb-connector-c-3.3.8-src.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts


core.git: download.lst

2024-03-25 Thread Xisco Fauli (via logerrit)
 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c6d791e3d2577498affec491876a0afa441be002
Author: Xisco Fauli 
AuthorDate: Mon Mar 25 10:56:38 2024 +0100
Commit: Xisco Fauli 
CommitDate: Mon Mar 25 20:42:40 2024 +0100

nss: upgrade to release 3.99

Change-Id: I77ccc45854b2d0aecc288f471d94c81ad9089f85
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165273
Tested-by: Xisco Fauli 
Reviewed-by: Xisco Fauli 

diff --git a/download.lst b/download.lst
index f7cacf0c43aa..d35bd6300748 100644
--- a/download.lst
+++ b/download.lst
@@ -477,8 +477,8 @@ MYTHES_TARBALL := mythes-1.2.5.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-NSS_SHA256SUM := 
59bb55a59b02e4004fc26ad0aa1a13fe8d73c6c90c447dd2f2efb73fb81083ed
-NSS_TARBALL := nss-3.98-with-nspr-4.35.tar.gz
+NSS_SHA256SUM := 
5f29fea64b3234b33a615b6df40469e239a4168ac0909106bd00e6490b274c31
+NSS_TARBALL := nss-3.99-with-nspr-4.35.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts


core.git: download.lst

2024-03-25 Thread Xisco Fauli (via logerrit)
 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9a0b37a5337faee5634cc9fce4955da204b95bf4
Author: Xisco Fauli 
AuthorDate: Mon Mar 25 12:14:07 2024 +0100
Commit: Xisco Fauli 
CommitDate: Mon Mar 25 15:54:36 2024 +0100

openldap: upgrade to release 2.6.7

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

diff --git a/download.lst b/download.lst
index 7064bd39bef3..f7cacf0c43aa 100644
--- a/download.lst
+++ b/download.lst
@@ -503,8 +503,8 @@ ONLINEUPDATE_TARBALL := 
onlineupdate-c003be8b9727672e7d30972983b375f4c200233f-2.
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-OPENLDAP_SHA256SUM := 
082e998cf542984d43634442dbe11da860759e510907152ea579bdc42fe39ea0
-OPENLDAP_TARBALL := openldap-2.6.6.tgz
+OPENLDAP_SHA256SUM := 
cd775f625c944ed78a3da18a03b03b08eea73c8aabc97b41bb336e9a10954930
+OPENLDAP_TARBALL := openldap-2.6.7.tgz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts


core.git: download.lst

2024-03-25 Thread Xisco Fauli (via logerrit)
 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e6f000c64fa986a9539f68fe5fff096b0b4b7c48
Author: Xisco Fauli 
AuthorDate: Mon Mar 25 11:23:27 2024 +0100
Commit: Xisco Fauli 
CommitDate: Mon Mar 25 15:13:19 2024 +0100

postgresql: upgrade to release 13.14

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

diff --git a/download.lst b/download.lst
index 643e9cc7f3f3..7064bd39bef3 100644
--- a/download.lst
+++ b/download.lst
@@ -550,8 +550,8 @@ POPPLER_DATA_TARBALL := poppler-data-0.4.12.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-POSTGRESQL_SHA256SUM := 
4992ff647203566b670d4e54dc5317499a26856c93576d0ea951bdf6bee50bfb
-POSTGRESQL_TARBALL := postgresql-13.11.tar.bz2
+POSTGRESQL_SHA256SUM := 
b8df078551898960bd500dc5d38a177e9905376df81fe7f2b660a1407fa6a5ed
+POSTGRESQL_TARBALL := postgresql-13.14.tar.bz2
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts


core.git: Branch 'libreoffice-24-2' - download.lst

2024-03-22 Thread Xisco Fauli (via logerrit)
 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 319966df55dda429202f12eba678eeb461eef5ed
Author: Xisco Fauli 
AuthorDate: Wed Mar 20 10:26:11 2024 +0100
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Sat Mar 23 01:05:13 2024 +0100

libxml2: upgrade to release 2.12.6

Change-Id: I7372b276f74bc760c99580ffc509fde1031cb3a6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165049
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 
(cherry picked from commit 832b98cedda2cd1631651f9397a871fb50d9cb1f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165183
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>

diff --git a/download.lst b/download.lst
index bc1f68ce8385..6b38df3ce30b 100644
--- a/download.lst
+++ b/download.lst
@@ -424,8 +424,8 @@ XMLSEC_TARBALL := xmlsec1-1.3.2.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBXML_SHA256SUM := 
a972796696afd38073e0f59c283c3a2f5a560b5268b4babc391b286166526b21
-LIBXML_VERSION_MICRO := 5
+LIBXML_SHA256SUM := 
889c593a881a3db5fdd96cc9318c87df34eb648edfc458272ad46fd607353fbb
+LIBXML_VERSION_MICRO := 6
 LIBXML_TARBALL := libxml2-2.12.$(LIBXML_VERSION_MICRO).tar.xz
 # three static lines
 # so that git cherry-pick


core.git: Branch 'libreoffice-24-2' - download.lst

2024-03-22 Thread Xisco Fauli (via logerrit)
 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 78f0fa2f7e408cbc75ffe99f61f6a556bed2a032
Author: Xisco Fauli 
AuthorDate: Wed Mar 20 10:49:53 2024 +0100
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Sat Mar 23 01:04:45 2024 +0100

libpng: upgrade to 1.6.43

Change-Id: Ia1ddc21dc521cf97b75a64d806417cbfe5dec623
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165050
Tested-by: Xisco Fauli 
Reviewed-by: Xisco Fauli 
(cherry picked from commit f29222eaf385891620d4868827b27e734752018e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165182
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>

diff --git a/download.lst b/download.lst
index 438359f38b65..bc1f68ce8385 100644
--- a/download.lst
+++ b/download.lst
@@ -533,8 +533,8 @@ PIXMAN_TARBALL := pixman-0.42.2.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBPNG_SHA256SUM := 
c919dbc11f4c03b05aba3f8884d8eb7adfe3572ad228af972bb60057bdb48450
-LIBPNG_TARBALL := libpng-1.6.42.tar.xz
+LIBPNG_SHA256SUM := 
6a5ca0652392a2d7c9db2ae5b40210843c0bbc081cbd410825ab00cc59f14a6c
+LIBPNG_TARBALL := libpng-1.6.43.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts


core.git: vcl/qa

2024-03-22 Thread Xisco Fauli (via logerrit)
 vcl/qa/cppunit/pdfexport/data/tdf160117.ods |binary
 vcl/qa/cppunit/pdfexport/pdfexport2.cxx |   42 
 2 files changed, 42 insertions(+)

New commits:
commit c6518dc58f76ad9b59a61dd3736abd62acc5fc57
Author: Xisco Fauli 
AuthorDate: Thu Mar 21 12:36:24 2024 +0100
Commit: Xisco Fauli 
CommitDate: Fri Mar 22 10:10:33 2024 +0100

tdf#160117: vcl_pdfexport2: Add unittest

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

diff --git a/vcl/qa/cppunit/pdfexport/data/tdf160117.ods 
b/vcl/qa/cppunit/pdfexport/data/tdf160117.ods
new file mode 100644
index ..ed18444e7b8d
Binary files /dev/null and b/vcl/qa/cppunit/pdfexport/data/tdf160117.ods differ
diff --git a/vcl/qa/cppunit/pdfexport/pdfexport2.cxx 
b/vcl/qa/cppunit/pdfexport/pdfexport2.cxx
index 061b79e488cb..525f1d91a449 100644
--- a/vcl/qa/cppunit/pdfexport/pdfexport2.cxx
+++ b/vcl/qa/cppunit/pdfexport/pdfexport2.cxx
@@ -1047,6 +1047,48 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest2, testReexportPDF)
 #endif
 }
 
+CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf160117)
+{
+vcl::filter::PDFDocument aDocument;
+load(u"tdf160117.ods", aDocument);
+
+// The document has one page.
+std::vector aPages = aDocument.GetPages();
+CPPUNIT_ASSERT_EQUAL(static_cast(1), aPages.size());
+
+int nCount = 0;
+bool bFound1 = false;
+bool bFound2 = false;
+bool bFound3 = false;
+for (const auto& rDocElement : aDocument.GetElements())
+{
+auto pObject = 
dynamic_cast(rDocElement.get());
+if (!pObject)
+continue;
+auto pType = 
dynamic_cast(pObject->Lookup("Type"_ostr));
+if (pType && pType->GetValue() == "FontDescriptor")
+{
+auto pFontName
+= 
dynamic_cast(pObject->Lookup("FontName"_ostr));
+CPPUNIT_ASSERT(pFontName);
+if ("CA+LiberationSans-Bold"_ostr == pFontName->GetValue())
+bFound1 = true;
+else if ("DA+LiberationSans-Italic"_ostr == 
pFontName->GetValue())
+bFound2 = true;
+else if ("BA+LiberationSans"_ostr == pFontName->GetValue())
+bFound3 = true;
+++nCount;
+}
+}
+// Without the fix in place, this test would have failed with
+// - Expected: 3
+// - Actual  : 2
+CPPUNIT_ASSERT_EQUAL(3, nCount);
+CPPUNIT_ASSERT(bFound1);
+CPPUNIT_ASSERT(bFound2);
+CPPUNIT_ASSERT(bFound3);
+}
+
 // Check we correctly copy more complex resources (Fonts describing
 // glyphs in recursive arrays) to the target PDF
 CPPUNIT_TEST_FIXTURE(PdfExportTest2, testReexportDocumentWithComplexResources)


core.git: download.lst

2024-03-21 Thread Xisco Fauli (via logerrit)
 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 832b98cedda2cd1631651f9397a871fb50d9cb1f
Author: Xisco Fauli 
AuthorDate: Wed Mar 20 10:26:11 2024 +0100
Commit: Xisco Fauli 
CommitDate: Thu Mar 21 13:06:47 2024 +0100

libxml2: upgrade to release 2.12.6

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

diff --git a/download.lst b/download.lst
index 27391725e6a5..276d67276c07 100644
--- a/download.lst
+++ b/download.lst
@@ -424,8 +424,8 @@ XMLSEC_TARBALL := xmlsec1-1.3.3.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBXML_SHA256SUM := 
a972796696afd38073e0f59c283c3a2f5a560b5268b4babc391b286166526b21
-LIBXML_VERSION_MICRO := 5
+LIBXML_SHA256SUM := 
889c593a881a3db5fdd96cc9318c87df34eb648edfc458272ad46fd607353fbb
+LIBXML_VERSION_MICRO := 6
 LIBXML_TARBALL := libxml2-2.12.$(LIBXML_VERSION_MICRO).tar.xz
 # three static lines
 # so that git cherry-pick


core.git: sw/qa

2024-03-21 Thread Xisco Fauli (via logerrit)
 sw/qa/uitest/data/tdf159418.odt |binary
 sw/qa/uitest/writer_tests4/tdf159418.py |   49 
 2 files changed, 49 insertions(+)

New commits:
commit b54dbc842491349ea1fd144988feb7e25ea5f106
Author: Xisco Fauli 
AuthorDate: Wed Mar 20 16:48:58 2024 +0100
Commit: Xisco Fauli 
CommitDate: Thu Mar 21 08:52:26 2024 +0100

tdf#159418: sw: Add UItest

Change-Id: Ic41eac4909e85544f5c195cebb59e32745c09f40
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165070
Tested-by: Xisco Fauli 
Reviewed-by: Xisco Fauli 

diff --git a/sw/qa/uitest/data/tdf159418.odt b/sw/qa/uitest/data/tdf159418.odt
new file mode 100644
index ..730b36fff3b0
Binary files /dev/null and b/sw/qa/uitest/data/tdf159418.odt differ
diff --git a/sw/qa/uitest/writer_tests4/tdf159418.py 
b/sw/qa/uitest/writer_tests4/tdf159418.py
new file mode 100644
index ..76143a5dce71
--- /dev/null
+++ b/sw/qa/uitest/writer_tests4/tdf159418.py
@@ -0,0 +1,49 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+from uitest.framework import UITestCase
+from libreoffice.uno.propertyvalue import mkPropertyValues
+from uitest.uihelper.common import get_state_as_dict, get_url_for_data_file
+
+class tdf159418(UITestCase):
+
+def test_tdf159418(self):
+with self.ui_test.load_file(get_url_for_data_file("tdf159418.odt")):
+
+with 
self.ui_test.execute_dialog_through_command(".uno:IndexEntryDialog", 
close_button="close") as xDialog:
+
+xEntry = xDialog.getChild("entryed")
+xNext = xDialog.getChild("next")
+xPrevious = xDialog.getChild("previous")
+
+# Without the fix in place, this test would have failed with
+# AssertionError: 'true' != 'false'
+self.assertEqual("true", get_state_as_dict(xNext)["Visible"])
+self.assertEqual("true", get_state_as_dict(xNext)["Enabled"])
+self.assertEqual("true", 
get_state_as_dict(xPrevious)["Visible"])
+self.assertEqual("false", 
get_state_as_dict(xPrevious)["Enabled"])
+self.assertEqual("Function", get_state_as_dict(xEntry)["Text"])
+
+xNext.executeAction("CLICK", tuple())
+
+self.assertEqual("true", get_state_as_dict(xNext)["Visible"])
+self.assertEqual("true", 
get_state_as_dict(xPrevious)["Visible"])
+self.assertEqual("true", 
get_state_as_dict(xPrevious)["Visible"])
+self.assertEqual("true", 
get_state_as_dict(xPrevious)["Enabled"])
+self.assertEqual("vector", get_state_as_dict(xEntry)["Text"])
+
+xPrevious.executeAction("CLICK", tuple())
+
+self.assertEqual("true", get_state_as_dict(xNext)["Visible"])
+self.assertEqual("true", get_state_as_dict(xNext)["Enabled"])
+self.assertEqual("true", 
get_state_as_dict(xPrevious)["Visible"])
+self.assertEqual("false", 
get_state_as_dict(xPrevious)["Enabled"])
+self.assertEqual("Function", get_state_as_dict(xEntry)["Text"])
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:


core.git: download.lst

2024-03-20 Thread Xisco Fauli (via logerrit)
 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c87f46492a41ebb2f9ac61ee8e1f0dd6d3dc90c7
Author: Xisco Fauli 
AuthorDate: Wed Mar 20 11:07:34 2024 +0100
Commit: Xisco Fauli 
CommitDate: Wed Mar 20 19:30:26 2024 +0100

harfbuzz: upgrade to 8.3.1

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

diff --git a/download.lst b/download.lst
index 003d7b3929a5..8589b1fc 100644
--- a/download.lst
+++ b/download.lst
@@ -292,8 +292,8 @@ GRAPHITE_TARBALL := graphite2-minimal-1.3.14.tgz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-HARFBUZZ_SHA256SUM := 
109501eaeb8bde3eadb25fab4164e993fbace29c3d775bcaa1c1e58e2f15f847
-HARFBUZZ_TARBALL := harfbuzz-8.3.0.tar.xz
+HARFBUZZ_SHA256SUM := 
f73e1eacd7e2ffae687bc3f056bb0c705b7a05aee86337686e09da8fc1c2030c
+HARFBUZZ_TARBALL := harfbuzz-8.3.1.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts


core.git: download.lst

2024-03-20 Thread Xisco Fauli (via logerrit)
 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f29222eaf385891620d4868827b27e734752018e
Author: Xisco Fauli 
AuthorDate: Wed Mar 20 10:49:53 2024 +0100
Commit: Xisco Fauli 
CommitDate: Wed Mar 20 17:44:02 2024 +0100

libpng: upgrade to 1.6.43

Change-Id: Ia1ddc21dc521cf97b75a64d806417cbfe5dec623
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165050
Tested-by: Xisco Fauli 
Reviewed-by: Xisco Fauli 

diff --git a/download.lst b/download.lst
index 682ec1a0f256..003d7b3929a5 100644
--- a/download.lst
+++ b/download.lst
@@ -533,8 +533,8 @@ PIXMAN_TARBALL := pixman-0.42.2.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBPNG_SHA256SUM := 
c919dbc11f4c03b05aba3f8884d8eb7adfe3572ad228af972bb60057bdb48450
-LIBPNG_TARBALL := libpng-1.6.42.tar.xz
+LIBPNG_SHA256SUM := 
6a5ca0652392a2d7c9db2ae5b40210843c0bbc081cbd410825ab00cc59f14a6c
+LIBPNG_TARBALL := libpng-1.6.43.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts


  1   2   3   4   5   6   7   8   9   10   >