[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 4 commits - cli_ure/source cppuhelper/source cui/source desktop/source instsetoo_native/inc_openoffice instsetoo_native/inc_sdkoo instsetoo_native/util odk/cfgWin.js odk/configure.pl odk/docs odk/setsdkenv_unix.sh.in odk/setsdkenv_windows.template odk/source odk/util officecfg/registry scp2/inc scp2/source sc/source sdext/source setup_native/source shell/inc shell/source solenv/bin solenv/inc svl/source svtools/source svx/source swext/mediawiki sysui/desktop unotools/inc unotools/source vcl/source
Oliver-Rainer Wittmann
orw at apache.org
Thu Feb 21 17:10:30 PST 2013
cli_ure/source/native/native_bootstrap.cxx | 8
cppuhelper/source/findsofficepath.c | 2
cui/source/dialogs/about.src | 4
desktop/source/app/app.cxx | 11
instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt | 8
instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt | 8
instsetoo_native/util/openoffice.lst | 16 -
odk/cfgWin.js | 12 -
odk/configure.pl | 10
odk/docs/install.html | 4
odk/setsdkenv_unix.sh.in | 6
odk/setsdkenv_windows.template | 8
odk/source/com/sun/star/lib/loader/InstallationFinder.java | 2
odk/source/unoapploader/win/unoapploader.c | 2
odk/util/makefile.pmk | 4
officecfg/registry/data/org/openoffice/Setup.xcu | 3
officecfg/registry/schema/org/openoffice/Setup.xcs | 23 +
sc/source/ui/vba/vbawindow.cxx | 2
scp2/inc/macros.inc | 26 +-
scp2/source/ooo/registryitem_ooo.scp | 18 -
scp2/source/ooo/ure.scp | 2
scp2/source/ooo/ure_standalone.scp | 4
scp2/source/quickstart/registryitem_quickstart.scp | 2
scp2/source/winexplorerext/registryitem_winexplorerext.scp | 4
sdext/source/minimizer/description.xml | 4
sdext/source/pdfimport/config/description.xml | 4
sdext/source/presenter/description.xml | 4
setup_native/source/opensolaris/bundledextensions/README | 6
setup_native/source/opensolaris/bundledextensions/svc-ooo_bundled_extensions | 8
setup_native/source/packinfo/shellscripts_brand.txt | 6
setup_native/source/packinfo/shellscripts_core01.txt | 14 -
setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx | 2
setup_native/source/win32/customactions/reg4msdoc/registrar.cxx | 4
setup_native/source/win32/customactions/relnotes/relnotes.cxx | 2
setup_native/source/win32/customactions/shellextensions/shellextensions.cxx | 16 -
shell/inc/internal/config.hxx | 8
shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx | 2
shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx | 10
shell/source/win32/shlxthandler/res/shlxthdl.manifest | 2
shell/source/win32/sysmail/sysmailclient.cxx | 2
solenv/bin/modules/installer/download.pm | 2
solenv/bin/modules/installer/epmfile.pm | 5
solenv/bin/modules/installer/simplepackage.pm | 2
solenv/bin/modules/installer/windows/property.pm | 4
solenv/bin/modules/installer/ziplist.pm | 2
solenv/inc/lldb4aoo.py | 116 ++++++----
svl/source/misc/mediatyp.src | 16 -
svtools/source/misc/imagemgr.src | 22 -
svx/source/dialog/sendreportw32.cxx | 20 -
swext/mediawiki/src/description.xml | 4
sysui/desktop/debian/control | 6
sysui/desktop/freedesktop/freedesktop-menus.spec | 2
sysui/desktop/mandriva/mandriva-menus.spec | 2
sysui/desktop/productversion.mk | 14 -
sysui/desktop/redhat/redhat-menus.spec | 2
sysui/desktop/share/brand.pl | 2
sysui/desktop/share/create_mime_xml.pl | 2
sysui/desktop/share/translate.pl | 2
sysui/desktop/suse/suse-menus.spec | 2
unotools/inc/unotools/configmgr.hxx | 3
unotools/source/config/configmgr.cxx | 11
vcl/source/app/settings.cxx | 4
vcl/source/window/toolbox.cxx | 2
63 files changed, 293 insertions(+), 237 deletions(-)
New commits:
commit 61610544f99b00aa7e09b8c6681d1eef590b8e10
Author: Oliver-Rainer Wittmann <orw at apache.org>
Date: Thu Feb 21 15:37:14 2013 +0000
#121388# - adapt renaming: "Apache OpenOffice" --> "OpenOffice"
diff --git a/cli_ure/source/native/native_bootstrap.cxx b/cli_ure/source/native/native_bootstrap.cxx
index ef01371..678cb72 100644
--- a/cli_ure/source/native/native_bootstrap.cxx
+++ b/cli_ure/source/native/native_bootstrap.cxx
@@ -54,7 +54,7 @@ namespace cli_ure {
// INSTALL_PATH value needs to correspond to the Windows registry subkey
// in main\scp2\source\ooo\registryitem_ooo.scp
-#define INSTALL_PATH L"Software\\Apache OpenOffice\\UNO\\InstallPath"
+#define INSTALL_PATH L"Software\\OpenOffice\\UNO\\InstallPath"
#define BASIS_LINK L"\\basis-link"
#define URE_LINK L"\\ure-link"
#define URE_BIN L"\\bin"
@@ -130,7 +130,7 @@ void oneDirUp(LPTSTR io_path)
for example c:/openoffice.org 3/program
This path is either obtained from the environment variable UNO_PATH
or the registry item
- "Software\\Apache OpenOffice\\UNO\\InstallPath"
+ "Software\\OpenOffice\\UNO\\InstallPath"
either in HKEY_CURRENT_USER or HKEY_LOCAL_MACHINE
The return value must be freed with delete[]
*/
@@ -332,8 +332,8 @@ namespace util
Bootstrapping requires the existence of many libraries which are contained
in an URE installation. To find and load these libraries the Windows
- registry keys HKEY_CURRENT_USER\Software\Apache OpenOffice\Layer\URE\1
- and HKEY_LOCAL_MACHINE\Software\Apache OpenOffice\Layer\URE\1 are examined.
+ registry keys HKEY_CURRENT_USER\Software\OpenOffice\Layer\URE\1
+ and HKEY_LOCAL_MACHINE\Software\OpenOffice\Layer\URE\1 are examined.
These contain a named value UREINSTALLLOCATION which holds a path to the URE
installation folder.
*/
diff --git a/cppuhelper/source/findsofficepath.c b/cppuhelper/source/findsofficepath.c
index 8daa795..f3f7b58 100644
--- a/cppuhelper/source/findsofficepath.c
+++ b/cppuhelper/source/findsofficepath.c
@@ -86,7 +86,7 @@ static char* getPathFromRegistryKey( HKEY hroot, const char* subKeyName )
*/
static char* platformSpecific()
{
- const char* SUBKEYNAME = "Software\\Apache OpenOffice\\UNO\\InstallPath";
+ const char* SUBKEYNAME = "Software\\OpenOffice\\UNO\\InstallPath";
char* path = NULL;
diff --git a/cui/source/dialogs/about.src b/cui/source/dialogs/about.src
index 01b6f92..f70fd4a 100644
--- a/cui/source/dialogs/about.src
+++ b/cui/source/dialogs/about.src
@@ -33,7 +33,7 @@ ModalDialog RID_DEFAULTABOUT
Moveable = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 200 , 150 ) ;
- Text [ en-US ] = "About %PRODUCTNAME" ;
+ Text [ en-US ] = "About %FULLPRODUCTNAME" ;
OKButton RID_CUI_ABOUT_BTN_OK
{
DefButton = TRUE ;
@@ -48,7 +48,7 @@ ModalDialog RID_DEFAULTABOUT
FixedText RID_CUI_ABOUT_FTXT_VERSION
{
WordBreak = TRUE ;
- Text = "%PRODUCTNAME %ABOUTBOXPRODUCTVERSION %PRODUCTEXTENSION" ;
+ Text = "%FULLPRODUCTNAME %ABOUTBOXPRODUCTVERSION %PRODUCTEXTENSION" ;
};
MultiLineEdit RID_CUI_ABOUT_FTXT_BUILDDATA
{
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 639b847..3128be3 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -409,6 +409,8 @@ namespace
{
struct BrandName
: public rtl::Static< String, BrandName > {};
+ struct FullProductname
+ : public rtl::Static< String, FullProductname > {};
struct Version
: public rtl::Static< String, Version > {};
struct AboutBoxVersion
@@ -430,9 +432,11 @@ void ReplaceStringHookProc( UniString& rStr )
static int nAll = 0, nPro = 0;
nAll++;
- if ( rStr.SearchAscii( "%PRODUCT" ) != STRING_NOTFOUND )
+ if ( ( rStr.SearchAscii( "%PRODUCT" ) != STRING_NOTFOUND ) ||
+ ( rStr.SearchAscii( "%FULLPRODUCT" ) != STRING_NOTFOUND ) )
{
String &rBrandName = BrandName::get();
+ String& rFullProductname = FullProductname::get();
String &rVersion = Version::get();
String &rAboutBoxVersion = AboutBoxVersion::get();
String &rExtension = Extension::get();
@@ -446,6 +450,10 @@ void ReplaceStringHookProc( UniString& rStr )
aRet >>= aTmp;
rBrandName = aTmp;
+ aRet = ::utl::ConfigManager::GetDirectConfigProperty( ::utl::ConfigManager::FULLPRODUCTNAME );
+ aRet >>= aTmp;
+ rFullProductname = aTmp;
+
aRet = ::utl::ConfigManager::GetDirectConfigProperty( ::utl::ConfigManager::PRODUCTXMLFILEFORMATNAME );
aRet >>= aTmp;
rXMLFileFormatName = aTmp;
@@ -472,6 +480,7 @@ void ReplaceStringHookProc( UniString& rStr )
nPro++;
rStr.SearchAndReplaceAllAscii( "%PRODUCTNAME", rBrandName );
+ rStr.SearchAndReplaceAllAscii( "%FULLPRODUCTNAME", rFullProductname );
rStr.SearchAndReplaceAllAscii( "%PRODUCTVERSION", rVersion );
rStr.SearchAndReplaceAllAscii( "%ABOUTBOXPRODUCTVERSION", rAboutBoxVersion );
rStr.SearchAndReplaceAllAscii( "%PRODUCTEXTENSION", rExtension );
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
index 25a4ad7..f746735 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
@@ -1,7 +1,7 @@
Signature_ Root Key Name Type
s72 i2 s255 S255 I2
RegLocator Signature_
-installuser 1 Software\Apache OpenOffice\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2
-installuser_ 1 Software\Apache OpenOffice\Layers_\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2
-installmachine 2 Software\Apache OpenOffice\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2
-installmachine_ 2 Software\Apache OpenOffice\Layers_\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2
+installuser 1 Software\OpenOffice\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2
+installuser_ 1 Software\OpenOffice\Layers_\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2
+installmachine 2 Software\OpenOffice\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2
+installmachine_ 2 Software\OpenOffice\Layers_\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt
index 1b44718..42bcc93 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt
@@ -1,7 +1,7 @@
Signature_ Root Key Name Type
s72 i2 s255 S255 I2
RegLocator Signature_
-basisinstalluser 1 Software\Apache OpenOffice\Layers\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2
-basisinstalluser_ 1 Software\Apache OpenOffice\Layers_\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2
-basisinstallmachine 2 Software\Apache OpenOffice\Layers\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2
-basisinstallmachine_ 2 Software\Apache OpenOffice\Layers_\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2
+basisinstalluser 1 Software\OpenOffice\Layers\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2
+basisinstalluser_ 1 Software\OpenOffice\Layers_\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2
+basisinstallmachine 2 Software\OpenOffice\Layers\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2
+basisinstallmachine_ 2 Software\OpenOffice\Layers_\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index 4f0d406..3c3b82a 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -9,8 +9,8 @@ Globals
OOOPACKAGEVERSION 4.0.0
UREPACKAGEVERSION 4.0.0
URELAYERVERSION 1
- BASISROOTNAME ApacheOpenOffice
- UNIXBASISROOTNAME apacheopenoffice
+ BASISROOTNAME OpenOffice
+ UNIXBASISROOTNAME openoffice
HIDELICENSEDIALOG 1
PACKAGEPREFIX
BASISPACKAGEPREFIX aoobasis
@@ -58,7 +58,8 @@ Apache_OpenOffice
{
variables
{
- PRODUCTNAME Apache OpenOffice
+ FULLPRODUCTNAME Apache OpenOffice
+ PRODUCTNAME OpenOffice
PRODUCTVERSION 4.0.0
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
@@ -117,7 +118,8 @@ Apache_OpenOffice_wJRE
{
variables
{
- PRODUCTNAME Apache OpenOffice
+ FULLPRODUCTNAME Apache OpenOffice
+ PRODUCTNAME OpenOffice
PRODUCTVERSION 4.0.0
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
@@ -176,6 +178,7 @@ Apache_OpenOffice_Dev
{
variables
{
+ FULLPRODUCTNAME AOO-Developer-Build
PRODUCTNAME AOO-Developer-Build
PRODUCTVERSION 4.0.0
PRODUCTEXTENSION
@@ -244,6 +247,7 @@ URE
downloadname URE_{productversion}_{os}_install_{languages}
variables
{
+ FULLPRODUCTNAME URE
PRODUCTNAME URE
PRODUCTVERSION 4.0.0
PACKAGEVERSION 4.0
@@ -286,7 +290,8 @@ Apache_OpenOffice_SDK
downloadname Apache_OpenOffice-SDK_{packageversion}_{os}_install_{languages}
variables
{
- PRODUCTNAME Apache OpenOffice
+ FULLPRODUCTNAME Apache OpenOffice
+ PRODUCTNAME OpenOffice
PRODUCTVERSION 4.0.0
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
@@ -333,6 +338,7 @@ Apache_OpenOffice_Dev_SDK
downloadname Apache_OpenOffice-Dev-SDK_{packageversion}_{os}_install_{languages}
variables
{
+ FULLPRODUCTNAME AOO-Developer-Build
PRODUCTNAME AOO-Developer-Build
PRODUCTVERSION 4.0.0
PRODUCTEXTENSION
diff --git a/odk/cfgWin.js b/odk/cfgWin.js
index 8162b26..7bf53ca 100644
--- a/odk/cfgWin.js
+++ b/odk/cfgWin.js
@@ -22,8 +22,8 @@
// examples of the Office Development Kit. The script duplicates the template
// script and inserts the variables into the copied script.
// The Script was developed for the operating systems Microsoft Windows.
-var regKeyOfficeCurrentUser = "HKEY_CURRENT_USER\\Software\\Apache OpenOffice\\UNO\\InstallPath\\";
-var regKeyOfficeLocaleMachine = "HKEY_LOCAL_MACHINE\\Software\\Apache OpenOffice\\UNO\\InstallPath\\";
+var regKeyOfficeCurrentUser = "HKEY_CURRENT_USER\\Software\\OpenOffice\\UNO\\InstallPath\\";
+var regKeyOfficeLocaleMachine = "HKEY_LOCAL_MACHINE\\Software\\OpenOffice\\UNO\\InstallPath\\";
var regKeyDotNetInstallRoot = "HKEY_LOCAL_MACHINE\\Software\\Microsoft\\.NETFramework\\InstallRoot";
var regKeyDotNet1_1 = "HKLM\\Software\\Microsoft\\.NETFramework\\policy\\v1.1\\4322";
var sDirDotNet1_1 = "v1.1.4322";
@@ -923,18 +923,18 @@ function writeBatFile(fdir, file)
"set OO_SDK_NAME=" + oo_sdk_name +
"\n\n" +
"REM Installation directory of the Software Development Kit.\n" +
- "REM Example: set OO_SDK_HOME=C:\\Program Files\\Apache OpenOffice\\Basic 4.0\\sdk\n" +
+ "REM Example: set OO_SDK_HOME=C:\\Program Files\\OpenOffice\\Basic 4.0\\sdk\n" +
"set OO_SDK_HOME=" + oo_sdk_home +
"\n\n" +
"REM Office installation directory.\n" +
- "REM Example: set OFFICE_HOME=C:\\Program Files\\Apache OpenOffice 4\n" +
+ "REM Example: set OFFICE_HOME=C:\\Program Files\\OpenOffice 4\n" +
"set OFFICE_HOME=" + office_home +
"\n\n" +
- "REM Example: set OFFICE_HOME=C:\\Program Files\\Apache OpenOffice\\Basis 4.0\n" +
+ "REM Example: set OFFICE_HOME=C:\\Program Files\\OpenOffice\\Basis 4.0\n" +
"set OFFICE_BASE_HOME=" + office_base_home +
"\n\n" +
"REM URE installation directory.\n" +
- "REM Example: set OO_SDK_URE_HOME=C:\\Program Files\\Apache OpenOffice\\URE\n" +
+ "REM Example: set OO_SDK_URE_HOME=C:\\Program Files\\OpenOffice\\URE\n" +
"set OO_SDK_URE_HOME=" + oo_sdk_ure_home +
"\n\n" +
"REM Directory of the make command.\n" +
diff --git a/odk/configure.pl b/odk/configure.pl
index 27cfb66..ac88c00 100755
--- a/odk/configure.pl
+++ b/odk/configure.pl
@@ -235,7 +235,7 @@ if ( $main::OFFICE_OR_URE eq "Office" )
else
{
# prepare URE path
- $main::OO_SDK_URE_HOME_SUGGESTION = "/opt/apacheopenoffice/ure";
+ $main::OO_SDK_URE_HOME_SUGGESTION = "/opt/openoffice/ure";
$main::OO_SDK_URE_HOME_SUGGESTION = "" unless
-e "$main::OO_SDK_URE_HOME_SUGGESTION/bin/uno";
for (;;)
@@ -711,8 +711,8 @@ sub searchprog
sub searchMacOffice
{
- if (-d "/Applications/Apache OpenOffice.app" ) {
- return "/Applications/Apache OpenOffice.app"
+ if (-d "/Applications/OpenOffice.app" ) {
+ return "/Applications/OpenOffice.app"
}
if (-d "/Applications/OpenOffice.org.app" ) {
return "/Applications/OpenOffice.org.app"
@@ -732,9 +732,9 @@ sub searchMacOffice
sub searchoffice
{
- my $offset = rindex($main::sdkpath, "/apacheopenoffice");
+ my $offset = rindex($main::sdkpath, "/openoffice");
my $tmpOffice = substr($main::sdkpath, 0, $offset);
- my $officepath = "$tmpOffice/apacheopenoffice$main::OO_MAJORVERSION";
+ my $officepath = "$tmpOffice/openoffice$main::OO_MAJORVERSION";
# if ( $main::OO_MINORVERSION > 0) {
# $officepath = "$officepath$main::OO_MINORVERSION";
diff --git a/odk/docs/install.html b/odk/docs/install.html
index d02f635..146d091 100644
--- a/odk/docs/install.html
+++ b/odk/docs/install.html
@@ -188,7 +188,7 @@
<tr valign="top">
<td class="cell20"><b>OFFICE_HOME</b></td>
<td class="cell80">Path to an existing Apache OpenOffice
- base installation, e.g. "/opt/apacheopenoffice3". Be sure
+ base installation, e.g. "/opt/openoffice3". Be sure
that it is not a user installation only. Exactly one of OFFICE_HOME
and OO_SDK_URE_HOME must be set. The other should be either unset or
set to an empty value.</td>
@@ -205,7 +205,7 @@
<tr>
<td class="cell20"><b>OO_SDK_URE_HOME</b></td>
<td class="cell80">Path to an existing UNO Runtime Environment
- installation, e.g. "/opt/apacheopenoffice/ure". Exactly one of
+ installation, e.g. "/opt/openoffice/ure". Exactly one of
OFFICE_HOME and OO_SDK_URE_HOME must be set. The other should be
either unset or set to an empty value.</td>
</tr>
diff --git a/odk/setsdkenv_unix.sh.in b/odk/setsdkenv_unix.sh.in
index 265355f..018befe 100644
--- a/odk/setsdkenv_unix.sh.in
+++ b/odk/setsdkenv_unix.sh.in
@@ -29,16 +29,16 @@ OO_SDK_NAME=@OO_SDK_NAME@
export OO_SDK_NAME
# Installation directory of the Software Development Kit.
-# Example: OO_SDK_HOME=/opt/apacheopenoffice/basis4.0/sdk
+# Example: OO_SDK_HOME=/opt/openoffice/basis4.0/sdk
OO_SDK_HOME='@OO_SDK_HOME@'
# Office installation directory.
-# Example: OFFICE_HOME=/opt/apacheopenoffice4
+# Example: OFFICE_HOME=/opt/openoffice4
OFFICE_HOME='@OFFICE_HOME@'
OFFICE_BASE_HOME='@OFFICE_BASE_HOME@'
# URE installation directory.
-# Example: OO_SDK_URE_HOME=/opt/apacheopenoffice/ure
+# Example: OO_SDK_URE_HOME=/opt/openoffice/ure
OO_SDK_URE_HOME='@OO_SDK_URE_HOME@'
export OO_SDK_URE_HOME
diff --git a/odk/setsdkenv_windows.template b/odk/setsdkenv_windows.template
index 00647da..b28ae0a 100644
--- a/odk/setsdkenv_windows.template
+++ b/odk/setsdkenv_windows.template
@@ -27,18 +27,18 @@ REM Example: set OO_SDK_NAME=apacheopenoffice4.0_sdk
set OO_SDK_NAME=apacheopenoffice4.0_sdk
REM Installation directory of the Software Development Kit.
-REM Example: set OO_SDK_HOME=C:\Program Files\Apache OpenOffice\Basic 4.0\sdk
+REM Example: set OO_SDK_HOME=C:\Program Files\OpenOffice\Basic 4.0\sdk
set OO_SDK_HOME=
REM Office installation directory.
-REM Example: set OFFICE_HOME=C:\Program Files\Apache OpenOffice 4
+REM Example: set OFFICE_HOME=C:\Program Files\OpenOffice 4
set OFFICE_HOME=
-REM Example: set OFFICE_HOME=C:\Program Files\Apache OpenOffice\Basis 4.0
+REM Example: set OFFICE_HOME=C:\Program Files\OpenOffice\Basis 4.0
set OFFICE_BASE_HOME=
REM URE installation directory.
-REM Example: set OO_SDK_URE_HOME=C:\Program Files\Apache OpenOffice\URE
+REM Example: set OO_SDK_URE_HOME=C:\Program Files\OpenOffice\URE
set OO_SDK_URE_HOME=
REM Directory of the make command.
diff --git a/odk/source/com/sun/star/lib/loader/InstallationFinder.java b/odk/source/com/sun/star/lib/loader/InstallationFinder.java
index 6dbdcb1..32e7329 100644
--- a/odk/source/com/sun/star/lib/loader/InstallationFinder.java
+++ b/odk/source/com/sun/star/lib/loader/InstallationFinder.java
@@ -188,7 +188,7 @@ final class InstallationFinder {
*/
private static String getPathFromWindowsRegistry() {
- final String SUBKEYNAME = "Software\\Apache OpenOffice\\UNO\\InstallPath";
+ final String SUBKEYNAME = "Software\\OpenOffice\\UNO\\InstallPath";
String path = null;
diff --git a/odk/source/unoapploader/win/unoapploader.c b/odk/source/unoapploader/win/unoapploader.c
index 83d0a75..2f6605c 100644
--- a/odk/source/unoapploader/win/unoapploader.c
+++ b/odk/source/unoapploader/win/unoapploader.c
@@ -61,7 +61,7 @@ void closeErrorFile();
* environment variable to the program directory of the UNO installation.
* If no installation is specified by the user, the default installation on
* the system will be taken. The default installation is read from the
- * default value of the key "Software\Apache OpenOffice\UNO\InstallPath" from the
+ * default value of the key "Software\OpenOffice\UNO\InstallPath" from the
* root key HKEY_CURRENT_USER in the Windows Registry. If this key is missing,
* the key is read from the root key HKEY_LOCAL_MACHINE.</p>
*/
diff --git a/odk/util/makefile.pmk b/odk/util/makefile.pmk
index f5edc7f..3e2cdd9 100644
--- a/odk/util/makefile.pmk
+++ b/odk/util/makefile.pmk
@@ -23,8 +23,8 @@
# used for sdk common files
PRODUCT_RELEASE=4.0
-OFFICENAME=Apache OpenOffice
-SDKDIRNAME=apacheopenoffice$(PRODUCT_RELEASE)_sdk
+OFFICENAME=OpenOffice
+SDKDIRNAME=openoffice$(PRODUCT_RELEASE)_sdk
OFFICEPRODUCTNAME=$(OFFICENAME) $(PRODUCT_RELEASE)
TITLE=$(OFFICENAME) $(PRODUCT_RELEASE) SDK
IDLDOCREFNAME="$(OFFICENAME) $(PRODUCT_RELEASE) API"
diff --git a/officecfg/registry/data/org/openoffice/Setup.xcu b/officecfg/registry/data/org/openoffice/Setup.xcu
index d1231de..3b934b5 100644
--- a/officecfg/registry/data/org/openoffice/Setup.xcu
+++ b/officecfg/registry/data/org/openoffice/Setup.xcu
@@ -27,6 +27,9 @@
<prop oor:name="ooName" install:module="brand">
<value >${PRODUCTNAME}</value>
</prop>
+ <prop oor:name="ooFullname" install:module="brand">
+ <value >${FULLPRODUCTNAME}</value>
+ </prop>
<prop oor:name="ooSetupVersion" install:module="brand">
<value >${PRODUCTVERSION}</value>
</prop>
diff --git a/officecfg/registry/schema/org/openoffice/Setup.xcs b/officecfg/registry/schema/org/openoffice/Setup.xcs
index 703446f..d99873a 100644
--- a/officecfg/registry/schema/org/openoffice/Setup.xcs
+++ b/officecfg/registry/schema/org/openoffice/Setup.xcs
@@ -228,14 +228,21 @@
<desc>Contains common product and version information</desc>
</info>
<!--The default must be written by the setup.-->
- <prop oor:name="ooName" oor:type="xs:string">
- <info>
- <desc>Specifies the name of a product.</desc>
- </info>
- <value/>
- <!-- JB: Empty default inserted into empty property node. Remove if NIL was intended -->
- </prop>
- <prop oor:name="ooXMLFileFormatVersion" oor:type="xs:string">
+ <prop oor:name="ooName" oor:type="xs:string">
+ <info>
+ <desc>Specifies the name of a product.</desc>
+ </info>
+ <value/>
+ <!-- JB: Empty default inserted into empty property node. Remove if NIL was intended -->
+ </prop>
+ <prop oor:name="ooFullname" oor:type="xs:string">
+ <info>
+ <author>orw</author>
+ <desc>Specifies the full name of a product.</desc>
+ </info>
+ <value/>
+ </prop>
+ <prop oor:name="ooXMLFileFormatVersion" oor:type="xs:string">
<info>
<desc>Specifies the version of the SO 6/7 or OOo 1.0 xml file formats.</desc>
</info>
diff --git a/sc/source/ui/vba/vbawindow.cxx b/sc/source/ui/vba/vbawindow.cxx
index 9531c6e..117add5 100644
--- a/sc/source/ui/vba/vbawindow.cxx
+++ b/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(" - Apache OpenOffice Calc" ) );
+ static rtl::OUString sCrud(RTL_CONSTASCII_USTRINGPARAM(" - OpenOffice Calc" ) );
static sal_Int32 nCrudLen = sCrud.getLength();
rtl::OUString sTitle;
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index ba592df..366e8b8 100644
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -386,7 +386,7 @@ End
ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
ModuleID = modid; \
Subkey = STRING(CONCAT3(.,key,\OpenWithProgIDs)); \
- Name = STRING(CONCAT2(Apache OpenOffice.,name)); \
+ Name = STRING(CONCAT2(OpenOffice.,name)); \
Value = " "; \
End
@@ -395,7 +395,7 @@ End
ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
ModuleID = modid; \
Subkey = STRING(CONCAT3(.,key,\OpenWithProgIDs)); \
- Name = STRING(CONCAT2(Apache OpenOffice.,name)); \
+ Name = STRING(CONCAT2(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(Apache OpenOffice.,name)); \
+ Value = STRING(CONCAT2(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(Apache OpenOffice.,name)); \
+ Subkey = STRING(CONCAT2(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(Apache OpenOffice.,name,\DefaultIcon)); \
+ Subkey = STRING(CONCAT3(OpenOffice.,name,\DefaultIcon)); \
Value = "<progpath>\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(Apache OpenOffice.,name,\shell)); \
+ Subkey = STRING(CONCAT3(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(Apache OpenOffice.,name,\shell\new)); \
+ Subkey = STRING(CONCAT3(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(Apache OpenOffice.,name,\shell\new\command)); \
+ Subkey = STRING(CONCAT3(OpenOffice.,name,\shell\new\command)); \
Value = "\"<progpath>\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(Apache OpenOffice.,name,\shell\open\command)); \
+ Subkey = STRING(CONCAT3(OpenOffice.,name,\shell\open\command)); \
Value = "\"<progpath>\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(Apache OpenOffice.,name,\shell\print\command)); \
+ Subkey = STRING(CONCAT3(OpenOffice.,name,\shell\print\command)); \
Value = "\"<progpath>\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(Apache OpenOffice.,name,\shell\printto\command)); \
+ Subkey = STRING(CONCAT3(OpenOffice.,name,\shell\printto\command)); \
Value = "\"<progpath>\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(Apache OpenOffice.,name)); \
+ Value = STRING(CONCAT2(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(Apache OpenOffice.,name)); \
+ Value = STRING(CONCAT2(OpenOffice.,name)); \
Styles = (); \
End
diff --git a/scp2/source/ooo/registryitem_ooo.scp b/scp2/source/ooo/registryitem_ooo.scp
index 87eba26..1be7727 100644
--- a/scp2/source/ooo/registryitem_ooo.scp
+++ b/scp2/source/ooo/registryitem_ooo.scp
@@ -247,7 +247,7 @@ End
RegistryItem gid_Regitem_Software_Openoffice_Productname_Productversion_Path
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\Apache OpenOffice\%PRODUCTNAME\%PRODUCTVERSION";
+ Subkey = "Software\OpenOffice\%PRODUCTNAME\%PRODUCTVERSION";
ModuleID = gid_Module_Root;
Name = "Path";
Value = "<progpath>\program\soffice.exe";
@@ -273,7 +273,7 @@ End
RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Install
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\Apache OpenOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
+ Subkey = "Software\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\Apache OpenOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
+ Subkey = "Software\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\Apache OpenOffice\${REGISTRYLAYERNAME}\Basis\%OOOBASEVERSION";
+ Subkey = "Software\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\Apache OpenOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
+ Subkey = "Software\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\Apache OpenOffice\${REGISTRYLAYERNAME}\URE\%URELAYERVERSION";
+ Subkey = "Software\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\Apache OpenOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
+ Subkey = "Software\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\Apache OpenOffice\UNO\InstallPath";
+ Subkey = "Software\OpenOffice\UNO\InstallPath";
ModuleID = gid_Module_Root;
Value = "<progpath>\program";
End
RegistryItem gid_Regitem_Software_Openofficeorg_Uno_Installpath_Branded
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\Apache OpenOffice\UNO\InstallPath";
+ Subkey = "Software\OpenOffice\UNO\InstallPath";
ModuleID = gid_Module_Root;
Name = "%PRODUCTNAME %PRODUCTVERSION";
Value = "<progpath>\program";
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 3aac69b..44d92bf 100644
--- a/scp2/source/ooo/ure.scp
+++ b/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\Apache OpenOffice\%PRODUCTNAME";
+ Subkey = "Software\OpenOffice\%PRODUCTNAME";
Name = "Path";
Value = "[INSTALLLOCATION]";
End
diff --git a/scp2/source/ooo/ure_standalone.scp b/scp2/source/ooo/ure_standalone.scp
index 2c65ada..f6bc02f 100644
--- a/scp2/source/ooo/ure_standalone.scp
+++ b/scp2/source/ooo/ure_standalone.scp
@@ -38,9 +38,9 @@ End
Directory gid_Dir_Ooo_Openofficeorg
ParentID = PREDEFINED_PROGDIR;
#ifdef WNT
- HostName = "Apache OpenOffice";
+ HostName = "OpenOffice";
#else
- HostName = "apacheopenoffice";
+ HostName = "openoffice";
#endif
Styles = (ISINSTALLLOCATION);
End
diff --git a/scp2/source/quickstart/registryitem_quickstart.scp b/scp2/source/quickstart/registryitem_quickstart.scp
index 804094b..a30297b 100644
--- a/scp2/source/quickstart/registryitem_quickstart.scp
+++ b/scp2/source/quickstart/registryitem_quickstart.scp
@@ -25,7 +25,7 @@
RegistryItem gid_Regitem_Software_OpenOffice_Quickstarterinstalled
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\Apache OpenOffice";
+ Subkey = "Software\OpenOffice";
ModuleID = gid_Module_Optional_Quickstart;
Name = "QuickStarterInstalled";
Value = "1";
diff --git a/scp2/source/winexplorerext/registryitem_winexplorerext.scp b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
index b1938c8..b5ac0d4 100644
--- a/scp2/source/winexplorerext/registryitem_winexplorerext.scp
+++ b/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 = "Apache OpenOffice Column Handler";
- Val64 = "Apache OpenOffice Column Handler";
+ Value = "OpenOffice Column Handler";
+ Val64 = "OpenOffice Column Handler";
End
RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer32
diff --git a/sdext/source/minimizer/description.xml b/sdext/source/minimizer/description.xml
index c539c63..05253a9 100644
--- a/sdext/source/minimizer/description.xml
+++ b/sdext/source/minimizer/description.xml
@@ -28,8 +28,8 @@
<identifier value="UPDATED_IDENTIFIER"/>
<dependencies>
- <OpenOffice.org-minimal-version value="4.0" dep:name="Apache OpenOffice"/>
- <OpenOffice.org-maximal-version value="4.9" dep:name="Apache OpenOffice"/>
+ <OpenOffice.org-minimal-version value="4.0" dep:name="OpenOffice"/>
+ <OpenOffice.org-maximal-version value="4.9" dep:name="OpenOffice"/>
</dependencies>
<registration>
diff --git a/sdext/source/pdfimport/config/description.xml b/sdext/source/pdfimport/config/description.xml
index 9a5cc87..d7cfa14 100644
--- a/sdext/source/pdfimport/config/description.xml
+++ b/sdext/source/pdfimport/config/description.xml
@@ -27,8 +27,8 @@
<identifier value="UPDATED_IDENTIFIER" />
<dependencies>
- <OpenOffice.org-minimal-version value="4.0" dep:name="Apache OpenOffice"/>
- <OpenOffice.org-maximal-version value="4.9" dep:name="Apache OpenOffice"/>
+ <OpenOffice.org-minimal-version value="4.0" dep:name="OpenOffice"/>
+ <OpenOffice.org-maximal-version value="4.9" dep:name="OpenOffice"/>
</dependencies>
<registration>
diff --git a/sdext/source/presenter/description.xml b/sdext/source/presenter/description.xml
index 3018cf1..68b126d 100644
--- a/sdext/source/presenter/description.xml
+++ b/sdext/source/presenter/description.xml
@@ -28,8 +28,8 @@
<identifier value="com.sun.PresenterScreen-UPDATED_SUPPORTED_PLATFORM" />
<dependencies>
- <OpenOffice.org-minimal-version value="4.0" dep:name="Apache OpenOffice"/>
- <OpenOffice.org-maximal-version value="4.9" dep:name="Apache OpenOffice"/>
+ <OpenOffice.org-minimal-version value="4.0" dep:name="OpenOffice"/>
+ <OpenOffice.org-maximal-version value="4.9" dep:name="OpenOffice"/>
</dependencies>
<registration>
diff --git a/setup_native/source/opensolaris/bundledextensions/README b/setup_native/source/opensolaris/bundledextensions/README
index 40a408c..c552794 100644
--- a/setup_native/source/opensolaris/bundledextensions/README
+++ b/setup_native/source/opensolaris/bundledextensions/README
@@ -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/apacheopenoffice3/share/extension/install
+EXTENSIONPATH=/opt/openoffice3/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/apacheopenoffice3/share/extension/install. To install them, the service calls
+/opt/openoffice3/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/apacheopenoffice3/share/extension/install, because
+extensions contained in /opt/openoffice3/share/extension/install, because
the newly installed 'installed' file does not contain any entries yet, except
for the version string.
diff --git a/setup_native/source/opensolaris/bundledextensions/svc-ooo_bundled_extensions b/setup_native/source/opensolaris/bundledextensions/svc-ooo_bundled_extensions
index 4cba159..1f1b76e 100644
--- a/setup_native/source/opensolaris/bundledextensions/svc-ooo_bundled_extensions
+++ b/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/apacheopenoffice/basis${OOOBASEVERSION}"
+OOO_BASE_DIR="/opt/openoffice/basis${OOOBASEVERSION}"
case "$1" in
'start')
- EXTENSIONDIR=/opt/apacheopenoffice${OOOBRANDPACKAGEVERSION}/share/extension/install
+ EXTENSIONDIR=/opt/openoffice${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/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'
+ /opt/openoffice${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/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'
+# /opt/openoffice${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/setup_native/source/packinfo/shellscripts_brand.txt b/setup_native/source/packinfo/shellscripts_brand.txt
index aa215a4..bfe54f2 100644
--- a/setup_native/source/packinfo/shellscripts_brand.txt
+++ b/setup_native/source/packinfo/shellscripts_brand.txt
@@ -44,11 +44,11 @@ Linux)
esac
# creating link to basis layer
-if [ -d $$BASISDIR/apacheopenoffice/basisBASISDIRECTORYVERSION ]
+if [ -d $$BASISDIR/openoffice/basisBASISDIRECTORYVERSION ]
then
- ln -s $$BASISDIR/apacheopenoffice/basisBASISDIRECTORYVERSION $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/basis-link >/dev/null 2>&1
+ ln -s $$BASISDIR/openoffice/basisBASISDIRECTORYVERSION $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/basis-link >/dev/null 2>&1
else
- ln -s ../apacheopenoffice/basisBASISDIRECTORYVERSION $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/basis-link >/dev/null 2>&1
+ ln -s ../openoffice/basisBASISDIRECTORYVERSION $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/basis-link >/dev/null 2>&1
fi
exit 0
diff --git a/setup_native/source/packinfo/shellscripts_core01.txt b/setup_native/source/packinfo/shellscripts_core01.txt
index c070ed69..fcd8757 100644
--- a/setup_native/source/packinfo/shellscripts_core01.txt
+++ b/setup_native/source/packinfo/shellscripts_core01.txt
@@ -44,11 +44,11 @@ Linux)
esac
# creating link to ure
-if [ -d $$UREDIR/apacheopenoffice/ure ]
+if [ -d $$UREDIR/openoffice/ure ]
then
- ln -s $$UREDIR/apacheopenoffice/ure $$PRODUCTINSTALLLOCATION/apacheopenoffice/basisBASISDIRECTORYVERSION/ure-link >/dev/null 2>&1
+ ln -s $$UREDIR/openoffice/ure $$PRODUCTINSTALLLOCATION/openoffice/basisBASISDIRECTORYVERSION/ure-link >/dev/null 2>&1
else
- ln -s ../ure $$PRODUCTINSTALLLOCATION/apacheopenoffice/basisBASISDIRECTORYVERSION/ure-link >/dev/null 2>&1
+ ln -s ../ure $$PRODUCTINSTALLLOCATION/openoffice/basisBASISDIRECTORYVERSION/ure-link >/dev/null 2>&1
fi
exit 0
@@ -80,11 +80,11 @@ Linux)
;;
esac
-if [ -h $$PRODUCTINSTALLLOCATION/apacheopenoffice/basisBASISDIRECTORYVERSION/ure-link -a $$LASTUNINSTALL -eq 1 ]
+if [ -h $$PRODUCTINSTALLLOCATION/openoffice/basisBASISDIRECTORYVERSION/ure-link -a $$LASTUNINSTALL -eq 1 ]
then
- rm -f $$PRODUCTINSTALLLOCATION/apacheopenoffice/basisBASISDIRECTORYVERSION/ure-link 2>/dev/null
- rmdir $$PRODUCTINSTALLLOCATION/apacheopenoffice/basisBASISDIRECTORYVERSION 2>/dev/null
- rmdir $$PRODUCTINSTALLLOCATION/apacheopenoffice 2>/dev/null
+ rm -f $$PRODUCTINSTALLLOCATION/openoffice/basisBASISDIRECTORYVERSION/ure-link 2>/dev/null
+ rmdir $$PRODUCTINSTALLLOCATION/openoffice/basisBASISDIRECTORYVERSION 2>/dev/null
+ rmdir $$PRODUCTINSTALLLOCATION/openoffice 2>/dev/null
fi
exit 0
diff --git a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
index 20b66d1..9e400f0 100644
--- a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
+++ b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
@@ -116,7 +116,7 @@ static BOOL CheckExtensionInRegistry( LPCSTR lpSubKey )
{ // We will replace registration for our (former) own types, too
bRet = true;
}
- else if ( strncmp( szBuffer, "Apache OpenOffice.", 18 ) == 0 )
+ else if ( strncmp( szBuffer, "OpenOffice.", 11 ) == 0 )
{ // We will replace registration for our own types, too
bRet = true;
}
diff --git a/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx b/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx
index 1f07a6a..e918384 100644
--- a/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx
+++ b/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"Apache OpenOffice"),
+ FORWARD_KEY_PREFIX(L"OpenOffice"),
DEFAULT_VALUE_NAME(L""),
BACKUP_VALUE_NAME(L"Backup"),
- PRIVATE_BACKUP_KEY_NAME(L"Apache OpenOffice.reg4msdocmsi"),//PRIVATE_BACKUP_KEY_NAME(L"soffice6.bak"),
+ PRIVATE_BACKUP_KEY_NAME(L"OpenOffice.reg4msdocmsi"),//PRIVATE_BACKUP_KEY_NAME(L"soffice6.bak"),
REGISTRATION_STATE(L"Reg4MsDocState")
{
m_RootKey = WindowsRegistry().GetClassesRootKey();
diff --git a/setup_native/source/win32/customactions/relnotes/relnotes.cxx b/setup_native/source/win32/customactions/relnotes/relnotes.cxx
index ebedb80..64a2253 100644
--- a/setup_native/source/win32/customactions/relnotes/relnotes.cxx
+++ b/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( "Apache OpenOffice" ) );
+ std::wstring::size_type nIndex = prodname.find( TEXT( "OpenOffice" ) );
if( std::wstring::npos == nIndex )
return ERROR_SUCCESS;
diff --git a/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx b/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx
index e795daf..f16f478 100644
--- a/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx
@@ -54,10 +54,10 @@
</MSDN>
We add the following entries to the respective registry key
- "{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"
+ "{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}"="OpenOffice Column Handler"
+ "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}"="OpenOffice Infotip Handler"
+ "{63542C48-9552-494A-84F7-73AA6A7C99C1}"="OpenOffice Property Sheet Handler"
+ "{3B092F0C-7696-40E3-A80F-68D74DA84210}"="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("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") };
+RegistryEntry ColumnHandler = { TEXT("{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}"), TEXT("OpenOffice Column Handler") };
+RegistryEntry InfotipHandler = { TEXT("{087B3AE3-E237-4467-B8DB-5A38AB959AC9}"), TEXT("OpenOffice Infotip Handler") };
+RegistryEntry PropHandler = { TEXT("{63542C48-9552-494A-84F7-73AA6A7C99C1}"), TEXT("OpenOffice Property Sheet Handler") };
+RegistryEntry ThumbViewer = { TEXT("{3B092F0C-7696-40E3-A80F-68D74DA84210}"), TEXT("OpenOffice Thumbnail Viewer") };
BOOL GetMsiProp( MSIHANDLE hMSI, const char* pPropName, char** ppValue )
{
diff --git a/shell/inc/internal/config.hxx b/shell/inc/internal/config.hxx
index ffbba1d..e30ba6d 100644
--- a/shell/inc/internal/config.hxx
+++ b/shell/inc/internal/config.hxx
@@ -40,10 +40,10 @@
#define MODULE_NAME_FILTER TEXT("ooofilt.dll")
#endif
-#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 COLUMN_HANDLER_DESCRIPTIVE_NAME TEXT("OpenOffice Column Handler")
+#define INFOTIP_HANDLER_DESCRIPTIVE_NAME TEXT("OpenOffice Infotip Handler")
+#define PROPSHEET_HANDLER_DESCRIPTIVE_NAME TEXT("OpenOffice Property Sheet Handler")
+#define THUMBVIEWER_HANDLER_DESCRIPTIVAE_NAME TEXT("OpenOffice Thumbnail Viewer")
#define META_CONTENT_NAME "meta.xml"
#define DOC_CONTENT_NAME "content.xml"
diff --git a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
index 9824780..e611cb5 100644
--- a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
+++ b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
@@ -1225,7 +1225,7 @@ namespace /* private */
SubstitutePlaceholder(ClsidEntry_Persist, GUID_PLACEHOLDER, ClsidToString(PersistentGuid));
- if (!SetRegistryKey(HKEY_CLASSES_ROOT, ClsidEntry_Persist.c_str(), "", "Apache OpenOffice Persistent Handler"))
+ if (!SetRegistryKey(HKEY_CLASSES_ROOT, ClsidEntry_Persist.c_str(), "", "OpenOffice Persistent Handler"))
return E_FAIL;
// Add missing entry
diff --git a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
index 913886c..6f2745d 100644
--- a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
+++ b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
@@ -56,11 +56,11 @@ struct PROPERTYMAP
PROPERTYMAP g_rgPROPERTYMAP[] =
{
- { 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" },
+ { PKEY_Title, L"OpenOffice", L"Title" },
+ { PKEY_Author, L"OpenOffice", L"Author" },
+ { PKEY_Subject, L"OpenOffice", L"Subject" },
+ { PKEY_Keywords, L"OpenOffice", L"Keyword" },
+ { PKEY_Comment, L"OpenOffice", L"Comments" },
};
size_t gPropertyMapTableSize = sizeof(g_rgPROPERTYMAP)/sizeof(g_rgPROPERTYMAP[0]);
diff --git a/shell/source/win32/shlxthandler/res/shlxthdl.manifest b/shell/source/win32/shlxthandler/res/shlxthdl.manifest
index 6af0aa2..628b736 100644
--- a/shell/source/win32/shlxthandler/res/shlxthdl.manifest
+++ b/shell/source/win32/shlxthandler/res/shlxthdl.manifest
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<assemblyIdentity version="1.0.0.0" processorArchitecture="x86" name="Apache_OpenOffice.shlxthdl" type="win32" />
-<description>Apache OpenOffice Shell Extension</description>
+<description>OpenOffice Shell Extension</description>
<dependency>
<dependentAssembly>
<assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="X86"
diff --git a/shell/source/win32/sysmail/sysmailclient.cxx b/shell/source/win32/sysmail/sysmailclient.cxx
index 0918d8b..6e7778c 100644
--- a/shell/source/win32/sysmail/sysmailclient.cxx
+++ b/shell/source/win32/sysmail/sysmailclient.cxx
@@ -129,7 +129,7 @@ namespace /* private */
{
rtl::OUString altSenddocUrl;
HKEY hkey;
- LONG lret = RegOpenKeyW(HKEY_CURRENT_USER, L"Software\\Apache OpenOffice\\SendAsEMailClient", &hkey);
+ LONG lret = RegOpenKeyW(HKEY_CURRENT_USER, L"Software\\OpenOffice\\SendAsEMailClient", &hkey);
if (lret == ERROR_SUCCESS)
{
wchar_t buff[MAX_PATH];
diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm
index f5b0f30..1d7d64d 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -472,7 +472,7 @@ sub get_downloadname_productname
else
{
$start = "Apache_OpenOffice";
- if ( $allvariables->{'PRODUCTNAME'} eq "Apache OpenOffice" )
+ if ( $allvariables->{'PRODUCTNAME'} eq "OpenOffice" )
{
if ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )
{
diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm
index e6027d4..cd7ed76 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -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 = "apacheopenoffice3/program/" . $licensefilename;
+ my $licpath = "openoffice4/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 'apache openoffice' )
+ if ( $installer::globals::debian && $variableshashref->{'UNIXPRODUCTNAME'} eq 'openoffice' )
{
$line = "%provides" . " openoffice.org-unbundled\n";
push(@epmheader, $line);
@@ -3435,7 +3435,6 @@ sub finalize_linux_patch
my $productname = $allvariables->{'PRODUCTNAME'};
$productname = lc($productname);
$productname =~ s/ /_/g; # abc office -> abc_office
-# $productname =~ s/\.//g; # openoffice.org -> openofficeorg
$infoline = "Adding productname $productname into Linux patch script\n";
push( @installer::globals::logfileinfo, $infoline);
diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm
index ce29b1e..4525a52 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -333,7 +333,7 @@ sub replace_variables_in_scriptfile
replace_one_variable_in_shellscript($scriptfile, $allvariables->{'PRODUCTVERSION'}, "PRODUCTVERSION" );
my $scriptname = lc($allvariables->{'PRODUCTNAME'}) . "\.script";
- if ( $allvariables->{'PRODUCTNAME'} eq "Apache OpenOffice" )
+ if ( $allvariables->{'PRODUCTNAME'} eq "OpenOffice" )
{
$scriptname = "org.openoffice.script";
}
diff --git a/solenv/bin/modules/installer/windows/property.pm b/solenv/bin/modules/installer/windows/property.pm
index 3538338..70e3d86 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -479,10 +479,6 @@ sub update_property_table
my $arpcomments = get_arpcomments_for_property_table($allvariables, $languagestringref);
my $installlevel = get_installlevel_for_property_table();
my $ischeckforproductupdates = get_ischeckforproductupdates_for_property_table();
-# my $manufacturer = get_manufacturer_for_property_table();
-# tweak publisher name in the registry to OOOVENDOR=Apache Software Foundation. The global change of the
-# manufacturer from "OpenOffice.org" to "Apache Software Foundation" requires more analysis and testing
-# because more registry entries/keys are potentially affected. For example test product updates etc.
my $manufacturer = $allvariables->{'OOOVENDOR'};
my $productlanguage = get_productlanguage_for_property_table($language);
my $productname = get_productname_for_property_table($allvariables);
diff --git a/solenv/bin/modules/installer/ziplist.pm b/solenv/bin/modules/installer/ziplist.pm
index 05a3c78..af70557 100644
--- a/solenv/bin/modules/installer/ziplist.pm
+++ b/solenv/bin/modules/installer/ziplist.pm
@@ -639,7 +639,7 @@ sub set_manufacturer
{
my ($allvariables) = @_;
- my $openofficeproductname = "Apache OpenOffice";
+ my $openofficeproductname = "OpenOffice";
my $sunname = "";
diff --git a/svl/source/misc/mediatyp.src b/svl/source/misc/mediatyp.src
index 9202933..9b76d78 100644
--- a/svl/source/misc/mediatyp.src
+++ b/svl/source/misc/mediatyp.src
@@ -539,42 +539,42 @@ String STR_SVT_MIMETYPE_INET_MULTI_MIXED
String STR_SVT_MIMETYPE_APP_SXCALC
{
- Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Spreadsheet" ;
+ Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Spreadsheet" ;
};
String STR_SVT_MIMETYPE_APP_SXCHART
{
- Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Chart" ;
+ Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Chart" ;
};
String STR_SVT_MIMETYPE_APP_SXDRAW
{
- Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Drawing" ;
+ Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Drawing" ;
};
String STR_SVT_MIMETYPE_APP_SXMATH
{
- Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Formula" ;
+ Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Formula" ;
};
String STR_SVT_MIMETYPE_APP_SXWRITER
{
- Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Text Document" ;
+ Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Text Document" ;
};
String STR_SVT_MIMETYPE_APP_SXIMPRESS
{
- Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Presentation" ;
+ Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Presentation" ;
};
String STR_SVT_MIMETYPE_APP_SXGLOBAL
{
- Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Master Document" ;
+ Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Master Document" ;
};
String STR_SVT_MIMETYPE_APP_SXIPACKED
{
- Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Presentation (packed)" ;
+ Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Presentation (packed)" ;
};
diff --git a/svtools/source/misc/imagemgr.src b/svtools/source/misc/imagemgr.src
index 6f7be83..4781d77 100644
--- a/svtools/source/misc/imagemgr.src
+++ b/svtools/source/misc/imagemgr.src
@@ -327,19 +327,19 @@ String STR_DESCRIPTION_FACTORY_DATABASE
};
String STR_DESCRIPTION_CALC_TEMPLATE
{
- Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Spreadsheet Template" ;
+ Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Spreadsheet Template" ;
};
String STR_DESCRIPTION_DRAW_TEMPLATE
{
- Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Drawing Template" ;
+ Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Drawing Template" ;
};
String STR_DESCRIPTION_IMPRESS_TEMPLATE
{
- Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Presentation Template" ;
+ Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Presentation Template" ;
};
String STR_DESCRIPTION_WRITER_TEMPLATE
{
- Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Text Document Template" ;
+ Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Text Document Template" ;
};
String STR_DESCRIPTION_LOCALE_VOLUME
{
@@ -374,37 +374,37 @@ String STR_DESCRIPTION_POWERPOINT_SHOW
String STR_DESCRIPTION_SXMATH_DOC
{
- Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Formula" ;
+ Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Formula" ;
};
String STR_DESCRIPTION_SXCHART_DOC
{
- Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Chart" ;
+ Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Chart" ;
};
String STR_DESCRIPTION_SXDRAW_DOC
{
- Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Drawing" ;
+ Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Drawing" ;
};
String STR_DESCRIPTION_SXCALC_DOC
{
- Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Spreadsheet" ;
+ Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Spreadsheet" ;
};
String STR_DESCRIPTION_SXIMPRESS_DOC
{
- Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Presentation" ;
+ Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Presentation" ;
};
String STR_DESCRIPTION_SXWRITER_DOC
{
- Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Text Document" ;
+ Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Text Document" ;
};
String STR_DESCRIPTION_SXGLOBAL_DOC
{
- Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Master Document" ;
+ Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Master Document" ;
};
String STR_DESCRIPTION_MATHML_DOC
{
diff --git a/svx/source/dialog/sendreportw32.cxx b/svx/source/dialog/sendreportw32.cxx
index 9b4ca02..ff94f69 100644
--- a/svx/source/dialog/sendreportw32.cxx
+++ b/svx/source/dialog/sendreportw32.cxx
@@ -93,7 +93,7 @@ namespace svx{
if ( ERROR_SUCCESS == RegReadValue(
HKEY_CURRENT_USER,
- TEXT("SOFTWARE\\Apache OpenOffice\\CrashReport"),
+ TEXT("SOFTWARE\\OpenOffice\\CrashReport"),
TEXT("HTTPProxyServer"),
szBuffer,
sizeof(szBuffer) ) )
@@ -102,7 +102,7 @@ namespace svx{
DWORD dwProxyPort;
if ( ERROR_SUCCESS == RegReadValue(
HKEY_CURRENT_USER,
- TEXT("SOFTWARE\\Apache OpenOffice\\CrashReport"),
+ TEXT("SOFTWARE\\OpenOffice\\CrashReport"),
TEXT("HTTPProxyPort"),
&dwProxyPort,
sizeof(dwProxyPort) ) )
@@ -113,7 +113,7 @@ namespace svx{
if ( ERROR_SUCCESS == RegReadValue(
HKEY_CURRENT_USER,
- TEXT("SOFTWARE\\Apache OpenOffice\\CrashReport"),
+ TEXT("SOFTWARE\\OpenOffice\\CrashReport"),
TEXT("ReturnAddress"),
szBuffer,
sizeof(szBuffer) ) )
@@ -122,7 +122,7 @@ namespace svx{
DWORD fAllowContact = sal_False;
RegReadValue(
HKEY_CURRENT_USER,
- TEXT("SOFTWARE\\Apache OpenOffice\\CrashReport"),
+ TEXT("SOFTWARE\\OpenOffice\\CrashReport"),
TEXT("AllowContact"),
&fAllowContact,
sizeof(fAllowContact) );
@@ -131,7 +131,7 @@ namespace svx{
DWORD uInternetConnection = 0;
RegReadValue(
HKEY_CURRENT_USER,
- TEXT("SOFTWARE\\Apache OpenOffice\\CrashReport"),
+ TEXT("SOFTWARE\\OpenOffice\\CrashReport"),
TEXT("HTTPConnection"),
&uInternetConnection,
sizeof(uInternetConnection) );
@@ -145,7 +145,7 @@ namespace svx{
const _TCHAR *lpHTTPProxyServer = reinterpret_cast<LPCTSTR>(maParams.maHTTPProxyServer.GetBuffer());
RegWriteValue(
HKEY_CURRENT_USER,
- TEXT("SOFTWARE\\Apache OpenOffice\\CrashReport"),
+ TEXT("SOFTWARE\\OpenOffice\\CrashReport"),
TEXT("HTTPProxyServer"), REG_SZ,
lpHTTPProxyServer,
sizeof(TCHAR) * (_tcslen(lpHTTPProxyServer) + 1) );
@@ -155,7 +155,7 @@ namespace svx{
RegWriteValue(
HKEY_CURRENT_USER,
- TEXT("SOFTWARE\\Apache OpenOffice\\CrashReport"),
+ TEXT("SOFTWARE\\OpenOffice\\CrashReport"),
TEXT("HTTPProxyPort"), REG_DWORD,
&dwProxyPort,
sizeof(DWORD) );
@@ -163,7 +163,7 @@ namespace svx{
DWORD fAllowContact = IsContactAllowed();
RegWriteValue(
HKEY_CURRENT_USER,
- TEXT("SOFTWARE\\Apache OpenOffice\\CrashReport"),
+ TEXT("SOFTWARE\\OpenOffice\\CrashReport"),
TEXT("AllowContact"), REG_DWORD,
&fAllowContact,
sizeof(DWORD) );
@@ -173,7 +173,7 @@ namespace svx{
RegWriteValue(
HKEY_CURRENT_USER,
- TEXT("SOFTWARE\\Apache OpenOffice\\CrashReport"),
+ TEXT("SOFTWARE\\OpenOffice\\CrashReport"),
TEXT("HTTPConnection"), REG_DWORD,
&uInternetConnection,
sizeof(DWORD) );
@@ -181,7 +181,7 @@ namespace svx{
const _TCHAR *lpEmail = reinterpret_cast<LPCTSTR>(GetEMailAddress().GetBuffer());
RegWriteValue(
HKEY_CURRENT_USER,
- TEXT("SOFTWARE\\Apache OpenOffice\\CrashReport"),
+ TEXT("SOFTWARE\\OpenOffice\\CrashReport"),
TEXT("ReturnAddress"), REG_SZ,
lpEmail,
sizeof(TCHAR) * (_tcslen(lpEmail) + 1) );
diff --git a/swext/mediawiki/src/description.xml b/swext/mediawiki/src/description.xml
index 951c5ad..209bd06 100644
--- a/swext/mediawiki/src/description.xml
+++ b/swext/mediawiki/src/description.xml
@@ -31,8 +31,8 @@
</simple-license>
</registration>
<dependencies>
- <OpenOffice.org-minimal-version value="4.0" d:name="Apache OpenOffice"/>
- <OpenOffice.org-maximal-version value="4.9" d:name="Apache OpenOffice"/>
+ <OpenOffice.org-minimal-version value="4.0" d:name="OpenOffice"/>
+ <OpenOffice.org-maximal-version value="4.9" d:name="OpenOffice"/>
</dependencies>
<publisher>
<name xlink:href="http://www.openoffice.org" lang="en">Apache Software Foundation</name>
diff --git a/sysui/desktop/debian/control b/sysui/desktop/debian/control
index e93a0a5..f80e0fa 100644
--- a/sysui/desktop/debian/control
+++ b/sysui/desktop/debian/control
@@ -1,6 +1,6 @@
Description: %productname desktop integration
Maintainer: Apache Software Foundation
Architecture: all
-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
+Provides: openoffice-desktop-integration, openoffice.org-unbundled
+Conflicts: openoffice-desktop-integration, openofficeorg-desktop-integration, openofficeorg-debian-menus, openoffice.org-bundled
+Replaces: openoffice-desktop-integration, openofficeorg-debian-menus
diff --git a/sysui/desktop/freedesktop/freedesktop-menus.spec b/sysui/desktop/freedesktop/freedesktop-menus.spec
index da64d19..1fb9c5f 100644
--- a/sysui/desktop/freedesktop/freedesktop-menus.spec
+++ b/sysui/desktop/freedesktop/freedesktop-menus.spec
@@ -27,7 +27,7 @@ Name: %pkgprefix-freedesktop-menus
#BuildRequires: perl
Group: Office
License: ALv2
-Provides: apache_openoffice3-desktop-integration
+Provides: openoffice-desktop-integration
Conflicts: %pkgprefix-suse-menus
Conflicts: %pkgprefix-debian-menus
Conflicts: %pkgprefix-redhat-menus
diff --git a/sysui/desktop/mandriva/mandriva-menus.spec b/sysui/desktop/mandriva/mandriva-menus.spec
index 1ea7015..b51bf44 100644
--- a/sysui/desktop/mandriva/mandriva-menus.spec
+++ b/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: apache_openoffice3-desktop-integration
+Provides: openoffice-desktop-integration
%define _unpackaged_files_terminate_build 0
%define _binary_filedigest_algorithm 1
diff --git a/sysui/desktop/productversion.mk b/sysui/desktop/productversion.mk
index a0319ef..33c7d7d 100644
--- a/sysui/desktop/productversion.mk
+++ b/sysui/desktop/productversion.mk
@@ -42,7 +42,7 @@ PKGDIR=$(BIN)
# CAUTION! here the parsing result from openoffice.lst is NOT available, so this is hardcoded
# 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
+PRODUCTLIST = openoffice
# default values to minimize maintainance effort
@@ -66,11 +66,11 @@ ICONVERSION = $(PRODUCTVERSIONSHORT:s/.//g)
UNIXWRAPPERNAME *= '$${{UNIXPRODUCTNAME}}$${{BRANDPACKAGEVERSION}}'
# CAUTION! $(UNIXBASISROOTNAME) from openoffice.lst NOT available (!)
-PRODUCTNAME.apache_openoffice = Apache OpenOffice
+PRODUCTNAME.openoffice = OpenOffice
-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)
+PRODUCTVERSION.openoffice = $(PRODUCTVERSION)
+PRODUCTVERSIONSHORT.openoffice = $(PRODUCTVERSIONSHORT)
+PKGVERSION.openoffice = $(PKGVERSION)
+UNIXFILENAME.openoffice = $(PRODUCTNAME.openoffice:l:s/ /_/g)$(PRODUCTVERSIONSHORT.openoffice)
+ICONPREFIX.openoffice = $(UNIXFILENAME.openoffice:s/.//g)
diff --git a/sysui/desktop/redhat/redhat-menus.spec b/sysui/desktop/redhat/redhat-menus.spec
index 8fa8f1e..f25f153 100644
--- a/sysui/desktop/redhat/redhat-menus.spec
+++ b/sysui/desktop/redhat/redhat-menus.spec
@@ -29,7 +29,7 @@ Vendor: Apache Software Foundation
AutoReqProv: no
BuildArch: noarch
Requires: redhat-release
-Provides: apache_openoffice3-desktop-integration
+Provides: openoffice-desktop-integration
%define _unpackaged_files_terminate_build 0
%define _binary_filedigest_algorithm 1
%define _binary_payload w9.gzdio
diff --git a/sysui/desktop/share/brand.pl b/sysui/desktop/share/brand.pl
index d52fc64..70db1ec 100644
--- a/sysui/desktop/share/brand.pl
+++ b/sysui/desktop/share/brand.pl
@@ -34,7 +34,7 @@ eval 'exec perl -wS $0 ${1+"$@"}'
$destdir = pop @ARGV;
mkdir $destdir,0777;
-$productname = "Apache OpenOffice";
+$productname = "OpenOffice";
$productfilename = "apacheopenoffice";
$prefix = "";
$iconprefix = "";
diff --git a/sysui/desktop/share/create_mime_xml.pl b/sysui/desktop/share/create_mime_xml.pl
index 5521cc8..ab780cf 100644
--- a/sysui/desktop/share/create_mime_xml.pl
+++ b/sysui/desktop/share/create_mime_xml.pl
@@ -21,7 +21,7 @@
# *************************************************************
use File::Basename;
$basedir = dirname($0);
-$productname = 'Apache OpenOffice';
+$productname = 'OpenOffice';
$mimedir = $basedir.'/../mimetypes';
$FS= ' '; # field seperator (space) - for documents.ulf
diff --git a/sysui/desktop/share/translate.pl b/sysui/desktop/share/translate.pl
index 783d0c0..ed6f101 100644
--- a/sysui/desktop/share/translate.pl
+++ b/sysui/desktop/share/translate.pl
@@ -32,7 +32,7 @@ eval 'exec perl -wS $0 ${1+"$@"}'
#
my ($prefix, $ext, $key);
-$productname = "Apache OpenOffice";
+$productname = "OpenOffice";
$workdir = ".";
while ($_ = $ARGV[0], /^-/) {
diff --git a/sysui/desktop/suse/suse-menus.spec b/sysui/desktop/suse/suse-menus.spec
index 8d02c9e..9ea96a9 100644
--- a/sysui/desktop/suse/suse-menus.spec
+++ b/sysui/desktop/suse/suse-menus.spec
@@ -32,7 +32,7 @@ BuildArch: noarch
Requires: /etc/SuSE-release
# .. but not for Sun JDS
Conflicts: SunDesktopVersion
-Provides: apacheopenoffice3-desktop-integration
+Provides: openoffice-desktop-integration
%define _unpackaged_files_terminate_build 0
%define _binary_filedigest_algorithm 1
%define _binary_payload w9.gzdio
diff --git a/unotools/inc/unotools/configmgr.hxx b/unotools/inc/unotools/configmgr.hxx
index 772be2d..0a9553a 100644
--- a/unotools/inc/unotools/configmgr.hxx
+++ b/unotools/inc/unotools/configmgr.hxx
@@ -96,7 +96,8 @@ namespace utl
WRITERCOMPATIBILITYVERSIONOOO11,
OPENSOURCECONTEXT,
ABOUTBOXPRODUCTVERSION,
- OOOVENDOR
+ OOOVENDOR,
+ FULLPRODUCTNAME
};
//direct readonly access to some special configuration elements
static com::sun::star::uno::Any GetDirectConfigProperty(ConfigProperty eProp);
diff --git a/unotools/source/config/configmgr.cxx b/unotools/source/config/configmgr.cxx
index 43b9d2d..7ca0cac 100644
--- a/unotools/source/config/configmgr.cxx
+++ b/unotools/source/config/configmgr.cxx
@@ -62,6 +62,8 @@ namespace
{
struct BrandName
: public rtl::Static< ::rtl::OUString, BrandName > {};
+ struct FullProductname
+ : public rtl::Static< ::rtl::OUString, FullProductname > {};
struct ProductVersion
: public rtl::Static< ::rtl::OUString, ProductVersion > {};
struct AboutBoxProductVersion
@@ -417,6 +419,13 @@ Any ConfigManager::GetDirectConfigProperty(ConfigProperty eProp)
return aRet;
}
+ ::rtl::OUString& rFullProductname = FullProductname::get();
+ if ( eProp == FULLPRODUCTNAME && rFullProductname.getLength() )
+ {
+ aRet <<= rFullProductname;
+ return aRet;
+ }
+
rtl::OUString &rProductVersion = ProductVersion::get();
if ( eProp == PRODUCTVERSION && rProductVersion.getLength() )
{
@@ -494,6 +503,7 @@ Any ConfigManager::GetDirectConfigProperty(ConfigProperty eProp)
case LOCALE: sPath += C2U("Setup/L10N"); break;
case PRODUCTNAME:
+ case FULLPRODUCTNAME:
case PRODUCTVERSION:
case PRODUCTEXTENSION:
case PRODUCTXMLFILEFORMATNAME :
@@ -531,6 +541,7 @@ Any ConfigManager::GetDirectConfigProperty(ConfigProperty eProp)
{
case LOCALE: sProperty = C2U("ooLocale"); break;
case PRODUCTNAME: sProperty = C2U("ooName"); break;
+ case FULLPRODUCTNAME: sProperty = C2U("ooFullname"); break;
case PRODUCTVERSION: sProperty = C2U("ooSetupVersion"); break;
case ABOUTBOXPRODUCTVERSION: sProperty = C2U("ooSetupVersionAboutBox"); break;
case OOOVENDOR: sProperty = C2U("ooVendor"); break;
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index e66ce73..6f6ec6d 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -1167,7 +1167,7 @@ sal_Bool MiscSettings::GetEnableATToolSupport() const
HKEY hkey;
if( ERROR_SUCCESS == RegOpenKey(HKEY_CURRENT_USER,
- "Software\\Aapche OpenOffice\\Accessibility\\AtToolSupport",
+ "Software\\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\\Apache OpenOffice\\Accessibility\\AtToolSupport",
+ "Software\\OpenOffice\\Accessibility\\AtToolSupport",
&hkey) )
{
DWORD dwType;
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 4ee5fd3..183654f 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -6302,7 +6302,7 @@ void ToolBox::ImplDisableFlatButtons()
HKEY hkey;
if( ERROR_SUCCESS == RegOpenKey(HKEY_CURRENT_USER,
- "Software\\Apache OpenOffice\\Accessibility\\AtToolSupport",
+ "Software\\OpenOffice\\Accessibility\\AtToolSupport",
&hkey) )
{
DWORD dwType = 0;
commit aebb790bfdc374a49b699092096f9d47d9730f0c
Author: Herbert Dürr <hdu at apache.org>
Date: Thu Feb 21 15:24:59 2013 +0000
lldb4aoo: add mechanism to provide/advertise LLDB helper functions
diff --git a/solenv/inc/lldb4aoo.py b/solenv/inc/lldb4aoo.py
index 2d6f769..a2bd5ed 100644
--- a/solenv/inc/lldb4aoo.py
+++ b/solenv/inc/lldb4aoo.py
@@ -17,6 +17,34 @@ def __lldb_init_module( dbg, dict):
# register a generic helper function for pimpl types
dbg.HandleCommand( 'type summary add -F %s.%s -v -C yes -n PIMPL %s' % ( __name__,'get_pimpl_info', ' '.join(pimpl_types)))
+ # add info about specific helper methods
+ # assume functions with docstrings are available for general consumption
+ helper_funcs = [v for (k,v) in globals().iteritems() if( not k.startswith('_') and callable(v) and v.__doc__)]
+ if helper_funcs:
+ print( 'Available AOO-specific helper functions:')
+ for hfunc in helper_funcs:
+ shortdesc = hfunc.__doc__.splitlines()[0]
+ print( '\t%s\t# "%s"' %(hfunc.__name__, shortdesc))
+ print( 'Run them with:')
+ for hfunc in helper_funcs[:4]:
+ print( '\tscript %s.%s()' %(__name__, hfunc.__name__))
+
+# some helpers for use from interactive LLDB sessions
+
+import lldb
+
+def add_breakpoints():
+ 'Setup breakpoints useful for AOO debugging'
+ dbg = lldb.debugger
+ if dbg.GetNumTargets() == 0:
+ return
+ # the list of interesting function breakpoints
+ aoo_breakfn = ['main', '__cxa_call_unexpected', 'objc_exception_throw']
+ aoo_breakfn += ['__cxa_throw']
+ # register breakpoints for function basenames
+ for b in aoo_breakfn:
+ dbg.HandleCommand( 'breakpoint set -b ' + b)
+
# local functions for use by the AOO-type summary providers
commit 4fcaec92844b0f063abc2e2c0961fa0a96510b43
Author: Herbert Dürr <hdu at apache.org>
Date: Thu Feb 21 13:48:28 2013 +0000
lldb4aoo: remove info-string parameter from walk_ptrchar
diff --git a/solenv/inc/lldb4aoo.py b/solenv/inc/lldb4aoo.py
index 5cbf61b..2d6f769 100644
--- a/solenv/inc/lldb4aoo.py
+++ b/solenv/inc/lldb4aoo.py
@@ -1,4 +1,4 @@
-# to activate the AOO-LLDB helper script run the line below into LLDB
+# to activate the AOO-LLDB helper script type the line below into LLDB
# command script import path-to-script/lldb4aoo.py
# or activate it automatically by adding the line to ~/.lldbinit
@@ -17,22 +17,22 @@ def __lldb_init_module( dbg, dict):
# register a generic helper function for pimpl types
dbg.HandleCommand( 'type summary add -F %s.%s -v -C yes -n PIMPL %s' % ( __name__,'get_pimpl_info', ' '.join(pimpl_types)))
+
# local functions for use by the AOO-type summary providers
-def walk_ptrchain( v, info):
+def walk_ptrchain( v):
+ info = ''
while v.TypeIsPointerType():
n = v.GetValueAsUnsigned()
if n == 0:
info += 'NULL'
return (None, info)
- else:
- info += '0x%04X-> ' % (n)
- v = v.Dereference()
+ info += '0x%04X-> ' % (n)
+ v = v.Dereference()
return (v, info)
def ret_strdata_info( v, refvar, lenvar, aryvar):
- info = ''
- (v, info) = walk_ptrchain( v, info)
+ (v, info) = walk_ptrchain( v)
if not v:
return info
r = v.GetChildMemberWithName( refvar).GetValueAsSigned()
@@ -50,12 +50,13 @@ def ret_strdata_info( v, refvar, lenvar, aryvar):
# definitions for our individual LLDB type summary providers
def get_pimpl_info( valobj, dict):
- v = walk_ptrchain( valobj, '')
+ (v, info) = walk_ptrchain( valobj)
p = v.GetChildAtIndex(0)
- info = v.GetName()
- if v.GetValueAsUnsigned() == 0:
- return '(%s==NULL)' % (info)
- info = '(%s=0x%04X)-> ' % (info,n)
+ pname = p.GetName()
+ n = p.GetValueAsUnsigned()
+ if n == 0:
+ return '%s(%s==NULL)' % (info, pname)
+ info = '%s(%s=0x%04X)-> ' % (info, pname, n)
return info + p.Dereference().GetSummary()
@@ -71,4 +72,3 @@ def getinfo_for__ByteStringData( valobj, dict):
def getinfo_for__UniStringData( valobj, dict):
return ret_strdata_info( valobj, 'mnRefCount', 'mnLen', 'maStr')
-
commit 305c919ec758e189c5ae6aa01144d53024be5ab1
Author: Herbert Dürr <hdu at apache.org>
Date: Thu Feb 21 10:08:31 2013 +0000
lldb4aoo: add and use type helpers for generic pimpl objects
diff --git a/solenv/inc/lldb4aoo.py b/solenv/inc/lldb4aoo.py
index 6172207..5cbf61b 100644
--- a/solenv/inc/lldb4aoo.py
+++ b/solenv/inc/lldb4aoo.py
@@ -1,54 +1,62 @@
-# to activate LLDB helper script run the command below when inside LLDB
-# command script import /tools/lldb4aoo.py
-# or add the line to ~/.lldbinit to always activate it
+# to activate the AOO-LLDB helper script run the line below into LLDB
+# command script import path-to-script/lldb4aoo.py
+# or activate it automatically by adding the line to ~/.lldbinit
def __lldb_init_module( dbg, dict):
# the list of AOO specific types
- aoo_types = ['rtl_String', 'rtl::OString', 'rtl_uString', 'rtl::OUString',
- '_ByteStringData', '_UniStringData', 'ByteString', 'UniString']
- # register a helper function for each type
+ aoo_types = ['rtl_String', 'rtl_uString', '_ByteStringData', '_UniStringData']
+ pimpl_types = ['rtl::OString', 'rtl::OUString', 'ByteString', 'UniString']
+ # register a helper function for each non-trivial type
for t in aoo_types:
f = 'getinfo_for_' + t.replace( '::', '_')
if f in globals():
- dbg.HandleCommand( 'type summary add %s -F %s.%s' % (t,__name__,f))
+ dbg.HandleCommand( 'type summary add %s -v -C yes -F %s.%s' % (t,__name__,f))
else:
- print( 'AOO-LLDB helper function "%s" is not yet defined: "%s" types cannot be displayed properly!' % (f,t))
+ print( 'AOO-LLDB helper function "%s" is not yet defined: '
+ '"%s" types cannot be displayed properly!' % (f,t))
+ # register a generic helper function for pimpl types
+ dbg.HandleCommand( 'type summary add -F %s.%s -v -C yes -n PIMPL %s' % ( __name__,'get_pimpl_info', ' '.join(pimpl_types)))
- # perform some goodies if the process is ready to run or already running
- if dbg.GetNumTargets() > 0:
- # the list of interesting function breakpoints
- aoo_breakfn = ['main', '__cxa_call_unexpected', 'objc_exception_throw']
- aoo_breakfn += ['__cxa_throw']
- # register the function breakpoints
- for t in aoo_breakfn:
- dbg.HandleCommand( 'breakpoint set -n ' + t)
+# local functions for use by the AOO-type summary providers
-
-# definitions for individual LLDB type summary helpers
+def walk_ptrchain( v, info):
+ while v.TypeIsPointerType():
+ n = v.GetValueAsUnsigned()
+ if n == 0:
+ info += 'NULL'
+ return (None, info)
+ else:
+ info += '0x%04X-> ' % (n)
+ v = v.Dereference()
+ return (v, info)
def ret_strdata_info( v, refvar, lenvar, aryvar):
- while v.TypeIsPointerType():
- if v.GetValueAsUnsigned() == 0:
- return 'NULL-Pointer!'
- v = v.Dereference()
+ info = ''
+ (v, info) = walk_ptrchain( v, info)
+ if not v:
+ return info
r = v.GetChildMemberWithName( refvar).GetValueAsSigned()
l = v.GetChildMemberWithName( lenvar).GetValueAsSigned()
c = v.GetChildMemberWithName( aryvar)
- d = c.AddressOf().GetPointeeData( 0, l)
+ L = min(l,128)
+ d = c.AddressOf().GetPointeeData( 0, L)
if c.GetByteSize() == 1: # assume UTF-8
s = ''.join([chr(x) for x in d.uint8s])
else: # assume UTF-16
s = (u''.join([unichr(x) for x in d.uint16s])).encode('utf-8')
- info = ('{refs=%d, len=%d, str="%s"}' % (r, l, s.encode('string_escape')))
+ info += ('{refs=%d, len=%d, str="%s"%s}' % (r, l, s.encode('string_escape'), '...'if(l!=L)else''))
return info
-def ret_strobject_info( v, ptrvar):
- while v.TypeIsPointerType():
- if v.GetValueAsUnsigned() == 0:
- return 'NULL-Pointer!'
- v = v.Dereference()
- p = v.GetChildMemberWithName( ptrvar)
- return p.Dereference()
+# definitions for our individual LLDB type summary providers
+
+def get_pimpl_info( valobj, dict):
+ v = walk_ptrchain( valobj, '')
+ p = v.GetChildAtIndex(0)
+ info = v.GetName()
+ if v.GetValueAsUnsigned() == 0:
+ return '(%s==NULL)' % (info)
+ info = '(%s=0x%04X)-> ' % (info,n)
+ return info + p.Dereference().GetSummary()
def getinfo_for_rtl_String( valobj, dict):
@@ -64,15 +72,3 @@ def getinfo_for__UniStringData( valobj, dict):
return ret_strdata_info( valobj, 'mnRefCount', 'mnLen', 'maStr')
-def getinfo_for_rtl_OString( valobj, dict):
- return ret_strobject_info( valobj, 'pData')
-
-def getinfo_for_rtl_OUString( valobj, dict):
- return ret_strobject_jinfo( valobj, 'pData')
-
-def getinfo_for_ByteString( valobj, dict):
- return ret_strobject_jinfo( valobj, 'mpData')
-
-def getinfo_for_UniString( valobj, dict):
- return ret_strobject_info( valobj, 'mpData')
-
More information about the Libreoffice-commits
mailing list