editeng/source/outliner/outlin2.cxx | 2 +-
include/editeng/outliner.hxx | 2 +-
sd/source/ui/sidebar/MasterPagesSelector.cxx | 4 ++--
sd/source/ui/sidebar/MasterPagesSelector.hxx | 2 +-
sd/source/ui/view/DocumentRenderer.cxx | 4 ++--
svx/source/svdraw/svdview.cxx | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 88986086f9d785491f7430a66bbc255dd737738b
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sat Dec 7 12:08:25 2024 +0000
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Sat Dec 7 15:20:04 2024 +0100
cid#1636582 Negative loop bound
Change-Id: Ib91ee62814837765f89f65a1204021e9d9610e53
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178035
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/editeng/source/outliner/outlin2.cxx
b/editeng/source/outliner/outlin2.cxx
index a0e384d1388f..18bf47edfe3f 100644
--- a/editeng/source/outliner/outlin2.cxx
+++ b/editeng/source/outliner/outlin2.cxx
@@ -308,7 +308,7 @@ bool Outliner::IsInUndo() const
return pEditEngine->IsInUndo();
}
-sal_uInt32 Outliner::GetLineCount( sal_Int32 nParagraph ) const
+sal_Int32 Outliner::GetLineCount( sal_Int32 nParagraph ) const
{
return pEditEngine->GetLineCount( nParagraph );
}
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index b18690050037..d1d46dc67326 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -866,7 +866,7 @@ public:
SAL_DLLPRIVATE const Link<Outliner*,void>& GetEndMovingHdl() const {return
aEndMovingHdl;}
SAL_DLLPRIVATE void SetEndMovingHdl( const
Link<Outliner*,void>& rLink){aEndMovingHdl=rLink;}
- sal_uInt32 GetLineCount( sal_Int32 nParagraph ) const;
+ sal_Int32 GetLineCount( sal_Int32 nParagraph ) const;
sal_Int32 GetLineLen( sal_Int32 nParagraph, sal_Int32 nLine )
const;
sal_uInt32 GetLineHeight( sal_Int32 nParagraph, sal_Int32 nLine
= 0 );
diff --git a/sd/source/ui/view/DocumentRenderer.cxx
b/sd/source/ui/view/DocumentRenderer.cxx
index 467c3fba4bc9..9812d963e604 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -921,8 +921,8 @@ namespace {
for (sal_Int32 i = 0; i < nParaCount && !bExit; ++i)
{
sal_Int32 nActualLineLen = 0;
- sal_uInt32 nLineCount = pOut->GetLineCount(i);
- for (sal_uInt32 j = 0; j < nLineCount; ++j)
+ sal_Int32 nLineCount = pOut->GetLineCount(i);
+ for (sal_Int32 j = 0; j < nLineCount; ++j)
{
nActualLineLen += pOut->GetLineLen(i, j);
sal_Int32 nLineHeight = pOut->GetLineHeight(i, j);
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index 33f7fb5913d1..3fac4208e6bc 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -1246,7 +1246,7 @@ OUString SdrView::GetStatusText()
// At the end of a line of any multi-line paragraph, we display the
// position of the next line of the same paragraph, if there is one.
sal_uInt16 nParaLine = 0;
- sal_uInt32 nParaLineCount =
mpTextEditOutliner->GetLineCount(aSel.end.nPara);
+ sal_Int32 nParaLineCount =
mpTextEditOutliner->GetLineCount(aSel.end.nPara);
bool bBrk = false;
while (!bBrk)
{
commit c812bb3fe730a68f7fd9e5a32a5e1be7a59f60a7
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sat Dec 7 12:17:55 2024 +0000
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Sat Dec 7 15:19:53 2024 +0100
cid#1636575 COPY_INSTEAD_OF_MOVE
and
cid#1636577 COPY_INSTEAD_OF_MOVE
cid#1636583 COPY_INSTEAD_OF_MOVE
Change-Id: Ic56139c5a17d8cc83d90afc78072ae073e99308c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178034
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
Tested-by: Jenkins
diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx
b/sd/source/ui/sidebar/MasterPagesSelector.cxx
index 2ee57bca11c3..33d87e4d919c 100644
--- a/sd/source/ui/sidebar/MasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx
@@ -466,9 +466,9 @@ void MasterPagesSelector::InvalidatePreview (const SdPage*
pPage)
}
}
-VclPtr<VirtualDevice> MasterPagesSelector::GetVirtualDevice(Image pImage)
+VclPtr<VirtualDevice> MasterPagesSelector::GetVirtualDevice(const Image&
rImage)
{
- BitmapEx aPreviewBitmap = pImage.GetBitmapEx();
+ BitmapEx aPreviewBitmap = rImage.GetBitmapEx();
VclPtr<VirtualDevice> pVDev = VclPtr<VirtualDevice>::Create();
const Point aNull(0, 0);
if (pVDev->GetDPIScaleFactor() > 1)
diff --git a/sd/source/ui/sidebar/MasterPagesSelector.hxx
b/sd/source/ui/sidebar/MasterPagesSelector.hxx
index 3eaf9851e317..b1c92b5d1c55 100644
--- a/sd/source/ui/sidebar/MasterPagesSelector.hxx
+++ b/sd/source/ui/sidebar/MasterPagesSelector.hxx
@@ -173,7 +173,7 @@ private:
sal_uInt16 nIndex,
MasterPageContainer::Token aToken);
- static VclPtr<VirtualDevice> GetVirtualDevice(Image pPreview);
+ static VclPtr<VirtualDevice> GetVirtualDevice(const Image& rPreview);
};
} // end of namespace sd::sidebar
