Kaydet (Commit) fb067f9b authored tarafından Andras Timar's avatar Andras Timar

replace OpenOffice.org to LibreOffice in registry keys

üst b13f2b57
......@@ -291,7 +291,7 @@ void CrashReportParams::ReadFromRegistry()
if ( ERROR_SUCCESS == RegReadValue(
HKEY_CURRENT_USER,
TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"),
TEXT("SOFTWARE\\LibreOffice\\CrashReport"),
TEXT("HTTPProxyServer"),
szBuffer,
sizeof(szBuffer) ) )
......@@ -301,7 +301,7 @@ void CrashReportParams::ReadFromRegistry()
if ( ERROR_SUCCESS == RegReadValue(
HKEY_CURRENT_USER,
TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"),
TEXT("SOFTWARE\\LibreOffice\\CrashReport"),
TEXT("HTTPProxyPort"),
&dwProxyPort,
sizeof(dwProxyPort) ) )
......@@ -312,7 +312,7 @@ void CrashReportParams::ReadFromRegistry()
if ( ERROR_SUCCESS == RegReadValue(
HKEY_CURRENT_USER,
TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"),
TEXT("SOFTWARE\\LibreOffice\\CrashReport"),
TEXT("ReturnAddress"),
szBuffer,
sizeof(szBuffer) ) )
......@@ -320,14 +320,14 @@ void CrashReportParams::ReadFromRegistry()
RegReadValue(
HKEY_CURRENT_USER,
TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"),
TEXT("SOFTWARE\\LibreOffice\\CrashReport"),
TEXT("AllowContact"),
&fAllowContact,
sizeof(fAllowContact) );
RegReadValue(
HKEY_CURRENT_USER,
TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"),
TEXT("SOFTWARE\\LibreOffice\\CrashReport"),
TEXT("HTTPConnection"),
&uInternetConnection,
sizeof(uInternetConnection) );
......@@ -339,7 +339,7 @@ void CrashReportParams::WriteToRegistry()
{
RegWriteValue(
HKEY_CURRENT_USER,
TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"),
TEXT("SOFTWARE\\LibreOffice\\CrashReport"),
TEXT("HTTPProxyServer"), REG_SZ,
sProxyServer.c_str(),
sizeof(TCHAR) * (sProxyServer.length() + 1) );
......@@ -349,14 +349,14 @@ void CrashReportParams::WriteToRegistry()
RegWriteValue(
HKEY_CURRENT_USER,
TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"),
TEXT("SOFTWARE\\LibreOffice\\CrashReport"),
TEXT("HTTPProxyPort"), REG_DWORD,
&dwProxyPort,
sizeof(DWORD) );
RegWriteValue(
HKEY_CURRENT_USER,
TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"),
TEXT("SOFTWARE\\LibreOffice\\CrashReport"),
TEXT("AllowContact"), REG_DWORD,
&fAllowContact,
sizeof(DWORD) );
......@@ -364,14 +364,14 @@ void CrashReportParams::WriteToRegistry()
RegWriteValue(
HKEY_CURRENT_USER,
TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"),
TEXT("SOFTWARE\\LibreOffice\\CrashReport"),
TEXT("HTTPConnection"), REG_DWORD,
&uInternetConnection,
sizeof(DWORD) );
RegWriteValue(
HKEY_CURRENT_USER,
TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"),
TEXT("SOFTWARE\\LibreOffice\\CrashReport"),
TEXT("ReturnAddress"), REG_SZ,
sEmail.c_str(),
sizeof(TCHAR) * (sEmail.length() + 1) );
......
......@@ -78,7 +78,7 @@ bool isAccessibilitySupportDesired()
#ifdef WNT
HKEY hKey = 0;
if (RegOpenKeyEx(HKEY_CURRENT_USER,
"Software\\OpenOffice.org\\Accessibility\\AtToolSupport",
"Software\\LibreOffice\\Accessibility\\AtToolSupport",
0, KEY_READ, &hKey) == ERROR_SUCCESS)
{
DWORD dwType = 0;
......
......@@ -66,7 +66,7 @@ void closeErrorFile();
* environment variable to the program directory of the UNO installation.
* If no installation is specified by the user, the default installation on
* the system will be taken. The default installation is read from the
* default value of the key "Software\OpenOffice.org\UNO\InstallPath" from the
* default value of the key "Software\LibreOffice\UNO\InstallPath" from the
* root key HKEY_CURRENT_USER in the Windows Registry. If this key is missing,
* the key is read from the root key HKEY_LOCAL_MACHINE.</p>
*/
......
......@@ -1138,7 +1138,7 @@ End
RegistryItem gid_Regitem_Path
ModuleID = gid_Module_Root;
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
Subkey = "Software\OpenOffice.org\%PRODUCTNAME";
Subkey = "Software\LibreOffice\%PRODUCTNAME";
Name = "Path";
Value = "[INSTALLLOCATION]";
End
......@@ -80,7 +80,7 @@ namespace /* private */
{
rtl::OUString altSenddocUrl;
HKEY hkey;
LONG lret = RegOpenKeyW(HKEY_CURRENT_USER, L"Software\\OpenOffice.org\\SendAsEMailClient", &hkey);
LONG lret = RegOpenKeyW(HKEY_CURRENT_USER, L"Software\\LibreOffice\\SendAsEMailClient", &hkey);
if (lret == ERROR_SUCCESS)
{
wchar_t buff[MAX_PATH];
......
......@@ -60,7 +60,7 @@ echo :
@echo ########################### N O T E ######################################
@echo .
@echo To run the test you have to provide the path to the office location. It must
@echo contain the ure (d:\myOffice\OpenOffice.org\URE).
@echo contain the ure (d:\myOffice\LibreOffice\URE).
@echo Also an office must be installed with full system integration.
@echo Example:
@echo dmake run office="d:\myOffice"
......@@ -87,7 +87,7 @@ CT_NOOFFICE = -NoOffice
# --- Targets ------------------------------------------------------
RUN: $(MISC)$/copyassemblies.done
java -cp $(CLASSPATH) -DSystemRoot=$(SystemRoot) -Dcli_test_program=$(BIN)$/runtests.exe -Dpath="$(office)"\OpenOffice.org\URE\bin $(CT_APP) $(CT_NOOFFICE) $(CT_TESTBASE) $(CT_TEST)
java -cp $(CLASSPATH) -DSystemRoot=$(SystemRoot) -Dcli_test_program=$(BIN)$/runtests.exe -Dpath="$(office)"\LibreOffice\URE\bin $(CT_APP) $(CT_NOOFFICE) $(CT_TESTBASE) $(CT_TEST)
run: RUN
......@@ -234,7 +234,7 @@ rpm --relocate on Linux. The URE is designed so that multiple instances of the
URE can coexist on a single system in different locations.
On Windows, the path to the installed URE is stored in the registry under the
path "HKEY_CLASSES_ROOT\Software\OpenOffice.org\URE" and key "Path".
path "HKEY_CLASSES_ROOT\Software\LibreOffice\URE" and key "Path".
UNO Deployment Variables
......
......@@ -984,7 +984,7 @@ sal_Bool MiscSettings::GetEnableATToolSupport() const
HKEY hkey;
if( ERROR_SUCCESS == RegOpenKey(HKEY_CURRENT_USER,
"Software\\OpenOffice.org\\Accessibility\\AtToolSupport",
"Software\\LibreOffice\\Accessibility\\AtToolSupport",
&hkey) )
{
DWORD dwType;
......@@ -1046,7 +1046,7 @@ void MiscSettings::SetEnableATToolSupport( sal_Bool bEnable )
// If the accessibility key in the Windows registry exists, change it synchronously
if( ERROR_SUCCESS == RegOpenKey(HKEY_CURRENT_USER,
"Software\\OpenOffice.org\\Accessibility\\AtToolSupport",
"Software\\LibreOffice\\Accessibility\\AtToolSupport",
&hkey) )
{
DWORD dwType;
......
......@@ -5986,7 +5986,7 @@ void ToolBox::ImplDisableFlatButtons()
HKEY hkey;
if( ERROR_SUCCESS == RegOpenKey(HKEY_CURRENT_USER,
"Software\\OpenOffice.org\\Accessibility\\AtToolSupport",
"Software\\LibreOffice\\Accessibility\\AtToolSupport",
&hkey) )
{
DWORD dwType = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment