vcl/Library_vclplug_qt5.mk | 1 - vcl/Library_vclplug_qt6.mk | 1 - vcl/inc/qt5/QtPrinter.hxx | 30 ------------------------------ vcl/inc/qt6/QtPrinter.hxx | 12 ------------ vcl/qt5/QtInstance_Print.cxx | 3 +-- vcl/qt5/QtPrinter.cxx | 27 --------------------------- vcl/qt6/QtPrinter.cxx | 12 ------------ 7 files changed, 1 insertion(+), 85 deletions(-)
New commits: commit fc9bfac55364a76c683f3c2d63e41c54660545f8 Author: Michael Weghorn <[email protected]> AuthorDate: Mon Mar 2 02:34:27 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Mon Mar 2 17:12:31 2026 +0100 qt: Drop QtPrinter QtPrinter subclasses PspSalPrinter without adding any value on top of it. Drop QtPrinter and use PspSalPrinter directly. Change-Id: Id1c8a19b6dbe3e64af00d21616174a72775aa34a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200742 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/vcl/Library_vclplug_qt5.mk b/vcl/Library_vclplug_qt5.mk index 708dfff67fab..f57c014fbe70 100644 --- a/vcl/Library_vclplug_qt5.mk +++ b/vcl/Library_vclplug_qt5.mk @@ -150,7 +150,6 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_qt5,\ vcl/qt5/QtObject \ vcl/qt5/QtOpenGLContext \ vcl/qt5/QtPainter \ - vcl/qt5/QtPrinter \ vcl/qt5/QtSvpGraphics \ vcl/qt5/QtSvpSurface \ vcl/qt5/QtSystem \ diff --git a/vcl/Library_vclplug_qt6.mk b/vcl/Library_vclplug_qt6.mk index aa301c453db2..68a190fd2dfd 100644 --- a/vcl/Library_vclplug_qt6.mk +++ b/vcl/Library_vclplug_qt6.mk @@ -149,7 +149,6 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_qt6,\ vcl/qt6/QtObject \ vcl/qt6/QtOpenGLContext \ vcl/qt6/QtPainter \ - vcl/qt6/QtPrinter \ vcl/qt6/QtSvpGraphics \ vcl/qt6/QtSvpSurface \ vcl/qt6/QtSystem \ diff --git a/vcl/inc/qt5/QtPrinter.hxx b/vcl/inc/qt5/QtPrinter.hxx deleted file mode 100644 index 51b7cc7d9076..000000000000 --- a/vcl/inc/qt5/QtPrinter.hxx +++ /dev/null @@ -1,30 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#pragma once - -#include <unx/genprn.h> - -class QtPrinter final : public PspSalPrinter -{ -public: - QtPrinter(SalInfoPrinter* pInfoPrinter); -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/vcl/inc/qt6/QtPrinter.hxx b/vcl/inc/qt6/QtPrinter.hxx deleted file mode 100644 index eb37ba138bff..000000000000 --- a/vcl/inc/qt6/QtPrinter.hxx +++ /dev/null @@ -1,12 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#include "../qt5/QtPrinter.hxx" - -/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/vcl/qt5/QtInstance_Print.cxx b/vcl/qt5/QtInstance_Print.cxx index 1040cf5a63c5..84301b887e34 100644 --- a/vcl/qt5/QtInstance_Print.cxx +++ b/vcl/qt5/QtInstance_Print.cxx @@ -22,7 +22,6 @@ #include <string_view> #include <QtInstance.hxx> -#include <QtPrinter.hxx> #include <printerinfomanager.hxx> @@ -73,7 +72,7 @@ void QtInstance::DestroyInfoPrinter(SalInfoPrinter* pPrinter) { delete pPrinter; std::unique_ptr<SalPrinter> QtInstance::CreatePrinter(SalInfoPrinter* pInfoPrinter) { // create and initialize SalPrinter - QtPrinter* pPrinter = new QtPrinter(pInfoPrinter); + PspSalPrinter* pPrinter = new PspSalPrinter(pInfoPrinter); pPrinter->m_aJobData = static_cast<PspSalInfoPrinter*>(pInfoPrinter)->m_aJobData; return std::unique_ptr<SalPrinter>(pPrinter); diff --git a/vcl/qt5/QtPrinter.cxx b/vcl/qt5/QtPrinter.cxx deleted file mode 100644 index 58385a7a75c7..000000000000 --- a/vcl/qt5/QtPrinter.cxx +++ /dev/null @@ -1,27 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include <QtPrinter.hxx> - -QtPrinter::QtPrinter(SalInfoPrinter* pInfoPrinter) - : PspSalPrinter(pInfoPrinter) -{ -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/vcl/qt6/QtPrinter.cxx b/vcl/qt6/QtPrinter.cxx deleted file mode 100644 index c251333d5c36..000000000000 --- a/vcl/qt6/QtPrinter.cxx +++ /dev/null @@ -1,12 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#include "../qt5/QtPrinter.cxx" - -/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
