filter/source/flash/swfwriter1.cxx | 2 +-
include/svx/ehdl.hxx | 2 +-
sd/source/ui/tools/SlideshowLayerRenderer.cxx | 25 +++++++++++++++----------
sfx2/source/appl/appserv.cxx | 6 ------
svx/source/items/ehdl.cxx | 4 ++--
vcl/qa/cppunit/pdfexport/PDFEncryptionTest.cxx | 2 +-
6 files changed, 20 insertions(+), 21 deletions(-)
New commits:
commit 2cec8b364f3c5e440033507d14c98876dde69345
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Wed Mar 12 14:39:21 2025 +0100
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Wed Mar 12 15:58:03 2025 +0100
sd: fix in SlideshowLayerRenderer indent on this branch
The clang-format hook was not enabled + the forward-port was pushed
directly, probably.
Change-Id: I54f348af9d1cad319dd93aeda97c84c5aa6bd290
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182829
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
diff --git a/sd/source/ui/tools/SlideshowLayerRenderer.cxx
b/sd/source/ui/tools/SlideshowLayerRenderer.cxx
index bb8daa13cbda..20fc4a77e444 100644
--- a/sd/source/ui/tools/SlideshowLayerRenderer.cxx
+++ b/sd/source/ui/tools/SlideshowLayerRenderer.cxx
@@ -172,17 +172,23 @@ void changePolyPolys(
{
if (pBasePrimitive->getPrimitive2DID() ==
PRIMITIVE2D_ID_GROUPPRIMITIVE2D)
{
- auto& rGroupPrimitive =
static_cast<drawinglayer::primitive2d::GroupPrimitive2D&>(*pBasePrimitive);
- const drawinglayer::primitive2d::Primitive2DContainer& rChildren =
rGroupPrimitive.getChildren();
+ auto& rGroupPrimitive
+ =
static_cast<drawinglayer::primitive2d::GroupPrimitive2D&>(*pBasePrimitive);
+ const drawinglayer::primitive2d::Primitive2DContainer& rChildren
+ = rGroupPrimitive.getChildren();
changePolyPolys(rChildren, bRenderObject, rPrimitivesToUnhide);
}
else if (pBasePrimitive->getPrimitive2DID() ==
PRIMITIVE2D_ID_POLYPOLYGONCOLORPRIMITIVE2D
- || pBasePrimitive->getPrimitive2DID() ==
PRIMITIVE2D_ID_POLYPOLYGONGRADIENTPRIMITIVE2D
- || pBasePrimitive->getPrimitive2DID() ==
PRIMITIVE2D_ID_POLYPOLYGONGRAPHICPRIMITIVE2D
- || pBasePrimitive->getPrimitive2DID() ==
PRIMITIVE2D_ID_POLYPOLYGONHATCHPRIMITIVE2D
- || pBasePrimitive->getPrimitive2DID() ==
PRIMITIVE2D_ID_POLYPOLYGONHAIRLINEPRIMITIVE2D
- || pBasePrimitive->getPrimitive2DID() ==
PRIMITIVE2D_ID_UNIFIEDTRANSPARENCEPRIMITIVE2D
- || pBasePrimitive->getPrimitive2DID() ==
PRIMITIVE2D_ID_POLYPOLYGONRGBAPRIMITIVE2D)
+ || pBasePrimitive->getPrimitive2DID()
+ == PRIMITIVE2D_ID_POLYPOLYGONGRADIENTPRIMITIVE2D
+ || pBasePrimitive->getPrimitive2DID()
+ == PRIMITIVE2D_ID_POLYPOLYGONGRAPHICPRIMITIVE2D
+ || pBasePrimitive->getPrimitive2DID() ==
PRIMITIVE2D_ID_POLYPOLYGONHATCHPRIMITIVE2D
+ || pBasePrimitive->getPrimitive2DID()
+ == PRIMITIVE2D_ID_POLYPOLYGONHAIRLINEPRIMITIVE2D
+ || pBasePrimitive->getPrimitive2DID()
+ == PRIMITIVE2D_ID_UNIFIEDTRANSPARENCEPRIMITIVE2D
+ || pBasePrimitive->getPrimitive2DID() ==
PRIMITIVE2D_ID_POLYPOLYGONRGBAPRIMITIVE2D)
{
pBasePrimitive->setVisible(bRenderObject);
if (!bRenderObject)
@@ -636,8 +642,7 @@ SdrObject*
getObjectForShape(uno::Reference<drawing::XShape> const& xShape)
} // end anonymous namespace
SlideshowLayerRenderer::SlideshowLayerRenderer(SdrPage& rPage, const OString&
rSlideHash,
- bool bRenderBackground,
- bool bRenderMasterPage)
+ bool bRenderBackground, bool
bRenderMasterPage)
: mrPage(rPage)
, msSlideHash(rSlideHash)
, mrModel(rPage.getSdrModelFromSdrPage())
commit 29e7f2d87c2599409b3f5a7c1757bbbd57aef9f1
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Wed Mar 12 14:32:25 2025 +0100
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Wed Mar 12 15:57:53 2025 +0100
Fix clang loplugin warnings in various
- filter: fix loplugin:subtlezeroinit
/home/vmiklos/git/libreoffice/co-25.04-clang/filter/source/flash/swfwriter1.cxx:505:29:
error: if zero-initialization of 'KernArray' (aka 'vector<double>') is
intentional here, better make that more explicit (e.g., assigning to members,
default constructor, default member initializers, std::memset)
[loplugin:subtlezeroinit]
pOwnArray.reset(new KernArray());
^~~~~~~~~~~~~~~
1 error generated.
- sfx2: fix loplugin:unnecessaryoverride
/home/vmiklos/git/libreoffice/co-25.04-clang/sfx2/source/appl/appserv.cxx:319:23:
error: public virtual function just calls public parent
[loplugin:unnecessaryoverride]
virtual short run() override
~~~~~~~~~~~~~~^~~~~~~~~~~~~~
1 error generated.
- svx: fix loplugin:passparamsbyref
/home/vmiklos/git/libreoffice/co-25.04-clang/svx/source/items/ehdl.cxx:14:63:
error: passing 'rtl::OUString' by value, rather pass by const lvalue reference
[loplugin:passparamsbyref]
SvxErrorContext::SvxErrorContext(sal_uInt16 nCtxIdP, OUString aArgOne,
weld::Window* pWin)
~~~~~~~~~^~~~~~~
/home/vmiklos/git/libreoffice/co-25.04-clang/include/svx/ehdl.hxx:18:5:
note: function is declared here: [loplugin:passparamsbyref]
SvxErrorContext(sal_uInt16 nCtxIdP, OUString aArg1, weld::Window*
pWin);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1 error generated.
- sd: fix loplugin:redundantpointerops
/home/vmiklos/git/libreoffice/co-25.04-clang/sd/source/ui/tools/SlideshowLayerRenderer.cxx:175:95:
error: '*' followed by '.get()' operating on 'const
rtl::Reference<drawinglayer::primi
tive2d::BasePrimitive2D>', just use '*' [loplugin:redundantpointerops]
auto& rGroupPrimitive =
static_cast<drawinglayer::primitive2d::GroupPrimitive2D&>(*(pBasePrimitive.get()));
^~~~~~~~~~~~~~~~~~~~~~~
1 error generated.
- vcl: fix loplugin:staticconstexpr
/home/vmiklos/git/libreoffice/co-25.04-clang/vcl/qa/cppunit/pdfexport/PDFEncryptionTest.cxx:354:5:
error: function-local constexpr vars should be declared static
[loplugin:staticconstex
pr]
constexpr const auto aData = std::to_array<sal_uInt8>({ 'e', 'n',
'-', 'G', 'B' });
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1 error generated.
Change-Id: I8d442ff67586a920e18a68cb2d110b41cc762072
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182827
Tested-by: Miklos Vajna <vmik...@collabora.com>
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
diff --git a/filter/source/flash/swfwriter1.cxx
b/filter/source/flash/swfwriter1.cxx
index 38dc0416c928..3a6561d96786 100644
--- a/filter/source/flash/swfwriter1.cxx
+++ b/filter/source/flash/swfwriter1.cxx
@@ -502,7 +502,7 @@ void Writer::Impl_writeText(const Point& rPos, const
OUString& rText, const Kern
}
else
{
- pOwnArray.reset(new KernArray());
+ pOwnArray.reset(new KernArray);
aNormSize = Size(
basegfx::fround<tools::Long>(mpVDev->GetTextArray(rText,
pOwnArray.get()).nWidth),
0);
diff --git a/include/svx/ehdl.hxx b/include/svx/ehdl.hxx
index 553f8420396f..5b8028eb70a3 100644
--- a/include/svx/ehdl.hxx
+++ b/include/svx/ehdl.hxx
@@ -15,7 +15,7 @@
class SVX_DLLPUBLIC SvxErrorContext : public SfxErrorContext
{
public:
- SvxErrorContext(sal_uInt16 nCtxIdP, OUString aArg1, weld::Window* pWin);
+ SvxErrorContext(sal_uInt16 nCtxIdP, const OUString& aArg1, weld::Window*
pWin);
private:
virtual OUString Translate(TranslateId aId) const;
diff --git a/sd/source/ui/tools/SlideshowLayerRenderer.cxx
b/sd/source/ui/tools/SlideshowLayerRenderer.cxx
index 9e080a893138..bb8daa13cbda 100644
--- a/sd/source/ui/tools/SlideshowLayerRenderer.cxx
+++ b/sd/source/ui/tools/SlideshowLayerRenderer.cxx
@@ -172,7 +172,7 @@ void changePolyPolys(
{
if (pBasePrimitive->getPrimitive2DID() ==
PRIMITIVE2D_ID_GROUPPRIMITIVE2D)
{
- auto& rGroupPrimitive =
static_cast<drawinglayer::primitive2d::GroupPrimitive2D&>(*(pBasePrimitive.get()));
+ auto& rGroupPrimitive =
static_cast<drawinglayer::primitive2d::GroupPrimitive2D&>(*pBasePrimitive);
const drawinglayer::primitive2d::Primitive2DContainer& rChildren =
rGroupPrimitive.getChildren();
changePolyPolys(rChildren, bRenderObject, rPrimitivesToUnhide);
}
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index a6b8bac2a119..5691264dbb26 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -315,12 +315,6 @@ namespace
m_xBtnLicense->connect_clicked( LINK(this, LicenseDialog,
LicenseHdl) );
m_xBtnEula->connect_clicked( LINK(this, LicenseDialog, EulaHdl) );
}
-
- virtual short run() override
- {
- short nRet = GenericDialogController::run();
- return nRet;
- }
};
IMPL_LINK_NOARG(LicenseDialog, EulaHdl, weld::Button&, void)
diff --git a/svx/source/items/ehdl.cxx b/svx/source/items/ehdl.cxx
index 4cf6c4d3fa1c..18749c27d1d8 100644
--- a/svx/source/items/ehdl.cxx
+++ b/svx/source/items/ehdl.cxx
@@ -11,8 +11,8 @@
#include <svx/ehdl.hxx>
#include <svx/svxerr.hxx>
-SvxErrorContext::SvxErrorContext(sal_uInt16 nCtxIdP, OUString aArgOne,
weld::Window* pWin)
- : SfxErrorContext(nCtxIdP, aArgOne, pWin, RID_SVXERRCTX)
+SvxErrorContext::SvxErrorContext(sal_uInt16 nCtxIdP, const OUString& rArgOne,
weld::Window* pWin)
+ : SfxErrorContext(nCtxIdP, rArgOne, pWin, RID_SVXERRCTX)
{
}
diff --git a/vcl/qa/cppunit/pdfexport/PDFEncryptionTest.cxx
b/vcl/qa/cppunit/pdfexport/PDFEncryptionTest.cxx
index bcd5cdb32eec..2126cc0eb7f7 100644
--- a/vcl/qa/cppunit/pdfexport/PDFEncryptionTest.cxx
+++ b/vcl/qa/cppunit/pdfexport/PDFEncryptionTest.cxx
@@ -351,7 +351,7 @@ CPPUNIT_TEST_FIXTURE(PDFEncryptionTest, testFileEncryption)
=
parseHex("90e657b78c0315610f3f421bd396ff635fa8fe3cf2ea399e7e1ae23e6185b4fc");
std::vector<sal_uInt8> aIV = parseHex("d07efca5cce3c18fd8e344d45d826886");
- constexpr const auto aData = std::to_array<sal_uInt8>({ 'e', 'n', '-',
'G', 'B' });
+ static constexpr const auto aData = std::to_array<sal_uInt8>({ 'e', 'n',
'-', 'G', 'B' });
std::vector<sal_uInt8> aEncryptedBuffer;
