From f61dbc302975aaa253b00ea6b141bb12474b3c95 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 21 Jan 2015 12:15:26 +0200 Subject: followup code removal after changing virtual methods to non-virtual This cleanups up indentation and removes dead classes. This is a followup patch to commit 272b1dd55797aacf511fb4342b0054e3697243f6 "new loplugin: change virtual methods to non-virtual" Change-Id: I1c2139589cf8cb23bb9808defe22c51039d38de1 --- xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx | 13 ----- .../source/cxxhelp/inc/util/CompressorIterator.hxx | 44 ----------------- xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx | 5 +- .../source/cxxhelp/inc/util/RandomAccessStream.hxx | 57 ---------------------- xmlhelp/source/cxxhelp/qe/DocGenerator.cxx | 3 -- xmlhelp/source/cxxhelp/util/Decompressor.cxx | 1 - 6 files changed, 1 insertion(+), 122 deletions(-) delete mode 100644 xmlhelp/source/cxxhelp/inc/util/CompressorIterator.hxx delete mode 100644 xmlhelp/source/cxxhelp/inc/util/RandomAccessStream.hxx (limited to 'xmlhelp') diff --git a/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx b/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx index 820ff70f3ae1..2221f053a298 100644 --- a/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx +++ b/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx @@ -22,7 +22,6 @@ #include #include #include -#include #include @@ -31,18 +30,6 @@ namespace xmlsearch { namespace qe { - class NonnegativeIntegerGenerator - { - public: - - static const sal_Int32 END; - - virtual ~NonnegativeIntegerGenerator() { }; - ; - ; - }; - - class RoleFiller { public: diff --git a/xmlhelp/source/cxxhelp/inc/util/CompressorIterator.hxx b/xmlhelp/source/cxxhelp/inc/util/CompressorIterator.hxx deleted file mode 100644 index f37884068f3d..000000000000 --- a/xmlhelp/source/cxxhelp/inc/util/CompressorIterator.hxx +++ /dev/null @@ -1,44 +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_XMLHELP_SOURCE_CXXHELP_INC_UTIL_COMPRESSORITERATOR_HXX -#define INCLUDED_XMLHELP_SOURCE_CXXHELP_INC_UTIL_COMPRESSORITERATOR_HXX - - -namespace xmlsearch { - - namespace util { - - class CompressorIterator - { - public: - ; - - protected: - ~CompressorIterator() {} - }; - - - } - -} - - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx b/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx index 6ca159e8a709..836dd586c3e0 100644 --- a/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx +++ b/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx @@ -21,7 +21,6 @@ #include #include -#include namespace xmlsearch { @@ -62,9 +61,7 @@ namespace xmlsearch { { public: - StreamDecompressor( RandomAccessStream* ) - { - } + StreamDecompressor() {} virtual ~StreamDecompressor() { } diff --git a/xmlhelp/source/cxxhelp/inc/util/RandomAccessStream.hxx b/xmlhelp/source/cxxhelp/inc/util/RandomAccessStream.hxx deleted file mode 100644 index efcebc85a830..000000000000 --- a/xmlhelp/source/cxxhelp/inc/util/RandomAccessStream.hxx +++ /dev/null @@ -1,57 +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_XMLHELP_SOURCE_CXXHELP_INC_UTIL_RANDOMACCESSSTREAM_HXX -#define INCLUDED_XMLHELP_SOURCE_CXXHELP_INC_UTIL_RANDOMACCESSSTREAM_HXX - -#include - -namespace xmlsearch { - - namespace util { - - - class RandomAccessStream - { - public: - - virtual ~RandomAccessStream() { }; - - // The calle is responsible for allocating the buffer - ; - ; - ; - ; - ; - - - protected: - - enum OPENFLAG { Read = osl_File_OpenFlag_Read, - Write = osl_File_OpenFlag_Write, - Create = osl_File_OpenFlag_Create }; - - }; - - - } -} - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlhelp/source/cxxhelp/qe/DocGenerator.cxx b/xmlhelp/source/cxxhelp/qe/DocGenerator.cxx index e64ddc7f817e..b96319f35f7c 100644 --- a/xmlhelp/source/cxxhelp/qe/DocGenerator.cxx +++ b/xmlhelp/source/cxxhelp/qe/DocGenerator.cxx @@ -25,9 +25,6 @@ using namespace xmlsearch; using namespace xmlsearch::qe; -const sal_Int32 NonnegativeIntegerGenerator::END = -1; - - RoleFiller RoleFiller::roleFiller_; diff --git a/xmlhelp/source/cxxhelp/util/Decompressor.cxx b/xmlhelp/source/cxxhelp/util/Decompressor.cxx index a52fb75bcf15..78f5ec8e273b 100644 --- a/xmlhelp/source/cxxhelp/util/Decompressor.cxx +++ b/xmlhelp/source/cxxhelp/util/Decompressor.cxx @@ -18,7 +18,6 @@ */ #include -#include using namespace xmlsearch; using namespace xmlsearch::util; -- cgit