This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new 58e9d42929 Cleanup, removed 'unreachable code'
58e9d42929 is described below
commit 58e9d42929cac29fe0b2b859f10760aa8c18cf7b
Author: mseidel <[email protected]>
AuthorDate: Wed Dec 31 15:12:53 2025 +0100
Cleanup, removed 'unreachable code'
---
main/desktop/win32/source/setup/Resource.h | 4 +--
main/desktop/win32/source/setup/rctmpl.txt | 10 +++----
main/desktop/win32/source/setup/setup.cpp | 6 +----
main/desktop/win32/source/setup/setup.ulf | 43 ++----------------------------
4 files changed, 9 insertions(+), 54 deletions(-)
diff --git a/main/desktop/win32/source/setup/Resource.h
b/main/desktop/win32/source/setup/Resource.h
index 742e7fb41c..49e635525c 100644
--- a/main/desktop/win32/source/setup/Resource.h
+++ b/main/desktop/win32/source/setup/Resource.h
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
#ifndef _RESOURCE_H
#define _RESOURCE_H
@@ -28,7 +26,7 @@
#define IDS_APP_PROD_TITLE 11
#define IDS_OUTOFMEM 12
#define IDS_NOMSI 13
-#define IDS_USER_CANCELLED 14
+#define IDS_USER_CANCELED 14
#define IDS_REQUIRES_ADMIN_PRIV 15
#define IDS_FILE_NOT_FOUND 16
#define IDS_INVALID_PARAM 17
diff --git a/main/desktop/win32/source/setup/rctmpl.txt
b/main/desktop/win32/source/setup/rctmpl.txt
index cf33e53187..d751726d6f 100644
--- a/main/desktop/win32/source/setup/rctmpl.txt
+++ b/main/desktop/win32/source/setup/rctmpl.txt
@@ -1,5 +1,5 @@
// *************************************************************
-//
+//
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
@@ -7,16 +7,16 @@
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
-//
+//
// http://www.apache.org/licenses/LICENSE-2.0
-//
+//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
-//
+//
// *************************************************************
// String Table
@@ -27,7 +27,7 @@ BEGIN
IDS_APP_PROD_TITLE %APP_PROD_TITLE%
IDS_OUTOFMEM %OUTOFMEM%
IDS_NOMSI %NOMSI%
- IDS_USER_CANCELLED %USER_CANCELLED%
+ IDS_USER_CANCELED %USER_CANCELED%
IDS_REQUIRES_ADMIN_PRIV %REQUIRES_ADMIN_PRIV%
IDS_FILE_NOT_FOUND %FILE_NOT_FOUND%
IDS_INVALID_PARAM %INVALID_PARAM%
diff --git a/main/desktop/win32/source/setup/setup.cpp
b/main/desktop/win32/source/setup/setup.cpp
index 2b6166e910..38d7322584 100644
--- a/main/desktop/win32/source/setup/setup.cpp
+++ b/main/desktop/win32/source/setup/setup.cpp
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
#define WIN // scope W32 API
#if defined _MSC_VER
@@ -1052,7 +1050,7 @@ void SetupAppX::DisplayError( UINT nErr ) const
case ERROR_OUTOFMEMORY: WIN::LoadString( m_hInst, IDS_OUTOFMEM,
sError, MAX_TEXT_LENGTH );
break;
case ERROR_INSTALL_USEREXIT:
- WIN::LoadString( m_hInst, IDS_USER_CANCELLED,
sError, MAX_TEXT_LENGTH );
+ WIN::LoadString( m_hInst, IDS_USER_CANCELED,
sError, MAX_TEXT_LENGTH );
break;
case ERROR_INSTALL_ALREADY_RUNNING: // 1618
WIN::LoadString( m_hInst, IDS_ALREADY_RUNNING,
sError, MAX_TEXT_LENGTH );
@@ -1893,8 +1891,6 @@ boolean SetupAppX::IsPatchInstalled( TCHAR* pBaseDir,
TCHAR* pFileName )
else if ( nRet == ERROR_UNKNOWN_PROPERTY )
return false;
else return false;
-
- return false;
}
//--------------------------------------------------------------------------
diff --git a/main/desktop/win32/source/setup/setup.ulf
b/main/desktop/win32/source/setup/setup.ulf
index 8ea9567861..03a7013409 100644
--- a/main/desktop/win32/source/setup/setup.ulf
+++ b/main/desktop/win32/source/setup/setup.ulf
@@ -22,161 +22,122 @@
[%APP_TITLE%]
en-US = "Setup"
-
[%APP_PROD_TITLE%]
en-US = "The %PRODUCTNAME Setup"
-
[%OUTOFMEM%]
en-US = "Out of Memory"
-
[%NOMSI%]
en-US = "Setup was unable to find the msi package."
-
-[%USER_CANCELLED%]
-en-US = "Setup was cancelled"
-
+[%USER_CANCELED%]
+en-US = "Setup was canceled"
[%REQUIRES_ADMIN_PRIV%]
en-US = "Administrator privileges are required for upgrading the Windows
Installer."
-
[%FILE_NOT_FOUND%]
en-US = "Setup was unable to find the file '%s'."
-
[%INVALID_PARAM%]
en-US = "Invalid command line option '%s'. Please use '/?' for help."
-
[%SETUP_TO_OLD%]
en-US = "This package requires at least the version '%s' of the Windows
Installer. \nYou have Windows Installer '%s' on your system!"
[%SETUP_NOT_FOUND%]
en-US = "This package requires the Windows Installer. \nYou need at least
Windows Installer '%s' on your system!"
-
[%USAGE%]
en-US = "Usage:\n /? : Shows this dialog.\n /a : Performs an
administrative installation.\n /j[u|m] : Performs an advertising
installation.\n /q[n] : Do not show any user interface (silent mode).\n"
-
[%ALREADY_RUNNING%]
en-US = "There is already a setup process running."
-
[%UNKNOWN_ERROR%]
en-US = "An Unknown Error occurred!"
-
[%INVALID_PROFILE%]
en-US = "Invalid or incomplete profile."
-
[%UNKNOWN_LANG%]
en-US = "Unknown Language: %d"
-
[%LANGUAGE_ZH_TW%]
en-US = "Chinese (traditional)"
-
[%LANGUAGE_CS%]
en-US = "Czech"
-
[%LANGUAGE_DA%]
en-US = "Danish"
-
[%LANGUAGE_DE_DE%]
en-US = "German (Germany)"
-
[%LANGUAGE_EL%]
en-US = "Greek"
-
[%LANGUAGE_EN_US%]
en-US = "English (USA)"
-
[%LANGUAGE_ES%]
en-US = "Spanish (Spain)"
-
[%LANGUAGE_FI%]
en-US = "Finnish"
-
[%LANGUAGE_FR_FR%]
en-US = "French (France)"
-
[%LANGUAGE_HE%]
en-US = "Hebrew"
-
[%LANGUAGE_HU%]
en-US = "Hungarian"
-
[%LANGUAGE_IT_IT%]
en-US = "Italian (Italy)"
-
[%LANGUAGE_JA%]
en-US = "Japanese"
-
[%LANGUAGE_KO%]
en-US = "Korean"
-
[%LANGUAGE_NL_NL%]
en-US = "Dutch (Netherlands)"
-
[%LANGUAGE_NO_NO%]
en-US = "Norwegian (Bokmål)"
-
[%LANGUAGE_PL%]
en-US = "Polish"
-
[%LANGUAGE_PT_BR%]
en-US = "Portuguese (Brazil)"
-
[%LANGUAGE_RU%]
en-US = "Russian"
-
[%LANGUAGE_SK%]
en-US = "Slovak"
-
[%LANGUAGE_SV_SE%]
en-US = "Swedish (Sweden)"
-
[%LANGUAGE_TH%]
en-US = "Thai"
-
[%LANGUAGE_TR%]
en-US = "Turkish"
-
[%LANGUAGE_ET%]
en-US = "Estonian"
-
[%LANGUAGE_ZH_CN%]
en-US = "Chinese (Simplified)"
-
[%LANGUAGE_PT_PT%]
en-US = "Portuguese (Portugal)"
