cppu: Avoid uno_direct_getEnvironment() indirection.

"UNO_ENV_SUBST:" should not be used.

Change-Id: If23b174de792cd69dc79e70dd8f5e8a31badb96d

4 files changed, 1 insertions, 84 deletions

diff --git a/cppu/Library_cppu.mk b/cppu/Library_cppu.mk
index eacaf83e9f1f..c00fd8e5efe0 100644
--- a/cppu/Library_cppu.mk
+++ b/cppu/Library_cppu.mk
@@ -43,7 +43,6 @@ $(eval $(call gb_Library_add_exception_objects,cppu,\
 	cppu/source/uno/cascade_mapping \
 	cppu/source/uno/data \
 	cppu/source/uno/EnvStack \
-	cppu/source/uno/env_subst \
 	cppu/source/uno/IdentityMapping \
 	cppu/source/uno/lbenv \
 	cppu/source/uno/lbmap \
diff --git a/cppu/source/uno/env_subst.cxx b/cppu/source/uno/env_subst.cxx
deleted file mode 100644
index 63ed295a086e..000000000000
--- a/cppu/source/uno/env_subst.cxx
+++ /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 .
- */
-
-#include "rtl/ustring.hxx"
-#include "uno/environment.h"
-#include "env_subst.hxx"
-
-
-CPPU_DLLPUBLIC void SAL_CALL uno_getEnvironment(uno_Environment ** ppEnv,
-                                 rtl_uString      * pEnvDcp,
-                                 void             * pContext)
-    SAL_THROW_EXTERN_C()
-{
-    rtl::OUString envDcp(pEnvDcp);
-
-    rtl::OString  a_envName("UNO_ENV_SUBST:");
-    a_envName += rtl::OUStringToOString(envDcp, RTL_TEXTENCODING_ASCII_US);
-    char * c_value = getenv(a_envName.getStr());
-    if (c_value && *c_value)
-    {
-        rtl::OString a_envDcp(a_envName.copy(a_envName.indexOf(':') + 1));
-
-        OSL_TRACE("UNO_ENV_SUBST \"%s\" -> \"%s\"", a_envDcp.getStr(), c_value);
-
-        envDcp = rtl::OUString::createFromAscii(c_value);
-    }
-
-    uno_direct_getEnvironment(ppEnv, envDcp.pData, pContext);
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/source/uno/env_subst.hxx b/cppu/source/uno/env_subst.hxx
deleted file mode 100644
index 70a24a347d80..000000000000
--- a/cppu/source/uno/env_subst.hxx
+++ /dev/null
@@ -1,35 +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_env_substs_hxx
-#define INCLUDED_env_substs_hxx
-
-#include "rtl/ustring.hxx"
-#include "uno/environment.h"
-
-
-extern "C" void SAL_CALL uno_direct_getEnvironment(uno_Environment ** ppEnv,
-                                                   rtl_uString      * pEnvDcp,
-                                                   void             * pContext)
-    SAL_THROW_EXTERN_C();
-
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx
index 04dfa2d056bd..107be170caaf 100644
--- a/cppu/source/uno/lbenv.cxx
+++ b/cppu/source/uno/lbenv.cxx
@@ -1154,7 +1154,7 @@ CPPU_DLLPUBLIC void SAL_CALL uno_createEnvironment(
 }
 
 //##############################################################################
-void SAL_CALL uno_direct_getEnvironment(
+CPPU_DLLPUBLIC void SAL_CALL uno_getEnvironment(
     uno_Environment ** ppEnv, rtl_uString * pEnvDcp, void * pContext )
     SAL_THROW_EXTERN_C()
 {