CWS-TOOLING: integrate CWS fwk154
This commit is contained in:
commit
471ac08517
4 changed files with 11 additions and 11 deletions
8
desktop/util/verinfo.rc
Normal file → Executable file
8
desktop/util/verinfo.rc
Normal file → Executable file
|
@ -68,25 +68,25 @@ VS_VERSION_INFO versioninfo
|
|||
block "040704E4"
|
||||
{
|
||||
// German StringTable
|
||||
value "CompanyName", "Oracle, Inc.\0"
|
||||
value "CompanyName", "Oracle\0"
|
||||
value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
|
||||
value "FileVersion", PPS(VER_LEVEL) "\0"
|
||||
value "ProductVersion", PPS(VER_LEVEL) "\0"
|
||||
value "OriginalFilename", "SOFFICE.EXE\0"
|
||||
value "InternalName", "SOFFICE\0"
|
||||
value "LegalCopyright", S_CRIGHT " Oracle, Inc.\0"
|
||||
value "LegalCopyright", S_CRIGHT " Oracle and/or its affiliates. All rights reserved.\0"
|
||||
}
|
||||
#else
|
||||
block "040904E4"
|
||||
{
|
||||
// International StringTable
|
||||
value "CompanyName", "Oracle, Inc.\0"
|
||||
value "CompanyName", "Oracle\0"
|
||||
value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
|
||||
value "FileVersion", PPS(VER_LEVEL) "\0"
|
||||
value "ProductVersion", PPS(VER_LEVEL) "\0"
|
||||
value "OriginalFilename", "SOFFICE.EXE\0"
|
||||
value "InternalName", "SOFFICE\0"
|
||||
value "LegalCopyright", S_CRIGHT " Oracle, Inc.\0"
|
||||
value "LegalCopyright", S_CRIGHT " Oracle and/or its affiliates. All rights reserved.\0"
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
|
4
desktop/win32/source/applauncher/ooo/verinfo.rc
Normal file → Executable file
4
desktop/win32/source/applauncher/ooo/verinfo.rc
Normal file → Executable file
|
@ -69,7 +69,7 @@ VS_VERSION_INFO versioninfo
|
|||
value "ProductVersion", PPS(VER_LEVEL) "\0"
|
||||
value "OriginalFilename", PPS(RES_APP_NAME) ".exe\0"
|
||||
value "InternalName", PPS(RES_APP_NAME) "\0"
|
||||
value "LegalCopyright", S_CRIGHT " Sun Microsystems, Inc.\0"
|
||||
value "LegalCopyright", S_CRIGHT " Oracle and/or its affiliates. All rights reserved.\0"
|
||||
}
|
||||
#else
|
||||
block "040904E4"
|
||||
|
@ -81,7 +81,7 @@ VS_VERSION_INFO versioninfo
|
|||
value "ProductVersion", PPS(VER_LEVEL) "\0"
|
||||
value "OriginalFilename", PPS(RES_APP_NAME) ".exe\0"
|
||||
value "InternalName", PPS(RES_APP_NAME) "\0"
|
||||
value "LegalCopyright", S_CRIGHT " Sun Microsystems, Inc.\0"
|
||||
value "LegalCopyright", S_CRIGHT " Oracle and/or its affiliates. All rights reserved.\0"
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
|
8
desktop/win32/source/applauncher/verinfo.rc
Normal file → Executable file
8
desktop/win32/source/applauncher/verinfo.rc
Normal file → Executable file
|
@ -68,25 +68,25 @@ VS_VERSION_INFO versioninfo
|
|||
block "040704E4"
|
||||
{
|
||||
// German StringTable
|
||||
value "CompanyName", "Sun Microsystems, Inc.\0"
|
||||
value "CompanyName", "Oracle\0"
|
||||
value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
|
||||
value "FileVersion", PPS(VER_LEVEL) "\0"
|
||||
value "ProductVersion", PPS(VER_LEVEL) "\0"
|
||||
value "OriginalFilename", PPS(RES_APP_NAME) ".exe\0"
|
||||
value "InternalName", PPS(RES_APP_NAME) "\0"
|
||||
value "LegalCopyright", S_CRIGHT " Sun Microsystems, Inc.\0"
|
||||
value "LegalCopyright", S_CRIGHT " Oracle and/or its affiliates. All rights reserved.\0"
|
||||
}
|
||||
#else
|
||||
block "040904E4"
|
||||
{
|
||||
// International StringTable
|
||||
value "CompanyName", "Sun Microsystems, Inc.\0"
|
||||
value "CompanyName", "Oracle\0"
|
||||
value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
|
||||
value "FileVersion", PPS(VER_LEVEL) "\0"
|
||||
value "ProductVersion", PPS(VER_LEVEL) "\0"
|
||||
value "OriginalFilename", PPS(RES_APP_NAME) ".exe\0"
|
||||
value "InternalName", PPS(RES_APP_NAME) "\0"
|
||||
value "LegalCopyright", S_CRIGHT " Sun Microsystems, Inc.\0"
|
||||
value "LegalCopyright", S_CRIGHT " Oracle and/or its affiliates. All rights reserved.\0"
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
|
2
uui/source/iahndl-authentication.cxx
Executable file → Normal file
2
uui/source/iahndl-authentication.cxx
Executable file → Normal file
|
@ -270,7 +270,7 @@ handleAuthenticationRequest_(
|
|||
aInfo.SetCanRememberPassword(
|
||||
ePreferredRememberMode != eAlternateRememberMode);
|
||||
aInfo.SetIsRememberPassword(
|
||||
eDefaultRememberMode != ucb::RememberAuthentication_NO);
|
||||
ePreferredRememberMode == eDefaultRememberMode);
|
||||
aInfo.SetIsRememberPersistent(
|
||||
ePreferredRememberMode == ucb::RememberAuthentication_PERSISTENT);
|
||||
|
||||
|
|
Loading…
Reference in a new issue