replace OpenOffice.org to LibreOffice in registry keys

9 files changed, 20 insertions, 20 deletions

diff --git a/crashrep/source/win32/soreport.cpp b/crashrep/source/win32/soreport.cpp
index 1a3baa87bbcd..c8c4876e6f97 100644
--- a/crashrep/source/win32/soreport.cpp
+++ b/crashrep/source/win32/soreport.cpp
@@ -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) );
diff --git a/jvmfwk/source/fwkutil.cxx b/jvmfwk/source/fwkutil.cxx
index 4b8c223b768e..928588aab4ad 100644
--- a/jvmfwk/source/fwkutil.cxx
+++ b/jvmfwk/source/fwkutil.cxx
@@ -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;
diff --git a/odk/source/unoapploader/win/unoapploader.c b/odk/source/unoapploader/win/unoapploader.c
index 762b554744b3..8debafe0c25f 100644
--- a/odk/source/unoapploader/win/unoapploader.c
+++ b/odk/source/unoapploader/win/unoapploader.c
@@ -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>
  */
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 88d76b970f8b..be2c52f4d78f 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -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
diff --git a/shell/source/win32/simplemail/smplmailclient.cxx b/shell/source/win32/simplemail/smplmailclient.cxx
index 4b70c8a62627..a6e0187b096a 100644
--- a/shell/source/win32/simplemail/smplmailclient.cxx
+++ b/shell/source/win32/simplemail/smplmailclient.cxx
@@ -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];
diff --git a/testtools/qa/cliversioning/makefile.mk b/testtools/qa/cliversioning/makefile.mk
index c4708f2d8337..329fa15952fa 100644
--- a/testtools/qa/cliversioning/makefile.mk
+++ b/testtools/qa/cliversioning/makefile.mk
@@ -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
 
diff --git a/ure/source/README b/ure/source/README
index efb88d9e4511..1da0610ce716 100644
--- a/ure/source/README
+++ b/ure/source/README
@@ -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
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index c95d5616963f..3116b7b8b2b1 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -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;
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index ff5cb5be324d..4dc2458acc58 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -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;