From 6ee75be645d605cbecd0ebda54303891acf25664 Mon Sep 17 00:00:00 2001 From: Takeshi Abe Date: Thu, 15 Dec 2016 21:48:17 +0900 Subject: vcl: Kill unused RenderSettings Change-Id: Ie74d4f3258ef553b4febcc544204080d8c6e0f40 Reviewed-on: https://gerrit.libreoffice.org/32046 Tested-by: Jenkins Reviewed-by: Takeshi Abe --- include/vcl/rendersettings.hxx | 34 ---------------------------------- include/vcl/window.hxx | 1 - unusedcode.easy | 2 -- vcl/Library_vcl.mk | 1 - vcl/inc/pch/precompiled_vcl.hxx | 2 +- vcl/inc/window.h | 1 - vcl/source/gdi/impanmvw.cxx | 5 +++-- vcl/source/outdev/rendersettings.cxx | 18 ------------------ 8 files changed, 4 insertions(+), 60 deletions(-) delete mode 100644 include/vcl/rendersettings.hxx delete mode 100644 vcl/source/outdev/rendersettings.cxx diff --git a/include/vcl/rendersettings.hxx b/include/vcl/rendersettings.hxx deleted file mode 100644 index d516dfcc41b3..000000000000 --- a/include/vcl/rendersettings.hxx +++ /dev/null @@ -1,34 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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/. - */ - -#ifndef INCLUDED_VCL_RENDERSETTINGS_HXX -#define INCLUDED_VCL_RENDERSETTINGS_HXX - -#include -#include -#include - -namespace vcl -{ - -class VCL_DLLPUBLIC RenderSettings final -{ - OutDevState maOutDevState; - std::unique_ptr mpBackground; - -public: - RenderSettings() - {} -}; - -} - -#endif // INCLUDED_VCL_RENDERSETTINGS_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index 8aa141e3ec09..1b5759b23f12 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -101,7 +101,6 @@ namespace dnd { namespace vcl { struct ControlLayoutData; - class RenderSettings; } namespace svt { class PopupWindowControllerImpl; } diff --git a/unusedcode.easy b/unusedcode.easy index 7285029d48d1..e93255042b4e 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -74,10 +74,8 @@ std::_Rb_tree, std::allocator > >::reserve(unsigned long) vcl::MapChar(vcl::TrueTypeFont*, unsigned short, bool) vcl::Region::IsInside(Rectangle const&) const -vcl::RenderSettings::PushAndApply(OutputDevice&) vcl::Window::DrawGradientWallpaper(OutputDevice&, long, long, long, long, Wallpaper const&) vcl::Window::DrawSelectionBackground(Rectangle const&, unsigned short, bool, bool, bool, Color*) -vcl::Window::GetRenderSettings() vcl::Window::SetDoubleBuffering(bool) vclcanvas::CanvasBitmapHelper::setData(com::sun::star::uno::Sequence const&, com::sun::star::rendering::IntegerBitmapLayout const&, com::sun::star::geometry::IntegerRectangle2D const&) vclcanvas::CanvasBitmapHelper::setPixel(com::sun::star::uno::Sequence const&, com::sun::star::rendering::IntegerBitmapLayout const&, com::sun::star::geometry::IntegerPoint2D const&) diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 5fd6a82f88cf..a57fdb4a7bc4 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -232,7 +232,6 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/source/outdev/textline \ vcl/source/outdev/pixel \ vcl/source/outdev/rect \ - vcl/source/outdev/rendersettings \ vcl/source/outdev/line \ vcl/source/outdev/polyline \ vcl/source/outdev/hatch \ diff --git a/vcl/inc/pch/precompiled_vcl.hxx b/vcl/inc/pch/precompiled_vcl.hxx index 7d3297788219..ec459c710e0e 100644 --- a/vcl/inc/pch/precompiled_vcl.hxx +++ b/vcl/inc/pch/precompiled_vcl.hxx @@ -50,7 +50,6 @@ #include #include #include -#include #include #include #include @@ -298,5 +297,6 @@ #include #include #include +#include /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/window.h b/vcl/inc/window.h index 061996dd856e..cb5d7e6f1548 100644 --- a/vcl/inc/window.h +++ b/vcl/inc/window.h @@ -24,7 +24,6 @@ #include #include -#include #include #include diff --git a/vcl/source/gdi/impanmvw.cxx b/vcl/source/gdi/impanmvw.cxx index c8616ef3ce49..185fee4b95f3 100644 --- a/vcl/source/gdi/impanmvw.cxx +++ b/vcl/source/gdi/impanmvw.cxx @@ -17,12 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include +#include "impanmvw.hxx" + #include #include #include -#include "impanmvw.hxx" +#include "window.h" ImplAnimView::ImplAnimView( Animation* pParent, OutputDevice* pOut, const Point& rPt, const Size& rSz, diff --git a/vcl/source/outdev/rendersettings.cxx b/vcl/source/outdev/rendersettings.cxx deleted file mode 100644 index ab9d10db0c4b..000000000000 --- a/vcl/source/outdev/rendersettings.cxx +++ /dev/null @@ -1,18 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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 - -namespace vcl -{ - -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit v1.2.3