diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-11-27 11:48:34 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-11-27 11:48:34 +0100 |
commit | 41565560250294e22fc1c21bc4bab8286255d4cc (patch) | |
tree | 7c0009ee853c1de18ecb556e0412ab5df0bdde16 /sal/inc | |
parent | c56d96fc39de897b5e8213eb5e5af295759dccbf (diff) |
Make osl_getExecutableFile work even without a prior osl_setCommandArgs
After 2ad716f406e0fdb9b9294876c64ae92fecbf5e27 "Revert 'pyuno: set up fake
command line in getComponentContext(),'" e.g. PythonTest_sw_python would fail on
Windows, where WinSalGraphics::GetDevFontList (vcl/win/source/gdi/salgdi3.cxx)
calls osl_getExecutableFile and is itself called in a python process where
osl_setCommandArgs has not been set up.
This patch makes osl_getExecutableFile on all platforms if osl_setCommandArgs
has not (yet) been set fall back to the code that was
osl_bootstrap_getExecutableFile_Impl (which was called from
sal/rtl/bootstrap.cxx, which can now call osl_getExecutableFile).
Change-Id: I6c1bb59205041b3208c830a8b8406e28128b4566
Diffstat (limited to 'sal/inc')
-rw-r--r-- | sal/inc/getexecutablefile.hxx | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/sal/inc/getexecutablefile.hxx b/sal/inc/getexecutablefile.hxx deleted file mode 100644 index 9ebf872d97aa..000000000000 --- a/sal/inc/getexecutablefile.hxx +++ /dev/null @@ -1,44 +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_SAL_INC_GETEXECUTABLEFILE_HXX -#define INCLUDED_SAL_INC_GETEXECUTABLEFILE_HXX - -#include <sal/config.h> - -#include <osl/process.h> -#include <rtl/ustring.h> -#include <sal/types.h> - -/*************************************** - osl_bootstrap_getExecutableFile_Impl(). - - @internal - @see rtl_bootstrap - @see #i37371# - - **************************************/ - -extern "C" oslProcessError SAL_CALL osl_bootstrap_getExecutableFile_Impl ( - rtl_uString ** ppFileURL -) SAL_THROW_EXTERN_C(); - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |