core.git: sw/source

2025-01-11 Thread Noel Grandin (via logerrit)
 sw/source/core/fields/reffld.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 96ed0ae5e35fbcf0f97a5dc8b6dff211579be893
Author: Noel Grandin 
AuthorDate: Sat Jan 11 11:48:29 2025 +0200
Commit: Noel Grandin 
CommitDate: Sat Jan 11 14:32:40 2025 +0100

tdf#164620 CRASH: selecting all and deleting

regression from
commit 73a46895c5927d68a222b13dc811ea1cceb811a1
Author: Noel Grandin 
Date:   Thu Dec 5 07:58:44 2024 +0200
tdf#119840 speed up SearchForStyleAnchor

We are dealing with a dangling pointer here, so I'm not sure if this
change will be sufficient.
We are very deep inside a series of listener callbacks and events here,
so no idea how to fix the actual problem i.e. not having a dangling
pointer at all.

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

diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index a063586b482f..75b2f5db7b6a 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -1606,6 +1606,12 @@ SwTextNode* 
SwGetRefFieldType::FindAnchorRefStyleOther(SwDoc* pDoc,
 
 SwNodeOffset nReference = pReference->GetIndex();
 const SwNodes& nodes = pDoc->GetNodes();
+
+// It is possible to end up here, with a pReference pointer which points 
to a node which has already been
+// removed from the nodes array, which means that calling GetIndex() 
returns an incorrect index.
+if (nReference >= nodes.Count() || nodes[nReference] != pReference)
+nReference = nodes.Count() - 1;
+
 SwTextNode* pTextNd = nullptr;
 
 // 1. Search up until we hit the top of the document


core.git: svx/source

2025-01-11 Thread Noel Grandin (via logerrit)
 svx/source/svdraw/svdpdf.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d334e7da3013392549694cd7dd3dd326a0387f19
Author: Noel Grandin 
AuthorDate: Sat Jan 11 00:44:54 2025 +0200
Commit: Noel Grandin 
CommitDate: Sat Jan 11 14:35:24 2025 +0100

fix import BGRx image from PDF

bug introduced in
commit 45c753aff6468b9761e68bc0bf48ab161cd0cba6
Author: Miklos Vajna 
Date:   Fri Sep 28 12:30:01 2018 +0200
svx: pdfium's FPDFImageObj_GetBitmapBgra() is not needed after all

Although the confusion was understandable, since the previous commit
which had introduced FPDFImageObj_GetBitmapBgra, which, despite
its name, actually returned RGB* data

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

diff --git a/svx/source/svdraw/svdpdf.cxx b/svx/source/svdraw/svdpdf.cxx
index cf2c4ac28f1a..6a00bd286ce1 100644
--- a/svx/source/svdraw/svdpdf.cxx
+++ b/svx/source/svdraw/svdpdf.cxx
@@ -879,7 +879,7 @@ void 
ImpSdrPdfImport::ImportImage(std::unique_ptr co
 ReadRawDIB(aBitmap, pBuf, ScanlineFormat::N24BitTcBgr, nHeight, 
nStride);
 break;
 case vcl::pdf::PDFBitmapType::BGRx:
-ReadRawDIB(aBitmap, pBuf, ScanlineFormat::N32BitTcRgba, nHeight, 
nStride);
+ReadRawDIB(aBitmap, pBuf, ScanlineFormat::N32BitTcBgra, nHeight, 
nStride);
 break;
 case vcl::pdf::PDFBitmapType::BGRA:
 ReadRawDIB(aBitmap, pBuf, ScanlineFormat::N32BitTcBgra, nHeight, 
nStride);


core.git: 2 commits - drawinglayer/source editeng/source filter/source include/drawinglayer include/vcl sc/source svx/source sw/inc sw/source vcl/inc vcl/source

2025-01-11 Thread Tomaž Vajngerl (via logerrit)
 drawinglayer/source/primitive2d/structuretagprimitive2d.cxx  |2 
 drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx   |   90 +-
 drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx   |4 
 drawinglayer/source/tools/primitive2dxmldump.cxx |3 
 editeng/source/editeng/impedit3.cxx  |4 
 filter/source/pdf/pdfexport.cxx  |4 
 include/drawinglayer/primitive2d/structuretagprimitive2d.hxx |6 
 include/vcl/pdfextoutdevdata.hxx |4 
 include/vcl/pdfwriter.hxx|   52 -
 sc/source/ui/inc/output.hxx  |2 
 sc/source/ui/unoobj/docuno.cxx   |2 
 sc/source/ui/view/output.cxx |   16 
 sc/source/ui/view/output2.cxx|   14 
 sc/source/ui/view/printfun.cxx   |   10 
 svx/source/sdr/contact/viewobjectcontact.cxx |   22 
 svx/source/table/viewcontactoftableobj.cxx   |6 
 sw/inc/EnhancedPDFExportHelper.hxx   |6 
 sw/source/core/text/EnhancedPDFExportHelper.cxx  |  181 ++--
 sw/source/core/text/itrform2.cxx |2 
 sw/source/core/text/porfld.cxx   |2 
 sw/source/uibase/docvw/AnnotationWin2.cxx|2 
 vcl/inc/pdf/pdfwriter_impl.hxx   |   10 
 vcl/source/gdi/pdfextoutdevdata.cxx  |9 
 vcl/source/gdi/pdfwriter.cxx |2 
 vcl/source/gdi/pdfwriter_impl.cxx|  445 +--
 25 files changed, 455 insertions(+), 445 deletions(-)

New commits:
commit f3fc477dab60f4f1c741b4453b4d0d34d00a46ba
Author: Tomaž Vajngerl 
AuthorDate: Thu Jan 9 09:23:41 2025 +0900
Commit: Tomaž Vajngerl 
CommitDate: Sat Jan 11 14:46:11 2025 +0100

pdf: change StructElement to enum class, move out of PDFWriter

Moves the StructElement out of PDFWriter and changes it to enum
class. This makes it mroe type safe, easier to search and more
clear what type we are using.

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

diff --git a/drawinglayer/source/primitive2d/structuretagprimitive2d.cxx 
b/drawinglayer/source/primitive2d/structuretagprimitive2d.cxx
index 783a54a4c409..e34a1a2a1f6d 100644
--- a/drawinglayer/source/primitive2d/structuretagprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/structuretagprimitive2d.cxx
@@ -27,7 +27,7 @@ using namespace com::sun::star;
 namespace drawinglayer::primitive2d
 {
 StructureTagPrimitive2D::StructureTagPrimitive2D(
-const vcl::PDFWriter::StructElement& rStructureElement,
+const vcl::pdf::StructElement& rStructureElement,
 bool bBackground,
 bool bIsImage,
 bool bIsDecorative,
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx 
b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index d931320718d4..eb218e5a234c 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -500,7 +500,7 @@ void 
VclMetafileProcessor2D::impEndSvtGraphicStroke(SvtGraphicStroke const* pSvt
 }
 }
 
-void VclMetafileProcessor2D::popStructureElement(vcl::PDFWriter::StructElement 
eElem)
+void VclMetafileProcessor2D::popStructureElement(vcl::pdf::StructElement eElem)
 {
 if (!maListElements.empty() && maListElements.top() == eElem)
 {
@@ -511,14 +511,14 @@ void 
VclMetafileProcessor2D::popStructureElement(vcl::PDFWriter::StructElement e
 
 void VclMetafileProcessor2D::popListItem()
 {
-popStructureElement(vcl::PDFWriter::LIBody);
-popStructureElement(vcl::PDFWriter::ListItem);
+popStructureElement(vcl::pdf::StructElement::LIBody);
+popStructureElement(vcl::pdf::StructElement::ListItem);
 }
 
 void VclMetafileProcessor2D::popList()
 {
 popListItem();
-popStructureElement(vcl::PDFWriter::List);
+popStructureElement(vcl::pdf::StructElement::List);
 }
 
 VclMetafileProcessor2D::VclMetafileProcessor2D(const 
geometry::ViewInformation2D& rViewInformation,
@@ -1131,7 +1131,7 @@ void VclMetafileProcessor2D::processControlPrimitive2D(

mpOutputDevice->GetMapMode());
 pPDFControl->TextFont.SetFontSize(aFontSize);
 
-
mpPDFExtOutDevData->WrapBeginStructureElement(vcl::PDFWriter::Form);
+
mpPDFExtOutDevData->WrapBeginStructureElement(vcl::pdf::StructElement::Form);
 vcl::PDFWriter::StructAttributeValue role;
 switch (pPDFControl->Type)
 {
@@ -1183,9 +1183,10 @@ void VclMetafile

core.git: sc/uiconfig

2025-01-11 Thread Javiya Vivekkumar Dineshbhai (via logerrit)
 sc/uiconfig/scalc/ui/conditionaleasydialog.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 92d3bd58a12c01316ef5704ecaa8e4294e5d68c6
Author: Javiya Vivekkumar Dineshbhai 
AuthorDate: Thu May 30 11:27:33 2024 +0530
Commit: vivek javiya 
CommitDate: Sat Jan 11 15:00:34 2025 +0100

Improvement to conditional formatting naming

Previously, the menu and submenu of conditional formatting options were 
technically correct but not very readable. We replaced 'Condition...' with 
'Highlight cells with...'.

Change-Id: I9f4c30506fee9b698f95608ace72f37dfd80f2b8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168238
Tested-by: Jenkins CollaboraOffice 
Tested-by: Pedro Silva 
Reviewed-by: Pedro Silva 
Reviewed-by: Tomaž Vajngerl 
(cherry picked from commit 18d295cb585c8dbed1860d10c1c22c10a15bee14)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168445
Tested-by: Jenkins
Reviewed-by: vivek javiya 

diff --git a/sc/uiconfig/scalc/ui/conditionaleasydialog.ui 
b/sc/uiconfig/scalc/ui/conditionaleasydialog.ui
index d2a32c99023a..d0a8dbc7c412 100644
--- a/sc/uiconfig/scalc/ui/conditionaleasydialog.ui
+++ b/sc/uiconfig/scalc/ui/conditionaleasydialog.ui
@@ -5,7 +5,7 @@
   
 False
 6
-Apply conditional formatting...
+Highlight cells...
 dialog
 
   


core.git: formula/inc

2025-01-11 Thread Andrea Gelmini (via logerrit)
 formula/inc/strings.hrc |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 808c09b917e2e508c95a28668eb8c3c0bfa74763
Author: Andrea Gelmini 
AuthorDate: Sat Jan 11 13:28:53 2025 +0100
Commit: Julien Nabet 
CommitDate: Sat Jan 11 15:30:18 2025 +0100

Fix typo

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

diff --git a/formula/inc/strings.hrc b/formula/inc/strings.hrc
index cbb59c6a8efc..1a97ec0f4b2b 100644
--- a/formula/inc/strings.hrc
+++ b/formula/inc/strings.hrc
@@ -30,6 +30,6 @@
 #define RID_STR_SHRINK  NC_("RID_STR_SHRINK", "Shrink")
 #define RID_STR_EXPAND  NC_("RID_STR_EXPAND", "Expand")
 #define FAV_ENABLED NC_("FAV_ENABLED", "Add or remove function from 
favourites")
-#define FAV_DISABLEDNC_("FAV_DISABLED", "Extention functions can not 
be added to favourites")
+#define FAV_DISABLEDNC_("FAV_DISABLED", "Extension functions can not 
be added to favourites")
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */


core.git: include/svl

2025-01-11 Thread Andrea Gelmini (via logerrit)
 include/svl/poolitem.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 46332200961363706f5b1f280e813510d7e1c265
Author: Andrea Gelmini 
AuthorDate: Sat Jan 11 13:27:24 2025 +0100
Commit: Julien Nabet 
CommitDate: Sat Jan 11 15:30:36 2025 +0100

Fix typo

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

diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx
index 3475aea6c039..6bff6195 100644
--- a/include/svl/poolitem.hxx
+++ b/include/svl/poolitem.hxx
@@ -670,7 +670,7 @@ private:
 }
 
 protected:
-// costructors are protected; SfxPoolItem is a base
+// constructors are protected; SfxPoolItem is a base
 // class and ought bot to be constructed (also guaranteed
 // by pure virtual function ItemType now)
 explicit SfxPoolItem(sal_uInt16 nWhich);


core.git: sw/source

2025-01-11 Thread Andrea Gelmini (via logerrit)
 sw/source/filter/ww8/docxexport.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 98c08942863198d9f9b6f38b38e39c7d012df6b7
Author: Andrea Gelmini 
AuthorDate: Sat Jan 11 13:26:42 2025 +0100
Commit: Julien Nabet 
CommitDate: Sat Jan 11 15:30:58 2025 +0100

Fix typo

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

diff --git a/sw/source/filter/ww8/docxexport.cxx 
b/sw/source/filter/ww8/docxexport.cxx
index 8a309d7da39c..6ab11f355a6e 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -2158,7 +2158,7 @@ sal_Int32 DocxExport::getWordCompatibilityMode()
 }
 }
 }
-// Keep the imported compatiblity mode (unless it is unknown / 
unsupported)
+// Keep the imported compatibility mode (unless it is unknown / 
unsupported)
 const bool bPreventRoundTrippingUnknownMode
 = nImportedWordCompatbilityMode > m_nWordCompatibilityMode;
 assert(!bPreventRoundTrippingUnknownMode && "create a new meta bug for 
new compat mode");


core.git: include/svl

2025-01-11 Thread Andrea Gelmini (via logerrit)
 include/svl/poolitem.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0a8118009ae0b4d5f1a9dbecee9dcb921db9a0a6
Author: Andrea Gelmini 
AuthorDate: Sat Jan 11 13:27:04 2025 +0100
Commit: Julien Nabet 
CommitDate: Sat Jan 11 15:31:19 2025 +0100

Fix typo

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

diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx
index 6bff6195..365ec0c8fa5a 100644
--- a/include/svl/poolitem.hxx
+++ b/include/svl/poolitem.hxx
@@ -110,7 +110,7 @@ enum class SfxItemState {
  * unique value that is returned in the call to ItemType(). This is done
  * using DECLARE_ITEM_TYPE_FUNCTION in the public section of each definition
  * of a derivation of SfxItemType, also for types derived deeper than one
- * step. It overloads virtual SfxItemType ItemType() with the secified
+ * step. It overloads virtual SfxItemType ItemType() with the specified
  * type, see that macro.
 */
 enum class SfxItemType : sal_uInt16


core.git: extensions/source

2025-01-11 Thread Andrea Gelmini (via logerrit)
 extensions/source/macosx/quicklookthumbnail/ThumbnailProvider.m |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b6d9da0e53bad06562536248280384f17671c1d4
Author: Andrea Gelmini 
AuthorDate: Sat Jan 11 13:26:24 2025 +0100
Commit: Julien Nabet 
CommitDate: Sat Jan 11 15:31:59 2025 +0100

Fix typos

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

diff --git a/extensions/source/macosx/quicklookthumbnail/ThumbnailProvider.m 
b/extensions/source/macosx/quicklookthumbnail/ThumbnailProvider.m
index afb37800665a..d22e7878d711 100644
--- a/extensions/source/macosx/quicklookthumbnail/ThumbnailProvider.m
+++ b/extensions/source/macosx/quicklookthumbnail/ThumbnailProvider.m
@@ -33,7 +33,7 @@
 [importer release];
 
 if (image) {
-// The handler() function appears to run the drwaing block 
asyncronously
+// The handler() function appears to run the drawing block 
asynchronously
 // so retain the image and release it in the drawing block.
 [image retain];
 NSSize imageSize = [image size];


core.git: Branch 'libreoffice-25-2' - instsetoo_native/inc_openoffice

2025-01-11 Thread Mike Kaganski (via logerrit)
 instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2c9ad5443000233f0d4f84e065cbbaf870aad995
Author: Mike Kaganski 
AuthorDate: Sat Jan 11 09:09:16 2025 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Sat Jan 11 15:47:14 2025 +0100

tdf#94193: add missing SecureCustomProperties

Change-Id: I777f5094058135bf438545a558074e9ebacdb743
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180110
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
(cherry picked from commit c154b79b580c7c9a7802b4a95ccfdc83d498eb3b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180112
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
index e528cac384ec..e7dbe6b787f1 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
@@ -44,7 +44,7 @@ ProgressType3 installs
 Quickstarterlinkname   QUICKSTARTERLINKNAMETEMPLATE
 RebootYesNoYes
 ReinstallModeText  omus
-SecureCustomProperties NEWPRODUCTS;OLDPRODUCTS;WIN81S14;WINMAJORVER
+SecureCustomProperties 
NEWPRODUCTS;OLDPRODUCTS;WINMAJORVER;INSTALLLOCATION;TARGETDIR;COMPANYNAME;USERNAME;ALLUSERSPROFILE;USERPROFILE;LANG_SELECTED;APP_SELECTED;FILETYPEDIALOGUSED;SOURCEDIR;ROOTDRIVE;REGISTER_XLW;REGISTER_VST;REGISTER_VSD;CREATEDESKTOPLINK;SELECT_WORD;SELECT_EXCEL;SELECT_POWERPOINT;SELECT_VISIO
 SetupType  Typical
 SELECT_WORD0
 SELECT_EXCEL   0


core.git: extensions/source

2025-01-11 Thread Andrea Gelmini (via logerrit)
 extensions/source/macosx/common/OOoManifestParser.m |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 758ea7adf410af8a95976b5bb01c7b909a0b5590
Author: Andrea Gelmini 
AuthorDate: Sat Jan 11 13:28:11 2025 +0100
Commit: Julien Nabet 
CommitDate: Sat Jan 11 15:31:41 2025 +0100

Fix typo

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

diff --git a/extensions/source/macosx/common/OOoManifestParser.m 
b/extensions/source/macosx/common/OOoManifestParser.m
index cc2072d1a9f5..88e01b96d1ee 100644
--- a/extensions/source/macosx/common/OOoManifestParser.m
+++ b/extensions/source/macosx/common/OOoManifestParser.m
@@ -67,7 +67,7 @@
 key = MEDIA_TYPE_PDF;
 }
 else if (![mediaType length]) {
-// NeoOffice sometimes adds PDF thumbnails with an emopty mime 
type
+// NeoOffice sometimes adds PDF thumbnails with an empty mime 
type
 if ([path hasSuffix:@".pdf"])
 key = MEDIA_TYPE_PDF;
 // Just to be safe, add any PNG thumbnails


Re: Question about weld

2025-01-11 Thread Jan Rheinländer

Thanks for the quick answer.

But - is this code actually used somewhere? It doesn't seem to work the 
same as the gtkinst version.


Am 08.01.25 um 22:09 schrieb Caolán McNamara:

On Wed, 2025-01-08 at 19:40 +0100, Jan Rheinländer wrote:

Where is the salvtables version used? I am developing on Linux and it
uses the code from gtkinst.cxx. How do I test my code in
salvtables.cxx?

export SAL_USE_VCLPLUGIN=gen
and run soffice and you get the backend that uses the built-in vcl
widgets that the code in salvtables uses.




OpenPGP_signature.asc
Description: OpenPGP digital signature


core.git: wizards/source

2025-01-11 Thread Jean-Pierre Ledure (via logerrit)
 wizards/source/scriptforge/SF_Utils.xba  |2 
 wizards/source/scriptforge/po/ScriptForge.pot| 1394 +++
 wizards/source/scriptforge/po/en.po  | 1394 +++
 wizards/source/scriptforge/python/scriptforge.py |2 
 4 files changed, 1388 insertions(+), 1404 deletions(-)

New commits:
commit e0935e73bb906fa143db349706466173ca11a626
Author: Jean-Pierre Ledure 
AuthorDate: Sat Jan 11 13:45:54 2025 +0100
Commit: Jean-Pierre Ledure 
CommitDate: Sat Jan 11 16:00:11 2025 +0100

ScriptForge - Upgrade to version 25.8

Hard-coded version numbers are modified
from 25.2 to 25.8.

Many changes in po files due to the alphabetical
sequence of keys after the introduction of the
new "case-sensitive" keys feature.
Before this the dict.Keys() method delivered
the keys as an array in the order of creation.

No effect on actual user scripts.

Change-Id: Iee0c48eca22d17ad892278398c9125912b8b2b3c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180120
Reviewed-by: Jean-Pierre Ledure 
Tested-by: Jenkins

diff --git a/wizards/source/scriptforge/SF_Utils.xba 
b/wizards/source/scriptforge/SF_Utils.xba
index 323978db2211..c84821898333 100644
--- a/wizards/source/scriptforge/SF_Utils.xba
+++ b/wizards/source/scriptforge/SF_Utils.xba
@@ -21,7 +21,7 @@ REM 
= GLOBAL
 Global _SF_As Variant  '  SF_Root (Basic) object)
 
 ''' ScriptForge version
-Const SF_Version = "25.2"
+Const SF_Version = "25.8"
 
 ''' Standard symbolic names for VarTypes
 ' V_EMPTY = 0
diff --git a/wizards/source/scriptforge/po/ScriptForge.pot 
b/wizards/source/scriptforge/po/ScriptForge.pot
index 108889012f23..ee10d24c4870 100644
--- a/wizards/source/scriptforge/po/ScriptForge.pot
+++ b/wizards/source/scriptforge/po/ScriptForge.pot
@@ -7,14 +7,14 @@
 #  *** are part of the LibreOffice project.  ***
 #  *
 #  
-#  ScriptForge Release 25.2
+#  ScriptForge Release 25.8
 #  ---
 #  
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION
"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI
"
-"POT-Creation-Date: 2024-08-13 13:35:41
"
+"POT-Creation-Date: 2025-01-11 13:09:17
"
 "PO-Revision-Date: -MM-DD HH:MM:SS
"
 "Last-Translator: FULL NAME 
"
 "Language-Team: LANGUAGE 
"
@@ -26,268 +26,382 @@ msgstr ""
 "X-Generator: LibreOffice - ScriptForge
"
 "X-Accelerator-Marker: ~
"
 
-#. Title in error message box
-#. %1: an error number
-#, kde-format
-msgctxt "ERRORNUMBER"
-msgid  "Error %1"
-msgstr ""
-
-#. Error message box
-#. %1: a line number
+#. SF_Array.ExtractColumn (...) error message
+#. %1: 'Column' or 'Row' of a matrix
+#. %2, %3: array contents
+#. 'Array_2D' should not be translated
 #, kde-format
-msgctxt "ERRORLOCATION"
-msgid  "Location : %1"
+msgctxt "ARRAYINDEX1"
+msgid  ""
+"The given index does not fit within the bounds of the array.
"
+"
"
+"« Array_2D » = %2
"
+"« %1 » = %3"
 msgstr ""
 
-#. Logfile record
+#. SF_Array.ExtractColumn (...) error message
+#. %1: 'Column' or 'Row' of a matrix
+#. %2, %3: array contents
+#. 'Array_1D', 'From' and 'UpTo' should not be translated
 #, kde-format
-msgctxt "LONGERRORDESC"
-msgid  "Error %1 - Location = %2 - Description = %3"
-msgstr ""
-
-#. Any blocking error message
-msgctxt "STOPEXECUTION"
-msgid  "THE EXECUTION IS CANCELLED."
+msgctxt "ARRAYINDEX2"
+msgid  ""
+"The given slice limits do not fit within the bounds of the array.
"
+"
"
+"« Array_1D » = %1
"
+"« From » = %2
"
+"« UpTo » = %3"
 msgstr ""
 
-#. Any blocking error message
-#. %1: a method name
+#. SF_Array.AppendColumn (...) error message
+#. %1: 'Column' or 'Row' of a matrix
+#. %2, %3: array contents
+#. 'Array_2D' should not be translated
 #, kde-format
-msgctxt "NEEDMOREHELP"
-msgid  "Do you want to receive more information about the '%1' method ?"
-msgstr ""
-
-#. SF_Exception.RaiseAbort error message
-msgctxt "INTERNALERROR"
+msgctxt "ARRAYINSERT"
 msgid  ""
-"The ScriptForge library has crashed. The reason is unknown.
"
-"Maybe a bug that could be reported on
"
-"https://bugs.documentfoundation.org/
"
-"
"
-"More details : 
"
+"The array and the vector to insert have incompatible sizes.
"
 "
"
-""
+"« Array_2D » = %2
"
+"« %1 » = %3"
 msgstr ""
 
-#. SF_Utils._Validate error message
-#. %1: probably ScriptForge
-#. %2: service or module name
-#. %3: property or method name where the error occurred
+#. SF_Array.RangeInit error message
+#. %1, %2, %3: Numeric values
+#. 'From', 'UpTo', 'ByStep' should not be translated
 #, kde-format
-msgctxt "VALIDATESOURCE"
+msgctxt "ARRAYSEQUENCE"
 msgid  ""
-"Library :   %1
"
-"Service :   %2
"
-"Method

core.git: wizards/source

2025-01-11 Thread Jean-Pierre Ledure (via logerrit)
 wizards/source/scriptforge/SF_Array.xba |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 7fdaeef4c5dcee68dd104851662eea9cf9aea59e
Author: Jean-Pierre Ledure 
AuthorDate: Sat Jan 11 16:08:58 2025 +0100
Commit: Jean-Pierre Ledure 
CommitDate: Sat Jan 11 19:24:12 2025 +0100

ScriptForge (SF_Array) fix the list of methods

The Methods() method returns the list of methods
present in each class.

It is unused so far (vs. Properties() is used
in the code) => a wrong list has no
consequences. It is however reserved for
future use.

The list was incomplete in Array class.

Change-Id: I3e0522d6669d2732c68e52e4021ffb5c8a3fb108
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180127
Tested-by: Jenkins
Reviewed-by: Jean-Pierre Ledure 

diff --git a/wizards/source/scriptforge/SF_Array.xba 
b/wizards/source/scriptforge/SF_Array.xba
index 05c96c96d494..d28bc7d4541c 100644
--- a/wizards/source/scriptforge/SF_Array.xba
+++ b/wizards/source/scriptforge/SF_Array.xba
@@ -1689,7 +1689,11 @@ Public Function Methods() As Variant
, "AppendColumn" _
, "AppendRow" _
, "Contains" _
+   , "ConvertFromDataArray" _
+   , "ConvertToDataArray" _
, "ConvertToDictionary" _
+   , "ConvertToRange" _
+   , "Copy" _
, "CountDims" _
, "Difference" _
, "ExportToTextFile" _
@@ -1708,6 +1712,7 @@ Public Function Methods() As Variant
, "RangeInit" _
, "Reverse" _
, "Shuffle" _
+   , "Slice" _
, "Sort" _
, "SortColumns" _
, "SortRows" _


core.git: hwpfilter/source

2025-01-11 Thread Akshay Kumar Dubey (via logerrit)
 hwpfilter/source/hfont.h   |4 +---
 hwpfilter/source/hiodev.h  |4 +---
 hwpfilter/source/hpara.h   |5 +
 hwpfilter/source/hstyle.h  |4 +---
 hwpfilter/source/hutil.h   |5 +
 hwpfilter/source/hwplib.h  |5 ++---
 hwpfilter/source/mapping.h |5 +
 hwpfilter/source/nodes.h   |5 +
 hwpfilter/source/solver.h  |5 +
 9 files changed, 10 insertions(+), 32 deletions(-)

New commits:
commit 30ea093fd65f5fb4807a6aa88b88c82130dfd719
Author: Akshay Kumar Dubey 
AuthorDate: Sat Jan 11 11:35:11 2025 +0530
Commit: Ilmari Lauhakangas 
CommitDate: Sat Jan 11 19:36:53 2025 +0100

tdf#143148 Use pragma once instead of include guards

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

diff --git a/hwpfilter/source/hfont.h b/hwpfilter/source/hfont.h
index c9d2e9930ec8..406b999dff49 100644
--- a/hwpfilter/source/hfont.h
+++ b/hwpfilter/source/hfont.h
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_HWPFILTER_SOURCE_HFONT_H
-#define INCLUDED_HWPFILTER_SOURCE_HFONT_H
+#pragma once
 
 #include 
 #include 
@@ -64,6 +63,5 @@ class DLLEXPORT HWPFont final
 
 void Read( HWPFile &hwpf );
 };
-#endif/* _HWPFONTS+H_ */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/hwpfilter/source/hiodev.h b/hwpfilter/source/hiodev.h
index b6f2c7aa2be7..09cebcfe8be5 100644
--- a/hwpfilter/source/hiodev.h
+++ b/hwpfilter/source/hiodev.h
@@ -22,8 +22,7 @@
  * (C) 1999 Mizi Research, All rights are reserved
  */
 
-#ifndef INCLUDED_HWPFILTER_SOURCE_HIODEV_H
-#define INCLUDED_HWPFILTER_SOURCE_HIODEV_H
+#pragma once
 
 #include 
 
@@ -157,6 +156,5 @@ class HMemIODev final: public HIODev
 private:
 virtual void init() override;
 };
-#endif // INCLUDED_HWPFILTER_SOURCE_HIODEV_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/hwpfilter/source/hpara.h b/hwpfilter/source/hpara.h
index b057edcb816b..1749985c7327 100644
--- a/hwpfilter/source/hpara.h
+++ b/hwpfilter/source/hpara.h
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_HWPFILTER_SOURCE_HPARA_H
-#define INCLUDED_HWPFILTER_SOURCE_HPARA_H
+#pragma once
 
 #include "hwplib.h"
 #include "hwpfile.h"
@@ -128,6 +127,4 @@ class DLLEXPORT HWPPara
 std::unique_ptr readHBox(HWPFile &);
 };
 
-#endif // INCLUDED_HWPFILTER_SOURCE_HPARA_H
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/hwpfilter/source/hstyle.h b/hwpfilter/source/hstyle.h
index 851bd8d4d164..d55b2f19c6fc 100644
--- a/hwpfilter/source/hstyle.h
+++ b/hwpfilter/source/hstyle.h
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_HWPFILTER_SOURCE_HSTYLE_H
-#define INCLUDED_HWPFILTER_SOURCE_HSTYLE_H
+#pragma once
 
 #include 
 #include 
@@ -50,7 +49,6 @@ class DLLEXPORT HWPStyle
 
 void Read( HWPFile &hwpf );
 };
-#endif
 /* _HWPSTYLE+H_ */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/hwpfilter/source/hutil.h b/hwpfilter/source/hutil.h
index d856b74de173..84660e03c61e 100644
--- a/hwpfilter/source/hutil.h
+++ b/hwpfilter/source/hutil.h
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_HWPFILTER_SOURCE_HUTIL_H
-#define INCLUDED_HWPFILTER_SOURCE_HUTIL_H
+#pragma once
 
 #include "hbox.h"
 /**
@@ -30,6 +29,4 @@ voidnum2roman(int num, char *buf);
  */
 voidstr2hstr(const char *c, hchar *i);
 
-#endif/* UTIL_H_*/
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/hwpfilter/source/hwplib.h b/hwpfilter/source/hwplib.h
index 354cbce4b55c..d62266cc4e3c 100644
--- a/hwpfilter/source/hwplib.h
+++ b/hwpfilter/source/hwplib.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_HWPFILTER_SOURCE_HWPLIB_H
-#define INCLUDED_HWPFILTER_SOURCE_HWPLIB_H
+#pragma once
+
 #include "precompile.h"
 
 #include 
@@ -217,6 +217,5 @@ enum DebugMask
 #  include 
 #  define DIRSEP '/'
 #endif
-#endif // INCLUDED_HWPFILTER_SOURCE_HWPLIB_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/hwpfilter/source/mapping.h b/hwpfilter/source/mapping.h
index 5235f7e777d5..34d8687d9529 100644
--- a/hwpfilter/source/mapping.h
+++ b/hwpfilter/source/mapping.h
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_HWPFILTER_SOURCE_MAPPING_H
-#define INCLUDED_HWPFILTER_SOURCE_MAPPING_H
+#pragma once
 
 #include 
 #include 
@@ -390,6 +389,4 @@ hchar_string getMathMLEntity(const char *tex)
 }
 #endif
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/hwpfilter/source/nodes.h b/hwpfilter/source/nod

core.git: Branch 'libreoffice-24-8' - instsetoo_native/inc_openoffice

2025-01-11 Thread Mike Kaganski (via logerrit)
 instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ec5490f30f524c1c209a4955bb6e9ca579b173dc
Author: Mike Kaganski 
AuthorDate: Sat Jan 11 09:09:16 2025 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Sat Jan 11 20:13:16 2025 +0100

tdf#94193: add missing SecureCustomProperties

Change-Id: I777f5094058135bf438545a558074e9ebacdb743
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180110
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
(cherry picked from commit c154b79b580c7c9a7802b4a95ccfdc83d498eb3b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180112
Reviewed-by: Adolfo Jayme Barrientos 
(cherry picked from commit 2c9ad5443000233f0d4f84e065cbbaf870aad995)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180125

diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
index e528cac384ec..e7dbe6b787f1 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
@@ -44,7 +44,7 @@ ProgressType3 installs
 Quickstarterlinkname   QUICKSTARTERLINKNAMETEMPLATE
 RebootYesNoYes
 ReinstallModeText  omus
-SecureCustomProperties NEWPRODUCTS;OLDPRODUCTS;WIN81S14;WINMAJORVER
+SecureCustomProperties 
NEWPRODUCTS;OLDPRODUCTS;WINMAJORVER;INSTALLLOCATION;TARGETDIR;COMPANYNAME;USERNAME;ALLUSERSPROFILE;USERPROFILE;LANG_SELECTED;APP_SELECTED;FILETYPEDIALOGUSED;SOURCEDIR;ROOTDRIVE;REGISTER_XLW;REGISTER_VST;REGISTER_VSD;CREATEDESKTOPLINK;SELECT_WORD;SELECT_EXCEL;SELECT_POWERPOINT;SELECT_VISIO
 SetupType  Typical
 SELECT_WORD0
 SELECT_EXCEL   0


dictionaries.git: Dictionary_or.mk Dictionary_pa.mk or_IN/hypn_or_IN.dic or_IN/or_IN.aff or_IN/or_IN.dic pa_IN/hyph_pa_IN.dic pa_IN/pa_IN.aff pa_IN/pa_IN.dic

2025-01-11 Thread Shantanu Oak (via logerrit)
 Dictionary_or.mk |   20 
 Dictionary_pa.mk |   20 
 or_IN/hypn_or_IN.dic |   91 ++
 or_IN/or_IN.aff  |2 
 or_IN/or_IN.dic  | 1030 +
 pa_IN/hyph_pa_IN.dic |   87 ++
 pa_IN/pa_IN.aff  |2 
 pa_IN/pa_IN.dic  | 2046 +++
 8 files changed, 3298 insertions(+)

New commits:
commit d12cf2e15fafe56330ca8812f15b1c060b08
Author: Shantanu Oak 
AuthorDate: Sat Jan 11 03:37:24 2025 +
Commit: Ilmari Lauhakangas 
CommitDate: Sat Jan 11 10:07:12 2025 +0100

Add Punjabi & Oriya

Change-Id: I2d25d1bd617e4628a1b376c837b8cd40efa1cb00
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/180106
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 

diff --git a/Dictionary_or.mk b/Dictionary_or.mk
new file mode 100644
index 000..1a12669
--- /dev/null
+++ b/Dictionary_or.mk
@@ -0,0 +1,20 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+#
+
+$(eval $(call gb_Dictionary_Dictionary,dict-or,dictionaries/or_IN))
+
+$(eval $(call gb_Dictionary_add_root_files,dict-or,\
+dictionaries/or_IN/or_IN.aff \
+dictionaries/or_IN/or_IN.dic \
+dictionaries/or_IN/hyph_or_IN.dic \
+
+))
+
+# vim: set noet sw=4 ts=4:
+
diff --git a/Dictionary_pa.mk b/Dictionary_pa.mk
new file mode 100644
index 000..f8512c7
--- /dev/null
+++ b/Dictionary_pa.mk
@@ -0,0 +1,20 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+#
+
+$(eval $(call gb_Dictionary_Dictionary,dict-pa,dictionaries/pa_IN))
+
+$(eval $(call gb_Dictionary_add_root_files,dict-pa,\
+dictionaries/pa_IN/pa_IN.aff \
+dictionaries/pa_IN/pa_IN.dic \
+dictionaries/pa_IN/hyph_pa_IN.dic \
+
+))
+
+# vim: set noet sw=4 ts=4:
+
diff --git a/or_IN/hypn_or_IN.dic b/or_IN/hypn_or_IN.dic
new file mode 100644
index 000..a19141a
--- /dev/null
+++ b/or_IN/hypn_or_IN.dic
@@ -0,0 +1,91 @@
+UTF-8
+%  Hyphenation for Oriya
+%  Copyright (C) 2008-2010 Santhosh Thottingal 
+%
+%  This library is free software; you can redistribute it and/or
+%  modify it under the terms of the GNU Lesser General Public
+%  License as published by the Free Software Foundation;
+%  version 3 or later version of the License.
+%
+%  This library is distributed in the hope that it will be useful,
+%  but WITHOUT ANY WARRANTY; without even the implied warranty of
+%  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+%  Lesser General Public License for more details.
+%
+%  You should have received a copy of the GNU Lesser General Public
+%  License along with this library; if not, write to the Free Software
+%  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+%
+% GENERAL RULE
+% Do not break either side of ZERO-WIDTH JOINER  (U+200D)
+2‍2
+% Break on both sides of ZERO-WIDTH NON JOINER  (U+200C)
+1‌1
+% Break before or after any independent vowel.
+ଅ1
+ଆ1
+ଇ1
+ଈ1
+ଉ1
+ଊ1
+ଋ1
+ୠ1
+ଌ1
+ୡ1
+ଏ1
+ଐ1
+ଓ1
+ଔ1
+% Break after any dependent vowel, but not before.
+ା1
+ି1
+ୀ1
+ୁ1
+ୂ1
+ୃ1
+େ1
+ୈ1
+ୋ1
+ୌ1
+% Break before or after any consonant.
+1କ
+1ଖ
+1ଗ
+1ଘ
+1ଙ
+1ଚ
+1ଛ
+1ଜ
+1ଝ
+1ଞ
+1ଟ
+1ଠ
+1ଡ
+1ଢ
+1ଣ
+1ତ
+1ଥ
+1ଦ
+1ଧ
+1ନ
+1ପ
+1ଫ
+1ବ
+1ଭ
+1ମ
+1ଯ
+1ର
+1ଲ
+1ଳ
+1ଵ
+1ଶ
+1ଷ
+1ସ
+1ହ
+% Do not break before anusvara, visarga and length mark.
+2ଂ1
+2ଃ1
+2ୗ1
+2ଁ1
+% Do not break either side of virama (may be within conjunct).
+2୍2
diff --git a/or_IN/or_IN.aff b/or_IN/or_IN.aff
new file mode 100644
index 000..d319ac7
--- /dev/null
+++ b/or_IN/or_IN.aff
@@ -0,0 +1,2 @@
+SET UTF-8
+TRY 
਋Ԋଂ਋㘊ଅ਋ᔊା਋⸊ୀ਋Ԋକ਋䴊ଷ਋Ԋକ਋䴊ଷ਋《ଅ਋ᔊ୍਋㜊ର਋⸊ା਋㌊ା਋Ԋକ਋䴊ଷ਋《ର਋䈊ପ਋Ԋଗ਋䴊ର਋ᜊତ਋㼊ଅ਋ᜊ୍਋《ା਋✊ି਋ᔊା਋《ଅ਋ᤊ୍਋ᔊଅ਋ᤊ୍਋ᔊନ਋Ԋଚ਋㌊ଅ਋ᬊି਋Ԋଜ਋⌊ା਋Ԋଜ਋䴊ଞ਋㸊ତ਋Ԋଞ਋䴊ଚ਋㌊ଅ਋Ἂକ਋Ԋତ਋㼊ର਋㼊କ਋䴊ତ਋Ԋତ਋䴊ଯ਋✊ି਋ᔊଅ਋☊ି਋㘊ଅ਋☊ୃ਋㘊୍਋⼊ଅ਋☊୍਋⼊ତ਋⠊ଅ਋☊୍਋⼊ତ਋⠊ନ਋Ԋଧ਋㼊କ਋Ԋଧ਋㼊ତ਋┊୍਋⼊ଅ਋✊ି਋⬊ା਋܊ଲ਋Ԋଧ਋㼊ବ਋䌊ତ਋䴊ତ਋Ԋଧ਋㼊ବ਋䜊ଶ਋⠊ଅ਋✊ି਋㠊ୂ਋ᨊନ਋㸊ଅ਋✊ୀ਋⠊ଅ਋⠊ନ਋䴊ତ਋Ԋନ਋䄊କ਋䈊ଳ਋⠊ଅ਋⠊ୁ਋ᔊ୍਋《ମ਋Ԋନ਋䄊କ਋䴊ର਋⸊ଣ਋㼊କ਋㸊ଅ਋⠊ୁ਋⨊ସ਋䴊ଥ਋㼊ତ਋Ԋନ਋䄊ପ਋㸊ତ਋Ԋନ਋䄊ବ਋㸊ଦ਋Ԋନ਋䄊ମ਋␊ି਋Ԋ�
 
��਋䄊ର਋䈊ପ਋Ԋନ਋䄊ର਋䬊ଧ਋Ԋନ਋䄊ଲ਋ᜊ୍਋⠊ଅ਋⠊ୁ਋㈊ି਋⨊ି਋Ԋନ਋䄊ଷ਋䴊ଠ਋㸊ନ਋Ԋନ਋䄊ସ਋⠊୍਋✊ା਋⠊ଅ਋⠊ୁ਋㠊୍਋┊ା਋⨊ନ਋Ԋନ਋䴊ତ਋《ା਋⨊ୃ਋㜊୍਋
 
ଅ਋⠊୍਋Ⰺେ਋㜊ଣ਋Ԋନ਋䴊ଯ਋㸊ନ਋䴊ଯ਋Ԋପ਋Ⰺା਋㤊ଅ਋⨊ର਋㼊ଚ਋㸊ଳ਋㼊ତ਋Ԋପ਋《ି਋Ⰺର਋䴊ତ਋䴊ତ਋⠊ୀ਋弊ଅ਋⨊ସ਋⠊୍਋☊ଅ਋⨊ସ਋㸊ର਋⌊ଅ਋⨊ସ਋㸊ର਋⌊ୀ਋弊ଅ਋⨊େ਋ᔊ୍਋㜊ମ਋㸊ଣ਋Ԋବ਋ᔊ୍਋㜊େ਋⨊ଣ਋Ԋବ਋✊ି਋Ԋବ਋《େ਋ᘊା਋Ԋବ਋《ୋ਋✊ଅ਋Ⰺଲ਋⸊୍਋Ⰺନ਋Ԋବ਋㈊ୋ਋ᔊନ਋Ԋବ਋㘊େ਋㜊ଅ਋Ⰺସ਋ᤊ୍਋ᔊେ਋␊କ਋Ԋବ਋㠊୍਋┊ା਋Ԋବ਋㠊୍਋┊ା਋⠊ଅ਋Ⰺସ਋䴊ଥ਋㼊ତ਋Ԋବ਋㠊୍਋┊ି਋␊ି਋Ԋବ਋㸊ସ਋䴊ତ਋Ⰺଅ਋Ⰺି਋《ତ਋Ԋବ਋䠊
 
ଧ਋Ԋଭ਋㼊ଧ਋㸊ନ਋Ԋଭ਋㼊ବ਋㸊ଦ਋⠊ଅ਋ⴊି਋Ⰺ୍਋⼊କ਋䴊ତ਋㼊ଅ਋ⴊି਋㈊େ਋ᘊା਋ᜊା਋《ଅ਋ⴊ୍਋⼊ନ਋䴊ତ਋《ଅ਋⸊ଳ਋ᔊୃ਋␊ଅ਋⸊ୂ਋《୍਋␊୍਋␊ଅ਋⸊େ਋㌊ଅ਋㈊ଗ਋㸊ଅ਋㜊୍਋Ἂଅ਋㠊ଞ਋䴊ଚ਋㼊ତ਋Ԋସ਋⬊ଳ਋Ԋସ਋⸊ର਋䴊ଥ਋Ԋସ਋⸊୍਋⨊ୂ਋《୍਋⌊୍਋⌊ଅ਋㠊ମ਋䴊ଭ਋Ⰺଅ਋㠊୍਋␊ି਋␊୍਋Ⰺଅ਋㠊୍਋⨊ଷ਋䴊ଟ਋Ԋସ਋䴊ବ਋ᨊ୍਋ᬊତ਋㸊ଅ਋㠊୍਋Ⰺା਋ⴊା਋Ⰺି਋ᔊଆ

core.git: dictionaries

2025-01-11 Thread Shantanu Oak (via logerrit)
 dictionaries |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1624ac0d58c2d8208a2c67e9f192661e21291393
Author: Shantanu Oak 
AuthorDate: Sat Jan 11 09:07:13 2025 +
Commit: Gerrit Code Review 
CommitDate: Sat Jan 11 10:07:13 2025 +0100

Update git submodules

* Update dictionaries from branch 'master'
  to d12cf2e15fafe56330ca8812f15b1c060b08
  - Add Punjabi & Oriya

Change-Id: I2d25d1bd617e4628a1b376c837b8cd40efa1cb00
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/180106
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 

diff --git a/dictionaries b/dictionaries
index 5b8116e5e8a1..d12cf2e15faf 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 5b8116e5e8a1ce761f929f8dad1a91ff6ceb5ccc
+Subproject commit d12cf2e15fafe56330ca8812f15b1c060b08


core.git: solenv/gbuild

2025-01-11 Thread Noel Grandin (via logerrit)
 solenv/gbuild/CppunitTest.mk |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 9e8e01c54826995c92667b52faffe1d8113c7c80
Author: Noel Grandin 
AuthorDate: Sat Jan 11 00:12:37 2025 +0200
Commit: Noel Grandin 
CommitDate: Sat Jan 11 10:06:37 2025 +0100

fix debugging unit tests under macOS 15.2

as of macOS 15.2, trying to debug a unit test will fail because
"env" is hardened and we were calling that around our actual
executable. But we don't need that, since we already pass in the
required stuff via a command that is inserted before the call to
lldb.

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

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 4aca3b7f2186..fdfaeff06f94 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -154,7 +154,9 @@ else
PYTHONWARNINGS=default) \
LO_RUNNING_UNIT_TEST=1 \
$(ICECREAM_RUN) $(gb_CppunitTest_coredumpctl_run) 
$(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_VALGRINDTOOL) $(gb_CppunitTest_RR) \
-   $(if $(filter gdb,$(gb_CppunitTest_GDBTRACE)),,env 
$(gb_CppunitTest_CPPTESTPRECOMMAND)) \
+   $(if $(filter gdb,$(gb_CppunitTest_GDBTRACE)),,\
+   $(if $(filter lldb,$(gb_CppunitTest_GDBTRACE)),,\
+   env $(gb_CppunitTest_CPPTESTPRECOMMAND))) \
$(gb_CppunitTest_CPPTESTCOMMAND) \
$(call gb_CppunitTest_get_linktarget_target,$*) \
$(call gb_CppunitTest__make_args) "-env:CPPUNITTESTTARGET=$@" \


Re: Question about weld

2025-01-11 Thread Noel Grandin
On Sat, 11 Jan 2025 at 17:10, Jan Rheinländer  wrote:

> But - is this code actually used somewhere? It doesn't seem to work the
> same as the gtkinst version.
>
> Used on Windows and macOS and for UI unit tests


core.git: canvas/source include/vcl vcl/headless vcl/qt5 vcl/quartz vcl/skia vcl/source

2025-01-11 Thread Noel Grandin (via logerrit)
 canvas/source/directx/dx_vcltools.cxx |4 +
 include/vcl/Scanline.hxx  |   12 ++-
 include/vcl/cairo.hxx |6 -
 vcl/headless/CairoCommon.cxx  |   12 +--
 vcl/qt5/QtBitmap.cxx  |   10 ++-
 vcl/quartz/salbmp.cxx |4 -
 vcl/skia/salbmp.cxx   |6 +
 vcl/source/bitmap/BitmapBasicMorphologyFilter.cxx |1 
 vcl/source/bitmap/BitmapFilterStackBlur.cxx   |6 +
 vcl/source/bitmap/BitmapReadAccess.cxx|   73 --
 vcl/source/bitmap/BitmapScaleSuperFilter.cxx  |4 +
 vcl/source/bitmap/BitmapTools.cxx |2 
 vcl/source/bitmap/BitmapWriteAccess.cxx   |   40 +++-
 vcl/source/bitmap/bmpfast.cxx |   28 
 vcl/source/filter/png/PngImageWriter.cxx  |2 
 vcl/source/filter/webp/reader.cxx |3 
 vcl/source/gdi/salmisc.cxx|6 +
 vcl/source/helper/canvasbitmap.cxx|4 +
 18 files changed, 155 insertions(+), 68 deletions(-)

New commits:
commit b29e161488f0291f381f04e2533106321f357c1e
Author: Noel Grandin 
AuthorDate: Fri Jan 10 21:19:54 2025 +0200
Commit: Noel Grandin 
CommitDate: Sat Jan 11 17:29:40 2025 +0100

make the ScanlineFormat values more explicit

instead of cleverly deciding that one format is actually another
format, depending on the current state of the supportsBitmap32()
call, just have explicit values that say what the actual format is.

This patch should have no functional affect, but will make
upcoming patches simpler.

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

diff --git a/canvas/source/directx/dx_vcltools.cxx 
b/canvas/source/directx/dx_vcltools.cxx
index 31b05be58e9c..9b0da87842a2 100644
--- a/canvas/source/directx/dx_vcltools.cxx
+++ b/canvas/source/directx/dx_vcltools.cxx
@@ -258,6 +258,10 @@ namespace dxcanvas::tools
 case ScanlineFormat::N32BitTcArgb:
 case ScanlineFormat::N32BitTcBgra:
 case ScanlineFormat::N32BitTcRgba:
+case ScanlineFormat::N32BitTcXbgr:
+case ScanlineFormat::N32BitTcXrgb:
+case ScanlineFormat::N32BitTcBgrx:
+case ScanlineFormat::N32BitTcRgbx:
 default:
 ENSURE_OR_THROW( false,
 
"::dxcanvas::tools::bitmapFromVCLBitmapEx(): "
diff --git a/include/vcl/Scanline.hxx b/include/vcl/Scanline.hxx
index 2e47ad025379..9dc7af46b904 100644
--- a/include/vcl/Scanline.hxx
+++ b/include/vcl/Scanline.hxx
@@ -36,10 +36,14 @@ enum class ScanlineFormat : sal_uInt8
 N24BitTcBgr,
 N24BitTcRgb,
 // 32 Bit
-N32BitTcAbgr,
-N32BitTcArgb,
-N32BitTcBgra,
-N32BitTcRgba,
+N32BitTcAbgr, // premultiplied
+N32BitTcXbgr, // ignore alpha channel
+N32BitTcArgb, // premultiplied
+N32BitTcXrgb, // ignore alpha channel
+N32BitTcBgra, // premultiplied
+N32BitTcBgrx, // ignore alpha channel
+N32BitTcRgba, // premultiplied
+N32BitTcRgbx, // ignore alpha channel
 N32BitTcMask,
 };
 
diff --git a/include/vcl/cairo.hxx b/include/vcl/cairo.hxx
index e9978526915d..5ea81835d3ae 100644
--- a/include/vcl/cairo.hxx
+++ b/include/vcl/cairo.hxx
@@ -37,21 +37,21 @@
 */
 #if ENABLE_CAIRO_RGBA
 #define SVP_24BIT_FORMAT (ScanlineFormat::N24BitTcRgb)
-#define SVP_CAIRO_FORMAT (ScanlineFormat::N32BitTcRgba)
+#define SVP_CAIRO_FORMAT (ScanlineFormat::N32BitTcRgbx)
 #define SVP_CAIRO_BLUE 1
 #define SVP_CAIRO_GREEN 2
 #define SVP_CAIRO_RED 0
 #define SVP_CAIRO_ALPHA 3
 #elif defined OSL_BIGENDIAN
 #define SVP_24BIT_FORMAT (ScanlineFormat::N24BitTcRgb)
-#define SVP_CAIRO_FORMAT (ScanlineFormat::N32BitTcArgb)
+#define SVP_CAIRO_FORMAT (ScanlineFormat::N32BitTcXrgb)
 #define SVP_CAIRO_BLUE 3
 #define SVP_CAIRO_GREEN 2
 #define SVP_CAIRO_RED 1
 #define SVP_CAIRO_ALPHA 0
 #else
 #define SVP_24BIT_FORMAT (ScanlineFormat::N24BitTcBgr)
-#define SVP_CAIRO_FORMAT (ScanlineFormat::N32BitTcBgra)
+#define SVP_CAIRO_FORMAT (ScanlineFormat::N32BitTcBgrx)
 #define SVP_CAIRO_BLUE 0
 #define SVP_CAIRO_GREEN 1
 #define SVP_CAIRO_RED 2
diff --git a/vcl/headless/CairoCommon.cxx b/vcl/headless/CairoCommon.cxx
index 6b6fd6dedcd7..78a16b729a9e 100644
--- a/vcl/headless/CairoCommon.cxx
+++ b/vcl/headless/CairoCommon.cxx
@@ -2021,8 +2021,8 @@ std::optional 
FastConvert24BitRgbTo32BitCairo(const BitmapBuffer*
 for (tools::Long x = 0; x < nWidth; ++x)
 {
 #if ENABLE_CAIRO_RGBA
-static_assert(SVP_CAIRO_FORMAT == ScanlineFormat::N32BitTcRgba,
-  "Expected SVP_CAIRO_FORM

core.git: sw/source

2025-01-11 Thread Caolán McNamara (via logerrit)
 sw/source/core/text/itrcrsr.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 029540bf5f31397cf5467c822869e22c0d90b2c0
Author: Caolán McNamara 
AuthorDate: Sat Jan 11 21:46:01 2025 +
Commit: Caolán McNamara 
CommitDate: Sun Jan 12 01:32:32 2025 +0100

crashtesting: assert on reloading .docx output of fdo60683-2.odt

maybe since:

commit 8cb4db941f91cc234dd18c61f8b1e51f65360d1f
CommitDate: Wed Aug 31 08:29:49 2022 +0200

tdf#30731: Improve caret travelling in Writer

 #3  0x774dabf0 in std::__glibcxx_assert_fail(char const*, int, 
char const*, char const*) () at /lib64/libstdc++.so.6
 #4  0x7fffce3e97b3 in std::clamp (__val=@0x7ffe52b4: 1897, 
__lo=@0x7ffe51f0: 1900, __hi=@0x7ffe51e8: 1897)
 at 
/usr/bin/../lib/gcc/x86_64-redhat-linux/14/../../../../include/c++/14/bits/stl_algo.h:3625
 #5  0x7fffce3e41ff in GetTextArray
 (rDevice=..., rStr='x' ..., 
rDXAry=std::__debug::vector of length 0, capacity 0, nIndex=1875, nLen=25, 
nLayoutContext=std::optional = {...}, nMaxAscent=0x7ffe5680, 
nMaxDescent=0x7ffe5678, bCaret=true, layoutCache=0x0) at 
core/sw/source/core/txtnode/fntcache.cxx:763
 #6  0x7fffce3e2a47 in SwFntObj::GetTextSize (this=0x6134340, rInf=...) 
at core/sw/source/core/txtnode/fntcache.cxx:1734
 #7  0x7fffce461147 in SwSubFont::GetTextSize_ (this=0x6281450, 
rInf=...) at core/sw/source/core/txtnode/swfont.cxx:1039
 #8  0x7fffce1f953c in SwFont::GetTextSize_ (this=0x6281450, rInf=...) 
at sw/source/core/inc/swfont.hxx:321
 #9  0x7fffce2234e2 in SwTextSizeInfo::GetTextSize 
(this=0x7ffe6b80, nLayoutContext=std::optional = {...}) at 
core/sw/source/core/text/inftxt.cxx:439
 #10 0x7fffce2f2217 in SwTextPortion::GetTextSize (this=0x62a3d40, 
rInf=...) at core/sw/source/core/text/portxt.cxx:586
 #11 0x7fffce250b8c in SwTextCursor::GetCharRect_ (this=0x7ffe6fc8, 
pOrig=0x7ffe81c8, nOfst=..., pCMS=0x7ffe6e20) at 
core/sw/source/core/text/itrcrsr.cxx:956
 #12 0x7fffce24d978 in SwTextCursor::GetCharRect (this=0x7ffe6fc8, 
pOrig=0x7ffe81c8, nOfst=..., pCMS=0x7ffe6e20, nMax=20604)
 at core/sw/source/core/text/itrcrsr.cxx:1281
 #13 0x7fffce1f08c1 in SwTextFrame::GetAutoPos (this=0x6259250, 
rOrig=SwRect = {...}, rPos=SwPosition (node 28, offset 1897)) at 
core/sw/source/core/text/frmcrsr.cxx:430

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

diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx
index 00dfa384029f..ddb54f8eb0d6 100644
--- a/sw/source/core/text/itrcrsr.cxx
+++ b/sw/source/core/text/itrcrsr.cxx
@@ -937,7 +937,8 @@ void SwTextCursor::GetCharRect_( SwRect* pOrig, 
TextFrameIndex const nOfst,
 // give the wrong width if nOfst is in e.g. the middle
 // of a ligature. See SwFntObj::DrawText().
 TextFrameIndex const nOldLen = pPor->GetLen();
-aInf.SetLen( pPor->GetLen() );
+TextFrameIndex nMaxLen = 
TextFrameIndex(aInf.GetText().getLength()) - aInf.GetIdx();
+aInf.SetLen( std::min(nMaxLen, pPor->GetLen()) );
 pPor->SetLen( nOfst - aInf.GetIdx() );
 aInf.SetMeasureLen(pPor->GetLen());
 if (aInf.GetLen() < aInf.GetMeasureLen())


New Defects reported by Coverity Scan for LibreOffice

2025-01-11 Thread scan-admin
Hi,

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

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

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


** CID 1638657:  Performance inefficiencies  (COPY_INSTEAD_OF_MOVE)
/comphelper/source/misc/lok.cxx: 345 in 
comphelper::LibreOfficeKit::setViewSetter(std::function)()



*** CID 1638657:  Performance inefficiencies  (COPY_INSTEAD_OF_MOVE)
/comphelper/source/misc/lok.cxx: 345 in 
comphelper::LibreOfficeKit::setViewSetter(std::function)()
339 
340 return bRet;
341 }
342 
343 void setViewSetter(std::function pViewSetter)
344 {
>>> CID 1638657:  Performance inefficiencies  (COPY_INSTEAD_OF_MOVE)
>>> "pViewSetter" is copied in a call to copy assignment "operator =", when 
>>> it could be moved instead.
345 g_pViewSetter = pViewSetter;
346 }
347 
348 void setView(int nView)
349 {
350 if (!g_pViewSetter)

** CID 1638656:  Performance inefficiencies  (COPY_INSTEAD_OF_MOVE)
/comphelper/source/misc/lok.cxx: 360 in 
comphelper::LibreOfficeKit::setViewGetter(std::function)()



*** CID 1638656:  Performance inefficiencies  (COPY_INSTEAD_OF_MOVE)
/comphelper/source/misc/lok.cxx: 360 in 
comphelper::LibreOfficeKit::setViewGetter(std::function)()
354 
355 g_pViewSetter(nView);
356 }
357 
358 void setViewGetter(std::function pViewGetter)
359 {
>>> CID 1638656:  Performance inefficiencies  (COPY_INSTEAD_OF_MOVE)
>>> "pViewGetter" is copied in a call to copy assignment "operator =", when 
>>> it could be moved instead.
360 g_pViewGetter = pViewGetter;
361 }
362 
363 int getView()
364 {
365 if (!g_pViewGetter)

** CID 1638655:  Performance inefficiencies  (COPY_INSTEAD_OF_MOVE)
/svgio/source/svgreader/svgsymbolnode.cxx: 203 in 
svgio::svgreader::SvgSymbolNode::decomposeSvgNode(drawinglayer::primitive2d::Primitive2DContainer
 &, bool) const()



*** CID 1638655:  Performance inefficiencies  (COPY_INSTEAD_OF_MOVE)
/svgio/source/svgreader/svgsymbolnode.cxx: 203 in 
svgio::svgreader::SvgSymbolNode::decomposeSvgNode(drawinglayer::primitive2d::Primitive2DContainer
 &, bool) const()
197 
198 // prepare embedding in transformation
199 // create embedding group element with transformation
200 const drawinglayer::primitive2d::Primitive2DReference xRef(
201 new drawinglayer::primitive2d::TransformPrimitive2D(
202 aEmbeddingTransform,
>>> CID 1638655:  Performance inefficiencies  (COPY_INSTEAD_OF_MOVE)
>>> "aContent" is passed-by-value as parameter to 
>>> "drawinglayer::primitive2d::TransformPrimitive2D::TransformPrimitive2D(basegfx::B2DHomMatrix,
>>>  drawinglayer::primitive2d::Primitive2DContainer &&)" when it could be 
>>> moved instead.
203 
drawinglayer::primitive2d::Primitive2DContainer(aContent)));
204 
205 // add embedded geometry to result
206 rTarget.push_back(xRef);
207 }
208 
209 } // end of namespace svgio::svgreader
210 



To view the defects in Coverity Scan visit, 
https://scan.coverity.com/projects/libreoffice?tab=overview



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

2025-01-11 Thread Tibor Nagy (via logerrit)
 vcl/inc/pdf/objectcopier.hxx|3 -
 vcl/qa/cppunit/pdfexport/data/tdf160051.odt |binary
 vcl/qa/cppunit/pdfexport/pdfexport.cxx  |   44 
 vcl/qa/cppunit/pdfexport/pdfexport2.cxx |6 +-
 vcl/source/gdi/pdfobjectcopier.cxx  |   60 +++-
 vcl/source/gdi/pdfwriter_impl.cxx   |4 +
 6 files changed, 110 insertions(+), 7 deletions(-)

New commits:
commit 05a075d23eb6003849e75582e12ef788e615a56d
Author: Tibor Nagy 
AuthorDate: Thu Jan 9 23:02:55 2025 +0100
Commit: Nagy Tibor 
CommitDate: Sun Jan 12 02:24:24 2025 +0100

tdf#160051 PDF export: Artifact present inside tagged content

If a PDF file containing artifacts is added to a document as an image,
and the document is then exported as a tagged PDF, these artifacts are
placed into a structure element (e.g., figure), which is not allowed.
This fix removes unnecessary artifact tags from the content stream.

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

diff --git a/vcl/inc/pdf/objectcopier.hxx b/vcl/inc/pdf/objectcopier.hxx
index 0168f69717ae..6d4d8676e418 100644
--- a/vcl/inc/pdf/objectcopier.hxx
+++ b/vcl/inc/pdf/objectcopier.hxx
@@ -57,7 +57,8 @@ public:
 
 /// Copies page one or more page streams from rContentStreams into rStream.
 static sal_Int32 copyPageStreams(std::vector& 
rContentStreams,
- SvMemoryStream& rStream, bool& 
rCompressed);
+ SvMemoryStream& rStream, bool& 
rCompressed,
+ bool bIsTaggedNonReferenceXObject = 
false);
 };
 }
 
diff --git a/vcl/qa/cppunit/pdfexport/data/tdf160051.odt 
b/vcl/qa/cppunit/pdfexport/data/tdf160051.odt
new file mode 100644
index ..39151e7e8d2c
Binary files /dev/null and b/vcl/qa/cppunit/pdfexport/data/tdf160051.odt differ
diff --git a/vcl/qa/cppunit/pdfexport/pdfexport.cxx 
b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
index c1f2ea43a6a0..c49c01aa7133 100644
--- a/vcl/qa/cppunit/pdfexport/pdfexport.cxx
+++ b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
@@ -90,6 +90,50 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest, testPopupRectangleSize)
 }
 }
 
+CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf160051)
+{
+// A tagged PDF file which containing artifacts was added to the sample 
file as an image.
+// When the sample file exporting as a tagged PDF, these artifacts are 
placed into a structure
+// element (e.g.:figure) which is not allowed.
+
+uno::Sequence aFilterData(
+comphelper::InitPropertySequence({ { "PDFUACompliance", uno::Any(true) 
},
+   { "SelectPdfVersion", 
uno::Any(sal_Int32(17)) } }));
+aMediaDescriptor[u"FilterData"_ustr] <<= aFilterData;
+
+vcl::filter::PDFDocument aDocument;
+load(u"tdf160051.odt", aDocument);
+
+std::vector aPages = aDocument.GetPages();
+CPPUNIT_ASSERT_EQUAL(static_cast(1), aPages.size());
+
+// Directly go to the inner XObject Im7.
+auto pInnerIm = aDocument.LookupObject(7);
+CPPUNIT_ASSERT(pInnerIm);
+
+vcl::filter::PDFStreamElement* pStream = pInnerIm->GetStream();
+CPPUNIT_ASSERT(pStream);
+SvMemoryStream& rObjectStream = pStream->GetMemory();
+
+// Uncompress it.
+SvMemoryStream aUncompressed;
+ZCodec aZCodec;
+aZCodec.BeginCompression();
+rObjectStream.Seek(0);
+aZCodec.Decompress(rObjectStream, aUncompressed);
+CPPUNIT_ASSERT(aZCodec.EndCompression());
+
+auto pStart = static_cast(aUncompressed.GetData());
+const char* pEnd = pStart + aUncompressed.GetSize();
+OString aStr("/Artifact"_ostr);
+auto pArtifact = std::search(pStart, pEnd, aStr.getStr(), aStr.getStr() + 
aStr.getLength());
+
+// Without the fix in place, this test would have failed with
+// Expected: The content stream does not contain "/Artifact" element
+// Actual:   The content stream contains "/Artifact" element
+CPPUNIT_ASSERT_EQUAL(pArtifact, pEnd);
+}
+
 CPPUNIT_TEST_FIXTURE(PdfExportTest, testCommentAnnotation)
 {
 // Enable PDF/UA and Comment as PDF annotations
diff --git a/vcl/qa/cppunit/pdfexport/pdfexport2.cxx 
b/vcl/qa/cppunit/pdfexport/pdfexport2.cxx
index f883a3c97540..25c707b5f0fc 100644
--- a/vcl/qa/cppunit/pdfexport/pdfexport2.cxx
+++ b/vcl/qa/cppunit/pdfexport/pdfexport2.cxx
@@ -830,7 +830,7 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest2, testMultiPagePDF)
 CPPUNIT_ASSERT(aZCodec.EndCompression());
 
 // Just check that the size of the page stream is what is expected.
-CPPUNIT_ASSERT_EQUAL(sal_uInt64(1236), aUncompressed.Tell());
+CPPUNIT_ASSERT_EQUAL(sal_uInt64(1218), aUncompressed.Tell());
 }
 
 { // embedded PDF page 2
@@ -865,7 +865,7 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest2, testMultiPagePDF)
 CPPUNIT_ASSERT(aZCodec.EndCompressio

core.git: 2 commits - vcl/qt5

2025-01-11 Thread Michael Weghorn (via logerrit)
 vcl/qt5/QtInstanceBuilder.cxx |1 +
 vcl/qt5/QtInstanceWidget.cxx  |1 +
 2 files changed, 2 insertions(+)

New commits:
commit bd7029c28db18592041eaebf36542586f4d73434
Author: Michael Weghorn 
AuthorDate: Fri Jan 10 21:15:08 2025 +0100
Commit: Michael Weghorn 
CommitDate: Sat Jan 11 13:22:38 2025 +0100

tdf#130857 qt weld: Support Calc "Move/Copy Sheet" dialog

Declare support for Calc's "Move/Copy Sheet" dialog that shows
up when right-clicking on a sheet in the bottom tabbar showing
sheets and selecting the "Move or Copy Sheet" context menu entry.

This means that native Qt widgets are used for that dialog
now when using the qt5 or qt6 VCL plugin and starting LO with
environment variable SAL_VCL_QT_USE_WELDED_WIDGETS=1 set.

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

diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx
index 479be26bcf1d..2977131d827f 100644
--- a/vcl/qt5/QtInstanceBuilder.cxx
+++ b/vcl/qt5/QtInstanceBuilder.cxx
@@ -74,6 +74,7 @@ bool QtInstanceBuilder::IsUIFileSupported(const OUString& 
rUIFile)
 u"cui/ui/toolbarmodedialog.ui"_ustr,
 u"modules/scalc/ui/inputstringdialog.ui"_ustr,
 u"modules/scalc/ui/insertcells.ui"_ustr,
+u"modules/scalc/ui/movecopysheet.ui"_ustr,
 u"modules/scalc/ui/selectsource.ui"_ustr,
 u"modules/scalc/ui/showsheetdialog.ui"_ustr,
 u"modules/schart/ui/insertaxisdlg.ui"_ustr,
commit ceeb93657bdc1a232d99c8e0a061590408722ac1
Author: Michael Weghorn 
AuthorDate: Fri Jan 10 21:06:10 2025 +0100
Commit: Michael Weghorn 
CommitDate: Sat Jan 11 13:22:32 2025 +0100

tdf#130857 qt weld: Traverse widget hierarchy to detect child focus

Actually traverse the hierarchy instead of
looping infinitely in
QtInstanceWidget::has_child_focus when the
initial `pParent` doesn't have focus.

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

diff --git a/vcl/qt5/QtInstanceWidget.cxx b/vcl/qt5/QtInstanceWidget.cxx
index 7aec0cbaad1b..3c016ef91902 100644
--- a/vcl/qt5/QtInstanceWidget.cxx
+++ b/vcl/qt5/QtInstanceWidget.cxx
@@ -156,6 +156,7 @@ bool QtInstanceWidget::has_child_focus() const
 {
 if (pParent == m_pWidget)
 return true;
+pParent = pParent->parentWidget();
 }
 return false;
 }


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

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

New commits:
commit 8b43a9507553cc8ea68fcb8445b777e6553afbe1
Author: Xisco Fauli 
AuthorDate: Wed Jan 8 09:25:52 2025 +0100
Commit: Xisco Fauli 
CommitDate: Sat Jan 11 09:26:54 2025 +0100

libpng: upgrade to 1.6.45

All three patches are upstreamed.

Downloaded from 
https://kumisystems.dl.sourceforge.net/project/libpng/libpng16/1.6.45/libpng-1.6.45.tar.xz?viasf=1

Change-Id: I61d336704b96e2a25d92b4512507cc168648ddec
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/179930
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 
(cherry picked from commit 9a8234e081c97fafcda009746828f3d01195fe3b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/179951
Reviewed-by: Taichi Haradaguchi 
(cherry picked from commit 5acb7648c3eff7371385df442a627768762a7aa6)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/179988

diff --git a/download.lst b/download.lst
index 8dcb7fcf0490..89564504c18c 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 := 
60c4da1d5b7f0aa8d158da48e8f8afa9773c1c8baa5d21974df61f1886b8ce8e
-LIBPNG_TARBALL := libpng-1.6.44.tar.xz
+LIBPNG_SHA256SUM := 
926485350139ffb51ef69760db35f78846c805fef3d59bfdcb2fba704663f370
+LIBPNG_TARBALL := libpng-1.6.45.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts


core.git: instsetoo_native/inc_openoffice

2025-01-11 Thread Mike Kaganski (via logerrit)
 instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c154b79b580c7c9a7802b4a95ccfdc83d498eb3b
Author: Mike Kaganski 
AuthorDate: Sat Jan 11 09:09:16 2025 +0100
Commit: Mike Kaganski 
CommitDate: Sat Jan 11 10:47:36 2025 +0100

tdf#94193: add missing SecureCustomProperties

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

diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
index c066aa162c7f..fb78652e272d 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
@@ -44,7 +44,7 @@ ProgressType3 installs
 Quickstarterlinkname   QUICKSTARTERLINKNAMETEMPLATE
 RebootYesNoYes
 ReinstallModeText  omus
-SecureCustomProperties NEWPRODUCTS;OLDPRODUCTS;WIN81S14;WINMAJORVER
+SecureCustomProperties 
NEWPRODUCTS;OLDPRODUCTS;WINMAJORVER;INSTALLLOCATION;TARGETDIR;COMPANYNAME;USERNAME;ALLUSERSPROFILE;USERPROFILE;LANG_SELECTED;APP_SELECTED;FILETYPEDIALOGUSED;SOURCEDIR;ROOTDRIVE;REGISTER_XLW;REGISTER_VST;REGISTER_VSD;CREATEDESKTOPLINK;SELECT_WORD;SELECT_EXCEL;SELECT_POWERPOINT;SELECT_VISIO
 SetupType  Typical
 SELECT_WORD0
 SELECT_EXCEL   0


Latest changes to poppler breaks build against Clang and libc++15

2025-01-11 Thread Etna -
Hello all, attempting to build the latest checkout against Debian 12 on a 
self-compiled LLVM15, libc++15 and clang-15 returns the following error:

---
/home/etna/Tmpdir/libreoffice/build/workdir/UnpackedTarball/poppler/poppler/Dict.cc:116:30:
 error: no member named 'sort' in namespace 'std::ranges'
std::ranges::sort(that->entries, CmpDictEntry {});
~^
/home/etna/Tmpdir/libreoffice/build/workdir/UnpackedTarball/poppler/poppler/Dict.cc:123:39:
 error: no member named 'lower_bound' in namespace 'std::ranges'
const auto pos = std::ranges::lower_bound(entries, key, std::less<> {}, 
&DictEntry::first);
 ~^
[CXX] workdir/UnpackedTarball/poppler/poppler/PageTransition.cc
[CXX] workdir/UnpackedTarball/poppler/poppler/Parser.cc
2 errors generated.
make[1]: *** [/home/etna/Tmpdir/libreoffice/solenv/gbuild/LinkTarget.mk:403: 
/home/etna/Tmpdir/libreoffice/build/workdir/GenCxxObject/UnpackedTarball/poppler/poppler/Dict.o]
 Error 1
make[1]: *** Waiting for unfinished jobs
/home/etna/Tmpdir/libreoffice/build/workdir/UnpackedTarball/poppler/poppler/Catalog.cc:708:22:
 error: no member named 'sort' in namespace 'std::ranges'
std::ranges::sort(entries, [](const auto &first, const auto &second) { 
return first->name.cmp(&second->name) < 0; });
~^
/home/etna/Tmpdir/libreoffice/build/workdir/UnpackedTarball/poppler/poppler/Catalog.cc:757:31:
 error: no member named 'lower_bound' in namespace 'std::ranges'
auto entry = std::ranges::lower_bound(entries, name, EntryGooStringComparer 
{});
 ~^
2 errors generated.
make[1]: *** [/home/etna/Tmpdir/libreoffice/solenv/gbuild/LinkTarget.mk:399: 
/home/etna/Tmpdir/libreoffice/build/workdir/GenCxxObject/UnpackedTarball/poppler/poppler/Catalog.o]
 Error 1
/home/etna/Tmpdir/libreoffice/build/workdir/UnpackedTarball/poppler/poppler/Annot.cc:7502:29:
 error: no member named 'find' in namespace 'std::ranges'
auto idx = std::ranges::find(annots, annot);
   ~^
1 error generated.
make[1]: *** [/home/etna/Tmpdir/libreoffice/solenv/gbuild/LinkTarget.mk:399: 
/home/etna/Tmpdir/libreoffice/build/workdir/GenCxxObject/UnpackedTarball/poppler/poppler/Annot.o]
 Error 1
/home/etna/Tmpdir/libreoffice/build/workdir/UnpackedTarball/poppler/poppler/Gfx.cc:2548:22:
 error: no type named 'sort' in namespace 'std::ranges'
std::ranges::sort(bboxIntersections);
~^
/home/etna/Tmpdir/libreoffice/build/workdir/UnpackedTarball/poppler/poppler/Gfx.cc:2649:22:
 error: no type named 'sort' in namespace 'std::ranges'
std::ranges::sort(s);
~^
/home/etna/Tmpdir/libreoffice/build/workdir/UnpackedTarball/poppler/poppler/Gfx.cc:2790:26:
 error: no type named 'sort' in namespace 'std::ranges'
std::ranges::sort(s);
~^
/home/etna/Tmpdir/libreoffice/build/workdir/UnpackedTarball/poppler/poppler/GlobalParams.cc:369:30:
 error: no member named 'find' in namespace 'std::ranges'
if (std::ranges::find(filesToIgnore, fi->path->toStr()) == 
filesToIgnore.end()) {
~^
/home/etna/Tmpdir/libreoffice/build/workdir/UnpackedTarball/poppler/poppler/GfxFont.cc:1871:22:
 error: no member named 'sort' in namespace 'std::ranges'
std::ranges::sort(widths.exceps, cmpWidthExcepFunctor());
~^
/home/etna/Tmpdir/libreoffice/build/workdir/UnpackedTarball/poppler/poppler/GlobalParams.cc:380:34:
 error: no member named 'find' in namespace 'std::ranges'
if (std::ranges::find(filesToIgnore, fi->path->toStr()) == 
filesToIgnore.end()) {
~^
/home/etna/Tmpdir/libreoffice/build/workdir/UnpackedTarball/poppler/poppler/GlobalParams.cc:392:34:
 error: no member named 'find' in namespace 'std::ranges'
if (std::ranges::find(filesToIgnore, fi->path->toStr()) == 
filesToIgnore.end()) {
~^
/home/etna/Tmpdir/libreoffice/build/workdir/UnpackedTarball/poppler/poppler/GfxFont.cc:1919:22:
 error: no member named 'sort' in namespace 'std::ranges'
std::ranges::sort(widths.excepsV, cmpWidthExcepVFunctor());
~^
/home/etna/Tmpdir/libreoffice/build/workdir/UnpackedTarball/poppler/poppler/GlobalParams.cc:740:18:
 error: no member named 'replace' in namespace 'std::ranges'
std::ranges::replace(fontName, '-', ' ');
~^
3 errors generated.
make[1]: *** [/home/etna/Tmpdir/libreoffice/solenv/gbuild/LinkTarget.mk:399: 
/home/etna/Tmpdir/libreoffice/build/workdir/GenCxxObject/UnpackedTarball/poppler/poppler/Gfx.o]
 Error 1
/home/etna/Tmpdir/libreoffice/build/workdir/UnpackedTarball/poppler/poppler/GlobalParams.cc:1123:38:
 error: no member named 'find' in namespace 'std::ranges'
if (std::ranges::find(filesToIgnore, sFilePath) == 
filesToIgnore.end()) {
~~

Latest changes to poppler breaks build against Clang and libc++15

2025-01-11 Thread Etna -
Hello all, attempting to build the latest checkout against Debian 12 on a 
self-compiled LLVM15, libc++15 and clang-15 returns the following error:

---
/home/etna/Tmpdir/libreoffice/build/workdir/UnpackedTarball/poppler/poppler/Dict.cc:116:30:
 error: no member named 'sort' in namespace 'std::ranges'
std::ranges::sort(that->entries, CmpDictEntry {});
~^
/home/etna/Tmpdir/libreoffice/build/workdir/UnpackedTarball/poppler/poppler/Dict.cc:123:39:
 error: no member named 'lower_bound' in namespace 'std::ranges'
const auto pos = std::ranges::lower_bound(entries, key, std::less<> {}, 
&DictEntry::first);
 ~^
[CXX] workdir/UnpackedTarball/poppler/poppler/PageTransition.cc
[CXX] workdir/UnpackedTarball/poppler/poppler/Parser.cc
2 errors generated.
make[1]: *** [/home/etna/Tmpdir/libreoffice/solenv/gbuild/LinkTarget.mk:403: 
/home/etna/Tmpdir/libreoffice/build/workdir/GenCxxObject/UnpackedTarball/poppler/poppler/Dict.o]
 Error 1
make[1]: *** Waiting for unfinished jobs
/home/etna/Tmpdir/libreoffice/build/workdir/UnpackedTarball/poppler/poppler/Catalog.cc:708:22:
 error: no member named 'sort' in namespace 'std::ranges'
std::ranges::sort(entries, [](const auto &first, const auto &second) { 
return first->name.cmp(&second->name) < 0; });
~^
/home/etna/Tmpdir/libreoffice/build/workdir/UnpackedTarball/poppler/poppler/Catalog.cc:757:31:
 error: no member named 'lower_bound' in namespace 'std::ranges'
auto entry = std::ranges::lower_bound(entries, name, EntryGooStringComparer 
{});
 ~^
2 errors generated.
make[1]: *** [/home/etna/Tmpdir/libreoffice/solenv/gbuild/LinkTarget.mk:399: 
/home/etna/Tmpdir/libreoffice/build/workdir/GenCxxObject/UnpackedTarball/poppler/poppler/Catalog.o]
 Error 1
/home/etna/Tmpdir/libreoffice/build/workdir/UnpackedTarball/poppler/poppler/Annot.cc:7502:29:
 error: no member named 'find' in namespace 'std::ranges'
auto idx = std::ranges::find(annots, annot);
   ~^
1 error generated.
make[1]: *** [/home/etna/Tmpdir/libreoffice/solenv/gbuild/LinkTarget.mk:399: 
/home/etna/Tmpdir/libreoffice/build/workdir/GenCxxObject/UnpackedTarball/poppler/poppler/Annot.o]
 Error 1
/home/etna/Tmpdir/libreoffice/build/workdir/UnpackedTarball/poppler/poppler/Gfx.cc:2548:22:
 error: no type named 'sort' in namespace 'std::ranges'
std::ranges::sort(bboxIntersections);
~^
/home/etna/Tmpdir/libreoffice/build/workdir/UnpackedTarball/poppler/poppler/Gfx.cc:2649:22:
 error: no type named 'sort' in namespace 'std::ranges'
std::ranges::sort(s);
~^
/home/etna/Tmpdir/libreoffice/build/workdir/UnpackedTarball/poppler/poppler/Gfx.cc:2790:26:
 error: no type named 'sort' in namespace 'std::ranges'
std::ranges::sort(s);
~^
/home/etna/Tmpdir/libreoffice/build/workdir/UnpackedTarball/poppler/poppler/GlobalParams.cc:369:30:
 error: no member named 'find' in namespace 'std::ranges'
if (std::ranges::find(filesToIgnore, fi->path->toStr()) == 
filesToIgnore.end()) {
~^
/home/etna/Tmpdir/libreoffice/build/workdir/UnpackedTarball/poppler/poppler/GfxFont.cc:1871:22:
 error: no member named 'sort' in namespace 'std::ranges'
std::ranges::sort(widths.exceps, cmpWidthExcepFunctor());
~^
/home/etna/Tmpdir/libreoffice/build/workdir/UnpackedTarball/poppler/poppler/GlobalParams.cc:380:34:
 error: no member named 'find' in namespace 'std::ranges'
if (std::ranges::find(filesToIgnore, fi->path->toStr()) == 
filesToIgnore.end()) {
~^
/home/etna/Tmpdir/libreoffice/build/workdir/UnpackedTarball/poppler/poppler/GlobalParams.cc:392:34:
 error: no member named 'find' in namespace 'std::ranges'
if (std::ranges::find(filesToIgnore, fi->path->toStr()) == 
filesToIgnore.end()) {
~^
/home/etna/Tmpdir/libreoffice/build/workdir/UnpackedTarball/poppler/poppler/GfxFont.cc:1919:22:
 error: no member named 'sort' in namespace 'std::ranges'
std::ranges::sort(widths.excepsV, cmpWidthExcepVFunctor());
~^
/home/etna/Tmpdir/libreoffice/build/workdir/UnpackedTarball/poppler/poppler/GlobalParams.cc:740:18:
 error: no member named 'replace' in namespace 'std::ranges'
std::ranges::replace(fontName, '-', ' ');
~^
3 errors generated.
make[1]: *** [/home/etna/Tmpdir/libreoffice/solenv/gbuild/LinkTarget.mk:399: 
/home/etna/Tmpdir/libreoffice/build/workdir/GenCxxObject/UnpackedTarball/poppler/poppler/Gfx.o]
 Error 1
/home/etna/Tmpdir/libreoffice/build/workdir/UnpackedTarball/poppler/poppler/GlobalParams.cc:1123:38:
 error: no member named 'find' in namespace 'std::ranges'
if (std::ranges::find(filesToIgnore, sFilePath) == 
filesToIgnore.end()) {
~~

Re: Latest changes to poppler breaks build against Clang and libc++15

2025-01-11 Thread Dr. David Alan Gilbert
* Dr. David Alan Gilbert (d...@treblig.org) wrote:
> * Etna - (e...@outlook.sg) wrote:
> > Hello all, attempting to build the latest checkout against Debian 12 on a 
> > self-compiled LLVM15, libc++15 and clang-15 returns the following error:
> > 
> > ---
> > /home/etna/Tmpdir/libreoffice/build/workdir/UnpackedTarball/poppler/poppler/Dict.cc:116:30:
> >  error: no member named 'sort' in namespace 'std::ranges'
> > std::ranges::sort(that->entries, CmpDictEntry {});
> > ~^
> > /home/etna/Tmpdir/libreoffice/build/workdir/UnpackedTarball/poppler/poppler/Dict.cc:123:39:
> >  error: no member named 'lower_bound' in namespace 'std::ranges'
> > const auto pos = std::ranges::lower_bound(entries, key, std::less<> 
> > {}, &DictEntry::first);
> >  ~^
> 
> OK, so my reading is that's a C++20 feature, and the LLVM 15.0.0 release 
> notes say:
> 
> https://releases.llvm.org/15.0.0/projects/libcxx/docs/ReleaseNotes.html
> 
>   'The C++20 ranges library has progressed a lot since the last release and 
> is almost complete. The ranges library is considered experimental.'

Oops, so I then saw your line at the bottom; so yes, it's no surprise
that the experimental flag helps, and yes that patch you found
should ifdef these std::ranges against clang;  in your world are
you seeing that patch has been applied - becuase it should
be applied by LO when it unpacks poppler.

Dave

> Dave
> 
> > [CXX] workdir/UnpackedTarball/poppler/poppler/PageTransition.cc
> > [CXX] workdir/UnpackedTarball/poppler/poppler/Parser.cc
> > 2 errors generated.
> > make[1]: *** 
> > [/home/etna/Tmpdir/libreoffice/solenv/gbuild/LinkTarget.mk:403: 
> > /home/etna/Tmpdir/libreoffice/build/workdir/GenCxxObject/UnpackedTarball/poppler/poppler/Dict.o]
> >  Error 1
> > make[1]: *** Waiting for unfinished jobs
> > /home/etna/Tmpdir/libreoffice/build/workdir/UnpackedTarball/poppler/poppler/Catalog.cc:708:22:
> >  error: no member named 'sort' in namespace 'std::ranges'
> > std::ranges::sort(entries, [](const auto &first, const auto 
> > &second) { return first->name.cmp(&second->name) < 0; });
> > ~^
> > /home/etna/Tmpdir/libreoffice/build/workdir/UnpackedTarball/poppler/poppler/Catalog.cc:757:31:
> >  error: no member named 'lower_bound' in namespace 'std::ranges'
> > auto entry = std::ranges::lower_bound(entries, name, 
> > EntryGooStringComparer {});
> >  ~^
> > 2 errors generated.
> > make[1]: *** 
> > [/home/etna/Tmpdir/libreoffice/solenv/gbuild/LinkTarget.mk:399: 
> > /home/etna/Tmpdir/libreoffice/build/workdir/GenCxxObject/UnpackedTarball/poppler/poppler/Catalog.o]
> >  Error 1
> > /home/etna/Tmpdir/libreoffice/build/workdir/UnpackedTarball/poppler/poppler/Annot.cc:7502:29:
> >  error: no member named 'find' in namespace 'std::ranges'
> > auto idx = std::ranges::find(annots, annot);
> >~^
> > 1 error generated.
> > make[1]: *** 
> > [/home/etna/Tmpdir/libreoffice/solenv/gbuild/LinkTarget.mk:399: 
> > /home/etna/Tmpdir/libreoffice/build/workdir/GenCxxObject/UnpackedTarball/poppler/poppler/Annot.o]
> >  Error 1
> > /home/etna/Tmpdir/libreoffice/build/workdir/UnpackedTarball/poppler/poppler/Gfx.cc:2548:22:
> >  error: no type named 'sort' in namespace 'std::ranges'
> > std::ranges::sort(bboxIntersections);
> > ~^
> > /home/etna/Tmpdir/libreoffice/build/workdir/UnpackedTarball/poppler/poppler/Gfx.cc:2649:22:
> >  error: no type named 'sort' in namespace 'std::ranges'
> > std::ranges::sort(s);
> > ~^
> > /home/etna/Tmpdir/libreoffice/build/workdir/UnpackedTarball/poppler/poppler/Gfx.cc:2790:26:
> >  error: no type named 'sort' in namespace 'std::ranges'
> > std::ranges::sort(s);
> > ~^
> > /home/etna/Tmpdir/libreoffice/build/workdir/UnpackedTarball/poppler/poppler/GlobalParams.cc:369:30:
> >  error: no member named 'find' in namespace 'std::ranges'
> > if (std::ranges::find(filesToIgnore, fi->path->toStr()) == 
> > filesToIgnore.end()) {
> > ~^
> > /home/etna/Tmpdir/libreoffice/build/workdir/UnpackedTarball/poppler/poppler/GfxFont.cc:1871:22:
> >  error: no member named 'sort' in namespace 'std::ranges'
> > std::ranges::sort(widths.exceps, cmpWidthExcepFunctor());
> > ~^
> > /home/etna/Tmpdir/libreoffice/build/workdir/UnpackedTarball/poppler/poppler/GlobalParams.cc:380:34:
> >  error: no member named 'find' in namespace 'std::ranges'
> > if (std::ranges::find(filesToIgnore, fi->path->toStr()) == 
> > filesToIgnore.end()) {
> > ~^
> > /home/etna/Tmpdir/libreoffice/build/workdir/UnpackedTarball/poppler/poppler/GlobalParams.cc:392:34:
> >  error: no member named 'find' in namespace 'std::ranges'
> > if (std::ranges::find(filesToIgnore, fi->path->toStr()) 

Re: Latest changes to poppler breaks build against Clang and libc++15

2025-01-11 Thread Dr. David Alan Gilbert
* Etna - (e...@outlook.sg) wrote:
> Hello all, attempting to build the latest checkout against Debian 12 on a 
> self-compiled LLVM15, libc++15 and clang-15 returns the following error:
> 
> ---
> /home/etna/Tmpdir/libreoffice/build/workdir/UnpackedTarball/poppler/poppler/Dict.cc:116:30:
>  error: no member named 'sort' in namespace 'std::ranges'
> std::ranges::sort(that->entries, CmpDictEntry {});
> ~^
> /home/etna/Tmpdir/libreoffice/build/workdir/UnpackedTarball/poppler/poppler/Dict.cc:123:39:
>  error: no member named 'lower_bound' in namespace 'std::ranges'
> const auto pos = std::ranges::lower_bound(entries, key, std::less<> 
> {}, &DictEntry::first);
>  ~^

OK, so my reading is that's a C++20 feature, and the LLVM 15.0.0 release notes 
say:

https://releases.llvm.org/15.0.0/projects/libcxx/docs/ReleaseNotes.html

  'The C++20 ranges library has progressed a lot since the last release and is 
almost complete. The ranges library is considered experimental.'

Dave

> [CXX] workdir/UnpackedTarball/poppler/poppler/PageTransition.cc
> [CXX] workdir/UnpackedTarball/poppler/poppler/Parser.cc
> 2 errors generated.
> make[1]: *** [/home/etna/Tmpdir/libreoffice/solenv/gbuild/LinkTarget.mk:403: 
> /home/etna/Tmpdir/libreoffice/build/workdir/GenCxxObject/UnpackedTarball/poppler/poppler/Dict.o]
>  Error 1
> make[1]: *** Waiting for unfinished jobs
> /home/etna/Tmpdir/libreoffice/build/workdir/UnpackedTarball/poppler/poppler/Catalog.cc:708:22:
>  error: no member named 'sort' in namespace 'std::ranges'
> std::ranges::sort(entries, [](const auto &first, const auto &second) 
> { return first->name.cmp(&second->name) < 0; });
> ~^
> /home/etna/Tmpdir/libreoffice/build/workdir/UnpackedTarball/poppler/poppler/Catalog.cc:757:31:
>  error: no member named 'lower_bound' in namespace 'std::ranges'
> auto entry = std::ranges::lower_bound(entries, name, 
> EntryGooStringComparer {});
>  ~^
> 2 errors generated.
> make[1]: *** [/home/etna/Tmpdir/libreoffice/solenv/gbuild/LinkTarget.mk:399: 
> /home/etna/Tmpdir/libreoffice/build/workdir/GenCxxObject/UnpackedTarball/poppler/poppler/Catalog.o]
>  Error 1
> /home/etna/Tmpdir/libreoffice/build/workdir/UnpackedTarball/poppler/poppler/Annot.cc:7502:29:
>  error: no member named 'find' in namespace 'std::ranges'
> auto idx = std::ranges::find(annots, annot);
>~^
> 1 error generated.
> make[1]: *** [/home/etna/Tmpdir/libreoffice/solenv/gbuild/LinkTarget.mk:399: 
> /home/etna/Tmpdir/libreoffice/build/workdir/GenCxxObject/UnpackedTarball/poppler/poppler/Annot.o]
>  Error 1
> /home/etna/Tmpdir/libreoffice/build/workdir/UnpackedTarball/poppler/poppler/Gfx.cc:2548:22:
>  error: no type named 'sort' in namespace 'std::ranges'
> std::ranges::sort(bboxIntersections);
> ~^
> /home/etna/Tmpdir/libreoffice/build/workdir/UnpackedTarball/poppler/poppler/Gfx.cc:2649:22:
>  error: no type named 'sort' in namespace 'std::ranges'
> std::ranges::sort(s);
> ~^
> /home/etna/Tmpdir/libreoffice/build/workdir/UnpackedTarball/poppler/poppler/Gfx.cc:2790:26:
>  error: no type named 'sort' in namespace 'std::ranges'
> std::ranges::sort(s);
> ~^
> /home/etna/Tmpdir/libreoffice/build/workdir/UnpackedTarball/poppler/poppler/GlobalParams.cc:369:30:
>  error: no member named 'find' in namespace 'std::ranges'
> if (std::ranges::find(filesToIgnore, fi->path->toStr()) == 
> filesToIgnore.end()) {
> ~^
> /home/etna/Tmpdir/libreoffice/build/workdir/UnpackedTarball/poppler/poppler/GfxFont.cc:1871:22:
>  error: no member named 'sort' in namespace 'std::ranges'
> std::ranges::sort(widths.exceps, cmpWidthExcepFunctor());
> ~^
> /home/etna/Tmpdir/libreoffice/build/workdir/UnpackedTarball/poppler/poppler/GlobalParams.cc:380:34:
>  error: no member named 'find' in namespace 'std::ranges'
> if (std::ranges::find(filesToIgnore, fi->path->toStr()) == 
> filesToIgnore.end()) {
> ~^
> /home/etna/Tmpdir/libreoffice/build/workdir/UnpackedTarball/poppler/poppler/GlobalParams.cc:392:34:
>  error: no member named 'find' in namespace 'std::ranges'
> if (std::ranges::find(filesToIgnore, fi->path->toStr()) == 
> filesToIgnore.end()) {
> ~^
> /home/etna/Tmpdir/libreoffice/build/workdir/UnpackedTarball/poppler/poppler/GfxFont.cc:1919:22:
>  error: no member named 'sort' in namespace 'std::ranges'
> std::ranges::sort(widths.excepsV, cmpWidthExcepVFunctor());
> ~^
> /home/etna/Tmpdir/libreoffice/build/workdir/UnpackedTarball/poppler/poppler/GlobalParams.cc:740:18:
>  error: no member named 'replace' in namespace 'std::ranges'
> std::ranges::replace(fontName, '-', ' ');
>   

dictionaries.git: Branch 'libreoffice-25-2' - mn_MN/description.xml mn_MN/mn_MN.aff mn_MN/mn_MN.dic

2025-01-11 Thread Xisco Fauli (via logerrit)
 mn_MN/description.xml |2 
 mn_MN/mn_MN.aff   |  180 +
 mn_MN/mn_MN.dic   | 1553 +-
 3 files changed, 1307 insertions(+), 428 deletions(-)

New commits:
commit 8390d156ed67c2b2b82f74dcd39f3ad3b1924b5b
Author: Xisco Fauli 
AuthorDate: Thu Dec 26 13:05:10 2024 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Sat Jan 11 16:30:33 2025 +0100

Upgrade Mongolian dictionary to 2024.12.26

Downloaded from 
https://codeload.github.com/bataak/dict-mn/zip/refs/tags/2024.12.26

Change-Id: I336665091832e67a7c27fe602f8cc9fd98e87e7c
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/179426
Tested-by: Xisco Fauli 
Reviewed-by: Xisco Fauli 
(cherry picked from commit 9e21ef7309e336a0f8f623c54a4dda49f9d043b6)
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/179427
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/mn_MN/description.xml b/mn_MN/description.xml
index 6e45a31..0fde8c2 100644
--- a/mn_MN/description.xml
+++ b/mn_MN/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";>
-
+
 
 
 Mongolian spelling and hyphenation 
dictionaries
diff --git a/mn_MN/mn_MN.aff b/mn_MN/mn_MN.aff
index 300c07b..ad7151e 100644
--- a/mn_MN/mn_MN.aff
+++ b/mn_MN/mn_MN.aff
@@ -1,5 +1,5 @@
 # mn_MN.aff
-# Version: 2024.11.08
+# Version: 2024.12.26
 # Copyright 2020-2024, Batmunkh Dorjgotov 
 #   https://zuv.bichig.dev
 # Special thanks to Guntevsuren Nanzad for your great professional assistance.
@@ -46,7 +46,7 @@ COMPOUNDRULE (nn)*[o0,o1,o2,o3]
 COMPOUNDRULE (nn)*%?
 COMPOUNDRULE (nn)*.(nn)*%?
 
-REP 3621
+REP 3753
 REP a а
 REP c с
 REP e е
@@ -115,10 +115,13 @@ REP аатай аалттай
 REP ав б
 REP ав ба
 REP ав уу
+REP авб вав
 REP авч агч
 REP авч айвч
 REP аг га
 REP аг ийг
+REP аг лаг
+REP аг лага
 REP агаа аа
 REP агаас оос
 REP агоос оос
@@ -127,6 +130,7 @@ REP аган г
 REP агийн ийн
 REP агийн ын
 REP агд д
+REP агдса огдсо
 REP агла гал
 REP агн г
 REP агний гийн
@@ -136,6 +140,7 @@ REP агнуур гар
 REP агны гийн
 REP агт гад
 REP агт ганд
+REP агч г
 REP ад даг
 REP ад нууд
 REP ад онд
@@ -150,6 +155,7 @@ REP ажла жил
 REP ай иа
 REP айлал айл
 REP айлл айл
+REP ал агла
 REP ал алал
 REP ал алла
 REP ал ла
@@ -163,6 +169,8 @@ REP алгаанд лагт
 REP алгааны лагын
 REP алганд лагад
 REP алганы лагын
+REP алгы гий
+REP алгы лагий
 REP алн л
 REP алнууд лууд
 REP алны лын
@@ -176,9 +184,11 @@ REP амн м
 REP амны мын
 REP амчих мачих
 REP амчих мачх
+REP амы мыг
 REP ан йг
 REP ан ын
 REP ана на
+REP ана энэ
 REP анаа ээ
 REP анаараа ноороо
 REP анаасаа ноосоо
@@ -190,6 +200,7 @@ REP ангид инганд
 REP ангий ы
 REP ангий$ ыг
 REP ангийн ны
+REP ангийх ынх
 REP ангийх ных
 REP ангиуд нууд
 REP ангууд нууд
@@ -244,6 +255,7 @@ REP ахад оход
 REP ахдаа охдоо
 REP ахиас хаас
 REP ахий хы
+REP ахы ы
 REP ач чи
 REP аш ши
 REP ашла шил
@@ -260,6 +272,7 @@ REP егийн ын
 REP егоо оо
 REP ей егий
 REP ендий анды
+REP ерээ ороо
 REP еэ ёо
 REP ёо еэ
 REP ёо яа
@@ -277,6 +290,7 @@ REP и н
 REP и о
 REP и ү
 REP й ү
+REP йнын ины
 REP и ха
 REP и ь
 REP и э
@@ -380,15 +394,20 @@ REP иддоо додоо
 REP иддөө дөдөө
 REP иддээ дэдээ
 REP идн д
+REP иж эжг
+REP ий аа
 REP ий агийн
 REP ий игий
 REP ий иягий
 REP ий огийн
+REP ий оо
 REP ий өгийн
+REP ий өө
 REP ий ы
 REP ий эгийн
 REP ий ээ
 REP ийг г
+REP ийг эг
 REP ийгөө ыгаа
 REP ийгөө ыгоо
 REP ийгээ ийгөө
@@ -472,6 +491,7 @@ REP ийнхээрээ ынхаараа
 REP ийнхээрээ ынхоороо
 REP ийнхээсээ ынхаасаа
 REP ийнхээсээ ынхоосоо
+REP ийс иш
 REP ийхний өгийнхний
 REP ийхний эгийнхний
 REP ийхтэй ыхтай
@@ -502,6 +522,10 @@ REP ил ли
 REP ил ло
 REP ил лө
 REP ил лэ
+REP ил лал
+REP ил лол
+REP ил лөл
+REP ил лэл
 REP йла али
 REP ила ли
 REP илб иллав
@@ -559,6 +583,7 @@ REP ингийн ний
 REP ингийн ны
 REP ингонд онгид
 REP ингөнд өнгид
+REP ингуудаа доо
 REP ингэнд энгид
 REP инд д
 REP инд т
@@ -577,6 +602,7 @@ REP инчлэ энчил
 REP ины ий
 REP ины ийн
 REP ины енийн
+REP ины нийн
 REP йны йн
 REP инэ ни
 REP ио ё
@@ -620,6 +646,7 @@ REP исн сон
 REP исн сөн
 REP исн сэн
 REP исны сын
+REP ист сэд
 REP исчи ьсчхо
 REP ит та
 REP ит то
@@ -666,8 +693,10 @@ REP ов уу
 REP овч огч
 REP овч ойвч
 REP ог го
+REP ог ийг
 REP огаа аа
 REP огаа оо
+REP огдсо агдса
 REP огийн ийн
 REP огийн ын
 REP огло гол
@@ -706,6 +735,7 @@ REP олдирл улдрал
 REP олдирлоо улдралаа
 REP олдиро улдра
 REP олдри улдра
+REP олий илы
 REP олн л
 REP олнууд лууд
 REP олны лын
@@ -713,6 +743,7 @@ REP олро лор
 REP олт л
 REP олчи лоч
 REP олъё лоё
+REP оль ил
 REP оль йл
 REP ольдир улдра
 REP ольдирлоо улдралаа
@@ -729,6 +760,7 @@ REP онг ыг
 REP онгид ингонд
 REP онгий ы
 REP онгийн ны
+REP онгийх ынх
 REP онгийх ных
 REP онгиуд нууд
 REP онгоо ноо
@@ -894,6 +926,7 @@ REP өнг нийг
 REP өнгид ингөнд
 REP өнг

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

2025-01-11 Thread Xisco Fauli (via logerrit)
 dictionaries |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 46f1d3a634d693e170d326d38777f2f4e3b2fc99
Author: Xisco Fauli 
AuthorDate: Sat Jan 11 16:30:34 2025 +0100
Commit: Gerrit Code Review 
CommitDate: Sat Jan 11 16:30:34 2025 +0100

Update git submodules

* Update dictionaries from branch 'libreoffice-25-2'
  to 8390d156ed67c2b2b82f74dcd39f3ad3b1924b5b
  - Upgrade Mongolian dictionary to 2024.12.26

Downloaded from 
https://codeload.github.com/bataak/dict-mn/zip/refs/tags/2024.12.26

Change-Id: I336665091832e67a7c27fe602f8cc9fd98e87e7c
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/179426
Tested-by: Xisco Fauli 
Reviewed-by: Xisco Fauli 
(cherry picked from commit 9e21ef7309e336a0f8f623c54a4dda49f9d043b6)
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/179427
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/dictionaries b/dictionaries
index a3af64a91c0b..8390d156ed67 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit a3af64a91c0b881f2c10f93d6e5aa275c814bb67
+Subproject commit 8390d156ed67c2b2b82f74dcd39f3ad3b1924b5b