extensions/source/propctrlr/browserpage.cxx | 5 ++++- extensions/source/propctrlr/browserpage.hxx | 2 ++ sd/source/core/drawdoc2.cxx | 4 ++-- sd/source/filter/eppt/pptx-epptooxml.cxx | 8 ++++---- 4 files changed, 12 insertions(+), 7 deletions(-)
New commits: commit a9aabf92da9fd1c05c9ccb5b19fe9f7d1eee6a4a Author: Caolán McNamara <[email protected]> AuthorDate: Sat Jan 24 11:15:22 2026 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Sat Jan 24 20:32:03 2026 +0100 cid#1680364 silence Overflowed constant Change-Id: I108c14edd596360eb883e0bb166ef686d8c58d72 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198037 Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Jenkins diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx index 6614002a4315..21cb6e91694c 100644 --- a/sd/source/filter/eppt/pptx-epptooxml.cxx +++ b/sd/source/filter/eppt/pptx-epptooxml.cxx @@ -1985,9 +1985,9 @@ void PowerPointExport::ImplWriteSlideMaster(sal_uInt32 nPageNum, Reference< XPro } // Close the list tag if it was the last one - if (nPageNum == mnMasterPages - 1) + if (nPageNum + 1 == mnMasterPages) mPresentationFS->endElementNS(XML_p, XML_sldMasterIdLst); - if (mnCanvasMasterIndex == mnMasterPages - 1 && nPageNum == mnMasterPages - 2) + if (mnCanvasMasterIndex == mnMasterPages - 1 && nPageNum + 2 == mnMasterPages) mPresentationFS->endElementNS(XML_p, XML_sldMasterIdLst); return; @@ -2010,10 +2010,10 @@ void PowerPointExport::ImplWriteSlideMaster(sal_uInt32 nPageNum, Reference< XPro // if canvas master page is the last one, close the list tag before that if (mnCanvasMasterIndex == mnMasterPages - 1) { - if (nPageNum == mnMasterPages - 2) + if (nPageNum + 2 == mnMasterPages) mPresentationFS->endElementNS(XML_p, XML_sldMasterIdLst); } - if (nPageNum == mnMasterPages - 1) + if (nPageNum + 1 == mnMasterPages) mPresentationFS->endElementNS(XML_p, XML_sldMasterIdLst); FSHelperPtr pFS = commit 4fb7d83362e6451eaa88b84b66a7c85834a9dfb5 Author: Caolán McNamara <[email protected]> AuthorDate: Sat Jan 24 11:10:48 2026 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Sat Jan 24 20:31:56 2026 +0100 cid#1680369 silence Unintended sign extension and cid#1680362 Unintended sign extension Change-Id: I07e9d3ae1fdbe59b4c625e5ce0db235a77285294 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198035 Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Jenkins diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx index da94ff711768..8076a629f70f 100644 --- a/sd/source/core/drawdoc2.cxx +++ b/sd/source/core/drawdoc2.cxx @@ -1694,8 +1694,8 @@ void SdDrawDocument::populatePagePreviewsGrid() sal_uInt8 nFactor = 3; // TODO: this should also vary based on the available space - sal_uInt16 nGapWidth = 500; - sal_uInt16 nGapHeight = 500; + constexpr ::tools::Long nGapWidth = 500; + constexpr ::tools::Long nGapHeight = 500; ::tools::Long nPreviewWidth; ::tools::Long nPreviewHeight; commit f564cb430509d9e11955603ef76f4cce5b59bb40 Author: Caolán McNamara <[email protected]> AuthorDate: Sat Jan 24 11:08:02 2026 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Sat Jan 24 20:31:49 2026 +0100 cid#1680644 Uncaught exception and cid#1401474 Uncaught exception Change-Id: I8e13132f730c6ad6f4af5499226f0e3f4b7c22d8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198034 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/extensions/source/propctrlr/browserpage.cxx b/extensions/source/propctrlr/browserpage.cxx index b902802f8cc9..b2c4b6f95333 100644 --- a/extensions/source/propctrlr/browserpage.cxx +++ b/extensions/source/propctrlr/browserpage.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <o3tl/deleter.hxx> #include <vcl/svapp.hxx> #include "browserpage.hxx" @@ -30,12 +31,14 @@ OBrowserPage::OBrowserPage(weld::Container* pParent, weld::Container* pInitialCo { } -OBrowserPage::~OBrowserPage() +void OBrowserPage::ImplDestroy() { if (m_pParent) detach(); assert(!m_pParent); } + +OBrowserPage::~OBrowserPage() { suppress_fun_call_w_exception(ImplDestroy()); } } // namespace pcr /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/browserpage.hxx b/extensions/source/propctrlr/browserpage.hxx index 5595b4bbe67f..82553367cc93 100644 --- a/extensions/source/propctrlr/browserpage.hxx +++ b/extensions/source/propctrlr/browserpage.hxx @@ -32,6 +32,8 @@ private: std::unique_ptr<weld::Container> m_xContainer; OBrowserListBox m_aBrowserListBox; + void ImplDestroy(); + public: // TODO inherit from BuilderPage explicit OBrowserPage(weld::Container* pParent, weld::Container* pContainer);
