[Libreoffice-commits] .: extensions/source

[Stephan Bergmann]

 extensions/source/nsplugin/source/npshell.cxx |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit f01f25815385778769c67d238527f5824346623c
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Oct 24 17:03:23 2011 +0200

    Fixed Windows-only code broken by recent commit.

diff --git a/extensions/source/nsplugin/source/npshell.cxx b/extensions/source/nsplugin/source/npshell.cxx
index 25659d4..1967a92 100644
--- a/extensions/source/nsplugin/source/npshell.cxx
+++ b/extensions/source/nsplugin/source/npshell.cxx
@@ -141,11 +141,10 @@ namespace {
 bool extendEnvironment(boost::scoped_array< WCHAR > * environment) {
     WCHAR path[MAX_PATH];
     int len = MultiByteToWideChar(
-        CP_ACP, MB_PRECOMPOSED, findInstallDir(), -1, brand, MAX_PATH);
+        CP_ACP, MB_PRECOMPOSED, findInstallDir(), -1, path, MAX_PATH);
         //TODO: conversion errors
     if (len == 0 ||
-        (tools::buildPath(
-            path, pathBegin, path + len - 1, MY_STRING(L"\\ure-link"))
+        (tools::buildPath(path, path, path + len - 1, MY_STRING(L"\\ure-link"))
          == NULL))
     {
         return false;
@@ -260,7 +259,7 @@ int do_init_pipe()
         }
         WCHAR path[MAX_PATH];
         int pathLen = MultiByteToWideChar(
-            CP_ACP, MB_PRECOMPOSED, findProgramDir(), -1, brand, MAX_PATH);
+            CP_ACP, MB_PRECOMPOSED, findProgramDir(), -1, path, MAX_PATH);
             //TODO: conversion errors
         if (pathLen == 0) {
             return NPERR_GENERIC_ERROR;