shell/source/tools/lngconvex/cmdline.hxx | 4 +-- shell/source/tools/lngconvex/defs.hxx | 32 ------------------------------- solenv/clang-format/blacklist | 1 3 files changed, 2 insertions(+), 35 deletions(-)
New commits: commit 5dab28cdada9a24ad2ddae1083ac977fe87cb1c1 Author: Arkadiy Illarionov <qar...@gmail.com> Date: Sun May 20 16:57:25 2018 +0300 tdf#96099 Remove unused typedef from shell/source/tools/lngconvex Also remove empty defs.hxx Change-Id: I35f70cc13f0198623d99cfd1e294808ac90f5f02 Reviewed-on: https://gerrit.libreoffice.org/54600 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Tor Lillqvist <t...@collabora.com> diff --git a/shell/source/tools/lngconvex/cmdline.hxx b/shell/source/tools/lngconvex/cmdline.hxx index 9cbc34e5e343..04cb7101aee0 100644 --- a/shell/source/tools/lngconvex/cmdline.hxx +++ b/shell/source/tools/lngconvex/cmdline.hxx @@ -20,12 +20,12 @@ #ifndef INCLUDED_SHELL_SOURCE_TOOLS_LNGCONVEX_CMDLINE_HXX #define INCLUDED_SHELL_SOURCE_TOOLS_LNGCONVEX_CMDLINE_HXX +#include <string> + #include <sal/config.h> #include <sal/types.h> -#include "defs.hxx" - /** Simple command line abstraction */ diff --git a/shell/source/tools/lngconvex/defs.hxx b/shell/source/tools/lngconvex/defs.hxx deleted file mode 100644 index 86745877e66e..000000000000 --- a/shell/source/tools/lngconvex/defs.hxx +++ /dev/null @@ -1,32 +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_SHELL_SOURCE_TOOLS_LNGCONVEX_DEFS_HXX -#define INCLUDED_SHELL_SOURCE_TOOLS_LNGCONVEX_DEFS_HXX - -#include <vector> -#include <string> -#include <memory> - -typedef std::vector<std::string> StringList_t; - - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist index cc3dfe0e8843..90ec26ee74a6 100644 --- a/solenv/clang-format/blacklist +++ b/solenv/clang-format/blacklist @@ -13173,7 +13173,6 @@ shell/source/sessioninstall/SyncDbusSessionHelper.hxx shell/source/sessioninstall/services.cxx shell/source/tools/lngconvex/cmdline.cxx shell/source/tools/lngconvex/cmdline.hxx -shell/source/tools/lngconvex/defs.hxx shell/source/tools/lngconvex/lngconvex.cxx shell/source/tools/regsvrex/regsvrex.cxx shell/source/unix/exec/shellexec.cxx _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits