diff options
author | Noel Grandin <noel@peralex.com> | 2016-05-16 10:11:04 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2016-05-18 10:03:44 +0000 |
commit | 2c8fe2e737b84ecd3dbac36a4fe6bd061bbd3bae (patch) | |
tree | 66ba7ff0b95cf5ceeda5e53294a71c6786460eb3 /filter | |
parent | 4e59eecc077d27dd9762e7c890b2aaf92a212959 (diff) |
update unusedmethods plugin to deal with constructors
and fix the operator< implementations in some of the other
plugins too.
Change-Id: Ie5631e0cdc8d2a994ad2af2533cdb558a6cfc035
Reviewed-on: https://gerrit.libreoffice.org/25057
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'filter')
-rw-r--r-- | filter/Library_xmlfa.mk | 1 | ||||
-rw-r--r-- | filter/source/flash/swfwriter.hxx | 1 | ||||
-rw-r--r-- | filter/source/flash/swfwriter2.cxx | 12 | ||||
-rw-r--r-- | filter/source/graphicfilter/icgm/cgmtypes.hxx | 8 | ||||
-rw-r--r-- | filter/source/svg/gfxtypes.hxx | 12 | ||||
-rw-r--r-- | filter/source/svg/svgfilter.hxx | 4 | ||||
-rw-r--r-- | filter/source/svg/svgwriter.hxx | 3 | ||||
-rw-r--r-- | filter/source/xmlfilteradaptor/streamwrap.cxx | 59 | ||||
-rw-r--r-- | filter/source/xmlfilteradaptor/streamwrap.hxx | 58 |
9 files changed, 0 insertions, 158 deletions
diff --git a/filter/Library_xmlfa.mk b/filter/Library_xmlfa.mk index 0f6cddcfd385..e23cd7d2df74 100644 --- a/filter/Library_xmlfa.mk +++ b/filter/Library_xmlfa.mk @@ -38,7 +38,6 @@ $(eval $(call gb_Library_use_libraries,xmlfa,\ $(eval $(call gb_Library_add_exception_objects,xmlfa,\ filter/source/xmlfilteradaptor/XmlFilterAdaptor \ filter/source/xmlfilteradaptor/genericfilter \ - filter/source/xmlfilteradaptor/streamwrap \ )) # vim: set noet sw=4 ts=4: diff --git a/filter/source/flash/swfwriter.hxx b/filter/source/flash/swfwriter.hxx index 69c66a7b7a5e..0a2ea581ce5c 100644 --- a/filter/source/flash/swfwriter.hxx +++ b/filter/source/flash/swfwriter.hxx @@ -188,7 +188,6 @@ public: void addRGB( const Color& rColor ); void addRect( const Rectangle& rRect ); void addMatrix( const ::basegfx::B2DHomMatrix& rMatrix ); // #i73264# - void addString( const char* pString ); void addStream( SvStream& rIn ); static void writeMatrix( SvStream& rOut, const ::basegfx::B2DHomMatrix& rMatrix ); // #i73264# diff --git a/filter/source/flash/swfwriter2.cxx b/filter/source/flash/swfwriter2.cxx index 3e06262d205c..4d6683eff79c 100644 --- a/filter/source/flash/swfwriter2.cxx +++ b/filter/source/flash/swfwriter2.cxx @@ -323,18 +323,6 @@ void Tag::writeMatrix( SvStream& rOut, const ::basegfx::B2DHomMatrix& rMatrix ) } -void Tag::addString( const char* pString ) -{ - if( pString ) - { - while( *pString ) - addUI8( *pString++ ); - } - - addUI8( 0 ); -} - - void Tag::addStream( SvStream& rIn ) { (*this).WriteStream( rIn ); diff --git a/filter/source/graphicfilter/icgm/cgmtypes.hxx b/filter/source/graphicfilter/icgm/cgmtypes.hxx index ef560ed4520b..8a6689d40ba2 100644 --- a/filter/source/graphicfilter/icgm/cgmtypes.hxx +++ b/filter/source/graphicfilter/icgm/cgmtypes.hxx @@ -25,7 +25,6 @@ struct FloatPoint double X; double Y; FloatPoint():X(0), Y(0){}; - FloatPoint( const double& rX, const double& rY ) { X = rX; Y = rY; }; }; struct FloatRect @@ -35,13 +34,6 @@ struct FloatRect double Right; double Bottom; FloatRect():Left(0), Top(0), Right(0), Bottom(0){}; - FloatRect( const FloatPoint& rTopLeft, const FloatPoint& rBottomRight ) - { - Left = rTopLeft.X; - Top = rTopLeft.Y; - Right = rBottomRight.X; - Bottom = rBottomRight.Y; - } void Justify() { double fTemp; diff --git a/filter/source/svg/gfxtypes.hxx b/filter/source/svg/gfxtypes.hxx index ff091892ab3e..9f9d38024fb0 100644 --- a/filter/source/svg/gfxtypes.hxx +++ b/filter/source/svg/gfxtypes.hxx @@ -28,24 +28,12 @@ struct ARGBColor {} explicit ARGBColor(double fGrey) : a(1.0), r(fGrey), g(fGrey), b(fGrey) {} - ARGBColor( double r_, double g_, double b_ ) : - a(1.0), r(r_), g(g_), b(b_) - {} - ARGBColor( double a_, double r_, double g_, double b_ ) : - a(a_), r(r_), g(g_), b(b_) - {} ARGBColor( int r_, int g_, int b_ ) : a(1.0), r(toDoubleColor(sal::static_int_cast<sal_uInt8>(r_))), g(toDoubleColor(sal::static_int_cast<sal_uInt8>(g_))), b(toDoubleColor(sal::static_int_cast<sal_uInt8>(b_))) {} - ARGBColor( int a_, int r_, int g_, int b_ ) : - a(toDoubleColor(sal::static_int_cast<sal_uInt8>(a_))), - r(toDoubleColor(sal::static_int_cast<sal_uInt8>(r_))), - g(toDoubleColor(sal::static_int_cast<sal_uInt8>(g_))), - b(toDoubleColor(sal::static_int_cast<sal_uInt8>(b_))) - {} double a; double r; double g; diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx index 0d4008c14707..dab095db6d06 100644 --- a/filter/source/svg/svgfilter.hxx +++ b/filter/source/svg/svgfilter.hxx @@ -118,10 +118,6 @@ protected: virtual void ExportContent_() override {} virtual void ExportMasterStyles_() override {} virtual sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum /* eClass */ ) override { return 0; } - -private: - - SVGExport(); }; class ObjectRepresentation diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx index 132d93b110a0..6b056f743950 100644 --- a/filter/source/svg/svgwriter.hxx +++ b/filter/source/svg/svgwriter.hxx @@ -89,8 +89,6 @@ private: SVGFontExport& mrFontExport; SvXMLElementExport* mpElemFont; - SVGAttributeWriter(); - static double ImplRound( double fVal ); public: @@ -349,7 +347,6 @@ class SVGWriter : public cppu::WeakImplHelper< XSVGWriter > private: Reference< XComponentContext > mxContext; Sequence< css::beans::PropertyValue > maFilterData; - SVGWriter(); public: explicit SVGWriter( const Sequence<Any>& args, diff --git a/filter/source/xmlfilteradaptor/streamwrap.cxx b/filter/source/xmlfilteradaptor/streamwrap.cxx deleted file mode 100644 index bcc2d97cb753..000000000000 --- a/filter/source/xmlfilteradaptor/streamwrap.cxx +++ /dev/null @@ -1,59 +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/. - * - * 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 "streamwrap.hxx" -#include <osl/file.hxx> - -namespace foo -{ - -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::io; -using namespace ::com::sun::star::lang; -using namespace ::osl; - - -//= OOutputStreamWrapper - - -void SAL_CALL OOutputStreamWrapper::writeBytes(const css::uno::Sequence< sal_Int8 >& aData) throw( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception ) -{ - sal_uInt64 nWritten = 0; - rStream.write(aData.getConstArray(),aData.getLength(),nWritten); - if (nWritten != (sal_uInt64)aData.getLength()) - { - throw css::io::BufferSizeExceededException(OUString(),static_cast<css::uno::XWeak*>(this)); - } -} - - -void SAL_CALL OOutputStreamWrapper::flush() throw( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception ) -{ -} - - -void SAL_CALL OOutputStreamWrapper::closeOutput() throw( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception ) -{ -} - -} // namespace utl - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/xmlfilteradaptor/streamwrap.hxx b/filter/source/xmlfilteradaptor/streamwrap.hxx deleted file mode 100644 index 1f57e31573e0..000000000000 --- a/filter/source/xmlfilteradaptor/streamwrap.hxx +++ /dev/null @@ -1,58 +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/. - * - * 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 . - */ -#ifndef INCLUDED_FILTER_SOURCE_XMLFILTERADAPTOR_STREAMWRAP_HXX -#define INCLUDED_FILTER_SOURCE_XMLFILTERADAPTOR_STREAMWRAP_HXX - -#include <osl/mutex.hxx> -#include <com/sun/star/io/XOutputStream.hpp> -#include <com/sun/star/io/XInputStream.hpp> -#include <com/sun/star/io/XSeekable.hpp> -#include <cppuhelper/implbase.hxx> - -namespace osl -{ - class File; -} - -namespace foo -{ - -//= OOutputStreamWrapper - -typedef ::cppu::WeakImplHelper<css::io::XOutputStream> OutputStreamWrapper_Base; - // needed for some compilers -class OOutputStreamWrapper : public OutputStreamWrapper_Base -{ - ::osl::File& rStream; - -public: - explicit OOutputStreamWrapper(osl::File& _rStream) :rStream(_rStream) { } - -// css::io::XOutputStream - virtual void SAL_CALL writeBytes(const css::uno::Sequence< sal_Int8 >& aData) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL flush() throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL closeOutput() throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception) override; -}; - -} // namespace utl - - -#endif // INCLUDED_FILTER_SOURCE_XMLFILTERADAPTOR_STREAMWRAP_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |