summaryrefslogtreecommitdiff
path: root/comphelper
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2020-07-20 21:02:52 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-07-21 08:31:20 +0200
commit363a25338e96f44ec01a7972bf46de884975ca06 (patch)
treeb69d6f8e6ed72d546abe0de9efd729951f5d9233 /comphelper
parent751f4d4428339b508abb5ee3c1804e63f0cfd593 (diff)
loplugin:unusedmethods
Change-Id: I3520c2e97bb5b1611dcce77ca9f8393b29e75a1f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99110 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'comphelper')
-rw-r--r--comphelper/Library_comphelper.mk6
-rw-r--r--comphelper/source/container/enumerablemap.cxx2
-rw-r--r--comphelper/source/inc/comphelper_module.hxx47
-rw-r--r--comphelper/source/misc/comphelper_module.cxx51
4 files changed, 1 insertions, 105 deletions
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 <comphelper_module.hxx>
#include <comphelper/anytostring.hxx>
#include <comphelper/anycompare.hxx>
#include <comphelper/componentbase.hxx>
@@ -30,6 +29,7 @@
#include <com/sun/star/beans/IllegalTypeException.hpp>
#include <com/sun/star/beans/Pair.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
#include <cppuhelper/compbase3.hxx>
#include <cppuhelper/implbase.hxx>
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 <comphelper/componentmodule.hxx>
-
-
-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 <comphelper_module.hxx>
-
-
-namespace comphelper::module
-{
-
-
- struct ComphelperModuleCreator
- {
- ComphelperModule m_aComphelperModule;
- };
- namespace
- {
- class theComphelperModuleInstance : public rtl::Static<ComphelperModuleCreator, theComphelperModuleInstance> {};
- }
-
- ComphelperModule::ComphelperModule()
- :BaseClass()
- {
- }
-
- ComphelperModule& ComphelperModule::getInstance()
- {
- return theComphelperModuleInstance::get().m_aComphelperModule;
- }
-
-
-} // namespace comphelper::module
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */