vcl/backendtest/VisualBackendTest.cxx | 3 --- vcl/backendtest/outputdevice/polyline.cxx | 3 --- vcl/headless/BitmapHelper.cxx | 3 ++- vcl/headless/CairoCommon.cxx | 8 +++++--- vcl/headless/SvpGraphicsBackend.cxx | 6 ------ vcl/headless/svpbmp.cxx | 7 +------ vcl/headless/svpdummies.cxx | 2 -- vcl/headless/svpframe.cxx | 2 -- vcl/headless/svpgdi.cxx | 5 ----- vcl/headless/svpinst.cxx | 4 ---- vcl/headless/svpprn.cxx | 4 ---- vcl/headless/svptext.cxx | 5 +---- vcl/headless/svpvd.cxx | 2 -- vcl/jsdialog/jsdialogbuilder.cxx | 7 ------- 14 files changed, 9 insertions(+), 52 deletions(-)
New commits: commit 7eebe680068f68d2e4081c2f4d9b290a4524d40a Author: Rafał Dobrakowski <dobrakowskira...@gmail.com> AuthorDate: Sun Mar 10 22:31:43 2024 +0100 Commit: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de> CommitDate: Wed Mar 13 09:31:09 2024 +0100 tdf#146619 Remove unused #includes from C/C++ files the 'vcl' module was cleaned. Change-Id: I3bc7470d08bd5eae46344975293a1f6ae30b30f5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164637 Tested-by: Jenkins Reviewed-by: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de> diff --git a/vcl/backendtest/VisualBackendTest.cxx b/vcl/backendtest/VisualBackendTest.cxx index cbcf881bc788..221f18254389 100644 --- a/vcl/backendtest/VisualBackendTest.cxx +++ b/vcl/backendtest/VisualBackendTest.cxx @@ -7,12 +7,10 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <math.h> #include <sal/log.hxx> #include <comphelper/processfactory.hxx> #include <cppuhelper/bootstrap.hxx> -#include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> @@ -28,7 +26,6 @@ #include <basegfx/numeric/ftools.hxx> #include <comphelper/diagnose_ex.hxx> -#include <chrono> #include <iostream> #include <test/outputdevice.hxx> diff --git a/vcl/backendtest/outputdevice/polyline.cxx b/vcl/backendtest/outputdevice/polyline.cxx index d187d4addd3b..3deed34ca76a 100644 --- a/vcl/backendtest/outputdevice/polyline.cxx +++ b/vcl/backendtest/outputdevice/polyline.cxx @@ -10,9 +10,6 @@ #include <test/outputdevice.hxx> -#include <cmath> -#include <vector> - namespace vcl::test { namespace diff --git a/vcl/headless/BitmapHelper.cxx b/vcl/headless/BitmapHelper.cxx index 43f529979c7b..312123b7cf3d 100644 --- a/vcl/headless/BitmapHelper.cxx +++ b/vcl/headless/BitmapHelper.cxx @@ -18,7 +18,8 @@ */ #include <headless/BitmapHelper.hxx> -#include <svdata.hxx> +#include <vcl/cairo.hxx> +#include <vcl/svapp.hxx> #include <utility> BitmapHelper::BitmapHelper(const SalBitmap& rSourceBitmap, const bool bForceARGB32) diff --git a/vcl/headless/CairoCommon.cxx b/vcl/headless/CairoCommon.cxx index 51a937d623ee..182a44b9aaf2 100644 --- a/vcl/headless/CairoCommon.cxx +++ b/vcl/headless/CairoCommon.cxx @@ -17,16 +17,18 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <vcl/gradient.hxx> +#include <vcl/svapp.hxx> #include <headless/BitmapHelper.hxx> #include <headless/CairoCommon.hxx> -#include <dlfcn.h> +#ifdef ANDROID +#include <vcl/cairo.hxx> // for correct compilation in only android +#endif #include <vcl/BitmapTools.hxx> #include <SalGradient.hxx> -#include <svdata.hxx> #include <tools/helpers.hxx> #include <basegfx/utils/canvastools.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> -#include <basegfx/polygon/b2dpolypolygontools.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/range/b2irange.hxx> #include <comphelper/configuration.hxx> diff --git a/vcl/headless/SvpGraphicsBackend.cxx b/vcl/headless/SvpGraphicsBackend.cxx index e8d582b98fcc..ead5936276d3 100644 --- a/vcl/headless/SvpGraphicsBackend.cxx +++ b/vcl/headless/SvpGraphicsBackend.cxx @@ -19,12 +19,6 @@ #include <headless/SvpGraphicsBackend.hxx> -#include <sal/log.hxx> -#include <basegfx/matrix/b2dhommatrixtools.hxx> -#include <basegfx/polygon/b2dpolygontools.hxx> -#include <vcl/BitmapTools.hxx> -#include <headless/BitmapHelper.hxx> - SvpGraphicsBackend::SvpGraphicsBackend(CairoCommon& rCairoCommon) : m_rCairoCommon(rCairoCommon) { diff --git a/vcl/headless/svpbmp.cxx b/vcl/headless/svpbmp.cxx index 328822f78c77..23a0d094d009 100644 --- a/vcl/headless/svpbmp.cxx +++ b/vcl/headless/svpbmp.cxx @@ -21,13 +21,8 @@ #include <sal/log.hxx> #include <cstring> - +#include <vcl/cairo.hxx> #include <headless/svpbmp.hxx> -#include <headless/svpgdi.hxx> -#include <headless/svpinst.hxx> - -#include <basegfx/vector/b2ivector.hxx> -#include <basegfx/range/b2ibox.hxx> #include <o3tl/safeint.hxx> #include <tools/helpers.hxx> #include <vcl/bitmap.hxx> diff --git a/vcl/headless/svpdummies.cxx b/vcl/headless/svpdummies.cxx index 944d494976ca..b0dd9c9438d4 100644 --- a/vcl/headless/svpdummies.cxx +++ b/vcl/headless/svpdummies.cxx @@ -17,9 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <rtl/ustrbuf.hxx> #include <headless/svpdummies.hxx> -#include <headless/svpinst.hxx> SvpSalObject::~SvpSalObject() { diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx index e0971f85b9ac..c31ae5e89970 100644 --- a/vcl/headless/svpframe.cxx +++ b/vcl/headless/svpframe.cxx @@ -18,8 +18,6 @@ */ #include <comphelper/lok.hxx> -#include <o3tl/safeint.hxx> -#include <vcl/syswin.hxx> #include <sal/log.hxx> #include <headless/svpframe.hxx> diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx index c9edd7e9a19c..81a35471dcc7 100644 --- a/vcl/headless/svpgdi.cxx +++ b/vcl/headless/svpgdi.cxx @@ -17,11 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <config_features.h> - -#include <memory> -#include <numeric> - #include <headless/svpgdi.hxx> #include <comphelper/lok.hxx> diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx index 19eef8997689..472ba6357f12 100644 --- a/vcl/headless/svpinst.cxx +++ b/vcl/headless/svpinst.cxx @@ -17,17 +17,14 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <config_features.h> #include <sal/config.h> #include <mutex> #include <pthread.h> #include <sys/time.h> -#include <poll.h> #include <sal/types.h> -#include <sal/log.hxx> #include <vcl/virdev.hxx> #include <vcl/inputtypes.hxx> @@ -51,7 +48,6 @@ #include <svdata.hxx> // FIXME: remove when we re-work the svp mainloop #include <unx/salunxtime.h> -#include <comphelper/lok.hxx> #include <tools/debug.hxx> SvpSalInstance* SvpSalInstance::s_pDefaultInstance = nullptr; diff --git a/vcl/headless/svpprn.cxx b/vcl/headless/svpprn.cxx index 6c40a0fd8d2f..4d81b7c3fd1a 100644 --- a/vcl/headless/svpprn.cxx +++ b/vcl/headless/svpprn.cxx @@ -22,14 +22,10 @@ #include <string_view> #include <vcl/svapp.hxx> -#include <vcl/timer.hxx> -#include <vcl/QueueInfo.hxx> #include <printerinfomanager.hxx> #include <jobset.h> #include <print.h> -#include <salptype.hxx> -#include <svdata.hxx> #include <unx/genpspgraphics.h> diff --git a/vcl/headless/svptext.cxx b/vcl/headless/svptext.cxx index 297523b8b356..ff9653aa6f6d 100644 --- a/vcl/headless/svptext.cxx +++ b/vcl/headless/svptext.cxx @@ -17,11 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <sal/config.h> - -#include <sal/types.h> #include <vcl/fontcharmap.hxx> -#include <basegfx/range/b2ibox.hxx> +#include <sal/config.h> #include <headless/svpgdi.hxx> #include <font/FontMetricData.hxx> #include <sallayout.hxx> diff --git a/vcl/headless/svpvd.cxx b/vcl/headless/svpvd.cxx index c65951e02964..d2b96f6253cf 100644 --- a/vcl/headless/svpvd.cxx +++ b/vcl/headless/svpvd.cxx @@ -19,8 +19,6 @@ #ifndef IOS -#include <headless/svpbmp.hxx> -#include <headless/svpinst.hxx> #include <headless/svpvd.hxx> #include <headless/svpgdi.hxx> diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx index 38b3a9e2922d..08a3f53b6059 100644 --- a/vcl/jsdialog/jsdialogbuilder.cxx +++ b/vcl/jsdialog/jsdialogbuilder.cxx @@ -10,9 +10,7 @@ #include <jsdialog/jsdialogbuilder.hxx> #include <sal/log.hxx> #include <comphelper/base64.hxx> -#include <comphelper/lok.hxx> #include <utility> -#include <vcl/tabpage.hxx> #include <vcl/toolbox.hxx> #include <vcl/toolkit/button.hxx> #include <vcl/toolkit/combobox.hxx> @@ -23,16 +21,11 @@ #include <LibreOfficeKit/LibreOfficeKitEnums.h> #include <messagedialog.hxx> #include <tools/json_writer.hxx> -#include <o3tl/deleter.hxx> #include <memory> -#include <boost/property_tree/json_parser.hpp> #include <vcl/jsdialog/executor.hxx> #include <cppuhelper/supportsservice.hxx> - #include <tools/stream.hxx> - #include <vcl/cvtgrf.hxx> - #include <wizdlg.hxx> static std::map<OUString, vcl::Window*>& GetLOKPopupsMap()