#121388# - Adapt naming "OpenOffice.org" --> "Apache OpenOffice"

-- impact on corresponding strings in the UI, folder names, package names, ...

18 files changed, 45 insertions, 42 deletions

diff --git a/odk/cfgWin.js b/odk/cfgWin.js
index 95bde9a93449..11a2b6c87675 100644
--- a/odk/cfgWin.js
+++ b/odk/cfgWin.js
@@ -22,8 +22,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\\OpenOffice.org\\UNO\\InstallPath\\";
-var regKeyOfficeLocaleMachine = "HKEY_LOCAL_MACHINE\\Software\\OpenOffice.org\\UNO\\InstallPath\\";
+var regKeyOfficeCurrentUser = "HKEY_CURRENT_USER\\Software\\Apache OpenOffice\\UNO\\InstallPath\\";
+var regKeyOfficeLocaleMachine = "HKEY_LOCAL_MACHINE\\Software\\Apache OpenOffice\\UNO\\InstallPath\\";
 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";
@@ -923,18 +923,18 @@ function writeBatFile(fdir, file)
         "set OO_SDK_NAME=" + oo_sdk_name  +
         "\n\n" +
         "REM Installation directory of the Software Development Kit.\n" +
-        "REM Example: set OO_SDK_HOME=C:\\Program Files\\OpenOffice.org\\Basic 3.0\\sdk\n" +
+        "REM Example: set OO_SDK_HOME=C:\\Program Files\\Apache OpenOffice\\Basic 3.0\\sdk\n" +
         "set OO_SDK_HOME=" + oo_sdk_home  +
         "\n\n" +
         "REM Office installation directory.\n" +
-        "REM Example: set OFFICE_HOME=C:\\Program Files\\OpenOffice.org 3\n" +
+        "REM Example: set OFFICE_HOME=C:\\Program Files\\Apache OpenOffice 3\n" +
         "set OFFICE_HOME=" + office_home +
         "\n\n" +
-        "REM Example: set OFFICE_HOME=C:\\Program Files\\OpenOffice.org\\Basis 3.0\n" +
+        "REM Example: set OFFICE_HOME=C:\\Program Files\\Apache OpenOffice\\Basis 3.0\n" +
         "set OFFICE_BASE_HOME=" + office_base_home +
         "\n\n" +
         "REM URE installation directory.\n" +
-        "REM Example: set OO_SDK_URE_HOME=C:\\Program Files\\OpenOffice.org\\URE\n" +
+        "REM Example: set OO_SDK_URE_HOME=C:\\Program Files\\Apache OpenOffice\\URE\n" +
         "set OO_SDK_URE_HOME=" + oo_sdk_ure_home +
         "\n\n" +
         "REM Directory of the make command.\n" +
diff --git a/odk/configure.pl b/odk/configure.pl
index cff35a156ba7..27cfb66bbeed 100755
--- a/odk/configure.pl
+++ b/odk/configure.pl
@@ -235,7 +235,7 @@ if ( $main::OFFICE_OR_URE eq "Office" )
 else
 {
     # prepare URE path
-    $main::OO_SDK_URE_HOME_SUGGESTION = "/opt/openoffice.org/ure";
+    $main::OO_SDK_URE_HOME_SUGGESTION = "/opt/apacheopenoffice/ure";
     $main::OO_SDK_URE_HOME_SUGGESTION = "" unless
         -e "$main::OO_SDK_URE_HOME_SUGGESTION/bin/uno";
     for (;;)
@@ -711,6 +711,9 @@ sub searchprog
 
 sub searchMacOffice
 {
+    if (-d "/Applications/Apache OpenOffice.app" ) {
+        return "/Applications/Apache OpenOffice.app"
+    }
     if (-d "/Applications/OpenOffice.org.app" ) {
         return "/Applications/OpenOffice.org.app"
     }
@@ -729,9 +732,9 @@ sub searchMacOffice
 
 sub searchoffice
 {
-    my $offset = rindex($main::sdkpath, "/openoffice.org");
+    my $offset = rindex($main::sdkpath, "/apacheopenoffice");
     my $tmpOffice = substr($main::sdkpath, 0, $offset);
-    my $officepath = "$tmpOffice/openoffice.org$main::OO_MAJORVERSION";
+    my $officepath = "$tmpOffice/apacheopenoffice$main::OO_MAJORVERSION";
 
 #   if ( $main::OO_MINORVERSION > 0) {
 #       $officepath = "$officepath$main::OO_MINORVERSION";
diff --git a/odk/docs/install.html b/odk/docs/install.html
index 0e24fa275eb7..d02f635539df 100644
--- a/odk/docs/install.html
+++ b/odk/docs/install.html
@@ -188,7 +188,7 @@
 		  <tr valign="top">
 		  <td class="cell20"><b>OFFICE_HOME</b></td>
 		  <td class="cell80">Path to an existing Apache OpenOffice 
-		  base installation, e.g. &quot;/opt/openoffice.org3&quot;. Be sure 
+		  base installation, e.g. &quot;/opt/apacheopenoffice3&quot;. Be sure 
 		  that it is not a user installation only. Exactly one of OFFICE_HOME
           and OO_SDK_URE_HOME must be set. The other should be either unset or
           set to an empty value.</td>
@@ -205,7 +205,7 @@
           <tr>
           <td class="cell20"><b>OO_SDK_URE_HOME</b></td>
           <td class="cell80">Path to an existing UNO Runtime Environment
-          installation, e.g. &quot;/opt/openoffice.org/ure&quot;. Exactly one of
+          installation, e.g. &quot;/opt/apacheopenoffice/ure&quot;. Exactly one of
           OFFICE_HOME and OO_SDK_URE_HOME must be set. The other should be
           either unset or set to an empty value.</td>
           </tr>
@@ -259,7 +259,7 @@
 		  the output is generated in the SDK directory itself. If an output 
 		  directory is specified, the output is generated in a SDK dependent 
 		  subdirectory in this directory (e.g. &lt;OO_SDK_OUTPUT_DIR&gt;
-		  /OpenOffice.org %PRODUCT_RELEASE%/LINUXExample.out)</td>
+		  /Apache OpenOffice %PRODUCT_RELEASE%/LINUXExample.out)</td>
 		  </tr>
 		  <tr>
 		  <td class="cell20"><b>SDK_AUTO_DEPLOYMENT</b></td>
diff --git a/odk/docs/notsupported.html b/odk/docs/notsupported.html
index e12e71d6ab7d..b33c29f8c805 100644
--- a/odk/docs/notsupported.html
+++ b/odk/docs/notsupported.html
@@ -23,7 +23,7 @@
  -->
 <html>
 <head>
-  <title>OpenOffice.org %PRODUCT_RELEASE% SDK - Not supported page</title>
+  <title>Apache OpenOffice %PRODUCT_RELEASE% SDK - Not supported page</title>
   <link rel="stylesheet" type="text/css" href="sdk_styles.css"> 
   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
   <meta name="author" content="J&uuml;rgen Schmidt">  
diff --git a/odk/docs/tools.html b/odk/docs/tools.html
index bb94b6cef338..f994f827ae20 100644
--- a/odk/docs/tools.html
+++ b/odk/docs/tools.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
 <!--
 #**************************************************************
 #  
@@ -23,7 +23,7 @@
  -->
 <html>
 <head>
-  <title>OpenOffice.org %PRODUCT_RELEASE% SDK - Development Tools</title>
+  <title>Apache OpenOffice %PRODUCT_RELEASE% SDK - Development Tools</title>
   <link rel="stylesheet" type="text/css" href="sdk_styles.css">
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
   <meta name="author" content="J&uuml;rgen Schmidt">
@@ -168,7 +168,7 @@
 		  office installation. UNO packages are UNO components (single libraries or 
 		  Jar files or more complex zip files that contains one or more libraries|
 		  Jar files, type libraries and configuration items), scripts  and 
-		  OpenOffice.org %PRODUCT_RELEASE% Basic libraries as zip package. 'unopkg' is not part of the 
+		  Apache OpenOffice %PRODUCT_RELEASE% Basic libraries as zip package. 'unopkg' is not part of the 
 		  SDK but comes with the office directly and is a development tool as well 
 		  as an end user tool to deploy extension into an office installation.</p>
 		  <p>More details concerning deployment and this tool can be find in the 
diff --git a/odk/examples/cpp/StatusbarController/ModifiedStatusbarController/project.mk b/odk/examples/cpp/StatusbarController/ModifiedStatusbarController/project.mk
index 631ff8148825..91a07fd7f690 100644
--- a/odk/examples/cpp/StatusbarController/ModifiedStatusbarController/project.mk
+++ b/odk/examples/cpp/StatusbarController/ModifiedStatusbarController/project.mk
@@ -20,7 +20,7 @@
 #**************************************************************
 
 DESCRIPTION_OOO_MIN_VER=3.5.0
-DESCRIPTION_DEP_NAME=OpenOffice.org $(DESCRIPTION_OOO_MIN_VER)
+DESCRIPTION_DEP_NAME=Apache OpenOffice $(DESCRIPTION_OOO_MIN_VER)
 
 EXTENSION_ID=org.apache.openoffice.framework.statusbar.ModifiedStatus
 EXTENSION_VERSION=0.0.1
diff --git a/odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/project.mk b/odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/project.mk
index a65d034c77fe..38db42374c54 100644
--- a/odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/project.mk
+++ b/odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/project.mk
@@ -20,7 +20,7 @@
 #**************************************************************
 
 DESCRIPTION_OOO_MIN_VER=3.5.0
-DESCRIPTION_DEP_NAME=OpenOffice.org $(DESCRIPTION_OOO_MIN_VER)
+DESCRIPTION_DEP_NAME=Apache OpenOffice $(DESCRIPTION_OOO_MIN_VER)
 
 EXTENSION_ID=org.apache.openoffice.framework.statusbar.SelectionMode
 EXTENSION_VERSION=0.0.1
diff --git a/odk/examples/cpp/StatusbarController/WordCountStatusbarController/project.mk b/odk/examples/cpp/StatusbarController/WordCountStatusbarController/project.mk
index 0f05b0a1e73d..0149b37ac74f 100644
--- a/odk/examples/cpp/StatusbarController/WordCountStatusbarController/project.mk
+++ b/odk/examples/cpp/StatusbarController/WordCountStatusbarController/project.mk
@@ -20,7 +20,7 @@
 #**************************************************************
 
 DESCRIPTION_OOO_MIN_VER=3.5.0
-DESCRIPTION_DEP_NAME=OpenOffice.org $(DESCRIPTION_OOO_MIN_VER)
+DESCRIPTION_DEP_NAME=Apache OpenOffice $(DESCRIPTION_OOO_MIN_VER)
 
 EXTENSION_ID=org.apache.openoffice.framework.statusbar.StatusWordCount
 EXTENSION_VERSION=0.0.1
diff --git a/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx b/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx
index 0bfbfb61e69b..36f309950a27 100644
--- a/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx
+++ b/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx
@@ -233,7 +233,7 @@ void SAL_CALL BaseDispatch::dispatch( const URL& aURL, const Sequence < Property
     {
         if ( !aURL.Path.compareToAscii( RTL_CONSTASCII_STRINGPARAM( "ImageButtonCmd" ) ) )
         {
-            // open the OpenOffice.org web page
+            // open the Apache OpenOffice web page
             ::rtl::OUString sURL( RTL_CONSTASCII_USTRINGPARAM( "http://www.openoffice.org" ) );
             Reference< XSystemShellExecute > xSystemShellExecute(
                 com::sun::star::system::SystemShellExecute::create( mxContext ) );
diff --git a/odk/examples/cpp/custompanel/description.xml b/odk/examples/cpp/custompanel/description.xml
index 1dc8721a04a1..9bba0d616695 100644
--- a/odk/examples/cpp/custompanel/description.xml
+++ b/odk/examples/cpp/custompanel/description.xml
@@ -31,6 +31,6 @@
     <name>Custom Tool Panel Example</name>
   </display-name>
   <dependencies>
-    <OpenOffice.org-minimal-version value="3.4" d:name="OpenOffice.org 3.4"/>
+    <OpenOffice.org-minimal-version value="3.4" d:name="Apache OpenOffice 3.4"/>
   </dependencies>
 </description>
diff --git a/odk/pack/copying/dk.mk b/odk/pack/copying/dk.mk
index ec06352e81a4..1b8ed2507f4c 100644
--- a/odk/pack/copying/dk.mk
+++ b/odk/pack/copying/dk.mk
@@ -19,7 +19,7 @@
 #  
 #**************************************************************
 
-# OpenOffice.org @@RELEASE@@ SDK dependent settings
+# Apache OpenOffice @@RELEASE@@ SDK dependent settings
 SDKVERSION=@@RELEASE@@
 BUILDID=@@BUILDID@@
 SCM_REVISION=@@SCMREVISION@@
\ No newline at end of file
diff --git a/odk/pack/copying/idl_chapter_refs.txt b/odk/pack/copying/idl_chapter_refs.txt
index 58d93cce9c1b..4095601a41d7 100644
--- a/odk/pack/copying/idl_chapter_refs.txt
+++ b/odk/pack/copying/idl_chapter_refs.txt
@@ -6547,8 +6547,8 @@ com.sun.star.task.JobExecutor
 TOPIC:
 com.sun.star.task.JobExecutor
 
-LINK:Documentation/DevGuide/Database/Data_Sources_in_OpenOffice.org_API#DatabaseContext
-DESCR:Database - Data Sources in OpenOffice.org API - DatabaseContext
+LINK:Documentation/DevGuide/Database/Data_Sources_in_Apache_OpenOffice_API#DatabaseContext
+DESCR:Database - Data Sources in Apache OpenOffice API - DatabaseContext
 REF:
 com.sun.star.sdb.Connection
 com.sun.star.sdb.DatabaseContext
@@ -7510,8 +7510,8 @@ com.sun.star.table.CellAddress
 com.sun.star.sheet.XSheetAnnotationAnchor
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Frame-Controller-Model_Paradigm_in_OpenOffice.org
-DESCR:OfficeDev - Frame-Controller-Model Paradigm in OpenOffice.org
+LINK:Documentation/DevGuide/OfficeDev/Frame-Controller-Model_Paradigm_in_Apache_OpenOffice
+DESCR:OfficeDev - Frame-Controller-Model Paradigm in Apache OpenOffice
 REF:
 TOPIC:
 com.sun.star.frame.XController
diff --git a/odk/setsdkenv_unix b/odk/setsdkenv_unix
index 53954d166775..859767cf6c94 100644
--- a/odk/setsdkenv_unix
+++ b/odk/setsdkenv_unix
@@ -30,7 +30,7 @@ if [ "$OSTYPE" = "Darwin" ]
 then
     OO_SDK_NAME=`basename $OO_SDK_HOME`
 else
-    OO_SDK_NAME=openoffice.org${OOVERSION}_sdk
+    OO_SDK_NAME=apacheopenoffice${OOVERSION}_sdk
 fi
 
 export OO_SDK_HOME
diff --git a/odk/setsdkenv_unix.sh.in b/odk/setsdkenv_unix.sh.in
index 321def875827..24d2c1cecbd6 100644
--- a/odk/setsdkenv_unix.sh.in
+++ b/odk/setsdkenv_unix.sh.in
@@ -29,16 +29,16 @@ OO_SDK_NAME=@OO_SDK_NAME@
 export OO_SDK_NAME
 
 # Installation directory of the Software Development Kit.
-# Example: OO_SDK_HOME=/opt/openoffice.org/basis3.0/sdk
+# Example: OO_SDK_HOME=/opt/apacheopenoffice/basis3.0/sdk
 OO_SDK_HOME='@OO_SDK_HOME@'
 
 # Office installation directory.
-# Example: OFFICE_HOME=/opt/openoffice.org3
+# Example: OFFICE_HOME=/opt/apacheopenoffice3
 OFFICE_HOME='@OFFICE_HOME@'
 OFFICE_BASE_HOME='@OFFICE_BASE_HOME@'
 
 # URE installation directory.
-# Example: OO_SDK_URE_HOME=/opt/openoffice.org/ure
+# Example: OO_SDK_URE_HOME=/opt/apacheopenoffice/ure
 OO_SDK_URE_HOME='@OO_SDK_URE_HOME@'
 export OO_SDK_URE_HOME
 
@@ -78,7 +78,7 @@ OO_SDK_OUTPUT_DIR=@OO_SDK_OUTPUT_DIR@
 SDK_AUTO_DEPLOYMENT=@SDK_AUTO_DEPLOYMENT@
 export SDK_AUTO_DEPLOYMENT
 
-# Check installation path for the OpenOffice Development Kit.
+# Check installation path for the Apache OpenOffice Development Kit.
 if [ -z "${OO_SDK_HOME}" ]
 then
     echo Error: Please insert a correct value for the variable OO_SDK_HOME.
diff --git a/odk/setsdkenv_windows.template b/odk/setsdkenv_windows.template
index b0015ff09877..079214f17639 100644
--- a/odk/setsdkenv_windows.template
+++ b/odk/setsdkenv_windows.template
@@ -23,22 +23,22 @@ REM This script sets all enviroment variables, which
 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=openoffice3.0_sdk
-set OO_SDK_NAME=openoffice.org3.0_sdk
+REM Example: set OO_SDK_NAME=apacheopenoffice3.0_sdk
+set OO_SDK_NAME=apacheopenoffice3.0_sdk
 
 REM Installation directory of the Software Development Kit.
-REM Example: set OO_SDK_HOME=C:\Program Files\OpenOffice.org\Basic 3.0\sdk
+REM Example: set OO_SDK_HOME=C:\Program Files\Apache OpenOffice\Basic 3.0\sdk
 set OO_SDK_HOME=
 
 REM Office installation directory.
-REM Example: set OFFICE_HOME=C:\Program Files\OpenOffice.org 3
+REM Example: set OFFICE_HOME=C:\Program Files\Apache OpenOffice 3
 set OFFICE_HOME=
 
-REM Example: set OFFICE_HOME=C:\Program Files\OpenOffice.org\Basis 3.0
+REM Example: set OFFICE_HOME=C:\Program Files\Apache OpenOffice\Basis 3.0
 set OFFICE_BASE_HOME=
 
 REM URE installation directory.
-REM Example: set OO_SDK_URE_HOME=C:\Program Files\OpenOffice.org\URE
+REM Example: set OO_SDK_URE_HOME=C:\Program Files\Apache OpenOffice\URE
 set OO_SDK_URE_HOME=
 
 REM Directory of the make command.
@@ -73,7 +73,7 @@ REM Example: set OO_SDK_JAVA_HOME=C:\Program Files\Java\jdk1.6.0_05
 set OO_SDK_JAVA_HOME=
 
 REM Special output directory
-REM Example: set OO_SDK_OUT=C:\openoffice.org3.0_sdk
+REM Example: set OO_SDK_OUT=C:\apacheopenoffice3.0_sdk
 set OO_SDK_OUT=
 
 REM Automatic deployment
diff --git a/odk/source/com/sun/star/lib/loader/InstallationFinder.java b/odk/source/com/sun/star/lib/loader/InstallationFinder.java
index 935256c7e729..6dbdcb190285 100644
--- a/odk/source/com/sun/star/lib/loader/InstallationFinder.java
+++ b/odk/source/com/sun/star/lib/loader/InstallationFinder.java
@@ -188,7 +188,7 @@ final class InstallationFinder {
      */
     private static String getPathFromWindowsRegistry() {
 
-        final String SUBKEYNAME = "Software\\OpenOffice.org\\UNO\\InstallPath";
+        final String SUBKEYNAME = "Software\\Apache OpenOffice\\UNO\\InstallPath";
 
         String path = null;
 
diff --git a/odk/source/unoapploader/win/unoapploader.c b/odk/source/unoapploader/win/unoapploader.c
index b2cda49b3a01..83d0a75c52cc 100644
--- a/odk/source/unoapploader/win/unoapploader.c
+++ b/odk/source/unoapploader/win/unoapploader.c
@@ -61,7 +61,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\Apache OpenOffice\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/odk/util/makefile.pmk b/odk/util/makefile.pmk
index c26bde3f0851..034fcb9cf3b0 100644
--- a/odk/util/makefile.pmk
+++ b/odk/util/makefile.pmk
@@ -23,8 +23,8 @@
 
 # used for sdk common files
 PRODUCT_RELEASE=3.5
-OFFICENAME=OpenOffice.org
-SDKDIRNAME=openoffice.org$(PRODUCT_RELEASE)_sdk
+OFFICENAME=Apache OpenOffice
+SDKDIRNAME=apacheopenoffice$(PRODUCT_RELEASE)_sdk
 OFFICEPRODUCTNAME=$(OFFICENAME) $(PRODUCT_RELEASE)
 TITLE=$(OFFICENAME) $(PRODUCT_RELEASE) SDK
 IDLDOCREFNAME="$(OFFICENAME) $(PRODUCT_RELEASE) API"