[Libreoffice-commits] .: sal/rtl

[Libreoffice Gerrit user]

 sal/rtl/source/bootstrap.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 2586871390dc5a03e4cf5f4f6f5a2af182b89db0
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Wed Nov 21 20:06:18 2012 +0200

    Use correct variable in the iOS and Android cases
    
    Change-Id: I759ea062c6a0cc1d9a2aafba502057f53596459c

diff --git a/sal/rtl/source/bootstrap.cxx b/sal/rtl/source/bootstrap.cxx
index e686f1e..4d9f190 100644
--- a/sal/rtl/source/bootstrap.cxx
+++ b/sal/rtl/source/bootstrap.cxx
@@ -258,14 +258,14 @@ static OUString & getIniFileName_Impl()
         // possibility to have several "applications" in the same
         // installation location with different inifiles.
         const char *inifile = [[@"vnd.sun.star.pathname:" stringByAppendingString: [[[NSBundle mainBundle] bundlePath] stringByAppendingPathComponent: @"rc"]] UTF8String];
-        uri = rtl::OUString(inifile, strlen(inifile), RTL_TEXTENCODING_UTF8);
-        resolvePathnameUrl(&uri);
+        fileName = rtl::OUString(inifile, strlen(inifile), RTL_TEXTENCODING_UTF8);
+        resolvePathnameUrl(&fileName);
 #elif defined ANDROID
         // Apps are self-contained on Android, too, can as well hardcode
         // it as "rc" in the "/assets" directory, i.e.  inside the app's
         // .apk (zip) archive as the /assets/rc file.
-        uri = rtl::OUString("vnd.sun.star.pathname:/assets/rc");
-        resolvePathnameUrl(&uri);
+        fileName = rtl::OUString("vnd.sun.star.pathname:/assets/rc");
+        resolvePathnameUrl(&fileName);
 #else
         if(getFromCommandLineArgs(
                OUString(RTL_CONSTASCII_USTRINGPARAM("INIFILENAME")), &fileName))