You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by or...@apache.org on 2013/02/21 17:37:15 UTC
svn commit: r1448713 [1/2] - in /openoffice/trunk/main:
cli_ure/source/native/ cppuhelper/source/ cui/source/dialogs/
desktop/source/app/ helpcontent2/source/text/shared/00/
instsetoo_native/inc_openoffice/windows/msi_templates/
instsetoo_native/inc_sd...
Author: orw
Date: Thu Feb 21 16:37:14 2013
New Revision: 1448713
URL: http://svn.apache.org/r1448713
Log:
#121388# - adapt renaming: "Apache OpenOffice" --> "OpenOffice"
Modified:
openoffice/trunk/main/cli_ure/source/native/native_bootstrap.cxx
openoffice/trunk/main/cppuhelper/source/findsofficepath.c
openoffice/trunk/main/cui/source/dialogs/about.src
openoffice/trunk/main/desktop/source/app/app.cxx
openoffice/trunk/main/helpcontent2/source/text/shared/00/00000021.xhp
openoffice/trunk/main/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
openoffice/trunk/main/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt
openoffice/trunk/main/instsetoo_native/util/openoffice.lst
openoffice/trunk/main/odk/cfgWin.js
openoffice/trunk/main/odk/configure.pl
openoffice/trunk/main/odk/docs/install.html
openoffice/trunk/main/odk/setsdkenv_unix.sh.in
openoffice/trunk/main/odk/setsdkenv_windows.template
openoffice/trunk/main/odk/source/com/sun/star/lib/loader/InstallationFinder.java
openoffice/trunk/main/odk/source/unoapploader/win/unoapploader.c
openoffice/trunk/main/odk/util/makefile.pmk
openoffice/trunk/main/officecfg/registry/data/org/openoffice/Setup.xcu
openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Setup.xcs
openoffice/trunk/main/sc/source/ui/vba/vbawindow.cxx
openoffice/trunk/main/scp2/inc/macros.inc
openoffice/trunk/main/scp2/source/ooo/registryitem_ooo.scp
openoffice/trunk/main/scp2/source/ooo/ure.scp
openoffice/trunk/main/scp2/source/ooo/ure_standalone.scp
openoffice/trunk/main/scp2/source/quickstart/registryitem_quickstart.scp
openoffice/trunk/main/scp2/source/winexplorerext/registryitem_winexplorerext.scp
openoffice/trunk/main/sdext/source/minimizer/description.xml
openoffice/trunk/main/sdext/source/pdfimport/config/description.xml
openoffice/trunk/main/sdext/source/presenter/description.xml
openoffice/trunk/main/setup_native/source/opensolaris/bundledextensions/README
openoffice/trunk/main/setup_native/source/opensolaris/bundledextensions/svc-ooo_bundled_extensions
openoffice/trunk/main/setup_native/source/packinfo/shellscripts_brand.txt
openoffice/trunk/main/setup_native/source/packinfo/shellscripts_core01.txt
openoffice/trunk/main/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
openoffice/trunk/main/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx
openoffice/trunk/main/setup_native/source/win32/customactions/relnotes/relnotes.cxx
openoffice/trunk/main/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx
openoffice/trunk/main/shell/inc/internal/config.hxx
openoffice/trunk/main/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
openoffice/trunk/main/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
openoffice/trunk/main/shell/source/win32/shlxthandler/res/shlxthdl.manifest
openoffice/trunk/main/shell/source/win32/sysmail/sysmailclient.cxx
openoffice/trunk/main/solenv/bin/modules/installer/download.pm
openoffice/trunk/main/solenv/bin/modules/installer/epmfile.pm
openoffice/trunk/main/solenv/bin/modules/installer/simplepackage.pm
openoffice/trunk/main/solenv/bin/modules/installer/windows/property.pm
openoffice/trunk/main/solenv/bin/modules/installer/ziplist.pm
openoffice/trunk/main/svl/source/misc/mediatyp.src
openoffice/trunk/main/svtools/source/misc/imagemgr.src
openoffice/trunk/main/svx/source/dialog/sendreportw32.cxx
openoffice/trunk/main/swext/mediawiki/src/description.xml
openoffice/trunk/main/sysui/desktop/debian/control
openoffice/trunk/main/sysui/desktop/freedesktop/freedesktop-menus.spec
openoffice/trunk/main/sysui/desktop/mandriva/mandriva-menus.spec
openoffice/trunk/main/sysui/desktop/productversion.mk
openoffice/trunk/main/sysui/desktop/redhat/redhat-menus.spec
openoffice/trunk/main/sysui/desktop/share/brand.pl
openoffice/trunk/main/sysui/desktop/share/create_mime_xml.pl
openoffice/trunk/main/sysui/desktop/share/translate.pl
openoffice/trunk/main/sysui/desktop/suse/suse-menus.spec
openoffice/trunk/main/unotools/inc/unotools/configmgr.hxx
openoffice/trunk/main/unotools/source/config/configmgr.cxx
openoffice/trunk/main/vcl/source/app/settings.cxx
openoffice/trunk/main/vcl/source/window/toolbox.cxx
Modified: openoffice/trunk/main/cli_ure/source/native/native_bootstrap.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cli_ure/source/native/native_bootstrap.cxx?rev=1448713&r1=1448712&r2=1448713&view=diff
==============================================================================
--- openoffice/trunk/main/cli_ure/source/native/native_bootstrap.cxx (original)
+++ openoffice/trunk/main/cli_ure/source/native/native_bootstrap.cxx Thu Feb 21 16:37:14 2013
@@ -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.
*/
Modified: openoffice/trunk/main/cppuhelper/source/findsofficepath.c
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cppuhelper/source/findsofficepath.c?rev=1448713&r1=1448712&r2=1448713&view=diff
==============================================================================
--- openoffice/trunk/main/cppuhelper/source/findsofficepath.c (original)
+++ openoffice/trunk/main/cppuhelper/source/findsofficepath.c Thu Feb 21 16:37:14 2013
@@ -86,7 +86,7 @@ static char* getPathFromRegistryKey( HKE
*/
static char* platformSpecific()
{
- const char* SUBKEYNAME = "Software\\Apache OpenOffice\\UNO\\InstallPath";
+ const char* SUBKEYNAME = "Software\\OpenOffice\\UNO\\InstallPath";
char* path = NULL;
Modified: openoffice/trunk/main/cui/source/dialogs/about.src
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cui/source/dialogs/about.src?rev=1448713&r1=1448712&r2=1448713&view=diff
==============================================================================
--- openoffice/trunk/main/cui/source/dialogs/about.src (original)
+++ openoffice/trunk/main/cui/source/dialogs/about.src Thu Feb 21 16:37:14 2013
@@ -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
{
Modified: openoffice/trunk/main/desktop/source/app/app.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/desktop/source/app/app.cxx?rev=1448713&r1=1448712&r2=1448713&view=diff
==============================================================================
--- openoffice/trunk/main/desktop/source/app/app.cxx (original)
+++ openoffice/trunk/main/desktop/source/app/app.cxx Thu Feb 21 16:37:14 2013
@@ -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& r
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& r
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& r
nPro++;
rStr.SearchAndReplaceAllAscii( "%PRODUCTNAME", rBrandName );
+ rStr.SearchAndReplaceAllAscii( "%FULLPRODUCTNAME", rFullProductname );
rStr.SearchAndReplaceAllAscii( "%PRODUCTVERSION", rVersion );
rStr.SearchAndReplaceAllAscii( "%ABOUTBOXPRODUCTVERSION", rAboutBoxVersion );
rStr.SearchAndReplaceAllAscii( "%PRODUCTEXTENSION", rExtension );
Modified: openoffice/trunk/main/helpcontent2/source/text/shared/00/00000021.xhp
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/helpcontent2/source/text/shared/00/00000021.xhp?rev=1448713&r1=1448712&r2=1448713&view=diff
==============================================================================
--- openoffice/trunk/main/helpcontent2/source/text/shared/00/00000021.xhp (original)
+++ openoffice/trunk/main/helpcontent2/source/text/shared/00/00000021.xhp Thu Feb 21 16:37:14 2013
@@ -220,7 +220,7 @@
<paragraph xml-lang="en-US" id="par_id0519200811530440" role="tablecontent" l10n="NEW">2011-09-29</paragraph>
</tablecell>
<tablecell>
- <paragraph role="tablecontent" id="par_id0519200811530471" xml-lang="en-US" l10n="NEW">OpenOffice.org 3, StarOffice 9, Apache Open Office</paragraph>
+ <paragraph role="tablecontent" id="par_id0519200811530471" xml-lang="en-US" l10n="NEW">OpenOffice.org 3, StarOffice 9</paragraph>
</tablecell>
</tablerow>
<tablerow>
@@ -231,7 +231,7 @@
<paragraph xml-lang="en-US" id="par_id100120091238112" role="tablecontent" l10n="NEW">-</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id1001200912381174" role="tablecontent" l10n="NEW">OpenOffice.org 3.2 or StarOffice 9.2</paragraph>
+ <paragraph xml-lang="en-US" id="par_id1001200912381174" role="tablecontent" l10n="NEW">OpenOffice.org 3.2, StarOffice 9.2</paragraph>
</tablecell>
</tablerow>
</table>
Modified: openoffice/trunk/main/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt?rev=1448713&r1=1448712&r2=1448713&view=diff
==============================================================================
--- openoffice/trunk/main/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt (original)
+++ openoffice/trunk/main/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt Thu Feb 21 16:37:14 2013
@@ -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
Modified: openoffice/trunk/main/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt?rev=1448713&r1=1448712&r2=1448713&view=diff
==============================================================================
--- openoffice/trunk/main/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt (original)
+++ openoffice/trunk/main/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt Thu Feb 21 16:37:14 2013
@@ -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
Modified: openoffice/trunk/main/instsetoo_native/util/openoffice.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/instsetoo_native/util/openoffice.lst?rev=1448713&r1=1448712&r2=1448713&view=diff
==============================================================================
--- openoffice/trunk/main/instsetoo_native/util/openoffice.lst (original)
+++ openoffice/trunk/main/instsetoo_native/util/openoffice.lst Thu Feb 21 16:37:14 2013
@@ -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
Modified: openoffice/trunk/main/odk/cfgWin.js
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/odk/cfgWin.js?rev=1448713&r1=1448712&r2=1448713&view=diff
==============================================================================
--- openoffice/trunk/main/odk/cfgWin.js (original)
+++ openoffice/trunk/main/odk/cfgWin.js Thu Feb 21 16:37:14 2013
@@ -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" +
Modified: openoffice/trunk/main/odk/configure.pl
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/odk/configure.pl?rev=1448713&r1=1448712&r2=1448713&view=diff
==============================================================================
--- openoffice/trunk/main/odk/configure.pl (original)
+++ openoffice/trunk/main/odk/configure.pl Thu Feb 21 16:37:14 2013
@@ -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";
Modified: openoffice/trunk/main/odk/docs/install.html
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/odk/docs/install.html?rev=1448713&r1=1448712&r2=1448713&view=diff
==============================================================================
--- openoffice/trunk/main/odk/docs/install.html (original)
+++ openoffice/trunk/main/odk/docs/install.html Thu Feb 21 16:37:14 2013
@@ -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>
Modified: openoffice/trunk/main/odk/setsdkenv_unix.sh.in
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/odk/setsdkenv_unix.sh.in?rev=1448713&r1=1448712&r2=1448713&view=diff
==============================================================================
--- openoffice/trunk/main/odk/setsdkenv_unix.sh.in (original)
+++ openoffice/trunk/main/odk/setsdkenv_unix.sh.in Thu Feb 21 16:37:14 2013
@@ -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
Modified: openoffice/trunk/main/odk/setsdkenv_windows.template
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/odk/setsdkenv_windows.template?rev=1448713&r1=1448712&r2=1448713&view=diff
==============================================================================
--- openoffice/trunk/main/odk/setsdkenv_windows.template (original)
+++ openoffice/trunk/main/odk/setsdkenv_windows.template Thu Feb 21 16:37:14 2013
@@ -27,18 +27,18 @@ REM Example: set OO_SDK_NAME=apacheopeno
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.
Modified: openoffice/trunk/main/odk/source/com/sun/star/lib/loader/InstallationFinder.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/odk/source/com/sun/star/lib/loader/InstallationFinder.java?rev=1448713&r1=1448712&r2=1448713&view=diff
==============================================================================
--- openoffice/trunk/main/odk/source/com/sun/star/lib/loader/InstallationFinder.java (original)
+++ openoffice/trunk/main/odk/source/com/sun/star/lib/loader/InstallationFinder.java Thu Feb 21 16:37:14 2013
@@ -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;
Modified: openoffice/trunk/main/odk/source/unoapploader/win/unoapploader.c
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/odk/source/unoapploader/win/unoapploader.c?rev=1448713&r1=1448712&r2=1448713&view=diff
==============================================================================
--- openoffice/trunk/main/odk/source/unoapploader/win/unoapploader.c (original)
+++ openoffice/trunk/main/odk/source/unoapploader/win/unoapploader.c Thu Feb 21 16:37:14 2013
@@ -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>
*/
Modified: openoffice/trunk/main/odk/util/makefile.pmk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/odk/util/makefile.pmk?rev=1448713&r1=1448712&r2=1448713&view=diff
==============================================================================
--- openoffice/trunk/main/odk/util/makefile.pmk (original)
+++ openoffice/trunk/main/odk/util/makefile.pmk Thu Feb 21 16:37:14 2013
@@ -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"
Modified: openoffice/trunk/main/officecfg/registry/data/org/openoffice/Setup.xcu
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/officecfg/registry/data/org/openoffice/Setup.xcu?rev=1448713&r1=1448712&r2=1448713&view=diff
==============================================================================
--- openoffice/trunk/main/officecfg/registry/data/org/openoffice/Setup.xcu (original)
+++ openoffice/trunk/main/officecfg/registry/data/org/openoffice/Setup.xcu Thu Feb 21 16:37:14 2013
@@ -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>
Modified: openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Setup.xcs
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Setup.xcs?rev=1448713&r1=1448712&r2=1448713&view=diff
==============================================================================
--- openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Setup.xcs (original)
+++ openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Setup.xcs Thu Feb 21 16:37:14 2013
@@ -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>
Modified: openoffice/trunk/main/sc/source/ui/vba/vbawindow.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/vba/vbawindow.cxx?rev=1448713&r1=1448712&r2=1448713&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/ui/vba/vbawindow.cxx (original)
+++ openoffice/trunk/main/sc/source/ui/vba/vbawindow.cxx Thu Feb 21 16:37:14 2013
@@ -310,7 +310,7 @@ ScVbaWindow::ScrollWorkbookTabs( const u
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;
Modified: openoffice/trunk/main/scp2/inc/macros.inc
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/inc/macros.inc?rev=1448713&r1=1448712&r2=1448713&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/inc/macros.inc (original)
+++ openoffice/trunk/main/scp2/inc/macros.inc Thu Feb 21 16:37:14 2013
@@ -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
Modified: openoffice/trunk/main/scp2/source/ooo/registryitem_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/registryitem_ooo.scp?rev=1448713&r1=1448712&r2=1448713&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/registryitem_ooo.scp (original)
+++ openoffice/trunk/main/scp2/source/ooo/registryitem_ooo.scp Thu Feb 21 16:37:14 2013
@@ -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";
Modified: openoffice/trunk/main/scp2/source/ooo/ure.scp
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/ure.scp?rev=1448713&r1=1448712&r2=1448713&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/ure.scp (original)
+++ openoffice/trunk/main/scp2/source/ooo/ure.scp Thu Feb 21 16:37:14 2013
@@ -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
Modified: openoffice/trunk/main/scp2/source/ooo/ure_standalone.scp
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/ure_standalone.scp?rev=1448713&r1=1448712&r2=1448713&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/ure_standalone.scp (original)
+++ openoffice/trunk/main/scp2/source/ooo/ure_standalone.scp Thu Feb 21 16:37:14 2013
@@ -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
Modified: openoffice/trunk/main/scp2/source/quickstart/registryitem_quickstart.scp
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/quickstart/registryitem_quickstart.scp?rev=1448713&r1=1448712&r2=1448713&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/quickstart/registryitem_quickstart.scp (original)
+++ openoffice/trunk/main/scp2/source/quickstart/registryitem_quickstart.scp Thu Feb 21 16:37:14 2013
@@ -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";
Modified: openoffice/trunk/main/scp2/source/winexplorerext/registryitem_winexplorerext.scp
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/winexplorerext/registryitem_winexplorerext.scp?rev=1448713&r1=1448712&r2=1448713&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/winexplorerext/registryitem_winexplorerext.scp (original)
+++ openoffice/trunk/main/scp2/source/winexplorerext/registryitem_winexplorerext.scp Thu Feb 21 16:37:14 2013
@@ -77,8 +77,8 @@ RegistryItem gid_Regitem_Folder_shellex_
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
Modified: openoffice/trunk/main/sdext/source/minimizer/description.xml
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sdext/source/minimizer/description.xml?rev=1448713&r1=1448712&r2=1448713&view=diff
==============================================================================
--- openoffice/trunk/main/sdext/source/minimizer/description.xml (original)
+++ openoffice/trunk/main/sdext/source/minimizer/description.xml Thu Feb 21 16:37:14 2013
@@ -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>
Modified: openoffice/trunk/main/sdext/source/pdfimport/config/description.xml
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sdext/source/pdfimport/config/description.xml?rev=1448713&r1=1448712&r2=1448713&view=diff
==============================================================================
--- openoffice/trunk/main/sdext/source/pdfimport/config/description.xml (original)
+++ openoffice/trunk/main/sdext/source/pdfimport/config/description.xml Thu Feb 21 16:37:14 2013
@@ -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>
Modified: openoffice/trunk/main/sdext/source/presenter/description.xml
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sdext/source/presenter/description.xml?rev=1448713&r1=1448712&r2=1448713&view=diff
==============================================================================
--- openoffice/trunk/main/sdext/source/presenter/description.xml (original)
+++ openoffice/trunk/main/sdext/source/presenter/description.xml Thu Feb 21 16:37:14 2013
@@ -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>
Modified: openoffice/trunk/main/setup_native/source/opensolaris/bundledextensions/README
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/opensolaris/bundledextensions/README?rev=1448713&r1=1448712&r2=1448713&view=diff
==============================================================================
--- openoffice/trunk/main/setup_native/source/opensolaris/bundledextensions/README (original)
+++ openoffice/trunk/main/setup_native/source/opensolaris/bundledextensions/README Thu Feb 21 16:37:14 2013
@@ -26,7 +26,7 @@ bundled extensions. This path changes wi
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 wou
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.
Modified: openoffice/trunk/main/setup_native/source/opensolaris/bundledextensions/svc-ooo_bundled_extensions
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/opensolaris/bundledextensions/svc-ooo_bundled_extensions?rev=1448713&r1=1448712&r2=1448713&view=diff
==============================================================================
--- openoffice/trunk/main/setup_native/source/opensolaris/bundledextensions/svc-ooo_bundled_extensions (original)
+++ openoffice/trunk/main/setup_native/source/opensolaris/bundledextensions/svc-ooo_bundled_extensions Thu Feb 21 16:37:14 2013
@@ -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
Modified: openoffice/trunk/main/setup_native/source/packinfo/shellscripts_brand.txt
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/packinfo/shellscripts_brand.txt?rev=1448713&r1=1448712&r2=1448713&view=diff
==============================================================================
--- openoffice/trunk/main/setup_native/source/packinfo/shellscripts_brand.txt (original)
+++ openoffice/trunk/main/setup_native/source/packinfo/shellscripts_brand.txt Thu Feb 21 16:37:14 2013
@@ -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
Modified: openoffice/trunk/main/setup_native/source/packinfo/shellscripts_core01.txt
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/packinfo/shellscripts_core01.txt?rev=1448713&r1=1448712&r2=1448713&view=diff
==============================================================================
--- openoffice/trunk/main/setup_native/source/packinfo/shellscripts_core01.txt (original)
+++ openoffice/trunk/main/setup_native/source/packinfo/shellscripts_core01.txt Thu Feb 21 16:37:14 2013
@@ -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
Modified: openoffice/trunk/main/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx?rev=1448713&r1=1448712&r2=1448713&view=diff
==============================================================================
--- openoffice/trunk/main/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx (original)
+++ openoffice/trunk/main/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx Thu Feb 21 16:37:14 2013
@@ -116,7 +116,7 @@ static BOOL CheckExtensionInRegistry( LP
{ // 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;
}
Modified: openoffice/trunk/main/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx?rev=1448713&r1=1448712&r2=1448713&view=diff
==============================================================================
--- openoffice/trunk/main/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx (original)
+++ openoffice/trunk/main/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx Thu Feb 21 16:37:14 2013
@@ -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();
Modified: openoffice/trunk/main/setup_native/source/win32/customactions/relnotes/relnotes.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/win32/customactions/relnotes/relnotes.cxx?rev=1448713&r1=1448712&r2=1448713&view=diff
==============================================================================
--- openoffice/trunk/main/setup_native/source/win32/customactions/relnotes/relnotes.cxx (original)
+++ openoffice/trunk/main/setup_native/source/win32/customactions/relnotes/relnotes.cxx Thu Feb 21 16:37:14 2013
@@ -158,7 +158,7 @@ extern "C" UINT __stdcall ShowSurveyAfte
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;
Modified: openoffice/trunk/main/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx?rev=1448713&r1=1448712&r2=1448713&view=diff
==============================================================================
--- openoffice/trunk/main/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx (original)
+++ openoffice/trunk/main/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx Thu Feb 21 16:37:14 2013
@@ -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 )
{
Modified: openoffice/trunk/main/shell/inc/internal/config.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/shell/inc/internal/config.hxx?rev=1448713&r1=1448712&r2=1448713&view=diff
==============================================================================
--- openoffice/trunk/main/shell/inc/internal/config.hxx (original)
+++ openoffice/trunk/main/shell/inc/internal/config.hxx Thu Feb 21 16:37:14 2013
@@ -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"
Modified: openoffice/trunk/main/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx?rev=1448713&r1=1448712&r2=1448713&view=diff
==============================================================================
--- openoffice/trunk/main/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx (original)
+++ openoffice/trunk/main/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx Thu Feb 21 16:37:14 2013
@@ -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
Modified: openoffice/trunk/main/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx?rev=1448713&r1=1448712&r2=1448713&view=diff
==============================================================================
--- openoffice/trunk/main/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx (original)
+++ openoffice/trunk/main/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx Thu Feb 21 16:37:14 2013
@@ -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]);
Modified: openoffice/trunk/main/shell/source/win32/shlxthandler/res/shlxthdl.manifest
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/shell/source/win32/shlxthandler/res/shlxthdl.manifest?rev=1448713&r1=1448712&r2=1448713&view=diff
==============================================================================
--- openoffice/trunk/main/shell/source/win32/shlxthandler/res/shlxthdl.manifest (original)
+++ openoffice/trunk/main/shell/source/win32/shlxthandler/res/shlxthdl.manifest Thu Feb 21 16:37:14 2013
@@ -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"
Modified: openoffice/trunk/main/shell/source/win32/sysmail/sysmailclient.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/shell/source/win32/sysmail/sysmailclient.cxx?rev=1448713&r1=1448712&r2=1448713&view=diff
==============================================================================
--- openoffice/trunk/main/shell/source/win32/sysmail/sysmailclient.cxx (original)
+++ openoffice/trunk/main/shell/source/win32/sysmail/sysmailclient.cxx Thu Feb 21 16:37:14 2013
@@ -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];
Modified: openoffice/trunk/main/solenv/bin/modules/installer/download.pm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/download.pm?rev=1448713&r1=1448712&r2=1448713&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/download.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/download.pm Thu Feb 21 16:37:14 2013
@@ -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" )
{
Modified: openoffice/trunk/main/solenv/bin/modules/installer/epmfile.pm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/epmfile.pm?rev=1448713&r1=1448712&r2=1448713&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/epmfile.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/epmfile.pm Thu Feb 21 16:37:14 2013
@@ -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);
Modified: openoffice/trunk/main/solenv/bin/modules/installer/simplepackage.pm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/simplepackage.pm?rev=1448713&r1=1448712&r2=1448713&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/simplepackage.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/simplepackage.pm Thu Feb 21 16:37:14 2013
@@ -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";
}
Modified: openoffice/trunk/main/solenv/bin/modules/installer/windows/property.pm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/windows/property.pm?rev=1448713&r1=1448712&r2=1448713&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/windows/property.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/windows/property.pm Thu Feb 21 16:37:14 2013
@@ -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);
Modified: openoffice/trunk/main/solenv/bin/modules/installer/ziplist.pm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/ziplist.pm?rev=1448713&r1=1448712&r2=1448713&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/ziplist.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/ziplist.pm Thu Feb 21 16:37:14 2013
@@ -639,7 +639,7 @@ sub set_manufacturer
{
my ($allvariables) = @_;
- my $openofficeproductname = "Apache OpenOffice";
+ my $openofficeproductname = "OpenOffice";
my $sunname = "";
Modified: openoffice/trunk/main/svl/source/misc/mediatyp.src
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svl/source/misc/mediatyp.src?rev=1448713&r1=1448712&r2=1448713&view=diff
==============================================================================
--- openoffice/trunk/main/svl/source/misc/mediatyp.src (original)
+++ openoffice/trunk/main/svl/source/misc/mediatyp.src Thu Feb 21 16:37:14 2013
@@ -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)" ;
};
Modified: openoffice/trunk/main/svtools/source/misc/imagemgr.src
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svtools/source/misc/imagemgr.src?rev=1448713&r1=1448712&r2=1448713&view=diff
==============================================================================
--- openoffice/trunk/main/svtools/source/misc/imagemgr.src (original)
+++ openoffice/trunk/main/svtools/source/misc/imagemgr.src Thu Feb 21 16:37:14 2013
@@ -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
{
Modified: openoffice/trunk/main/svx/source/dialog/sendreportw32.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/dialog/sendreportw32.cxx?rev=1448713&r1=1448712&r2=1448713&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/dialog/sendreportw32.cxx (original)
+++ openoffice/trunk/main/svx/source/dialog/sendreportw32.cxx Thu Feb 21 16:37:14 2013
@@ -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) );
Modified: openoffice/trunk/main/swext/mediawiki/src/description.xml
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/swext/mediawiki/src/description.xml?rev=1448713&r1=1448712&r2=1448713&view=diff
==============================================================================
--- openoffice/trunk/main/swext/mediawiki/src/description.xml (original)
+++ openoffice/trunk/main/swext/mediawiki/src/description.xml Thu Feb 21 16:37:14 2013
@@ -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>
Modified: openoffice/trunk/main/sysui/desktop/debian/control
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sysui/desktop/debian/control?rev=1448713&r1=1448712&r2=1448713&view=diff
==============================================================================
--- openoffice/trunk/main/sysui/desktop/debian/control (original)
+++ openoffice/trunk/main/sysui/desktop/debian/control Thu Feb 21 16:37:14 2013
@@ -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
Modified: openoffice/trunk/main/sysui/desktop/freedesktop/freedesktop-menus.spec
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sysui/desktop/freedesktop/freedesktop-menus.spec?rev=1448713&r1=1448712&r2=1448713&view=diff
==============================================================================
--- openoffice/trunk/main/sysui/desktop/freedesktop/freedesktop-menus.spec (original)
+++ openoffice/trunk/main/sysui/desktop/freedesktop/freedesktop-menus.spec Thu Feb 21 16:37:14 2013
@@ -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
Modified: openoffice/trunk/main/sysui/desktop/mandriva/mandriva-menus.spec
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sysui/desktop/mandriva/mandriva-menus.spec?rev=1448713&r1=1448712&r2=1448713&view=diff
==============================================================================
--- openoffice/trunk/main/sysui/desktop/mandriva/mandriva-menus.spec (original)
+++ openoffice/trunk/main/sysui/desktop/mandriva/mandriva-menus.spec Thu Feb 21 16:37:14 2013
@@ -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
Modified: openoffice/trunk/main/sysui/desktop/productversion.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sysui/desktop/productversion.mk?rev=1448713&r1=1448712&r2=1448713&view=diff
==============================================================================
--- openoffice/trunk/main/sysui/desktop/productversion.mk (original)
+++ openoffice/trunk/main/sysui/desktop/productversion.mk Thu Feb 21 16:37:14 2013
@@ -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/./
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)
Modified: openoffice/trunk/main/sysui/desktop/redhat/redhat-menus.spec
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sysui/desktop/redhat/redhat-menus.spec?rev=1448713&r1=1448712&r2=1448713&view=diff
==============================================================================
--- openoffice/trunk/main/sysui/desktop/redhat/redhat-menus.spec (original)
+++ openoffice/trunk/main/sysui/desktop/redhat/redhat-menus.spec Thu Feb 21 16:37:14 2013
@@ -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
Modified: openoffice/trunk/main/sysui/desktop/share/brand.pl
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sysui/desktop/share/brand.pl?rev=1448713&r1=1448712&r2=1448713&view=diff
==============================================================================
--- openoffice/trunk/main/sysui/desktop/share/brand.pl (original)
+++ openoffice/trunk/main/sysui/desktop/share/brand.pl Thu Feb 21 16:37:14 2013
@@ -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 = "";
Modified: openoffice/trunk/main/sysui/desktop/share/create_mime_xml.pl
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sysui/desktop/share/create_mime_xml.pl?rev=1448713&r1=1448712&r2=1448713&view=diff
==============================================================================
--- openoffice/trunk/main/sysui/desktop/share/create_mime_xml.pl (original)
+++ openoffice/trunk/main/sysui/desktop/share/create_mime_xml.pl Thu Feb 21 16:37:14 2013
@@ -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
Modified: openoffice/trunk/main/sysui/desktop/share/translate.pl
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sysui/desktop/share/translate.pl?rev=1448713&r1=1448712&r2=1448713&view=diff
==============================================================================
--- openoffice/trunk/main/sysui/desktop/share/translate.pl (original)
+++ openoffice/trunk/main/sysui/desktop/share/translate.pl Thu Feb 21 16:37:14 2013
@@ -32,7 +32,7 @@ eval 'exec perl -wS $0 ${1+"$@"}'
#
my ($prefix, $ext, $key);
-$productname = "Apache OpenOffice";
+$productname = "OpenOffice";
$workdir = ".";
while ($_ = $ARGV[0], /^-/) {
Modified: openoffice/trunk/main/sysui/desktop/suse/suse-menus.spec
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sysui/desktop/suse/suse-menus.spec?rev=1448713&r1=1448712&r2=1448713&view=diff
==============================================================================
--- openoffice/trunk/main/sysui/desktop/suse/suse-menus.spec (original)
+++ openoffice/trunk/main/sysui/desktop/suse/suse-menus.spec Thu Feb 21 16:37:14 2013
@@ -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
Modified: openoffice/trunk/main/unotools/inc/unotools/configmgr.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/unotools/inc/unotools/configmgr.hxx?rev=1448713&r1=1448712&r2=1448713&view=diff
==============================================================================
--- openoffice/trunk/main/unotools/inc/unotools/configmgr.hxx (original)
+++ openoffice/trunk/main/unotools/inc/unotools/configmgr.hxx Thu Feb 21 16:37:14 2013
@@ -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);