[Libreoffice-commits] core.git: include/vcl unusedcode.easy vcl/inc vcl/Library_vcl.mk vcl/source
Takeshi Abe
tabe at fixedpoint.jp
Fri Dec 16 08:24:10 UTC 2016
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(-)
New commits:
commit 6ee75be645d605cbecd0ebda54303891acf25664
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Thu Dec 15 21:48:17 2016 +0900
vcl: Kill unused RenderSettings
Change-Id: Ie74d4f3258ef553b4febcc544204080d8c6e0f40
Reviewed-on: https://gerrit.libreoffice.org/32046
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Takeshi Abe <tabe at fixedpoint.jp>
diff --git a/include/vcl/rendersettings.hxx b/include/vcl/rendersettings.hxx
deleted file mode 100644
index d516dfc..0000000
--- 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 <vcl/window.hxx>
-#include <vcl/outdev.hxx>
-#include <vcl/outdevstate.hxx>
-
-namespace vcl
-{
-
-class VCL_DLLPUBLIC RenderSettings final
-{
- OutDevState maOutDevState;
- std::unique_ptr<Wallpaper> 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 8aa141e..1b5759b 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 7285029..e932550 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -74,10 +74,8 @@ std::_Rb_tree<rtl::OUString, std::pair<rtl::OUString const, (anonymous namespace
std::__cxx1998::vector<rtl::Reference<oox::xls::(anonymous namespace)::WorkerThread>, std::allocator<rtl::Reference<oox::xls::(anonymous namespace)::WorkerThread> > >::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<signed char> const&, com::sun::star::rendering::IntegerBitmapLayout const&, com::sun::star::geometry::IntegerRectangle2D const&)
vclcanvas::CanvasBitmapHelper::setPixel(com::sun::star::uno::Sequence<signed char> 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 5fd6a82..a57fdb4 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 7d32977..ec459c7 100644
--- a/vcl/inc/pch/precompiled_vcl.hxx
+++ b/vcl/inc/pch/precompiled_vcl.hxx
@@ -50,7 +50,6 @@
#include <unordered_map>
#include <utility>
#include <vector>
-#include <window.h>
#include <boost/functional/hash.hpp>
#include <boost/math/special_functions/sinc.hpp>
#include <boost/multi_array.hpp>
@@ -298,5 +297,6 @@
#include <unotools/configmgr.hxx>
#include <unotools/localedatawrapper.hxx>
#include <unotools/unotoolsdllapi.h>
+#include <window.h>
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/window.h b/vcl/inc/window.h
index 061996d..cb5d7e6 100644
--- a/vcl/inc/window.h
+++ b/vcl/inc/window.h
@@ -24,7 +24,6 @@
#include <tools/fract.hxx>
#include <vcl/idle.hxx>
-#include <vcl/rendersettings.hxx>
#include <o3tl/typed_flags_set.hxx>
#include <list>
diff --git a/vcl/source/gdi/impanmvw.cxx b/vcl/source/gdi/impanmvw.cxx
index c8616ef..185fee4 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 <window.h>
+#include "impanmvw.hxx"
+
#include <vcl/virdev.hxx>
#include <vcl/window.hxx>
#include <tools/helpers.hxx>
-#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 ab9d10d..0000000
--- 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 <vcl/rendersettings.hxx>
-
-namespace vcl
-{
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list