configure.in | 2 - dbaccess/source/ui/dlg/dbadminsetup.src | 2 - setup_native/source/win32/customactions/patch/swappatchfiles.cxx | 3 -- setup_native/source/win32/customactions/shellextensions/completeinstallpath.cxx | 15 ---------- setup_native/source/win32/customactions/shellextensions/registerextensions.cxx | 3 -- 5 files changed, 2 insertions(+), 23 deletions(-)
New commits: commit 7c74443e8522fd0f1db60c2d18f736574e3db5f9 Author: Korrawit Pruegsanusak <detective.conan.1...@gmail.com> Date: Thu Nov 17 16:37:33 2011 +0700 cppcheck: unused variables also remove commented-out codes diff --git a/setup_native/source/win32/customactions/patch/swappatchfiles.cxx b/setup_native/source/win32/customactions/patch/swappatchfiles.cxx index 7b7d46c..c0c6fd2 100644 --- a/setup_native/source/win32/customactions/patch/swappatchfiles.cxx +++ b/setup_native/source/win32/customactions/patch/swappatchfiles.cxx @@ -184,8 +184,6 @@ static bool SwapFiles( const std::_tstring& sFileName1, const std::_tstring& sFi //Try to move the original file to a temp file fSuccess = MoveFileExA( sFileName1.c_str(), sTempFileName.c_str(), MOVEFILE_REPLACE_EXISTING); - std::_tstring mystr; - if ( fSuccess ) { fSuccess = MoveFileExA( sFileName2.c_str(), sFileName1.c_str(), MOVEFILE_REPLACE_EXISTING ); @@ -713,7 +711,6 @@ extern "C" UINT __stdcall SetFeatureState( MSIHANDLE handle ) extern "C" UINT __stdcall SetNewFeatureState( MSIHANDLE handle ) { - std::_tstring mystr; std::_tstring sValueName; sValueName = TEXT("gm_o_Onlineupdate"); diff --git a/setup_native/source/win32/customactions/shellextensions/completeinstallpath.cxx b/setup_native/source/win32/customactions/shellextensions/completeinstallpath.cxx index 7b7453a..4c33821 100644 --- a/setup_native/source/win32/customactions/shellextensions/completeinstallpath.cxx +++ b/setup_native/source/win32/customactions/shellextensions/completeinstallpath.cxx @@ -83,8 +83,6 @@ extern "C" UINT __stdcall CompleteInstallPath( MSIHANDLE handle ) TCHAR szValue[8192]; DWORD nValueSize = sizeof(szValue); HKEY hKey; - std::_tstring sInstDir; - std::_tstring mystr; // Reading property OFFICEDIRHOSTNAME_, that contains the part of the path behind // the program files folder. @@ -100,8 +98,6 @@ extern "C" UINT __stdcall CompleteInstallPath( MSIHANDLE handle ) if ( _tcsstr( sInstallLocation.c_str(), sOfficeDirHostname.c_str() ) ) { pathCompletionRequired = false; // nothing to do - // mystr = "Nothing to do, officedir is included into installlocation"; - // MessageBox( NULL, mystr.c_str(), "It is part of installlocation", MB_OK ); } // If the path INSTALLLOCATION does not end with this string, INSTALLLOCATION is maybe @@ -124,12 +120,6 @@ extern "C" UINT __stdcall CompleteInstallPath( MSIHANDLE handle ) std::_tstring sProductKey32 = "Software\\" + sManufacturer + "\\" + sDefinedName + "\\" + "3.2" + "\\" + sUpgradeCode; - // mystr = "ProductKey: " + sProductKey; - // MessageBox( NULL, mystr.c_str(), "ProductKey", MB_OK ); - - // mystr = "Checking registry"; - // MessageBox( NULL, mystr.c_str(), "registry search", MB_OK ); - bool oldVersionExists = false; if ( ERROR_SUCCESS == RegOpenKey( HKEY_CURRENT_USER, sProductKey30.c_str(), &hKey ) ) @@ -169,14 +159,9 @@ extern "C" UINT __stdcall CompleteInstallPath( MSIHANDLE handle ) sInstallLocation = sInstallLocation + sOfficeDirHostname; // Setting the new property value MsiSetProperty(handle, TEXT("INSTALLLOCATION"), sInstallLocation.c_str()); - // mystr = "Setting path to: " + sInstallLocation; - // MessageBox( NULL, mystr.c_str(), "sInstallLocation", MB_OK ); } } - // mystr = "Ending with INSTALLLOCATION: " + sInstallLocation; - // MessageBox( NULL, mystr.c_str(), "END", MB_OK ); - return ERROR_SUCCESS; } diff --git a/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx b/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx index 1e30c46..bd5efb7 100644 --- a/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx +++ b/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx @@ -170,7 +170,6 @@ static BOOL RemoveCompleteDirectory( std::_tstring sPath ) extern "C" UINT __stdcall RegisterExtensions(MSIHANDLE handle) { - // std::_tstring sInstDir = GetMsiProperty( handle, TEXT("INSTALLLOCATION") ); std::_tstring sInstDir = GetMsiProperty( handle, TEXT("CustomActionData") ); std::_tstring sUnoPkgFile = sInstDir + TEXT("program\\unopkg.exe"); std::_tstring mystr; @@ -211,8 +210,6 @@ extern "C" UINT __stdcall RegisterExtensions(MSIHANDLE handle) extern "C" UINT __stdcall RemoveExtensions(MSIHANDLE handle) { - std::_tstring mystr; - // Finding the product with the help of the propery FINDPRODUCT, // that contains a Windows Registry key, that points to the install location. commit 97e3d1faef2e028dc83a4e4dc360f83e2e4f0fa3 Author: Korrawit Pruegsanusak <detective.conan.1...@gmail.com> Date: Tue Jan 31 14:17:58 2012 +0700 remove glitch in sbase dialog diff --git a/dbaccess/source/ui/dlg/dbadminsetup.src b/dbaccess/source/ui/dlg/dbadminsetup.src index ea43419..a5b8d73 100644 --- a/dbaccess/source/ui/dlg/dbadminsetup.src +++ b/dbaccess/source/ui/dlg/dbadminsetup.src @@ -232,7 +232,7 @@ TabPage PAGE_DBWIZARD_AUTHENTIFICATION FixedText FT_GENERALUSERNAME { Pos = MAP_APPFONT (START_X , 62 ) ; - Size = MAP_APPFONT ( AUTHENTEDIT_X - START_X , FIXEDTEXT_HEIGHT ) ; + Size = MAP_APPFONT ( AUTHENTEDIT_X - START_X - 1 , FIXEDTEXT_HEIGHT ) ; Text[ en-US ] = "~User name" ; }; commit f18cae12960e945240b8fbd76f9a214d464b71b3 Author: Korrawit Pruegsanusak <detective.conan.1...@gmail.com> Date: Mon Jan 30 23:55:51 2012 +0700 _os is WINNT, not cygwin (Thanks Norbert) See http://lists.freedesktop.org/archives/libreoffice/2012-January/024878.html diff --git a/configure.in b/configure.in index 6ab110d..a1b2c09 100644 --- a/configure.in +++ b/configure.in @@ -6819,7 +6819,7 @@ Use "./download" to download.]) -e "$SRC_ROOT/moz/zipped/${OS}${COM}${CPU}runtime.zip" ; then AC_MSG_RESULT([Found]) PREBUILD_MOZAB="YES" - if test "$_os" = "cygwin" ; then + if test "$_os" = "WINNT" ; then AC_MSG_CHECKING([for MSVC 2005 runtime needed for prebuilt Mozilla]) if test -e "$SRC_ROOT/external/msvcp80/Microsoft.VC80.CRT.manifest" -a \ -e "$SRC_ROOT/external/msvcp80/msvcp80.dll" -a \ _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits