From 363a25338e96f44ec01a7972bf46de884975ca06 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 20 Jul 2020 21:02:52 +0200 Subject: loplugin:unusedmethods Change-Id: I3520c2e97bb5b1611dcce77ca9f8393b29e75a1f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99110 Tested-by: Jenkins Reviewed-by: Noel Grandin --- comphelper/Library_comphelper.mk | 6 ---- comphelper/source/container/enumerablemap.cxx | 2 +- comphelper/source/inc/comphelper_module.hxx | 47 ------------------------ comphelper/source/misc/comphelper_module.cxx | 51 --------------------------- 4 files changed, 1 insertion(+), 105 deletions(-) delete mode 100644 comphelper/source/inc/comphelper_module.hxx delete mode 100644 comphelper/source/misc/comphelper_module.cxx (limited to 'comphelper') diff --git a/comphelper/Library_comphelper.mk b/comphelper/Library_comphelper.mk index 9a814e17d5bf..d2878d1d69a9 100644 --- a/comphelper/Library_comphelper.mk +++ b/comphelper/Library_comphelper.mk @@ -25,11 +25,6 @@ $(eval $(call gb_Library_use_custom_headers,comphelper,\ $(eval $(call gb_Library_set_componentfile,comphelper,comphelper/util/comphelp)) -$(eval $(call gb_Library_set_include,comphelper,\ - -I$(SRCDIR)/comphelper/source/inc \ - $$(INCLUDE) \ -)) - $(eval $(call gb_Library_set_precompiled_header,comphelper,comphelper/inc/pch/precompiled_comphelper)) $(eval $(call gb_Library_add_defs,comphelper,\ @@ -96,7 +91,6 @@ $(eval $(call gb_Library_add_exception_objects,comphelper,\ comphelper/source/misc/automationinvokedzone \ comphelper/source/misc/backupfilehelper \ comphelper/source/misc/base64 \ - comphelper/source/misc/comphelper_module \ comphelper/source/misc/componentbase \ comphelper/source/misc/componentmodule \ comphelper/source/misc/configuration \ diff --git a/comphelper/source/container/enumerablemap.cxx b/comphelper/source/container/enumerablemap.cxx index 55c2b9e28077..2add21d262b6 100644 --- a/comphelper/source/container/enumerablemap.cxx +++ b/comphelper/source/container/enumerablemap.cxx @@ -18,7 +18,6 @@ */ -#include #include #include #include @@ -30,6 +29,7 @@ #include #include #include +#include #include #include diff --git a/comphelper/source/inc/comphelper_module.hxx b/comphelper/source/inc/comphelper_module.hxx deleted file mode 100644 index aaa547649b8e..000000000000 --- a/comphelper/source/inc/comphelper_module.hxx +++ /dev/null @@ -1,47 +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_COMPHELPER_SOURCE_INC_COMPHELPER_MODULE_HXX -#define INCLUDED_COMPHELPER_SOURCE_INC_COMPHELPER_MODULE_HXX - -#include - - -namespace comphelper::module -{ - - - class ComphelperModule : public ::comphelper::OModule - { - friend struct ComphelperModuleCreator; - typedef ::comphelper::OModule BaseClass; - - public: - static ComphelperModule& getInstance(); - - private: - ComphelperModule(); - }; - -} // namespace comphelper::module - - -#endif // INCLUDED_COMPHELPER_SOURCE_INC_COMPHELPER_MODULE_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/comphelper/source/misc/comphelper_module.cxx b/comphelper/source/misc/comphelper_module.cxx deleted file mode 100644 index 9cf32546e1be..000000000000 --- a/comphelper/source/misc/comphelper_module.cxx +++ /dev/null @@ -1,51 +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 - - -namespace comphelper::module -{ - - - struct ComphelperModuleCreator - { - ComphelperModule m_aComphelperModule; - }; - namespace - { - class theComphelperModuleInstance : public rtl::Static {}; - } - - ComphelperModule::ComphelperModule() - :BaseClass() - { - } - - ComphelperModule& ComphelperModule::getInstance() - { - return theComphelperModuleInstance::get().m_aComphelperModule; - } - - -} // namespace comphelper::module - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit v1.2.3