[openoffice] branch AOO41X updated: Defined some variables to reduce warnings while packaging for Windows

[mseidel]

This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a commit to branch AOO41X
in repository https://gitbox.apache.org/repos/asf/openoffice.git


The following commit(s) were added to refs/heads/AOO41X by this push:
     new ab0e39dbcf Defined some variables to reduce warnings while packaging 
for Windows
ab0e39dbcf is described below

commit ab0e39dbcf1a219bf78e0580b1d832c1de9e5860
Author: mseidel <msei...@apache.org>
AuthorDate: Tue Jul 11 17:29:49 2023 +0200

    Defined some variables to reduce warnings while packaging for Windows
    
    (cherry picked from commit 1746dd2bc8e0936fb3f18eea60e976c0f1852a9b)
---
 main/scp2/source/ooo/installation_ooo.scp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/main/scp2/source/ooo/installation_ooo.scp 
b/main/scp2/source/ooo/installation_ooo.scp
index b69b0058c7..af92d8cba0 100644
--- a/main/scp2/source/ooo/installation_ooo.scp
+++ b/main/scp2/source/ooo/installation_ooo.scp
@@ -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.
- * 
+ *
  *************************************************************/
 
 
@@ -29,10 +29,11 @@ Installation gid_Installation_Ooo
     ProductExtension = "${PRODUCTEXTENSION}";
     OOoBaseVersion = "${OOOBASEVERSION}";
     UserDirProductVersion = "${USERDIRPRODUCTVERSION}";
-    JavaVersion = "${JAVAVERSION}";
     SxwFormatName = "OpenOffice.org XML";
     SxwFormatVersion = "1.0";
-    VendorName = "Apache OpenOffice";
+    Manufacturer = "${PRODUCTNAME}";
+    ProductAddon = "${PRODUCTADDON}";
+    BrandPackageVersion = "${BRANDPACKAGEVERSION}";
   #ifdef WNT
     DefaultDestPath = "<winprogpath>\${PRODUCTNAME}${PRODUCTVERSION}";
   #else
@@ -42,4 +43,3 @@ Installation gid_Installation_Ooo
     PatchLevel = 0;
     Styles = (KEEP_OLD_VERSION);
 End
-