[Libreoffice-commits] core.git: sal/rtl

Stephan Bergmann sbergman at redhat.com
Wed Nov 26 09:25:05 PST 2014


 sal/rtl/bootstrap.cxx |    9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

New commits:
commit 85b5e24b903b6b4438ce422e6cb3eb8c7a02035f
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Nov 26 18:24:41 2014 +0100

    Needless indirection
    
    Change-Id: Idf514941f4bb05834d8ac0d7bafbe86e34377611

diff --git a/sal/rtl/bootstrap.cxx b/sal/rtl/bootstrap.cxx
index 5719ae4..f248819 100644
--- a/sal/rtl/bootstrap.cxx
+++ b/sal/rtl/bootstrap.cxx
@@ -213,15 +213,10 @@ static bool getFromCommandLineArgs(
     return found;
 }
 
-inline void getExecutableFile_Impl (rtl_uString ** ppFileURL)
-{
-    osl_bootstrap_getExecutableFile_Impl (ppFileURL);
-}
-
 static void getExecutableDirectory_Impl (rtl_uString ** ppDirURL)
 {
     OUString fileName;
-    getExecutableFile_Impl (&(fileName.pData));
+    osl_bootstrap_getExecutableFile_Impl (&(fileName.pData));
 
     sal_Int32 nDirEnd = fileName.lastIndexOf('/');
     OSL_ENSURE(nDirEnd >= 0, "Cannot locate executable directory");
@@ -259,7 +254,7 @@ static OUString & getIniFileName_Impl()
         }
         else
         {
-            getExecutableFile_Impl (&(fileName.pData));
+            osl_bootstrap_getExecutableFile_Impl (&(fileName.pData));
 
             // get rid of a potential executable extension
             OUString progExt = ".bin";


More information about the Libreoffice-commits mailing list