core.git: include/svx svx/source

[Miklos Vajna (via logerrit)]

 include/svx/svdundo.hxx   |6 +++---
 svx/source/svdraw/svdundo.cxx |   28 ++--
 2 files changed, 17 insertions(+), 17 deletions(-)

New commits:
commit 61f5006c18b3194f6aaa03e260425dc878cfff79
Author: Miklos Vajna 
AuthorDate: Mon Jun 3 09:32:38 2024 +0200
Commit: Miklos Vajna 
CommitDate: Mon Jun 3 12:24:08 2024 +0200

svx: prefix members of SdrUndoGeoObj

See tdf#94879 for motivation.

Change-Id: Ic34b5e1c7a1b73d688cc4dfc87c03417fe8e987b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168357
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins

diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx
index e1b778064e6d..bc15932fd81c 100644
--- a/include/svx/svdundo.hxx
+++ b/include/svx/svdundo.hxx
@@ -211,10 +211,10 @@ public:
 
 class SVXCORE_DLLPUBLIC SdrUndoGeoObj : public SdrUndoObj
 {
-std::unique_ptr pUndoGeo;
-std::unique_ptr pRedoGeo;
+std::unique_ptr m_pUndoGeo;
+std::unique_ptr m_pRedoGeo;
 // If we have a group object:
-std::unique_ptr pUndoGroup;
+std::unique_ptr m_pUndoGroup;
 /// If we have a table object, should its layout change?
 bool mbSkipChangeLayout;
 
diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index c7bb38d81ada..7d98d21b7cb4 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -564,21 +564,21 @@ SdrUndoGeoObj::SdrUndoGeoObj(SdrObject& rNewObj)
 // this is a group object!
 // If this were 3D scene, we'd only add an Undo for the scene itself
 // (which we do elsewhere).
-pUndoGroup.reset(new SdrUndoGroup(mxObj->getSdrModelFromSdrObject()));
+m_pUndoGroup.reset(new 
SdrUndoGroup(mxObj->getSdrModelFromSdrObject()));
 for (const rtl::Reference& pObj : *pOL)
-pUndoGroup->AddAction(std::make_unique(*pObj));
+m_pUndoGroup->AddAction(std::make_unique(*pObj));
 }
 else
 {
-pUndoGeo = mxObj->GetGeoData();
+m_pUndoGeo = mxObj->GetGeoData();
 }
 }
 
 SdrUndoGeoObj::~SdrUndoGeoObj()
 {
-pUndoGeo.reset();
-pRedoGeo.reset();
-pUndoGroup.reset();
+m_pUndoGeo.reset();
+m_pRedoGeo.reset();
+m_pUndoGroup.reset();
 }
 
 void SdrUndoGeoObj::Undo()
@@ -586,21 +586,21 @@ void SdrUndoGeoObj::Undo()
 // Trigger PageChangeCall
 ImpShowPageOfThisObject();
 
-if(pUndoGroup)
+if(m_pUndoGroup)
 {
-pUndoGroup->Undo();
+m_pUndoGroup->Undo();
 
 // only repaint, no objectchange
 mxObj->ActionChanged();
 }
 else
 {
-pRedoGeo = mxObj->GetGeoData();
+m_pRedoGeo = mxObj->GetGeoData();
 
 auto pTableObj = dynamic_cast(mxObj.get());
 if (pTableObj && mbSkipChangeLayout)
 pTableObj->SetSkipChangeLayout(true);
-mxObj->SetGeoData(*pUndoGeo);
+mxObj->SetGeoData(*m_pUndoGeo);
 if (pTableObj && mbSkipChangeLayout)
 pTableObj->SetSkipChangeLayout(false);
 }
@@ -608,17 +608,17 @@ void SdrUndoGeoObj::Undo()
 
 void SdrUndoGeoObj::Redo()
 {
-if(pUndoGroup)
+if(m_pUndoGroup)
 {
-pUndoGroup->Redo();
+m_pUndoGroup->Redo();
 
 // only repaint, no objectchange
 mxObj->ActionChanged();
 }
 else
 {
-pUndoGeo = mxObj->GetGeoData();
-mxObj->SetGeoData(*pRedoGeo);
+m_pUndoGeo = mxObj->GetGeoData();
+mxObj->SetGeoData(*m_pRedoGeo);
 }
 
 // Trigger PageChangeCall

help.git: source/text

[Stanislav Horacek (via logerrit)]

 source/text/scalc/01/func_sumif.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0bcda201437649d9a6cfc0c7b7875e19c511ea22
Author: Stanislav Horacek 
AuthorDate: Sun Jun 2 21:50:07 2024 +0200
Commit: Olivier Hallot 
CommitDate: Mon Jun 3 13:03:19 2024 +0200

fix SUMIF function name

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

diff --git a/source/text/scalc/01/func_sumif.xhp 
b/source/text/scalc/01/func_sumif.xhp
index 5b8ac7767f..2e92efcca9 100644
--- a/source/text/scalc/01/func_sumif.xhp
+++ b/source/text/scalc/01/func_sumif.xhp
@@ -52,7 +52,7 @@
 =SUMIF(ProductName,"pen*",Revenue)
 A named range can 
be given as the Range or SumRange parameter. For example, if the columns in the 
above table are respectively named "ProductName", "Sales", and "Revenue", the 
function returns 150. This function will only work as described if you have 
defined the names of the columns using the Define Names 
dialog.
 Reference to a cell as a criterion
-If you need to 
change a criterion easily, you may specify it in a separate cell and use a 
reference to this cell in the condition of the SUMIFS function. For 
example:
+If you need to 
change a criterion easily, you may specify it in a separate cell and use a 
reference to this cell in the condition of the SUMIF function. For 
example:
 =SUMIF(A2:A6,E2,C2:C6)
 If E2 = pen, the 
function returns 85 because the link to the cell is substituted with its 
contents.
 

core.git: helpcontent2

[Stanislav Horacek (via logerrit)]

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

New commits:
commit b3d23096e8f6e9f562a6d1f5a73922cf677870e6
Author: Stanislav Horacek 
AuthorDate: Mon Jun 3 13:03:19 2024 +0200
Commit: Gerrit Code Review 
CommitDate: Mon Jun 3 13:03:19 2024 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 0bcda201437649d9a6cfc0c7b7875e19c511ea22
  - fix SUMIF function name

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

diff --git a/helpcontent2 b/helpcontent2
index 540ea4b3f6f1..0bcda2014376 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 540ea4b3f6f10a77fc06665de7c550c1eb9df00e
+Subproject commit 0bcda201437649d9a6cfc0c7b7875e19c511ea22

core.git: solenv/gbuild

[Christian Lohmaier (via logerrit)]

 solenv/gbuild/platform/com_MSC_defs.mk |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit c2f9689cd489f44122b50d7c0d7841c47381df99
Author: Christian Lohmaier 
AuthorDate: Mon Jun 3 11:55:14 2024 +0200
Commit: Christian Lohmaier 
CommitDate: Mon Jun 3 13:08:43 2024 +0200

disable MSVC -analyse when run in CI - build time penalty is too much

times went from 55min to 88min when doing a single build

Change-Id: I9304eae9f2326c206bd571e7b8a3ef861206282f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168362
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 
Reviewed-by: Noel Grandin 

diff --git a/solenv/gbuild/platform/com_MSC_defs.mk 
b/solenv/gbuild/platform/com_MSC_defs.mk
index 506cfbe7d30a..67aa47320c6c 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -104,7 +104,8 @@ gb_AFLAGS := $(AFLAGS)
 
 # C4706: assignment within conditional expression
 
-MSVC_ANALYZE_FLAGS := -analyze:ruleset$(SRCDIR)/solenv/vs/LibreOffice.ruleset
+# build-time penalty is to high for ci use/disable when JENKINS_HOME is set
+MSVC_ANALYZE_FLAGS := $(if 
$(JENKINS_HOME),,-analyze:ruleset$(SRCDIR)/solenv/vs/LibreOffice.ruleset)
 
 gb_FilterOutClangCFLAGS += $(MSVC_ANALYZE_FLAGS)
 

core.git: sd/source

[Xisco Fauli (via logerrit)]

 sd/source/ui/app/sdmod1.cxx|   39 ++--
 sd/source/ui/dlg/LayerTabBar.cxx   |   53 +++--
 sd/source/ui/dlg/sdtreelb.cxx  |9 +-
 sd/source/ui/func/fuinsert.cxx |6 +
 sd/source/ui/inc/ViewShell.hxx |2 
 sd/source/ui/slideshow/slideshow.cxx   |8 +-
 sd/source/ui/slidesorter/controller/SlsSlotManager.cxx |   26 +---
 sd/source/ui/table/tablefunction.cxx   |   15 ++--
 sd/source/ui/view/ViewShellBase.cxx|4 -
 sd/source/ui/view/ViewShellImplementation.cxx  |   11 ++-
 sd/source/ui/view/drviews5.cxx |4 -
 sd/source/ui/view/drviews7.cxx |6 +
 sd/source/ui/view/grviewsh.cxx |4 -
 13 files changed, 118 insertions(+), 69 deletions(-)

New commits:
commit d7311b4f1ff824c74e9cef6cf12454115e5ccc0b
Author: Xisco Fauli 
AuthorDate: Fri May 31 12:31:47 2024 +0200
Commit: Xisco Fauli 
CommitDate: Mon Jun 3 13:23:22 2024 +0200

sd: use SAL_RET_MAYBENULL in GetViewFrame()

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

diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx
index 023e44a7c1e6..ea2b09e3f285 100644
--- a/sd/source/ui/app/sdmod1.cxx
+++ b/sd/source/ui/app/sdmod1.cxx
@@ -294,26 +294,27 @@ bool SdModule::OutlineToImpress(SfxRequest const & 
rRequest)
 // AutoLayouts have to be finished
 pDoc->StopWorkStartupDelay();
 
-SfxViewFrame* pViewFrame = pViewSh->GetViewFrame();
-
-// When the view frame has not been just created we have
-// to switch synchronously to the outline view.
-// (Otherwise the request will be ignored anyway.)
-::sd::ViewShellBase* pBase
-= dynamic_cast< 
::sd::ViewShellBase*>(pViewFrame->GetViewShell());
-if (pBase != nullptr)
+if (SfxViewFrame* pViewFrame = pViewSh->GetViewFrame())
 {
-std::shared_ptr pHelper (
-FrameworkHelper::Instance(*pBase));
-pHelper->RequestView(
-FrameworkHelper::msOutlineViewURL,
-FrameworkHelper::msCenterPaneURL);
-
-pHelper->RunOnResourceActivation(
-FrameworkHelper::CreateResourceId(
-FrameworkHelper::msOutlineViewURL,
-FrameworkHelper::msCenterPaneURL),
-OutlineToImpressFinalizer(*pBase, *pDoc, pBytes));
+// When the view frame has not been just created we have
+// to switch synchronously to the outline view.
+// (Otherwise the request will be ignored anyway.)
+::sd::ViewShellBase* pBase
+= dynamic_cast< 
::sd::ViewShellBase*>(pViewFrame->GetViewShell());
+if (pBase != nullptr)
+{
+std::shared_ptr pHelper (
+FrameworkHelper::Instance(*pBase));
+pHelper->RequestView(
+FrameworkHelper::msOutlineViewURL,
+FrameworkHelper::msCenterPaneURL);
+
+pHelper->RunOnResourceActivation(
+FrameworkHelper::CreateResourceId(
+FrameworkHelper::msOutlineViewURL,
+FrameworkHelper::msCenterPaneURL),
+OutlineToImpressFinalizer(*pBase, *pDoc, pBytes));
+}
 }
 }
 }
diff --git a/sd/source/ui/dlg/LayerTabBar.cxx b/sd/source/ui/dlg/LayerTabBar.cxx
index 324a9bd36ad9..aba77bd9501c 100644
--- a/sd/source/ui/dlg/LayerTabBar.cxx
+++ b/sd/source/ui/dlg/LayerTabBar.cxx
@@ -144,8 +144,11 @@ bool 
LayerTabBar::IsRealNameOfStandardLayer(std::u16string_view rName)
 
 void LayerTabBar::Select()
 {
-SfxDispatcher* pDispatcher = pDrViewSh->GetViewFrame()->GetDispatcher();
-pDispatcher->Execute(SID_SWITCHLAYER, SfxCallMode::SYNCHRON);
+if (SfxViewFrame* pFrame = pDrViewSh->GetViewFrame())
+{
+SfxDispatcher* pDispatcher = pFrame->GetDispatcher();
+pDispatcher->Execute(SID_SWITCHLAYER, SfxCallMode::SYNCHRON);
+}
 }
 
 void LayerTabBar::MouseMove(const MouseEvent &rMEvt)
@@ -244,10 +247,13 @@ void LayerTabBar::MouseButtonDown(const MouseEvent& rMEvt)
 sal_uInt16 aTabId = GetPageId( PixelToLogic(aPosPixel) );
 if (aTabId == 0)
 {
-SfxDispatcher* pDispatcher = 
pDrViewSh->GetViewFrame()->GetDispatcher();
-pDisp

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

[Eike Rathke (via logerrit)]

 sc/source/core/tool/interpr1.cxx |   22 +-
 1 file changed, 21 insertions(+), 1 deletion(-)

New commits:
commit 5af051e9e6b0f86fe471c4f040506ee9fdb91e92
Author: Eike Rathke 
AuthorDate: Fri May 31 17:34:35 2024 +0200
Commit: Xisco Fauli 
CommitDate: Mon Jun 3 13:24:12 2024 +0200

Resolves: tdf#158789 operate on query array if no extra array or range given

Also push error and bail out early if there was an error, or more
important pResultMatrix is nullptr.

Change-Id: I1094ed9d14795ea1bc3f4ff61d687cc28d0b94fb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168300
Tested-by: Jenkins
Reviewed-by: Eike Rathke 
(cherry picked from commit a523e9bf2d54fc84583c9da05af592297b055e40)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168315
Reviewed-by: Xisco Fauli 

diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index e372228721e3..c5113ba204aa 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -5575,7 +5575,8 @@ void ScInterpreter::IterateParametersIf( ScIterFuncIf 
eFunc )
 ScMatrixRef pResultMatrix = QueryMat( pQueryMatrix, aOptions);
 if (nGlobalError != FormulaError::NONE || !pResultMatrix)
 {
-SetError( FormulaError::IllegalParameter);
+PushIllegalParameter();
+return;
 }
 
 if (pSumExtraMatrix)
@@ -5599,6 +5600,25 @@ void ScInterpreter::IterateParametersIf( ScIterFuncIf 
eFunc )
 }
 }
 }
+else if (!bSumExtraRange)
+{
+for (SCCOL nCol = nCol1; nCol <= nCol2; ++nCol)
+{
+for (SCROW nRow = nRow1; nRow <= nRow2; ++nRow)
+{
+if (pResultMatrix->IsValue( nCol, nRow) &&
+pResultMatrix->GetDouble( nCol, nRow))
+{
+if (pQueryMatrix->IsValue( nCol, nRow))
+{
+fVal = pQueryMatrix->GetDouble( nCol, 
nRow);
+++fCount;
+fSum += fVal;
+}
+}
+}
+}
+}
 else
 {
 for (SCCOL nCol = nCol1; nCol <= nCol2; ++nCol)

core.git: translations

[Christian Lohmaier (via logerrit)]

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

New commits:
commit 0fc56575b69e0083d66149adeeb90662e29cdac7
Author: Christian Lohmaier 
AuthorDate: Mon Jun 3 13:51:56 2024 +0200
Commit: Gerrit Code Review 
CommitDate: Mon Jun 3 13:51:56 2024 +0200

Update git submodules

* Update translations from branch 'master'
  to fbbd7b927a869cfe63dfbf0542b967da94eef28e
  - update translations for master

and force-fix errors using pocheck

Change-Id: I49098e6b67b2b13457c5f911910aac85b0d70b5d

diff --git a/translations b/translations
index 113c6c3c2498..fbbd7b927a86 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 113c6c3c2498ffc2f99f20c088367bca1fecc50b
+Subproject commit fbbd7b927a869cfe63dfbf0542b967da94eef28e

core.git: sw/inc sw/source

[Samuel Mehrbrodt (via logerrit)]

 sw/inc/doc.hxx  |2 +-
 sw/inc/editsh.hxx   |2 +-
 sw/source/core/doc/docnum.cxx   |6 +++---
 sw/source/core/edit/ednumber.cxx|2 +-
 sw/source/uibase/shells/textsh1.cxx |4 +++-
 5 files changed, 9 insertions(+), 7 deletions(-)

New commits:
commit 00c92662a688e04c0dcec0db6c253689d662faeb
Author: Samuel Mehrbrodt 
AuthorDate: Mon Jun 3 10:59:04 2024 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Mon Jun 3 14:32:32 2024 +0200

tdf#161248 Don't duplicate bullets used in document

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

diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 461f835bc2a5..77944005ec3d 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1102,7 +1102,7 @@ public:
 const SvxNumberFormat::SvxNumPositionAndSpaceMode 
eDefaultNumberFormatPositionAndSpaceMode =
 SvxNumberFormat::LABEL_WIDTH_AND_POSITION );
 sal_uInt16 FindNumRule( std::u16string_view rName ) const;
-std::vector GetUsedBullets();
+std::set GetUsedBullets();
 SW_DLLPUBLIC SwNumRule* FindNumRulePtr( const OUString& rName ) const;
 
 // Deletion only possible if Rule is not used!
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 85eb84bca3f5..0de62a1d27de 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -578,7 +578,7 @@ public:
  text node belongs, which applies the found list style. */
 const SwNumRule * SearchNumRule(const bool bNum,
 OUString& sListId );
-std::vector GetUsedBullets();
+std::set GetUsedBullets();
 
 /** Undo.
  Maintain UndoHistory in Document.
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index c4afeac7c50f..93f29d72f1fb 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -2526,9 +2526,9 @@ sal_uInt16 SwDoc::FindNumRule( std::u16string_view rName 
) const
 return USHRT_MAX;
 }
 
-std::vector SwDoc::GetUsedBullets()
+std::set SwDoc::GetUsedBullets()
 {
-std::vector aUsedBullets;
+std::set aUsedBullets;
 for (size_t nRule = 0; nRule < mpNumRuleTable->size(); ++nRule)
 {
 for (int nLevel=0; nLevel<10; ++nLevel)
@@ -2543,7 +2543,7 @@ std::vector SwDoc::GetUsedBullets()
 sal_UCS4 cBullet = rFormat.GetBulletChar();
 OUString sBullet(&cBullet, 1);
 OUString sFontName(aFont.GetFamilyName());
-aUsedBullets.emplace_back(sBullet + sFontName);
+aUsedBullets.emplace(sBullet + sFontName);
 }
 }
 return aUsedBullets;
diff --git a/sw/source/core/edit/ednumber.cxx b/sw/source/core/edit/ednumber.cxx
index d2d2a0749043..6a60cd47dd40 100644
--- a/sw/source/core/edit/ednumber.cxx
+++ b/sw/source/core/edit/ednumber.cxx
@@ -876,7 +876,7 @@ const SwNumRule * SwEditShell::SearchNumRule( const bool 
bNum,
 sListId, GetLayout() );
 }
 
-std::vector SwEditShell::GetUsedBullets()
+std::set SwEditShell::GetUsedBullets()
 {
 return GetDoc()->GetUsedBullets();
 }
diff --git a/sw/source/uibase/shells/textsh1.cxx 
b/sw/source/uibase/shells/textsh1.cxx
index fa4de6bd9d0d..4606b6228bbc 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -2855,7 +2855,9 @@ void SwTextShell::GetState( SfxItemSet &rSet )
 break;
 case FN_BUL_GET_DOC_BULLETS:
 {
-std::vector aBullets = rSh.GetUsedBullets();
+std::set aBulletsSet = rSh.GetUsedBullets();
+std::vector aBullets;
+std::copy(aBulletsSet.begin(), aBulletsSet.end(), 
std::back_inserter(aBullets));
 SfxStringListItem aItem(FN_BUL_GET_DOC_BULLETS);
 uno::Sequence aSeq(aBullets.data(),
  
static_cast(aBullets.size()));

core.git: sw/source

[Noel Grandin (via logerrit)]

 sw/source/ui/fldui/DateFormFieldDialog.cxx |7 ++-
 sw/source/ui/fldui/DropDownFieldDialog.cxx |   12 +++---
 sw/source/ui/fldui/DropDownFormFieldDialog.cxx |   16 
 sw/source/ui/fldui/changedb.cxx|   14 +++
 sw/source/ui/fldui/flddb.cxx   |   28 +++
 sw/source/ui/fldui/flddinf.cxx |   24 ++---
 sw/source/ui/fldui/flddok.cxx  |   32 -
 sw/source/ui/fldui/fldedt.cxx  |8 ++--
 sw/source/ui/fldui/fldfunc.cxx |   46 -
 sw/source/ui/fldui/fldpage.cxx |4 +-
 sw/source/ui/fldui/fldref.cxx  |   28 +++
 sw/source/ui/fldui/fldtdlg.cxx |   40 ++---
 sw/source/ui/fldui/fldvar.cxx  |   38 ++--
 sw/source/ui/fldui/inpdlg.cxx  |   12 +++---
 sw/source/ui/fldui/javaedit.cxx|   22 +--
 15 files changed, 166 insertions(+), 165 deletions(-)

New commits:
commit d620821608a4b89d10ce4b93aa03e6e6d5d04fa8
Author: Noel Grandin 
AuthorDate: Mon Jun 3 12:08:21 2024 +0200
Commit: Noel Grandin 
CommitDate: Mon Jun 3 14:36:20 2024 +0200

loplugin:ostr in sw/.../fldui

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

diff --git a/sw/source/ui/fldui/DateFormFieldDialog.cxx 
b/sw/source/ui/fldui/DateFormFieldDialog.cxx
index 24461c47d6b2..85baf0ed62f5 100644
--- a/sw/source/ui/fldui/DateFormFieldDialog.cxx
+++ b/sw/source/ui/fldui/DateFormFieldDialog.cxx
@@ -19,11 +19,12 @@ namespace sw
 {
 DateFormFieldDialog::DateFormFieldDialog(weld::Widget* pParent,
  sw::mark::IDateFieldmark* pDateField, 
SwDoc& rDoc)
-: GenericDialogController(pParent, 
"modules/swriter/ui/dateformfielddialog.ui",
-  "DateFormFieldDialog")
+: GenericDialogController(pParent, 
u"modules/swriter/ui/dateformfielddialog.ui"_ustr,
+  u"DateFormFieldDialog"_ustr)
 , m_pDateField(pDateField)
 , m_pNumberFormatter(rDoc.GetNumberFormatter())
-, m_xFormatLB(new 
SwNumFormatTreeView(m_xBuilder->weld_tree_view("date_formats_treeview")))
+, m_xFormatLB(
+  new 
SwNumFormatTreeView(m_xBuilder->weld_tree_view(u"date_formats_treeview"_ustr)))
 {
 m_xFormatLB->SetFormatType(SvNumFormatType::DATE);
 m_xFormatLB->SetAutomaticLanguage(true);
diff --git a/sw/source/ui/fldui/DropDownFieldDialog.cxx 
b/sw/source/ui/fldui/DropDownFieldDialog.cxx
index d85bc5365bee..b5dc3e36ebea 100644
--- a/sw/source/ui/fldui/DropDownFieldDialog.cxx
+++ b/sw/source/ui/fldui/DropDownFieldDialog.cxx
@@ -29,15 +29,15 @@ using namespace ::com::sun::star;
 // edit insert-field
 sw::DropDownFieldDialog::DropDownFieldDialog(weld::Widget *pParent, SwWrtShell 
&rS,
   SwField* pField, bool bPrevButton, bool 
bNextButton)
-: GenericDialogController(pParent, 
"modules/swriter/ui/dropdownfielddialog.ui", "DropdownFieldDialog")
+: GenericDialogController(pParent, 
u"modules/swriter/ui/dropdownfielddialog.ui"_ustr, u"DropdownFieldDialog"_ustr)
 , m_rSh( rS )
 , m_pDropField(nullptr)
 , m_pPressedButton(nullptr)
-, m_xListItemsLB(m_xBuilder->weld_tree_view("list"))
-, m_xOKPB(m_xBuilder->weld_button("ok"))
-, m_xPrevPB(m_xBuilder->weld_button("prev"))
-, m_xNextPB(m_xBuilder->weld_button("next"))
-, m_xEditPB(m_xBuilder->weld_button("edit"))
+, m_xListItemsLB(m_xBuilder->weld_tree_view(u"list"_ustr))
+, m_xOKPB(m_xBuilder->weld_button(u"ok"_ustr))
+, m_xPrevPB(m_xBuilder->weld_button(u"prev"_ustr))
+, m_xNextPB(m_xBuilder->weld_button(u"next"_ustr))
+, m_xEditPB(m_xBuilder->weld_button(u"edit"_ustr))
 {
 
m_xListItemsLB->set_size_request(m_xListItemsLB->get_approximate_digit_width() 
* 24,
  m_xListItemsLB->get_height_rows(12));
diff --git a/sw/source/ui/fldui/DropDownFormFieldDialog.cxx 
b/sw/source/ui/fldui/DropDownFormFieldDialog.cxx
index a28d9f1f5fab..dab673c45da5 100644
--- a/sw/source/ui/fldui/DropDownFormFieldDialog.cxx
+++ b/sw/source/ui/fldui/DropDownFormFieldDialog.cxx
@@ -19,16 +19,16 @@ namespace sw
 {
 DropDownFormFieldDialog::DropDownFormFieldDialog(weld::Widget* pParent,
  mark::IFieldmark* 
pDropDownField)
-: GenericDialogController(pParent, 
"modules/swriter/ui/dropdownformfielddialog.ui",
-  "DropDownFormFieldDialog")
+: GenericDialogController(pParent, 
u"modules/swriter/ui/dropdownformfielddialog.ui"_ustr,
+  u"DropDownFormFieldDialog"_ustr)
 , m_pDropDownField(pDropDownField)
 , m_bListHasChanged(false)
-, m_xListItemEntry(m_xBuilder->weld_entry("i

core.git: slideshow/opengl slideshow/source

[Javiya Vivekkumar Dineshbhai (via logerrit)]

 slideshow/opengl/glitterVertexShader.glsl |1 -
 slideshow/source/engine/opengl/TransitionImpl.cxx |6 --
 2 files changed, 7 deletions(-)

New commits:
commit d5c5732ada2f9f616e26ef514676adee2245c5e5
Author: Javiya Vivekkumar Dineshbhai 
AuthorDate: Wed May 29 18:29:18 2024 +0530
Commit: Tomaž Vajngerl 
CommitDate: Mon Jun 3 15:18:08 2024 +0200

Remove unused 'numTiles' from glitter vertex shader

The 'numTiles' variable is not being used in the vertex shader. To test 
this PR, apply the Glitter transition. If it works as expected, then the change 
is successful.

Signed-off-by: Javiya Vivekkumar Dineshbhai 
Change-Id: Ia1f833e6009b1f8c774329945ba260d20b8c9f64
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168222
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/slideshow/opengl/glitterVertexShader.glsl 
b/slideshow/opengl/glitterVertexShader.glsl
index 00ae568ac672..ecf0cbb13124 100644
--- a/slideshow/opengl/glitterVertexShader.glsl
+++ b/slideshow/opengl/glitterVertexShader.glsl
@@ -25,7 +25,6 @@ varying vec3 v_normal;
 
 attribute vec3 center;
 uniform float time;
-uniform ivec2 numTiles;
 uniform sampler2D permTexture;
 varying float angle;
 
diff --git a/slideshow/source/engine/opengl/TransitionImpl.cxx 
b/slideshow/source/engine/opengl/TransitionImpl.cxx
index 758b4a7d4d73..1e9c661d6c09 100644
--- a/slideshow/source/engine/opengl/TransitionImpl.cxx
+++ b/slideshow/source/engine/opengl/TransitionImpl.cxx
@@ -1997,12 +1997,6 @@ void GlitterTransition::prepareTransition( sal_Int32 
glLeavingSlideTex, sal_Int3
 PermTextureTransition::prepareTransition( glLeavingSlideTex, 
glEnteringSlideTex, pContext );
 CHECK_GL_ERROR();
 
-GLint nNumTilesLocation = glGetUniformLocation(m_nProgramObject, 
"numTiles");
-if (nNumTilesLocation != -1) {
-glUniform2iv(nNumTilesLocation, 1, glm::value_ptr(glm::ivec2(41, 41 * 
4 / 3)));
-CHECK_GL_ERROR();
-}
-
 glGenBuffers(1, &maBuffer);
 glBindBuffer(GL_ARRAY_BUFFER, maBuffer);
 

core.git: sc/qa

[Xisco Fauli (via logerrit)]

 sc/qa/unit/data/functions/mathematical/fods/sumif.fods |   18 +
 1 file changed, 18 insertions(+)

New commits:
commit d804d6aff49054bad1719ec3c2d136b545bbc7e7
Author: Xisco Fauli 
AuthorDate: Mon Jun 3 12:49:58 2024 +0200
Commit: Xisco Fauli 
CommitDate: Mon Jun 3 15:49:54 2024 +0200

tdf#158789: sc_mathematical_functions: Add unittest

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

diff --git a/sc/qa/unit/data/functions/mathematical/fods/sumif.fods 
b/sc/qa/unit/data/functions/mathematical/fods/sumif.fods
index d51a06ec3697..b23883520260 100644
--- a/sc/qa/unit/data/functions/mathematical/fods/sumif.fods
+++ b/sc/qa/unit/data/functions/mathematical/fods/sumif.fods
@@ -2624,6 +2624,24 @@
  
  
 
+
+ 
+  60
+ 
+ 
+  60
+ 
+ 
+  TRUE
+ 
+ 
+  =SUMIF({-10;10;20;30};">0")
+ 
+ 
+ 
+ 
+ 
+
 
  
  

core.git: Branch 'distro/collabora/co-24.04' - 25 commits - download.lst formula/source i18npool/source include/svtools include/vcl readlicense_oo/license sal/textenc sc/source sd/source sfx2/source s

[Jeff Huang (via logerrit)]

 download.lst |4 
 formula/source/core/api/FormulaCompiler.cxx  |4 
 i18npool/source/nativenumber/data/numberchar.h   |2 
 include/svtools/editbrowsebox.hxx|2 
 include/vcl/weld.hxx |4 
 readlicense_oo/license/CREDITS.fodt  | 2782 +--
 sal/textenc/tcvtutf8.cxx |3 
 sc/source/core/tool/interpr4.cxx | 1036 +++
 sc/source/filter/oox/numberformatsbuffer.cxx |   16 
 sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx |4 
 sc/source/ui/app/inputwin.cxx|   19 
 sc/source/ui/condformat/condformatdlgentry.cxx   |   68 
 sc/source/ui/dialogs/searchresults.cxx   |   20 
 sc/source/ui/docshell/dbdocfun.cxx   |2 
 sc/source/ui/docshell/docfunc.cxx|8 
 sc/source/ui/miscdlgs/mvtabdlg.cxx   |   16 
 sc/source/ui/namedlg/namedefdlg.cxx  |8 
 sc/source/ui/namedlg/namedlg.cxx |4 
 sc/source/ui/undo/undodat.cxx|  129 
 sc/source/ui/undo/undotab.cxx|   47 
 sc/source/ui/view/tabvwsh4.cxx   |2 
 sd/source/ui/view/ToolBarManager.cxx |   67 
 sfx2/source/control/bindings.cxx |3 
 sfx2/source/control/dispatch.cxx |   16 
 sfx2/source/view/viewfrm.cxx |4 
 svgio/inc/svgstyleattributes.hxx |7 
 svgio/qa/cppunit/SvgImportTest.cxx   |8 
 svgio/qa/cppunit/data/contextFill.svg|8 
 svgio/source/svgreader/svgstyleattributes.cxx|   36 
 svtools/source/brwbox/ebbcontrols.cxx|6 
 svx/source/fmcomp/gridcell.cxx   |   11 
 sw/qa/extras/uiwriter/uiwriter3.cxx  |5 
 sw/source/core/draw/dcontact.cxx |   16 
 sw/source/ui/frmdlg/frmpage.cxx  |3 
 sw/source/uibase/utlui/unotools.cxx  |2 
 vcl/inc/osx/a11ywrapper.h|2 
 vcl/inc/salvtables.hxx   |2 
 vcl/osx/DataFlavorMapping.cxx|3 
 vcl/osx/a11yactionwrapper.mm |   12 
 vcl/osx/a11ycomponentwrapper.mm  |5 
 vcl/osx/a11yfactory.mm   |3 
 vcl/osx/a11yrolehelper.mm|4 
 vcl/osx/a11yselectionwrapper.mm  |   12 
 vcl/osx/a11ytextattributeswrapper.mm |   12 
 vcl/osx/a11ytextwrapper.mm   |   17 
 vcl/osx/a11ywrapper.mm   |  122 
 vcl/osx/a11ywrapperbutton.mm |2 
 vcl/osx/a11ywrappercheckbox.mm   |4 
 vcl/osx/a11ywrappercombobox.mm   |6 
 vcl/osx/a11ywrappergroup.mm  |2 
 vcl/osx/a11ywrapperlist.mm   |2 
 vcl/osx/a11ywrapperradiobutton.mm|4 
 vcl/osx/a11ywrapperradiogroup.mm |2 
 vcl/osx/a11ywrapperrow.mm|2 
 vcl/osx/a11ywrapperscrollarea.mm |2 
 vcl/osx/a11ywrapperscrollbar.mm  |2 
 vcl/osx/a11ywrappersplitter.mm   |2 
 vcl/osx/a11ywrapperstatictext.mm |2 
 vcl/osx/a11ywrappertabgroup.mm   |2 
 vcl/osx/a11ywrappertextarea.mm   |2 
 vcl/osx/a11ywrappertoolbar.mm|2 
 vcl/osx/salmenu.cxx  |1 
 vcl/qt5/QtFrame.cxx  |   12 
 vcl/source/app/salvtables.cxx|2 
 vcl/source/gdi/pdfwriter_impl.cxx|   14 
 vcl/unx/gtk3/gtkinst.cxx |   16 
 66 files changed, 2485 insertions(+), 2164 deletions(-)

New commits:
commit 44fda102b25488de1669c03798f18fc500d03cd5
Author: Jeff Huang 
AuthorDate: Mon May 27 17:34:35 2024 +0800
Commit: Andras Timar 
CommitDate: Mon Jun 3 14:33:32 2024 +0200

tdf#161288 Traditional Chinese minus character is U+8CA0(負), not U+5069(偩)

Co-authored-by: Firefly 
Change-Id: I22fe8b31aa59d08f982d2b4586471f4cc13653b9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168089
Tested-by: Jenkins
Reviewed-by: Eike Rathke 
(cherry picked from commit a3f537e13ee64c5bf3155864035c1591e7099101)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168314
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/i18npool/source/nativenumber/data/numberchar.h 
b/i18npool/source/nativenumber/data/numberchar.h
index a711e960724f..ec647b7b9ce0 100644
--- a/i18

core.git: Branch 'distro/collabora/co-24.04' - writerfilter/qa writerfilter/source

[Miklos Vajna (via logerrit)]

 writerfilter/qa/cppunittests/dmapper/DomainMapper_Impl.cxx |   23 
++
 writerfilter/qa/cppunittests/dmapper/data/clearing-break-sect-end.docx |binary
 writerfilter/source/dmapper/DomainMapper.cxx   |4 -
 writerfilter/source/dmapper/DomainMapper_Impl.cxx  |5 
++
 writerfilter/source/dmapper/DomainMapper_Impl.hxx  |3 +
 5 files changed, 33 insertions(+), 2 deletions(-)

New commits:
commit f1338ba7de2ab1abf98283f977605a9d1053b82d
Author: Miklos Vajna 
AuthorDate: Fri May 31 09:00:18 2024 +0200
Commit: Caolán McNamara 
CommitDate: Mon Jun 3 16:08:02 2024 +0200

tdf#161318 sw clearing break: fix this at section end

Regression from commit 19bca24486315cc35f873486e6a2dd18394d0614
(tdf#126287: docx import: use defered linebreak, 2022-02-07), the bugdoc
has a single paragraph in the first section, containing a clearing
break, which is lost. This leads to overlapping text as the text is
shifted up.

Seems the intention was to avoid a line break at the very end of the
document, as that can lead to an empty page with "next page" section
breaks, with non-clearing line breaks.

Fix the problem by only doing this for non-clearing line breaks: that
keeps the old use-case working, but the new, clearing line break then
shifts down the text, so no text overlap happens.

Switching from appendTextPortion() to HandleLineBreak() helps because
HandleLineBreak() does exactly appendTextPortion("
") in the
non-clearing case, but knows about the stream stack's line break clear
status.

(cherry picked from commit e00479404af5058b982c447e485af995d552e372)

Conflicts:

writerfilter/qa/cppunittests/dmapper/data/clearing-break-sect-end.docx
writerfilter/source/dmapper/DomainMapper.cxx

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

diff --git a/writerfilter/qa/cppunittests/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/qa/cppunittests/dmapper/DomainMapper_Impl.cxx
index 16aa5cbfb2df..d2388505d71d 100644
--- a/writerfilter/qa/cppunittests/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/qa/cppunittests/dmapper/DomainMapper_Impl.cxx
@@ -411,6 +411,29 @@ CPPUNIT_TEST_FIXTURE(Test, testRedlinedShapeThenSdt)
 CPPUNIT_ASSERT_EQUAL(u"ContentControl"_ustr,
  
xPortion->getPropertyValue("TextPortionType").get());
 }
+
+CPPUNIT_TEST_FIXTURE(Test, testClearingBreakSectEnd)
+{
+// Given a file with a single-paragraph section, ends with a clearing 
break:
+// When importing that document:
+loadFromFile(u"clearing-break-sect-end.docx");
+
+// Then make sure the clearing break is not lost before a cont sect break:
+uno::Reference xTextDocument(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
xParaEnumAccess(xTextDocument->getText(),
+  
uno::UNO_QUERY);
+uno::Reference xParaEnum = 
xParaEnumAccess->createEnumeration();
+uno::Reference 
xPortionEnumAccess(xParaEnum->nextElement(),
+ 
uno::UNO_QUERY);
+uno::Reference xPortionEnum = 
xPortionEnumAccess->createEnumeration();
+uno::Reference xPortion(xPortionEnum->nextElement(), 
uno::UNO_QUERY);
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected: LineBreak
+// - Actual  : Text
+// i.e. the clearing break at sect end was lost, leading to text overlap.
+CPPUNIT_ASSERT_EQUAL(u"LineBreak"_ustr,
+ 
xPortion->getPropertyValue("TextPortionType").get());
+}
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git 
a/writerfilter/qa/cppunittests/dmapper/data/clearing-break-sect-end.docx 
b/writerfilter/qa/cppunittests/dmapper/data/clearing-break-sect-end.docx
new file mode 100644
index ..5052b2dd1649
Binary files /dev/null and 
b/writerfilter/qa/cppunittests/dmapper/data/clearing-break-sect-end.docx differ
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index bfca0214a017..d206fa0b140f 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -4354,13 +4354,13 @@ void DomainMapper::lcl_utext(const sal_Unicode *const 
data_, size_t len)
 else if (len == 1 && sText[0] == ' ')
 {
 // Clear "last" one linebreak at end of section
-if (m_pImpl->GetIsLastParagraphInSection() && 
m_pImpl->isBreakDeferred(LINE_BREAK))
+if (m_pImpl->GetIsLastParagraphInSection() && 
m_pImpl->isBreakDeferred(LINE_BREAK) && !m_pImpl->HasLineBreakClear())
 m_pImpl->clearDeferredBreak(LINE_BREAK);
 // And emit a

core.git: Branch 'libreoffice-24-2' - 2 commits - desktop/source external/onlineupdate

[Stephan Bergmann (via logerrit)]

 desktop/source/app/updater.cxx |   14 --
 desktop/source/app/updater.hxx |1 -
 external/onlineupdate/lo.patch |8 +++-
 3 files changed, 11 insertions(+), 12 deletions(-)

New commits:
commit 44d8490f615cd6c56a1336d6d4da10219f572ccb
Author: Stephan Bergmann 
AuthorDate: Thu May 30 13:44:49 2024 +0200
Commit: Christian Lohmaier 
CommitDate: Mon Jun 3 16:32:59 2024 +0200

Make sure updates dir exists when writing updating.log

Change-Id: Ib652fedde970d01b701ad4b61e75028cd43974f6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168258
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit 48190a8f3783135c65538977cd38f34ba733f071)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168297
Reviewed-by: Christian Lohmaier 

diff --git a/desktop/source/app/updater.cxx b/desktop/source/app/updater.cxx
index 12bb4969a68c..aed765d6eb3d 100644
--- a/desktop/source/app/updater.cxx
+++ b/desktop/source/app/updater.cxx
@@ -803,14 +803,6 @@ void update_checker()
 }
 }
 
-OUString Updater::getUpdateInfoLog()
-{
-OUString aUpdateInfoURL("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" 
SAL_CONFIGFILE("bootstrap") ":UserInstallation}/updates/updating.log");
-rtl::Bootstrap::expandMacros(aUpdateInfoURL);
-
-return aUpdateInfoURL;
-}
-
 OUString Updater::getPatchDirURL()
 {
 OUString aPatchDirURL("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" 
SAL_CONFIGFILE("bootstrap") ":UserInstallation}/updates/0/");
@@ -843,8 +835,10 @@ OUString Updater::getExecutableDirURL()
 void Updater::log(const OUString& rMessage)
 {
 SAL_INFO("desktop.updater", rMessage);
-OUString aUpdateLog = getUpdateInfoLog();
-SvFileStream aLog(aUpdateLog, StreamMode::STD_READWRITE);
+OUString dir("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" 
SAL_CONFIGFILE("bootstrap") ":UserInstallation}/updates");
+rtl::Bootstrap::expandMacros(dir);
+osl::Directory::create(dir);
+SvFileStream aLog(dir + "/updating.log", StreamMode::STD_READWRITE);
 aLog.Seek(aLog.Tell() + aLog.remainingSize()); // make sure we are at the 
end
 aLog.WriteLine(OUStringToOString(rMessage, RTL_TEXTENCODING_UTF8));
 }
diff --git a/desktop/source/app/updater.hxx b/desktop/source/app/updater.hxx
index 7f1ea920fbe9..8989f1f684a0 100644
--- a/desktop/source/app/updater.hxx
+++ b/desktop/source/app/updater.hxx
@@ -18,7 +18,6 @@ void update_checker();
 class Updater
 {
 public:
-static OUString getUpdateInfoLog();
 static OUString getPatchDirURL();
 static OUString getUpdateFileURL();
 static OUString getExecutableDirURL();
commit f7bd624cf1f2ad51a5f7d0edf23a1f19a9063823
Author: Stephan Bergmann 
AuthorDate: Fri May 31 10:35:06 2024 +0200
Commit: Christian Lohmaier 
CommitDate: Mon Jun 3 16:32:52 2024 +0200

tdf#161292: Fix create-partial-info for newly added files

084c64982ef6187292fd73e6deaa4448e0b6f3de "Create MAR updates from msi rather
than from archive" had patched make_add_instruction (in
workdir/UnpackedTarball/onlineupdate/tools/update-packagin/common.sh) to
unconditionally use add-if (with the file itself as test file) rather than 
plain
add (because we can't reuse Mozilla's extension logic there to determine
optional installation parts), and it noted in its commit message that 
"addition
of files will cause a MAR update to miss them".

Which turned out to be a problem with

,
updating from 24.2.2.1 with instdir/program/python-core-3.8.18/ to 24.2.2.2 
with
instdir/program/python-core-3.8.19/:  All the files in python-core-3.8.19 
were
recorded as add-if testing on themselves, so were never added.

So a better approach is, for newly added files to make them add (so they get
added unconditionally, even if they are part of some optional component that
happens to not be installed; this hopefully won't cause further issues) 
instead
of add-if.  (Existing files that are added instead of patched still use 
add-if,
though.)  This does not address the create-update-info target for full mar
updates (which is not used currently?), just the create-partial-info target.

(The existing calls to make_add_instruction in the upstream Mozilla code 
already
have a seemingly rotten mix of two-argument calls and calls with three 
arguments
where the third argument is ignored, and would check for a fourth "forced"
argument but which is never passed in.  So avoid extending that mess 
further,
and just replace this never-use-add-if call to make_add_instruction directly
with that function's (accordingly tweaked) body.)

Change-Id: Ib596f3aa72c3ab9f896b20f7d623bc574eb15fd8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168285
Reviewed-by: Stephan Be

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

[Stephan Bergmann (via logerrit)]

 desktop/source/app/updater.cxx |   34 +-
 desktop/source/app/updater.hxx |2 --
 2 files changed, 9 insertions(+), 27 deletions(-)

New commits:
commit aff07e946a08608a96fcc853152d0e57b7a00e8e
Author: Stephan Bergmann 
AuthorDate: Thu May 30 13:36:49 2024 +0200
Commit: Christian Lohmaier 
CommitDate: Mon Jun 3 16:33:36 2024 +0200

Consolidate on a single Updater::log overload

Change-Id: Id812788f30ac4a327d450255cfe19181c69ae81e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168257
Reviewed-by: Stephan Bergmann 
Tested-by: Jenkins
(cherry picked from commit 253bd05e95ae5093e61a4685a9d28f31edc6f585)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168296
Reviewed-by: Christian Lohmaier 

diff --git a/desktop/source/app/updater.cxx b/desktop/source/app/updater.cxx
index aed765d6eb3d..d60c006f6b6f 100644
--- a/desktop/source/app/updater.cxx
+++ b/desktop/source/app/updater.cxx
@@ -29,7 +29,9 @@
 #include 
 #include 
 #include 
+#include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -553,7 +555,7 @@ size_t WriteCallbackFile(void *ptr, size_t size,
 
 std::string download_content(const OString& rURL, bool bFile, OUString& rHash)
 {
-Updater::log("Download: " + rURL);
+Updater::log("Download: " + OStringToOUString(rURL, 
osl_getThreadTextEncoding()));
 std::unique_ptr> curl(
 curl_easy_init(), [](CURL * p) { curl_easy_cleanup(p); });
 
@@ -729,7 +731,7 @@ void update_checker()
 OUString aDownloadCheckURL = aDownloadCheckBaseURL + "update/check/1/" + 
aProductName +
 "/" + aBuildID + "/" + aBuildTarget + "/" + aChannel;
 OString aURL = OUStringToOString(aDownloadCheckURL, RTL_TEXTENCODING_UTF8);
-Updater::log("Update check: " + aURL);
+Updater::log("Update check: " + OStringToOUString(aURL, 
osl_getThreadTextEncoding()));
 
 try
 {
@@ -779,27 +781,27 @@ void update_checker()
 catch (const invalid_update_info&)
 {
 SAL_WARN("desktop.updater", "invalid update information");
-Updater::log(OString("warning: invalid update info"));
+Updater::log("warning: invalid update info");
 }
 catch (const error_updater& e)
 {
 SAL_WARN("desktop.updater", "error during the update check: " << 
e.what());
-Updater::log(OString("warning: error by the updater") + e.what());
+Updater::log("warning: error by the updater" + 
o3tl::runtimeToOUString(e.what()));
 }
 catch (const invalid_size& e)
 {
 SAL_WARN("desktop.updater", e.what());
-Updater::log(OString("warning: invalid size"));
+Updater::log("warning: invalid size");
 }
 catch (const invalid_hash& e)
 {
 SAL_WARN("desktop.updater", e.what());
-Updater::log(OString("warning: invalid hash"));
+Updater::log("warning: invalid hash");
 }
 catch (...)
 {
 SAL_WARN("desktop.updater", "unknown error during the update check");
-Updater::log(OString("warning: unknown exception"));
+Updater::log("warning: unknown exception");
 }
 }
 
@@ -843,24 +845,6 @@ void Updater::log(const OUString& rMessage)
 aLog.WriteLine(OUStringToOString(rMessage, RTL_TEXTENCODING_UTF8));
 }
 
-void Updater::log(const OString& rMessage)
-{
-SAL_INFO("desktop.updater", rMessage);
-OUString aUpdateLog = getUpdateInfoLog();
-SvFileStream aLog(aUpdateLog, StreamMode::STD_READWRITE);
-aLog.Seek(aLog.Tell() + aLog.remainingSize()); // make sure we are at the 
end
-aLog.WriteLine(rMessage);
-}
-
-void Updater::log(const char* pMessage)
-{
-SAL_INFO("desktop.updater", pMessage);
-OUString aUpdateLog = getUpdateInfoLog();
-SvFileStream aLog(aUpdateLog, StreamMode::STD_READWRITE);
-aLog.Seek(aLog.Tell() + aLog.remainingSize()); // make sure we are at the 
end
-aLog.WriteOString(pMessage);
-}
-
 OUString Updater::getBuildID()
 {
 OUString aBuildID("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" 
SAL_CONFIGFILE("version") ":buildid}");
diff --git a/desktop/source/app/updater.hxx b/desktop/source/app/updater.hxx
index 8989f1f684a0..3fc767748094 100644
--- a/desktop/source/app/updater.hxx
+++ b/desktop/source/app/updater.hxx
@@ -27,8 +27,6 @@ public:
 static OUString getUpdateChannel();
 
 static void log(const OUString& rMessage);
-static void log(const OString& rMessage);
-static void log(const char* pMessage);
 
 static void removeUpdateFiles();
 };

core.git: sc/qa

[Xisco Fauli (via logerrit)]

 sc/qa/unit/data/xlsx/tdf161301.xlsx |binary
 sc/qa/unit/subsequent_filters_test2.cxx |   13 +
 2 files changed, 13 insertions(+)

New commits:
commit 04954ffee19bb2357dca69f929ac660f99d80f16
Author: Xisco Fauli 
AuthorDate: Mon Jun 3 15:26:12 2024 +0200
Commit: Xisco Fauli 
CommitDate: Mon Jun 3 17:14:02 2024 +0200

tdf#161301: sc_subsequent_filters_test2: Add unittest

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

diff --git a/sc/qa/unit/data/xlsx/tdf161301.xlsx 
b/sc/qa/unit/data/xlsx/tdf161301.xlsx
new file mode 100644
index ..599248390352
Binary files /dev/null and b/sc/qa/unit/data/xlsx/tdf161301.xlsx differ
diff --git a/sc/qa/unit/subsequent_filters_test2.cxx 
b/sc/qa/unit/subsequent_filters_test2.cxx
index 4968ef61ae59..74eea5b91efa 100644
--- a/sc/qa/unit/subsequent_filters_test2.cxx
+++ b/sc/qa/unit/subsequent_filters_test2.cxx
@@ -249,6 +249,19 @@ CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testTdf153767)
 CPPUNIT_ASSERT_EQUAL(u"FALSE"_ustr, pDoc->GetString(ScAddress(7, 2, 0)));
 }
 
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testTdf161301)
+{
+createScDoc("xlsx/tdf161301.xlsx");
+
+ScDocument* pDoc = getScDoc();
+
+// Without the fix in place, this test would have failed with
+// - Expected: CE784年2月20日
+// - Actual  : 45440
+CPPUNIT_ASSERT_EQUAL(u"CE784年2月20日"_ustr, pDoc->GetString(ScAddress(1, 0, 
0)));
+CPPUNIT_ASSERT_EQUAL(u"CE784年2月20日"_ustr, pDoc->GetString(ScAddress(1, 1, 
0)));
+}
+
 CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testTdf124454)
 {
 createScDoc("ods/tdf124454.ods");

dictionaries.git: Branch 'distro/collabora/co-24.04' - 2 commits - en/changelog.txt en/description.xml en/en_GB.aff en/en_GB.dic en/English.png en/en_ZA.aff en/package-description.txt en/README_en_GB.

[Marco A.G.Pinto (via logerrit)]

 en/English.png |binary
 en/README_en_GB.txt|4 
 en/README_en_ZA.txt|   38 
 en/changelog.txt   |   30 
 en/description.xml |2 
 en/en_GB.aff   |5 
 en/en_GB.dic   | 1267 
 en/en_ZA.aff   |   60 
 en/package-description.txt |4 
 uk_UA/description.xml  |2 
 uk_UA/uk_UA.aff| 2459 
 uk_UA/uk_UA.dic|142223 
+++--
 12 files changed, 75609 insertions(+), 70485 deletions(-)

New commits:
commit 08a2fe2451477d8d08ad2879ed1184a6dce468c5
Author: Marco A.G.Pinto 
AuthorDate: Fri May 3 06:11:46 2024 +0100
Commit: Andras Timar 
CommitDate: Mon Jun 3 17:28:30 2024 +0200

Updated the English dictionaries: GB+ZA (2024.05.01)

Change-Id: Ie9586a0ff5a823893e059c0190f9239548448173
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/167028
Reviewed-by: Aron Budea 
Tested-by: Aron Budea 
(cherry picked from commit 7272a82714ca91947b4573c09bce4938861a9877)
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/167819
Tested-by: Xisco Fauli 
Reviewed-by: Xisco Fauli 

diff --git a/en/English.png b/en/English.png
index 13ec15f..39f406b 100644
Binary files a/en/English.png and b/en/English.png differ
diff --git a/en/README_en_GB.txt b/en/README_en_GB.txt
index 821acd0..7dd301e 100644
--- a/en/README_en_GB.txt
+++ b/en/README_en_GB.txt
@@ -196,6 +196,10 @@ OOo Issue 63541 — remove *dessicated
 
 2023-10-26:
— Improved flag “J”, increasing the wordlist in 70 valid words.
+
+2024-04-02:
+   — Improved flag “S”, increasing the wordlist in 13 valid words.
+
 ---
 
 MARCO A.G.PINTO:
diff --git a/en/README_en_ZA.txt b/en/README_en_ZA.txt
index 436b56e..144797c 100644
--- a/en/README_en_ZA.txt
+++ b/en/README_en_ZA.txt
@@ -1,3 +1,41 @@
+Since 2021 that the ZA dictionary has been improved/fixed by Marco A.G.Pinto.
+
+2010-03-09 (nemeth AT OOo)
+   - UTF-8 encoded dictionary:
+   - fix em-dash problem of OOo 3.2 by BREAK
+   - suggesting words with typographical apostrophes
+   - recognizing words with Unicode f ligatures
+   - add phonetic suggestion (Copyright (C) 2000 Björn Jacke, see the 
end of the file)
+
+2021-02-15 (Marco A.G.Pinto)
+   - Fixed: concious + conciousness.
+
+2022-07-12 (Marco A.G.Pinto)
+   - Fixed: “!” flag at start of words;
+   - Removed duplicate words;
+   - Sorted alphabetically the dictionary.
+
+2023-01-01 (Marco A.G.Pinto)
+   - Added the: ICONV ’ ';
+   - Sorted alphabetically the tags of the .aff.
+
+2023-01-17 (Marco A.G.Pinto)
+   - Added: Czechia + Czechia's.
+
+2023-01-26 (Marco A.G.Pinto)
+   - Fixed/improved: flag “3”.
+
+2024-01-29 (Marco A.G.Pinto)
+   - Fix: Removed the: ICONV ’ ' because it was already at the end of 
the .aff;
+   - Fix: apostrophe handling, by adding: WORDCHARS 0123456789’ to the 
.aff;
+   - Improved flag “J” adding 424 words.
+
+2024-04-02 (Marco A.G.Pinto)
+   - Improved flag “S” adding 9 words (possessives).
+   - Improved flag “N” adding 1114 words (possessives).
+
+---
+
 MySpell English (South African) Spellchecker
 
 
diff --git a/en/changelog.txt b/en/changelog.txt
index 7873374..3844ae3 100644
--- a/en/changelog.txt
+++ b/en/changelog.txt
@@ -1,3 +1,33 @@
+MAGP 2024-05-01
+
+Updated the Dictionaries:
+- British (Marco A.G.Pinto)*
+  * British has 204 new words(1) (2024-05-01).
+(1) Added tons of plurals and possessives.
+- ZA
+  * Improved flag “S” adding 9 words (possessives).
+  * Improved flag “N” adding 1114 words (possessives).
+
+
+
+MAGP 2024-04-01
+
+Updated the Dictionaries:
+- British (Marco A.G.Pinto)*
+  * British has 191 new words(1) (2024-04-01).
+(1) Added tons of plurals and possessives.
+
+
+
+MAGP 2024-03-01
+
+Updated the Dictionaries:
+- British (Marco A.G.Pinto)*
+  * British has 199 new words(1) (2024-03-01).
+(1) Added tons of plurals and possessives.
+
+
+
 MAGP 2024-02-01
 
 Updated the Dictionaries:
diff --git a/en/description.xml b/en/description.xml
index 8a514f2..a9c5921 100644
--- a/en/description.xml
+++ b/en/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";>
-
+
 
 
 English spelling dictionaries, hyphenation rules, 
thesaurus, and grammar checker
diff --git a/en/en_GB.aff b/en/en_GB.aff
index c0b778d..8816fec 100644
--- a/en/en_GB.aff
+++ b/en/en_GB.aff
@@ -14,7 +14,7 @@
 #   3) Plurals.
 #
 # David Bartlett, Andrew Brown, Marco A.G.Pinto.
-# V 3.2.9, 2024-02-01
+# V 3.3.2, 2024-05-01
 
 SET UTF-8
 
@@ -714,7 +714,7 @@ SFX r 0 lers [^aeio][aeiou]l
 SFX r 0 r e 
 SFX r 0 r's e 
 SFX r 0 rs e 
-SFX S Y 9
+SFX S 

core.git: Branch 'distro/collabora/co-24.04' - dictionaries

[Marco A.G.Pinto (via logerrit)]

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

New commits:
commit 140b59d37f8e8efead4bc06b451577d1c989909e
Author: Marco A.G.Pinto 
AuthorDate: Mon Jun 3 16:28:49 2024 +0100
Commit: Gerrit Code Review 
CommitDate: Mon Jun 3 17:28:49 2024 +0200

Update git submodules

* Update dictionaries from branch 'distro/collabora/co-24.04'
  to 08a2fe2451477d8d08ad2879ed1184a6dce468c5
  - Updated the English dictionaries: GB+ZA (2024.05.01)

Change-Id: Ie9586a0ff5a823893e059c0190f9239548448173
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/167028
Reviewed-by: Aron Budea 
Tested-by: Aron Budea 
(cherry picked from commit 7272a82714ca91947b4573c09bce4938861a9877)
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/167819
Tested-by: Xisco Fauli 
Reviewed-by: Xisco Fauli 

  - 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 12518d47..08a2fe245147 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 12518d479bc574492d6da740e9176649725c
+Subproject commit 08a2fe2451477d8d08ad2879ed1184a6dce468c5

help.git: Branch 'distro/collabora/co-24.04' - source/text

[Taichi Haradaguchi (via logerrit)]

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

New commits:
commit 27f62cdb52fe23f6090a3249fcd1433777b2598d
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sat May 25 17:43:02 2024 +0200
Commit: Andras Timar 
CommitDate: Mon Jun 3 17:29:13 2024 +0200

Fix bad links in help page

...after commit 2dea31ccc46cfbc44fed1c3348ed57f9b3344a7a
"tdf#155876 UI cmds Calc-Insert menu (18)"

Change-Id: I63130ed5a60defa8b917d1ffe24d3223eeab1002
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/168053
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/source/text/scalc/01/0212.xhp 
b/source/text/scalc/01/0212.xhp
index e8e06a7171..4ea8b53270 100644
--- a/source/text/scalc/01/0212.xhp
+++ b/source/text/scalc/01/0212.xhp
@@ -32,9 +32,9 @@
 
 The 
Headers/Footers dialog contains the tabs for defining headers and 
footers. There will be separate tabs for the left and right page headers and 
footers if the Same content left/right option was not marked in 
the Page Style 
dialog.
 
-
+
 
-
+
 
 
 

core.git: Branch 'distro/collabora/co-24.04' - helpcontent2

[Taichi Haradaguchi (via logerrit)]

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

New commits:
commit 55ba5fccbafdc9bbd6cc92116e8244671acbe949
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Mon Jun 3 17:29:40 2024 +0200
Commit: Gerrit Code Review 
CommitDate: Mon Jun 3 17:29:40 2024 +0200

Update git submodules

* Update helpcontent2 from branch 'distro/collabora/co-24.04'
  to 27f62cdb52fe23f6090a3249fcd1433777b2598d
  - Fix bad links in help page

...after commit 2dea31ccc46cfbc44fed1c3348ed57f9b3344a7a
"tdf#155876 UI cmds Calc-Insert menu (18)"

Change-Id: I63130ed5a60defa8b917d1ffe24d3223eeab1002
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/168053
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/helpcontent2 b/helpcontent2
index 7fb7d1daa6a6..27f62cdb52fe 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 7fb7d1daa6a67905417d701f0f85560b8644e80e
+Subproject commit 27f62cdb52fe23f6090a3249fcd1433777b2598d

core.git: Branch 'distro/collabora/co-24.04' - translations

[Christian Lohmaier (via logerrit)]

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

New commits:
commit ea5fdd799fdcbe20d218873e44b8dc95ab6d305a
Author: Christian Lohmaier 
AuthorDate: Mon Jun 3 17:31:44 2024 +0200
Commit: Gerrit Code Review 
CommitDate: Mon Jun 3 17:31:44 2024 +0200

Update git submodules

* Update translations from branch 'distro/collabora/co-24.04'
  to eb9a6b26a36adfac6235cbd2852e5e7abeda54a3
  - update translations for 24.2.4 rc2

and force-fix errors using pocheck

Change-Id: I72d7d0cfe6d2cf73e9d77b235e568607dc2e64ac

  - update translations for 24.2.4 rc1

and force-fix errors using pocheck

Change-Id: I33b8c9512615cb5d058159e40785d20255b645df

  - update translations for 24.2.3 rc2

and force-fix errors using pocheck

Change-Id: Ia1b6ca2a6abad23632aafb021c8bba19a20e1a7b

diff --git a/translations b/translations
index d835b3bec673..eb9a6b26a36a 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit d835b3bec673fcb88a3e9c4aed8067ec0e838773
+Subproject commit eb9a6b26a36adfac6235cbd2852e5e7abeda54a3

core.git: Branch 'distro/collabora/co-24.04' - 4 commits - desktop/source external/onlineupdate sc/source

[Stephan Bergmann (via logerrit)]

 desktop/source/app/updater.cxx   |   48 ++-
 desktop/source/app/updater.hxx   |3 --
 external/onlineupdate/lo.patch   |8 +-
 sc/source/core/tool/interpr1.cxx |   22 +
 4 files changed, 41 insertions(+), 40 deletions(-)

New commits:
commit 0ed516d3a5e018b873a711cdffa187d6bfb3f1d6
Author: Stephan Bergmann 
AuthorDate: Thu May 30 13:36:49 2024 +0200
Commit: Andras Timar 
CommitDate: Mon Jun 3 17:36:49 2024 +0200

Consolidate on a single Updater::log overload

Change-Id: Id812788f30ac4a327d450255cfe19181c69ae81e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168257
Reviewed-by: Stephan Bergmann 
Tested-by: Jenkins
(cherry picked from commit 253bd05e95ae5093e61a4685a9d28f31edc6f585)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168296
Reviewed-by: Christian Lohmaier 

diff --git a/desktop/source/app/updater.cxx b/desktop/source/app/updater.cxx
index aed765d6eb3d..d60c006f6b6f 100644
--- a/desktop/source/app/updater.cxx
+++ b/desktop/source/app/updater.cxx
@@ -29,7 +29,9 @@
 #include 
 #include 
 #include 
+#include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -553,7 +555,7 @@ size_t WriteCallbackFile(void *ptr, size_t size,
 
 std::string download_content(const OString& rURL, bool bFile, OUString& rHash)
 {
-Updater::log("Download: " + rURL);
+Updater::log("Download: " + OStringToOUString(rURL, 
osl_getThreadTextEncoding()));
 std::unique_ptr> curl(
 curl_easy_init(), [](CURL * p) { curl_easy_cleanup(p); });
 
@@ -729,7 +731,7 @@ void update_checker()
 OUString aDownloadCheckURL = aDownloadCheckBaseURL + "update/check/1/" + 
aProductName +
 "/" + aBuildID + "/" + aBuildTarget + "/" + aChannel;
 OString aURL = OUStringToOString(aDownloadCheckURL, RTL_TEXTENCODING_UTF8);
-Updater::log("Update check: " + aURL);
+Updater::log("Update check: " + OStringToOUString(aURL, 
osl_getThreadTextEncoding()));
 
 try
 {
@@ -779,27 +781,27 @@ void update_checker()
 catch (const invalid_update_info&)
 {
 SAL_WARN("desktop.updater", "invalid update information");
-Updater::log(OString("warning: invalid update info"));
+Updater::log("warning: invalid update info");
 }
 catch (const error_updater& e)
 {
 SAL_WARN("desktop.updater", "error during the update check: " << 
e.what());
-Updater::log(OString("warning: error by the updater") + e.what());
+Updater::log("warning: error by the updater" + 
o3tl::runtimeToOUString(e.what()));
 }
 catch (const invalid_size& e)
 {
 SAL_WARN("desktop.updater", e.what());
-Updater::log(OString("warning: invalid size"));
+Updater::log("warning: invalid size");
 }
 catch (const invalid_hash& e)
 {
 SAL_WARN("desktop.updater", e.what());
-Updater::log(OString("warning: invalid hash"));
+Updater::log("warning: invalid hash");
 }
 catch (...)
 {
 SAL_WARN("desktop.updater", "unknown error during the update check");
-Updater::log(OString("warning: unknown exception"));
+Updater::log("warning: unknown exception");
 }
 }
 
@@ -843,24 +845,6 @@ void Updater::log(const OUString& rMessage)
 aLog.WriteLine(OUStringToOString(rMessage, RTL_TEXTENCODING_UTF8));
 }
 
-void Updater::log(const OString& rMessage)
-{
-SAL_INFO("desktop.updater", rMessage);
-OUString aUpdateLog = getUpdateInfoLog();
-SvFileStream aLog(aUpdateLog, StreamMode::STD_READWRITE);
-aLog.Seek(aLog.Tell() + aLog.remainingSize()); // make sure we are at the 
end
-aLog.WriteLine(rMessage);
-}
-
-void Updater::log(const char* pMessage)
-{
-SAL_INFO("desktop.updater", pMessage);
-OUString aUpdateLog = getUpdateInfoLog();
-SvFileStream aLog(aUpdateLog, StreamMode::STD_READWRITE);
-aLog.Seek(aLog.Tell() + aLog.remainingSize()); // make sure we are at the 
end
-aLog.WriteOString(pMessage);
-}
-
 OUString Updater::getBuildID()
 {
 OUString aBuildID("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" 
SAL_CONFIGFILE("version") ":buildid}");
diff --git a/desktop/source/app/updater.hxx b/desktop/source/app/updater.hxx
index 8989f1f684a0..3fc767748094 100644
--- a/desktop/source/app/updater.hxx
+++ b/desktop/source/app/updater.hxx
@@ -27,8 +27,6 @@ public:
 static OUString getUpdateChannel();
 
 static void log(const OUString& rMessage);
-static void log(const OString& rMessage);
-static void log(const char* pMessage);
 
 static void removeUpdateFiles();
 };
commit d422233304c18af143c1d8cb861767a96742f06d
Author: Stephan Bergmann 
AuthorDate: Thu May 30 13:44:49 2024 +0200
Commit: Andras Timar 
CommitDate: Mon Jun 3 17:36:49 2024 +0200

Make sure updates dir exists when writing updating.log

Change-Id: Ib652fedde970d01b701ad4b61e75028cd43974f6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168258
Tested-

core.git: Branch 'distro/collabora/co-24.04' - sc/source

[Armin Le Grand (allotropia) (via logerrit)]

 sc/source/ui/inc/output.hxx   |1 +
 sc/source/ui/view/output.cxx  |1 +
 sc/source/ui/view/output3.cxx |8 +++-
 3 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 9fd2a690267d4502a4be45b76d9bc136abd6feb4
Author: Armin Le Grand (allotropia) 
AuthorDate: Tue Apr 16 16:26:07 2024 +0200
Commit: Andras Timar 
CommitDate: Mon Jun 3 17:37:26 2024 +0200

tdf#160589: compare the correct OutDev with PageWindows

Change-Id: I29d9c60cac04536bb2d5ad2ed1c086c8e67a9f20
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166151
Tested-by: Jenkins
Reviewed-by: Armin Le Grand 
(cherry picked from commit 1e1a3825d76ed8071424e8e21bbda23464c10fff)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168317
Reviewed-by: Xisco Fauli 

diff --git a/sc/source/ui/inc/output.hxx b/sc/source/ui/inc/output.hxx
index e4763767b7f5..18d4aa1f2bbc 100644
--- a/sc/source/ui/inc/output.hxx
+++ b/sc/source/ui/inc/output.hxx
@@ -175,6 +175,7 @@ private:
 void adjustForHyperlinkInPDF(Point aURLStart, const OutputDevice* 
pDev);
 };
 
+VclPtr mpOriginalTargetDevice; // 'unpatched' TargetDevice
 VclPtr mpDev;// Device
 VclPtr mpRefDevice;  // printer if used for preview
 VclPtr pFmtDevice;   // reference for text formatting
diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx
index 9d0fe1430550..6f01dc052fa4 100644
--- a/sc/source/ui/view/output.cxx
+++ b/sc/source/ui/view/output.cxx
@@ -144,6 +144,7 @@ ScOutputData::ScOutputData( OutputDevice* pNewDev, 
ScOutputType eNewType,
 SCCOL nNewX1, SCROW nNewY1, SCCOL nNewX2, SCROW 
nNewY2,
 double nPixelPerTwipsX, double nPixelPerTwipsY,
 const Fraction* pZoomX, const Fraction* pZoomY ) :
+mpOriginalTargetDevice( pNewDev ),
 mpDev( pNewDev ),
 mpRefDevice( pNewDev ),  // default is output device
 pFmtDevice( pNewDev ),  // default is output device
diff --git a/sc/source/ui/view/output3.cxx b/sc/source/ui/view/output3.cxx
index bc6efec65400..760a62a12d1d 100644
--- a/sc/source/ui/view/output3.cxx
+++ b/sc/source/ui/view/output3.cxx
@@ -206,7 +206,13 @@ void ScOutputData::DrawSelectiveObjects(SdrLayerID nLayer)
 
 if(pPageView)
 {
-if (nullptr != pPageView->FindPageWindow(*mpDev))
+// tdf#160589 need to check for registered PaintWindow using 
the
+// 'original' TragetDevice, mpDev might have been changed by a
+// call to ::SetContentDevice. That again might patch in a
+// pre-render device fetched from 
SdrPaintWindow::GetTargetOutputDevice
+// and thus the test if target is aregistered PageWindow would 
fail
+assert(nullptr != mpOriginalTargetDevice && 
"mpOriginalTargetDevice *must* be set when constructing ScOutputData (!)");
+if (nullptr != 
pPageView->FindPageWindow(*mpOriginalTargetDevice))
 {
 // Target OutputDevice is registered for this view
 // (as it should be), we can just render

core.git: officecfg/registry sw/inc sw/source

[Miklos Vajna (via logerrit)]

 officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs |6 
 sw/inc/strings.hrc|3 +-
 sw/inc/viewsh.hxx |2 +
 sw/source/core/doc/DocumentSettingManager.cxx |1 
 sw/source/core/view/viewsh.cxx|   14 
++
 sw/source/ui/config/optcomp.cxx   |6 
 6 files changed, 31 insertions(+), 1 deletion(-)

New commits:
commit b79b50c8f06a5c977451995b2d632e5738d7d335
Author: Miklos Vajna 
AuthorDate: Mon Jun 3 17:01:20 2024 +0200
Commit: Miklos Vajna 
CommitDate: Mon Jun 3 18:34:02 2024 +0200

tdf#160984 sw continuous endnotes: add enable/disable option UI

Doing this via a macro was possible already, but that didn't invalidate
the endnote positions on the layout, so required a document reload,
which was ugly.

Implement the new SwViewShell::SetContinuousEndnotes() by removing the
endnote frames in the document, so they'll be re-created at the expected
place as the layout action ends.

Change-Id: If96e70ab29c5a6c95fce36775e9a9a61277fc8a1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168383
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins

diff --git a/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs
index 9bc722106070..c1fc01658ad3 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs
@@ -158,6 +158,12 @@
 
 false
   
+  
+
+  Render endnotes at the end of the document inline, rather than 
on a separate page
+
+false
+  
 
   
   
diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
index 6a36f4740926..298b861eecf6 100644
--- a/sw/inc/strings.hrc
+++ b/sw/inc/strings.hrc
@@ -1492,7 +1492,8 @@
 #define STR_COMPAT_OPT_NOGAPAFTERNOTENUMBER 
NC_("STR_COMPAT_OPT_NOGAPAFTERNOTENUMBER", "Do not add an extra space after 
number in footnotes / endnotes with hanging first line")
 #define STR_COMPAT_OPT_TABSRELATIVETOINDENT 
NC_("STR_COMPAT_OPT_TABSRELATIVETOINDENT", "Set tabstops relative to indent of 
paragraph")
 #define STR_COMPAT_OPT_TABOVERMARGIN
NC_("STR_COMPAT_OPT_TABOVERMARGIN", "Allow tabs to extend beyond the right 
margin")
-#define STR_COMPAT_OPT_DO_NOT_MIRROR_RTL_DRAW_OBJS 
NC_("DO_NOT_MIRROR_RTL_DRAW_OBJS", "Do not mirror drawing objects anchored in 
paragraphs with an RTL writing direction")
+#define STR_COMPAT_OPT_DO_NOT_MIRROR_RTL_DRAW_OBJS 
NC_("STR_COMPAT_OPT_DO_NOT_MIRROR_RTL_DRAW_OBJS", "Do not mirror drawing 
objects anchored in paragraphs with an RTL writing direction")
+#define STR_COMPAT_OPT_CONTINUOUS_ENDNOTES 
NC_("STR_COMPAT_OPT_CONTINUOUS_ENDNOTES", "Render endnotes at the end of 
document inline, rather than on a separate page")
 
 #define STR_TABLE_PANEL_ALIGN_AUTO  
NC_("sidebartableedit|alignautolabel", "Automatic")
 #define STR_TABLE_PANEL_ALIGN_LEFT  
NC_("sidebartableedit|alignleftlabel", "Left")
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index 18d33266b627..b53a3ed7b719 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -453,6 +453,8 @@ public:
 
 SW_DLLPUBLIC void SetDoNotMirrorRtlDrawObjs(bool bDoNotMirrorRtlDrawObjs);
 
+SW_DLLPUBLIC void SetContinuousEndnotes(bool bContinuousEndnotes);
+
 // DOCUMENT COMPATIBILITY FLAGS END
 
 // Calls Idle-formatter of Layout.
diff --git a/sw/source/core/doc/DocumentSettingManager.cxx 
b/sw/source/core/doc/DocumentSettingManager.cxx
index 0a02eb5cb72f..52d609be2e78 100644
--- a/sw/source/core/doc/DocumentSettingManager.cxx
+++ b/sw/source/core/doc/DocumentSettingManager.cxx
@@ -141,6 +141,7 @@ sw::DocumentSettingManager::DocumentSettingManager(SwDoc 
&rDoc)
 mbTabRelativeToIndent   = 
aOptions.get(u"TabsRelativeToIndent"_ustr);
 mbTabOverMargin = 
aOptions.get(u"TabOverMargin"_ustr);
 mbDoNotMirrorRtlDrawObjs= 
aOptions.get(u"DoNotMirrorRtlDrawObjs"_ustr);
+mbContinuousEndnotes= 
aOptions.get(u"ContinuousEndnotes"_ustr);
 }
 else
 {
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index ec29a15874c0..c4d9a551807c 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -1094,6 +1094,20 @@ void SwViewShell::SetDoNotMirrorRtlDrawObjs(bool 
bDoNotMirrorRtlDrawObjs)
 }
 }
 
+void SwViewShell::SetContinuousEndnotes(bool bContinuousEndnotes)
+{
+IDocumentSettingAccess& rIDSA = getIDocumentSettingAccess();
+if (rIDSA.get(DocumentSettingId::CONTINUOUS_ENDNOTES) != 
bContinuousEndnotes)
+{
+SwWait aWait(*GetDoc()->GetDocShell(), true);
+rIDSA.set(DocumentSettingId::CONTI

core.git: sw/source

[Noel Grandin (via logerrit)]

 sw/source/uibase/sidebar/A11yCheckIssuesPanel.cxx |   57 +-
 sw/source/uibase/sidebar/PageColumnControl.cxx|   24 +++
 sw/source/uibase/sidebar/PageColumnPopup.cxx  |4 -
 sw/source/uibase/sidebar/PageFooterPanel.cxx  |   14 ++--
 sw/source/uibase/sidebar/PageFormatPanel.cxx  |   16 ++---
 sw/source/uibase/sidebar/PageHeaderPanel.cxx  |   16 ++---
 sw/source/uibase/sidebar/PageMarginControl.cxx|   44 ++---
 sw/source/uibase/sidebar/PageMarginPopup.cxx  |4 -
 sw/source/uibase/sidebar/PageOrientationControl.cxx   |8 +-
 sw/source/uibase/sidebar/PageOrientationPopup.cxx |4 -
 sw/source/uibase/sidebar/PageSizeControl.cxx  |8 +-
 sw/source/uibase/sidebar/PageSizePopup.cxx|4 -
 sw/source/uibase/sidebar/PageStylesPanel.cxx  |   24 +++
 sw/source/uibase/sidebar/QuickFindPanel.cxx   |   10 +--
 sw/source/uibase/sidebar/StylePresetsPanel.cxx|6 -
 sw/source/uibase/sidebar/SwPanelFactory.cxx   |   16 ++---
 sw/source/uibase/sidebar/TableEditPanel.cxx   |   36 +--
 sw/source/uibase/sidebar/ThemePanel.cxx   |8 +-
 sw/source/uibase/sidebar/WrapPropertyPanel.cxx|   12 +--
 sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx |   33 +-
 20 files changed, 175 insertions(+), 173 deletions(-)

New commits:
commit 782f7c23af25187b9205e7ca036cb819834be2df
Author: Noel Grandin 
AuthorDate: Mon Jun 3 14:37:41 2024 +0200
Commit: Noel Grandin 
CommitDate: Mon Jun 3 19:35:46 2024 +0200

loplugin:ostr in sw/.../sidebar

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

diff --git a/sw/source/uibase/sidebar/A11yCheckIssuesPanel.cxx 
b/sw/source/uibase/sidebar/A11yCheckIssuesPanel.cxx
index 8a41db78f0ac..bf5333ac6456 100644
--- a/sw/source/uibase/sidebar/A11yCheckIssuesPanel.cxx
+++ b/sw/source/uibase/sidebar/A11yCheckIssuesPanel.cxx
@@ -32,11 +32,11 @@ namespace sw::sidebar
 {
 AccessibilityCheckEntry::AccessibilityCheckEntry(
 weld::Container* pParent, std::shared_ptr const& 
rAccessibilityIssue)
-: m_xBuilder(Application::CreateBuilder(pParent, 
"svx/ui/accessibilitycheckentry.ui"))
-, m_xContainer(m_xBuilder->weld_container("accessibilityCheckEntryBox"))
-, m_xLabel(m_xBuilder->weld_label("accessibilityCheckEntryLabel"))
-, 
m_xGotoButton(m_xBuilder->weld_link_button("accessibilityCheckEntryLinkButton"))
-, m_xFixButton(m_xBuilder->weld_button("accessibilityCheckEntryFixButton"))
+: m_xBuilder(Application::CreateBuilder(pParent, 
u"svx/ui/accessibilitycheckentry.ui"_ustr))
+, 
m_xContainer(m_xBuilder->weld_container(u"accessibilityCheckEntryBox"_ustr))
+, m_xLabel(m_xBuilder->weld_label(u"accessibilityCheckEntryLabel"_ustr))
+, 
m_xGotoButton(m_xBuilder->weld_link_button(u"accessibilityCheckEntryLinkButton"_ustr))
+, 
m_xFixButton(m_xBuilder->weld_button(u"accessibilityCheckEntryFixButton"_ustr))
 , m_pAccessibilityIssue(rAccessibilityIssue)
 {
 // lock in the height as including the button so all rows are the same 
height
@@ -97,39 +97,40 @@ std::unique_ptr 
A11yCheckIssuesPanel::Create(weld::Widget* pParent,
 {
 if (pParent == nullptr)
 throw ::com::sun::star::lang::IllegalArgumentException(
-"no parent window given to A11yCheckIssuesPanel::Create", nullptr, 
0);
+u"no parent window given to A11yCheckIssuesPanel::Create"_ustr, 
nullptr, 0);
 return std::make_unique(pParent, pBindings);
 }
 
 A11yCheckIssuesPanel::A11yCheckIssuesPanel(weld::Widget* pParent, SfxBindings* 
pBindings)
-: PanelLayout(pParent, "A11yCheckIssuesPanel", 
"modules/swriter/ui/a11ycheckissuespanel.ui")
+: PanelLayout(pParent, u"A11yCheckIssuesPanel"_ustr,
+  u"modules/swriter/ui/a11ycheckissuespanel.ui"_ustr)
 , mpBindings(pBindings)
 , mpDoc(nullptr)
 , maA11yCheckController(FN_STAT_ACCESSIBILITY_CHECK, *pBindings, *this)
 , mnIssueCount(0)
 , mbAutomaticCheckEnabled(false)
 {
-m_xExpanders[0] = m_xBuilder->weld_expander("expand_document");
-m_xExpanders[1] = m_xBuilder->weld_expander("expand_styles");
-m_xExpanders[2] = m_xBuilder->weld_expander("expand_linked");
-m_xExpanders[3] = m_xBuilder->weld_expander("expand_no_alt");
-m_xExpanders[4] = m_xBuilder->weld_expander("expand_table");
-m_xExpanders[5] = m_xBuilder->weld_expander("expand_formatting");
-m_xExpanders[6] = m_xBuilder->weld_expander("expand_hyperlink");
-m_xExpanders[7] = m_xBuilder->weld_expander("expand_fakes");
-m_xExpanders[8] = m_xBuilder->weld_expander("expand_numbering");
-m_xExpanders[9] = m_xBuilder->weld_expander("expand_other");
-
-m_xBoxes[0] = m_xBuilder->weld_box("box_document");
-m_xBoxes[1] = m_xBuilder->weld_box("box_styles");
-m_xB

core.git: Branch 'libreoffice-24-2-4' - external/onlineupdate

[Stephan Bergmann (via logerrit)]

 external/onlineupdate/lo.patch |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit ada4296497bae971c3cb293f934f5e6240f23185
Author: Stephan Bergmann 
AuthorDate: Fri May 31 10:35:06 2024 +0200
Commit: Christian Lohmaier 
CommitDate: Mon Jun 3 20:16:34 2024 +0200

tdf#161292: Fix create-partial-info for newly added files

084c64982ef6187292fd73e6deaa4448e0b6f3de "Create MAR updates from msi rather
than from archive" had patched make_add_instruction (in
workdir/UnpackedTarball/onlineupdate/tools/update-packagin/common.sh) to
unconditionally use add-if (with the file itself as test file) rather than 
plain
add (because we can't reuse Mozilla's extension logic there to determine
optional installation parts), and it noted in its commit message that 
"addition
of files will cause a MAR update to miss them".

Which turned out to be a problem with

,
updating from 24.2.2.1 with instdir/program/python-core-3.8.18/ to 24.2.2.2 
with
instdir/program/python-core-3.8.19/:  All the files in python-core-3.8.19 
were
recorded as add-if testing on themselves, so were never added.

So a better approach is, for newly added files to make them add (so they get
added unconditionally, even if they are part of some optional component that
happens to not be installed; this hopefully won't cause further issues) 
instead
of add-if.  (Existing files that are added instead of patched still use 
add-if,
though.)  This does not address the create-update-info target for full mar
updates (which is not used currently?), just the create-partial-info target.

(The existing calls to make_add_instruction in the upstream Mozilla code 
already
have a seemingly rotten mix of two-argument calls and calls with three 
arguments
where the third argument is ignored, and would check for a fourth "forced"
argument but which is never passed in.  So avoid extending that mess 
further,
and just replace this never-use-add-if call to make_add_instruction directly
with that function's (accordingly tweaked) body.)

Change-Id: Ib596f3aa72c3ab9f896b20f7d623bc574eb15fd8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168285
Reviewed-by: Stephan Bergmann 
Tested-by: Jenkins
(cherry picked from commit c00014019e6d33bfb4729c563062db1645c48e9d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168310
Reviewed-by: Christian Lohmaier 
(cherry picked from commit f7bd624cf1f2ad51a5f7d0edf23a1f19a9063823)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168319
Tested-by: Christian Lohmaier 

diff --git a/external/onlineupdate/lo.patch b/external/onlineupdate/lo.patch
index 35dfb2f80fb8..571cea560d3c 100644
--- a/external/onlineupdate/lo.patch
+++ b/external/onlineupdate/lo.patch
@@ -372,7 +372,13 @@
fi
  fi
else
-@@ -270,7 +270,7 @@
+@@ -266,11 +266,12 @@
+   if check_for_add_if_not_update "$f"; then
+ make_add_if_not_instruction "$f" "$updatemanifestv3"
+   else
+-make_add_instruction "$f" "$updatemanifestv3"
++verbose_notice " add \"$f\""
++echo "add \"$f\"" >> "$updatemanifestv3"
fi
  
  

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

[Stephan Bergmann (via logerrit)]

 desktop/source/app/updater.cxx |   14 --
 desktop/source/app/updater.hxx |1 -
 2 files changed, 4 insertions(+), 11 deletions(-)

New commits:
commit b01f7e8f4b931f56a55d5bfc661f7bb7416afa58
Author: Stephan Bergmann 
AuthorDate: Thu May 30 13:44:49 2024 +0200
Commit: Christian Lohmaier 
CommitDate: Mon Jun 3 20:17:10 2024 +0200

Make sure updates dir exists when writing updating.log

Change-Id: Ib652fedde970d01b701ad4b61e75028cd43974f6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168258
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit 48190a8f3783135c65538977cd38f34ba733f071)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168297
Reviewed-by: Christian Lohmaier 
(cherry picked from commit 44d8490f615cd6c56a1336d6d4da10219f572ccb)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168382
Reviewed-by: Xisco Fauli 
Tested-by: Christian Lohmaier 

diff --git a/desktop/source/app/updater.cxx b/desktop/source/app/updater.cxx
index 12bb4969a68c..aed765d6eb3d 100644
--- a/desktop/source/app/updater.cxx
+++ b/desktop/source/app/updater.cxx
@@ -803,14 +803,6 @@ void update_checker()
 }
 }
 
-OUString Updater::getUpdateInfoLog()
-{
-OUString aUpdateInfoURL("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" 
SAL_CONFIGFILE("bootstrap") ":UserInstallation}/updates/updating.log");
-rtl::Bootstrap::expandMacros(aUpdateInfoURL);
-
-return aUpdateInfoURL;
-}
-
 OUString Updater::getPatchDirURL()
 {
 OUString aPatchDirURL("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" 
SAL_CONFIGFILE("bootstrap") ":UserInstallation}/updates/0/");
@@ -843,8 +835,10 @@ OUString Updater::getExecutableDirURL()
 void Updater::log(const OUString& rMessage)
 {
 SAL_INFO("desktop.updater", rMessage);
-OUString aUpdateLog = getUpdateInfoLog();
-SvFileStream aLog(aUpdateLog, StreamMode::STD_READWRITE);
+OUString dir("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" 
SAL_CONFIGFILE("bootstrap") ":UserInstallation}/updates");
+rtl::Bootstrap::expandMacros(dir);
+osl::Directory::create(dir);
+SvFileStream aLog(dir + "/updating.log", StreamMode::STD_READWRITE);
 aLog.Seek(aLog.Tell() + aLog.remainingSize()); // make sure we are at the 
end
 aLog.WriteLine(OUStringToOString(rMessage, RTL_TEXTENCODING_UTF8));
 }
diff --git a/desktop/source/app/updater.hxx b/desktop/source/app/updater.hxx
index 7f1ea920fbe9..8989f1f684a0 100644
--- a/desktop/source/app/updater.hxx
+++ b/desktop/source/app/updater.hxx
@@ -18,7 +18,6 @@ void update_checker();
 class Updater
 {
 public:
-static OUString getUpdateInfoLog();
 static OUString getPatchDirURL();
 static OUString getUpdateFileURL();
 static OUString getExecutableDirURL();

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

[Stephan Bergmann (via logerrit)]

 desktop/source/app/updater.cxx |   34 +-
 desktop/source/app/updater.hxx |2 --
 2 files changed, 9 insertions(+), 27 deletions(-)

New commits:
commit 5c9c8a230d9e98c6d54c2ada2d4824e2c20b42c8
Author: Stephan Bergmann 
AuthorDate: Thu May 30 13:36:49 2024 +0200
Commit: Christian Lohmaier 
CommitDate: Mon Jun 3 20:17:28 2024 +0200

Consolidate on a single Updater::log overload

Change-Id: Id812788f30ac4a327d450255cfe19181c69ae81e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168257
Reviewed-by: Stephan Bergmann 
Tested-by: Jenkins
(cherry picked from commit 253bd05e95ae5093e61a4685a9d28f31edc6f585)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168296
Reviewed-by: Christian Lohmaier 
(cherry picked from commit aff07e946a08608a96fcc853152d0e57b7a00e8e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168381
Tested-by: Christian Lohmaier 
Reviewed-by: Xisco Fauli 

diff --git a/desktop/source/app/updater.cxx b/desktop/source/app/updater.cxx
index aed765d6eb3d..d60c006f6b6f 100644
--- a/desktop/source/app/updater.cxx
+++ b/desktop/source/app/updater.cxx
@@ -29,7 +29,9 @@
 #include 
 #include 
 #include 
+#include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -553,7 +555,7 @@ size_t WriteCallbackFile(void *ptr, size_t size,
 
 std::string download_content(const OString& rURL, bool bFile, OUString& rHash)
 {
-Updater::log("Download: " + rURL);
+Updater::log("Download: " + OStringToOUString(rURL, 
osl_getThreadTextEncoding()));
 std::unique_ptr> curl(
 curl_easy_init(), [](CURL * p) { curl_easy_cleanup(p); });
 
@@ -729,7 +731,7 @@ void update_checker()
 OUString aDownloadCheckURL = aDownloadCheckBaseURL + "update/check/1/" + 
aProductName +
 "/" + aBuildID + "/" + aBuildTarget + "/" + aChannel;
 OString aURL = OUStringToOString(aDownloadCheckURL, RTL_TEXTENCODING_UTF8);
-Updater::log("Update check: " + aURL);
+Updater::log("Update check: " + OStringToOUString(aURL, 
osl_getThreadTextEncoding()));
 
 try
 {
@@ -779,27 +781,27 @@ void update_checker()
 catch (const invalid_update_info&)
 {
 SAL_WARN("desktop.updater", "invalid update information");
-Updater::log(OString("warning: invalid update info"));
+Updater::log("warning: invalid update info");
 }
 catch (const error_updater& e)
 {
 SAL_WARN("desktop.updater", "error during the update check: " << 
e.what());
-Updater::log(OString("warning: error by the updater") + e.what());
+Updater::log("warning: error by the updater" + 
o3tl::runtimeToOUString(e.what()));
 }
 catch (const invalid_size& e)
 {
 SAL_WARN("desktop.updater", e.what());
-Updater::log(OString("warning: invalid size"));
+Updater::log("warning: invalid size");
 }
 catch (const invalid_hash& e)
 {
 SAL_WARN("desktop.updater", e.what());
-Updater::log(OString("warning: invalid hash"));
+Updater::log("warning: invalid hash");
 }
 catch (...)
 {
 SAL_WARN("desktop.updater", "unknown error during the update check");
-Updater::log(OString("warning: unknown exception"));
+Updater::log("warning: unknown exception");
 }
 }
 
@@ -843,24 +845,6 @@ void Updater::log(const OUString& rMessage)
 aLog.WriteLine(OUStringToOString(rMessage, RTL_TEXTENCODING_UTF8));
 }
 
-void Updater::log(const OString& rMessage)
-{
-SAL_INFO("desktop.updater", rMessage);
-OUString aUpdateLog = getUpdateInfoLog();
-SvFileStream aLog(aUpdateLog, StreamMode::STD_READWRITE);
-aLog.Seek(aLog.Tell() + aLog.remainingSize()); // make sure we are at the 
end
-aLog.WriteLine(rMessage);
-}
-
-void Updater::log(const char* pMessage)
-{
-SAL_INFO("desktop.updater", pMessage);
-OUString aUpdateLog = getUpdateInfoLog();
-SvFileStream aLog(aUpdateLog, StreamMode::STD_READWRITE);
-aLog.Seek(aLog.Tell() + aLog.remainingSize()); // make sure we are at the 
end
-aLog.WriteOString(pMessage);
-}
-
 OUString Updater::getBuildID()
 {
 OUString aBuildID("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" 
SAL_CONFIGFILE("version") ":buildid}");
diff --git a/desktop/source/app/updater.hxx b/desktop/source/app/updater.hxx
index 8989f1f684a0..3fc767748094 100644
--- a/desktop/source/app/updater.hxx
+++ b/desktop/source/app/updater.hxx
@@ -27,8 +27,6 @@ public:
 static OUString getUpdateChannel();
 
 static void log(const OUString& rMessage);
-static void log(const OString& rMessage);
-static void log(const char* pMessage);
 
 static void removeUpdateFiles();
 };

core.git: cui/source

[Samuel Mehrbrodt (via logerrit)]

 cui/source/tabpages/numpages.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit b8a89b3356275e95e3fc78c79f55a209f8056556
Author: Samuel Mehrbrodt 
AuthorDate: Mon Jun 3 11:08:52 2024 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Mon Jun 3 20:22:23 2024 +0200

tdf#69724 Disable 'Change Bullet' btn until selection exists

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

diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 343b0ce9c7f0..c0495541ca61 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -330,6 +330,7 @@ SvxBulletPickTabPage::SvxBulletPickTabPage(weld::Container* 
pPage, weld::DialogC
 , m_xExamplesVSWin(new weld::CustomWeld(*m_xBuilder, u"valueset"_ustr, 
*m_xExamplesVS))
 {
 SetExchangeSupport();
+m_xBtChangeBullet->set_sensitive(false);
 m_xExamplesVS->init(NumberingPageType::BULLET);
 m_xExamplesVS->SetSelectHdl(LINK(this, SvxBulletPickTabPage, 
NumSelectHdl_Impl));
 m_xExamplesVS->SetDoubleClickHdl(LINK(this, SvxBulletPickTabPage, 
DoubleClickHdl_Impl));
@@ -426,6 +427,8 @@ IMPL_LINK_NOARG(SvxBulletPickTabPage, NumSelectHdl_Impl, 
ValueSet*, void)
 if(!pActNum)
 return;
 
+m_xBtChangeBullet->set_sensitive(true);
+
 bPreset = false;
 bModified = true;
 sal_uInt16 nIndex = m_xExamplesVS->GetSelectedItemId() - 1;

core.git: sc/qa

[Xisco Fauli (via logerrit)]

 sc/qa/unit/data/xlsx/tdf160371.xlsx |binary
 sc/qa/unit/subsequent_filters_test2.cxx |   13 +
 2 files changed, 13 insertions(+)

New commits:
commit e10ca8d250b39cc2778e9df47a06fd6ba4f2fced
Author: Xisco Fauli 
AuthorDate: Mon Jun 3 15:58:57 2024 +0200
Commit: Xisco Fauli 
CommitDate: Mon Jun 3 20:52:58 2024 +0200

tdf#160371: sc_subsequent_filters_test2: Add unittest

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

diff --git a/sc/qa/unit/data/xlsx/tdf160371.xlsx 
b/sc/qa/unit/data/xlsx/tdf160371.xlsx
new file mode 100644
index ..798db83d9c18
Binary files /dev/null and b/sc/qa/unit/data/xlsx/tdf160371.xlsx differ
diff --git a/sc/qa/unit/subsequent_filters_test2.cxx 
b/sc/qa/unit/subsequent_filters_test2.cxx
index 74eea5b91efa..60966f08bc5c 100644
--- a/sc/qa/unit/subsequent_filters_test2.cxx
+++ b/sc/qa/unit/subsequent_filters_test2.cxx
@@ -730,6 +730,19 @@ CPPUNIT_TEST_FIXTURE(ScFiltersTest2, 
testErrorOnExternalReferences)
  pDoc->GetFormula(0, 0, 0));
 }
 
+CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testTdf160371)
+{
+createScDoc("xlsx/tdf160371.xlsx");
+
+ScDocument* pDoc = getScDoc();
+
+// Without the fix in place, this test would have failed with
+// - Expected: =INDIRECT(B2)!INDIRECT(B3)
+// - Actual  : =INDIRECT(B2) INDIRECT(B3)
+CPPUNIT_ASSERT_EQUAL(u"=INDIRECT(B2)!INDIRECT(B3)"_ustr, 
pDoc->GetFormula(1, 3, 0));
+CPPUNIT_ASSERT_EQUAL(1.0, pDoc->GetValue(ScAddress(1, 3, 0)));
+}
+
 CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testTdf145054)
 {
 createScDoc("xlsx/tdf145054.xlsx");

core.git: Changes to 'refs/tags/mimo-6.4.7.2.M11'

[Stephan Bergmann (via logerrit)]

Tag 'mimo-6.4.7.2.M11' created by Aron Budea  at 
2024-06-03 19:24 +

mimo-6.4.7.2.M11

Changes since mimo-6.4.7.2.M10-3:
---
 0 files changed
---

core.git: Changes to 'refs/tags/mimo-6.2.8.2.M14'

[Stephan Bergmann (via logerrit)]

Tag 'mimo-6.2.8.2.M14' created by Aron Budea  at 
2024-06-03 19:28 +

mimo-6.2.8.2.M14

Changes since mimo-6.2.8.2.M13-5:
---
 0 files changed
---

core.git: Changes to 'refs/tags/mimo-7.0.7.0.M15'

[Stephan Bergmann (via logerrit)]

Tag 'mimo-7.0.7.0.M15' created by Aron Budea  at 
2024-06-03 19:30 +

mimo-7.0.7.0.M15

Changes since mimo-7.0.7.0.M14-3:
---
 0 files changed
---

core.git: Changes to 'refs/tags/mimo-7.1.8.1.M7'

[Aron Budea (via logerrit)]

Tag 'mimo-7.1.8.1.M7' created by Aron Budea  at 
2024-06-03 19:38 +

7.1.8.1.M7

Changes since mimo-7.1.8.1.M6-3:
---
 0 files changed
---

core.git: Changes to 'refs/tags/mimo-7.2.7.2.M17'

[Aron Budea (via logerrit)]

Tag 'mimo-7.2.7.2.M17' created by Aron Budea  at 
2024-06-03 19:44 +

mimo-7.2.7.2.M17

Changes since mimo-7.2.7.2.M15-3:
---
 0 files changed
---

core.git: Changes to 'refs/tags/mimo-7.3.7.2.M10'

[Aron Budea (via logerrit)]

Tag 'mimo-7.3.7.2.M10' created by Aron Budea  at 
2024-06-03 19:45 +

mimo-7.3.7.2.M10

Changes since mimo-7.3.7.2.M9-1:
---
 0 files changed
---

core.git: sw/source

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

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

New commits:
commit 03aa8a1d9bfe4af2f37df0bde42193c2cf90ffb4
Author: László Németh 
AuthorDate: Mon Jun 3 16:27:55 2024 +0200
Commit: László Németh 
CommitDate: Mon Jun 3 21:50:26 2024 +0200

tdf#77388 sw: fix missing table border at cropped images

At images cropped by the bottom or right cell boundaries,
or at images with zero padding in table cells (e.g, in
test document of tdf#160836), table borders were hovered
by the image, resulting missing table borders.

First paint the cell content, and after that the DOCX-like
"collapsing" cell borders in SwTabFrame::PaintSwFrame.

Note: this doesn't modify painting of the objects
anchored to characters (which still hovers the cell borders),
and painting of the text content of the cells (which are
still hovered by the cell borders at zero padding, despite
their non-transparent background color).

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

diff --git a/sw/source/core/layout/paintfrm.cxx 
b/sw/source/core/layout/paintfrm.cxx
index c572585e597a..fd426234a652 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -4667,6 +4667,8 @@ void SwTabFrame::PaintSwFrame(vcl::RenderContext& 
rRenderContext, SwRect const&
 const SwViewOption* pViewOption = gProp.pSGlobalShell->GetViewOptions();
 if (pViewOption->IsTable())
 {
+SwLayoutFrame::PaintSwFrame( rRenderContext, rRect );
+
 // #i29550#
 if ( IsCollapsingBorders() )
 {
@@ -4684,8 +4686,6 @@ void SwTabFrame::PaintSwFrame(vcl::RenderContext& 
rRenderContext, SwRect const&
 SwTabFramePainter aHelper(*this);
 aHelper.PaintLines(rRenderContext, rRect);
 }
-
-SwLayoutFrame::PaintSwFrame( rRenderContext, rRect );
 }
 // #i6467# - no light grey rectangle for page preview
 else if ( gProp.pSGlobalShell->GetWin() && 
!gProp.pSGlobalShell->IsPreview() )

core.git: Changes to 'refs/tags/mimo-7.5.9.2.M3'

[Aron Budea (via logerrit)]

Tag 'mimo-7.5.9.2.M3' created by Aron Budea  at 
2024-06-03 19:55 +

mimo-7.5.9.2.M3

Changes since mimo-7.5.9.2.M2-1:
---
 0 files changed
---

ODF problems with 3D-objects

[Regina Henschel]

Hi all, hi Armin,

(A)
The UI-option "Double-Sided Illumination" (= UNO property 
D3DSceneTwoSidedLighting) is mapped to ODF scene attribute 
dr3d:lighting-mode (19.99.3, part 3, ODF 1.3).
Its specification is, "The dr3d:lighting-mode attribute specifies 
whether lighting is used in a three-dimensional scene.".


That is not implemented in LO. Lighting is always used in LibreOffice. 
Not using lighting would mean, that the fill color is not modulated but 
drawn as if the object is two-dimensional.



The ODF graphic property dr3d:lighting-mode(20.86, part3, ODF 1.3) fits 
neither. Its values are,
"double-sided: the front and back sides of all planes are displayed if 
they are visible from the viewer's perspective."
"standard: Depending on the value of the dr3d:normals-direction 20.87 
attribute, only the front or only the back side sides of the plane are 
displayed. The opposite sides are not displayed, whether they are 
visible from the viewer's perspective or not."

That is not about lighting, but about the visibility of object faces.


(B)
The UI-option "Invert Normals" (= UNO property D3DNormalsInvert) is 
mapped to ODF graphic property dr3d:normals-direction (20.87, part 3, 
ODF 1.3). Thereby the value D3DNormalsInvert=true is mapped to 
dr3d:normals-direction="normal" and D3DNormalsInvert=false is mapped to 
dr3d:normals-direction="invert".


For dr3d:normals-direction is specified, "The dr3d:normals-direction 
attribute has no effect if the dr3d:lighting-mode 20.86 attribute has 
the value double-sided". But the graphic property dr3d:lighting-mode 
20.86 is not implemented in LibreOffice at all. Its value is not read 
and not written.



(C)
The light position is determined by Svx3DLightControl() in the UI. It is 
associated with UNO properties D3DSceneLightDirection1 to 
D3DSceneLightDirection8. A position in the center in front of the sphere 
in the control results in D3DSceneLightDirection1 = {DirectionX=0, 
DirectionY=0, DirectionZ=1}, for example. This is mapped to ODF 
attribute dr3d:direction (19.95, part 3, ODF 1.3) as dr3d:direction="(0 
0 1)" for the example. The attribute dr3d:direction is specified as, 
"The dr3d:direction attribute specifies the direction in which light is 
emitted.".


So LO uses it as position, but for ODF it is a direction, a vector.


(D)
The UI-option "Double-Sided" (=UNO property D3DDoubleSided) is mapped to 
ODF graphic property dr3d:backface-culling (20.76, part3, ODF 1.3). In 
my understanding, if "backface-culling" is enabled it means, that object 
polygons, which are not visible to the viewer are skipped on rendering. 
In case of solid filling this would have no effect on the final result, 
but only reduces the time for rendering. But in LO the effect is, that 
object polygons, which are not visible because the viewer looks on the 
back face, become visible when backface-culling is disabled. That 
behavior would more fit to ODF dr3d:lighting-mode="double-sided" (20.86).


(E)
In my understanding, a normal determines which side of an object polygon 
is the front face and which is the back face. When I assume an object 
polygon is not visible because the viewer looks on the back face, then 
when changing the state of "Invers Normals" those polygons which were 
invisible become visible and vice versa. But that is not the case in 
LibreOffice.


Is my view in (D) and (E) correct?


Do you agree, that there is a mess? And if yes, how we can fix it?

Kind regards,
Regina

core.git: svx/source

[Caolán McNamara (via logerrit)]

 svx/source/fmcomp/gridctrl.cxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit 6f2b5043613bea755f01b413fd86ece0b3a29e5d
Author: Caolán McNamara 
AuthorDate: Mon Jun 3 17:22:21 2024 +0100
Commit: Caolán McNamara 
CommitDate: Mon Jun 3 22:43:45 2024 +0200

crashtesting: BrowseBox::GetControlArea crash

see with forums/ods/forum-en-11050.ods

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

diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index faedec67aa66..b6fb24d05df7 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -817,11 +817,15 @@ void DbGridControl::dispose()
 
 m_aBar.disposeAndClear();
 
+m_aRearrangeIdle.Stop();
+
 EditBrowseBox::dispose();
 }
 
 void DbGridControl::RearrangeAtIdle()
 {
+if (isDisposed())
+return;
 m_aRearrangeIdle.Start();
 }
 
@@ -2642,6 +2646,9 @@ IMPL_LINK_NOARG(DbGridControl, OnDelete, void*, void)
 
 IMPL_LINK_NOARG(DbGridControl, RearrangeHdl, Timer*, void)
 {
+if (isDisposed())
+return;
+
 // and give it a chance to rearrange
 Point aPoint = GetControlArea().TopLeft();
 sal_uInt16 nX = static_cast(aPoint.X());

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

[Caolán McNamara (via logerrit)]

 sc/source/ui/navipi/content.cxx |2 +-
 sw/source/core/doc/docsort.cxx  |   21 +++--
 2 files changed, 12 insertions(+), 11 deletions(-)

New commits:
commit 2c0157fbe9b9338f98e66d300664fe3c710eb415
Author: Caolán McNamara 
AuthorDate: Mon Jun 3 20:09:16 2024 +0100
Commit: Caolán McNamara 
CommitDate: Mon Jun 3 22:44:16 2024 +0200

cid#1602449 Resource leak

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

diff --git a/sw/source/core/doc/docsort.cxx b/sw/source/core/doc/docsort.cxx
index df5aaf6e5c89..8f5e70d5110d 100644
--- a/sw/source/core/doc/docsort.cxx
+++ b/sw/source/core/doc/docsort.cxx
@@ -313,7 +313,7 @@ bool SwDoc::SortText(const SwPaM& rPaM, const 
SwSortOptions& rOpt)
 }
 
 std::optional pRedlPam;
-SwUndoRedlineSort* pRedlUndo = nullptr;
+std::unique_ptr xRedlUndo;
 SwUndoSort* pUndoSort = nullptr;
 
 // To-Do - add 'SwExtraRedlineTable' also ?
@@ -328,7 +328,7 @@ bool SwDoc::SortText(const SwPaM& rPaM, const 
SwSortOptions& rOpt)
 {
 if( bUndo )
 {
-pRedlUndo = new SwUndoRedlineSort( *pRedlPam,rOpt );
+xRedlUndo.reset(new SwUndoRedlineSort(*pRedlPam, rOpt));
 GetIDocumentUndoRedo().DoUndo(false);
 }
 // First copy the range
@@ -356,8 +356,8 @@ bool SwDoc::SortText(const SwPaM& rPaM, const 
SwSortOptions& rOpt)
 if (pCNd)
 pRedlPam->GetPoint()->SetContent( nCLen );
 
-if( pRedlUndo )
-pRedlUndo->SetValues( rPaM );
+if (xRedlUndo)
+xRedlUndo->SetValues(rPaM);
 }
 else
 {
@@ -380,7 +380,7 @@ bool SwDoc::SortText(const SwPaM& rPaM, const 
SwSortOptions& rOpt)
 SwNodeOffset nBeg = pStart->GetNodeIndex();
 SwNodeRange aRg( aStart, aStart );
 
-if( bUndo && !pRedlUndo )
+if (bUndo && !xRedlUndo)
 {
 pUndoSort = new SwUndoSort(rPaM, rOpt);
 GetIDocumentUndoRedo().AppendUndo(std::unique_ptr(pUndoSort));
@@ -412,12 +412,13 @@ bool SwDoc::SortText(const SwPaM& rPaM, const 
SwSortOptions& rOpt)
 
 if( pRedlPam )
 {
-if( pRedlUndo )
+SwUndoRedlineSort* pRedlUndo = xRedlUndo.get();
+if (pRedlUndo)
 {
-pRedlUndo->SetSaveRange( *pRedlPam );
+xRedlUndo->SetSaveRange(*pRedlPam);
 // UGLY: temp. enable Undo
 GetIDocumentUndoRedo().DoUndo(true);
-GetIDocumentUndoRedo().AppendUndo( 
std::unique_ptr(pRedlUndo) );
+GetIDocumentUndoRedo().AppendUndo(std::move(xRedlUndo));
 GetIDocumentUndoRedo().DoUndo(false);
 }
 
@@ -437,13 +438,13 @@ bool SwDoc::SortText(const SwPaM& rPaM, const 
SwSortOptions& rOpt)
 // the sorted range is inserted
 getIDocumentRedlineAccess().AppendRedline( new SwRangeRedline( 
RedlineType::Insert, *pRedlPam ), true);
 
-if( pRedlUndo )
+if (pRedlUndo)
 {
 SwNodeIndex aInsEndIdx( pRedlPam->GetMark()->GetNode(), -1 );
 SwContentNode *const pContentNode = 
aInsEndIdx.GetNode().GetContentNode();
 pRedlPam->GetMark()->Assign( *pContentNode, pContentNode->Len() );
 
-pRedlUndo->SetValues( *pRedlPam );
+pRedlUndo->SetValues(*pRedlPam);
 }
 
 pRedlPam.reset();
commit 16b0ad3cf76d9932ebbd169af64b7ad292e68426
Author: Caolán McNamara 
AuthorDate: Mon Jun 3 20:03:07 2024 +0100
Commit: Caolán McNamara 
CommitDate: Mon Jun 3 22:44:08 2024 +0200

cid#1459023 Dereference null return value

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

diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index 0ae1b45de7ee..c0e06a0f2b01 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -386,7 +386,7 @@ IMPL_LINK_NOARG(ScContentTree, ContentDoubleClickHdl, 
weld::TreeView&, bool)
 pParentWindow->SetCurrentCell( aPos.Col(), aPos.Row() );
 // Check whether the comment is currently visible and toggle 
its visibility
 ScDocument* pSrcDoc = GetSourceDocument();
-if (ScPostIt* pNote = pSrcDoc->GetNote(aPos.Col(), aPos.Row(), 
aPos.Tab()))
+if (ScPostIt* pNote = pSrcDoc ? pSrcDoc->GetNote(aPos.Col(), 
aPos.Row(), aPos.Tab()) : nullptr)
 {
 bool bVisible = pNote->IsCaptionShown();
 // Effectivelly set the visibility of the comment

GSOC More and Better Tests: Weekly Update

[Adam Seskunas]

Hello everyone,

This is my weekly update for More and Better tests. Last week I finished 
porting framework/qa/complex/XTitle/CheckXTitle.java over to CppUnit. The patch 
is in Gerrit here
https://gerrit.libreoffice.org/c/core/+/168168 


Xisco has noted that, if commit 4355137901e18e24de2ab123fd0454147f1f3890 is 
reverted, the test fails, which means the test is working as intended. 
Hopefully having this test in c++ will help anyone in the future who runs into 
a test failure by making the test easier to understand and easier to debug. 

After submitting CheckXTitle to Gerrit, I began working on 
framework/qa/complex/checkdispatchapi.java. After talking it over with Xisco 
and Hossein, it was decided to split this test into two Gerrit submissions, one 
for the database portion and one for everything else in the test suite. The 
database portion of the test suite had been disabled and the hope is to be able 
to get it working in CppUnit again. Submitting it separately will allow some 
time for CI testing while I finish porting the rest of the test suite. As of 
now, I’m close to getting the first part submitted, I’ve been reading the 
Developers Guide database documentation and working on importing the database 
components with a database connection. 

After finishing the porting of checkdispatchapi.java, I tentatively plan to 
start working on framework/qa/complex/api_internal/CheckAPI.java. 

Have a good week,
Adam Seskunas

core.git: svtools/source

[Caolán McNamara (via logerrit)]

 svtools/source/control/scrolladaptor.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 8501cb20627e5bc36d760b53b0990f4105c4ff65
Author: Caolán McNamara 
AuthorDate: Mon Jun 3 21:30:52 2024 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jun 4 00:43:18 2024 +0200

tdf#160844 we don't want scrollbars to be a target for Ctrl+F6, etc

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

diff --git a/svtools/source/control/scrolladaptor.cxx 
b/svtools/source/control/scrolladaptor.cxx
index 98c4fe7d672c..290468254149 100644
--- a/svtools/source/control/scrolladaptor.cxx
+++ b/svtools/source/control/scrolladaptor.cxx
@@ -24,6 +24,8 @@ ScrollAdaptor::ScrollAdaptor(vcl::Window* pWin, bool bHoriz)
 , m_xScrollBar(m_xBuilder->weld_scrollbar(bHoriz ? u"horizontal"_ustr : 
u"vertical"_ustr))
 , m_bHori(bHoriz)
 {
+// tdf#160844 we don't want scrollbars to be a default target for Ctrl+F6, 
etc
+SetStyle(GetStyle() & ~WB_TABSTOP);
 m_xScrollBar->show();
 SetSizePixel(GetOptimalSize());
 }

Re: [GSoC] Comments in Sidebar Deck: Weekly Update

[Mohit Marathe]

Hello everyone,

In the last week, I implemented a method to `populateComments` 
(which loads and displays all the existing comments to the 
Comments deck).

For implementing this, I needed to collect all the existing comments 
in the document. Fortunately, there was `SwPostItMgr::AddPostIts` 
which already does that. So I refactored a part of the code (which 
was needed) and made it public. Now, I have all the info to display 
the comments. For the time being, I have displayed all the 
comments separately i.e. not in threads (even if they should be).

Currently I'm implementing a way to display comments in a tree-view.

Thanks,
Mohit

core.git: Branch 'distro/collabora/libreoffice-7-5+backports' - sw/CppunitTest_sw_core_layout.mk sw/qa sw/source

[Miklos Vajna (via logerrit)]

 sw/CppunitTest_sw_core_layout.mk  |1 
 sw/qa/core/layout/data/table-print-area-left.docx |binary
 sw/qa/core/layout/tabfrm.cxx  |   38 ++
 sw/source/core/layout/tabfrm.cxx  |7 ++--
 4 files changed, 44 insertions(+), 2 deletions(-)

New commits:
commit 3b92f905115cd789a4dafb4e2ee8ee6043693ea8
Author: Miklos Vajna 
AuthorDate: Wed May 10 23:28:03 2023 +0100
Commit: Mike Kaganski 
CommitDate: Mon Jun 3 10:27:47 2024 +0500

tdf#154775 sw layout: fix unexpected large table print area left margin

The bugdoc had 2 pages, but the second page's content was mostly a
table. This table was rendered outside the page frame, so it was
practically invisible.

This started after commit fd7749fddc5a767461dfced55369af48e5a6d561 (sw:
fix handling of table vs fly overlaps in the AddVerticalFlyOffsets case,
2020-02-14), and that behavior is still wanted to have correct table
borders, but that change introduced an inconsistent case: we started to
always accept an invalid frame area definition of the fly, but we only
shifted the content down in the text::HoriOrientation::NONE case.

Fix the problem by limiting the "accept invalid frame area definition"
based on the horizontal orientation, so we either both ignore the
validity flag & shift down or do none of this. This keeps the original
bug fixed, but addresses the new "no visible table" problem.

Note that this only fixes the regression part; once the image from the
header is removed and undo is invoked, a similar problem still happens.
But that is a pre-existing, separate problem.

Change-Id: Id752c169b7c7fb6b75e6603ad29aaafbb676b8a5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151652
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/sw/CppunitTest_sw_core_layout.mk b/sw/CppunitTest_sw_core_layout.mk
index 9a7a4710dfb7..1c991f8c19ba 100644
--- a/sw/CppunitTest_sw_core_layout.mk
+++ b/sw/CppunitTest_sw_core_layout.mk
@@ -15,6 +15,7 @@ $(eval $(call 
gb_CppunitTest_use_common_precompiled_header,sw_core_layout))
 
 $(eval $(call gb_CppunitTest_add_exception_objects,sw_core_layout, \
 sw/qa/core/layout/layout \
+sw/qa/core/layout/tabfrm \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,sw_core_layout, \
diff --git a/sw/qa/core/layout/data/table-print-area-left.docx 
b/sw/qa/core/layout/data/table-print-area-left.docx
new file mode 100644
index ..e326bed82f39
Binary files /dev/null and b/sw/qa/core/layout/data/table-print-area-left.docx 
differ
diff --git a/sw/qa/core/layout/tabfrm.cxx b/sw/qa/core/layout/tabfrm.cxx
new file mode 100644
index ..4b991c27dbf8
--- /dev/null
+++ b/sw/qa/core/layout/tabfrm.cxx
@@ -0,0 +1,38 @@
+/* -*- 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/.
+ */
+
+#include 
+
+/// Covers sw/source/core/layout/tabfrm.cxx fixes.
+class Test : public SwModelTestBase
+{
+public:
+Test()
+: SwModelTestBase("/sw/qa/core/layout/data/")
+{
+}
+};
+
+CPPUNIT_TEST_FIXTURE(Test, testTablePrintAreaLeft)
+{
+// Given a document with a header containing an image, and also with an 
overlapping table:
+createSwDoc("table-print-area-left.docx");
+
+// When laying out that document & parsing the left margin of the table:
+SwTwips nTablePrintLeft = parseDump("//tab/infos/prtBounds", 
"left").toInt32();
+
+// Then make sure it has ~no left margin:
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected: 5
+// - Actual  : 10646
+// i.e. the table was shifted outside the page, was invisible.
+CPPUNIT_ASSERT_EQUAL(static_cast(5), nTablePrintLeft);
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index d2e4618bf317..abf9fa1bb4f0 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -2860,10 +2860,14 @@ bool SwTabFrame::CalcFlyOffsets( SwTwips& rUpper,
 //   at the page frame, the table is on, but it's anchor 
character
 //   text frame has already changed its page.
 const SwTextFrame* pAnchorCharFrame = 
pFly->FindAnchorCharFrame();
+const SwFormatHoriOrient& rHori = 
pFly->GetFormat()->GetHoriOrient();
+// Only consider invalid Writer fly frames if they'll be 
shifted down.
+bool bIgnoreFlyValidity
+= bAddVerticalFlyOffsets && rHori.GetHoriOrient() == 
text::HoriOrientation::NONE;
 bool bConsiderFly =
 

core.git: sw/source

[Andrea Gelmini (via logerrit)]

 sw/source/core/inc/flowfrm.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit eb6c458bc97d18da342c7cd1aca5306b2ffe04e9
Author: Andrea Gelmini 
AuthorDate: Mon Jun 3 15:49:38 2024 +0200
Commit: Julien Nabet 
CommitDate: Tue Jun 4 08:58:23 2024 +0200

Fix typo

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

diff --git a/sw/source/core/inc/flowfrm.hxx b/sw/source/core/inc/flowfrm.hxx
index 3d271613bf6a..154fd37febf2 100644
--- a/sw/source/core/inc/flowfrm.hxx
+++ b/sw/source/core/inc/flowfrm.hxx
@@ -48,7 +48,7 @@ class SwNodeIndex;
 multiple base classes since the class tree splits exactly at the branch
 from SwFrame to SwContentFrame and SwLayoutFrame) also virtually from 
SwFrame as
 well. Unfortunately, this leads - besides problems with compilers and
-debugging programs - to high additional costs, that we IMHO are not able to
+debugging programs - too high additional costs, that we IMHO are not able 
to
 afford nowadays.
 
 Hence, we use another technique: A FlowFrame keeps a reference to a SwFrame

core.git: solenv/gbuild

[Andrea Gelmini (via logerrit)]

 solenv/gbuild/platform/com_MSC_defs.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d947d39bedbae88b19be99fd3b43c612a25ea500
Author: Andrea Gelmini 
AuthorDate: Mon Jun 3 15:49:26 2024 +0200
Commit: Julien Nabet 
CommitDate: Tue Jun 4 08:58:45 2024 +0200

Fix typo

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

diff --git a/solenv/gbuild/platform/com_MSC_defs.mk 
b/solenv/gbuild/platform/com_MSC_defs.mk
index 67aa47320c6c..ce1a1ed7ea5e 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -104,7 +104,7 @@ gb_AFLAGS := $(AFLAGS)
 
 # C4706: assignment within conditional expression
 
-# build-time penalty is to high for ci use/disable when JENKINS_HOME is set
+# build-time penalty is too high for ci use/disable when JENKINS_HOME is set
 MSVC_ANALYZE_FLAGS := $(if 
$(JENKINS_HOME),,-analyze:ruleset$(SRCDIR)/solenv/vs/LibreOffice.ruleset)
 
 gb_FilterOutClangCFLAGS += $(MSVC_ANALYZE_FLAGS)

core.git: basctl/source

[Zainab Abbasi (via logerrit)]

 basctl/source/inc/scriptdocument.hxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 606bde742eb94767c9713f58a7b844c0c2957d60
Author: Zainab Abbasi <101zabb...@gmail.com>
AuthorDate: Wed Apr 17 13:41:13 2024 -0700
Commit: Ilmari Lauhakangas 
CommitDate: Mon Jun 3 09:02:08 2024 +0200

tdf#157664 Drop operator !=, where respective operator == is defined

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

diff --git a/basctl/source/inc/scriptdocument.hxx 
b/basctl/source/inc/scriptdocument.hxx
index da7f2b50d307..d52dcb6c8c5f 100644
--- a/basctl/source/inc/scriptdocument.hxx
+++ b/basctl/source/inc/scriptdocument.hxx
@@ -152,7 +152,6 @@ namespace basctl
 
 // comparison
 bool operator==( const ScriptDocument& _rhs ) const;
-bool operator!=( const ScriptDocument& _rhs ) const { return !( *this 
== _rhs ); }
 
 /// retrieves a (pretty simple) hash code for the document
 sal_Int32   hashCode() const;

core.git: vcl/source

[Samuel Mehrbrodt (via logerrit)]

 vcl/source/control/imivctl1.cxx |   27 +++
 vcl/source/control/ivctrl.cxx   |4 ++--
 2 files changed, 17 insertions(+), 14 deletions(-)

New commits:
commit f6ea343e6fb2dc3539823dee60c9c6f96fc16275
Author: Samuel Mehrbrodt 
AuthorDate: Thu May 30 12:26:11 2024 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Mon Jun 3 09:32:06 2024 +0200

tdf#161030 Improve vertical Tab list display

* Increase width a bit to allow for longer tab names
* Avoid jumping while moving through the list with arrow keys

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

diff --git a/vcl/source/control/imivctl1.cxx b/vcl/source/control/imivctl1.cxx
index ea69fbcfb99b..dca91c7d4163 100644
--- a/vcl/source/control/imivctl1.cxx
+++ b/vcl/source/control/imivctl1.cxx
@@ -92,7 +92,7 @@ SvxIconChoiceCtrl_Impl::SvxIconChoiceCtrl_Impl(
 
aVisRectChangedIdle.SetInvokeHandler(LINK(this,SvxIconChoiceCtrl_Impl,VisRectChangedHdl));
 
 Clear( true );
-Size gridSize((nWinStyle & WB_DETAILS) ? 200 : 100, (nWinStyle & 
WB_DETAILS) ?  20 : 70);
+Size gridSize((nWinStyle & WB_DETAILS) ? 150 : 100, (nWinStyle & 
WB_DETAILS) ?  20 : 70);
 if(pView->GetDPIScaleFactor() > 1)
 {
   gridSize.setHeight( gridSize.Height() * ( pView->GetDPIScaleFactor()) );
@@ -1942,19 +1942,22 @@ void SvxIconChoiceCtrl_Impl::MakeVisible( const 
tools::Rectangle& rRect, bool bS
 else
 nDy = 0;
 
-tools::Long nDx;
-if( aVirtRect.Left() < aOutputArea.Left() )
-{
-// scroll to the left (nDx < 0)
-nDx = aVirtRect.Left() - aOutputArea.Left();
-}
-else if( aVirtRect.Right() > aOutputArea.Right() )
+tools::Long nDx = 0;
+
+// no horizontal scrolling needed in list mode
+if (!(nWinBits & WB_DETAILS))
 {
-// scroll to the right (nDx > 0)
-nDx = aVirtRect.Right() - aOutputArea.Right();
+if( aVirtRect.Left() < aOutputArea.Left() )
+{
+// scroll to the left (nDx < 0)
+nDx = aVirtRect.Left() - aOutputArea.Left();
+}
+else if( aVirtRect.Right() > aOutputArea.Right() )
+{
+// scroll to the right (nDx > 0)
+nDx = aVirtRect.Right() - aOutputArea.Right();
+}
 }
-else
-nDx = 0;
 
 aOrigin.AdjustX(nDx );
 aOrigin.AdjustY(nDy );
diff --git a/vcl/source/control/ivctrl.cxx b/vcl/source/control/ivctrl.cxx
index cb0c4e33d0c3..c17a0caf359d 100644
--- a/vcl/source/control/ivctrl.cxx
+++ b/vcl/source/control/ivctrl.cxx
@@ -447,9 +447,9 @@ VerticalTabControl::VerticalTabControl(vcl::Window* 
pParent, bool bWithIcons)
 SetType(WindowType::VERTICALTABCONTROL);
 m_xChooser->SetSelectionMode(SelectionMode::Single);
 m_xChooser->SetClickHdl(LINK(this, VerticalTabControl, ChosePageHdl_Impl));
-m_xChooser->set_width_request(110);
+m_xChooser->set_width_request(150);
 m_xChooser->set_height_request(400);
-m_xChooser->SetSizePixel(Size(110, 400));
+m_xChooser->SetSizePixel(Size(150, 400));
 m_xBox->set_vexpand(true);
 m_xBox->set_hexpand(true);
 m_xBox->set_expand(true);

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

[Armin Le Grand (allotropia) (via logerrit)]

 sc/source/ui/inc/output.hxx   |1 +
 sc/source/ui/view/output.cxx  |1 +
 sc/source/ui/view/output3.cxx |8 +++-
 3 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit c8d067868792e6de49bde70507bd30261d3fbd3d
Author: Armin Le Grand (allotropia) 
AuthorDate: Tue Apr 16 16:26:07 2024 +0200
Commit: Xisco Fauli 
CommitDate: Mon Jun 3 10:46:08 2024 +0200

tdf#160589: compare the correct OutDev with PageWindows

Change-Id: I29d9c60cac04536bb2d5ad2ed1c086c8e67a9f20
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166151
Tested-by: Jenkins
Reviewed-by: Armin Le Grand 
(cherry picked from commit 1e1a3825d76ed8071424e8e21bbda23464c10fff)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168317
Reviewed-by: Xisco Fauli 

diff --git a/sc/source/ui/inc/output.hxx b/sc/source/ui/inc/output.hxx
index e4763767b7f5..18d4aa1f2bbc 100644
--- a/sc/source/ui/inc/output.hxx
+++ b/sc/source/ui/inc/output.hxx
@@ -175,6 +175,7 @@ private:
 void adjustForHyperlinkInPDF(Point aURLStart, const OutputDevice* 
pDev);
 };
 
+VclPtr mpOriginalTargetDevice; // 'unpatched' TargetDevice
 VclPtr mpDev;// Device
 VclPtr mpRefDevice;  // printer if used for preview
 VclPtr pFmtDevice;   // reference for text formatting
diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx
index 9d0fe1430550..6f01dc052fa4 100644
--- a/sc/source/ui/view/output.cxx
+++ b/sc/source/ui/view/output.cxx
@@ -144,6 +144,7 @@ ScOutputData::ScOutputData( OutputDevice* pNewDev, 
ScOutputType eNewType,
 SCCOL nNewX1, SCROW nNewY1, SCCOL nNewX2, SCROW 
nNewY2,
 double nPixelPerTwipsX, double nPixelPerTwipsY,
 const Fraction* pZoomX, const Fraction* pZoomY ) :
+mpOriginalTargetDevice( pNewDev ),
 mpDev( pNewDev ),
 mpRefDevice( pNewDev ),  // default is output device
 pFmtDevice( pNewDev ),  // default is output device
diff --git a/sc/source/ui/view/output3.cxx b/sc/source/ui/view/output3.cxx
index bc6efec65400..760a62a12d1d 100644
--- a/sc/source/ui/view/output3.cxx
+++ b/sc/source/ui/view/output3.cxx
@@ -206,7 +206,13 @@ void ScOutputData::DrawSelectiveObjects(SdrLayerID nLayer)
 
 if(pPageView)
 {
-if (nullptr != pPageView->FindPageWindow(*mpDev))
+// tdf#160589 need to check for registered PaintWindow using 
the
+// 'original' TragetDevice, mpDev might have been changed by a
+// call to ::SetContentDevice. That again might patch in a
+// pre-render device fetched from 
SdrPaintWindow::GetTargetOutputDevice
+// and thus the test if target is aregistered PageWindow would 
fail
+assert(nullptr != mpOriginalTargetDevice && 
"mpOriginalTargetDevice *must* be set when constructing ScOutputData (!)");
+if (nullptr != 
pPageView->FindPageWindow(*mpOriginalTargetDevice))
 {
 // Target OutputDevice is registered for this view
 // (as it should be), we can just render

core.git: sw/source

[Caolán McNamara (via logerrit)]

 sw/source/filter/html/htmlgrin.cxx |4 ++--
 sw/source/filter/html/htmlplug.cxx |8 
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 24b06580577425681e22472ee68ab00e9c509a83
Author: Caolán McNamara 
AuthorDate: Sun Jun 2 12:19:41 2024 +0100
Commit: Caolán McNamara 
CommitDate: Mon Jun 3 11:21:01 2024 +0200

cid#1602448 Unchecked return value

and

cid#1602447 Unchecked return value
cid#1602444 Unchecked return value

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

diff --git a/sw/source/filter/html/htmlgrin.cxx 
b/sw/source/filter/html/htmlgrin.cxx
index 4b5a0d5e4bd5..c8c15997ab78 100644
--- a/sw/source/filter/html/htmlgrin.cxx
+++ b/sw/source/filter/html/htmlgrin.cxx
@@ -563,7 +563,7 @@ IMAGE_SETEVENT:
 SfxItemSet aItemSet( m_xDoc->GetAttrPool(), m_pCSS1Parser->GetWhichMap() );
 SvxCSS1PropertyInfo aPropInfo;
 if( HasStyleOptions( aStyle, aId, aClass ) )
-ParseStyleOptions( aStyle, aId, aClass, aItemSet, aPropInfo );
+(void)ParseStyleOptions( aStyle, aId, aClass, aItemSet, aPropInfo );
 
 SfxItemSetFixed aFrameSet( 
m_xDoc->GetAttrPool() );
 if( !IsNewDoc() )
@@ -1093,7 +1093,7 @@ void SwHTMLParser::InsertBodyOptions()
 SfxItemSet aItemSet( m_xDoc->GetAttrPool(), 
m_pCSS1Parser->GetWhichMap() );
 SvxCSS1PropertyInfo aPropInfo;
 OUString aDummy;
-ParseStyleOptions( aStyle, aDummy, aDummy, aItemSet, aPropInfo, 
nullptr, &aDir );
+(void)ParseStyleOptions( aStyle, aDummy, aDummy, aItemSet, aPropInfo, 
nullptr, &aDir );
 
 // Some attributes have to set on the page style, in fact the ones
 // which aren't inherited
diff --git a/sw/source/filter/html/htmlplug.cxx 
b/sw/source/filter/html/htmlplug.cxx
index 80453237045d..720a9a929647 100644
--- a/sw/source/filter/html/htmlplug.cxx
+++ b/sw/source/filter/html/htmlplug.cxx
@@ -453,7 +453,7 @@ bool SwHTMLParser::InsertEmbed()
 SfxItemSet aItemSet( m_xDoc->GetAttrPool(), m_pCSS1Parser->GetWhichMap() );
 SvxCSS1PropertyInfo aPropInfo;
 if( HasStyleOptions( aStyle, aId, aClass ) )
-ParseStyleOptions( aStyle, aId, aClass, aItemSet, aPropInfo );
+(void)ParseStyleOptions( aStyle, aId, aClass, aItemSet, aPropInfo );
 
 // Convert the default values (except height/width, which is done by 
SetFrameSize())
 if( eVertOri==text::VertOrientation::NONE && 
eHoriOri==text::HoriOrientation::NONE )
@@ -834,7 +834,7 @@ void SwHTMLParser::NewObject()
 SfxItemSet aItemSet( m_xDoc->GetAttrPool(), m_pCSS1Parser->GetWhichMap() );
 SvxCSS1PropertyInfo aPropInfo;
 if( HasStyleOptions( aStyle, aId, aClass ) )
-ParseStyleOptions( aStyle, aId, aClass, aItemSet, aPropInfo );
+(void)ParseStyleOptions( aStyle, aId, aClass, aItemSet, aPropInfo );
 
 SfxItemSet& rFrameSet = m_pAppletImpl->GetItemSet();
 if( !IsNewDoc() )
@@ -964,7 +964,7 @@ void SwHTMLParser::InsertApplet()
 SfxItemSet aItemSet( m_xDoc->GetAttrPool(), m_pCSS1Parser->GetWhichMap() );
 SvxCSS1PropertyInfo aPropInfo;
 if( HasStyleOptions( aStyle, aId, aClass ) )
-ParseStyleOptions( aStyle, aId, aClass, aItemSet, aPropInfo );
+(void)ParseStyleOptions( aStyle, aId, aClass, aItemSet, aPropInfo );
 
 SfxItemSet& rFrameSet = m_pAppletImpl->GetItemSet();
 if( !IsNewDoc() )
@@ -1148,7 +1148,7 @@ void SwHTMLParser::InsertFloatingFrame()
 SfxItemSet aItemSet( m_xDoc->GetAttrPool(), m_pCSS1Parser->GetWhichMap() );
 SvxCSS1PropertyInfo aPropInfo;
 if( HasStyleOptions( aStyle, aId, aClass ) )
-ParseStyleOptions( aStyle, aId, aClass, aItemSet, aPropInfo );
+(void)ParseStyleOptions( aStyle, aId, aClass, aItemSet, aPropInfo );
 
 // fetch the ItemSet
 SfxItemSetFixed aFrameSet( 
m_xDoc->GetAttrPool() );

core.git: sc/inc sc/source

[Noel Grandin (via logerrit)]

 sc/inc/SolverSettings.hxx|   56 
 sc/inc/appluno.hxx   |   72 +-
 sc/source/ui/app/drwtrans.cxx|8 -
 sc/source/ui/app/inputhdl.cxx|   12 -
 sc/source/ui/app/inputwin.cxx|   30 ++--
 sc/source/ui/app/msgpool.cxx |2 
 sc/source/ui/app/scdll.cxx   |2 
 sc/source/ui/app/scmod.cxx   |6 
 sc/source/ui/app/seltrans.cxx|2 
 sc/source/ui/attrdlg/attrdlg.cxx |   22 +--
 sc/source/ui/attrdlg/scuiexp.cxx |4 
 sc/source/ui/attrdlg/tabpages.cxx|   10 -
 sc/source/ui/cctrl/cbnumberformat.cxx|4 
 sc/source/ui/cctrl/checklistmenu.cxx |   54 
 sc/source/ui/cctrl/tbzoomsliderctrl.cxx  |   16 +-
 sc/source/ui/condformat/colorformat.cxx  |   30 ++--
 sc/source/ui/condformat/condformatdlg.cxx|   26 +--
 sc/source/ui/condformat/condformatdlgentry.cxx   |  126 +--
 sc/source/ui/condformat/condformateasydlg.cxx|   25 +--
 sc/source/ui/condformat/condformathelper.cxx |   12 -
 sc/source/ui/condformat/condformatmgr.cxx|   14 +-
 sc/source/ui/dataprovider/datatransformation.cxx |2 
 sc/source/ui/dialogs/SparklineDataRangeDialog.cxx|   12 -
 sc/source/ui/dialogs/SparklineDialog.cxx |   74 +--
 sc/source/ui/dialogs/searchresults.cxx   |8 -
 sc/source/ui/formdlg/dwfunctr.cxx|   26 +--
 sc/source/ui/formdlg/formula.cxx |2 
 sc/source/ui/inc/corodlg.hxx |8 -
 sc/source/ui/inc/docsh.hxx   |6 
 sc/source/ui/inc/dwfunctr.hxx|2 
 sc/source/ui/namedlg/namedefdlg.cxx  |2 
 sc/source/ui/namedlg/namedlg.cxx |6 
 sc/source/ui/namedlg/namepast.cxx|   11 -
 sc/source/ui/navipi/content.cxx  |   18 +-
 sc/source/ui/navipi/navipi.cxx   |   48 +++
 sc/source/ui/navipi/scenwnd.cxx  |8 -
 sc/source/ui/pagedlg/areasdlg.cxx|   36 ++---
 sc/source/ui/pagedlg/hfedtdlg.cxx|  116 -
 sc/source/ui/pagedlg/scuitphfedit.cxx|   46 +++---
 sc/source/ui/pagedlg/tphf.cxx|2 
 sc/source/ui/pagedlg/tptable.cxx |   48 +++
 sc/source/ui/sidebar/AlignmentPropertyPanel.cxx  |   38 ++---
 sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx |   16 +-
 sc/source/ui/sidebar/CellBorderStyleControl.cxx  |   10 -
 sc/source/ui/sidebar/CellLineStyleControl.cxx|6 
 sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx   |   34 ++---
 sc/source/ui/sidebar/ScPanelFactory.cxx  |   18 +-
 sc/source/ui/styleui/styledlg.cxx|   70 +-
 sc/source/ui/uitest/uiobject.cxx |   78 +--
 sc/source/ui/undo/undoblk3.cxx   |4 
 sc/source/ui/undo/undocell.cxx   |8 -
 sc/source/ui/undo/undotab.cxx|2 
 sc/source/ui/xmlsource/xmlsourcedlg.cxx  |   18 +-
 53 files changed, 660 insertions(+), 656 deletions(-)

New commits:
commit 83d0b6bd8da7495bc962b83a6638e2aaab90a5ae
Author: Noel Grandin 
AuthorDate: Mon Jun 3 09:11:36 2024 +0200
Commit: Noel Grandin 
CommitDate: Mon Jun 3 12:07:20 2024 +0200

loplugin:ostr in sc

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

diff --git a/sc/inc/SolverSettings.hxx b/sc/inc/SolverSettings.hxx
index 9d9b96ef975f..7f328ed89eed 100644
--- a/sc/inc/SolverSettings.hxx
+++ b/sc/inc/SolverSettings.hxx
@@ -248,39 +248,41 @@ private:
 // NonNegative: for MS compatibility, use 1 for selected and 2 for not 
selected
 typedef std::vector> TParamInfo;
 std::map SolverParamNames
-= { { "Integer", { SP_INTEGER, "solver_int", "bool" } },
-{ "NonNegative", { SP_NON_NEGATIVE, "solver_neg", "bool" } },
-{ "EpsilonLevel", { SP_EPSILON_LEVEL, "solver_eps", "int" } },
-{ "LimitBBDepth", { SP_LIMIT_BBDEPTH, "solver_bbd", "bool" } },
-{ "Timeout", { SP_TIMEOUT, "solver_tim", "int" } },
-{ "Algorithm", { SP_ALGORITHM, "solver_alg", "int" } },
+= { { u"Integer"_ustr, { SP_INTEGER, "solver_int", "bool" } },
+{ u"NonNegative"_ustr, { SP_NON_NEGATIVE, "solver_neg", "bool" } },
+{ u"EpsilonLevel"_ustr, { SP_EPSILON_LEVEL, "solver_eps", "int" } 
},
+{ u"LimitBBDepth"_ustr, { SP_LIMIT_BBDEPTH, "sol