More details concerning deployment and this tool can be find in the
diff --git a/main/odk/examples/cpp/StatusbarController/ModifiedStatusbarController/project.mk b/main/odk/examples/cpp/StatusbarController/ModifiedStatusbarController/project.mk
index 631ff81..91a07fd 100644
--- a/main/odk/examples/cpp/StatusbarController/ModifiedStatusbarController/project.mk
+++ b/main/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/main/odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/project.mk b/main/odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/project.mk
index a65d034..38db423 100644
--- a/main/odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/project.mk
+++ b/main/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/main/odk/examples/cpp/StatusbarController/WordCountStatusbarController/project.mk b/main/odk/examples/cpp/StatusbarController/WordCountStatusbarController/project.mk
index 0f05b0a..0149b37 100644
--- a/main/odk/examples/cpp/StatusbarController/WordCountStatusbarController/project.mk
+++ b/main/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/main/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx b/main/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx
index 20f3ff9..17088d1 100644
--- a/main/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx
+++ b/main/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/main/odk/examples/cpp/custompanel/description.xml b/main/odk/examples/cpp/custompanel/description.xml
index 6834e39..1011569 100644
--- a/main/odk/examples/cpp/custompanel/description.xml
+++ b/main/odk/examples/cpp/custompanel/description.xml
@@ -31,6 +31,6 @@
Custom Tool Panel Example
-
+
diff --git a/main/odk/pack/copying/dk.mk b/main/odk/pack/copying/dk.mk
index ec06352..1b8ed25 100644
--- a/main/odk/pack/copying/dk.mk
+++ b/main/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/main/odk/pack/copying/idl_chapter_refs.txt b/main/odk/pack/copying/idl_chapter_refs.txt
index 58d93cc..4095601 100644
--- a/main/odk/pack/copying/idl_chapter_refs.txt
+++ b/main/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/main/odk/setsdkenv_unix b/main/odk/setsdkenv_unix
index 53954d1..859767c 100755
--- a/main/odk/setsdkenv_unix
+++ b/main/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/main/odk/setsdkenv_unix.sh.in b/main/odk/setsdkenv_unix.sh.in
index 321def8..24d2c1c 100644
--- a/main/odk/setsdkenv_unix.sh.in
+++ b/main/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/main/odk/setsdkenv_windows.template b/main/odk/setsdkenv_windows.template
index b0015ff..079214f 100644
--- a/main/odk/setsdkenv_windows.template
+++ b/main/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/main/odk/source/com/sun/star/lib/loader/InstallationFinder.java b/main/odk/source/com/sun/star/lib/loader/InstallationFinder.java
index 6c53189..35070b7 100644
--- a/main/odk/source/com/sun/star/lib/loader/InstallationFinder.java
+++ b/main/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/main/odk/source/unoapploader/win/unoapploader.c b/main/odk/source/unoapploader/win/unoapploader.c
index d88bdbd..b1676ed 100644
--- a/main/odk/source/unoapploader/win/unoapploader.c
+++ b/main/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.
*/
diff --git a/main/odk/util/makefile.pmk b/main/odk/util/makefile.pmk
index 86c1802..9528622 100644
--- a/main/odk/util/makefile.pmk
+++ b/main/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"
diff --git a/main/officecfg/registry/data/org/openoffice/Setup.xcu b/main/officecfg/registry/data/org/openoffice/Setup.xcu
index 3958d5a..0f88b69 100644
--- a/main/officecfg/registry/data/org/openoffice/Setup.xcu
+++ b/main/officecfg/registry/data/org/openoffice/Setup.xcu
@@ -41,10 +41,10 @@
${OPENSOURCE}
diff --git a/main/postprocess/rebase/no_rebase.txt b/main/postprocess/rebase/no_rebase.txt
index 8490f1c..a1462c9 100644
--- a/main/postprocess/rebase/no_rebase.txt
+++ b/main/postprocess/rebase/no_rebase.txt
@@ -31,3 +31,5 @@ msvcr80.dll
msvcr90d.dll
msvcr90.dll
msvcr100.dll
+msvcr100d.dll
+dbghelp.dll
diff --git a/main/readlicense_oo/docs/readme/readme.xrm b/main/readlicense_oo/docs/readme/readme.xrm
index b7004a0..0ce60b7 100644
--- a/main/readlicense_oo/docs/readme/readme.xrm
+++ b/main/readlicense_oo/docs/readme/readme.xrm
@@ -39,13 +39,13 @@
${PRODUCTNAME} ${PRODUCTVERSION} ReadMe
For latest updates to this readme file, see http://www.openoffice.org/welcome/readme.html
This file contains important information about this program. Please read this information very carefully before starting work.
- The OpenOffice.org Community, responsible for the development of this product, would like to invite you to participate as a community member. As a new user, you can check out the ${PRODUCTNAME} site with helpful user information at http://www.openoffice.org/about_us/introduction.html
- Also read the sections below about getting involved in the OpenOffice.org project.
+ The Apache OpenOffice Community, responsible for the development of this product, would like to invite you to participate as a community member. As a new user, you can check out the ${PRODUCTNAME} site with helpful user information at http://www.openoffice.org/about_us/introduction.html
+ Also read the sections below about getting involved in the Apache OpenOffice project.
Is ${PRODUCTNAME} really free for any user?
${PRODUCTNAME} is free for use by everybody. You may take this copy of ${PRODUCTNAME} and install it on as many computers as you like, and use it for any purpose you like (including commercial, government, public administration and educational use). For further details see the license text delivered together with ${PRODUCTNAME} or http://www.openoffice.org/license.html
Why is ${PRODUCTNAME} free for any user?
You can use this copy of ${PRODUCTNAME} today free of charge because individual contributors and corporate sponsors have designed, developed, tested, translated, documented, supported, marketed, and helped in many other ways to make ${PRODUCTNAME} what it is today - the world's leading open-source office software.
- If you appreciate their efforts, and would like to ensure OpenOffice.org continues into the future, please consider contributing to the project - see http://contributing.openoffice.org for details. Everyone has a contribution to make.
+ If you appreciate their efforts, and would like to ensure Apache OpenOffice continues into the future, please consider contributing to the project - see http://contributing.openoffice.org for details. Everyone has a contribution to make.
@@ -266,7 +266,7 @@
@@ -302,13 +302,13 @@
Joining the Project
You can make major contributions to this important open source project even if you have limited software design or coding experience. Yes, you!
-
At http://openoffice.apache.org/get-involved.html you will find a first overview where you can start with, ranging from Localization, QA, user support to some real core coding projects. If you are not a developer, try the Documentation or the Marketing Project. The OpenOffice.org Marketing Project is applying both guerilla and traditional commercial techniques to marketing open source software, and we are doing it across language and cultural barriers, so you can help just by spreading the word and telling a friend about this office suite.
+
At http://openoffice.apache.org/get-involved.html you will find a first overview where you can start with, ranging from Localization, QA, user support to some real core coding projects. If you are not a developer, try the Documentation or the Marketing Project. The Apache OpenOffice Marketing Project is applying both guerilla and traditional commercial techniques to marketing open source software, and we are doing it across language and cultural barriers, so you can help just by spreading the word and telling a friend about this office suite.
You can help by joining the marktig mailig list ooo-marketing@incubator.apache.org or visit the Marketing Communications & Information Network on http://marketing.openoffice.org where you can provide point communication contact with press, media, government agencies, consultants, schools, Linux Users Groups and developers in your country and local community.
We hope you enjoy working with the new ${PRODUCTNAME} ${PRODUCTVERSION} and will join us online.
-
The OpenOffice.org Community
+
The Apache OpenOffice Community
diff --git a/main/sc/source/ui/vba/vbawindow.cxx b/main/sc/source/ui/vba/vbawindow.cxx
index 5b0fc2b..f36351b 100644
--- a/main/sc/source/ui/vba/vbawindow.cxx
+++ b/main/sc/source/ui/vba/vbawindow.cxx
@@ -310,7 +310,7 @@ ScVbaWindow::ScrollWorkbookTabs( const uno::Any& /*Sheets*/, const uno::Any& /*P
uno::Any SAL_CALL
ScVbaWindow::getCaption() throw (uno::RuntimeException)
{
- static rtl::OUString sCrud(RTL_CONSTASCII_USTRINGPARAM(" - OpenOffice.org Calc" ) );
+ static rtl::OUString sCrud(RTL_CONSTASCII_USTRINGPARAM(" - Apache OpenOffice Calc" ) );
static sal_Int32 nCrudLen = sCrud.getLength();
rtl::OUString sTitle;
diff --git a/main/sc/xml/ScXMLExport.xml b/main/sc/xml/ScXMLExport.xml
index a81c951..fd5d18b 100644
--- a/main/sc/xml/ScXMLExport.xml
+++ b/main/sc/xml/ScXMLExport.xml
@@ -39,11 +39,11 @@
com.sun.star.xml.XMLExportFilter
+ xlink:title="general OpenOffice.org XML information" />
+ xlink:title="Guide to implement XML-based filters in Apache OpenOffice" />
@@ -57,11 +57,11 @@
com.sun.star.xml.XMLExportFilter
+ xlink:title="general OpenOffice.org XML information" />
+ xlink:title="Guide to implement XML-based filters in Apache OpenOffice" />
@@ -75,11 +75,11 @@
com.sun.star.xml.XMLExportFilter
+ xlink:title="general OpenOffice.org XML information" />
+ xlink:title="Guide to implement XML-based filters in Apache OpenOffice" />
@@ -93,11 +93,11 @@
com.sun.star.xml.XMLExportFilter
+ xlink:title="general OpenOffice.org XML information" />
+ xlink:title="Guide to implement XML-based filters in Apache OpenOffice" />
@@ -111,11 +111,11 @@
com.sun.star.xml.XMLExportFilter
+ xlink:title="general OpenOffice.org XML information" />
+ xlink:title="Guide to implement XML-based filters in Apache OpenOffice" />
cppu
cppuhelper
diff --git a/main/sc/xml/ScXMLImport.xml b/main/sc/xml/ScXMLImport.xml
index 2b9fd7c..bbf7f9c 100644
--- a/main/sc/xml/ScXMLImport.xml
+++ b/main/sc/xml/ScXMLImport.xml
@@ -39,11 +39,11 @@
com.sun.star.xml.XMLImportFilter
+ xlink:title="general OpenOffice.org XML information" />
+ xlink:title="Guide to implement XML-based filters in Apache OpenOffice" />
@@ -57,11 +57,11 @@
com.sun.star.xml.XMLImportFilter
+ xlink:title="general OpenOffice.org XML information" />
+ xlink:title="Guide to implement XML-based filters in Apache OpenOffice" />
@@ -75,11 +75,11 @@
com.sun.star.xml.XMLImportFilter
+ xlink:title="general OpenOffice.org XML information" />
+ xlink:title="Guide to implement XML-based filters in Apache OpenOffice" />
@@ -93,11 +93,11 @@
com.sun.star.xml.XMLImportFilter
+ xlink:title="general OpenOffice.org XML information" />
+ xlink:title="Guide to implement XML-based filters in Apache OpenOffice" />
@@ -111,11 +111,11 @@
com.sun.star.xml.XMLImportFilter
+ xlink:title="general OpenOffice.org XML information" />
+ xlink:title="Guide to implement XML-based filters in Apache OpenOffice" />
cppu
cppuhelper
diff --git a/main/scp2/inc/macros.inc b/main/scp2/inc/macros.inc
index fadf910..ba592df 100644
--- a/main/scp2/inc/macros.inc
+++ b/main/scp2/inc/macros.inc
@@ -386,7 +386,7 @@ End
ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
ModuleID = modid; \
Subkey = STRING(CONCAT3(.,key,\OpenWithProgIDs)); \
- Name = STRING(CONCAT2(OpenOffice.org.,name)); \
+ Name = STRING(CONCAT2(Apache OpenOffice.,name)); \
Value = " "; \
End
@@ -395,7 +395,7 @@ End
ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
ModuleID = modid; \
Subkey = STRING(CONCAT3(.,key,\OpenWithProgIDs)); \
- Name = STRING(CONCAT2(OpenOffice.org.,name)); \
+ Name = STRING(CONCAT2(Apache OpenOffice.,name)); \
Value = " "; \
End
@@ -404,7 +404,7 @@ End
ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
ModuleID = gid_Module_Root_Reg_##name; \
Subkey = STRING(CONCAT2(.,key)); \
- Value = STRING(CONCAT2(OpenOffice.org.,name)); \
+ Value = STRING(CONCAT2(Apache OpenOffice.,name)); \
ComponentCondition = STRING(CONCAT3(REGISTER_,cond,=1)); \
End
@@ -412,7 +412,7 @@ End
RegistryItem CONCAT2(gid_Regitem_Openoffice_,name) \
ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
ModuleID = modid; \
- Subkey = STRING(CONCAT2(OpenOffice.org.,name)); \
+ Subkey = STRING(CONCAT2(Apache OpenOffice.,name)); \
REG_VALUE_LNG(disp_name) \
End
@@ -420,7 +420,7 @@ End
RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Defaulticon) \
ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
ModuleID = modid; \
- Subkey = STRING(CONCAT3(OpenOffice.org.,name,\DefaultIcon)); \
+ Subkey = STRING(CONCAT3(Apache OpenOffice.,name,\DefaultIcon)); \
Value = "
\program\soffice.exe," STRING(icon_id); \
End
@@ -428,7 +428,7 @@ End
RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell) \
ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
ModuleID = modid; \
- Subkey = STRING(CONCAT3(OpenOffice.org.,name,\shell)); \
+ Subkey = STRING(CONCAT3(Apache OpenOffice.,name,\shell)); \
Value = STRING(default); \
End
@@ -436,13 +436,13 @@ End
RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_New) \
ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
ModuleID = modid; \
- Subkey = STRING(CONCAT3(OpenOffice.org.,name,\shell\new)); \
+ Subkey = STRING(CONCAT3(Apache OpenOffice.,name,\shell\new)); \
REG_VALUE_LNG(NEW) \
End \
RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_New_Command) \
ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
ModuleID = modid; \
- Subkey = STRING(CONCAT3(OpenOffice.org.,name,\shell\new\command)); \
+ Subkey = STRING(CONCAT3(Apache OpenOffice.,name,\shell\new\command)); \
Value = "\"\program\\" STRING(app) "\" -n \"%1\""; \
End
@@ -450,7 +450,7 @@ End
RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_Open_Command) \
ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
ModuleID = modid; \
- Subkey = STRING(CONCAT3(OpenOffice.org.,name,\shell\open\command)); \
+ Subkey = STRING(CONCAT3(Apache OpenOffice.,name,\shell\open\command)); \
Value = "\"\program\\" STRING(app) "\" -o \"%1\""; \
End
@@ -458,7 +458,7 @@ End
RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_Print_Command) \
ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
ModuleID = modid; \
- Subkey = STRING(CONCAT3(OpenOffice.org.,name,\shell\print\command)); \
+ Subkey = STRING(CONCAT3(Apache OpenOffice.,name,\shell\print\command)); \
Value = "\"\program\\" STRING(app) "\" -p \"%1\""; \
End
@@ -466,7 +466,7 @@ End
RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_Printto_Command) \
ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
ModuleID = modid; \
- Subkey = STRING(CONCAT3(OpenOffice.org.,name,\shell\printto\command)); \
+ Subkey = STRING(CONCAT3(Apache OpenOffice.,name,\shell\printto\command)); \
Value = "\"\program\\" STRING(app) "\" -pt \"%2\" \"%1\""; \
End
@@ -476,7 +476,7 @@ End
ModuleID = modid; \
Subkey = STRING(Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations); \
Name = STRING(CONCAT2(.,key)); \
- Value = STRING(CONCAT2(OpenOffice.org.,name)); \
+ Value = STRING(CONCAT2(Apache OpenOffice.,name)); \
Styles = (); \
End
@@ -486,7 +486,7 @@ End
ModuleID = modid; \
Subkey = STRING(Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations); \
Name = STRING(CONCAT2(.,key)); \
- Value = STRING(CONCAT2(OpenOffice.org.,name)); \
+ Value = STRING(CONCAT2(Apache OpenOffice.,name)); \
Styles = (); \
End
diff --git a/main/scp2/source/ooo/installation_ooo.scp b/main/scp2/source/ooo/installation_ooo.scp
index 85f4915..b69b005 100644
--- a/main/scp2/source/ooo/installation_ooo.scp
+++ b/main/scp2/source/ooo/installation_ooo.scp
@@ -30,9 +30,9 @@ Installation gid_Installation_Ooo
OOoBaseVersion = "${OOOBASEVERSION}";
UserDirProductVersion = "${USERDIRPRODUCTVERSION}";
JavaVersion = "${JAVAVERSION}";
- SxwFormatName = "OpenOffice.org";
- SxwFormatVersion = "1.1";
- VendorName = "OpenOffice.org";
+ SxwFormatName = "OpenOffice.org XML";
+ SxwFormatVersion = "1.0";
+ VendorName = "Apache OpenOffice";
#ifdef WNT
DefaultDestPath = "\${PRODUCTNAME}${PRODUCTVERSION}";
#else
diff --git a/main/scp2/source/ooo/registryitem_ooo.scp b/main/scp2/source/ooo/registryitem_ooo.scp
index f61e447..87eba26 100644
--- a/main/scp2/source/ooo/registryitem_ooo.scp
+++ b/main/scp2/source/ooo/registryitem_ooo.scp
@@ -218,7 +218,7 @@ RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Uninstall_Sta
ModuleID = gid_Module_Root;
Subkey = "Software\Microsoft\Windows\CurrentVersion\Uninstall\%PRODUCTNAME %PRODUCTVERSION";
Name = "Publisher";
- Value = "Sun Microsystems, Inc. for the OpenOffice.org-Community";
+ Value = "Apache OpenOffice project community";
End
RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Uninstall_Staroffice_Uninstallstring
@@ -247,7 +247,7 @@ End
RegistryItem gid_Regitem_Software_Openoffice_Productname_Productversion_Path
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\OpenOffice.org\%PRODUCTNAME\%PRODUCTVERSION";
+ Subkey = "Software\Apache OpenOffice\%PRODUCTNAME\%PRODUCTVERSION";
ModuleID = gid_Module_Root;
Name = "Path";
Value = "\program\soffice.exe";
@@ -273,7 +273,7 @@ End
RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Install
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\OpenOffice.org\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
+ Subkey = "Software\Apache OpenOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
ModuleID = gid_Module_Root;
Name = "INSTALLLOCATION";
Value = "[INSTALLLOCATION]";
@@ -318,7 +318,7 @@ End
RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Officeinstall
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\OpenOffice.org\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
+ Subkey = "Software\Apache OpenOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
ModuleID = gid_Module_Root;
Name = "OFFICEINSTALLLOCATION";
Value = "[INSTALLLOCATION]";
@@ -345,7 +345,7 @@ End
RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Basisinstall
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\OpenOffice.org\${REGISTRYLAYERNAME}\Basis\%OOOBASEVERSION";
+ Subkey = "Software\Apache OpenOffice\${REGISTRYLAYERNAME}\Basis\%OOOBASEVERSION";
ModuleID = gid_Module_Root;
Name = "BASISINSTALLLOCATION";
Value = "[INSTALLLOCATION]Basis\\";
@@ -354,7 +354,7 @@ End
RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Basisinstall
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\OpenOffice.org\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
+ Subkey = "Software\Apache OpenOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
ModuleID = gid_Module_Root;
Name = "BASISINSTALLLOCATION";
Value = "[INSTALLLOCATION]Basis\\";
@@ -381,7 +381,7 @@ End
RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Ureinstall
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\OpenOffice.org\${REGISTRYLAYERNAME}\URE\%URELAYERVERSION";
+ Subkey = "Software\Apache OpenOffice\${REGISTRYLAYERNAME}\URE\%URELAYERVERSION";
ModuleID = gid_Module_Root;
Name = "UREINSTALLLOCATION";
Value = "[INSTALLLOCATION]URE\\";
@@ -390,7 +390,7 @@ End
RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Ureinstall
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\OpenOffice.org\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
+ Subkey = "Software\Apache OpenOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
ModuleID = gid_Module_Root;
Name = "UREINSTALLLOCATION";
Value = "[INSTALLLOCATION]URE\\";
@@ -513,14 +513,14 @@ End
RegistryItem gid_Regitem_Software_Openofficeorg_Uno_Installpath
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\OpenOffice.org\UNO\InstallPath";
+ Subkey = "Software\Apache OpenOffice\UNO\InstallPath";
ModuleID = gid_Module_Root;
Value = "\program";
End
RegistryItem gid_Regitem_Software_Openofficeorg_Uno_Installpath_Branded
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\OpenOffice.org\UNO\InstallPath";
+ Subkey = "Software\Apache OpenOffice\UNO\InstallPath";
ModuleID = gid_Module_Root;
Name = "%PRODUCTNAME %PRODUCTVERSION";
Value = "\program";
diff --git a/main/scp2/source/ooo/registryitem_ooo.ulf b/main/scp2/source/ooo/registryitem_ooo.ulf
index 76ac98e..b20fb24 100644
--- a/main/scp2/source/ooo/registryitem_ooo.ulf
+++ b/main/scp2/source/ooo/registryitem_ooo.ulf
@@ -28,10 +28,10 @@ en-US = "&New"
en-US = "&Install"
[STR_REG_VAL_SO60_CONFIGFILE]
-en-US = "%SXWFORMATNAME %SXWFORMATVERSION Configuration File"
+en-US = "OpenOffice.org 1.1 Configuration File"
[STR_REG_VAL_SO50_TEMPLATE_OOO]
en-US = "StarOffice 5.0 Template"
[STR_REG_VAL_APPCAPABILITY_DESCRIPTION_OOO]
-en-US = "OpenOffice.org"
+en-US = "office productivity suite based on Apache OpenOffice project"
diff --git a/main/scp2/source/ooo/ure.scp b/main/scp2/source/ooo/ure.scp
index b32baf9..3aac69b 100644
--- a/main/scp2/source/ooo/ure.scp
+++ b/main/scp2/source/ooo/ure.scp
@@ -1316,7 +1316,7 @@ End
RegistryItem gid_Regitem_Path
ModuleID = gid_Module_Root;
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
- Subkey = "Software\OpenOffice.org\%PRODUCTNAME";
+ Subkey = "Software\Apache OpenOffice\%PRODUCTNAME";
Name = "Path";
Value = "[INSTALLLOCATION]";
End
diff --git a/main/scp2/source/ooo/ure_standalone.scp b/main/scp2/source/ooo/ure_standalone.scp
index 4c34cae..2c65ada 100644
--- a/main/scp2/source/ooo/ure_standalone.scp
+++ b/main/scp2/source/ooo/ure_standalone.scp
@@ -38,9 +38,9 @@ End
Directory gid_Dir_Ooo_Openofficeorg
ParentID = PREDEFINED_PROGDIR;
#ifdef WNT
- HostName = "OpenOffice.org";
+ HostName = "Apache OpenOffice";
#else
- HostName = "openoffice.org";
+ HostName = "apacheopenoffice";
#endif
Styles = (ISINSTALLLOCATION);
End
diff --git a/main/scp2/source/quickstart/registryitem_quickstart.scp b/main/scp2/source/quickstart/registryitem_quickstart.scp
index 5ac2d1a..804094b 100644
--- a/main/scp2/source/quickstart/registryitem_quickstart.scp
+++ b/main/scp2/source/quickstart/registryitem_quickstart.scp
@@ -25,7 +25,7 @@
RegistryItem gid_Regitem_Software_OpenOffice_Quickstarterinstalled
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\OpenOffice.org";
+ Subkey = "Software\Apache OpenOffice";
ModuleID = gid_Module_Optional_Quickstart;
Name = "QuickStarterInstalled";
Value = "1";
diff --git a/main/scp2/source/sdkoo/sdkoo.scp b/main/scp2/source/sdkoo/sdkoo.scp
index 13750d2..968dd35 100644
--- a/main/scp2/source/sdkoo/sdkoo.scp
+++ b/main/scp2/source/sdkoo/sdkoo.scp
@@ -53,22 +53,14 @@ End
#ifndef WNT
Directory gid_Dir_Ooo_Openofficeorg_Sdk
ParentID = PREDEFINED_PROGDIR;
- #ifdef WNT
- HostName = "${BASISROOTNAME}";
- #else
HostName = "${UNIXBASISROOTNAME}";
- #endif
End
#endif
#ifndef WNT
Directory gid_Dir_Ooo_Basis_Sdk
ParentID = gid_Dir_Ooo_Openofficeorg_Sdk;
- #ifdef WNT
- HostName = "Basis ${OOOBASEVERSION}";
- #else
HostName = "basis${OOOBASEVERSION}";
- #endif
Styles = (BASISDIRECTORY);
End
#endif
@@ -78,8 +70,7 @@ End
Directory gid_Dir_Basis_Sdk
#if defined MACOSX
ParentID = PREDEFINED_PROGDIR;
- // DosName = "OpenOffice.org${OOOBASEVERSION}_SDK";
- DosName = "OpenOffice.org_SDK";
+ DosName = "Apache_OpenOffice_SDK";
#else
#if defined WNT
ParentID = gid_Dir_Sdkoo_Root;
diff --git a/main/scp2/source/winexplorerext/registryitem_winexplorerext.scp b/main/scp2/source/winexplorerext/registryitem_winexplorerext.scp
index ce51acd..b1938c8 100644
--- a/main/scp2/source/winexplorerext/registryitem_winexplorerext.scp
+++ b/main/scp2/source/winexplorerext/registryitem_winexplorerext.scp
@@ -77,8 +77,8 @@ RegistryItem gid_Regitem_Folder_shellex_ColumnHandlers_C52AF81D_F7A0_4AAB_8E87_F
ModuleID = gid_Module_Optional_Winexplorerext;
Styles = (X64);
Subkey = "Folder\shellex\ColumnHandlers\{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}";
- Value = "OpenOffice.org Column Handler";
- Val64 = "OpenOffice.org Column Handler";
+ Value = "Apache OpenOffice Column Handler";
+ Val64 = "Apache OpenOffice Column Handler";
End
RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer32
@@ -108,8 +108,6 @@ RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Root;
Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}";
-// Better?: "OpenOffice.org Format Filter"
-// old: Value = "opendocument.org Filter";
Styles = (X64_ONLY); // Values: X64
Value = "OpenDocument Format Filter";
Val64 = "OpenDocument Format Filter";
@@ -138,8 +136,6 @@ RegistryItem gid_Regitem_Clsid_7BC0E713_5703_45BE_A29D_5D46D8B39262
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Root;
Subkey = "CLSID\{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
-//? Better: "OpenOffice.org Persistent Handler"
-// old: Value = "opendocument.org Persistent Handler";
Styles = (X64); // Values: X64
Value = "OpenDocument Format Persistent Handler";
Val64 = "OpenDocument Format Persistent Handler";
diff --git a/main/scp2/util/makefile.mk b/main/scp2/util/makefile.mk
index d767fc1..4fdcf70 100644
--- a/main/scp2/util/makefile.mk
+++ b/main/scp2/util/makefile.mk
@@ -187,7 +187,7 @@ SCP1FILES += \
.ENDIF
# ------------------------------------------------------------------------
-# OpenOffice.org with JRE
+# Apache OpenOffice with JRE
SCP2LINK_PRODUCT_TYPE=osl
SCP2TARGET = setup_osljre
diff --git a/main/setup_native/scripts/langpackscript.sh b/main/setup_native/scripts/langpackscript.sh
index c307ea0..f824da3 100644
--- a/main/setup_native/scripts/langpackscript.sh
+++ b/main/setup_native/scripts/langpackscript.sh
@@ -80,7 +80,7 @@ SunOS)
;;
Linux)
SEARCHPACKAGENAME="BASISPACKAGEPREFIXPLACEHOLDEROOOBASEVERSIONPLACEHOLDER-core01"
- FIXPATH="/openoffice.org"
+ FIXPATH="/apachopenoffice"
echo
echo "Searching for the FULLPRODUCTNAMELONGPLACEHOLDER installation ..."
RPMNAME=`rpm -qa | grep $SEARCHPACKAGENAME`
diff --git a/main/setup_native/scripts/update.sh b/main/setup_native/scripts/update.sh
index 31c16c1..4877ce8 100644
--- a/main/setup_native/scripts/update.sh
+++ b/main/setup_native/scripts/update.sh
@@ -58,7 +58,7 @@ make_tempfile() {
#
run_in_terminal () {
- TMPCMD=`make_tempfile 'OpenOffice.org-Online-Update'`
+ TMPCMD=`make_tempfile 'Apache_OpenOffice-Online-Update'`
cat >> $TMPCMD
@@ -119,7 +119,7 @@ elevate() {
update_pkg() {
- ADMINFILE=`make_tempfile 'OpenOffice.org-Online-Update-admin'`
+ ADMINFILE=`make_tempfile 'Apache_OpenOffice-Online-Update-admin'`
cat >> $ADMINFILE << EOF
action=nocheck
diff --git a/main/setup_native/source/opensolaris/bundledextensions/README b/main/setup_native/source/opensolaris/bundledextensions/README
index f64c225..40a408c 100644
--- a/main/setup_native/source/opensolaris/bundledextensions/README
+++ b/main/setup_native/source/opensolaris/bundledextensions/README
@@ -9,7 +9,7 @@ installed
ooo_bundled_extensions.xml
svc-ooo_bundled_extensions
-are part of the OpenOffice.org IPS package. They must be added to the package
+are part of the Apache OpenOffice IPS package. They must be added to the package
after all other files have been added. Those other files are the SVR4 packages
of OOo which can be imported by pkg (pkg import).
The files have to be uploaded this way:
@@ -26,7 +26,7 @@ bundled extensions. This path changes with every major release of OOo because of
the version number which is part of a folder name. The
current value is:
-EXTENSIONPATH=/opt/openoffice.org3/share/extension/install
+EXTENSIONPATH=/opt/apacheopenoffice3/share/extension/install
The service was tested with OpenSolaris release 2009.6 and may not work with a
previous release.
@@ -38,7 +38,7 @@ What do these files do
The three files constitute a SMF service. When this service is started, then it
installes the bundled extensions which are contained in
-/opt/openoffice.org3/share/extension/install. To install them, the service calls
+/opt/apacheopenoffice3/share/extension/install. To install them, the service calls
"unopkg add --shared ..." with the appropriate arguments.
The service is started initially after the installation of
@@ -58,7 +58,7 @@ file in every release. Otherwise IPS would not replace the installed version of
The update procedure of OOo will replace 'installed'. 'installed' is associated
with a restart_fmri of the service ooo_bundled_extensions. That is after
copying 'installed' the service will be restarted. It then installes all
-extensions contained in /opt/openoffice.org3/share/extension/install, because
+extensions contained in /opt/apacheopenoffice3/share/extension/install, because
the newly installed 'installed' file does not contain any entries yet, except
for the version string.
diff --git a/main/setup_native/source/opensolaris/bundledextensions/ooo_bundled_extensions.xml b/main/setup_native/source/opensolaris/bundledextensions/ooo_bundled_extensions.xml
index 091c7a6..316b221 100644
--- a/main/setup_native/source/opensolaris/bundledextensions/ooo_bundled_extensions.xml
+++ b/main/setup_native/source/opensolaris/bundledextensions/ooo_bundled_extensions.xml
@@ -71,7 +71,7 @@
- Installation of OpenOffice.org's bundled extensions.
+ Installation of Apache OpenOffice's bundled extensions.
diff --git a/main/setup_native/source/opensolaris/bundledextensions/svc-ooo_bundled_extensions b/main/setup_native/source/opensolaris/bundledextensions/svc-ooo_bundled_extensions
index 142043d..4cba159 100644
--- a/main/setup_native/source/opensolaris/bundledextensions/svc-ooo_bundled_extensions
+++ b/main/setup_native/source/opensolaris/bundledextensions/svc-ooo_bundled_extensions
@@ -49,11 +49,11 @@
#Create the folder which contains the temporary user installation
INSTDIR=`/usr/bin/mktemp -d "/tmp/userinstall.XXXXXX"`
-OOO_BASE_DIR="/opt/openoffice.org/basis${OOOBASEVERSION}"
+OOO_BASE_DIR="/opt/apacheopenoffice/basis${OOOBASEVERSION}"
case "$1" in
'start')
- EXTENSIONDIR=/opt/openoffice.org${OOOBRANDPACKAGEVERSION}/share/extension/install
+ EXTENSIONDIR=/opt/apacheopenoffice${OOOBRANDPACKAGEVERSION}/share/extension/install
for FILE in $EXTENSIONDIR/*.oxt
do
#We check if the file exist, because if there is no extension
@@ -70,7 +70,7 @@ case "$1" in
#list. That is, it has not been installed (with unopkg) yet.
#Therefore we do it now.
echo installing $FILE
- /opt/openoffice.org${OOOBRANDPACKAGEVERSION}/program/unopkg add --shared --bundled "$FILE" '-env:UserInstallation=file://$INSTDIR' '-env:UNO_JAVA_JFW_INSTALL_DATA=$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1'
+ /opt/apacheopenoffice${OOOBRANDPACKAGEVERSION}/program/unopkg add --shared --bundled "$FILE" '-env:UserInstallation=file://$INSTDIR' '-env:UNO_JAVA_JFW_INSTALL_DATA=$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1'
#Let us remember that this extensions has been installed
#by adding the path name of the extension to the file
#installed
@@ -98,7 +98,7 @@ case "$1" in
# #share/extension/install. Now we remove the installed
# #extension
# echo removing `basename $LINE`
-# /opt/openoffice.org${OOOBRANDPACKAGEVERSION}/program/unopkg remove --shared --bundled "`basename $LINE`" '-env:UserInstallation=file://$INSTDIR' '-env:UNO_JAVA_JFW_INSTALL_DATA=$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1'
+# /opt/apacheopenoffice${OOOBRANDPACKAGEVERSION}/program/unopkg remove --shared --bundled "`basename $LINE`" '-env:UserInstallation=file://$INSTDIR' '-env:UNO_JAVA_JFW_INSTALL_DATA=$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1'
# REMOVED=1
# else
# NEWCONTENT+=$LINE
diff --git a/main/setup_native/source/packinfo/package_names.txt b/main/setup_native/source/packinfo/package_names.txt
index 7e7276c..45deaaa 100644
--- a/main/setup_native/source/packinfo/package_names.txt
+++ b/main/setup_native/source/packinfo/package_names.txt
@@ -1,46 +1,46 @@
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING Language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-base Base language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-binfilter Legacy filters (e.g. StarOffice 5.2) for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-calc Calc language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-draw Draw language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-fonts Language fonts module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-help Language help module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-impress Impress language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-math Math language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-onlineupd Online update language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-res Language resource module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-writer Writer language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-activex ActiveX control for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-base Base module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-binfilter Legacy filters (e.g. StarOffice 5.2) for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-calc Calc module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 Core module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 Office core module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 Office core module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 Office core module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 Office core module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 Office core module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 Office core module for OpenOffice.org %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING Language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-base Base language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-binfilter Legacy filters (e.g. StarOffice 5.2) for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-calc Calc language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-draw Draw language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-fonts Language fonts module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-help Language help module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-impress Impress language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-math Math language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-onlineupd Online update language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-res Language resource module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-writer Writer language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-activex ActiveX control for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-base Base module for %APACHEPROJECTNAME%OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-binfilter Legacy filters (e.g. StarOffice 5.2) for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-calc Calc module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 Core module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 Office core module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 Office core module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 Office core module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 Office core module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 Office core module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 Office core module for %APACHEPROJECTNAME %OOOBASEVERSION
%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-dict-gl Gl dictionary for %PRODUCTNAME %PRODUCTVERSION
%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-dict-vi Vietnamese dictionary for %PRODUCTNAME %PRODUCTVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-draw Draw module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-emailmerge Email mailmerge module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-gnome-integratn Gnome integration module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-graphicfilter Graphic filter module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-headless Headless display module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-images Images module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-impress Impress module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-javafilter Java filter module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-kde-integration KDE integration module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-math Math module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-onlineupdate Online update modul for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-ooofonts Mailcap module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-ooolinguistic Linguistic module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-pyuno Pyuno module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-spellcheck English spellchecker module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-testtool Testtool module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-writer Writer module for OpenOffice.org %OOOBASEVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-xsltfilter XSLT filter samples module for OpenOffice.org %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-draw Draw module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-emailmerge Email mailmerge module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-gnome-integratn Gnome integration module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-graphicfilter Graphic filter module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-headless Headless display module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-images Images module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-impress Impress module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-javafilter Java filter module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-kde-integration KDE integration module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-math Math module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-onlineupdate Online update modul for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-ooofonts Mailcap module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-ooolinguistic Linguistic module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-pyuno Pyuno module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-spellcheck English spellchecker module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-testtool Testtool module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-writer Writer module for %APACHEPROJECTNAME %OOOBASEVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-xsltfilter XSLT filter samples module for %APACHEPROJECTNAME %OOOBASEVERSION
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-af Af dictionary for %PRODUCTNAME %PRODUCTVERSION
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-cs Cs dictionary for %PRODUCTNAME %PRODUCTVERSION
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-da Da dictionary for %PRODUCTNAME %PRODUCTVERSION
diff --git a/main/setup_native/source/packinfo/packinfo_office.txt b/main/setup_native/source/packinfo/packinfo_office.txt
index 7532822..040014d 100644
--- a/main/setup_native/source/packinfo/packinfo_office.txt
+++ b/main/setup_native/source/packinfo/packinfo_office.txt
@@ -48,7 +48,7 @@ findrequires = "find-requires-gnome.sh"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Gnome integration module for OpenOffice.org %OOOBASEVERSION"
+description = "Gnome integration module for %APACHEPROJECTNAME %OOOBASEVERSION"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
End
@@ -63,7 +63,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "KDE integration module for OpenOffice.org %OOOBASEVERSION"
+description = "KDE integration module for %APACHEPROJECTNAME %OOOBASEVERSION"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
End
@@ -79,7 +79,7 @@ freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Core module for OpenOffice.org %OOOBASEVERSION"
+description = "Core module for %APACHEPROJECTNAME %OOOBASEVERSION"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
End
@@ -95,7 +95,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Writer module for OpenOffice.org %OOOBASEVERSION"
+description = "Writer module for %APACHEPROJECTNAME %OOOBASEVERSION"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
End
@@ -111,7 +111,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Calc module for OpenOffice.org %OOOBASEVERSION"
+description = "Calc module for %APACHEPROJECTNAME %OOOBASEVERSION"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
End
@@ -127,7 +127,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Draw module for OpenOffice.org %OOOBASEVERSION"
+description = "Draw module for %APACHEPROJECTNAME %OOOBASEVERSION"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
End
@@ -143,7 +143,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Impress module for OpenOffice.org %OOOBASEVERSION"
+description = "Impress module for %APACHEPROJECTNAME %OOOBASEVERSION"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
End
@@ -159,7 +159,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Base module for OpenOffice.org %OOOBASEVERSION"
+description = "Base module for %APACHEPROJECTNAME %OOOBASEVERSION"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
End
@@ -175,7 +175,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Math module for OpenOffice.org %OOOBASEVERSION"
+description = "Math module for %APACHEPROJECTNAME %OOOBASEVERSION"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
End
@@ -190,7 +190,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Legacy filters (e.g. StarOffice 5.2) for OpenOffice.org %OOOBASEVERSION"
+description = "Legacy filters (e.g. StarOffice 5.2) for %APACHEPROJECTNAME %OOOBASEVERSION"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
End
@@ -205,7 +205,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Graphic filter module for OpenOffice.org %OOOBASEVERSION"
+description = "Graphic filter module for %APACHEPROJECTNAME %OOOBASEVERSION"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
End
@@ -220,7 +220,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Usage tracking module for OpenOffice.org %OOOBASEVERSION"
+description = "Usage tracking module for %APACHEPROJECTNAME %OOOBASEVERSION"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
End
@@ -235,7 +235,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Testtool module for OpenOffice.org %OOOBASEVERSION"
+description = "Testtool module for %APACHEPROJECTNAME %OOOBASEVERSION"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
End
@@ -250,7 +250,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "English spellchecker module for OpenOffice.org %OOOBASEVERSION"
+description = "English spellchecker module for %APACHEPROJECTNAME %OOOBASEVERSION"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
End
@@ -265,7 +265,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "XSLT filter samples module for OpenOffice.org %OOOBASEVERSION"
+description = "XSLT filter samples module for %APACHEPROJECTNAME %OOOBASEVERSION"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
End
@@ -280,7 +280,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Java filter module for OpenOffice.org %OOOBASEVERSION"
+description = "Java filter module for %APACHEPROJECTNAME %OOOBASEVERSION"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
End
@@ -295,7 +295,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "ActiveX control for OpenOffice.org %OOOBASEVERSION"
+description = "ActiveX control for %APACHEPROJECTNAME %OOOBASEVERSION"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
End
@@ -309,7 +309,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Online update modul for OpenOffice.org %OOOBASEVERSION"
+description = "Online update modul for %APACHEPROJECTNAME %OOOBASEVERSION"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
End
@@ -324,7 +324,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Pyuno module for OpenOffice.org %OOOBASEVERSION"
+description = "Pyuno module for %APACHEPROJECTNAME %OOOBASEVERSION"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
End
@@ -339,7 +339,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-pyuno"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Email mailmerge module for OpenOffice.org %OOOBASEVERSION"
+description = "Email mailmerge module for %APACHEPROJECTNAME %OOOBASEVERSION"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
End
@@ -354,7 +354,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Headless display module for OpenOffice.org %OOOBASEVERSION"
+description = "Headless display module for %APACHEPROJECTNAME %OOOBASEVERSION"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
End
@@ -369,7 +369,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Images module for OpenOffice.org %OOOBASEVERSION"
+description = "Images module for %APACHEPROJECTNAME %OOOBASEVERSION"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
End
@@ -384,7 +384,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Mailcap module for OpenOffice.org %OOOBASEVERSION"
+description = "Mailcap module for %APACHEPROJECTNAME %OOOBASEVERSION"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
End
@@ -399,7 +399,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Linguistic module for OpenOffice.org %OOOBASEVERSION"
+description = "Linguistic module for %APACHEPROJECTNAME %OOOBASEVERSION"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
End
@@ -415,7 +415,7 @@ freebsdrequires = ""
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Office core module for OpenOffice.org %OOOBASEVERSION"
+description = "Office core module for %APACHEPROJECTNAME %OOOBASEVERSION"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
End
@@ -430,7 +430,7 @@ freebsdrequires = ""
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Office core module for OpenOffice.org %OOOBASEVERSION"
+description = "Office core module for %APACHEPROJECTNAME %OOOBASEVERSION"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
End
@@ -446,7 +446,7 @@ freebsdrequires = ""
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Office core module for OpenOffice.org %OOOBASEVERSION"
+description = "Office core module for %APACHEPROJECTNAME %OOOBASEVERSION"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
End
@@ -461,7 +461,7 @@ freebsdrequires = ""
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Office core module for OpenOffice.org %OOOBASEVERSION"
+description = "Office core module for %APACHEPROJECTNAME %OOOBASEVERSION"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
End
@@ -476,7 +476,7 @@ freebsdrequires = ""
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Office core module for OpenOffice.org %OOOBASEVERSION"
+description = "Office core module for %APACHEPROJECTNAME %OOOBASEVERSION"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
End
@@ -491,7 +491,7 @@ freebsdrequires = ""
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Office core module for OpenOffice.org %OOOBASEVERSION"
+description = "Office core module for %APACHEPROJECTNAME %OOOBASEVERSION"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
End
@@ -1035,7 +1035,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-impress"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "OpenGL slide transitions module for OpenOffice.org %OOOBASEVERSION"
+description = "OpenGL slide transitions module for %APACHEPROJECTNAME %OOOBASEVERSION"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
End
diff --git a/main/setup_native/source/packinfo/packinfo_office_lang.txt b/main/setup_native/source/packinfo/packinfo_office_lang.txt
index 204f909..fb4bb67 100644
--- a/main/setup_native/source/packinfo/packinfo_office_lang.txt
+++ b/main/setup_native/source/packinfo/packinfo_office_lang.txt
@@ -47,7 +47,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING"
+description = "Language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01"
@@ -63,7 +63,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Language fonts module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING"
+description = "Language fonts module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01"
@@ -79,7 +79,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Language resource module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING"
+description = "Language resource module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01"
@@ -95,7 +95,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Language help module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING"
+description = "Language help module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01"
@@ -111,7 +111,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Writer language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING"
+description = "Writer language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-writer"
@@ -127,7 +127,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Calc language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING"
+description = "Calc language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-calc"
@@ -143,7 +143,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Impress language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING"
+description = "Impress language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-impress"
@@ -159,7 +159,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Draw language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING"
+description = "Draw language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-draw"
@@ -175,7 +175,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Math language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING"
+description = "Math language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-math"
@@ -191,7 +191,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Base language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING"
+description = "Base language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-base"
@@ -207,7 +207,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Legacy filters (e.g. StarOffice 5.2) for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING"
+description = "Legacy filters (e.g. StarOffice 5.2) for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-binfilter"
@@ -223,7 +223,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Online update language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING"
+description = "Online update language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-onlineupdate"
diff --git a/main/setup_native/source/packinfo/packinfo_sdkoo.txt b/main/setup_native/source/packinfo/packinfo_sdkoo.txt
index 8de7a0e..e91440d 100644
--- a/main/setup_native/source/packinfo/packinfo_sdkoo.txt
+++ b/main/setup_native/source/packinfo/packinfo_sdkoo.txt
@@ -29,7 +29,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Software Development Kit for OpenOffice.org %OOOBASEVERSION"
+description = "Software Development Kit for %APACHEPROJECTNAME %OOOBASEVERSION"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
End
diff --git a/main/setup_native/source/packinfo/shellscripts_brand.txt b/main/setup_native/source/packinfo/shellscripts_brand.txt
index 10917d8..aa215a4 100644
--- a/main/setup_native/source/packinfo/shellscripts_brand.txt
+++ b/main/setup_native/source/packinfo/shellscripts_brand.txt
@@ -29,12 +29,12 @@ END
platform=`uname -s`
case $$platform in
SunOS)
- BASISPACKAGE=openofficeorg-core01
+ BASISPACKAGE=apacheopenoffice-core01
BASISDIR=`pkginfo -r $$BASISPACKAGE`
PRODUCTINSTALLLOCATION="$$BASEDIR"
;;
Linux)
- BASISPACKAGE=openoffice.org-core01
+ BASISPACKAGE=apacheopenoffice-core01
BASISDIR=`rpm -q --queryformat "%{INSTALLPREFIX}" $$BASISPACKAGE`
PRODUCTINSTALLLOCATION="$$RPM_INSTALL_PREFIX"
;;
@@ -44,11 +44,11 @@ Linux)
esac
# creating link to basis layer
-if [ -d $$BASISDIR/openoffice.org/basisBASISDIRECTORYVERSION ]
+if [ -d $$BASISDIR/apacheopenoffice/basisBASISDIRECTORYVERSION ]
then
- ln -s $$BASISDIR/openoffice.org/basisBASISDIRECTORYVERSION $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/basis-link >/dev/null 2>&1
+ ln -s $$BASISDIR/apacheopenoffice/basisBASISDIRECTORYVERSION $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/basis-link >/dev/null 2>&1
else
- ln -s ../openoffice.org/basisBASISDIRECTORYVERSION $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/basis-link >/dev/null 2>&1
+ ln -s ../apacheopenoffice/basisBASISDIRECTORYVERSION $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/basis-link >/dev/null 2>&1
fi
exit 0
diff --git a/main/setup_native/source/packinfo/shellscripts_core01.txt b/main/setup_native/source/packinfo/shellscripts_core01.txt
index 11a02a7..c070ed6 100644
--- a/main/setup_native/source/packinfo/shellscripts_core01.txt
+++ b/main/setup_native/source/packinfo/shellscripts_core01.txt
@@ -44,11 +44,11 @@ Linux)
esac
# creating link to ure
-if [ -d $$UREDIR/openoffice.org/ure ]
+if [ -d $$UREDIR/apacheopenoffice/ure ]
then
- ln -s $$UREDIR/openoffice.org/ure $$PRODUCTINSTALLLOCATION/openoffice.org/basisBASISDIRECTORYVERSION/ure-link >/dev/null 2>&1
+ ln -s $$UREDIR/apacheopenoffice/ure $$PRODUCTINSTALLLOCATION/apacheopenoffice/basisBASISDIRECTORYVERSION/ure-link >/dev/null 2>&1
else
- ln -s ../ure $$PRODUCTINSTALLLOCATION/openoffice.org/basisBASISDIRECTORYVERSION/ure-link >/dev/null 2>&1
+ ln -s ../ure $$PRODUCTINSTALLLOCATION/apacheopenoffice/basisBASISDIRECTORYVERSION/ure-link >/dev/null 2>&1
fi
exit 0
@@ -80,11 +80,11 @@ Linux)
;;
esac
-if [ -h $$PRODUCTINSTALLLOCATION/openoffice.org/basisBASISDIRECTORYVERSION/ure-link -a $$LASTUNINSTALL -eq 1 ]
+if [ -h $$PRODUCTINSTALLLOCATION/apacheopenoffice/basisBASISDIRECTORYVERSION/ure-link -a $$LASTUNINSTALL -eq 1 ]
then
- rm -f $$PRODUCTINSTALLLOCATION/openoffice.org/basisBASISDIRECTORYVERSION/ure-link 2>/dev/null
- rmdir $$PRODUCTINSTALLLOCATION/openoffice.org/basisBASISDIRECTORYVERSION 2>/dev/null
- rmdir $$PRODUCTINSTALLLOCATION/openoffice.org 2>/dev/null
+ rm -f $$PRODUCTINSTALLLOCATION/apacheopenoffice/basisBASISDIRECTORYVERSION/ure-link 2>/dev/null
+ rmdir $$PRODUCTINSTALLLOCATION/apacheopenoffice/basisBASISDIRECTORYVERSION 2>/dev/null
+ rmdir $$PRODUCTINSTALLLOCATION/apacheopenoffice 2>/dev/null
fi
exit 0
diff --git a/main/setup_native/source/win32/customactions/languagepacks/lngpckinsthelper.cxx b/main/setup_native/source/win32/customactions/languagepacks/lngpckinsthelper.cxx
index 55bd7a4..01bb595 100644
--- a/main/setup_native/source/win32/customactions/languagepacks/lngpckinsthelper.cxx
+++ b/main/setup_native/source/win32/customactions/languagepacks/lngpckinsthelper.cxx
@@ -124,8 +124,8 @@ UINT GetInstallProperty(MSIHANDLE handle, LPCTSTR name, CharacterBuffer_t* buffe
Try to find the installation path to an already installed product.
The installation path will be written in the Windows registry
during the installation. There may exist different products in
- parallel e.g. StarOffice, StarSuite, OpenOffice.org. It will be
- searched in this order for an installed product. If a product
+ parallel e.g. StarOffice, StarSuite, OpenOffice.org, Apache OpenOffice.
+ It will be searched in this order for an installed product. If a product
will be found the path to the product will be set in the property
"INSTALLLOCATION" else nothing will be done.
*/
diff --git a/main/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx b/main/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
index 2eeac9f..67712db 100644
--- a/main/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
+++ b/main/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
@@ -113,6 +113,10 @@ static BOOL CheckExtensionInRegistry( LPCSTR lpSubKey )
bRet = true;
}
else if ( strncmp( szBuffer, "OpenOffice.org.", 15 ) == 0 )
+ { // We will replace registration for our (former) own types, too
+ bRet = true;
+ }
+ else if ( strncmp( szBuffer, "Apache OpenOffice.", 18 ) == 0 )
{ // We will replace registration for our own types, too
bRet = true;
}
diff --git a/main/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx b/main/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx
index be60093..0075a10 100644
--- a/main/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx
+++ b/main/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx
@@ -77,10 +77,10 @@ namespace /* private */
Registrar::Registrar(const RegistrationContextInformation& RegContext) :
m_ContextInformation(RegContext),
- FORWARD_KEY_PREFIX(L"OpenOffice.org"),//FORWARD_KEY_PREFIX(L"soffice6"),
+ FORWARD_KEY_PREFIX(L"Apache OpenOffice"),
DEFAULT_VALUE_NAME(L""),
BACKUP_VALUE_NAME(L"Backup"),
- PRIVATE_BACKUP_KEY_NAME(L"OpenOffice.org.reg4msdocmsi"),//PRIVATE_BACKUP_KEY_NAME(L"soffice6.bak"),
+ PRIVATE_BACKUP_KEY_NAME(L"Apache OpenOffice.reg4msdocmsi"),//PRIVATE_BACKUP_KEY_NAME(L"soffice6.bak"),
REGISTRATION_STATE(L"Reg4MsDocState")
{
m_RootKey = WindowsRegistry().GetClassesRootKey();
diff --git a/main/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.cxx b/main/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.cxx
index 271ea2d..29e8b64 100644
--- a/main/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.cxx
+++ b/main/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.cxx
@@ -305,8 +305,7 @@ std::wstring RegistrationContextInformation::GetOpenOfficeExecutableName() const
std::wstring RegistrationContextInformation::GetOpenOfficeCommandline(SHELL_COMMAND ShellCommand,
OFFICE_APPLICATION OfficeApp) const
{
- // quote the path to OpenOffice, this is important
- // for Windows 9x
+ // quote the path to Apache OpenOffice, this is important for Windows 9x
std::wstring cmd_line = std::wstring(TEXT("\"")) + m_OOExecPath + std::wstring(TEXT("\""));
switch( OfficeApp )
diff --git a/main/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.hxx b/main/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.hxx
index e732d7e..0d99580 100644
--- a/main/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.hxx
+++ b/main/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.hxx
@@ -45,7 +45,7 @@
document display name is convertable to an ANSI
string and if not returns an english default.
So we avoid garbage if soemone for instance
- installs an japanese StarOffice/OpenOffice
+ installs an japanese version
under a German Windows 98 for instance.
*/
class RegistrationContextInformation
@@ -150,7 +150,7 @@ public:
*/
std::wstring GetOpenOfficeFriendlyAppName() const;
- /** The path to the StarOffice/OpenOffice executable
+ /** The path to the office executable
*/
std::wstring GetOpenOfficeExecutablePath() const;
diff --git a/main/setup_native/source/win32/customactions/relnotes/relnotes.cxx b/main/setup_native/source/win32/customactions/relnotes/relnotes.cxx
index 1cddaeb..c264fa3 100644
--- a/main/setup_native/source/win32/customactions/relnotes/relnotes.cxx
+++ b/main/setup_native/source/win32/customactions/relnotes/relnotes.cxx
@@ -158,7 +158,7 @@ extern "C" UINT __stdcall ShowSurveyAfter( MSIHANDLE handle )
std::wstring prodname;
GetMsiProp( handle, TEXT("ProductName"), prodname );
- std::wstring::size_type nIndex = prodname.find( TEXT( "OpenOffice.org" ) );
+ std::wstring::size_type nIndex = prodname.find( TEXT( "Apache OpenOffice" ) );
if( std::wstring::npos == nIndex )
return ERROR_SUCCESS;
@@ -170,7 +170,8 @@ extern "C" UINT __stdcall ShowSurveyAfter( MSIHANDLE handle )
aExecInf.cbSize = sizeof( aExecInf );
aExecInf.fMask = SEE_MASK_FLAG_DDEWAIT | SEE_MASK_FLAG_NO_UI;
aExecInf.lpVerb = TEXT("open");
- aExecInf.lpFile = TEXT("http://surveys.services.openoffice.org/deinstall");
+ //aExecInf.lpFile = TEXT("http://surveys.services.openoffice.org/deinstall");
+ aExecInf.lpFile = TEXT("http://www.openoffice.org/support/");
aExecInf.lpDirectory = NULL;
aExecInf.nShow = SW_SHOWNORMAL;
diff --git a/main/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx b/main/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx
index f97fe39..a9fbf68 100644
--- a/main/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx
+++ b/main/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx
@@ -54,10 +54,10 @@
We add the following entries to the respective registry key
- "{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}"="OpenOffice.org Column Handler"
- "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}"="OpenOffice.org Infotip Handler"
- "{63542C48-9552-494A-84F7-73AA6A7C99C1}"="OpenOffice.org Property Sheet Handler"
- "{3B092F0C-7696-40E3-A80F-68D74DA84210}"="OpenOffice.org Thumbnail Viewer"
+ "{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}"="Apache OpenOffice Column Handler"
+ "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}"="Apache OpenOffice Infotip Handler"
+ "{63542C48-9552-494A-84F7-73AA6A7C99C1}"="Apache OpenOffice Property Sheet Handler"
+ "{3B092F0C-7696-40E3-A80F-68D74DA84210}"="Apache OpenOffice Thumbnail Viewer"
These shell extensions are implemented in the 'shell' project. We ignore registration
failures because of insufficient privileges. The reason is: On systems which restrict the
@@ -90,10 +90,10 @@ struct RegistryEntry
TCHAR* Value;
};
-RegistryEntry ColumnHandler = { TEXT("{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}"), TEXT("OpenOffice.org Column Handler") };
-RegistryEntry InfotipHandler = { TEXT("{087B3AE3-E237-4467-B8DB-5A38AB959AC9}"), TEXT("OpenOffice.org Infotip Handler") };
-RegistryEntry PropHandler = { TEXT("{63542C48-9552-494A-84F7-73AA6A7C99C1}"), TEXT("OpenOffice.org Property Sheet Handler") };
-RegistryEntry ThumbViewer = { TEXT("{3B092F0C-7696-40E3-A80F-68D74DA84210}"), TEXT("OpenOffice.org Thumbnail Viewer") };
+RegistryEntry ColumnHandler = { TEXT("{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}"), TEXT("Apache OpenOffice Column Handler") };
+RegistryEntry InfotipHandler = { TEXT("{087B3AE3-E237-4467-B8DB-5A38AB959AC9}"), TEXT("Apache OpenOffice Infotip Handler") };
+RegistryEntry PropHandler = { TEXT("{63542C48-9552-494A-84F7-73AA6A7C99C1}"), TEXT("Apache OpenOffice Property Sheet Handler") };
+RegistryEntry ThumbViewer = { TEXT("{3B092F0C-7696-40E3-A80F-68D74DA84210}"), TEXT("Apache OpenOffice Thumbnail Viewer") };
BOOL GetMsiProp( MSIHANDLE hMSI, const char* pPropName, char** ppValue )
{
diff --git a/main/setup_native/source/win32/stwrapper/stwrapper.manifest b/main/setup_native/source/win32/stwrapper/stwrapper.manifest
index ec639e4..2439b5f 100644
--- a/main/setup_native/source/win32/stwrapper/stwrapper.manifest
+++ b/main/setup_native/source/win32/stwrapper/stwrapper.manifest
@@ -7,7 +7,7 @@
version="1.0.0.0"
processorArchitecture="x86"
/>
- OpenOffice.org Installer
+ Apache OpenOffice Installer
diff --git a/main/shell/inc/internal/config.hxx b/main/shell/inc/internal/config.hxx
index c8e6403..2a0b737 100644
--- a/main/shell/inc/internal/config.hxx
+++ b/main/shell/inc/internal/config.hxx
@@ -40,10 +40,10 @@
#define MODULE_NAME_FILTER TEXT("ooofilt.dll")
#endif
-#define COLUMN_HANDLER_DESCRIPTIVE_NAME TEXT("OpenOffice.org Column Handler")
-#define INFOTIP_HANDLER_DESCRIPTIVE_NAME TEXT("OpenOffice.org Infotip Handler")
-#define PROPSHEET_HANDLER_DESCRIPTIVE_NAME TEXT("OpenOffice.org Property Sheet Handler")
-#define THUMBVIEWER_HANDLER_DESCRIPTIVAE_NAME TEXT("OpenOffice.org Thumbnail Viewer")
+#define COLUMN_HANDLER_DESCRIPTIVE_NAME TEXT("Apache OpenOffice Column Handler")
+#define INFOTIP_HANDLER_DESCRIPTIVE_NAME TEXT("Apache OpenOffice Infotip Handler")
+#define PROPSHEET_HANDLER_DESCRIPTIVE_NAME TEXT("Apache OpenOffice Property Sheet Handler")
+#define THUMBVIEWER_HANDLER_DESCRIPTIVAE_NAME TEXT("Apache OpenOffice Thumbnail Viewer")
#define META_CONTENT_NAME "meta.xml"
#define DOC_CONTENT_NAME "content.xml"
diff --git a/main/shell/source/unix/sysshell/recently_used_file_handler.cxx b/main/shell/source/unix/sysshell/recently_used_file_handler.cxx
index 4811d32..7c6cbec 100644
--- a/main/shell/source/unix/sysshell/recently_used_file_handler.cxx
+++ b/main/shell/source/unix/sysshell/recently_used_file_handler.cxx
@@ -405,7 +405,7 @@ namespace /* private */ {
};
//------------------------------------------------
- const char* GROUP_OOO = "openoffice.org";
+ const char* GROUP_OOO = "apacheopenoffice";
const char* GROUP_STAR_OFFICE = "staroffice";
const char* GROUP_STAR_SUITE = "starsuite";
diff --git a/main/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx b/main/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
index ee71c81..cd9d0dd 100644
--- a/main/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
+++ b/main/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
@@ -1197,7 +1197,7 @@ namespace /* private */
std::string ClsidEntry = CLSID_GUID_ENTRY;
SubstitutePlaceholder(ClsidEntry, GUID_PLACEHOLDER, ClsidToString(FilterGuid));
- if (!SetRegistryKey(HKEY_CLASSES_ROOT, ClsidEntry.c_str(), "", "OpenOffice.org Filter"))
+ if (!SetRegistryKey(HKEY_CLASSES_ROOT, ClsidEntry.c_str(), "", "OpenOffice.org XML Filter"))
return E_FAIL;
ClsidEntry = CLSID_GUID_INPROC_ENTRY;
@@ -1225,7 +1225,7 @@ namespace /* private */
SubstitutePlaceholder(ClsidEntry_Persist, GUID_PLACEHOLDER, ClsidToString(PersistentGuid));
- if (!SetRegistryKey(HKEY_CLASSES_ROOT, ClsidEntry_Persist.c_str(), "", "OpenOffice.org Persistent Handler"))
+ if (!SetRegistryKey(HKEY_CLASSES_ROOT, ClsidEntry_Persist.c_str(), "", "Apache OpenOffice Persistent Handler"))
return E_FAIL;
// Add missing entry
diff --git a/main/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx b/main/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
index 55c5a0a..4e4dd37 100644
--- a/main/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
+++ b/main/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
@@ -56,11 +56,11 @@ struct PROPERTYMAP
PROPERTYMAP g_rgPROPERTYMAP[] =
{
- { PKEY_Title, L"OpenOffice.org", L"Title" },
- { PKEY_Author, L"OpenOffice.org", L"Author" },
- { PKEY_Subject, L"OpenOffice.org", L"Subject" },
- { PKEY_Keywords, L"OpenOffice.org", L"Keyword" },
- { PKEY_Comment, L"OpenOffice.org", L"Comments" },
+ { PKEY_Title, L"Apache OpenOffice", L"Title" },
+ { PKEY_Author, L"Apache OpenOffice", L"Author" },
+ { PKEY_Subject, L"Apache OpenOffice", L"Subject" },
+ { PKEY_Keywords, L"Apache OpenOffice", L"Keyword" },
+ { PKEY_Comment, L"Apache OpenOffice", L"Comments" },
};
size_t gPropertyMapTableSize = sizeof(g_rgPROPERTYMAP)/sizeof(g_rgPROPERTYMAP[0]);
diff --git a/main/shell/source/win32/shlxthandler/res/shlxthdl.manifest b/main/shell/source/win32/shlxthandler/res/shlxthdl.manifest
index a785006..6af0aa2 100644
--- a/main/shell/source/win32/shlxthandler/res/shlxthdl.manifest
+++ b/main/shell/source/win32/shlxthandler/res/shlxthdl.manifest
@@ -1,7 +1,7 @@
-
-OpenOffice Shell Extension
+
+Apache OpenOffice Shell Extension
{'PRODUCTNAME'} eq "OpenOffice.org" ) { $start .= ""; }
-
- if ( $allvariables->{'PRODUCTNAME'} eq "OOo-dev" ) { $start .= "-Dev"; }
-
- if (( $allvariables->{'PRODUCTNAME'} eq "OpenOffice.org" ) && ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start .= "-SDK"; }
+ my ($allvariables) = @_;
- if (( $allvariables->{'PRODUCTNAME'} eq "OOo-dev" ) && ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start .= "-Dev-SDK"; }
+ my $start;
- if ( $allvariables->{'PRODUCTNAME'} eq "URE" ) { $start .= "-URE"; }
+ if ( $allvariables->{'AOODOWNLOADNAMEPREFIX'} )
+ {
+ $start = $allvariables->{'AOODOWNLOADNAMEPREFIX'};
+ }
+ else
+ {
+ $start = "Apache_OpenOffice";
+ if ( $allvariables->{'PRODUCTNAME'} eq "Apache OpenOffice" )
+ {
+ if ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )
+ {
+ $start .= "-SDK";
+ }
+ }
+
+ if ( $allvariables->{'PRODUCTNAME'} eq "AOO-Developer-Build" )
+ {
+ if ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )
+ {
+ $start .= "-Dev-SDK";
+ }
+ else
+ {
+ $start .= "-Dev";
+ }
+ }
+
+ if ( $allvariables->{'PRODUCTNAME'} eq "URE" )
+ {
+ $start .= "-URE";
+ }
+ }
- return $start;
+ return $start;
}
#########################################################
@@ -1968,8 +1991,14 @@ sub create_download_sets
# evaluating the name of the download file
- if ( $allvariableshashref->{'OOODOWNLOADNAME'} ) { $downloadname = set_download_filename($languagestringref, $allvariableshashref); }
- else { $downloadname = resolve_variables_in_downloadname($allvariableshashref, $downloadname, $languagestringref); }
+ if ( $allvariableshashref->{'AOODOWNLOADNAME'} )
+ {
+ $downloadname = set_download_filename($languagestringref, $allvariableshashref);
+ }
+ else
+ {
+ $downloadname = resolve_variables_in_downloadname($allvariableshashref, $downloadname, $languagestringref);
+ }
if ( ! $installer::globals::iswindowsbuild ) # Unix specific part
{
@@ -1978,7 +2007,7 @@ sub create_download_sets
my $getuidlibrary = "";
if (( $installer::globals::issolarisbuild ) || ( $installer::globals::islinuxbuild )) { $getuidlibrary = get_path_for_library($includepatharrayref); }
- if ( $allvariableshashref->{'OOODOWNLOADNAME'} )
+ if ( $allvariableshashref->{'AOODOWNLOADNAME'} )
{
my $downloadfile = create_tar_gz_file_from_directory($installationdir, $getuidlibrary, $downloaddir, $downloadname);
}
diff --git a/main/solenv/bin/modules/installer/epmfile.pm b/main/solenv/bin/modules/installer/epmfile.pm
index 8d7a9b4..2116537 100644
--- a/main/solenv/bin/modules/installer/epmfile.pm
+++ b/main/solenv/bin/modules/installer/epmfile.pm
@@ -326,11 +326,11 @@ sub create_epm_header
my $line = "";
my $infoline = "";
- # %product OpenOffice.org Software
+ # %product Apache OpenOffice Software
# %version 2.0
# %description A really great software
# %copyright 1999-2003 by OOo
- # %vendor OpenOffice.org
+ # %vendor Apache OpenOffice project
# %license /test/replace/01/LICENSE01
# %readme /test/replace/01/README01
# %requires foo
@@ -492,7 +492,7 @@ sub create_epm_header
{
# refer to the license in the matching AOO installation
# TODO: sync AOO dest license full path with lpacks/sdks/exts
- my $licpath = "openoffice.org3/program/" . $licensefilename;
+ my $licpath = "apacheopenoffice3/program/" . $licensefilename;
$foundlicensefile = 1;
$line = "%license " . $licpath . "\n";
push(@epmheader, $line);
@@ -550,7 +550,7 @@ sub create_epm_header
}
}
- if ( $installer::globals::debian && $variableshashref->{'UNIXPRODUCTNAME'} eq 'openoffice.org' )
+ if ( $installer::globals::debian && $variableshashref->{'UNIXPRODUCTNAME'} eq 'apache openoffice' )
{
$line = "%provides" . " openoffice.org-unbundled\n";
push(@epmheader, $line);
diff --git a/main/solenv/bin/modules/installer/simplepackage.pm b/main/solenv/bin/modules/installer/simplepackage.pm
index c6b22d3..1f2ad69 100644
--- a/main/solenv/bin/modules/installer/simplepackage.pm
+++ b/main/solenv/bin/modules/installer/simplepackage.pm
@@ -333,7 +333,10 @@ sub replace_variables_in_scriptfile
replace_one_variable_in_shellscript($scriptfile, $allvariables->{'PRODUCTVERSION'}, "PRODUCTVERSION" );
my $scriptname = lc($allvariables->{'PRODUCTNAME'}) . "\.script";
- if ( $allvariables->{'PRODUCTNAME'} eq "OpenOffice.org" ) { $scriptname = "org.openoffice.script"; }
+ if ( $allvariables->{'PRODUCTNAME'} eq "Apache OpenOffice" )
+ {
+ $scriptname = "org.openoffice.script";
+ }
replace_one_variable_in_shellscript($scriptfile, $scriptname, "SEARCHSCRIPTNAME" );
}
@@ -616,7 +619,7 @@ sub create_simple_package
my $locallanguage = $installer::globals::csp_languagestring;
- if ( $allvariables->{'OOODOWNLOADNAME'} )
+ if ( $allvariables->{'AOODOWNLOADNAME'} )
{
$packagename = installer::download::set_download_filename(\$locallanguage, $allvariables);
}
diff --git a/main/solenv/bin/modules/installer/windows/msp.pm b/main/solenv/bin/modules/installer/windows/msp.pm
index 83cd346..ff416cd 100644
--- a/main/solenv/bin/modules/installer/windows/msp.pm
+++ b/main/solenv/bin/modules/installer/windows/msp.pm
@@ -884,7 +884,7 @@ sub change_patchmetadata_table
if ( $allvariables->{'PROPERTYTABLEPRODUCTNAME'} ) { $targetproductnamevalue = $allvariables->{'PROPERTYTABLEPRODUCTNAME'}; }
my $manufacturerstring = "ManufacturerName";
- my $manufacturervalue = "OpenOffice.org";
+ my $manufacturervalue = "Apache OpenOffice";
if ( $installer::globals::longmanufacturer ) { $manufacturervalue = $installer::globals::longmanufacturer; }
my $displaynamestring = "DisplayName";
diff --git a/main/solenv/bin/modules/installer/ziplist.pm b/main/solenv/bin/modules/installer/ziplist.pm
index cb85d5d..0236558 100644
--- a/main/solenv/bin/modules/installer/ziplist.pm
+++ b/main/solenv/bin/modules/installer/ziplist.pm
@@ -639,7 +639,7 @@ sub set_manufacturer
{
my ($allvariables) = @_;
- my $openofficeproductname = "OpenOffice.org";
+ my $openofficeproductname = "Apache OpenOffice";
my $sunname = "";
diff --git a/main/svx/source/dialog/sendreportw32.cxx b/main/svx/source/dialog/sendreportw32.cxx
index cf68642..c58a22b 100644
--- a/main/svx/source/dialog/sendreportw32.cxx
+++ b/main/svx/source/dialog/sendreportw32.cxx
@@ -93,7 +93,7 @@ namespace svx{
if ( ERROR_SUCCESS == RegReadValue(
HKEY_CURRENT_USER,
- TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"),
+ TEXT("SOFTWARE\\Apache OpenOffice\\CrashReport"),
TEXT("HTTPProxyServer"),
szBuffer,
sizeof(szBuffer) ) )
@@ -102,7 +102,7 @@ namespace svx{
DWORD dwProxyPort;
if ( ERROR_SUCCESS == RegReadValue(
HKEY_CURRENT_USER,
- TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"),
+ TEXT("SOFTWARE\\Apache OpenOffice\\CrashReport"),
TEXT("HTTPProxyPort"),
&dwProxyPort,
sizeof(dwProxyPort) ) )
@@ -113,7 +113,7 @@ namespace svx{
if ( ERROR_SUCCESS == RegReadValue(
HKEY_CURRENT_USER,
- TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"),
+ TEXT("SOFTWARE\\Apache OpenOffice\\CrashReport"),
TEXT("ReturnAddress"),
szBuffer,
sizeof(szBuffer) ) )
@@ -122,7 +122,7 @@ namespace svx{
DWORD fAllowContact = sal_False;
RegReadValue(
HKEY_CURRENT_USER,
- TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"),
+ TEXT("SOFTWARE\\Apache OpenOffice\\CrashReport"),
TEXT("AllowContact"),
&fAllowContact,
sizeof(fAllowContact) );
@@ -131,7 +131,7 @@ namespace svx{
DWORD uInternetConnection = 0;
RegReadValue(
HKEY_CURRENT_USER,
- TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"),
+ TEXT("SOFTWARE\\Apache OpenOffice\\CrashReport"),
TEXT("HTTPConnection"),
&uInternetConnection,
sizeof(uInternetConnection) );
@@ -145,7 +145,7 @@ namespace svx{
const _TCHAR *lpHTTPProxyServer = reinterpret_cast(maParams.maHTTPProxyServer.GetBuffer());
RegWriteValue(
HKEY_CURRENT_USER,
- TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"),
+ TEXT("SOFTWARE\\Apache OpenOffice\\CrashReport"),
TEXT("HTTPProxyServer"), REG_SZ,
lpHTTPProxyServer,
sizeof(TCHAR) * (_tcslen(lpHTTPProxyServer) + 1) );
@@ -155,7 +155,7 @@ namespace svx{
RegWriteValue(
HKEY_CURRENT_USER,
- TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"),
+ TEXT("SOFTWARE\\Apache OpenOffice\\CrashReport"),
TEXT("HTTPProxyPort"), REG_DWORD,
&dwProxyPort,
sizeof(DWORD) );
@@ -163,7 +163,7 @@ namespace svx{
DWORD fAllowContact = IsContactAllowed();
RegWriteValue(
HKEY_CURRENT_USER,
- TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"),
+ TEXT("SOFTWARE\\Apache OpenOffice\\CrashReport"),
TEXT("AllowContact"), REG_DWORD,
&fAllowContact,
sizeof(DWORD) );
@@ -173,7 +173,7 @@ namespace svx{
RegWriteValue(
HKEY_CURRENT_USER,
- TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"),
+ TEXT("SOFTWARE\\Apache OpenOffice\\CrashReport"),
TEXT("HTTPConnection"), REG_DWORD,
&uInternetConnection,
sizeof(DWORD) );
@@ -181,7 +181,7 @@ namespace svx{
const _TCHAR *lpEmail = reinterpret_cast(GetEMailAddress().GetBuffer());
RegWriteValue(
HKEY_CURRENT_USER,
- TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"),
+ TEXT("SOFTWARE\\Apache OpenOffice\\CrashReport"),
TEXT("ReturnAddress"), REG_SZ,
lpEmail,
sizeof(TCHAR) * (_tcslen(lpEmail) + 1) );
diff --git a/main/sysui/desktop/debian/control b/main/sysui/desktop/debian/control
index 3dd2d9c..e93a0a5 100644
--- a/main/sysui/desktop/debian/control
+++ b/main/sysui/desktop/debian/control
@@ -1,6 +1,6 @@
Description: %productname desktop integration
Maintainer: Apache Software Foundation
Architecture: all
-Provides: openoffice.org-desktop-integration, openoffice.org-unbundled
-Conflicts: openofficeorg-desktop-integration, openofficeorg-debian-menus, openoffice.org-bundled
-Replaces: openofficeorg-desktop-integration, openofficeorg-debian-menus
+Provides: apache_openoffice-desktop-integration, openoffice.org-unbundled
+Conflicts: apache_openoffice-desktop-integration, openofficeorg-desktop-integration, openofficeorg-debian-menus, openoffice.org-bundled
+Replaces: apache_openoffice-desktop-integration, openofficeorg-debian-menus
diff --git a/main/sysui/desktop/freedesktop/freedesktop-menus.spec b/main/sysui/desktop/freedesktop/freedesktop-menus.spec
index 640e6f6..da64d19 100644
--- a/main/sysui/desktop/freedesktop/freedesktop-menus.spec
+++ b/main/sysui/desktop/freedesktop/freedesktop-menus.spec
@@ -27,7 +27,7 @@ Name: %pkgprefix-freedesktop-menus
#BuildRequires: perl
Group: Office
License: ALv2
-Provides: openoffice.org3-desktop-integration
+Provides: apache_openoffice3-desktop-integration
Conflicts: %pkgprefix-suse-menus
Conflicts: %pkgprefix-debian-menus
Conflicts: %pkgprefix-redhat-menus
diff --git a/main/sysui/desktop/macosx/Info.plist b/main/sysui/desktop/macosx/Info.plist
index 157e907..03b09a8 100644
--- a/main/sysui/desktop/macosx/Info.plist
+++ b/main/sysui/desktop/macosx/Info.plist
@@ -32,7 +32,7 @@
UTTypeIdentifier
org.openoffice.text
UTTypeDescription
- ${FILEFORMATNAME} ${FILEFORMATVERSION} Text
+ ${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Text
UTTypeConformsTo
public.data
@@ -80,7 +80,7 @@
UTTypeIdentifier
org.openoffice.spreadsheet
UTTypeDescription
- ${FILEFORMATNAME} ${FILEFORMATVERSION} Spreadsheet
+ ${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Spreadsheet
UTTypeConformsTo
public.data
@@ -128,7 +128,7 @@
UTTypeIdentifier
org.openoffice.presentation
UTTypeDescription
- ${FILEFORMATNAME} ${FILEFORMATVERSION} Presentation
+ ${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Presentation
UTTypeConformsTo
public.data
@@ -178,7 +178,7 @@
UTTypeIdentifier
org.openoffice.graphics
UTTypeDescription
- ${FILEFORMATNAME} ${FILEFORMATVERSION} Drawing
+ ${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Drawing
UTTypeConformsTo
public.data
@@ -226,7 +226,7 @@
UTTypeIdentifier
org.openoffice.text-master
UTTypeDescription
- ${FILEFORMATNAME} ${FILEFORMATVERSION} Master
+ ${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Master
UTTypeConformsTo
public.data
@@ -272,7 +272,7 @@
UTTypeIdentifier
org.openoffice.formula
UTTypeDescription
- ${FILEFORMATNAME} ${FILEFORMATVERSION} Formula
+ ${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Formula
UTTypeConformsTo
public.data
@@ -320,7 +320,7 @@
UTTypeIdentifier
org.openoffice.text-template
UTTypeDescription
- ${FILEFORMATNAME} ${FILEFORMATVERSION} Text Template
+ ${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Text Template
UTTypeConformsTo
public.data
@@ -366,7 +366,7 @@
UTTypeIdentifier
org.openoffice.spreadsheet-template
UTTypeDescription
- ${FILEFORMATNAME} ${FILEFORMATVERSION} Spreadsheet Template
+ ${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Spreadsheet Template
UTTypeConformsTo
public.data
@@ -412,7 +412,7 @@
UTTypeIdentifier
org.openoffice.presentation-template
UTTypeDescription
- ${FILEFORMATNAME} ${FILEFORMATVERSION} Presentation Template
+ ${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Presentation Template
UTTypeConformsTo
public.data
@@ -458,7 +458,7 @@
UTTypeIdentifier
org.openoffice.graphics-template
UTTypeDescription
- ${FILEFORMATNAME} ${FILEFORMATVERSION} Drawing Template
+ ${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Drawing Template
UTTypeConformsTo
public.data
@@ -868,7 +868,7 @@
CFBundleTypeIconFile
text.icns
CFBundleTypeName
- ${FILEFORMATNAME} ${FILEFORMATVERSION} Text
+ ${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Text
CFBundleTypeRole
Editor
LSIsAppleDefaultForType
@@ -906,7 +906,7 @@
CFBundleTypeIconFile
spreadsheet.icns
CFBundleTypeName
- ${FILEFORMATNAME} ${FILEFORMATVERSION} Spreadsheet
+ ${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Spreadsheet
CFBundleTypeRole
Editor
LSIsAppleDefaultForType
@@ -946,7 +946,7 @@
CFBundleTypeIconFile
presentation.icns
CFBundleTypeName
- ${FILEFORMATNAME} ${FILEFORMATVERSION} Presentation
+ ${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Presentation
CFBundleTypeRole
Editor
LSIsAppleDefaultForType
@@ -984,7 +984,7 @@
CFBundleTypeIconFile
drawing.icns
CFBundleTypeName
- ${FILEFORMATNAME} ${FILEFORMATVERSION} Drawing
+ ${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Drawing
CFBundleTypeRole
Editor
LSIsAppleDefaultForType
@@ -1020,7 +1020,7 @@
CFBundleTypeIconFile
master-document.icns
CFBundleTypeName
- ${FILEFORMATNAME} ${FILEFORMATVERSION} Master
+ ${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Master
CFBundleTypeRole
Editor
LSIsAppleDefaultForType
@@ -1058,7 +1058,7 @@
CFBundleTypeIconFile
formula.icns
CFBundleTypeName
- ${FILEFORMATNAME} ${FILEFORMATVERSION} Formula
+ ${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Formula
CFBundleTypeRole
Editor
LSIsAppleDefaultForType
@@ -1094,7 +1094,7 @@
CFBundleTypeIconFile
text-template.icns
CFBundleTypeName
- ${FILEFORMATNAME} ${FILEFORMATVERSION} Text Template
+ ${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Text Template
CFBundleTypeRole
Editor
LSIsAppleDefaultForType
@@ -1130,7 +1130,7 @@
CFBundleTypeIconFile
spreadsheet-template.icns
CFBundleTypeName
- ${FILEFORMATNAME} ${FILEFORMATVERSION} Spreadsheet Template
+ ${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Spreadsheet Template
CFBundleTypeRole
Editor
LSIsAppleDefaultForType
@@ -1166,7 +1166,7 @@
CFBundleTypeIconFile
presentation-template.icns
CFBundleTypeName
- ${FILEFORMATNAME} ${FILEFORMATVERSION} Presentation Template
+ ${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Presentation Template
CFBundleTypeRole
Editor
LSIsAppleDefaultForType
@@ -1202,7 +1202,7 @@
CFBundleTypeIconFile
drawing-template.icns
CFBundleTypeName
- ${FILEFORMATNAME} ${FILEFORMATVERSION} Drawing Template
+ ${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Drawing Template
CFBundleTypeRole
Editor
LSIsAppleDefaultForType
diff --git a/main/sysui/desktop/mandriva/mandriva-menus.spec b/main/sysui/desktop/mandriva/mandriva-menus.spec
index abcdb55..1ea7015 100644
--- a/main/sysui/desktop/mandriva/mandriva-menus.spec
+++ b/main/sysui/desktop/mandriva/mandriva-menus.spec
@@ -33,7 +33,7 @@ BuildArch: noarch
# here and check for the 'mandriva-release' in the future (next year).
#
Requires: mandrake-release
-Provides: openoffice.org3-desktop-integration
+Provides: apache_openoffice3-desktop-integration
%define _unpackaged_files_terminate_build 0
%define _binary_filedigest_algorithm 1
diff --git a/main/sysui/desktop/productversion.mk b/main/sysui/desktop/productversion.mk
index bbfdb9a..ef2b12f 100644
--- a/main/sysui/desktop/productversion.mk
+++ b/main/sysui/desktop/productversion.mk
@@ -40,8 +40,9 @@ PKGDIR=$(BIN)
.ENDIF
# CAUTION! here the parsing result from openoffice.lst is NOT available, so this is hardcoded
-# but should not be. When replacing with $(UNIXBASISROOTNAME) it will be empty (!)
-PRODUCTLIST = openoffice.org
+# but should not be.
+# It has to be equal to PRODUCTNAME:l:s/\s/\_/g - see solenv/bin/modules/installer/setupscript.pm
+PRODUCTLIST = apache_openoffice
# default values to minimize maintainance effort
@@ -65,11 +66,11 @@ ICONVERSION = $(PRODUCTVERSIONSHORT:s/.//g)
UNIXWRAPPERNAME *= '$${{UNIXPRODUCTNAME}}$${{BRANDPACKAGEVERSION}}'
# CAUTION! $(UNIXBASISROOTNAME) from openoffice.lst NOT available (!)
-PRODUCTNAME.openoffice.org = OpenOffice.org
+PRODUCTNAME.apache_openoffice = Apache OpenOffice
-PRODUCTVERSION.openoffice.org = $(PRODUCTVERSION)
-PRODUCTVERSIONSHORT.openoffice.org = $(PRODUCTVERSIONSHORT)
-PKGVERSION.openoffice.org = $(PKGVERSION)
-UNIXFILENAME.openoffice.org = $(PRODUCTNAME.openoffice.org:l)$(PRODUCTVERSIONSHORT.openoffice.org)
-ICONPREFIX.openoffice.org = $(UNIXFILENAME.openoffice.org:s/.//g)
+PRODUCTVERSION.apache_openoffice = $(PRODUCTVERSION)
+PRODUCTVERSIONSHORT.apache_openoffice = $(PRODUCTVERSIONSHORT)
+PKGVERSION.apache_openoffice = $(PKGVERSION)
+UNIXFILENAME.apache_openoffice = $(PRODUCTNAME.apache_openoffice:l:s/ /_/g)$(PRODUCTVERSIONSHORT.apache_openoffice)
+ICONPREFIX.apache_openoffice = $(UNIXFILENAME.apache_openoffice:s/.//g)
diff --git a/main/sysui/desktop/redhat/redhat-menus.spec b/main/sysui/desktop/redhat/redhat-menus.spec
index 6ce824c..8fa8f1e 100644
--- a/main/sysui/desktop/redhat/redhat-menus.spec
+++ b/main/sysui/desktop/redhat/redhat-menus.spec
@@ -29,7 +29,7 @@ Vendor: Apache Software Foundation
AutoReqProv: no
BuildArch: noarch
Requires: redhat-release
-Provides: openoffice.org3-desktop-integration
+Provides: apache_openoffice3-desktop-integration
%define _unpackaged_files_terminate_build 0
%define _binary_filedigest_algorithm 1
%define _binary_payload w9.gzdio
diff --git a/main/sysui/desktop/share/brand.pl b/main/sysui/desktop/share/brand.pl
index edd1243..dc51b37 100644
--- a/main/sysui/desktop/share/brand.pl
+++ b/main/sysui/desktop/share/brand.pl
@@ -34,8 +34,8 @@ eval 'exec perl -wS $0 ${1+"$@"}'
$destdir = pop @ARGV;
mkdir $destdir,0777;
-$productname = "OpenOffice.org";
-$productfilename = "openoffice";
+$productname = "Apache OpenOffice";
+$productfilename = "apacheopenoffice";
$prefix = "";
$iconprefix = "";
diff --git a/main/sysui/desktop/share/create_mime_xml.pl b/main/sysui/desktop/share/create_mime_xml.pl
index 1e47a0d..03cc250 100644
--- a/main/sysui/desktop/share/create_mime_xml.pl
+++ b/main/sysui/desktop/share/create_mime_xml.pl
@@ -21,7 +21,7 @@
# *************************************************************
use File::Basename;
$basedir = dirname($0);
-$productname = 'OpenOffice.org';
+$productname = 'Apache OpenOffice';
$mimedir = $basedir.'/../mimetypes';
$FS= ' '; # field seperator (space) - for documents.ulf
diff --git a/main/sysui/desktop/share/create_tree.sh b/main/sysui/desktop/share/create_tree.sh
index fafebfa..2ff4a37 100644
--- a/main/sysui/desktop/share/create_tree.sh
+++ b/main/sysui/desktop/share/create_tree.sh
@@ -121,8 +121,8 @@ cp printeradmin.sh ${DESTDIR}/usr/bin/${PREFIX}-printeradmin
chmod 0755 ${DESTDIR}/usr/bin/${PREFIX} ${DESTDIR}/usr/bin/${PREFIX}-printeradmin
mkdir -p ${DESTDIR}/usr/share/mime/packages
-cp openoffice.org.xml ${DESTDIR}/usr/share/mime/packages/
-chmod 0644 ${DESTDIR}/usr/share/mime/packages/openoffice.org.xml
+cp apacheopenoffice.xml ${DESTDIR}/usr/share/mime/packages/
+chmod 0644 ${DESTDIR}/usr/share/mime/packages/apacheopenoffice.xml
mkdir -p ${DESTDIR}/usr/share/applications
for i in `cat launcherlist`; do
diff --git a/main/sysui/desktop/share/makefile.mk b/main/sysui/desktop/share/makefile.mk
index 67ef37e..cf17970 100644
--- a/main/sysui/desktop/share/makefile.mk
+++ b/main/sysui/desktop/share/makefile.mk
@@ -157,8 +157,8 @@ $(LAUNCHERFLAGFILE) : $(LAUNCHERDEPN)
#
# Create shared mime info xml file
#
-$(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.org.xml : ../mimetypes/{$(MIMELIST)}.desktop create_mime_xml.pl
-$(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.org.xml : $(ULFDIR)$/documents.ulf
+$(COMMONMISC)$/{$(PRODUCTLIST)}$/apacheopenoffice.xml : ../mimetypes/{$(MIMELIST)}.desktop create_mime_xml.pl
+$(COMMONMISC)$/{$(PRODUCTLIST)}$/apacheopenoffice.xml : $(ULFDIR)$/documents.ulf
@echo Create shared mime info xml file ..
@echo ---------------------------------
@$(PERL) create_mime_xml.pl $< > $@.$(INPATH)
@@ -173,8 +173,8 @@ $(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.keys : ../mimetypes/{$(MIMELIST)}.ke
@@-$(MKDIRHIER) $(@:d)
@echo Creating GNOME .keys file for $(@:d:d:f) ..
@echo ---------------------------------
- @$(PERL) brand.pl -p $(PRODUCTNAME.$(@:d:d:f)) -u $(UNIXFILENAME.$(@:d:d:f)) --iconprefix "$(ICONPREFIX.$(@:d:d:f))-" $< $(MISC)/$(@:d:d:f)
- @$(PERL) translate.pl -p $(PRODUCTNAME.$(@:d:d:f)) -d $(MISC)/$(@:d:d:f) --ext "keys" --key "description" $(ULFDIR)$/documents.ulf
+ @$(PERL) brand.pl -p "$(PRODUCTNAME.$(@:d:d:f))" -u $(UNIXFILENAME.$(@:d:d:f)) --iconprefix "$(ICONPREFIX.$(@:d:d:f))-" $< $(MISC)/$(@:d:d:f)
+ @$(PERL) translate.pl -p "$(PRODUCTNAME.$(@:d:d:f))" -d $(MISC)/$(@:d:d:f) --ext "keys" --key "description" $(ULFDIR)$/documents.ulf
@cat $(MISC)/$(@:d:d:f)/{$(MIMELIST)}.keys > $@.$(INPATH)
@mv -f $@.$(INPATH) $@
@@ -249,7 +249,7 @@ $(COMMONMISC)$/{$(PRODUCTLIST)}$/build.flag : $(ICONDEPN) \
$(COMMONMISC)$/{$(PRODUCTLIST)}$/create_tree.sh \
$(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.keys \
$(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.mime \
- $(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.org.xml \
+ $(COMMONMISC)$/{$(PRODUCTLIST)}$/apacheopenoffice.xml \
$(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.applications \
$(COMMONMISC)$/{$(PRODUCTLIST)}$/{openoffice printeradmin}.sh
@touch $@
diff --git a/main/sysui/desktop/share/translate.pl b/main/sysui/desktop/share/translate.pl
index e8d1638..003a5b2 100644
--- a/main/sysui/desktop/share/translate.pl
+++ b/main/sysui/desktop/share/translate.pl
@@ -32,7 +32,7 @@ eval 'exec perl -wS $0 ${1+"$@"}'
#
my ($prefix, $ext, $key);
-$productname = "OpenOffice.org";
+$productname = "Apache OpenOffice";
$workdir = ".";
while ($_ = $ARGV[0], /^-/) {
diff --git a/main/sysui/desktop/solaris/makefile.mk b/main/sysui/desktop/solaris/makefile.mk
index e156da6..d522949 100644
--- a/main/sysui/desktop/solaris/makefile.mk
+++ b/main/sysui/desktop/solaris/makefile.mk
@@ -94,9 +94,9 @@ $(MISC)/{$(PRODUCTLIST)}/postremove : $$(@:f)
# --- openoffice.xml---------------------------
.IF "$(common_build)"=="TRUE"
-# Copy the openoffice.org.xml file to $(MISC)
-#$(MISC)/$(foreach,i,$(PRODUCTLIST) $i/$i.xml) : $(COMMONMISC)/$$(@:b)/openoffice.org.xml
-$(MISC)/$(foreach,i,$(PRODUCTLIST) $(MISC)/$i/openoffice.org.xml) : $(COMMONMISC)/$$(@:b)/openoffice.org.xml
+# Copy the apacheopenoffice.xml file to $(MISC)
+#$(MISC)/$(foreach,i,$(PRODUCTLIST) $i/$i.xml) : $(COMMONMISC)/$$(@:b)/apacheopenoffice.xml
+$(MISC)/$(foreach,i,$(PRODUCTLIST) $(MISC)/$i/apacheopenoffice.xml) : $(COMMONMISC)/$$(@:b)/apacheopenoffice.xml
$(MKDIRHIER) $(@:d)
echo hier hier $@
cat $< | tr -d "\015" > $@
@@ -112,7 +112,7 @@ $(MISC)/{$(PRODUCTLIST)}$/prototype : $$(@:f) ../productversion.mk makefile.mk
# --- packaging ---------------------------------------------------
#$(PKGFILES) : $(MISC)/{$(PRODUCTLIST)}/{copyright pkginfo depend mailcap postinstall postremove} makefile.mk $(MISC)/$$(@:b:b:s/-desktop-integration//)/$$(@:b:b:s/-desktop-integration//).xml
-$(PKGFILES) : $(MISC)/{$(PRODUCTLIST)}/{copyright pkginfo depend mailcap postinstall postremove} makefile.mk $(MISC)/$$(@:b:b:s/-desktop-integration//)/openoffice.org.xml
+$(PKGFILES) : $(MISC)/{$(PRODUCTLIST)}/{copyright pkginfo depend mailcap postinstall postremove} makefile.mk $(MISC)/$$(@:b:b:s/-desktop-integration//)/apacheopenoffice.xml
$(PKGFILES) : $(MISC)$/{$(PRODUCTLIST)}$/prototype
@-$(RM) $(BIN)$/$(@:f)
@$(MKDIRHIER) $(@:d)
diff --git a/main/sysui/desktop/solaris/prototype b/main/sysui/desktop/solaris/prototype
index ef541c3..dda571d 100644
--- a/main/sysui/desktop/solaris/prototype
+++ b/main/sysui/desktop/solaris/prototype
@@ -21,7 +21,7 @@ d none share/mime/packages 0755 root other
!default 0644 root bin
e build etc/mime.types=./mime.types
e build etc/mailcap=mailcap
-f none usr/share/mime/packages/%PREFIX.xml=%SOURCE/openoffice.org.xml
+f none usr/share/mime/packages/%PREFIX.xml=%SOURCE/apacheopenoffice.xml
f none usr/share/application-registry/%PREFIX.applications=%SOURCE/openoffice.applications
s none usr/share/applications/%PREFIX-writer.desktop=../../../opt/%PREFIX/share/xdg/writer.desktop
s none usr/share/applications/%PREFIX-calc.desktop=../../../opt/%PREFIX/share/xdg/calc.desktop
diff --git a/main/sysui/desktop/suse/suse-menus.spec b/main/sysui/desktop/suse/suse-menus.spec
index 0f7a56a..8d02c9e 100644
--- a/main/sysui/desktop/suse/suse-menus.spec
+++ b/main/sysui/desktop/suse/suse-menus.spec
@@ -32,7 +32,7 @@ BuildArch: noarch
Requires: /etc/SuSE-release
# .. but not for Sun JDS
Conflicts: SunDesktopVersion
-Provides: openoffice.org3-desktop-integration
+Provides: apacheopenoffice3-desktop-integration
%define _unpackaged_files_terminate_build 0
%define _binary_filedigest_algorithm 1
%define _binary_payload w9.gzdio
diff --git a/main/unoil/climaker/makefile.mk b/main/unoil/climaker/makefile.mk
index 27e25fe..9a5feeb 100644
--- a/main/unoil/climaker/makefile.mk
+++ b/main/unoil/climaker/makefile.mk
@@ -64,8 +64,8 @@ $(BIN)/cli_oootypes.dll : $(RDB) $(EXTRA_RDB) version.txt
$(CLIMAKER) $(CLIMAKERFLAGS) \
--out $@ \
--assembly-version $(CLI_OOOTYPES_NEW_VERSION) \
- --assembly-company "OpenOffice.org" \
- --assembly-description "This assembly contains metadata for the StarOffice/OpenOffice.org API." \
+ --assembly-company "Apache OpenOffice" \
+ --assembly-description "This assembly contains metadata for the Apache OpenOffice API." \
-X $(EXTRA_RDB) \
-r $(SOLARBINDIR)$/cli_uretypes.dll \
--keyfile $(SOLARBINDIR)$/cliuno.snk \
diff --git a/main/vcl/source/app/settings.cxx b/main/vcl/source/app/settings.cxx
index ba12261..7ecbe43 100644
--- a/main/vcl/source/app/settings.cxx
+++ b/main/vcl/source/app/settings.cxx
@@ -1167,7 +1167,7 @@ sal_Bool MiscSettings::GetEnableATToolSupport() const
HKEY hkey;
if( ERROR_SUCCESS == RegOpenKey(HKEY_CURRENT_USER,
- "Software\\OpenOffice.org\\Accessibility\\AtToolSupport",
+ "Software\\Aapche OpenOffice\\Accessibility\\AtToolSupport",
&hkey) )
{
DWORD dwType;
@@ -1245,7 +1245,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\\Apache OpenOffice\\Accessibility\\AtToolSupport",
&hkey) )
{
DWORD dwType;
diff --git a/main/vcl/source/window/toolbox.cxx b/main/vcl/source/window/toolbox.cxx
index 195019c..38572dd 100644
--- a/main/vcl/source/window/toolbox.cxx
+++ b/main/vcl/source/window/toolbox.cxx
@@ -6302,7 +6302,7 @@ void ToolBox::ImplDisableFlatButtons()
HKEY hkey;
if( ERROR_SUCCESS == RegOpenKey(HKEY_CURRENT_USER,
- "Software\\OpenOffice.org\\Accessibility\\AtToolSupport",
+ "Software\\Apache OpenOffice\\Accessibility\\AtToolSupport",
&hkey) )
{
DWORD dwType = 0;
diff --git a/main/xmerge/source/activesync/XMergeFilter.cpp b/main/xmerge/source/activesync/XMergeFilter.cpp
index d1e357f..47a4ec1 100644
--- a/main/xmerge/source/activesync/XMergeFilter.cpp
+++ b/main/xmerge/source/activesync/XMergeFilter.cpp
@@ -38,8 +38,8 @@
const LPTSTR CXMergeFilter::m_pszPSWExportCLSID = _T("{BDD611C3-7BAB-460F-8711-5B9AC9EF6020}");
const LPTSTR CXMergeFilter::m_pszPSWExportExt = _T("sxw");
-const LPTSTR CXMergeFilter::m_pszPSWExportDesc = _T("OpenOffice.org Writer XML Document");
-const LPTSTR CXMergeFilter::m_pszPSWExportShortDesc = _T("OpenOffice.org Writer");
+const LPTSTR CXMergeFilter::m_pszPSWExportDesc = _T("OpenOffice.org XML Writer Document");
+const LPTSTR CXMergeFilter::m_pszPSWExportShortDesc = _T("OpenOffice.org XML Writer");
const LPTSTR CXMergeFilter::m_pszPSWImportCLSID = _T("{CB43F086-838D-4FA4-B5F6-3406B9A57439}");
const LPTSTR CXMergeFilter::m_pszPSWImportExt = _T("psw");
@@ -48,8 +48,8 @@ const LPTSTR CXMergeFilter::m_pszPSWImportShortDesc = _T("Pocket Word");
const LPTSTR CXMergeFilter::m_pszPXLExportCLSID = _T("{C6AB3E74-9F4F-4370-8120-A8A6FABB7A7C}");
const LPTSTR CXMergeFilter::m_pszPXLExportExt = _T("sxc");
-const LPTSTR CXMergeFilter::m_pszPXLExportDesc = _T("OpenOffice.org Calc XML Document");
-const LPTSTR CXMergeFilter::m_pszPXLExportShortDesc = _T("OpenOffice.org Calc");
+const LPTSTR CXMergeFilter::m_pszPXLExportDesc = _T("OpenOffice.org XML Calc Document");
+const LPTSTR CXMergeFilter::m_pszPXLExportShortDesc = _T("OpenOffice.org XML Calc");
const LPTSTR CXMergeFilter::m_pszPXLImportCLSID = _T("{43887C67-4D5D-4127-BAAC-87A288494C7C}");
const LPTSTR CXMergeFilter::m_pszPXLImportExt = _T("pxl");
@@ -237,7 +237,7 @@ STDMETHODIMP CXMergeFilter::NextConvertFile(int nConversion, CFF_CONVERTINFO *pc
}
}
- // Get the StarOffice/OpenOffice class directory
+ // Get the Apache OpenOffice class directory
if (m_szClasspath == NULL)
{
m_szClasspath = GetXMergeClassPath();
diff --git a/main/xmerge/source/aportisdoc/converter.xml b/main/xmerge/source/aportisdoc/converter.xml
index 6f84e8e..ae9ca7b 100644
--- a/main/xmerge/source/aportisdoc/converter.xml
+++ b/main/xmerge/source/aportisdoc/converter.xml
@@ -29,7 +29,7 @@
StarWriter XML to/from AportisDoc conversion
- OpenOffice.org
+ Apache OpenOffice
org.openoffice.xmerge.converter.xml.sxw.aportisdoc.PluginFactoryImpl
diff --git a/main/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/package.html b/main/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/package.html
index 74e86e6..8133364 100644
--- a/main/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/package.html
+++ b/main/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/package.html
@@ -163,7 +163,7 @@ then passed back to the client via the ConvertData
object.
<text:change*> [Not implemented yet]
Change tracking elements are not supported yet on the current
- OpenOffice XML filters, will have to watch out on this. The text
+ OpenOffice.org XML filters, will have to watch out on this. The text
within these elements have to be interpreted properly during the
conversion process.
diff --git a/main/xmerge/source/htmlsoff/converter.xml b/main/xmerge/source/htmlsoff/converter.xml
index e5eb11c..f12a4eb 100644
--- a/main/xmerge/source/htmlsoff/converter.xml
+++ b/main/xmerge/source/htmlsoff/converter.xml
@@ -30,7 +30,7 @@
Converter which performs xslt transformations
- OpenOffice.org
+ Apache OpenOffice
org.openoffice.xmerge.converter.xml.xslt.PluginFactoryImpl
diff --git a/main/xmerge/source/htmlsoff/package.html b/main/xmerge/source/htmlsoff/package.html
index a9c722d..32b76f5 100644
--- a/main/xmerge/source/htmlsoff/package.html
+++ b/main/xmerge/source/htmlsoff/package.html
@@ -38,8 +38,8 @@ Transformation
of one or more XSLT style sheets, which are used in the
DocumentSerializer and DocumentDeserializer, to perform the actual
translations. The location of these stylesheets is extracted from the {@link org.openoffice.xmerge.util.registry.ConverterInfo ConverterInfo} data structure, and are specified using the optional converter-xslt-serialize and converter-xsltdeserialize tags in a plugins converter.xml file. Please refer to the SDK document for more information about how to implement a Plugin Configuration XML File for a specific plugin.
-A sample OpenOffice to Html stylesheet and Html to
-Openffice stylesheet, has been provided as a sample implementation.
+A sample OpenOffice.org XML to Html stylesheet and Html to
+Openffice.org XML stylesheet, has been provided as a sample implementation.
The converter also makes use of an XsltPlugin.properties file, which may be edited by the user to provide MIME-TYPE to file extension mappings. This file is used by the {@link org.openoffice.xmerge.converter.xml.xslt.PluginFactoryImpl getDeviceFileExtension} method.
diff --git a/main/xmerge/source/minicalc/converter.xml b/main/xmerge/source/minicalc/converter.xml
index bf82823..828205c 100644
--- a/main/xmerge/source/minicalc/converter.xml
+++ b/main/xmerge/source/minicalc/converter.xml
@@ -29,7 +29,7 @@
StarCalc XML to/from Minicalc 6.4 conversion
- OpenOffice.org
+ Apache OpenOffice
org.openoffice.xmerge.converter.xml.sxc.minicalc.PluginFactoryImpl
diff --git a/main/xmerge/source/pexcel/converter.xml b/main/xmerge/source/pexcel/converter.xml
index b74db75..dec3352 100644
--- a/main/xmerge/source/pexcel/converter.xml
+++ b/main/xmerge/source/pexcel/converter.xml
@@ -29,7 +29,7 @@
StarCalc XML to/from Pocket Excel 2.0 conversion
- OpenOffice.org
+ Apache OpenOffice
org.openoffice.xmerge.converter.xml.sxc.pexcel.PluginFactoryImpl
diff --git a/main/xmerge/source/pocketword/converter.xml b/main/xmerge/source/pocketword/converter.xml
index 382656c..f2b6077 100644
--- a/main/xmerge/source/pocketword/converter.xml
+++ b/main/xmerge/source/pocketword/converter.xml
@@ -30,10 +30,10 @@
Pocket Word
- OpenOffice Writer XML to/from Pocket Word conversion.
+ OpenOffice.org XML Writer to/from Pocket Word conversion.
- OpenOffice.org
+ Apache OpenOffice
org.openoffice.xmerge.converter.xml.sxw.pocketword.PluginFactoryImpl
diff --git a/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentDeserializerImpl.java b/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentDeserializerImpl.java
index 9288af9..18310e7 100644
--- a/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentDeserializerImpl.java
+++ b/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentDeserializerImpl.java
@@ -53,7 +53,7 @@ import org.w3c.dom.Element;
* org.openoffice.xmerge.converter.xml.sxw.pocketword.PluginFactoryImpl
* PluginFactoryImpl}.
*
- * This converts a Pocket Word file to an OpenOffice Writer XML DOM.
+ * This converts a Pocket Word file to an OpenOffice.org XML Writer DOM.
*
* @author Mark Murnane
* @version 1.1
@@ -94,7 +94,7 @@ public final class DocumentDeserializerImpl
/**
* Convert the data passed into the DocumentDeserializer
- * constructor into the OpenOffice Writer Document
+ * constructor into the OpenOffice.org XML Writer Document
* format.
*
* This method may or may not be thread-safe. It is expected
@@ -120,7 +120,7 @@ public final class DocumentDeserializerImpl
}
catch (Exception e) {
e.printStackTrace();
- throw new ConvertException("Error building OpenOffice Writer DOM: "
+ throw new ConvertException("Error building OpenOffice.org XML Writer DOM: "
+ e.toString());
}
diff --git a/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentSerializerImpl.java b/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentSerializerImpl.java
index c58c83e..50b7cce 100644
--- a/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentSerializerImpl.java
+++ b/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentSerializerImpl.java
@@ -48,7 +48,7 @@ import java.io.IOException;
* org.openoffice.xmerge.converter.xml.sxw.pocketword.PluginFactoryImpl
* PluginFactoryImpl}.
*
- * This converts an OpenOffice Writer XML files to a Pocket Word file<.
+ * This converts an OpenOffice.org XML Writer files to a Pocket Word file<.
*
* @author Mark Murnane
* @version 1.1
diff --git a/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PluginFactoryImpl.java b/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PluginFactoryImpl.java
index bd3f207..43261ae 100644
--- a/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PluginFactoryImpl.java
+++ b/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PluginFactoryImpl.java
@@ -69,7 +69,7 @@ public final class PluginFactoryImpl extends SxwPluginFactory
/**
* The DocumentSerializer
is used to convert
- * from the OpenOffice Writer Document
format
+ * from the OpenOffice.org XML Writer Document
format
* to the Pocket Word Document
format.
*
* The ConvertData
object is passed along to the
@@ -92,7 +92,7 @@ public final class PluginFactoryImpl extends SxwPluginFactory
/**
* The DocumentDeserializer
is used to convert
* from the Pocket Word Document
format to
- * the OpenOffice Writer Document
format.
+ * the OpenOffice.org XML Writer Document
format.
*
* The ConvertData
object is passed along to the
* created DocumentDeserializer
via its constructor.
diff --git a/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordDocument.java b/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordDocument.java
index 3ea645d..5cfb279 100644
--- a/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordDocument.java
+++ b/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordDocument.java
@@ -41,7 +41,7 @@ import java.util.Vector;
* Class representing a Pocket Word Document.
*
* PocketWordDocument
is used to create new Pocket Word documents
- * and to read existing data to allow for conversion to OpenOffice Writer
+ * and to read existing data to allow for conversion to OpenOffice.org XML Writer
* format.
*
* @author Mark Murnane
diff --git a/main/xmerge/source/wordsmith/converter.xml b/main/xmerge/source/wordsmith/converter.xml
index 221399a..0c4b09d 100644
--- a/main/xmerge/source/wordsmith/converter.xml
+++ b/main/xmerge/source/wordsmith/converter.xml
@@ -27,7 +27,7 @@
StarWriter XML to/from WordSmith conversion
- OpenOffice.org
+ Apache OpenOffice
org.openoffice.xmerge.converter.xml.sxw.wordsmith.PluginFactoryImpl
diff --git a/main/xmerge/source/xmerge/build.xml b/main/xmerge/source/xmerge/build.xml
index 806d233..265b26a 100644
--- a/main/xmerge/source/xmerge/build.xml
+++ b/main/xmerge/source/xmerge/build.xml
@@ -64,8 +64,8 @@
includes="**/*.properties" />
-
-
+
+
diff --git a/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java b/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java
index 219a7e6..3278eb9 100644
--- a/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java
+++ b/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java
@@ -369,7 +369,7 @@ public class DOMDocument
/**
* Creates a new DOM Document
containing minimum
- * OpenOffice XML tags.
+ * OpenOffice.org XML tags.
*
* This method uses the subclass
* getOfficeClassAttribute
method to get the
diff --git a/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java b/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java
index dbe5b81..4ccee98 100644
--- a/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java
+++ b/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java
@@ -1022,7 +1022,7 @@ public abstract class OfficeDocument
/**
*
Creates a new DOM Document
containing minimum
- * OpenOffice XML tags.
+ * OpenOffice.org XML tags.
*
* This method uses the subclass
* getOfficeClassAttribute
method to get the
@@ -1061,7 +1061,7 @@ public abstract class OfficeDocument
/**
*
Creates a new DOM Document
containing minimum
- * OpenOffice XML tags.
+ * OpenOffice.org XML tags.
*
* This method uses the subclass
* getOfficeClassAttribute
method to get the
diff --git a/main/xmerge/source/xmerge/java/org/openoffice/xmerge/util/OfficeUtil.java b/main/xmerge/source/xmerge/java/org/openoffice/xmerge/util/OfficeUtil.java
index 3f9737f..33a999c 100644
--- a/main/xmerge/source/xmerge/java/org/openoffice/xmerge/util/OfficeUtil.java
+++ b/main/xmerge/source/xmerge/java/org/openoffice/xmerge/util/OfficeUtil.java
@@ -43,7 +43,7 @@ public class OfficeUtil implements OfficeConstants {
/**
*
Method to replace whitespace character within text with appropriate
- * OpenOffice tags.
+ * OpenOffice.org XML tags.
*
* @param text The text to parse for whitespace.
*
diff --git a/main/xmerge/util/build.xml b/main/xmerge/util/build.xml
index 20f3dc7..7d4ac64 100644
--- a/main/xmerge/util/build.xml
+++ b/main/xmerge/util/build.xml
@@ -53,8 +53,8 @@
nodeprecated="true"
nodeprecatedlist="true"
use="true"
- Doctitle="OpenOffice XMerge API"
- windowtitle="OpenOffice XMerge API"
+ Doctitle="Apache OpenOffice XMerge API"
+ windowtitle="Apache OpenOffice XMerge API"
classpathref="classpath">
diff --git a/main/xmerge/util/xmerge.mf b/main/xmerge/util/xmerge.mf
index 89d942f..9699a69 100644
--- a/main/xmerge/util/xmerge.mf
+++ b/main/xmerge/util/xmerge.mf
@@ -1,8 +1,8 @@
Manifest-Version: 1.0
Main-Class: org.openoffice.xmerge.test.Driver
Class-Path: xml-apis.jar xercesImpl.jar serializer.jar
-Specification-Title: OpenOffice XMerge Framework
-Specification-Vendor: OpenOffice.org
+Specification-Title: Apache OpenOffice XMerge Framework
+Specification-Vendor: Apache OpenOffice
Specification-Version: 0.6.0
Implementation-Version: #IMPL-VERSION#
diff --git a/main/xmlsecurity/source/dialogs/digitalsignaturesdialog.src b/main/xmlsecurity/source/dialogs/digitalsignaturesdialog.src
index 7ffb882..88af874 100644
--- a/main/xmlsecurity/source/dialogs/digitalsignaturesdialog.src
+++ b/main/xmlsecurity/source/dialogs/digitalsignaturesdialog.src
@@ -200,7 +200,7 @@ ErrorBox RID_XMLSECDLG_OLD_ODF_FORMAT
Buttons = WB_OK ;
DefButton = WB_DEF_OK ;
Message [ en-US ] =
- "This document contains signatures in ODF 1.1 (OpenOffice.org 2.x) format. "
+ "This document contains signatures in ODF 1.1 format. "
"Signing documents in %PRODUCTNAME %PRODUCTVERSION requires ODF 1.2 format version. "
"Thus no signatures can be added or removed to this document.\n\n"
"Save document in ODF 1.2 format and add all desired signatures again.";
diff --git a/main/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx b/main/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
index c7f9131..f449aba 100644
--- a/main/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
+++ b/main/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
@@ -87,7 +87,7 @@ using ::rtl::OString;
#define IMPLEMENTATION_NAME "com.sun.star.xml.security.bridge.xmlsec.NSSInitializer_NssImpl"
-#define ROOT_CERTS "Root Certs for OpenOffice.org"
+#define ROOT_CERTS "Root Certs for Apache OpenOffice"
extern "C" void nsscrypto_finalize();