cppuhelper/source/findsofficepath.c                           |   12 ++---
 odk/config/cfgWin.js                                          |   10 ++--
 odk/config/configure.pl                                       |    8 +--
 odk/config/setsdkenv_unix                                     |    2 
 odk/config/setsdkenv_unix.sh.in                               |    4 -
 odk/docs/install.html                                         |   21 ----------
 odk/docs/sdk_styles.css                                       |    2 
 odk/docs/tools.html                                           |    2 
 odk/examples/DevelopersGuide/examples.html                    |    2 
 odk/examples/OLE/activex/README.txt                           |    4 -
 odk/examples/cpp/Draw/Draw.cxx                                |    2 
 odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx |    4 -
 odk/examples/examples.html                                    |    2 
 odk/examples/python/DocumentHandling/DocumentConverter.py     |    4 -
 odk/examples/python/DocumentHandling/DocumentLoader.py        |    4 -
 odk/examples/python/DocumentHandling/DocumentPrinter.py       |    6 +-
 odk/examples/python/DocumentHandling/DocumentSaver.py         |    6 +-
 odk/examples/python/DocumentHandling/README.md                |    6 +-
 odk/index.html                                                |    2 
 odk/index_online.html                                         |    4 -
 odk/source/com/sun/star/lib/loader/InstallationFinder.java    |    2 
 odk/source/com/sun/star/lib/loader/WinRegKey.java             |    2 
 odk/source/unoapploader/win/unoapploader.c                    |    6 +-
 23 files changed, 50 insertions(+), 67 deletions(-)

New commits:
commit cc449ea2ea430f7a2427bc0dbd5b53844334b023
Author:     Stephan Bergmann <[email protected]>
AuthorDate: Thu Nov 14 09:57:52 2024 +0100
Commit:     Stephan Bergmann <[email protected]>
CommitDate: Fri Nov 15 11:00:46 2024 +0100

    SDK branding
    
    Change-Id: Ib03b7e31a771c7ac86096599eb8107f42b004ebb
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176617
    Reviewed-by: Stephan Bergmann <[email protected]>
    Tested-by: allotropia jenkins <[email protected]>

diff --git a/cppuhelper/source/findsofficepath.c 
b/cppuhelper/source/findsofficepath.c
index e22e0a582ef1..1e0273591ec2 100644
--- a/cppuhelper/source/findsofficepath.c
+++ b/cppuhelper/source/findsofficepath.c
@@ -53,18 +53,18 @@ static wchar_t* getPathFromRegistryKey( HKEY hroot, const 
wchar_t* subKeyName )
         return NULL;
     }
 
-    /* find the type and size of the default value */
-    if ( RegQueryValueExW( hkey, NULL, NULL, &type, NULL, &size) != 
ERROR_SUCCESS )
+    /* find the type and size of the relevant value */
+    if ( RegQueryValueExW( hkey, L"ZetaOffice " LIBO_VERSION_DOTTED_2, NULL, 
&type, NULL, &size) != ERROR_SUCCESS )
     {
         RegCloseKey( hkey );
         return NULL;
     }
 
-    /* get memory to hold the default value */
+    /* get memory to hold the value */
     data = (wchar_t*) malloc( size + sizeof(wchar_t) );
 
-    /* read the default value */
-    if ( RegQueryValueExW( hkey, NULL, NULL, &type, (LPBYTE) data, &size ) != 
ERROR_SUCCESS )
+    /* read the value */
+    if ( RegQueryValueExW( hkey, L"ZetaOffice " LIBO_VERSION_DOTTED_2, NULL, 
&type, (LPBYTE) data, &size ) != ERROR_SUCCESS )
     {
         RegCloseKey( hkey );
         free( data );
@@ -137,7 +137,7 @@ static char* platformSpecific(void)
     const int SEPARATOR = '/';
     const char* PATHSEPARATOR = ":";
     const char* PATHVARNAME = "PATH";
-    const char* APPENDIX = "/libreoffice" LIBO_VERSION_DOTTED_2;
+    const char* APPENDIX = "/zetaoffice" LIBO_VERSION_DOTTED_2;
         // must match the product's UNIXFILENAME.* in sysui/productlist.mk
 
     char* path = NULL;
diff --git a/odk/config/cfgWin.js b/odk/config/cfgWin.js
index 6cfdce68f36a..24651dfa3a25 100644
--- a/odk/config/cfgWin.js
+++ b/odk/config/cfgWin.js
@@ -19,8 +19,8 @@
 // examples of the Office Development Kit. The script duplicates the template
 // script and inserts the variables into the copied script.
 // The Script was developed for the operating systems Microsoft Windows.
-var regKeyOfficeCurrentUser = 
"HKEY_CURRENT_USER\Software\LibreOffice\UNO\InstallPath\";
-var regKeyOfficeLocaleMachine = 
"HKEY_LOCAL_MACHINE\Software\LibreOffice\UNO\InstallPath\";
+var regKeyOfficeCurrentUser = 
"HKEY_CURRENT_USER\Software\LibreOffice\UNO\InstallPath\ZetaOffice 24.2";
+var regKeyOfficeLocaleMachine = 
"HKEY_LOCAL_MACHINE\Software\LibreOffice\UNO\InstallPath\ZetaOffice 24.2";
 var regKeyDotNetInstallRoot = 
"HKEY_LOCAL_MACHINE\Software\Microsoft\.NETFramework\InstallRoot";
 var regKeyDotNet1_1 = "HKLM\Software\Microsoft\.NETFramework\policy\v1.1\4322";
 var sDirDotNet1_1 = "v1.1.4322";
@@ -842,15 +842,15 @@ function writeBatFile(fdir, file)
         "REM are necessary for building the examples of the Office Development 
Kit.
" +
         "REM The Script was developed for the operating systems Windows.
" +
         "REM The SDK name
" +
-        "REM Example: set OO_SDK_NAME=libreoffice3.4_sdk
" +
+        "REM Example: set OO_SDK_NAME=zetaoffice24.2_sdk
" +
         "set OO_SDK_NAME=" + oo_sdk_name  +
         "

" +
         "REM Installation directory of the Software Development Kit.
" +
-        "REM Example: set OO_SDK_HOME=C:\Program Files\LibreOffice 3\sdk
" +
+        "REM Example: set OO_SDK_HOME=C:\Program Files\ZetaOffice\sdk
" +
         "set OO_SDK_HOME=" + oo_sdk_home  +
         "

" +
         "REM Office installation directory.
" +
-        "REM Example: set OFFICE_HOME=C:\Program Files\LibreOffice 3
" +
+        "REM Example: set OFFICE_HOME=C:\Program Files\ZetaOffice
" +
         "set OFFICE_HOME=" + office_home +
         "

" +
         "REM Directory of the make command.
" +
diff --git a/odk/config/configure.pl b/odk/config/configure.pl
index 756db5a3c76b..8a10651e18c7 100755
--- a/odk/config/configure.pl
+++ b/odk/config/configure.pl
@@ -599,8 +599,8 @@ sub searchprog
 
 sub searchMacOffice
 {
-    if (-d "/Applications/LibreOffice.app" ) {
-        return "/Applications/LibreOffice.app"
+    if (-d "/Applications/ZetaOffice.app" ) {
+        return "/Applications/ZetaOffice.app"
     }
     if (-d "/Applications/OpenOffice.org.app" ) {
         return "/Applications/OpenOffice.org.app"
@@ -620,9 +620,9 @@ sub searchMacOffice
 
 sub searchoffice
 {
-    my $offset = rindex($main::sdkpath, "/libreoffice");
+    my $offset = rindex($main::sdkpath, "/zetaoffice");
     my $tmpOffice = substr($main::sdkpath, 0, $offset);
-    my $officepath = "$tmpOffice/libreoffice";
+    my $officepath = "$tmpOffice/zetaoffice";
 
 #   if ( $main::OO_MINORVERSION > 0) {
 #       $officepath = "$officepath$main::OO_MINORVERSION";
diff --git a/odk/config/setsdkenv_unix b/odk/config/setsdkenv_unix
index cc5f06e64d20..d3d1f7d5cf3f 100755
--- a/odk/config/setsdkenv_unix
+++ b/odk/config/setsdkenv_unix
@@ -27,7 +27,7 @@ if [ "$OSTYPE" = "Darwin" ]
 then
     OO_SDK_NAME=`basename $OO_SDK_HOME`
 else
-    OO_SDK_NAME=libreoffice${OOVERSION}_sdk
+    OO_SDK_NAME=zetaoffice${OOVERSION}_sdk
 fi
 
 export OO_SDK_HOME
diff --git a/odk/config/setsdkenv_unix.sh.in b/odk/config/setsdkenv_unix.sh.in
index 7feda4159e01..13752076dbec 100644
--- a/odk/config/setsdkenv_unix.sh.in
+++ b/odk/config/setsdkenv_unix.sh.in
@@ -26,11 +26,11 @@ OO_SDK_NAME=@OO_SDK_NAME@
 export OO_SDK_NAME
 
 # Installation directory of the Software Development Kit.
-# Example: OO_SDK_HOME=/opt/libreoffice/basis3.4/sdk
+# Example: OO_SDK_HOME=/opt/zetaoffice24.2/sdk
 OO_SDK_HOME='@OO_SDK_HOME@'
 
 # Office installation directory.
-# Example: OFFICE_HOME=/opt/libreoffice
+# Example: OFFICE_HOME=/opt/zetaoffice24.2
 OFFICE_HOME='@OFFICE_HOME@'
 export OFFICE_HOME
 
diff --git a/odk/docs/install.html b/odk/docs/install.html
index 8392063b4c36..c6b252ac1df0 100644
--- a/odk/docs/install.html
+++ b/odk/docs/install.html
@@ -26,8 +26,8 @@
   <div id="BgContainer">
     <div id="Container">
       <div id="TopHeader">
-        <a id="Logo" href="http://www.libreoffice.org/";
-           title="Go to the Home of LibreOffice and the LibreOffice Community 
page"></a>
+        <a id="Logo" href="https://zetaoffice.net/";
+           title="Go to the Home of ZetaOffice"></a>
         <p id="HeaderTagLine">
           Software Development Kit %PRODUCT_RELEASE%
         </p>
@@ -72,23 +72,6 @@
                             libraries as the %PRODUCTNAME% installation.</p>
                             <p>Download the SDK from the same
                             source as your %PRODUCTNAME% packages.</p>
-                            <ul>
-                              <li>If you have installed an official The
-                                Document Foundation LibreOffice release,
-                                download and install the corresponding SDK
-                                release for your platform from
-                                <a target="_blank" 
href="https://www.libreoffice.org/download"; title="link to The Document 
Foundation download page">https://www.libreoffice.org/download</a>
-                              </li>
-                              <li>If you have installed a downstream 
LibreOffice
-                                release via your operating system's package
-                                management tools, use the same package
-                                management tools to install the corresponding
-                                downstream SDK package(s).
-                              </li>
-                            </ul>
-                            <p><b>Note</b>: Do not mix and match The Document
-                              Foundation LibreOffice releases with downstream
-                              SDK packages or vice versa!</p></td>
                             </td>
                         </tr>
                         <tr valign="middle">
diff --git a/odk/docs/sdk_styles.css b/odk/docs/sdk_styles.css
index fe6917a4cc72..09d3c7dadb1e 100644
--- a/odk/docs/sdk_styles.css
+++ b/odk/docs/sdk_styles.css
@@ -39,7 +39,7 @@ body {
        width: 218px;
        height: 45px;
        padding: 18px 20px;
-       background: 
url(https://api.libreoffice.org/themes/libo/images/logo.png) no-repeat 18px 
20px;
+       background: url(https://zetaoffice.net/assets/img/zeta.png) no-repeat 
center / contain;
        *float:left;/* hack for IE7 that doesn't respect inline-block */
 }
 #TopHeader { height: 88px;/* needed for IE7 */}
diff --git a/odk/docs/tools.html b/odk/docs/tools.html
index 09f77f338ba0..0169af5dab37 100644
--- a/odk/docs/tools.html
+++ b/odk/docs/tools.html
@@ -27,7 +27,7 @@
         <div id="BgContainer">
             <div id="Container">
                 <div id="TopHeader">
-                    <a id="Logo" href="http://www.libreoffice.org/"; title="Go 
to the Home of LibreOffice and the LibreOffice Community page"></a>
+                    <a id="Logo" href="https://zetaoffice.net/"; title="Go to 
the Home of ZetaOffice"></a>
                     <p id="HeaderTagLine">
                         Software Development Kit %PRODUCT_RELEASE%
                     </p>
diff --git a/odk/examples/DevelopersGuide/examples.html 
b/odk/examples/DevelopersGuide/examples.html
index fbdee2861795..0b83bc86e717 100644
--- a/odk/examples/DevelopersGuide/examples.html
+++ b/odk/examples/DevelopersGuide/examples.html
@@ -27,7 +27,7 @@
         <div id="BgContainer">
             <div id="Container">
                 <div id="TopHeader">
-                    <a id="Logo" href="http://www.libreoffice.org/"; title="Go 
to the Home of LibreOffice and the LibreOffice Community page"></a>
+                    <a id="Logo" href="https://zetaoffice.net/"; title="Go to 
the Home of ZetaOffice"></a>
                     <p id="HeaderTagLine">
                         Software Development Kit %PRODUCT_RELEASE%
                     </p>
diff --git a/odk/examples/OLE/activex/README.txt 
b/odk/examples/OLE/activex/README.txt
index 6528c528fa38..dbc43464bc0d 100644
--- a/odk/examples/OLE/activex/README.txt
+++ b/odk/examples/OLE/activex/README.txt
@@ -10,8 +10,8 @@ uncomment or remove the line 'CL_NEW_LIB=atls.lib'.
 
 * Description.
 
-The LibreOffice ActiveX control shows an example of access to UNO through COM 
technology.
-It requires a properly installed LibreOffice version 4.0 or later
+The ZetaOffice ActiveX control shows an example of access to UNO through COM 
technology.
+It requires a properly installed ZetaOffice
 This is a Lite ActiveX control so it can be used only in containers that
 allows to use such controls. It can be activated with an <OBJECT> tag from
 a html-page to embed a document. Without any parameters a new writer document 
will be
diff --git a/odk/examples/cpp/Draw/Draw.cxx b/odk/examples/cpp/Draw/Draw.cxx
index baed25444155..d00db7aeef53 100644
--- a/odk/examples/cpp/Draw/Draw.cxx
+++ b/odk/examples/cpp/Draw/Draw.cxx
@@ -106,7 +106,7 @@ Reference<XComponent> openDraw(Reference<XComponentContext> 
xContext)
 
     try
     {
-        // getting the remote LibreOffice service manager
+        // getting the remote ZetaOffice service manager
         Reference<XMultiComponentFactory> xMCF = xContext->getServiceManager();
 
         Reference<XInterface> oDesktop
diff --git a/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx 
b/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx
index 3fd70340aebc..6f4059f1d06c 100644
--- a/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx
+++ b/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx
@@ -210,8 +210,8 @@ void SAL_CALL BaseDispatch::dispatch( const URL& aURL, 
const Sequence < Property
     {
         if ( aURL.Path == "ImageButtonCmd" )
         {
-            // open the LibreOffice web page
-            ::rtl::OUString sURL("http://www.libreoffice.org";);
+            // open the ZetaOffice web page
+            ::rtl::OUString sURL("https://zetaoffice.net";);
             Reference< XSystemShellExecute > xSystemShellExecute(
                 SystemShellExecute::create(mxContext) );
             try
diff --git a/odk/examples/examples.html b/odk/examples/examples.html
index 506158a7a1e5..3acf9ff6eb72 100644
--- a/odk/examples/examples.html
+++ b/odk/examples/examples.html
@@ -27,7 +27,7 @@
         <div id="BgContainer">
             <div id="Container">
                 <div id="TopHeader">
-                    <a id="Logo" href="http://www.libreoffice.org/"; title="Go 
to the Home of LibreOffice and the LibreOffice Community page"></a>
+                    <a id="Logo" href="https://zetaoffice.net/"; title="Go to 
the Home of ZetaOffice"></a>
                     <p id="HeaderTagLine">
                         Software Development Kit %PRODUCT_RELEASE%
                     </p>
diff --git a/odk/examples/python/DocumentHandling/DocumentConverter.py 
b/odk/examples/python/DocumentHandling/DocumentConverter.py
index a1f54fca9102..a184665e0b6f 100644
--- a/odk/examples/python/DocumentHandling/DocumentConverter.py
+++ b/odk/examples/python/DocumentHandling/DocumentConverter.py
@@ -22,7 +22,7 @@ SOFFICE_CONNECTION_URI = 
"uno:socket,host=localhost,port=2083;urp;StarOffice.Com
 
 
 def connect_soffice():
-    """Connect to remote running LibreOffice"""
+    """Connect to remote running ZetaOffice"""
     local_context = uno.getComponentContext()
     resolver = local_context.ServiceManager.createInstanceWithContext(
         "com.sun.star.bridge.UnoUrlResolver", local_context
@@ -30,7 +30,7 @@ def connect_soffice():
     try:
         remote_context = resolver.resolve(SOFFICE_CONNECTION_URI)
     except NoConnectException:
-        raise Exception("Cannot establish a connection to LibreOffice.")
+        raise Exception("Cannot establish a connection to ZetaOffice.")
 
     return remote_context.ServiceManager.createInstanceWithContext(
         "com.sun.star.frame.Desktop", remote_context
diff --git a/odk/examples/python/DocumentHandling/DocumentLoader.py 
b/odk/examples/python/DocumentHandling/DocumentLoader.py
index a88f3ad0d724..d2df8059297d 100644
--- a/odk/examples/python/DocumentHandling/DocumentLoader.py
+++ b/odk/examples/python/DocumentHandling/DocumentLoader.py
@@ -46,7 +46,7 @@ if __name__ == "__main__":
             "uno:socket,host=localhost,"
             "port=2083;urp;StarOffice.ComponentContext")
     except NoConnectException:
-        raise Exception("Error: cannot establish a connection to LibreOffice.")
+        raise Exception("Error: cannot establish a connection to ZetaOffice.")
 
     desktop = context.ServiceManager.createInstanceWithContext(
         "com.sun.star.frame.Desktop", context)
@@ -62,7 +62,7 @@ if __name__ == "__main__":
     else:
         url = "private:factory/swriter"
 
-    # Load a LibreOffice document, and automatically display it on the screen
+    # Load a ZetaOffice document, and automatically display it on the screen
     xComp = desktop.loadComponentFromURL(url, "_blank", 0, tuple([]))
 
 # vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/odk/examples/python/DocumentHandling/DocumentPrinter.py 
b/odk/examples/python/DocumentHandling/DocumentPrinter.py
index d9a4e29632c7..6bc9ed77336a 100644
--- a/odk/examples/python/DocumentHandling/DocumentPrinter.py
+++ b/odk/examples/python/DocumentHandling/DocumentPrinter.py
@@ -21,9 +21,9 @@ SOFFICE_CONNECTION_URI = 
"uno:socket,host=localhost,port=2083;urp;StarOffice.Com
 
 
 def connect_soffice():
-    """Connect to remote running LibreOffice
+    """Connect to remote running ZetaOffice
 
-    :return: an object representing the remote LibreOffice instance.
+    :return: an object representing the remote ZetaOffice instance.
     """
     local_context = uno.getComponentContext()
     resolver = local_context.ServiceManager.createInstanceWithContext(
@@ -32,7 +32,7 @@ def connect_soffice():
     try:
         remote_context = resolver.resolve(SOFFICE_CONNECTION_URI)
     except NoConnectException:
-        raise Exception("Cannot establish a connection to LibreOffice.")
+        raise Exception("Cannot establish a connection to ZetaOffice.")
 
     return remote_context.ServiceManager.createInstanceWithContext(
         "com.sun.star.frame.Desktop", remote_context
diff --git a/odk/examples/python/DocumentHandling/DocumentSaver.py 
b/odk/examples/python/DocumentHandling/DocumentSaver.py
index e7d8010a231a..e0786160330f 100644
--- a/odk/examples/python/DocumentHandling/DocumentSaver.py
+++ b/odk/examples/python/DocumentHandling/DocumentSaver.py
@@ -26,9 +26,9 @@ SOFFICE_CONNECTION_URI = 
"uno:socket,host=localhost,port=2083;urp;StarOffice.Com
 
 
 def connect_soffice():
-    """Connect to remote running LibreOffice
+    """Connect to remote running ZetaOffice
 
-    :return: an object representing the remote LibreOffice instance.
+    :return: an object representing the remote ZetaOffice instance.
     """
     local_context = uno.getComponentContext()
     resolver = local_context.ServiceManager.createInstanceWithContext(
@@ -37,7 +37,7 @@ def connect_soffice():
     try:
         remote_context = resolver.resolve(SOFFICE_CONNECTION_URI)
     except NoConnectException:
-        raise Exception("Cannot establish a connection to LibreOffice.")
+        raise Exception("Cannot establish a connection to ZetaOffice.")
 
     return remote_context.ServiceManager.createInstanceWithContext(
         "com.sun.star.frame.Desktop", remote_context
diff --git a/odk/examples/python/DocumentHandling/README.md 
b/odk/examples/python/DocumentHandling/README.md
index 7e0e8aa43e4f..e0d6a32e8d1e 100644
--- a/odk/examples/python/DocumentHandling/README.md
+++ b/odk/examples/python/DocumentHandling/README.md
@@ -1,7 +1,7 @@
 # Document Handling Examples
 
 These examples are somehow similar to DocumentLoader in C++ and Java.
-To get started, first start LibreOffice listening on port 2083
+To get started, first start ZetaOffice listening on port 2083
 
     $OFFICE_PROGRAM_PATH/soffice "--accept=socket,port=2083;urp;"
 
@@ -10,7 +10,7 @@ Each example script accepts `-h` to show the usage, e.g.
     $OFFICE_PROGRAM_PATH/python DocumentLoader.py -h
 
 You should use `setsdkenv_unix` for Unix/Linux and `setsdkenv_windows.bat` for
-Windows. In this way, the LibreOffice internal Python interpreter will be used.
+Windows. In this way, the ZetaOffice internal Python interpreter will be used.
 
 ## Document Converter
 
@@ -18,7 +18,7 @@ Windows. In this way, the LibreOffice internal Python 
interpreter will be used.
 $OFFICE_PROGRAM_PATH/python DocumentConverter.py ./tests/ "MS Word 97" doc 
/tmp/
 ```
 
-This command searches LibreOffice documents recursively under directory
+This command searches ZetaOffice documents recursively under directory
 `./tests` and convert every found document to format Microsoft Word 97. The
 converted document can be found under directory `/tmp`.
 
diff --git a/odk/index.html b/odk/index.html
index 7eba20ce6cad..8d90d61a0922 100644
--- a/odk/index.html
+++ b/odk/index.html
@@ -26,7 +26,7 @@
 <div id="BgContainer">
     <div id="Container">
         <div id="TopHeader">
-            <a id="Logo" href="http://www.libreoffice.org/"; title="Go to the 
Home of LibreOffice and the LibreOffice Community page"></a>
+            <a id="Logo" href="https://zetaoffice.net/"; title="Go to the Home 
of ZetaOffice"></a>
             <p id="HeaderTagLine">%PRODUCTNAME% API Documentation</p>
          </div>
          <div class="clear"></div>
diff --git a/odk/index_online.html b/odk/index_online.html
index 9e7a54ba3d49..74f030fbc65d 100644
--- a/odk/index_online.html
+++ b/odk/index_online.html
@@ -3,13 +3,13 @@
   <title>%PRODUCTNAME% API Documentation</title>
   <link rel="stylesheet" type="text/css" href="docs/sdk_styles.css">
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-  <link rel="shortcut icon" href="http://www.libreoffice.org/favicon.ico"; />
+  <link rel="shortcut icon" 
href="https://zetaoffice.net/assets/img/favicon.png"; />
 </head>
 <body>
 <div id="BgContainer">
     <div id="Container">
         <div id="TopHeader">
-            <a id="Logo" href="http://www.libreoffice.org/"; title="Go to the 
Home of LibreOffice and the LibreOffice Community page"></a>
+            <a id="Logo" href="https://zetaoffice.net/"; title="Go to the Home 
of ZetaOffice"></a>
             <p id="HeaderTagLine">LibreOffice API Documentation</p>
          </div>
          <div class="clear"></div>
diff --git a/odk/source/com/sun/star/lib/loader/InstallationFinder.java 
b/odk/source/com/sun/star/lib/loader/InstallationFinder.java
index 8178e0670781..00667fd0d2be 100644
--- a/odk/source/com/sun/star/lib/loader/InstallationFinder.java
+++ b/odk/source/com/sun/star/lib/loader/InstallationFinder.java
@@ -63,7 +63,7 @@ final class InstallationFinder {
     private static final String SYSPROP_NAME =
         "com.sun.star.lib.loader.unopath";
     private static final String ENVVAR_NAME = "UNO_PATH";
-    private static final String SOFFICE = "libreoffice"; // Unix/Linux only
+    private static final String SOFFICE = "zetaoffice24.2"; // Unix/Linux only
 
     private InstallationFinder() {} // do not instantiate
 
diff --git a/odk/source/com/sun/star/lib/loader/WinRegKey.java 
b/odk/source/com/sun/star/lib/loader/WinRegKey.java
index 597b506d9ca2..321eaba459ae 100644
--- a/odk/source/com/sun/star/lib/loader/WinRegKey.java
+++ b/odk/source/com/sun/star/lib/loader/WinRegKey.java
@@ -60,7 +60,7 @@ final class WinRegKey {
             r = new BufferedReader(
                 new InputStreamReader(p.getInputStream(), 
Charset.defaultCharset()));
             String v = null;
-            Pattern pt = Pattern.compile("\s+\(Default\)\s+REG_SZ\s+(.+)");
+            Pattern pt = Pattern.compile("\s+ZetaOffice 
24\.2\s+REG_SZ\s+(.+)");
             for (;;) {
                 String s = r.readLine();
                 if (s == null) {
diff --git a/odk/source/unoapploader/win/unoapploader.c 
b/odk/source/unoapploader/win/unoapploader.c
index 7a4f9e98e3de..389970577e99 100644
--- a/odk/source/unoapploader/win/unoapploader.c
+++ b/odk/source/unoapploader/win/unoapploader.c
@@ -56,9 +56,9 @@ static void closeErrorFile(void);
  * 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\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>
+ * relevant value of the key "Software\ZetaOffice\UNO\InstallPath" from the
+ * root key HKEY_CURRENT_USER in the Windows Registry. If this value is 
missing,
+ * the value is read from the root key HKEY_LOCAL_MACHINE.</p>
  */
 int WINAPI wWinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
                     LPWSTR lpCmdLine, int nCmdShow )

Reply via email to