summaryrefslogtreecommitdiff
path: root/setup_native/source/win32/customactions/shellextensions/layerlinks.cxx
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:06:53 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:06:53 +0200
commit6e4894c2019dc9c442dce738d3f0423d8d74973f (patch)
treee3734a287f4c02ecb120e54aa32141f95f484236 /setup_native/source/win32/customactions/shellextensions/layerlinks.cxx
parentb84e1626f6fcb29fe784933dee51079c3447a50c (diff)
recreated tag libreoffice-3.3.3.1 which had these commits:
commit d7e53cee633ec1c583c72e6d9c01122195c4383c (tag: refs/tags/libreoffice-3.3.3.1) Author: Petr Mladek <pmladek@suse.cz> Date: Tue May 31 17:39:04 2011 +0200 Version 3.3.3.1, tag libreoffice-3.3.3.1 (3.3.3-rc1)
Notes
Notes: split repo tag: components_libreoffice-3.3.3.1 split repo tag: components_libreoffice-3.3.4.1
Diffstat (limited to 'setup_native/source/win32/customactions/shellextensions/layerlinks.cxx')
-rw-r--r--setup_native/source/win32/customactions/shellextensions/layerlinks.cxx18
1 files changed, 9 insertions, 9 deletions
diff --git a/setup_native/source/win32/customactions/shellextensions/layerlinks.cxx b/setup_native/source/win32/customactions/shellextensions/layerlinks.cxx
index 11c9757ff921..cab23c6483e7 100644
--- a/setup_native/source/win32/customactions/shellextensions/layerlinks.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/layerlinks.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -136,19 +136,19 @@ extern "C" UINT __stdcall CreateLayerLinks(MSIHANDLE handle)
if (IsValidHandle(h1file))
{
DWORD dummy;
-
+
// Converting string into UTF-8 encoding and writing into file "basis-link"
int nCharsRequired = MultiByteToWideChar( CP_ACP, 0, sBasisInstallPath.c_str(), -1, NULL, 0 );
if ( nCharsRequired )
{
- LPWSTR lpPathW = new WCHAR[nCharsRequired];
+ LPWSTR lpPathW = new WCHAR[nCharsRequired];
if ( MultiByteToWideChar( CP_ACP, 0, sBasisInstallPath.c_str(), -1, lpPathW, nCharsRequired ) )
{
nCharsRequired = WideCharToMultiByte( CP_UTF8, 0, lpPathW, -1, NULL, 0, NULL, NULL );
if ( nCharsRequired )
{
- LPSTR lpPathUTF8 = new CHAR[nCharsRequired];
+ LPSTR lpPathUTF8 = new CHAR[nCharsRequired];
WideCharToMultiByte( CP_UTF8, 0, lpPathW, -1, lpPathUTF8, nCharsRequired, NULL, NULL );
// WriteFile( h1file, sBasisInstallPath.c_str(), sBasisInstallPath.size() ,&dummy, 0 );
@@ -157,7 +157,7 @@ extern "C" UINT __stdcall CreateLayerLinks(MSIHANDLE handle)
delete lpPathUTF8;
}
}
-
+
delete lpPathW;
}
@@ -184,13 +184,13 @@ extern "C" UINT __stdcall CreateLayerLinks(MSIHANDLE handle)
int nCharsRequired = MultiByteToWideChar( CP_ACP, 0, sUreInstallPath.c_str(), -1, NULL, 0 );
if ( nCharsRequired )
{
- LPWSTR lpPathW = new WCHAR[nCharsRequired];
+ LPWSTR lpPathW = new WCHAR[nCharsRequired];
if ( MultiByteToWideChar( CP_ACP, 0, sUreInstallPath.c_str(), -1, lpPathW, nCharsRequired ) )
{
nCharsRequired = WideCharToMultiByte( CP_UTF8, 0, lpPathW, -1, NULL, 0, NULL, NULL );
if ( nCharsRequired )
{
- LPSTR lpPathUTF8 = new CHAR[nCharsRequired];
+ LPSTR lpPathUTF8 = new CHAR[nCharsRequired];
WideCharToMultiByte( CP_UTF8, 0, lpPathW, -1, lpPathUTF8, nCharsRequired, NULL, NULL );
// WriteFile( h2file, sUreInstallPath.c_str(), sUreInstallPath.size() ,&dummy, 0 );
@@ -199,7 +199,7 @@ extern "C" UINT __stdcall CreateLayerLinks(MSIHANDLE handle)
delete lpPathUTF8;
}
}
-
+
delete lpPathW;
}
@@ -216,7 +216,7 @@ extern "C" UINT __stdcall RemoveLayerLinks(MSIHANDLE handle)
string sOfficeInstallPath = sInstallPath;
string sBasisInstallPath = sInstallPath + TEXT("Basis\\");
string sUreInstallPath = sInstallPath + TEXT("URE\\");
-
+
string sBasisLinkPath = sOfficeInstallPath + TEXT("basis-link");
string sUreLinkPath = sBasisInstallPath + TEXT("ure-link");
string sUreDirName = sUreInstallPath + TEXT("bin");