[Libreoffice-commits] core.git: solenv/clang-format svx/inc svx/source

[Gabor Kelemen]

 solenv/clang-format/blacklist |    1 -
 svx/inc/svdglob.hxx           |   36 ------------------------------------
 svx/source/svdraw/svdetc.cxx  |    6 ------
 3 files changed, 43 deletions(-)

New commits:
commit 8c0d170cf9270c06232562a26d70341012847364
Author: Gabor Kelemen <kelemeng at ubuntu.com>
Date:   Thu Apr 26 23:11:10 2018 +0200

    Drop newly unused svdglob.hxx
    
    Contained only a l10n wrapper method above SvxResId
    
    Change-Id: I9ea7537773b40c38835b8fe975e303cc3dc433c1
    Reviewed-on: https://gerrit.libreoffice.org/53547
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index 27fd14f8d24f..f63ff7be8ab7 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -14175,7 +14175,6 @@ svx/inc/sdr/properties/pageproperties.hxx
 svx/inc/sdr/properties/rectangleproperties.hxx
 svx/inc/sdr/properties/textproperties.hxx
 svx/inc/strings.hxx
-svx/inc/svdglob.hxx
 svx/inc/svdibrow.hxx
 svx/inc/sxallitm.hxx
 svx/inc/sxcikitm.hxx
diff --git a/svx/inc/svdglob.hxx b/svx/inc/svdglob.hxx
deleted file mode 100644
index 296562342431..000000000000
--- a/svx/inc/svdglob.hxx
+++ /dev/null
@@ -1,36 +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_SVX_INC_SVDGLOB_HXX
-#define INCLUDED_SVX_INC_SVDGLOB_HXX
-
-#include <rtl/ustring.hxx>
-#include <sal/config.h>
-#include <svx/svxdllapi.h>
-
-// ResourceCache for frequently used strings.
-// Global string resources with the IDs from
-// SDR_StringCacheBegin (256) to SDR_StringCacheEnd
-// are cached.
-// See also SvdStr.Hrc
-SVX_DLLPUBLIC OUString ImpGetResStr(const char* pResID);
-
-#endif // INCLUDED_SVX_INC_SVDGLOB_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx
index b1ab9536c7d8..3633bfbba696 100644
--- a/svx/source/svdraw/svdetc.cxx
+++ b/svx/source/svdraw/svdetc.cxx
@@ -25,7 +25,6 @@
 #include <svx/svdetc.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/svdtrans.hxx>
-#include <svdglob.hxx>
 #include <svx/strings.hrc>
 #include <svx/svdviter.hxx>
 #include <svx/svdview.hxx>
@@ -353,11 +352,6 @@ std::vector<Link<SdrObjCreatorParams, SdrObject*>>& ImpGetUserMakeObjHdl()
     return rGlobalData.aUserMakeObjHdl;
 }
 
-OUString ImpGetResStr(const char* pResID)
-{
-    return SvxResId(pResID);
-}
-
 bool SearchOutlinerItems(const SfxItemSet& rSet, bool bInklDefaults, bool* pbOnlyEE)
 {
     bool bHas=false;