sd/inc/drawdoc.hxx | 4 ++-- sd/source/core/drawdoc2.cxx | 2 +- sd/source/ui/view/frmview.cxx | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
New commits: commit 83a8572a99db1c6142568a8a7507f72c7a49ce25 Author: Swarnadeep Paul <[email protected]> AuthorDate: Sat Feb 28 12:07:32 2026 +0530 Commit: Michael Weghorn <[email protected]> CommitDate: Tue Mar 3 10:43:05 2026 +0100 tdf#114441 sd: Use size_t for container links Replaced platform-dependent sal_uLong with size_t for proper container size tracking. Change-Id: I58cdba8facfb5740c7540ac39908a6fca5c47cd5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200667 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx index a8a9267453f1..6a5c088e011e 100644 --- a/sd/inc/drawdoc.hxx +++ b/sd/inc/drawdoc.hxx @@ -857,7 +857,7 @@ public: SAL_DLLPRIVATE void InsertObject(SdrObject* pObj); SAL_DLLPRIVATE void RemoveObject(SdrObject* pObj); - SAL_DLLPRIVATE sal_uLong GetLinkCount() const; + SAL_DLLPRIVATE size_t GetLinkCount() const; SAL_DLLPRIVATE std::vector<std::unique_ptr<sd::FrameView>>& GetFrameViewList() { return maFrameViewList; } SdCustomShowList* GetCustomShowList(bool bCreate = false); @@ -877,7 +877,7 @@ public: SAL_DLLPRIVATE void NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool* pSPool ); SAL_DLLPRIVATE bool IsNewOrLoadCompleted() const {return mbNewOrLoadCompleted; } - SAL_DLLPRIVATE ::sd::FrameView* GetFrameView(sal_uLong nPos) { + SAL_DLLPRIVATE ::sd::FrameView* GetFrameView(size_t nPos) { return nPos < maFrameViewList.size() ? maFrameViewList[nPos].get() : nullptr; } /** deprecated*/ diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx index 8076a629f70f..c0c29e383ec4 100644 --- a/sd/source/core/drawdoc2.cxx +++ b/sd/source/core/drawdoc2.cxx @@ -955,7 +955,7 @@ bool SdDrawDocument::MovePages(sal_uInt16 nTargetPage, const std::vector<SdPage* } // Return number of links in sfx2::LinkManager -sal_uLong SdDrawDocument::GetLinkCount() const +size_t SdDrawDocument::GetLinkCount() const { return m_pLinkManager->GetLinks().size(); } diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx index e67e49830e9c..7c4168cc6cab 100644 --- a/sd/source/ui/view/frmview.cxx +++ b/sd/source/ui/view/frmview.cxx @@ -74,7 +74,7 @@ FrameView::FrameView(SdDrawDocument* pDrawDoc, FrameView* pFrameView /* = NULL * if ( pDocShell ) { // document is loaded, is there a FrameView? - sal_uLong nSdViewShellCount = 0; + size_t nSdViewShellCount = 0; SfxViewFrame* pSfxViewFrame = SfxViewFrame::GetFirst(pDocShell); while (pSfxViewFrame)
