Attachment #80310 for issue #121388

View | Details | Raw Unified | Return to issue 121388
Collapse All | Expand All





// INSTALL_PATH value needs to correspond to the Windows registry subkey
// in main\scp2\source\ooo\registryitem_ooo.scp
#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"

    for example c:/openoffice.org 3/program
   This path is either obtained from the environment variable UNO_PATH
   or the registry item
   "Software\\OpenOffice\\UNO\\InstallPath"
   either in HKEY_CURRENT_USER or HKEY_LOCAL_MACHINE
   The return value must be freed with delete[]
*/


    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\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.
*/

Lines 86-92 static char* getPathFromRegistryKey( HKEY hroot, const char* subKeyName ) Link Here

(-)a/main/cppuhelper/source/findsofficepath.c (-1 / +1 lines)
86	*/	86	*/
87	static char* platformSpecific()	87	static char* platformSpecific()
88	{	88	{
89	const char* SUBKEYNAME = "Software\\Apache OpenOffice\\UNO\\InstallPath";	89	const char* SUBKEYNAME = "Software\\OpenOffice\\UNO\\InstallPath";
90		90
91	char* path = NULL;	91	char* path = NULL;
92		92

Lines 33-39 ModalDialog RID_DEFAULTABOUT Link Here

(-)a/main/cui/source/dialogs/about.src (-2 / +2 lines)
33	Moveable = TRUE ;	33	Moveable = TRUE ;
34	SVLook = TRUE ;	34	SVLook = TRUE ;
35	Size = MAP_APPFONT ( 200 , 150 ) ;	35	Size = MAP_APPFONT ( 200 , 150 ) ;
36	Text [ en-US ] = "About %PRODUCTNAME" ;	36	Text [ en-US ] = "About %FULLPRODUCTNAME" ;
37	OKButton RID_CUI_ABOUT_BTN_OK	37	OKButton RID_CUI_ABOUT_BTN_OK
38	{	38	{
39	DefButton = TRUE ;	39	DefButton = TRUE ;
Lines 48-54 ModalDialog RID_DEFAULTABOUT Link Here
48	FixedText RID_CUI_ABOUT_FTXT_VERSION	48	FixedText RID_CUI_ABOUT_FTXT_VERSION
49	{	49	{
50	WordBreak = TRUE ;	50	WordBreak = TRUE ;
51	Text = "%PRODUCTNAME %ABOUTBOXPRODUCTVERSION %PRODUCTEXTENSION" ;	51	Text = "%FULLPRODUCTNAME %ABOUTBOXPRODUCTVERSION %PRODUCTEXTENSION" ;
52	};	52	};
53	MultiLineEdit RID_CUI_ABOUT_FTXT_BUILDDATA	53	MultiLineEdit RID_CUI_ABOUT_FTXT_BUILDDATA
54	{	54	{

Lines 409-414 namespace Link Here

(-)a/main/desktop/source/app/app.cxx (-1 / +10 lines)
409	{	409	{
410	struct BrandName	410	struct BrandName
411	: public rtl::Static< String, BrandName > {};	411	: public rtl::Static< String, BrandName > {};
		412	struct FullProductname
		413	: public rtl::Static< String, FullProductname > {};
412	struct Version	414	struct Version
413	: public rtl::Static< String, Version > {};	415	: public rtl::Static< String, Version > {};
414	struct AboutBoxVersion	416	struct AboutBoxVersion
Lines 430-438 void ReplaceStringHookProc( UniString& rStr ) Link Here
430	static int nAll = 0, nPro = 0;	432	static int nAll = 0, nPro = 0;
431		433
432	nAll++;	434	nAll++;
433	if ( rStr.SearchAscii( "%PRODUCT" ) != STRING_NOTFOUND )	435	if ( ( rStr.SearchAscii( "%PRODUCT" ) != STRING_NOTFOUND ) \|\|
		436	( rStr.SearchAscii( "%FULLPRODUCT" ) != STRING_NOTFOUND ) )
434	{	437	{
435	String &rBrandName = BrandName::get();	438	String &rBrandName = BrandName::get();
		439	String& rFullProductname = FullProductname::get();
436	String &rVersion = Version::get();	440	String &rVersion = Version::get();
437	String &rAboutBoxVersion = AboutBoxVersion::get();	441	String &rAboutBoxVersion = AboutBoxVersion::get();
438	String &rExtension = Extension::get();	442	String &rExtension = Extension::get();
Lines 446-451 void ReplaceStringHookProc( UniString& rStr ) Link Here
446	aRet >>= aTmp;	450	aRet >>= aTmp;
447	rBrandName = aTmp;	451	rBrandName = aTmp;
448		452
		453	aRet = ::utl::ConfigManager::GetDirectConfigProperty( ::utl::ConfigManager::FULLPRODUCTNAME );
		454	aRet >>= aTmp;
		455	rFullProductname = aTmp;
		456
449	aRet = ::utl::ConfigManager::GetDirectConfigProperty( ::utl::ConfigManager::PRODUCTXMLFILEFORMATNAME );	457	aRet = ::utl::ConfigManager::GetDirectConfigProperty( ::utl::ConfigManager::PRODUCTXMLFILEFORMATNAME );
450	aRet >>= aTmp;	458	aRet >>= aTmp;
451	rXMLFileFormatName = aTmp;	459	rXMLFileFormatName = aTmp;
Lines 472-477 void ReplaceStringHookProc( UniString& rStr ) Link Here
472		480
473	nPro++;	481	nPro++;
474	rStr.SearchAndReplaceAllAscii( "%PRODUCTNAME", rBrandName );	482	rStr.SearchAndReplaceAllAscii( "%PRODUCTNAME", rBrandName );
		483	rStr.SearchAndReplaceAllAscii( "%FULLPRODUCTNAME", rFullProductname );
475	rStr.SearchAndReplaceAllAscii( "%PRODUCTVERSION", rVersion );	484	rStr.SearchAndReplaceAllAscii( "%PRODUCTVERSION", rVersion );
476	rStr.SearchAndReplaceAllAscii( "%ABOUTBOXPRODUCTVERSION", rAboutBoxVersion );	485	rStr.SearchAndReplaceAllAscii( "%ABOUTBOXPRODUCTVERSION", rAboutBoxVersion );
477	rStr.SearchAndReplaceAllAscii( "%PRODUCTEXTENSION", rExtension );	486	rStr.SearchAndReplaceAllAscii( "%PRODUCTEXTENSION", rExtension );

Lines 220-226 Link Here

(-)a/main/helpcontent2/source/text/shared/00/00000021.xhp (-2 / +2 lines)
220	<paragraph xml-lang="en-US" id="par_id0519200811530440" role="tablecontent" l10n="NEW">2011-09-29</paragraph>	220	<paragraph xml-lang="en-US" id="par_id0519200811530440" role="tablecontent" l10n="NEW">2011-09-29</paragraph>
221	</tablecell>	221	</tablecell>
222	<tablecell>	222	<tablecell>
223	<paragraph role="tablecontent" id="par_id0519200811530471" xml-lang="en-US" l10n="NEW">OpenOffice.org 3, StarOffice 9, Apache Open Office</paragraph>	223	<paragraph role="tablecontent" id="par_id0519200811530471" xml-lang="en-US" l10n="NEW">OpenOffice.org 3, StarOffice 9</paragraph>
224	</tablecell>	224	</tablecell>
225	</tablerow>	225	</tablerow>
226	<tablerow>	226	<tablerow>
Lines 231-237 Link Here
231	<paragraph xml-lang="en-US" id="par_id100120091238112" role="tablecontent" l10n="NEW">-</paragraph>	231	<paragraph xml-lang="en-US" id="par_id100120091238112" role="tablecontent" l10n="NEW">-</paragraph>
232	</tablecell>	232	</tablecell>
233	<tablecell>	233	<tablecell>
234	<paragraph xml-lang="en-US" id="par_id1001200912381174" role="tablecontent" l10n="NEW">OpenOffice.org 3.2 or StarOffice 9.2</paragraph>	234	<paragraph xml-lang="en-US" id="par_id1001200912381174" role="tablecontent" l10n="NEW">OpenOffice.org 3.2, StarOffice 9.2</paragraph>
235	</tablecell>	235	</tablecell>
236	</tablerow>	236	</tablerow>
237	</table>	237	</table>

Lines 1-7 Link Here

(-)a/main/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt (-4 / +4 lines)
1	Signature_ Root Key Name Type	1	Signature_ Root Key Name Type
2	s72 i2 s255 S255 I2	2	s72 i2 s255 S255 I2
3	RegLocator Signature_	3	RegLocator Signature_
4	installuser 1 Software\Apache OpenOffice\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2	4	installuser 1 Software\OpenOffice\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2
5	installuser_ 1 Software\Apache OpenOffice\Layers_\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2	5	installuser_ 1 Software\OpenOffice\Layers_\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2
6	installmachine 2 Software\Apache OpenOffice\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2	6	installmachine 2 Software\OpenOffice\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2
7	installmachine_ 2 Software\Apache OpenOffice\Layers_\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2	7	installmachine_ 2 Software\OpenOffice\Layers_\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2

Lines 1-7 Link Here

(-)a/main/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt (-4 / +4 lines)
1	Signature_ Root Key Name Type	1	Signature_ Root Key Name Type
2	s72 i2 s255 S255 I2	2	s72 i2 s255 S255 I2
3	RegLocator Signature_	3	RegLocator Signature_
4	basisinstalluser 1 Software\Apache OpenOffice\Layers\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2	4	basisinstalluser 1 Software\OpenOffice\Layers\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2
5	basisinstalluser_ 1 Software\Apache OpenOffice\Layers_\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2	5	basisinstalluser_ 1 Software\OpenOffice\Layers_\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2
6	basisinstallmachine 2 Software\Apache OpenOffice\Layers\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2	6	basisinstallmachine 2 Software\OpenOffice\Layers\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2
7	basisinstallmachine_ 2 Software\Apache OpenOffice\Layers_\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2	7	basisinstallmachine_ 2 Software\OpenOffice\Layers_\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2




            OOOPACKAGEVERSION 4.0.0
            UREPACKAGEVERSION 4.0.0
            URELAYERVERSION 1
            BASISROOTNAME OpenOffice
            UNIXBASISROOTNAME openoffice
            HIDELICENSEDIALOG 1
            PACKAGEPREFIX 
            BASISPACKAGEPREFIX aoobasis

    {
        variables
        {
            FULLPRODUCTNAME Apache OpenOffice
            PRODUCTNAME OpenOffice
            PRODUCTVERSION 4.0.0
            PRODUCTEXTENSION 
            LONG_PRODUCTEXTENSION 

    {
        variables
        {
            FULLPRODUCTNAME Apache OpenOffice
            PRODUCTNAME OpenOffice
            PRODUCTVERSION 4.0.0
            PRODUCTEXTENSION 
            LONG_PRODUCTEXTENSION 

    {
        variables
        {
            FULLPRODUCTNAME AOO-Developer-Build
            PRODUCTNAME AOO-Developer-Build
            PRODUCTVERSION 4.0.0
            PRODUCTEXTENSION 

        downloadname URE_{productversion}_{os}_install_{languages}
        variables
        {
            FULLPRODUCTNAME URE
            PRODUCTNAME URE
            PRODUCTVERSION 4.0.0
            PACKAGEVERSION 4.0

        downloadname Apache_OpenOffice-SDK_{packageversion}_{os}_install_{languages}
        variables
        {
            FULLPRODUCTNAME Apache OpenOffice
            PRODUCTNAME OpenOffice
            PRODUCTVERSION 4.0.0
            PRODUCTEXTENSION
            LONG_PRODUCTEXTENSION

        downloadname Apache_OpenOffice-Dev-SDK_{packageversion}_{os}_install_{languages}
        variables
        {
            FULLPRODUCTNAME AOO-Developer-Build
            PRODUCTNAME AOO-Developer-Build
            PRODUCTVERSION 4.0.0
            PRODUCTEXTENSION




// examples of the Office Development Kit. The script duplicates the template
// script and inserts the variables into the copied script.
// The Script was developed for the operating systems Microsoft Windows.
var regKeyOfficeCurrentUser = "HKEY_CURRENT_USER\\Software\\OpenOffice\\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";

        "set OO_SDK_NAME=" + oo_sdk_name  +
        "\n\n" +
        "REM Installation directory of the Software Development Kit.\n" +
        "REM Example: set OO_SDK_HOME=C:\\Program Files\\OpenOffice\\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\\OpenOffice 4\n" +
        "set OFFICE_HOME=" + office_home +
        "\n\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\\OpenOffice\\URE\n" +
        "set OO_SDK_URE_HOME=" + oo_sdk_ure_home +
        "\n\n" +
        "REM Directory of the make command.\n" +




else
{
    # prepare URE path
    $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 (;;)


sub searchMacOffice
{
	if (-d "/Applications/OpenOffice.app" ) {
		return "/Applications/OpenOffice.app"
	}
	if (-d "/Applications/OpenOffice.org.app" ) {
		return "/Applications/OpenOffice.org.app"


sub searchoffice
{
	my $offset = rindex($main::sdkpath, "/openoffice");
	my $tmpOffice = substr($main::sdkpath, 0, $offset);
	my $officepath = "$tmpOffice/openoffice$main::OO_MAJORVERSION";

#	if ( $main::OO_MINORVERSION > 0) {
#		$officepath = "$officepath$main::OO_MINORVERSION";

Lines 188-194 Link Here

(-)a/main/odk/docs/install.html (-2 / +2 lines)
188	<tr valign="top">	188	<tr valign="top">
189	<td class="cell20"><b>OFFICE_HOME</b></td>	189	<td class="cell20"><b>OFFICE_HOME</b></td>
190	<td class="cell80">Path to an existing Apache OpenOffice	190	<td class="cell80">Path to an existing Apache OpenOffice
191	base installation, e.g. "/opt/apacheopenoffice3". Be sure	191	base installation, e.g. "/opt/openoffice3". Be sure
192	that it is not a user installation only. Exactly one of OFFICE_HOME	192	that it is not a user installation only. Exactly one of OFFICE_HOME
193	and OO_SDK_URE_HOME must be set. The other should be either unset or	193	and OO_SDK_URE_HOME must be set. The other should be either unset or
194	set to an empty value.</td>	194	set to an empty value.</td>
Lines 205-211 Link Here
205	<tr>	205	<tr>
206	<td class="cell20"><b>OO_SDK_URE_HOME</b></td>	206	<td class="cell20"><b>OO_SDK_URE_HOME</b></td>
207	<td class="cell80">Path to an existing UNO Runtime Environment	207	<td class="cell80">Path to an existing UNO Runtime Environment
208	installation, e.g. "/opt/apacheopenoffice/ure". Exactly one of	208	installation, e.g. "/opt/openoffice/ure". Exactly one of
209	OFFICE_HOME and OO_SDK_URE_HOME must be set. The other should be	209	OFFICE_HOME and OO_SDK_URE_HOME must be set. The other should be
210	either unset or set to an empty value.</td>	210	either unset or set to an empty value.</td>
211	</tr>	211	</tr>




export OO_SDK_NAME

# Installation directory of the Software Development Kit.
# Example: OO_SDK_HOME=/opt/openoffice/basis4.0/sdk
OO_SDK_HOME='@OO_SDK_HOME@'

# Office installation directory.
# Example: OFFICE_HOME=/opt/openoffice4
OFFICE_HOME='@OFFICE_HOME@'
OFFICE_BASE_HOME='@OFFICE_BASE_HOME@'

# URE installation directory.
# Example: OO_SDK_URE_HOME=/opt/openoffice/ure
OO_SDK_URE_HOME='@OO_SDK_URE_HOME@'
export OO_SDK_URE_HOME





set OO_SDK_NAME=apacheopenoffice4.0_sdk

REM Installation directory of the Software Development Kit.
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\OpenOffice 4
set OFFICE_HOME=

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\OpenOffice\URE
set OO_SDK_URE_HOME=

REM Directory of the make command.

Lines 188-194 final class InstallationFinder { Link Here

(-)a/main/odk/source/com/sun/star/lib/loader/InstallationFinder.java (-1 / +1 lines)
188	*/	188	*/
189	private static String getPathFromWindowsRegistry() {	189	private static String getPathFromWindowsRegistry() {
190		190
191	final String SUBKEYNAME = "Software\\Apache OpenOffice\\UNO\\InstallPath";	191	final String SUBKEYNAME = "Software\\OpenOffice\\UNO\\InstallPath";
192		192
193	String path = null;	193	String path = null;
194		194

Lines 61-67 void closeErrorFile(); Link Here

(-)a/main/odk/source/unoapploader/win/unoapploader.c (-1 / +1 lines)
61	* environment variable to the program directory of the UNO installation.	61	* environment variable to the program directory of the UNO installation.
62	* If no installation is specified by the user, the default installation on	62	* If no installation is specified by the user, the default installation on
63	* the system will be taken. The default installation is read from the	63	* the system will be taken. The default installation is read from the
64	* default value of the key "Software\Apache OpenOffice\UNO\InstallPath" from the	64	* default value of the key "Software\OpenOffice\UNO\InstallPath" from the
65	* root key HKEY_CURRENT_USER in the Windows Registry. If this key is missing,	65	* root key HKEY_CURRENT_USER in the Windows Registry. If this key is missing,
66	* the key is read from the root key HKEY_LOCAL_MACHINE.</p>	66	* the key is read from the root key HKEY_LOCAL_MACHINE.</p>
67	*/	67	*/

Lines 23-30 Link Here

(-)a/main/odk/util/makefile.pmk (-2 / +2 lines)
23		23
24	# used for sdk common files	24	# used for sdk common files
25	PRODUCT_RELEASE=4.0	25	PRODUCT_RELEASE=4.0
26	OFFICENAME=Apache OpenOffice	26	OFFICENAME=OpenOffice
27	SDKDIRNAME=apacheopenoffice$(PRODUCT_RELEASE)_sdk	27	SDKDIRNAME=openoffice$(PRODUCT_RELEASE)_sdk
28	OFFICEPRODUCTNAME=$(OFFICENAME) $(PRODUCT_RELEASE)	28	OFFICEPRODUCTNAME=$(OFFICENAME) $(PRODUCT_RELEASE)
29	TITLE=$(OFFICENAME) $(PRODUCT_RELEASE) SDK	29	TITLE=$(OFFICENAME) $(PRODUCT_RELEASE) SDK
30	IDLDOCREFNAME="$(OFFICENAME) $(PRODUCT_RELEASE) API"	30	IDLDOCREFNAME="$(OFFICENAME) $(PRODUCT_RELEASE) API"

Lines 27-32 Link Here

(-)a/main/officecfg/registry/data/org/openoffice/Setup.xcu (+3 lines)
27	<prop oor:name="ooName" install:module="brand">	27	<prop oor:name="ooName" install:module="brand">
28	<value >${PRODUCTNAME}</value>	28	<value >${PRODUCTNAME}</value>
29	</prop>	29	</prop>
		30	<prop oor:name="ooFullname" install:module="brand">
		31	<value >${FULLPRODUCTNAME}</value>
		32	</prop>
30	<prop oor:name="ooSetupVersion" install:module="brand">	33	<prop oor:name="ooSetupVersion" install:module="brand">
31	<value >${PRODUCTVERSION}</value>	34	<value >${PRODUCTVERSION}</value>
32	</prop>	35	</prop>




				<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="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>

Lines 310-316 ScVbaWindow::ScrollWorkbookTabs( const uno::Any& /Sheets/, const uno::Any& /*P Link Here

(-)a/main/sc/source/ui/vba/vbawindow.cxx (-1 / +1 lines)
310	uno::Any SAL_CALL	310	uno::Any SAL_CALL
311	ScVbaWindow::getCaption() throw (uno::RuntimeException)	311	ScVbaWindow::getCaption() throw (uno::RuntimeException)
312	{	312	{
313	static rtl::OUString sCrud(RTL_CONSTASCII_USTRINGPARAM(" - Apache OpenOffice Calc" ) );	313	static rtl::OUString sCrud(RTL_CONSTASCII_USTRINGPARAM(" - OpenOffice Calc" ) );
314	static sal_Int32 nCrudLen = sCrud.getLength();	314	static sal_Int32 nCrudLen = sCrud.getLength();
315		315
316	rtl::OUString sTitle;	316	rtl::OUString sTitle;




        ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
        ModuleID = modid; \
        Subkey = STRING(CONCAT3(.,key,\OpenWithProgIDs)); \
        Name = STRING(CONCAT2(OpenOffice.,name)); \
        Value = " "; \
    End


        ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
        ModuleID = modid; \
        Subkey = STRING(CONCAT3(.,key,\OpenWithProgIDs)); \
        Name = STRING(CONCAT2(OpenOffice.,name)); \
        Value = " "; \
    End


        ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
        ModuleID = gid_Module_Root_Reg_##name; \
        Subkey = STRING(CONCAT2(.,key)); \
        Value = STRING(CONCAT2(OpenOffice.,name)); \
        ComponentCondition = STRING(CONCAT3(REGISTER_,cond,=1)); \
    End


    RegistryItem CONCAT2(gid_Regitem_Openoffice_,name) \
        ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
        ModuleID = modid; \
        Subkey = STRING(CONCAT2(OpenOffice.,name)); \
        REG_VALUE_LNG(disp_name) \
    End


    RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Defaulticon) \
        ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
        ModuleID = modid; \
        Subkey = STRING(CONCAT3(OpenOffice.,name,\DefaultIcon)); \
        Value = "<progpath>\program\soffice.exe," STRING(icon_id); \
    End


    RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell) \
        ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
        ModuleID = modid; \
        Subkey = STRING(CONCAT3(OpenOffice.,name,\shell)); \
        Value = STRING(default); \
    End


    RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_New) \
        ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
        ModuleID = modid; \
        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(OpenOffice.,name,\shell\new\command)); \
        Value = "\"<progpath>\program\\" STRING(app) "\" -n \"%1\""; \
    End


    RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_Open_Command) \
        ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
        ModuleID = modid; \
        Subkey = STRING(CONCAT3(OpenOffice.,name,\shell\open\command)); \
        Value = "\"<progpath>\program\\" STRING(app) "\" -o \"%1\""; \
    End


    RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_Print_Command) \
        ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
        ModuleID = modid; \
        Subkey = STRING(CONCAT3(OpenOffice.,name,\shell\print\command)); \
        Value = "\"<progpath>\program\\" STRING(app) "\" -p \"%1\""; \
    End


    RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_Printto_Command) \
        ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
        ModuleID = modid; \
        Subkey = STRING(CONCAT3(OpenOffice.,name,\shell\printto\command)); \
        Value = "\"<progpath>\program\\" STRING(app) "\" -pt \"%2\" \"%1\""; \
    End


        ModuleID = modid; \
        Subkey = STRING(Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations); \
        Name = STRING(CONCAT2(.,key)); \
        Value = STRING(CONCAT2(OpenOffice.,name)); \
        Styles = (); \
    End


        ModuleID = modid; \
        Subkey = STRING(Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations); \
        Name = STRING(CONCAT2(.,key)); \
        Value = STRING(CONCAT2(OpenOffice.,name)); \
        Styles = (); \
    End






RegistryItem gid_Regitem_Software_Openoffice_Productname_Productversion_Path
	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
	Subkey = "Software\OpenOffice\%PRODUCTNAME\%PRODUCTVERSION";
	ModuleID = gid_Module_Root;
	Name = "Path";
	Value = "<progpath>\program\soffice.exe";


RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Install
	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
	Subkey = "Software\OpenOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
	ModuleID = gid_Module_Root;
	Name = "INSTALLLOCATION";
	Value = "[INSTALLLOCATION]";


RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Officeinstall
	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
	Subkey = "Software\OpenOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
	ModuleID = gid_Module_Root;
	Name = "OFFICEINSTALLLOCATION";
	Value = "[INSTALLLOCATION]";


RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Basisinstall
	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
	Subkey = "Software\OpenOffice\${REGISTRYLAYERNAME}\Basis\%OOOBASEVERSION";
	ModuleID = gid_Module_Root;
	Name = "BASISINSTALLLOCATION";
	Value = "[INSTALLLOCATION]Basis\\";


RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Basisinstall
	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
	Subkey = "Software\OpenOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
	ModuleID = gid_Module_Root;
	Name = "BASISINSTALLLOCATION";
	Value = "[INSTALLLOCATION]Basis\\";


RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Ureinstall
	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
	Subkey = "Software\OpenOffice\${REGISTRYLAYERNAME}\URE\%URELAYERVERSION";
	ModuleID = gid_Module_Root;
	Name = "UREINSTALLLOCATION";
	Value = "[INSTALLLOCATION]URE\\";


RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Ureinstall
	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
	Subkey = "Software\OpenOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
	ModuleID = gid_Module_Root;
	Name = "UREINSTALLLOCATION";
	Value = "[INSTALLLOCATION]URE\\";


RegistryItem gid_Regitem_Software_Openofficeorg_Uno_Installpath
    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
    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\OpenOffice\UNO\InstallPath";
    ModuleID = gid_Module_Root;
    Name = "%PRODUCTNAME %PRODUCTVERSION";
    Value  = "<progpath>\program";

Lines 1316-1322 End Link Here

(-)a/main/scp2/source/ooo/ure.scp (-1 / +1 lines)
1316	RegistryItem gid_Regitem_Path	1316	RegistryItem gid_Regitem_Path
1317	ModuleID = gid_Module_Root;	1317	ModuleID = gid_Module_Root;
1318	ParentID = PREDEFINED_HKEY_CLASSES_ROOT;	1318	ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
1319	Subkey = "Software\Apache OpenOffice\%PRODUCTNAME";	1319	Subkey = "Software\OpenOffice\%PRODUCTNAME";
1320	Name = "Path";	1320	Name = "Path";
1321	Value = "[INSTALLLOCATION]";	1321	Value = "[INSTALLLOCATION]";
1322	End	1322	End

Lines 38-46 End Link Here

(-)a/main/scp2/source/ooo/ure_standalone.scp (-2 / +2 lines)
38	Directory gid_Dir_Ooo_Openofficeorg	38	Directory gid_Dir_Ooo_Openofficeorg
39	ParentID = PREDEFINED_PROGDIR;	39	ParentID = PREDEFINED_PROGDIR;
40	#ifdef WNT	40	#ifdef WNT
41	HostName = "Apache OpenOffice";	41	HostName = "OpenOffice";
42	#else	42	#else
43	HostName = "apacheopenoffice";	43	HostName = "openoffice";
44	#endif	44	#endif
45	Styles = (ISINSTALLLOCATION);	45	Styles = (ISINSTALLLOCATION);
46	End	46	End

Lines 25-31 Link Here

(-)a/main/scp2/source/quickstart/registryitem_quickstart.scp (-1 / +1 lines)
25		25
26	RegistryItem gid_Regitem_Software_OpenOffice_Quickstarterinstalled	26	RegistryItem gid_Regitem_Software_OpenOffice_Quickstarterinstalled
27	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;	27	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
28	Subkey = "Software\Apache OpenOffice";	28	Subkey = "Software\OpenOffice";
29	ModuleID = gid_Module_Optional_Quickstart;	29	ModuleID = gid_Module_Optional_Quickstart;
30	Name = "QuickStarterInstalled";	30	Name = "QuickStarterInstalled";
31	Value = "1";	31	Value = "1";

Lines 77-84 RegistryItem gid_Regitem_Folder_shellex_ColumnHandlers_C52AF81D_F7A0_4AAB_8E87_F Link Here

(-)a/main/scp2/source/winexplorerext/registryitem_winexplorerext.scp (-2 / +2 lines)
77	ModuleID = gid_Module_Optional_Winexplorerext;	77	ModuleID = gid_Module_Optional_Winexplorerext;
78	Styles = (X64);	78	Styles = (X64);
79	Subkey = "Folder\shellex\ColumnHandlers\{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}";	79	Subkey = "Folder\shellex\ColumnHandlers\{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}";
80	Value = "Apache OpenOffice Column Handler";	80	Value = "OpenOffice Column Handler";
81	Val64 = "Apache OpenOffice Column Handler";	81	Val64 = "OpenOffice Column Handler";
82	End	82	End
83		83
84	RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer32	84	RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer32

Lines 28-35 Link Here

(-)a/main/sdext/source/minimizer/description.xml (-2 / +2 lines)
28	<identifier value="UPDATED_IDENTIFIER"/>	28	<identifier value="UPDATED_IDENTIFIER"/>
29		29
30	<dependencies>	30	<dependencies>
31	<OpenOffice.org-minimal-version value="4.0" dep:name="Apache OpenOffice"/>	31	<OpenOffice.org-minimal-version value="4.0" dep:name="OpenOffice"/>
32	<OpenOffice.org-maximal-version value="4.9" dep:name="Apache OpenOffice"/>	32	<OpenOffice.org-maximal-version value="4.9" dep:name="OpenOffice"/>
33	</dependencies>	33	</dependencies>
34		34
35	<registration>	35	<registration>

Lines 27-34 Link Here

(-)a/main/sdext/source/pdfimport/config/description.xml (-2 / +2 lines)
27	<identifier value="UPDATED_IDENTIFIER" />	27	<identifier value="UPDATED_IDENTIFIER" />
28		28
29	<dependencies>	29	<dependencies>
30	<OpenOffice.org-minimal-version value="4.0" dep:name="Apache OpenOffice"/>	30	<OpenOffice.org-minimal-version value="4.0" dep:name="OpenOffice"/>
31	<OpenOffice.org-maximal-version value="4.9" dep:name="Apache OpenOffice"/>	31	<OpenOffice.org-maximal-version value="4.9" dep:name="OpenOffice"/>
32	</dependencies>	32	</dependencies>
33		33
34	<registration>	34	<registration>

Lines 28-35 Link Here

(-)a/main/sdext/source/presenter/description.xml (-2 / +2 lines)
28	<identifier value="com.sun.PresenterScreen-UPDATED_SUPPORTED_PLATFORM" />	28	<identifier value="com.sun.PresenterScreen-UPDATED_SUPPORTED_PLATFORM" />
29		29
30	<dependencies>	30	<dependencies>
31	<OpenOffice.org-minimal-version value="4.0" dep:name="Apache OpenOffice"/>	31	<OpenOffice.org-minimal-version value="4.0" dep:name="OpenOffice"/>
32	<OpenOffice.org-maximal-version value="4.9" dep:name="Apache OpenOffice"/>	32	<OpenOffice.org-maximal-version value="4.9" dep:name="OpenOffice"/>
33	</dependencies>	33	</dependencies>
34		34
35	<registration>	35	<registration>




the version number which is part of a folder name. The
current value is:

EXTENSIONPATH=/opt/openoffice3/share/extension/install

The service was tested with OpenSolaris release 2009.6 and may not work with a
previous release. 


The three files constitute a SMF service. When this service is started, then it
installes the bundled extensions which are contained in
/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

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/openoffice3/share/extension/install, because
the newly installed 'installed' file does not contain any entries yet, except
for the version string.





#Create the folder which contains the temporary user installation
INSTDIR=`/usr/bin/mktemp -d "/tmp/userinstall.XXXXXX"`

OOO_BASE_DIR="/opt/openoffice/basis${OOOBASEVERSION}"

case "$1" in
'start')
    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

		#list. That is, it has not been installed (with unopkg) yet.
		#Therefore we do it now.
		echo installing $FILE
		/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

# 	    #share/extension/install. Now we remove the installed
# 	    #extension
# 	    echo removing `basename $LINE`
# 	    /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 

Lines 44-54 Linux) Link Here

(-)a/main/setup_native/source/packinfo/shellscripts_brand.txt (-3 / +3 lines)
44	esac	44	esac
45		45
46	# creating link to basis layer	46	# creating link to basis layer
47	if [ -d $$BASISDIR/apacheopenoffice/basisBASISDIRECTORYVERSION ]	47	if [ -d $$BASISDIR/openoffice/basisBASISDIRECTORYVERSION ]
48	then	48	then
49	ln -s $$BASISDIR/apacheopenoffice/basisBASISDIRECTORYVERSION $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/basis-link >/dev/null 2>&1	49	ln -s $$BASISDIR/openoffice/basisBASISDIRECTORYVERSION $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/basis-link >/dev/null 2>&1
50	else	50	else
51	ln -s ../apacheopenoffice/basisBASISDIRECTORYVERSION $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/basis-link >/dev/null 2>&1	51	ln -s ../openoffice/basisBASISDIRECTORYVERSION $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/basis-link >/dev/null 2>&1
52	fi	52	fi
53		53
54	exit 0	54	exit 0




esac

# creating link to ure
if [ -d $$UREDIR/openoffice/ure ]
then
      ln -s $$UREDIR/openoffice/ure $$PRODUCTINSTALLLOCATION/openoffice/basisBASISDIRECTORYVERSION/ure-link >/dev/null 2>&1
else
      ln -s ../ure $$PRODUCTINSTALLLOCATION/openoffice/basisBASISDIRECTORYVERSION/ure-link >/dev/null 2>&1
fi

exit 0

  ;;
esac

if [ -h $$PRODUCTINSTALLLOCATION/openoffice/basisBASISDIRECTORYVERSION/ure-link -a $$LASTUNINSTALL -eq 1 ]
then
  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

Lines 116-122 static BOOL CheckExtensionInRegistry( LPCSTR lpSubKey ) Link Here

(-)a/main/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx (-1 / +1 lines)
116	{ // We will replace registration for our (former) own types, too	116	{ // We will replace registration for our (former) own types, too
117	bRet = true;	117	bRet = true;
118	}	118	}
119	else if ( strncmp( szBuffer, "Apache OpenOffice.", 18 ) == 0 )	119	else if ( strncmp( szBuffer, "OpenOffice.", 11 ) == 0 )
120	{ // We will replace registration for our own types, too	120	{ // We will replace registration for our own types, too
121	bRet = true;	121	bRet = true;
122	}	122	}

Lines 77-86 namespace /* private */ Link Here

(-)a/main/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx (-2 / +2 lines)
77		77
78	Registrar::Registrar(const RegistrationContextInformation& RegContext) :	78	Registrar::Registrar(const RegistrationContextInformation& RegContext) :
79	m_ContextInformation(RegContext),	79	m_ContextInformation(RegContext),
80	FORWARD_KEY_PREFIX(L"Apache OpenOffice"),	80	FORWARD_KEY_PREFIX(L"OpenOffice"),
81	DEFAULT_VALUE_NAME(L""),	81	DEFAULT_VALUE_NAME(L""),
82	BACKUP_VALUE_NAME(L"Backup"),	82	BACKUP_VALUE_NAME(L"Backup"),
83	PRIVATE_BACKUP_KEY_NAME(L"Apache OpenOffice.reg4msdocmsi"),//PRIVATE_BACKUP_KEY_NAME(L"soffice6.bak"),	83	PRIVATE_BACKUP_KEY_NAME(L"OpenOffice.reg4msdocmsi"),//PRIVATE_BACKUP_KEY_NAME(L"soffice6.bak"),
84	REGISTRATION_STATE(L"Reg4MsDocState")	84	REGISTRATION_STATE(L"Reg4MsDocState")
85	{	85	{
86	m_RootKey = WindowsRegistry().GetClassesRootKey();	86	m_RootKey = WindowsRegistry().GetClassesRootKey();

Lines 158-164 extern "C" UINT __stdcall ShowSurveyAfter( MSIHANDLE handle ) Link Here

(-)a/main/setup_native/source/win32/customactions/relnotes/relnotes.cxx (-1 / +1 lines)
158	std::wstring prodname;	158	std::wstring prodname;
159		159
160	GetMsiProp( handle, TEXT("ProductName"), prodname );	160	GetMsiProp( handle, TEXT("ProductName"), prodname );
161	std::wstring::size_type nIndex = prodname.find( TEXT( "Apache OpenOffice" ) );	161	std::wstring::size_type nIndex = prodname.find( TEXT( "OpenOffice" ) );
162	if( std::wstring::npos == nIndex )	162	if( std::wstring::npos == nIndex )
163	return ERROR_SUCCESS;	163	return ERROR_SUCCESS;
164		164




    </MSDN>
    
    We add the following entries to the respective registry key
    "{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

    TCHAR* Value;
};

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 )
{

Lines 40-49 Link Here

(-)a/main/shell/inc/internal/config.hxx (-4 / +4 lines)
40	#define MODULE_NAME_FILTER TEXT("ooofilt.dll")	40	#define MODULE_NAME_FILTER TEXT("ooofilt.dll")
41	#endif	41	#endif
42		42
43	#define COLUMN_HANDLER_DESCRIPTIVE_NAME TEXT("Apache OpenOffice Column Handler")	43	#define COLUMN_HANDLER_DESCRIPTIVE_NAME TEXT("OpenOffice Column Handler")
44	#define INFOTIP_HANDLER_DESCRIPTIVE_NAME TEXT("Apache OpenOffice Infotip Handler")	44	#define INFOTIP_HANDLER_DESCRIPTIVE_NAME TEXT("OpenOffice Infotip Handler")
45	#define PROPSHEET_HANDLER_DESCRIPTIVE_NAME TEXT("Apache OpenOffice Property Sheet Handler")	45	#define PROPSHEET_HANDLER_DESCRIPTIVE_NAME TEXT("OpenOffice Property Sheet Handler")
46	#define THUMBVIEWER_HANDLER_DESCRIPTIVAE_NAME TEXT("Apache OpenOffice Thumbnail Viewer")	46	#define THUMBVIEWER_HANDLER_DESCRIPTIVAE_NAME TEXT("OpenOffice Thumbnail Viewer")
47		47
48	#define META_CONTENT_NAME "meta.xml"	48	#define META_CONTENT_NAME "meta.xml"
49	#define DOC_CONTENT_NAME "content.xml"	49	#define DOC_CONTENT_NAME "content.xml"

Lines 1225-1231 namespace /* private */ Link Here

(-)a/main/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx (-1 / +1 lines)
1225	SubstitutePlaceholder(ClsidEntry_Persist, GUID_PLACEHOLDER, ClsidToString(PersistentGuid));	1225	SubstitutePlaceholder(ClsidEntry_Persist, GUID_PLACEHOLDER, ClsidToString(PersistentGuid));
1226		1226
1227		1227
1228	if (!SetRegistryKey(HKEY_CLASSES_ROOT, ClsidEntry_Persist.c_str(), "", "Apache OpenOffice Persistent Handler"))	1228	if (!SetRegistryKey(HKEY_CLASSES_ROOT, ClsidEntry_Persist.c_str(), "", "OpenOffice Persistent Handler"))
1229	return E_FAIL;	1229	return E_FAIL;
1230		1230
1231	// Add missing entry	1231	// Add missing entry

Lines 56-66 struct PROPERTYMAP Link Here

(-)a/main/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx (-5 / +5 lines)
56		56
57	PROPERTYMAP g_rgPROPERTYMAP[] =	57	PROPERTYMAP g_rgPROPERTYMAP[] =
58	{	58	{
59	{ PKEY_Title, L"Apache OpenOffice", L"Title" },	59	{ PKEY_Title, L"OpenOffice", L"Title" },
60	{ PKEY_Author, L"Apache OpenOffice", L"Author" },	60	{ PKEY_Author, L"OpenOffice", L"Author" },
61	{ PKEY_Subject, L"Apache OpenOffice", L"Subject" },	61	{ PKEY_Subject, L"OpenOffice", L"Subject" },
62	{ PKEY_Keywords, L"Apache OpenOffice", L"Keyword" },	62	{ PKEY_Keywords, L"OpenOffice", L"Keyword" },
63	{ PKEY_Comment, L"Apache OpenOffice", L"Comments" },	63	{ PKEY_Comment, L"OpenOffice", L"Comments" },
64	};	64	};
65		65
66	size_t gPropertyMapTableSize = sizeof(g_rgPROPERTYMAP)/sizeof(g_rgPROPERTYMAP[0]);	66	size_t gPropertyMapTableSize = sizeof(g_rgPROPERTYMAP)/sizeof(g_rgPROPERTYMAP[0]);

Lines 1-7 Link Here

(-)a/main/shell/source/win32/shlxthandler/res/shlxthdl.manifest (-1 / +1 lines)
1	<?xml version="1.0" encoding="UTF-8" standalone="yes"?>	1	<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2	<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">	2	<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
3	<assemblyIdentity version="1.0.0.0" processorArchitecture="x86" name="Apache_OpenOffice.shlxthdl" type="win32" />	3	<assemblyIdentity version="1.0.0.0" processorArchitecture="x86" name="Apache_OpenOffice.shlxthdl" type="win32" />
4	<description>Apache OpenOffice Shell Extension</description>	4	<description>OpenOffice Shell Extension</description>
5	<dependency>	5	<dependency>
6	<dependentAssembly>	6	<dependentAssembly>
7	<assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="X86"	7	<assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="X86"

Lines 129-135 namespace /* private */ Link Here

(-)a/main/shell/source/win32/sysmail/sysmailclient.cxx (-1 / +1 lines)
129	{	129	{
130	rtl::OUString altSenddocUrl;	130	rtl::OUString altSenddocUrl;
131	HKEY hkey;	131	HKEY hkey;
132	LONG lret = RegOpenKeyW(HKEY_CURRENT_USER, L"Software\\Apache OpenOffice\\SendAsEMailClient", &hkey);	132	LONG lret = RegOpenKeyW(HKEY_CURRENT_USER, L"Software\\OpenOffice\\SendAsEMailClient", &hkey);
133	if (lret == ERROR_SUCCESS)	133	if (lret == ERROR_SUCCESS)
134	{	134	{
135	wchar_t buff[MAX_PATH];	135	wchar_t buff[MAX_PATH];

Lines 472-478 sub get_downloadname_productname Link Here

(-)a/main/solenv/bin/modules/installer/download.pm (-1 / +1 lines)
472	else	472	else
473	{	473	{
474	$start = "Apache_OpenOffice";	474	$start = "Apache_OpenOffice";
475	if ( $allvariables->{'PRODUCTNAME'} eq "Apache OpenOffice" )	475	if ( $allvariables->{'PRODUCTNAME'} eq "OpenOffice" )
476	{	476	{
477	if ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )	477	if ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )
478	{	478	{




	{
		# refer to the license in the matching AOO installation
		# TODO: sync AOO dest license full path with lpacks/sdks/exts
		my $licpath = "openoffice4/program/" . $licensefilename;
		$foundlicensefile = 1;
		$line = "%license " . $licpath . "\n";
		push(@epmheader, $line);

				}
			}

			if ( $installer::globals::debian && $variableshashref->{'UNIXPRODUCTNAME'} eq 'openoffice' )
			{
				$line = "%provides" . " openoffice.org-unbundled\n";
				push(@epmheader, $line);

	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);

Lines 333-339 sub replace_variables_in_scriptfile Link Here

(-)a/main/solenv/bin/modules/installer/simplepackage.pm (-1 / +1 lines)
333	replace_one_variable_in_shellscript($scriptfile, $allvariables->{'PRODUCTVERSION'}, "PRODUCTVERSION" );	333	replace_one_variable_in_shellscript($scriptfile, $allvariables->{'PRODUCTVERSION'}, "PRODUCTVERSION" );
334		334
335	my $scriptname = lc($allvariables->{'PRODUCTNAME'}) . "\.script";	335	my $scriptname = lc($allvariables->{'PRODUCTNAME'}) . "\.script";
336	if ( $allvariables->{'PRODUCTNAME'} eq "Apache OpenOffice" )	336	if ( $allvariables->{'PRODUCTNAME'} eq "OpenOffice" )
337	{	337	{
338	$scriptname = "org.openoffice.script";	338	$scriptname = "org.openoffice.script";
339	}	339	}

Lines 479-488 sub update_property_table Link Here

(-)a/main/solenv/bin/modules/installer/windows/property.pm (-4 lines)
479	my $arpcomments = get_arpcomments_for_property_table($allvariables, $languagestringref);	479	my $arpcomments = get_arpcomments_for_property_table($allvariables, $languagestringref);
480	my $installlevel = get_installlevel_for_property_table();	480	my $installlevel = get_installlevel_for_property_table();
481	my $ischeckforproductupdates = get_ischeckforproductupdates_for_property_table();	481	my $ischeckforproductupdates = get_ischeckforproductupdates_for_property_table();
482	# my $manufacturer = get_manufacturer_for_property_table();
483	# tweak publisher name in the registry to OOOVENDOR=Apache Software Foundation. The global change of the
484	# manufacturer from "OpenOffice.org" to "Apache Software Foundation" requires more analysis and testing
485	# because more registry entries/keys are potentially affected. For example test product updates etc.
486	my $manufacturer = $allvariables->{'OOOVENDOR'};	482	my $manufacturer = $allvariables->{'OOOVENDOR'};
487	my $productlanguage = get_productlanguage_for_property_table($language);	483	my $productlanguage = get_productlanguage_for_property_table($language);
488	my $productname = get_productname_for_property_table($allvariables);	484	my $productname = get_productname_for_property_table($allvariables);

Lines 639-645 sub set_manufacturer Link Here

(-)a/main/solenv/bin/modules/installer/ziplist.pm (-1 / +1 lines)
639	{	639	{
640	my ($allvariables) = @_;	640	my ($allvariables) = @_;
641		641
642	my $openofficeproductname = "Apache OpenOffice";	642	my $openofficeproductname = "OpenOffice";
643	my $sunname = "";	643	my $sunname = "";
644		644
645		645





String STR_SVT_MIMETYPE_APP_SXCALC
{
	Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Spreadsheet" ;
};

String STR_SVT_MIMETYPE_APP_SXCHART
{
	Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Chart" ;
};

String STR_SVT_MIMETYPE_APP_SXDRAW
{
	Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Drawing" ;
};

String STR_SVT_MIMETYPE_APP_SXMATH
{
	Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Formula" ;
};

String STR_SVT_MIMETYPE_APP_SXWRITER
{
	Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Text Document" ;
};

String STR_SVT_MIMETYPE_APP_SXIMPRESS
{
	Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Presentation" ;
};

String STR_SVT_MIMETYPE_APP_SXGLOBAL
{
	Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Master Document" ;
};

String STR_SVT_MIMETYPE_APP_SXIPACKED
{
	Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Presentation (packed)" ;
};






};
String STR_DESCRIPTION_CALC_TEMPLATE
{
	Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Spreadsheet Template" ;
};
String STR_DESCRIPTION_DRAW_TEMPLATE
{
	Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Drawing Template" ;
};
String STR_DESCRIPTION_IMPRESS_TEMPLATE
{
	Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Presentation Template" ;
};
String STR_DESCRIPTION_WRITER_TEMPLATE
{
	Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Text Document Template" ;
};
String STR_DESCRIPTION_LOCALE_VOLUME
{


String STR_DESCRIPTION_SXMATH_DOC
{
	Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Formula" ;
};

String STR_DESCRIPTION_SXCHART_DOC
{
	Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Chart" ;
};

String STR_DESCRIPTION_SXDRAW_DOC
{
	Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Drawing" ;
};

String STR_DESCRIPTION_SXCALC_DOC
{
	Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Spreadsheet" ;
};

String STR_DESCRIPTION_SXIMPRESS_DOC
{
	Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Presentation" ;
};

String STR_DESCRIPTION_SXWRITER_DOC
{
	Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Text Document" ;
};

String STR_DESCRIPTION_SXGLOBAL_DOC
{
	Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Master Document" ;
};
String STR_DESCRIPTION_MATHML_DOC
{





			if ( ERROR_SUCCESS == RegReadValue(
				HKEY_CURRENT_USER,
				TEXT("SOFTWARE\\OpenOffice\\CrashReport"),
				TEXT("HTTPProxyServer"),
				szBuffer,
				sizeof(szBuffer) ) )

			DWORD	dwProxyPort;
			if ( ERROR_SUCCESS == RegReadValue(
				HKEY_CURRENT_USER,
				TEXT("SOFTWARE\\OpenOffice\\CrashReport"),
				TEXT("HTTPProxyPort"),
				&dwProxyPort,
				sizeof(dwProxyPort) ) )


			if ( ERROR_SUCCESS == RegReadValue(
				HKEY_CURRENT_USER,
				TEXT("SOFTWARE\\OpenOffice\\CrashReport"),
				TEXT("ReturnAddress"),
				szBuffer,
				sizeof(szBuffer) ) )

			DWORD	fAllowContact = sal_False;
			RegReadValue(
				HKEY_CURRENT_USER,
				TEXT("SOFTWARE\\OpenOffice\\CrashReport"),
				TEXT("AllowContact"),
				&fAllowContact,
				sizeof(fAllowContact) );

			DWORD	uInternetConnection = 0;
			RegReadValue(
				HKEY_CURRENT_USER,
				TEXT("SOFTWARE\\OpenOffice\\CrashReport"),
				TEXT("HTTPConnection"),
				&uInternetConnection,
				sizeof(uInternetConnection) );

			const _TCHAR	*lpHTTPProxyServer = reinterpret_cast<LPCTSTR>(maParams.maHTTPProxyServer.GetBuffer());
			RegWriteValue(
				HKEY_CURRENT_USER,
				TEXT("SOFTWARE\\OpenOffice\\CrashReport"),
				TEXT("HTTPProxyServer"), REG_SZ,
				lpHTTPProxyServer,
				sizeof(TCHAR) * (_tcslen(lpHTTPProxyServer) + 1) );


			RegWriteValue(
				HKEY_CURRENT_USER,
				TEXT("SOFTWARE\\OpenOffice\\CrashReport"),
				TEXT("HTTPProxyPort"), REG_DWORD,
				&dwProxyPort,
				sizeof(DWORD) );

			DWORD	fAllowContact = IsContactAllowed();
			RegWriteValue(
				HKEY_CURRENT_USER,
				TEXT("SOFTWARE\\OpenOffice\\CrashReport"),
				TEXT("AllowContact"), REG_DWORD,
				&fAllowContact,
				sizeof(DWORD) );


			RegWriteValue(
				HKEY_CURRENT_USER,
				TEXT("SOFTWARE\\OpenOffice\\CrashReport"),
				TEXT("HTTPConnection"), REG_DWORD,
				&uInternetConnection,
				sizeof(DWORD) );

			const _TCHAR	*lpEmail = reinterpret_cast<LPCTSTR>(GetEMailAddress().GetBuffer());
			RegWriteValue(
				HKEY_CURRENT_USER,
				TEXT("SOFTWARE\\OpenOffice\\CrashReport"),
				TEXT("ReturnAddress"), REG_SZ,
				lpEmail,
				sizeof(TCHAR) * (_tcslen(lpEmail) + 1) );

Lines 31-38 Link Here

(-)a/main/swext/mediawiki/src/description.xml (-2 / +2 lines)
31	</simple-license>	31	</simple-license>
32	</registration>	32	</registration>
33	<dependencies>	33	<dependencies>
34	<OpenOffice.org-minimal-version value="4.0" d:name="Apache OpenOffice"/>	34	<OpenOffice.org-minimal-version value="4.0" d:name="OpenOffice"/>
35	<OpenOffice.org-maximal-version value="4.9" d:name="Apache OpenOffice"/>	35	<OpenOffice.org-maximal-version value="4.9" d:name="OpenOffice"/>
36	</dependencies>	36	</dependencies>
37	<publisher>	37	<publisher>
38	<name xlink:href="http://www.openoffice.org" lang="en">Apache Software Foundation</name>	38	<name xlink:href="http://www.openoffice.org" lang="en">Apache Software Foundation</name>

Lines 1-6 Link Here

(-)a/main/sysui/desktop/debian/control (-3 / +3 lines)
1	Description: %productname desktop integration	1	Description: %productname desktop integration
2	Maintainer: Apache Software Foundation	2	Maintainer: Apache Software Foundation
3	Architecture: all	3	Architecture: all
4	Provides: apache_openoffice-desktop-integration, openoffice.org-unbundled	4	Provides: openoffice-desktop-integration, openoffice.org-unbundled
5	Conflicts: apache_openoffice-desktop-integration, openofficeorg-desktop-integration, openofficeorg-debian-menus, openoffice.org-bundled	5	Conflicts: openoffice-desktop-integration, openofficeorg-desktop-integration, openofficeorg-debian-menus, openoffice.org-bundled
6	Replaces: apache_openoffice-desktop-integration, openofficeorg-debian-menus	6	Replaces: openoffice-desktop-integration, openofficeorg-debian-menus

Lines 27-33 Name: %pkgprefix-freedesktop-menus Link Here

(-)a/main/sysui/desktop/freedesktop/freedesktop-menus.spec (-1 / +1 lines)
27	#BuildRequires: perl	27	#BuildRequires: perl
28	Group: Office	28	Group: Office
29	License: ALv2	29	License: ALv2
30	Provides: apache_openoffice3-desktop-integration	30	Provides: openoffice-desktop-integration
31	Conflicts: %pkgprefix-suse-menus	31	Conflicts: %pkgprefix-suse-menus
32	Conflicts: %pkgprefix-debian-menus	32	Conflicts: %pkgprefix-debian-menus
33	Conflicts: %pkgprefix-redhat-menus	33	Conflicts: %pkgprefix-redhat-menus

Lines 33-39 BuildArch: noarch Link Here

(-)a/main/sysui/desktop/mandriva/mandriva-menus.spec (-1 / +1 lines)
33	# here and check for the 'mandriva-release' in the future (next year).	33	# here and check for the 'mandriva-release' in the future (next year).
34	#	34	#
35	Requires: mandrake-release	35	Requires: mandrake-release
36	Provides: apache_openoffice3-desktop-integration	36	Provides: openoffice-desktop-integration
37		37
38	%define _unpackaged_files_terminate_build 0	38	%define _unpackaged_files_terminate_build 0
39	%define _binary_filedigest_algorithm 1	39	%define _binary_filedigest_algorithm 1




# 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 = openoffice

# default values to minimize maintainance effort


UNIXWRAPPERNAME *= '$${{UNIXPRODUCTNAME}}$${{BRANDPACKAGEVERSION}}'

# CAUTION! $(UNIXBASISROOTNAME) from openoffice.lst NOT available (!)
PRODUCTNAME.openoffice = OpenOffice

PRODUCTVERSION.openoffice = $(PRODUCTVERSION)
PRODUCTVERSIONSHORT.openoffice = $(PRODUCTVERSIONSHORT)
PKGVERSION.openoffice = $(PKGVERSION)
UNIXFILENAME.openoffice = $(PRODUCTNAME.openoffice:l:s/ /_/g)$(PRODUCTVERSIONSHORT.openoffice)
ICONPREFIX.openoffice = $(UNIXFILENAME.openoffice:s/.//g)


Lines 29-35 Vendor: Apache Software Foundation Link Here

(-)a/main/sysui/desktop/redhat/redhat-menus.spec (-1 / +1 lines)
29	AutoReqProv: no	29	AutoReqProv: no
30	BuildArch: noarch	30	BuildArch: noarch
31	Requires: redhat-release	31	Requires: redhat-release
32	Provides: apache_openoffice3-desktop-integration	32	Provides: openoffice-desktop-integration
33	%define _unpackaged_files_terminate_build 0	33	%define _unpackaged_files_terminate_build 0
34	%define _binary_filedigest_algorithm 1	34	%define _binary_filedigest_algorithm 1
35	%define _binary_payload w9.gzdio	35	%define _binary_payload w9.gzdio

Lines 34-40 eval 'exec perl -wS $0 ${1+"$@"}' Link Here

(-)a/main/sysui/desktop/share/brand.pl (-1 / +1 lines)
34	$destdir = pop @ARGV;	34	$destdir = pop @ARGV;
35	mkdir $destdir,0777;	35	mkdir $destdir,0777;
36		36
37	$productname = "Apache OpenOffice";	37	$productname = "OpenOffice";
38	$productfilename = "apacheopenoffice";	38	$productfilename = "apacheopenoffice";
39	$prefix = "";	39	$prefix = "";
40	$iconprefix = "";	40	$iconprefix = "";

Lines 21-27 Link Here

(-)a/main/sysui/desktop/share/create_mime_xml.pl (-1 / +1 lines)
21	# *************************************************************	21	# *************************************************************
22	use File::Basename;	22	use File::Basename;
23	$basedir = dirname($0);	23	$basedir = dirname($0);
24	$productname = 'Apache OpenOffice';	24	$productname = 'OpenOffice';
25	$mimedir = $basedir.'/../mimetypes';	25	$mimedir = $basedir.'/../mimetypes';
26		26
27	$FS= ' '; # field seperator (space) - for documents.ulf	27	$FS= ' '; # field seperator (space) - for documents.ulf

Lines 32-38 eval 'exec perl -wS $0 ${1+"$@"}' Link Here

(-)a/main/sysui/desktop/share/translate.pl (-1 / +1 lines)
32	#	32	#
33		33
34	my ($prefix, $ext, $key);	34	my ($prefix, $ext, $key);
35	$productname = "Apache OpenOffice";	35	$productname = "OpenOffice";
36	$workdir = ".";	36	$workdir = ".";
37		37
38	while ($_ = $ARGV[0], /^-/) {	38	while ($_ = $ARGV[0], /^-/) {

Lines 32-38 BuildArch: noarch Link Here

(-)a/main/sysui/desktop/suse/suse-menus.spec (-1 / +1 lines)
32	Requires: /etc/SuSE-release	32	Requires: /etc/SuSE-release
33	# .. but not for Sun JDS	33	# .. but not for Sun JDS
34	Conflicts: SunDesktopVersion	34	Conflicts: SunDesktopVersion
35	Provides: apacheopenoffice3-desktop-integration	35	Provides: openoffice-desktop-integration
36	%define _unpackaged_files_terminate_build 0	36	%define _unpackaged_files_terminate_build 0
37	%define _binary_filedigest_algorithm 1	37	%define _binary_filedigest_algorithm 1
38	%define _binary_payload w9.gzdio	38	%define _binary_payload w9.gzdio

Lines 96-102 namespace utl Link Here

(-)a/main/unotools/inc/unotools/configmgr.hxx (-1 / +2 lines)
96	WRITERCOMPATIBILITYVERSIONOOO11,	96	WRITERCOMPATIBILITYVERSIONOOO11,
97	OPENSOURCECONTEXT,	97	OPENSOURCECONTEXT,
98	ABOUTBOXPRODUCTVERSION,	98	ABOUTBOXPRODUCTVERSION,
99	OOOVENDOR	99	OOOVENDOR,
		100	FULLPRODUCTNAME
100	};	101	};
101	//direct readonly access to some special configuration elements	102	//direct readonly access to some special configuration elements
102	static com::sun::star::uno::Any GetDirectConfigProperty(ConfigProperty eProp);	103	static com::sun::star::uno::Any GetDirectConfigProperty(ConfigProperty eProp);

Lines 62-67 namespace Link Here

(-)a/main/unotools/source/config/configmgr.cxx (+11 lines)
62	{	62	{
63	struct BrandName	63	struct BrandName
64	: public rtl::Static< ::rtl::OUString, BrandName > {};	64	: public rtl::Static< ::rtl::OUString, BrandName > {};
		65	struct FullProductname
		66	: public rtl::Static< ::rtl::OUString, FullProductname > {};
65	struct ProductVersion	67	struct ProductVersion
66	: public rtl::Static< ::rtl::OUString, ProductVersion > {};	68	: public rtl::Static< ::rtl::OUString, ProductVersion > {};
67	struct AboutBoxProductVersion	69	struct AboutBoxProductVersion
Lines 417-422 Any ConfigManager::GetDirectConfigProperty(ConfigProperty eProp) Link Here
417	return aRet;	419	return aRet;
418	}	420	}
419		421
		422	::rtl::OUString& rFullProductname = FullProductname::get();
		423	if ( eProp == FULLPRODUCTNAME && rFullProductname.getLength() )
		424	{
		425	aRet <<= rFullProductname;
		426	return aRet;
		427	}
		428
420	rtl::OUString &rProductVersion = ProductVersion::get();	429	rtl::OUString &rProductVersion = ProductVersion::get();
421	if ( eProp == PRODUCTVERSION && rProductVersion.getLength() )	430	if ( eProp == PRODUCTVERSION && rProductVersion.getLength() )
422	{	431	{
Lines 494-499 Any ConfigManager::GetDirectConfigProperty(ConfigProperty eProp) Link Here
494	case LOCALE: sPath += C2U("Setup/L10N"); break;	503	case LOCALE: sPath += C2U("Setup/L10N"); break;
495		504
496	case PRODUCTNAME:	505	case PRODUCTNAME:
		506	case FULLPRODUCTNAME:
497	case PRODUCTVERSION:	507	case PRODUCTVERSION:
498	case PRODUCTEXTENSION:	508	case PRODUCTEXTENSION:
499	case PRODUCTXMLFILEFORMATNAME :	509	case PRODUCTXMLFILEFORMATNAME :
Lines 531-536 Any ConfigManager::GetDirectConfigProperty(ConfigProperty eProp) Link Here
531	{	541	{
532	case LOCALE: sProperty = C2U("ooLocale"); break;	542	case LOCALE: sProperty = C2U("ooLocale"); break;
533	case PRODUCTNAME: sProperty = C2U("ooName"); break;	543	case PRODUCTNAME: sProperty = C2U("ooName"); break;
		544	case FULLPRODUCTNAME: sProperty = C2U("ooFullname"); break;
534	case PRODUCTVERSION: sProperty = C2U("ooSetupVersion"); break;	545	case PRODUCTVERSION: sProperty = C2U("ooSetupVersion"); break;
535	case ABOUTBOXPRODUCTVERSION: sProperty = C2U("ooSetupVersionAboutBox"); break;	546	case ABOUTBOXPRODUCTVERSION: sProperty = C2U("ooSetupVersionAboutBox"); break;
536	case OOOVENDOR: sProperty = C2U("ooVendor"); break;	547	case OOOVENDOR: sProperty = C2U("ooVendor"); break;

Lines 1167-1173 sal_Bool MiscSettings::GetEnableATToolSupport() const Link Here

(-)a/main/vcl/source/app/settings.cxx (-2 / +2 lines)
1167	HKEY hkey;	1167	HKEY hkey;
1168		1168
1169	if( ERROR_SUCCESS == RegOpenKey(HKEY_CURRENT_USER,	1169	if( ERROR_SUCCESS == RegOpenKey(HKEY_CURRENT_USER,
1170	"Software\\Aapche OpenOffice\\Accessibility\\AtToolSupport",	1170	"Software\\OpenOffice\\Accessibility\\AtToolSupport",
1171	&hkey) )	1171	&hkey) )
1172	{	1172	{
1173	DWORD dwType;	1173	DWORD dwType;
Lines 1245-1251 void MiscSettings::SetEnableATToolSupport( sal_Bool bEnable ) Link Here
1245		1245
1246	// If the accessibility key in the Windows registry exists, change it synchronously	1246	// If the accessibility key in the Windows registry exists, change it synchronously
1247	if( ERROR_SUCCESS == RegOpenKey(HKEY_CURRENT_USER,	1247	if( ERROR_SUCCESS == RegOpenKey(HKEY_CURRENT_USER,
1248	"Software\\Apache OpenOffice\\Accessibility\\AtToolSupport",	1248	"Software\\OpenOffice\\Accessibility\\AtToolSupport",
1249	&hkey) )	1249	&hkey) )
1250	{	1250	{
1251	DWORD dwType;	1251	DWORD dwType;

Lines 6302-6308 void ToolBox::ImplDisableFlatButtons() Link Here

(-)a/main/vcl/source/window/toolbox.cxx (-1 / +1 lines)
6302	HKEY hkey;	6302	HKEY hkey;
6303		6303
6304	if( ERROR_SUCCESS == RegOpenKey(HKEY_CURRENT_USER,	6304	if( ERROR_SUCCESS == RegOpenKey(HKEY_CURRENT_USER,
6305	"Software\\Apache OpenOffice\\Accessibility\\AtToolSupport",	6305	"Software\\OpenOffice\\Accessibility\\AtToolSupport",
6306	&hkey) )	6306	&hkey) )
6307	{	6307	{
6308	DWORD dwType = 0;	6308	DWORD dwType = 0;

Return to issue 121388

Lines 235-241 if ( $main::OFFICE_OR_URE eq "Office" ) Link Here

(-)a/main/odk/configure.pl (-5 / +5 lines)
235	else	235	else
236	{	236	{
237	# prepare URE path	237	# prepare URE path
238	$main::OO_SDK_URE_HOME_SUGGESTION = "/opt/apacheopenoffice/ure";	238	$main::OO_SDK_URE_HOME_SUGGESTION = "/opt/openoffice/ure";
239	$main::OO_SDK_URE_HOME_SUGGESTION = "" unless	239	$main::OO_SDK_URE_HOME_SUGGESTION = "" unless
240	-e "$main::OO_SDK_URE_HOME_SUGGESTION/bin/uno";	240	-e "$main::OO_SDK_URE_HOME_SUGGESTION/bin/uno";
241	for (;;)	241	for (;;)
Lines 711-718 sub searchprog Link Here
711		711
712	sub searchMacOffice	712	sub searchMacOffice
713	{	713	{
714	if (-d "/Applications/Apache OpenOffice.app" ) {	714	if (-d "/Applications/OpenOffice.app" ) {
715	return "/Applications/Apache OpenOffice.app"	715	return "/Applications/OpenOffice.app"
716	}	716	}
717	if (-d "/Applications/OpenOffice.org.app" ) {	717	if (-d "/Applications/OpenOffice.org.app" ) {
718	return "/Applications/OpenOffice.org.app"	718	return "/Applications/OpenOffice.org.app"
Lines 732-740 sub searchMacOffice Link Here
732		732
733	sub searchoffice	733	sub searchoffice
734	{	734	{
735	my $offset = rindex($main::sdkpath, "/apacheopenoffice");	735	my $offset = rindex($main::sdkpath, "/openoffice");
736	my $tmpOffice = substr($main::sdkpath, 0, $offset);	736	my $tmpOffice = substr($main::sdkpath, 0, $offset);
737	my $officepath = "$tmpOffice/apacheopenoffice$main::OO_MAJORVERSION";	737	my $officepath = "$tmpOffice/openoffice$main::OO_MAJORVERSION";
738		738
739	# if ( $main::OO_MINORVERSION > 0) {	739	# if ( $main::OO_MINORVERSION > 0) {
740	# $officepath = "$officepath$main::OO_MINORVERSION";	740	# $officepath = "$officepath$main::OO_MINORVERSION";

Lines 54-60 namespace cli_ure { Link Here

(-)a/main/cli_ure/source/native/native_bootstrap.cxx (-4 / +4 lines)
54		54
55	// INSTALL_PATH value needs to correspond to the Windows registry subkey	55	// INSTALL_PATH value needs to correspond to the Windows registry subkey
56	// in main\scp2\source\ooo\registryitem_ooo.scp	56	// in main\scp2\source\ooo\registryitem_ooo.scp
57	#define INSTALL_PATH L"Software\\Apache OpenOffice\\UNO\\InstallPath"	57	#define INSTALL_PATH L"Software\\OpenOffice\\UNO\\InstallPath"
58	#define BASIS_LINK L"\\basis-link"	58	#define BASIS_LINK L"\\basis-link"
59	#define URE_LINK L"\\ure-link"	59	#define URE_LINK L"\\ure-link"
60	#define URE_BIN L"\\bin"	60	#define URE_BIN L"\\bin"
Lines 130-136 void oneDirUp(LPTSTR io_path) Link Here
130	for example c:/openoffice.org 3/program	130	for example c:/openoffice.org 3/program
131	This path is either obtained from the environment variable UNO_PATH	131	This path is either obtained from the environment variable UNO_PATH
132	or the registry item	132	or the registry item
133	"Software\\Apache OpenOffice\\UNO\\InstallPath"	133	"Software\\OpenOffice\\UNO\\InstallPath"
134	either in HKEY_CURRENT_USER or HKEY_LOCAL_MACHINE	134	either in HKEY_CURRENT_USER or HKEY_LOCAL_MACHINE
135	The return value must be freed with delete[]	135	The return value must be freed with delete[]
136	*/	136	*/
Lines 332-339 namespace util Link Here
332		332
333	Bootstrapping requires the existence of many libraries which are contained	333	Bootstrapping requires the existence of many libraries which are contained
334	in an URE installation. To find and load these libraries the Windows	334	in an URE installation. To find and load these libraries the Windows
335	registry keys HKEY_CURRENT_USER\Software\Apache OpenOffice\Layer\URE\1	335	registry keys HKEY_CURRENT_USER\Software\OpenOffice\Layer\URE\1
336	and HKEY_LOCAL_MACHINE\Software\Apache OpenOffice\Layer\URE\1 are examined.	336	and HKEY_LOCAL_MACHINE\Software\OpenOffice\Layer\URE\1 are examined.
337	These contain a named value UREINSTALLLOCATION which holds a path to the URE	337	These contain a named value UREINSTALLLOCATION which holds a path to the URE
338	installation folder.	338	installation folder.
339	*/	339	*/

Lines 9-16 Globals Link Here

(-)a/main/instsetoo_native/util/openoffice.lst (-5 / +11 lines)
9	OOOPACKAGEVERSION 4.0.0	9	OOOPACKAGEVERSION 4.0.0
10	UREPACKAGEVERSION 4.0.0	10	UREPACKAGEVERSION 4.0.0
11	URELAYERVERSION 1	11	URELAYERVERSION 1
12	BASISROOTNAME ApacheOpenOffice	12	BASISROOTNAME OpenOffice
13	UNIXBASISROOTNAME apacheopenoffice	13	UNIXBASISROOTNAME openoffice
14	HIDELICENSEDIALOG 1	14	HIDELICENSEDIALOG 1
15	PACKAGEPREFIX	15	PACKAGEPREFIX
16	BASISPACKAGEPREFIX aoobasis	16	BASISPACKAGEPREFIX aoobasis
Lines 58-64 Apache_OpenOffice Link Here
58	{	58	{
59	variables	59	variables
60	{	60	{
61	PRODUCTNAME Apache OpenOffice	61	FULLPRODUCTNAME Apache OpenOffice
		62	PRODUCTNAME OpenOffice
62	PRODUCTVERSION 4.0.0	63	PRODUCTVERSION 4.0.0
63	PRODUCTEXTENSION	64	PRODUCTEXTENSION
64	LONG_PRODUCTEXTENSION	65	LONG_PRODUCTEXTENSION
Lines 117-123 Apache_OpenOffice_wJRE Link Here
117	{	118	{
118	variables	119	variables
119	{	120	{
120	PRODUCTNAME Apache OpenOffice	121	FULLPRODUCTNAME Apache OpenOffice
		122	PRODUCTNAME OpenOffice
121	PRODUCTVERSION 4.0.0	123	PRODUCTVERSION 4.0.0
122	PRODUCTEXTENSION	124	PRODUCTEXTENSION
123	LONG_PRODUCTEXTENSION	125	LONG_PRODUCTEXTENSION
Lines 176-181 Apache_OpenOffice_Dev Link Here
176	{	178	{
177	variables	179	variables
178	{	180	{
		181	FULLPRODUCTNAME AOO-Developer-Build
179	PRODUCTNAME AOO-Developer-Build	182	PRODUCTNAME AOO-Developer-Build
180	PRODUCTVERSION 4.0.0	183	PRODUCTVERSION 4.0.0
181	PRODUCTEXTENSION	184	PRODUCTEXTENSION
Lines 244-249 URE Link Here
244	downloadname URE_{productversion}_{os}_install_{languages}	247	downloadname URE_{productversion}_{os}_install_{languages}
245	variables	248	variables
246	{	249	{
		250	FULLPRODUCTNAME URE
247	PRODUCTNAME URE	251	PRODUCTNAME URE
248	PRODUCTVERSION 4.0.0	252	PRODUCTVERSION 4.0.0
249	PACKAGEVERSION 4.0	253	PACKAGEVERSION 4.0
Lines 286-292 Apache_OpenOffice_SDK Link Here
286	downloadname Apache_OpenOffice-SDK_{packageversion}_{os}_install_{languages}	290	downloadname Apache_OpenOffice-SDK_{packageversion}_{os}_install_{languages}
287	variables	291	variables
288	{	292	{
289	PRODUCTNAME Apache OpenOffice	293	FULLPRODUCTNAME Apache OpenOffice
		294	PRODUCTNAME OpenOffice
290	PRODUCTVERSION 4.0.0	295	PRODUCTVERSION 4.0.0
291	PRODUCTEXTENSION	296	PRODUCTEXTENSION
292	LONG_PRODUCTEXTENSION	297	LONG_PRODUCTEXTENSION
Lines 333-338 Apache_OpenOffice_Dev_SDK Link Here
333	downloadname Apache_OpenOffice-Dev-SDK_{packageversion}_{os}_install_{languages}	338	downloadname Apache_OpenOffice-Dev-SDK_{packageversion}_{os}_install_{languages}
334	variables	339	variables
335	{	340	{
		341	FULLPRODUCTNAME AOO-Developer-Build
336	PRODUCTNAME AOO-Developer-Build	342	PRODUCTNAME AOO-Developer-Build
337	PRODUCTVERSION 4.0.0	343	PRODUCTVERSION 4.0.0
338	PRODUCTEXTENSION	344	PRODUCTEXTENSION

Lines 22-29 Link Here

(-)a/main/odk/cfgWin.js (-6 / +6 lines)
22	// examples of the Office Development Kit. The script duplicates the template	22	// examples of the Office Development Kit. The script duplicates the template
23	// script and inserts the variables into the copied script.	23	// script and inserts the variables into the copied script.
24	// The Script was developed for the operating systems Microsoft Windows.	24	// The Script was developed for the operating systems Microsoft Windows.
25	var regKeyOfficeCurrentUser = "HKEY_CURRENT_USER\\Software\\Apache OpenOffice\\UNO\\InstallPath\\";	25	var regKeyOfficeCurrentUser = "HKEY_CURRENT_USER\\Software\\OpenOffice\\UNO\\InstallPath\\";
26	var regKeyOfficeLocaleMachine = "HKEY_LOCAL_MACHINE\\Software\\Apache OpenOffice\\UNO\\InstallPath\\";	26	var regKeyOfficeLocaleMachine = "HKEY_LOCAL_MACHINE\\Software\\OpenOffice\\UNO\\InstallPath\\";
27	var regKeyDotNetInstallRoot = "HKEY_LOCAL_MACHINE\\Software\\Microsoft\\.NETFramework\\InstallRoot";	27	var regKeyDotNetInstallRoot = "HKEY_LOCAL_MACHINE\\Software\\Microsoft\\.NETFramework\\InstallRoot";
28	var regKeyDotNet1_1 = "HKLM\\Software\\Microsoft\\.NETFramework\\policy\\v1.1\\4322";	28	var regKeyDotNet1_1 = "HKLM\\Software\\Microsoft\\.NETFramework\\policy\\v1.1\\4322";
29	var sDirDotNet1_1 = "v1.1.4322";	29	var sDirDotNet1_1 = "v1.1.4322";
Lines 923-940 function writeBatFile(fdir, file) Link Here
923	"set OO_SDK_NAME=" + oo_sdk_name +	923	"set OO_SDK_NAME=" + oo_sdk_name +
924	"\n\n" +	924	"\n\n" +
925	"REM Installation directory of the Software Development Kit.\n" +	925	"REM Installation directory of the Software Development Kit.\n" +
926	"REM Example: set OO_SDK_HOME=C:\\Program Files\\Apache OpenOffice\\Basic 4.0\\sdk\n" +	926	"REM Example: set OO_SDK_HOME=C:\\Program Files\\OpenOffice\\Basic 4.0\\sdk\n" +
927	"set OO_SDK_HOME=" + oo_sdk_home +	927	"set OO_SDK_HOME=" + oo_sdk_home +
928	"\n\n" +	928	"\n\n" +
929	"REM Office installation directory.\n" +	929	"REM Office installation directory.\n" +
930	"REM Example: set OFFICE_HOME=C:\\Program Files\\Apache OpenOffice 4\n" +	930	"REM Example: set OFFICE_HOME=C:\\Program Files\\OpenOffice 4\n" +
931	"set OFFICE_HOME=" + office_home +	931	"set OFFICE_HOME=" + office_home +
932	"\n\n" +	932	"\n\n" +
933	"REM Example: set OFFICE_HOME=C:\\Program Files\\Apache OpenOffice\\Basis 4.0\n" +	933	"REM Example: set OFFICE_HOME=C:\\Program Files\\OpenOffice\\Basis 4.0\n" +
934	"set OFFICE_BASE_HOME=" + office_base_home +	934	"set OFFICE_BASE_HOME=" + office_base_home +
935	"\n\n" +	935	"\n\n" +
936	"REM URE installation directory.\n" +	936	"REM URE installation directory.\n" +
937	"REM Example: set OO_SDK_URE_HOME=C:\\Program Files\\Apache OpenOffice\\URE\n" +	937	"REM Example: set OO_SDK_URE_HOME=C:\\Program Files\\OpenOffice\\URE\n" +
938	"set OO_SDK_URE_HOME=" + oo_sdk_ure_home +	938	"set OO_SDK_URE_HOME=" + oo_sdk_ure_home +
939	"\n\n" +	939	"\n\n" +
940	"REM Directory of the make command.\n" +	940	"REM Directory of the make command.\n" +

Lines 29-44 OO_SDK_NAME=@OO_SDK_NAME@ Link Here

(-)a/main/odk/setsdkenv_unix.sh.in (-3 / +3 lines)
29	export OO_SDK_NAME	29	export OO_SDK_NAME
30		30
31	# Installation directory of the Software Development Kit.	31	# Installation directory of the Software Development Kit.
32	# Example: OO_SDK_HOME=/opt/apacheopenoffice/basis4.0/sdk	32	# Example: OO_SDK_HOME=/opt/openoffice/basis4.0/sdk
33	OO_SDK_HOME='@OO_SDK_HOME@'	33	OO_SDK_HOME='@OO_SDK_HOME@'
34		34
35	# Office installation directory.	35	# Office installation directory.
36	# Example: OFFICE_HOME=/opt/apacheopenoffice4	36	# Example: OFFICE_HOME=/opt/openoffice4
37	OFFICE_HOME='@OFFICE_HOME@'	37	OFFICE_HOME='@OFFICE_HOME@'
38	OFFICE_BASE_HOME='@OFFICE_BASE_HOME@'	38	OFFICE_BASE_HOME='@OFFICE_BASE_HOME@'
39		39
40	# URE installation directory.	40	# URE installation directory.
41	# Example: OO_SDK_URE_HOME=/opt/apacheopenoffice/ure	41	# Example: OO_SDK_URE_HOME=/opt/openoffice/ure
42	OO_SDK_URE_HOME='@OO_SDK_URE_HOME@'	42	OO_SDK_URE_HOME='@OO_SDK_URE_HOME@'
43	export OO_SDK_URE_HOME	43	export OO_SDK_URE_HOME
44		44

Lines 27-44 REM Example: set OO_SDK_NAME=apacheopenoffice4.0_sdk Link Here

(-)a/main/odk/setsdkenv_windows.template (-4 / +4 lines)
27	set OO_SDK_NAME=apacheopenoffice4.0_sdk	27	set OO_SDK_NAME=apacheopenoffice4.0_sdk
28		28
29	REM Installation directory of the Software Development Kit.	29	REM Installation directory of the Software Development Kit.
30	REM Example: set OO_SDK_HOME=C:\Program Files\Apache OpenOffice\Basic 4.0\sdk	30	REM Example: set OO_SDK_HOME=C:\Program Files\OpenOffice\Basic 4.0\sdk
31	set OO_SDK_HOME=	31	set OO_SDK_HOME=
32		32
33	REM Office installation directory.	33	REM Office installation directory.
34	REM Example: set OFFICE_HOME=C:\Program Files\Apache OpenOffice 4	34	REM Example: set OFFICE_HOME=C:\Program Files\OpenOffice 4
35	set OFFICE_HOME=	35	set OFFICE_HOME=
36		36
37	REM Example: set OFFICE_HOME=C:\Program Files\Apache OpenOffice\Basis 4.0	37	REM Example: set OFFICE_HOME=C:\Program Files\OpenOffice\Basis 4.0
38	set OFFICE_BASE_HOME=	38	set OFFICE_BASE_HOME=
39		39
40	REM URE installation directory.	40	REM URE installation directory.
41	REM Example: set OO_SDK_URE_HOME=C:\Program Files\Apache OpenOffice\URE	41	REM Example: set OO_SDK_URE_HOME=C:\Program Files\OpenOffice\URE
42	set OO_SDK_URE_HOME=	42	set OO_SDK_URE_HOME=
43		43
44	REM Directory of the make command.	44	REM Directory of the make command.

Lines 228-241 Link Here

(-)a/main/officecfg/registry/schema/org/openoffice/Setup.xcs (-8 / +15 lines)
228	<desc>Contains common product and version information</desc>	228	<desc>Contains common product and version information</desc>
229	</info>	229	</info>
230	<!--The default must be written by the setup.-->	230	<!--The default must be written by the setup.-->
231	<prop oor:name="ooName" oor:type="xs:string">	231	<prop oor:name="ooName" oor:type="xs:string">
232	<info>	232	<info>
233	<desc>Specifies the name of a product.</desc>	233	<desc>Specifies the name of a product.</desc>
234	</info>	234	</info>
235	<value/>	235	<value/>
236	<!-- JB: Empty default inserted into empty property node. Remove if NIL was intended -->	236	<!-- JB: Empty default inserted into empty property node. Remove if NIL was intended -->
237	</prop>	237	</prop>
238	<prop oor:name="ooXMLFileFormatVersion" oor:type="xs:string">	238	<prop oor:name="ooFullname" oor:type="xs:string">
		239	<info>
		240	<author>orw</author>
		241	<desc>Specifies the full name of a product.</desc>
		242	</info>
		243	<value/>
		244	</prop>
		245	<prop oor:name="ooXMLFileFormatVersion" oor:type="xs:string">
239	<info>	246	<info>
240	<desc>Specifies the version of the SO 6/7 or OOo 1.0 xml file formats.</desc>	247	<desc>Specifies the version of the SO 6/7 or OOo 1.0 xml file formats.</desc>
241	</info>	248	</info>

Lines 386-392 End Link Here

(-)a/main/scp2/inc/macros.inc (-13 / +13 lines)
386	ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \	386	ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
387	ModuleID = modid; \	387	ModuleID = modid; \
388	Subkey = STRING(CONCAT3(.,key,\OpenWithProgIDs)); \	388	Subkey = STRING(CONCAT3(.,key,\OpenWithProgIDs)); \
389	Name = STRING(CONCAT2(Apache OpenOffice.,name)); \	389	Name = STRING(CONCAT2(OpenOffice.,name)); \
390	Value = " "; \	390	Value = " "; \
391	End	391	End
392		392
Lines 395-401 End Link Here
395	ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \	395	ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
396	ModuleID = modid; \	396	ModuleID = modid; \
397	Subkey = STRING(CONCAT3(.,key,\OpenWithProgIDs)); \	397	Subkey = STRING(CONCAT3(.,key,\OpenWithProgIDs)); \
398	Name = STRING(CONCAT2(Apache OpenOffice.,name)); \	398	Name = STRING(CONCAT2(OpenOffice.,name)); \
399	Value = " "; \	399	Value = " "; \
400	End	400	End
401		401
Lines 404-410 End Link Here
404	ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \	404	ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
405	ModuleID = gid_Module_Root_Reg_##name; \	405	ModuleID = gid_Module_Root_Reg_##name; \
406	Subkey = STRING(CONCAT2(.,key)); \	406	Subkey = STRING(CONCAT2(.,key)); \
407	Value = STRING(CONCAT2(Apache OpenOffice.,name)); \	407	Value = STRING(CONCAT2(OpenOffice.,name)); \
408	ComponentCondition = STRING(CONCAT3(REGISTER_,cond,=1)); \	408	ComponentCondition = STRING(CONCAT3(REGISTER_,cond,=1)); \
409	End	409	End
410		410
Lines 412-418 End Link Here
412	RegistryItem CONCAT2(gid_Regitem_Openoffice_,name) \	412	RegistryItem CONCAT2(gid_Regitem_Openoffice_,name) \
413	ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \	413	ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
414	ModuleID = modid; \	414	ModuleID = modid; \
415	Subkey = STRING(CONCAT2(Apache OpenOffice.,name)); \	415	Subkey = STRING(CONCAT2(OpenOffice.,name)); \
416	REG_VALUE_LNG(disp_name) \	416	REG_VALUE_LNG(disp_name) \
417	End	417	End
418		418
Lines 420-426 End Link Here
420	RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Defaulticon) \	420	RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Defaulticon) \
421	ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \	421	ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
422	ModuleID = modid; \	422	ModuleID = modid; \
423	Subkey = STRING(CONCAT3(Apache OpenOffice.,name,\DefaultIcon)); \	423	Subkey = STRING(CONCAT3(OpenOffice.,name,\DefaultIcon)); \
424	Value = "<progpath>\program\soffice.exe," STRING(icon_id); \	424	Value = "<progpath>\program\soffice.exe," STRING(icon_id); \
425	End	425	End
426		426
Lines 428-434 End Link Here
428	RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell) \	428	RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell) \
429	ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \	429	ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
430	ModuleID = modid; \	430	ModuleID = modid; \
431	Subkey = STRING(CONCAT3(Apache OpenOffice.,name,\shell)); \	431	Subkey = STRING(CONCAT3(OpenOffice.,name,\shell)); \
432	Value = STRING(default); \	432	Value = STRING(default); \
433	End	433	End
434		434
Lines 436-448 End Link Here
436	RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_New) \	436	RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_New) \
437	ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \	437	ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
438	ModuleID = modid; \	438	ModuleID = modid; \
439	Subkey = STRING(CONCAT3(Apache OpenOffice.,name,\shell\new)); \	439	Subkey = STRING(CONCAT3(OpenOffice.,name,\shell\new)); \
440	REG_VALUE_LNG(NEW) \	440	REG_VALUE_LNG(NEW) \
441	End \	441	End \
442	RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_New_Command) \	442	RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_New_Command) \
443	ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \	443	ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
444	ModuleID = modid; \	444	ModuleID = modid; \
445	Subkey = STRING(CONCAT3(Apache OpenOffice.,name,\shell\new\command)); \	445	Subkey = STRING(CONCAT3(OpenOffice.,name,\shell\new\command)); \
446	Value = "\"<progpath>\program\\" STRING(app) "\" -n \"%1\""; \	446	Value = "\"<progpath>\program\\" STRING(app) "\" -n \"%1\""; \
447	End	447	End
448		448
Lines 450-456 End Link Here
450	RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_Open_Command) \	450	RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_Open_Command) \
451	ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \	451	ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
452	ModuleID = modid; \	452	ModuleID = modid; \
453	Subkey = STRING(CONCAT3(Apache OpenOffice.,name,\shell\open\command)); \	453	Subkey = STRING(CONCAT3(OpenOffice.,name,\shell\open\command)); \
454	Value = "\"<progpath>\program\\" STRING(app) "\" -o \"%1\""; \	454	Value = "\"<progpath>\program\\" STRING(app) "\" -o \"%1\""; \
455	End	455	End
456		456
Lines 458-464 End Link Here
458	RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_Print_Command) \	458	RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_Print_Command) \
459	ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \	459	ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
460	ModuleID = modid; \	460	ModuleID = modid; \
461	Subkey = STRING(CONCAT3(Apache OpenOffice.,name,\shell\print\command)); \	461	Subkey = STRING(CONCAT3(OpenOffice.,name,\shell\print\command)); \
462	Value = "\"<progpath>\program\\" STRING(app) "\" -p \"%1\""; \	462	Value = "\"<progpath>\program\\" STRING(app) "\" -p \"%1\""; \
463	End	463	End
464		464
Lines 466-472 End Link Here
466	RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_Printto_Command) \	466	RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_Printto_Command) \
467	ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \	467	ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
468	ModuleID = modid; \	468	ModuleID = modid; \
469	Subkey = STRING(CONCAT3(Apache OpenOffice.,name,\shell\printto\command)); \	469	Subkey = STRING(CONCAT3(OpenOffice.,name,\shell\printto\command)); \
470	Value = "\"<progpath>\program\\" STRING(app) "\" -pt \"%2\" \"%1\""; \	470	Value = "\"<progpath>\program\\" STRING(app) "\" -pt \"%2\" \"%1\""; \
471	End	471	End
472		472
Lines 476-482 End Link Here
476	ModuleID = modid; \	476	ModuleID = modid; \
477	Subkey = STRING(Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations); \	477	Subkey = STRING(Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations); \
478	Name = STRING(CONCAT2(.,key)); \	478	Name = STRING(CONCAT2(.,key)); \
479	Value = STRING(CONCAT2(Apache OpenOffice.,name)); \	479	Value = STRING(CONCAT2(OpenOffice.,name)); \
480	Styles = (); \	480	Styles = (); \
481	End	481	End
482		482
Lines 486-492 End Link Here
486	ModuleID = modid; \	486	ModuleID = modid; \
487	Subkey = STRING(Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations); \	487	Subkey = STRING(Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations); \
488	Name = STRING(CONCAT2(.,key)); \	488	Name = STRING(CONCAT2(.,key)); \
489	Value = STRING(CONCAT2(Apache OpenOffice.,name)); \	489	Value = STRING(CONCAT2(OpenOffice.,name)); \
490	Styles = (); \	490	Styles = (); \
491	End	491	End
492		492

Lines 247-253 End Link Here

(-)a/main/scp2/source/ooo/registryitem_ooo.scp (-9 / +9 lines)
247		247
248	RegistryItem gid_Regitem_Software_Openoffice_Productname_Productversion_Path	248	RegistryItem gid_Regitem_Software_Openoffice_Productname_Productversion_Path
249	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;	249	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
250	Subkey = "Software\Apache OpenOffice\%PRODUCTNAME\%PRODUCTVERSION";	250	Subkey = "Software\OpenOffice\%PRODUCTNAME\%PRODUCTVERSION";
251	ModuleID = gid_Module_Root;	251	ModuleID = gid_Module_Root;
252	Name = "Path";	252	Name = "Path";
253	Value = "<progpath>\program\soffice.exe";	253	Value = "<progpath>\program\soffice.exe";
Lines 273-279 End Link Here
273		273
274	RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Install	274	RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Install
275	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;	275	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
276	Subkey = "Software\Apache OpenOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";	276	Subkey = "Software\OpenOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
277	ModuleID = gid_Module_Root;	277	ModuleID = gid_Module_Root;
278	Name = "INSTALLLOCATION";	278	Name = "INSTALLLOCATION";
279	Value = "[INSTALLLOCATION]";	279	Value = "[INSTALLLOCATION]";
Lines 318-324 End Link Here
318		318
319	RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Officeinstall	319	RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Officeinstall
320	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;	320	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
321	Subkey = "Software\Apache OpenOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";	321	Subkey = "Software\OpenOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
322	ModuleID = gid_Module_Root;	322	ModuleID = gid_Module_Root;
323	Name = "OFFICEINSTALLLOCATION";	323	Name = "OFFICEINSTALLLOCATION";
324	Value = "[INSTALLLOCATION]";	324	Value = "[INSTALLLOCATION]";
Lines 345-351 End Link Here
345		345
346	RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Basisinstall	346	RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Basisinstall
347	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;	347	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
348	Subkey = "Software\Apache OpenOffice\${REGISTRYLAYERNAME}\Basis\%OOOBASEVERSION";	348	Subkey = "Software\OpenOffice\${REGISTRYLAYERNAME}\Basis\%OOOBASEVERSION";
349	ModuleID = gid_Module_Root;	349	ModuleID = gid_Module_Root;
350	Name = "BASISINSTALLLOCATION";	350	Name = "BASISINSTALLLOCATION";
351	Value = "[INSTALLLOCATION]Basis\\";	351	Value = "[INSTALLLOCATION]Basis\\";
Lines 354-360 End Link Here
354		354
355	RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Basisinstall	355	RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Basisinstall
356	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;	356	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
357	Subkey = "Software\Apache OpenOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";	357	Subkey = "Software\OpenOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
358	ModuleID = gid_Module_Root;	358	ModuleID = gid_Module_Root;
359	Name = "BASISINSTALLLOCATION";	359	Name = "BASISINSTALLLOCATION";
360	Value = "[INSTALLLOCATION]Basis\\";	360	Value = "[INSTALLLOCATION]Basis\\";
Lines 381-387 End Link Here
381		381
382	RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Ureinstall	382	RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Ureinstall
383	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;	383	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
384	Subkey = "Software\Apache OpenOffice\${REGISTRYLAYERNAME}\URE\%URELAYERVERSION";	384	Subkey = "Software\OpenOffice\${REGISTRYLAYERNAME}\URE\%URELAYERVERSION";
385	ModuleID = gid_Module_Root;	385	ModuleID = gid_Module_Root;
386	Name = "UREINSTALLLOCATION";	386	Name = "UREINSTALLLOCATION";
387	Value = "[INSTALLLOCATION]URE\\";	387	Value = "[INSTALLLOCATION]URE\\";
Lines 390-396 End Link Here
390		390
391	RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Ureinstall	391	RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Ureinstall
392	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;	392	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
393	Subkey = "Software\Apache OpenOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";	393	Subkey = "Software\OpenOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
394	ModuleID = gid_Module_Root;	394	ModuleID = gid_Module_Root;
395	Name = "UREINSTALLLOCATION";	395	Name = "UREINSTALLLOCATION";
396	Value = "[INSTALLLOCATION]URE\\";	396	Value = "[INSTALLLOCATION]URE\\";
Lines 513-526 End Link Here
513		513
514	RegistryItem gid_Regitem_Software_Openofficeorg_Uno_Installpath	514	RegistryItem gid_Regitem_Software_Openofficeorg_Uno_Installpath
515	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;	515	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
516	Subkey = "Software\Apache OpenOffice\UNO\InstallPath";	516	Subkey = "Software\OpenOffice\UNO\InstallPath";
517	ModuleID = gid_Module_Root;	517	ModuleID = gid_Module_Root;
518	Value = "<progpath>\program";	518	Value = "<progpath>\program";
519	End	519	End
520		520
521	RegistryItem gid_Regitem_Software_Openofficeorg_Uno_Installpath_Branded	521	RegistryItem gid_Regitem_Software_Openofficeorg_Uno_Installpath_Branded
522	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;	522	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
523	Subkey = "Software\Apache OpenOffice\UNO\InstallPath";	523	Subkey = "Software\OpenOffice\UNO\InstallPath";
524	ModuleID = gid_Module_Root;	524	ModuleID = gid_Module_Root;
525	Name = "%PRODUCTNAME %PRODUCTVERSION";	525	Name = "%PRODUCTNAME %PRODUCTVERSION";
526	Value = "<progpath>\program";	526	Value = "<progpath>\program";

Lines 26-32 bundled extensions. This path changes with every major release of OOo because of Link Here

(-)a/main/setup_native/source/opensolaris/bundledextensions/README (-3 / +3 lines)
26	the version number which is part of a folder name. The	26	the version number which is part of a folder name. The
27	current value is:	27	current value is:
28		28
29	EXTENSIONPATH=/opt/apacheopenoffice3/share/extension/install	29	EXTENSIONPATH=/opt/openoffice3/share/extension/install
30		30
31	The service was tested with OpenSolaris release 2009.6 and may not work with a	31	The service was tested with OpenSolaris release 2009.6 and may not work with a
32	previous release.	32	previous release.
Lines 38-44 What do these files do Link Here
38		38
39	The three files constitute a SMF service. When this service is started, then it	39	The three files constitute a SMF service. When this service is started, then it
40	installes the bundled extensions which are contained in	40	installes the bundled extensions which are contained in
41	/opt/apacheopenoffice3/share/extension/install. To install them, the service calls	41	/opt/openoffice3/share/extension/install. To install them, the service calls
42	"unopkg add --shared ..." with the appropriate arguments.	42	"unopkg add --shared ..." with the appropriate arguments.
43		43
44	The service is started initially after the installation of	44	The service is started initially after the installation of
Lines 58-64 file in every release. Otherwise IPS would not replace the installed version of Link Here
58	The update procedure of OOo will replace 'installed'. 'installed' is associated	58	The update procedure of OOo will replace 'installed'. 'installed' is associated
59	with a restart_fmri of the service ooo_bundled_extensions. That is after	59	with a restart_fmri of the service ooo_bundled_extensions. That is after
60	copying 'installed' the service will be restarted. It then installes all	60	copying 'installed' the service will be restarted. It then installes all
61	extensions contained in /opt/apacheopenoffice3/share/extension/install, because	61	extensions contained in /opt/openoffice3/share/extension/install, because
62	the newly installed 'installed' file does not contain any entries yet, except	62	the newly installed 'installed' file does not contain any entries yet, except
63	for the version string.	63	for the version string.
64		64

Lines 49-59 Link Here

(-)a/main/setup_native/source/opensolaris/bundledextensions/svc-ooo_bundled_extensions (-4 / +4 lines)
49	#Create the folder which contains the temporary user installation	49	#Create the folder which contains the temporary user installation
50	INSTDIR=`/usr/bin/mktemp -d "/tmp/userinstall.XXXXXX"`	50	INSTDIR=`/usr/bin/mktemp -d "/tmp/userinstall.XXXXXX"`
51		51
52	OOO_BASE_DIR="/opt/apacheopenoffice/basis${OOOBASEVERSION}"	52	OOO_BASE_DIR="/opt/openoffice/basis${OOOBASEVERSION}"
53		53
54	case "$1" in	54	case "$1" in
55	'start')	55	'start')
56	EXTENSIONDIR=/opt/apacheopenoffice${OOOBRANDPACKAGEVERSION}/share/extension/install	56	EXTENSIONDIR=/opt/openoffice${OOOBRANDPACKAGEVERSION}/share/extension/install
57	for FILE in $EXTENSIONDIR/*.oxt	57	for FILE in $EXTENSIONDIR/*.oxt
58	do	58	do
59	#We check if the file exist, because if there is no extension	59	#We check if the file exist, because if there is no extension
Lines 70-76 case "$1" in Link Here
70	#list. That is, it has not been installed (with unopkg) yet.	70	#list. That is, it has not been installed (with unopkg) yet.
71	#Therefore we do it now.	71	#Therefore we do it now.
72	echo installing $FILE	72	echo installing $FILE
73	/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'	73	/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'
74	#Let us remember that this extensions has been installed	74	#Let us remember that this extensions has been installed
75	#by adding the path name of the extension to the file	75	#by adding the path name of the extension to the file
76	#installed	76	#installed
Lines 98-104 case "$1" in Link Here
98	# #share/extension/install. Now we remove the installed	98	# #share/extension/install. Now we remove the installed
99	# #extension	99	# #extension
100	# echo removing `basename $LINE`	100	# echo removing `basename $LINE`
101	# /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'	101	# /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'
102	# REMOVED=1	102	# REMOVED=1
103	# else	103	# else
104	# NEWCONTENT+=$LINE	104	# NEWCONTENT+=$LINE

Lines 54-63 Link Here

(-)a/main/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx (-8 / +8 lines)
54	</MSDN>	54	</MSDN>
55		55
56	We add the following entries to the respective registry key	56	We add the following entries to the respective registry key
57	"{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}"="Apache OpenOffice Column Handler"	57	"{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}"="OpenOffice Column Handler"
58	"{087B3AE3-E237-4467-B8DB-5A38AB959AC9}"="Apache OpenOffice Infotip Handler"	58	"{087B3AE3-E237-4467-B8DB-5A38AB959AC9}"="OpenOffice Infotip Handler"
59	"{63542C48-9552-494A-84F7-73AA6A7C99C1}"="Apache OpenOffice Property Sheet Handler"	59	"{63542C48-9552-494A-84F7-73AA6A7C99C1}"="OpenOffice Property Sheet Handler"
60	"{3B092F0C-7696-40E3-A80F-68D74DA84210}"="Apache OpenOffice Thumbnail Viewer"	60	"{3B092F0C-7696-40E3-A80F-68D74DA84210}"="OpenOffice Thumbnail Viewer"
61		61
62	These shell extensions are implemented in the 'shell' project. We ignore registration	62	These shell extensions are implemented in the 'shell' project. We ignore registration
63	failures because of insufficient privileges. The reason is: On systems which restrict the	63	failures because of insufficient privileges. The reason is: On systems which restrict the
Lines 90-99 struct RegistryEntry Link Here
90	TCHAR* Value;	90	TCHAR* Value;
91	};	91	};
92		92
93	RegistryEntry ColumnHandler = { TEXT("{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}"), TEXT("Apache OpenOffice Column Handler") };	93	RegistryEntry ColumnHandler = { TEXT("{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}"), TEXT("OpenOffice Column Handler") };
94	RegistryEntry InfotipHandler = { TEXT("{087B3AE3-E237-4467-B8DB-5A38AB959AC9}"), TEXT("Apache OpenOffice Infotip Handler") };	94	RegistryEntry InfotipHandler = { TEXT("{087B3AE3-E237-4467-B8DB-5A38AB959AC9}"), TEXT("OpenOffice Infotip Handler") };
95	RegistryEntry PropHandler = { TEXT("{63542C48-9552-494A-84F7-73AA6A7C99C1}"), TEXT("Apache OpenOffice Property Sheet Handler") };	95	RegistryEntry PropHandler = { TEXT("{63542C48-9552-494A-84F7-73AA6A7C99C1}"), TEXT("OpenOffice Property Sheet Handler") };
96	RegistryEntry ThumbViewer = { TEXT("{3B092F0C-7696-40E3-A80F-68D74DA84210}"), TEXT("Apache OpenOffice Thumbnail Viewer") };	96	RegistryEntry ThumbViewer = { TEXT("{3B092F0C-7696-40E3-A80F-68D74DA84210}"), TEXT("OpenOffice Thumbnail Viewer") };
97		97
98	BOOL GetMsiProp( MSIHANDLE hMSI, const char* pPropName, char** ppValue )	98	BOOL GetMsiProp( MSIHANDLE hMSI, const char* pPropName, char** ppValue )
99	{	99	{

Lines 492-498 sub create_epm_header Link Here

(-)a/main/solenv/bin/modules/installer/epmfile.pm (-3 / +2 lines)
492	{	492	{
493	# refer to the license in the matching AOO installation	493	# refer to the license in the matching AOO installation
494	# TODO: sync AOO dest license full path with lpacks/sdks/exts	494	# TODO: sync AOO dest license full path with lpacks/sdks/exts
495	my $licpath = "apacheopenoffice3/program/" . $licensefilename;	495	my $licpath = "openoffice4/program/" . $licensefilename;
496	$foundlicensefile = 1;	496	$foundlicensefile = 1;
497	$line = "%license " . $licpath . "\n";	497	$line = "%license " . $licpath . "\n";
498	push(@epmheader, $line);	498	push(@epmheader, $line);
Lines 550-556 sub create_epm_header Link Here
550	}	550	}
551	}	551	}
552		552
553	if ( $installer::globals::debian && $variableshashref->{'UNIXPRODUCTNAME'} eq 'apache openoffice' )	553	if ( $installer::globals::debian && $variableshashref->{'UNIXPRODUCTNAME'} eq 'openoffice' )
554	{	554	{
555	$line = "%provides" . " openoffice.org-unbundled\n";	555	$line = "%provides" . " openoffice.org-unbundled\n";
556	push(@epmheader, $line);	556	push(@epmheader, $line);
Lines 3435-3441 sub finalize_linux_patch Link Here
3435	my $productname = $allvariables->{'PRODUCTNAME'};	3435	my $productname = $allvariables->{'PRODUCTNAME'};
3436	$productname = lc($productname);	3436	$productname = lc($productname);
3437	$productname =~ s/ /_/g; # abc office -> abc_office	3437	$productname =~ s/ /_/g; # abc office -> abc_office
3438	# $productname =~ s/\.//g; # openoffice.org -> openofficeorg
3439		3438
3440	$infoline = "Adding productname $productname into Linux patch script\n";	3439	$infoline = "Adding productname $productname into Linux patch script\n";
3441	push( @installer::globals::logfileinfo, $infoline);	3440	push( @installer::globals::logfileinfo, $infoline);

Lines 539-580 String STR_SVT_MIMETYPE_INET_MULTI_MIXED Link Here

(-)a/main/svl/source/misc/mediatyp.src (-8 / +8 lines)
539		539
540	String STR_SVT_MIMETYPE_APP_SXCALC	540	String STR_SVT_MIMETYPE_APP_SXCALC
541	{	541	{
542	Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Spreadsheet" ;	542	Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Spreadsheet" ;
543	};	543	};
544		544
545	String STR_SVT_MIMETYPE_APP_SXCHART	545	String STR_SVT_MIMETYPE_APP_SXCHART
546	{	546	{
547	Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Chart" ;	547	Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Chart" ;
548	};	548	};
549		549
550	String STR_SVT_MIMETYPE_APP_SXDRAW	550	String STR_SVT_MIMETYPE_APP_SXDRAW
551	{	551	{
552	Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Drawing" ;	552	Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Drawing" ;
553	};	553	};
554		554
555	String STR_SVT_MIMETYPE_APP_SXMATH	555	String STR_SVT_MIMETYPE_APP_SXMATH
556	{	556	{
557	Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Formula" ;	557	Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Formula" ;
558	};	558	};
559		559
560	String STR_SVT_MIMETYPE_APP_SXWRITER	560	String STR_SVT_MIMETYPE_APP_SXWRITER
561	{	561	{
562	Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Text Document" ;	562	Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Text Document" ;
563	};	563	};
564		564
565	String STR_SVT_MIMETYPE_APP_SXIMPRESS	565	String STR_SVT_MIMETYPE_APP_SXIMPRESS
566	{	566	{
567	Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Presentation" ;	567	Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Presentation" ;
568	};	568	};
569		569
570	String STR_SVT_MIMETYPE_APP_SXGLOBAL	570	String STR_SVT_MIMETYPE_APP_SXGLOBAL
571	{	571	{
572	Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Master Document" ;	572	Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Master Document" ;
573	};	573	};
574		574
575	String STR_SVT_MIMETYPE_APP_SXIPACKED	575	String STR_SVT_MIMETYPE_APP_SXIPACKED
576	{	576	{
577	Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Presentation (packed)" ;	577	Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Presentation (packed)" ;
578	};	578	};
579		579
580		580

Lines 327-345 String STR_DESCRIPTION_FACTORY_DATABASE Link Here

(-)a/main/svtools/source/misc/imagemgr.src (-11 / +11 lines)
327	};	327	};
328	String STR_DESCRIPTION_CALC_TEMPLATE	328	String STR_DESCRIPTION_CALC_TEMPLATE
329	{	329	{
330	Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Spreadsheet Template" ;	330	Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Spreadsheet Template" ;
331	};	331	};
332	String STR_DESCRIPTION_DRAW_TEMPLATE	332	String STR_DESCRIPTION_DRAW_TEMPLATE
333	{	333	{
334	Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Drawing Template" ;	334	Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Drawing Template" ;
335	};	335	};
336	String STR_DESCRIPTION_IMPRESS_TEMPLATE	336	String STR_DESCRIPTION_IMPRESS_TEMPLATE
337	{	337	{
338	Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Presentation Template" ;	338	Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Presentation Template" ;
339	};	339	};
340	String STR_DESCRIPTION_WRITER_TEMPLATE	340	String STR_DESCRIPTION_WRITER_TEMPLATE
341	{	341	{
342	Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Text Document Template" ;	342	Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Text Document Template" ;
343	};	343	};
344	String STR_DESCRIPTION_LOCALE_VOLUME	344	String STR_DESCRIPTION_LOCALE_VOLUME
345	{	345	{
Lines 374-410 String STR_DESCRIPTION_POWERPOINT_SHOW Link Here
374		374
375	String STR_DESCRIPTION_SXMATH_DOC	375	String STR_DESCRIPTION_SXMATH_DOC
376	{	376	{
377	Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Formula" ;	377	Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Formula" ;
378	};	378	};
379		379
380	String STR_DESCRIPTION_SXCHART_DOC	380	String STR_DESCRIPTION_SXCHART_DOC
381	{	381	{
382	Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Chart" ;	382	Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Chart" ;
383	};	383	};
384		384
385	String STR_DESCRIPTION_SXDRAW_DOC	385	String STR_DESCRIPTION_SXDRAW_DOC
386	{	386	{
387	Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Drawing" ;	387	Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Drawing" ;
388	};	388	};
389		389
390	String STR_DESCRIPTION_SXCALC_DOC	390	String STR_DESCRIPTION_SXCALC_DOC
391	{	391	{
392	Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Spreadsheet" ;	392	Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Spreadsheet" ;
393	};	393	};
394		394
395	String STR_DESCRIPTION_SXIMPRESS_DOC	395	String STR_DESCRIPTION_SXIMPRESS_DOC
396	{	396	{
397	Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Presentation" ;	397	Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Presentation" ;
398	};	398	};
399		399
400	String STR_DESCRIPTION_SXWRITER_DOC	400	String STR_DESCRIPTION_SXWRITER_DOC
401	{	401	{
402	Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Text Document" ;	402	Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Text Document" ;
403	};	403	};
404		404
405	String STR_DESCRIPTION_SXGLOBAL_DOC	405	String STR_DESCRIPTION_SXGLOBAL_DOC
406	{	406	{
407	Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Master Document" ;	407	Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Master Document" ;
408	};	408	};
409	String STR_DESCRIPTION_MATHML_DOC	409	String STR_DESCRIPTION_MATHML_DOC
410	{	410	{

Lines 93-99 namespace svx{ Link Here

(-)a/main/svx/source/dialog/sendreportw32.cxx (-10 / +10 lines)
93		93
94	if ( ERROR_SUCCESS == RegReadValue(	94	if ( ERROR_SUCCESS == RegReadValue(
95	HKEY_CURRENT_USER,	95	HKEY_CURRENT_USER,
96	TEXT("SOFTWARE\\Apache OpenOffice\\CrashReport"),	96	TEXT("SOFTWARE\\OpenOffice\\CrashReport"),
97	TEXT("HTTPProxyServer"),	97	TEXT("HTTPProxyServer"),
98	szBuffer,	98	szBuffer,
99	sizeof(szBuffer) ) )	99	sizeof(szBuffer) ) )
Lines 102-108 namespace svx{ Link Here
102	DWORD dwProxyPort;	102	DWORD dwProxyPort;
103	if ( ERROR_SUCCESS == RegReadValue(	103	if ( ERROR_SUCCESS == RegReadValue(
104	HKEY_CURRENT_USER,	104	HKEY_CURRENT_USER,
105	TEXT("SOFTWARE\\Apache OpenOffice\\CrashReport"),	105	TEXT("SOFTWARE\\OpenOffice\\CrashReport"),
106	TEXT("HTTPProxyPort"),	106	TEXT("HTTPProxyPort"),
107	&dwProxyPort,	107	&dwProxyPort,
108	sizeof(dwProxyPort) ) )	108	sizeof(dwProxyPort) ) )
Lines 113-119 namespace svx{ Link Here
113		113
114	if ( ERROR_SUCCESS == RegReadValue(	114	if ( ERROR_SUCCESS == RegReadValue(
115	HKEY_CURRENT_USER,	115	HKEY_CURRENT_USER,
116	TEXT("SOFTWARE\\Apache OpenOffice\\CrashReport"),	116	TEXT("SOFTWARE\\OpenOffice\\CrashReport"),
117	TEXT("ReturnAddress"),	117	TEXT("ReturnAddress"),
118	szBuffer,	118	szBuffer,
119	sizeof(szBuffer) ) )	119	sizeof(szBuffer) ) )
Lines 122-128 namespace svx{ Link Here
122	DWORD fAllowContact = sal_False;	122	DWORD fAllowContact = sal_False;
123	RegReadValue(	123	RegReadValue(
124	HKEY_CURRENT_USER,	124	HKEY_CURRENT_USER,
125	TEXT("SOFTWARE\\Apache OpenOffice\\CrashReport"),	125	TEXT("SOFTWARE\\OpenOffice\\CrashReport"),
126	TEXT("AllowContact"),	126	TEXT("AllowContact"),
127	&fAllowContact,	127	&fAllowContact,
128	sizeof(fAllowContact) );	128	sizeof(fAllowContact) );
Lines 131-137 namespace svx{ Link Here
131	DWORD uInternetConnection = 0;	131	DWORD uInternetConnection = 0;
132	RegReadValue(	132	RegReadValue(
133	HKEY_CURRENT_USER,	133	HKEY_CURRENT_USER,
134	TEXT("SOFTWARE\\Apache OpenOffice\\CrashReport"),	134	TEXT("SOFTWARE\\OpenOffice\\CrashReport"),
135	TEXT("HTTPConnection"),	135	TEXT("HTTPConnection"),
136	&uInternetConnection,	136	&uInternetConnection,
137	sizeof(uInternetConnection) );	137	sizeof(uInternetConnection) );
Lines 145-151 namespace svx{ Link Here
145	const _TCHAR *lpHTTPProxyServer = reinterpret_cast<LPCTSTR>(maParams.maHTTPProxyServer.GetBuffer());	145	const _TCHAR *lpHTTPProxyServer = reinterpret_cast<LPCTSTR>(maParams.maHTTPProxyServer.GetBuffer());
146	RegWriteValue(	146	RegWriteValue(
147	HKEY_CURRENT_USER,	147	HKEY_CURRENT_USER,
148	TEXT("SOFTWARE\\Apache OpenOffice\\CrashReport"),	148	TEXT("SOFTWARE\\OpenOffice\\CrashReport"),
149	TEXT("HTTPProxyServer"), REG_SZ,	149	TEXT("HTTPProxyServer"), REG_SZ,
150	lpHTTPProxyServer,	150	lpHTTPProxyServer,
151	sizeof(TCHAR) * (_tcslen(lpHTTPProxyServer) + 1) );	151	sizeof(TCHAR) * (_tcslen(lpHTTPProxyServer) + 1) );
Lines 155-161 namespace svx{ Link Here
155		155
156	RegWriteValue(	156	RegWriteValue(
157	HKEY_CURRENT_USER,	157	HKEY_CURRENT_USER,
158	TEXT("SOFTWARE\\Apache OpenOffice\\CrashReport"),	158	TEXT("SOFTWARE\\OpenOffice\\CrashReport"),
159	TEXT("HTTPProxyPort"), REG_DWORD,	159	TEXT("HTTPProxyPort"), REG_DWORD,
160	&dwProxyPort,	160	&dwProxyPort,
161	sizeof(DWORD) );	161	sizeof(DWORD) );
Lines 163-169 namespace svx{ Link Here
163	DWORD fAllowContact = IsContactAllowed();	163	DWORD fAllowContact = IsContactAllowed();
164	RegWriteValue(	164	RegWriteValue(
165	HKEY_CURRENT_USER,	165	HKEY_CURRENT_USER,
166	TEXT("SOFTWARE\\Apache OpenOffice\\CrashReport"),	166	TEXT("SOFTWARE\\OpenOffice\\CrashReport"),
167	TEXT("AllowContact"), REG_DWORD,	167	TEXT("AllowContact"), REG_DWORD,
168	&fAllowContact,	168	&fAllowContact,
169	sizeof(DWORD) );	169	sizeof(DWORD) );
Lines 173-179 namespace svx{ Link Here
173		173
174	RegWriteValue(	174	RegWriteValue(
175	HKEY_CURRENT_USER,	175	HKEY_CURRENT_USER,
176	TEXT("SOFTWARE\\Apache OpenOffice\\CrashReport"),	176	TEXT("SOFTWARE\\OpenOffice\\CrashReport"),
177	TEXT("HTTPConnection"), REG_DWORD,	177	TEXT("HTTPConnection"), REG_DWORD,
178	&uInternetConnection,	178	&uInternetConnection,
179	sizeof(DWORD) );	179	sizeof(DWORD) );
Lines 181-187 namespace svx{ Link Here
181	const _TCHAR *lpEmail = reinterpret_cast<LPCTSTR>(GetEMailAddress().GetBuffer());	181	const _TCHAR *lpEmail = reinterpret_cast<LPCTSTR>(GetEMailAddress().GetBuffer());
182	RegWriteValue(	182	RegWriteValue(
183	HKEY_CURRENT_USER,	183	HKEY_CURRENT_USER,
184	TEXT("SOFTWARE\\Apache OpenOffice\\CrashReport"),	184	TEXT("SOFTWARE\\OpenOffice\\CrashReport"),
185	TEXT("ReturnAddress"), REG_SZ,	185	TEXT("ReturnAddress"), REG_SZ,
186	lpEmail,	186	lpEmail,
187	sizeof(TCHAR) * (_tcslen(lpEmail) + 1) );	187	sizeof(TCHAR) * (_tcslen(lpEmail) + 1) );

Lines 42-48 PKGDIR=$(BIN) Link Here

(-)a/main/sysui/desktop/productversion.mk (-7 / +7 lines)
42	# CAUTION! here the parsing result from openoffice.lst is NOT available, so this is hardcoded	42	# CAUTION! here the parsing result from openoffice.lst is NOT available, so this is hardcoded
43	# but should not be.	43	# but should not be.
44	# It has to be equal to PRODUCTNAME:l:s/\s/\_/g - see solenv/bin/modules/installer/setupscript.pm	44	# It has to be equal to PRODUCTNAME:l:s/\s/\_/g - see solenv/bin/modules/installer/setupscript.pm
45	PRODUCTLIST = apache_openoffice	45	PRODUCTLIST = openoffice
46		46
47	# default values to minimize maintainance effort	47	# default values to minimize maintainance effort
48		48
Lines 66-76 ICONVERSION = $(PRODUCTVERSIONSHORT:s/.//g) Link Here
66	UNIXWRAPPERNAME *= '$${{UNIXPRODUCTNAME}}$${{BRANDPACKAGEVERSION}}'	66	UNIXWRAPPERNAME *= '$${{UNIXPRODUCTNAME}}$${{BRANDPACKAGEVERSION}}'
67		67
68	# CAUTION! $(UNIXBASISROOTNAME) from openoffice.lst NOT available (!)	68	# CAUTION! $(UNIXBASISROOTNAME) from openoffice.lst NOT available (!)
69	PRODUCTNAME.apache_openoffice = Apache OpenOffice	69	PRODUCTNAME.openoffice = OpenOffice
70		70
71	PRODUCTVERSION.apache_openoffice = $(PRODUCTVERSION)	71	PRODUCTVERSION.openoffice = $(PRODUCTVERSION)
72	PRODUCTVERSIONSHORT.apache_openoffice = $(PRODUCTVERSIONSHORT)	72	PRODUCTVERSIONSHORT.openoffice = $(PRODUCTVERSIONSHORT)
73	PKGVERSION.apache_openoffice = $(PKGVERSION)	73	PKGVERSION.openoffice = $(PKGVERSION)
74	UNIXFILENAME.apache_openoffice = $(PRODUCTNAME.apache_openoffice:l:s/ /_/g)$(PRODUCTVERSIONSHORT.apache_openoffice)	74	UNIXFILENAME.openoffice = $(PRODUCTNAME.openoffice:l:s/ /_/g)$(PRODUCTVERSIONSHORT.openoffice)
75	ICONPREFIX.apache_openoffice = $(UNIXFILENAME.apache_openoffice:s/.//g)	75	ICONPREFIX.openoffice = $(UNIXFILENAME.openoffice:s/.//g)
76		76