diff options
author | Eike Rathke <erack@redhat.com> | 2018-10-12 22:38:31 +0200 |
---|---|---|
committer | Eike Rathke <erack@redhat.com> | 2018-10-13 00:33:16 +0200 |
commit | c0bf396a566f94b0999357dcdca10cf2eb03b5bc (patch) | |
tree | 31644daba521aa147e0e17151e69ad565d0e9869 | |
parent | e888ed185e9e4b254409959c7978e4d84f70d846 (diff) |
Ditch now unused class UserInformation and userinformation.?xx
... one class with one member variable holding one string for one
instantiation ...
Change-Id: I033312ed1c05c181e7077b4b1a0d988cfb80eb33
Reviewed-on: https://gerrit.libreoffice.org/61734
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins
-rw-r--r-- | dbaccess/Library_dba.mk | 1 | ||||
-rw-r--r-- | dbaccess/source/core/dataaccess/ModelImpl.cxx | 1 | ||||
-rw-r--r-- | dbaccess/source/core/dataaccess/datasource.cxx | 1 | ||||
-rw-r--r-- | dbaccess/source/core/inc/userinformation.hxx | 39 | ||||
-rw-r--r-- | dbaccess/source/core/misc/userinformation.cxx | 33 | ||||
-rw-r--r-- | solenv/clang-format/blacklist | 2 |
6 files changed, 0 insertions, 77 deletions
diff --git a/dbaccess/Library_dba.mk b/dbaccess/Library_dba.mk index fe80f157887b..126f3a77211d 100644 --- a/dbaccess/Library_dba.mk +++ b/dbaccess/Library_dba.mk @@ -121,7 +121,6 @@ $(eval $(call gb_Library_add_exception_objects,dba,\ dbaccess/source/core/misc/PropertyForward \ dbaccess/source/core/misc/sdbcoretools \ dbaccess/source/core/misc/services \ - dbaccess/source/core/misc/userinformation \ dbaccess/source/core/misc/veto \ dbaccess/source/core/recovery/dbdocrecovery \ dbaccess/source/core/recovery/settingsimport \ diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx index 64bc6b16e8bd..4f360bfc1ee9 100644 --- a/dbaccess/source/core/dataaccess/ModelImpl.cxx +++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx @@ -24,7 +24,6 @@ #include "datasource.hxx" #include <stringconstants.hxx> #include <ModelImpl.hxx> -#include <userinformation.hxx> #include <sdbcoretools.hxx> #include <com/sun/star/beans/PropertyBag.hpp> diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx index fd707eb1cb66..b653396e54e7 100644 --- a/dbaccess/source/core/dataaccess/datasource.cxx +++ b/dbaccess/source/core/dataaccess/datasource.cxx @@ -18,7 +18,6 @@ */ #include "datasource.hxx" -#include <userinformation.hxx> #include "commandcontainer.hxx" #include <stringconstants.hxx> #include <core_resource.hxx> diff --git a/dbaccess/source/core/inc/userinformation.hxx b/dbaccess/source/core/inc/userinformation.hxx deleted file mode 100644 index 4a8243686eeb..000000000000 --- a/dbaccess/source/core/inc/userinformation.hxx +++ /dev/null @@ -1,39 +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_DBACCESS_SOURCE_CORE_INC_USERINFORMATION_HXX -#define INCLUDED_DBACCESS_SOURCE_CORE_INC_USERINFORMATION_HXX - -#include <com/sun/star/lang/Locale.hpp> - -#include <com/sun/star/lang/XMultiServiceFactory.hpp> - -class UserInformation -{ - css::lang::Locale m_aUserLocale; - -public: - UserInformation(); - - const css::lang::Locale& getUserLanguage() const { return m_aUserLocale; } -}; - -#endif // INCLUDED_DBACCESS_SOURCE_CORE_INC_USERINFORMATION_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/misc/userinformation.cxx b/dbaccess/source/core/misc/userinformation.cxx deleted file mode 100644 index b5f6d4e28f88..000000000000 --- a/dbaccess/source/core/misc/userinformation.cxx +++ /dev/null @@ -1,33 +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 <userinformation.hxx> - -#include <i18nlangtag/languagetag.hxx> -#include <unotools/configmgr.hxx> - -using namespace ::utl; -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::lang; - -UserInformation::UserInformation(): - m_aUserLocale( LanguageTag( ConfigManager::getWorkLocale()).getLocale()) -{} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist index 7f423cac9d51..7aba9fc878b3 100644 --- a/solenv/clang-format/blacklist +++ b/solenv/clang-format/blacklist @@ -3138,7 +3138,6 @@ dbaccess/source/core/inc/sdbcoretools.hxx dbaccess/source/core/inc/statement.hxx dbaccess/source/core/inc/table.hxx dbaccess/source/core/inc/tablecontainer.hxx -dbaccess/source/core/inc/userinformation.hxx dbaccess/source/core/inc/veto.hxx dbaccess/source/core/inc/viewcontainer.hxx dbaccess/source/core/misc/ContainerMediator.cxx @@ -3149,7 +3148,6 @@ dbaccess/source/core/misc/dsntypes.cxx dbaccess/source/core/misc/objectnameapproval.cxx dbaccess/source/core/misc/sdbcoretools.cxx dbaccess/source/core/misc/services.cxx -dbaccess/source/core/misc/userinformation.cxx dbaccess/source/core/misc/veto.cxx dbaccess/source/core/recovery/dbdocrecovery.cxx dbaccess/source/core/recovery/settingsimport.cxx |