compilerplugins/clang/constparams.cxx | 2 +- compilerplugins/clang/store/stringloop.cxx | 2 +- compilerplugins/clang/stringadd.cxx | 2 +- drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx | 2 +- ios/UnitTest/UnitTest.xcodeproj/project.pbxproj | 6 +++--- solenv/clang-format/excludelist | 4 ++-- vcl/Library_vcl.mk | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-)
New commits: commit c4c93d1a3ebfcf40bdfda28c1b269a1efc014895 Author: Christopher Sherlock <[email protected]> AuthorDate: Tue Sep 9 22:20:38 2025 +1000 Commit: Julien Nabet <[email protected]> CommitDate: Mon Sep 29 09:36:45 2025 +0200 vcl: pdfwriter_impl1.cxx and pdfwriter_impl2.cxx from gdi/ to pdf/ directory Update clang plugin. Change-Id: I0d862e8c08ef829d4f452108fec6176532af3ecb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190712 Tested-by: Julien Nabet <[email protected]> Reviewed-by: Julien Nabet <[email protected]> diff --git a/compilerplugins/clang/constparams.cxx b/compilerplugins/clang/constparams.cxx index 480352719b14..fffa735135e5 100644 --- a/compilerplugins/clang/constparams.cxx +++ b/compilerplugins/clang/constparams.cxx @@ -69,7 +69,7 @@ public: || loplugin::hasPathnamePrefix(fn, SRCDIR "/cppuhelper/source/compbase.cxx") || loplugin::hasPathnamePrefix(fn, SRCDIR "/comphelper/source/misc/compbase.cxx") || loplugin::hasPathnamePrefix(fn, SRCDIR "/unotools/source/misc/fontcvt.cxx") - || loplugin::hasPathnamePrefix(fn, SRCDIR "/vcl/source/gdi/pdfwriter_impl2.cxx") + || loplugin::hasPathnamePrefix(fn, SRCDIR "/vcl/source/pdf/pdfwriter_impl2.cxx") || loplugin::hasPathnamePrefix(fn, SRCDIR "/vcl/source/treelist/treelist.cxx") || loplugin::hasPathnamePrefix(fn, SRCDIR "/vcl/unx/gtk3/gloactiongroup.cxx") || loplugin::hasPathnamePrefix(fn, SRCDIR "/vcl/unx/gtk3/customcellrenderer.cxx") diff --git a/compilerplugins/clang/store/stringloop.cxx b/compilerplugins/clang/store/stringloop.cxx index 3bae1a225b1e..1f1da82e78aa 100644 --- a/compilerplugins/clang/store/stringloop.cxx +++ b/compilerplugins/clang/store/stringloop.cxx @@ -63,7 +63,7 @@ void StringLoop::run() return; if (loplugin::isSamePathname(fn, SRCDIR "/vcl/source/control/combobox.cxx")) return; - if (loplugin::isSamePathname(fn, SRCDIR "/vcl/source/gdi/pdfwriter_impl.cxx")) + if (loplugin::isSamePathname(fn, SRCDIR "/vcl/source/pdf/pdfwriter_impl.cxx")) return; if (loplugin::hasPathnamePrefix(fn, SRCDIR "/svtools/")) return; diff --git a/compilerplugins/clang/stringadd.cxx b/compilerplugins/clang/stringadd.cxx index 72ed12a40ef7..ecd2edea4be9 100644 --- a/compilerplugins/clang/stringadd.cxx +++ b/compilerplugins/clang/stringadd.cxx @@ -57,7 +57,7 @@ public: if (loplugin::hasPathnamePrefix(fn, SRCDIR "/sal/qa/OStringBuffer/")) return false; // TODO this file has a boatload of buffer appends' and I don't feel like fixing them all now - if (fn == SRCDIR "/vcl/source/gdi/pdfwriter_impl.cxx") + if (fn == SRCDIR "/vcl/source/pdf/pdfwriter_impl.cxx") return false; return true; } diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx index cd7be32ddb14..4188e32e0f1b 100644 --- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx @@ -2581,7 +2581,7 @@ void VclMetafileProcessor2D::processTransparencePrimitive2D( // MCGR extended possibilities. I checked what happens with the // MetaFloatTransparentAction added by OutputDevice::DrawTransparent, but // in most cases it gets converted to bitmap or even ignored, see e.g. - // - vcl/source/gdi/pdfwriter_impl2.cxx for PDF export + // - vcl/source/pdf/pdfwriter_impl2.cxx for PDF export // - vcl/source/filter/wmf/wmfwr.cxx -> does ignore TransparenceGradient completely // - vcl/source/filter/wmf/emfwr.cxx -> same // - vcl/source/filter/eps/eps.cxx -> same diff --git a/ios/UnitTest/UnitTest.xcodeproj/project.pbxproj b/ios/UnitTest/UnitTest.xcodeproj/project.pbxproj index ce48076bd696..d0088c7f0c4d 100644 --- a/ios/UnitTest/UnitTest.xcodeproj/project.pbxproj +++ b/ios/UnitTest/UnitTest.xcodeproj/project.pbxproj @@ -112,7 +112,7 @@ BEA20DC6216797C00032F67B /* base14.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = base14.cxx; path = ../../vcl/source/gdi/base14.cxx; sourceTree = "<group>"; }; BEA20DC7216797C00032F67B /* bmpfast.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = bmpfast.cxx; path = ../../vcl/source/gdi/bmpfast.cxx; sourceTree = "<group>"; }; BEA20DC8216797C00032F67B /* vectorgraphicdata.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = vectorgraphicdata.cxx; path = ../../vcl/source/gdi/vectorgraphicdata.cxx; sourceTree = "<group>"; }; - BEA20DC9216797C00032F67B /* pdfwriter_impl2.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = pdfwriter_impl2.cxx; path = ../../vcl/source/gdi/pdfwriter_impl2.cxx; sourceTree = "<group>"; }; + BEA20DC9216797C00032F67B /* pdfwriter_impl2.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = pdfwriter_impl2.cxx; path = ../../vcl/source/pdf/pdfwriter_impl2.cxx; sourceTree = "<group>"; }; BEA20DCA216797C00032F67B /* mapmod.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = mapmod.cxx; path = ../../vcl/source/gdi/mapmod.cxx; sourceTree = "<group>"; }; BEA20DCB216797C00032F67B /* bitmap3.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = bitmap3.cxx; path = ../../vcl/source/gdi/bitmap3.cxx; sourceTree = "<group>"; }; BEA20DCC216797C00032F67B /* pdfwriter.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = pdfwriter.cxx; path = ../../vcl/source/gdi/pdfwriter.cxx; sourceTree = "<group>"; }; @@ -151,14 +151,14 @@ BEA20DED216797C20032F67B /* lineinfo.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = lineinfo.cxx; path = ../../vcl/source/gdi/lineinfo.cxx; sourceTree = "<group>"; }; BEA20DEE216797C20032F67B /* animate.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = animate.cxx; path = ../../vcl/source/gdi/animate.cxx; sourceTree = "<group>"; }; BEA20DEF216797C20032F67B /* bmpacc.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = bmpacc.cxx; path = ../../vcl/source/gdi/bmpacc.cxx; sourceTree = "<group>"; }; - BEA20DF0216797C20032F67B /* pdfwriter_impl.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = pdfwriter_impl.cxx; path = ../../vcl/source/gdi/pdfwriter_impl.cxx; sourceTree = "<group>"; }; + BEA20DF0216797C20032F67B /* pdfwriter_impl.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = pdfwriter_impl.cxx; path = ../../vcl/source/pdf/pdfwriter_impl.cxx; sourceTree = "<group>"; }; BEA20DF1216797C20032F67B /* wall.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = wall.cxx; path = ../../vcl/source/gdi/wall.cxx; sourceTree = "<group>"; }; BEA20DF2216797C20032F67B /* impvect.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = impvect.cxx; path = ../../vcl/source/gdi/impvect.cxx; sourceTree = "<group>"; }; BEA20DF3216797C20032F67B /* impanmvw.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = impanmvw.cxx; path = ../../vcl/source/gdi/impanmvw.cxx; sourceTree = "<group>"; }; BEA20DF4216797C20032F67B /* print2.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = print2.cxx; path = ../../vcl/source/gdi/print2.cxx; sourceTree = "<group>"; }; BEA20DF5216797C20032F67B /* metaact.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = metaact.cxx; path = ../../vcl/source/gdi/metaact.cxx; sourceTree = "<group>"; }; BEA20DF6216797C20032F67B /* CommonSalLayout.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = CommonSalLayout.cxx; path = ../../vcl/source/gdi/CommonSalLayout.cxx; sourceTree = "<group>"; }; - BEA20DF7216797C20032F67B /* pdfwriter_impl.hxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = pdfwriter_impl.hxx; path = ../../vcl/source/gdi/pdfwriter_impl.hxx; sourceTree = "<group>"; }; + BEA20DF7216797C20032F67B /* pdfwriter_impl.hxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = pdfwriter_impl.hxx; path = ../../vcl/source/pdf/pdfwriter_impl.hxx; sourceTree = "<group>"; }; BEA20DF8216797C20032F67B /* dibtools.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dibtools.cxx; path = ../../vcl/source/gdi/dibtools.cxx; sourceTree = "<group>"; }; BEA20DF9216797C20032F67B /* sallayout.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sallayout.cxx; path = ../../vcl/source/gdi/sallayout.cxx; sourceTree = "<group>"; }; BEA20DFA216797C20032F67B /* bmpacc2.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = bmpacc2.cxx; path = ../../vcl/source/gdi/bmpacc2.cxx; sourceTree = "<group>"; }; diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index 5d1bd0e4377a..edbd40b13355 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -14680,8 +14680,6 @@ vcl/source/gdi/mapmod.cxx vcl/source/gdi/metaact.cxx vcl/source/gdi/mtfxmldump.cxx vcl/source/gdi/oldprintadaptor.cxx -vcl/source/gdi/pdfwriter_impl.cxx -vcl/source/gdi/pdfwriter_impl2.cxx vcl/source/gdi/print.cxx vcl/source/gdi/print2.cxx vcl/source/gdi/print3.cxx @@ -14744,6 +14742,8 @@ vcl/source/outdev/vclreferencebase.cxx vcl/source/outdev/wallpaper.cxx vcl/source/pdf/pdfextoutdevdata.cxx vcl/source/pdf/pdfwriter.cxx +vcl/source/pdf/pdfwriter_impl.cxx +vcl/source/pdf/pdfwriter_impl2.cxx vcl/source/pdf/pwdinteract.cxx vcl/source/text/ImplLayoutRuns.cxx vcl/source/text/textlayout.cxx diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index d080ee48d921..cef0fe92c2f4 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -342,8 +342,6 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/source/gdi/mapmod \ vcl/source/gdi/metaact \ vcl/source/gdi/oldprintadaptor \ - vcl/source/gdi/pdfwriter_impl2 \ - vcl/source/gdi/pdfwriter_impl \ vcl/source/gdi/print2 \ vcl/source/gdi/print3 \ vcl/source/gdi/print \ @@ -567,6 +565,8 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/source/pdf/pdfbuildin_fonts \ vcl/source/pdf/pdfextoutdevdata \ vcl/source/pdf/pdfwriter \ + vcl/source/pdf/pdfwriter_impl2 \ + vcl/source/pdf/pdfwriter_impl \ vcl/source/uitest/logger \ vcl/source/uitest/toolboxitemuiobject \ vcl/source/uitest/toolboxuiobject \ diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/pdf/pdfwriter_impl.cxx similarity index 100% rename from vcl/source/gdi/pdfwriter_impl.cxx rename to vcl/source/pdf/pdfwriter_impl.cxx diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/pdf/pdfwriter_impl2.cxx similarity index 100% rename from vcl/source/gdi/pdfwriter_impl2.cxx rename to vcl/source/pdf/pdfwriter_impl2.cxx
