Attachment #80062 for issue #121388

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

Lines 20-23 Link Here

(-)a/main/cli_ure/source/basetypes/assembly.cs (-1 / +1 lines)
20	*************************************************************/	20	*************************************************************/
21		21
22	[assembly:System.Reflection.AssemblyDescription( "CLI-UNO: Language Binding specific types" )]	22	[assembly:System.Reflection.AssemblyDescription( "CLI-UNO: Language Binding specific types" )]
23	[assembly:System.Reflection.AssemblyCompany( "OpenOffice.org" )]	23	[assembly: System.Reflection.AssemblyCompany("Apache Software Foundation")]

Lines 29-32 Link Here

(-)a/main/cli_ure/source/native/assembly.cxx (-1 / +1 lines)
29	[assembly:System::Reflection::AssemblyProduct( "CLI-UNO Language Binding" )];	29	[assembly:System::Reflection::AssemblyProduct( "CLI-UNO Language Binding" )];
30	[assembly:System::Reflection::AssemblyDescription( "CLI-UNO Helper Library" )];	30	[assembly:System::Reflection::AssemblyDescription( "CLI-UNO Helper Library" )];
31	[assembly:System::Reflection::AssemblyDelaySign(true)];	31	[assembly:System::Reflection::AssemblyDelaySign(true)];
32	[assembly:System::Reflection::AssemblyCompany( "OpenOffice.org" )];	32	[assembly:System::Reflection::AssemblyCompany( "Apache Software Foundation" )];

Lines 52-58 namespace cli_ure { Link Here

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

Lines 20-23 Link Here

(-)a/main/cli_ure/source/ure/assembly.cs (-1 / +1 lines)
20	*************************************************************/	20	*************************************************************/
21		21
22	[assembly:System.Reflection.AssemblyDescription( "CLI-UNO Runtime Library" )]	22	[assembly:System.Reflection.AssemblyDescription( "CLI-UNO Runtime Library" )]
23	[assembly:System.Reflection.AssemblyCompany( "OpenOffice.org" )]	23	[assembly: System.Reflection.AssemblyCompany("Apache Software Foundation")]

Lines 54-61 $(OUT)$/bin$/cli_uretypes.dll : $(BIN)$/climaker.exe $(SOLARBINDIR)$/types.rdb $ Link Here

(-)a/main/cli_ure/unotypes/makefile.mk (-2 / +2 lines)
54	--out $@ \	54	--out $@ \
55	--keyfile $(BIN)$/cliuno.snk \	55	--keyfile $(BIN)$/cliuno.snk \
56	--assembly-version $(CLI_URETYPES_NEW_VERSION) \	56	--assembly-version $(CLI_URETYPES_NEW_VERSION) \
57	--assembly-description "This assembly contains metadata for the StarOffice/OpenOffice.org API." \	57	--assembly-description "This assembly contains metadata for the Apache OpenOffice API." \
58	--assembly-company "OpenOffice.org" \	58	--assembly-company "Apache Software Foundation" \
59	$(SOLARBINDIR)$/udkapi.rdb	59	$(SOLARBINDIR)$/udkapi.rdb
60		60
61	#do not forget to deliver cli_uretypes.config. It is NOT embedded in the policy file.	61	#do not forget to deliver cli_uretypes.config. It is NOT embedded in the policy file.

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\\OpenOffice.org\\UNO\\InstallPath";	89	const char* SUBKEYNAME = "Software\\Apache OpenOffice\\UNO\\InstallPath";
90		90
91	char* path = NULL;	91	char* path = NULL;
92		92

Lines 59-65 VS_VERSION_INFO versioninfo Link Here

(-)a/main/desktop/util/ooverinfo.rc (-2 / +2 lines)
59	block "040704E4"	59	block "040704E4"
60	{	60	{
61	// German StringTable	61	// German StringTable
62	value "CompanyName", "OpenOffice.org\0"	62	value "CompanyName", "Apache Software Foundation\0"
63	value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"	63	value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
64	value "FileVersion", PPS(VER_LEVEL) "\0"	64	value "FileVersion", PPS(VER_LEVEL) "\0"
65	value "ProductVersion", PPS(VER_LEVEL) "\0"	65	value "ProductVersion", PPS(VER_LEVEL) "\0"
Lines 71-77 VS_VERSION_INFO versioninfo Link Here
71	block "040904E4"	71	block "040904E4"
72	{	72	{
73	// International StringTable	73	// International StringTable
74	value "CompanyName", "OpenOffice.org\0"	74	value "CompanyName", "Apache Software Foundation\0"
75	value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"	75	value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
76	value "FileVersion", PPS(VER_LEVEL) "\0"	76	value "FileVersion", PPS(VER_LEVEL) "\0"
77	value "ProductVersion", PPS(VER_LEVEL) "\0"	77	value "ProductVersion", PPS(VER_LEVEL) "\0"

Lines 64-70 VS_VERSION_INFO versioninfo Link Here

(-)a/main/desktop/util/verinfo.rc (-2 / +2 lines)
64	block "040704E4"	64	block "040704E4"
65	{	65	{
66	// German StringTable	66	// German StringTable
67	value "CompanyName", "Oracle\0"	67	value "CompanyName", "Apache Software Foundation\0"
68	value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"	68	value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
69	value "FileVersion", PPS(VER_LEVEL) "\0"	69	value "FileVersion", PPS(VER_LEVEL) "\0"
70	value "ProductVersion", PPS(VER_LEVEL) "\0"	70	value "ProductVersion", PPS(VER_LEVEL) "\0"
Lines 76-82 VS_VERSION_INFO versioninfo Link Here
76	block "040904E4"	76	block "040904E4"
77	{	77	{
78	// International StringTable	78	// International StringTable
79	value "CompanyName", "Oracle\0"	79	value "CompanyName", "Apache Software Foundation\0"
80	value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"	80	value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
81	value "FileVersion", PPS(VER_LEVEL) "\0"	81	value "FileVersion", PPS(VER_LEVEL) "\0"
82	value "ProductVersion", PPS(VER_LEVEL) "\0"	82	value "ProductVersion", PPS(VER_LEVEL) "\0"

Lines 59-65 VS_VERSION_INFO versioninfo Link Here

(-)a/main/desktop/win32/source/applauncher/ooo/verinfo.rc (-2 / +2 lines)
59	block "040704E4"	59	block "040704E4"
60	{	60	{
61	// German StringTable	61	// German StringTable
62	value "CompanyName", "OpenOffice.org\0"	62	value "CompanyName", "Apache Software Foundation\0"
63	value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"	63	value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
64	value "FileVersion", PPS(VER_LEVEL) "\0"	64	value "FileVersion", PPS(VER_LEVEL) "\0"
65	value "ProductVersion", PPS(VER_LEVEL) "\0"	65	value "ProductVersion", PPS(VER_LEVEL) "\0"
Lines 71-77 VS_VERSION_INFO versioninfo Link Here
71	block "040904E4"	71	block "040904E4"
72	{	72	{
73	// International StringTable	73	// International StringTable
74	value "CompanyName", "OpenOffice.org\0"	74	value "CompanyName", "Apache Software Foundation\0"
75	value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"	75	value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
76	value "FileVersion", PPS(VER_LEVEL) "\0"	76	value "FileVersion", PPS(VER_LEVEL) "\0"
77	value "ProductVersion", PPS(VER_LEVEL) "\0"	77	value "ProductVersion", PPS(VER_LEVEL) "\0"

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\OpenOffice.org\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2	4	installuser 1 Software\Apache OpenOffice\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2
5	installuser_ 1 Software\OpenOffice.org\Layers_\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2	5	installuser_ 1 Software\Apache OpenOffice\Layers_\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2
6	installmachine 2 Software\OpenOffice.org\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2	6	installmachine 2 Software\Apache OpenOffice\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2
7	installmachine_ 2 Software\OpenOffice.org\Layers_\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2	7	installmachine_ 2 Software\Apache 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\OpenOffice.org\Layers\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2	4	basisinstalluser 1 Software\Apache OpenOffice\Layers\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2
5	basisinstalluser_ 1 Software\OpenOffice.org\Layers_\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2	5	basisinstalluser_ 1 Software\Apache OpenOffice\Layers_\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2
6	basisinstallmachine 2 Software\OpenOffice.org\Layers\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2	6	basisinstallmachine 2 Software\Apache OpenOffice\Layers\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2
7	basisinstallmachine_ 2 Software\OpenOffice.org\Layers_\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2	7	basisinstallmachine_ 2 Software\Apache OpenOffice\Layers_\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2




.ENDIF			# "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
.ENDIF			# "$(MAKETARGETS)"!=""
openoffice_%{$(PKGFORMAT:^".") .archive} :
	$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p Apache_OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
	$(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product Apache_OpenOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml

$(foreach,i,$(alllangiso) openofficewithjre_$i) : $$@{$(PKGFORMAT:^".")}
openofficewithjre_%{$(PKGFORMAT:^".")} :
	$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p Aapche_OpenOffice_wJRE -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)

$(foreach,i,$(alllangiso) openofficedev_$i) : $$@{$(PKGFORMAT:^".")}
openofficedev_%{$(PKGFORMAT:^".")} :
	$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p Apache_OpenOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
	$(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product Apache_OpenOffice_Dev --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml

$(foreach,i,$(alllangiso) ooolanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
ooolanguagepack_%{$(PKGFORMAT:^".")} :
	$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p Apache_OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -languagepack -format $(@:e:s/.//) $(VERBOSESWITCH)

$(foreach,i,$(alllangiso) ooodevlanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
ooodevlanguagepack_%{$(PKGFORMAT:^".")} :
	$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p Apache_OpenOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -languagepack -format $(@:e:s/.//) $(VERBOSESWITCH)

$(foreach,i,$(alllangiso) sdkoo_$i) : $$@{$(PKGFORMAT:^".")}
sdkoo_%{$(PKGFORMAT:^".")} :
	$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p Apache_OpenOffice_SDK -u $(OUT) -buildid $(BUILD) -msitemplate $(MSISDKOOTEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -dontstrip -format $(@:e:s/.//) $(VERBOSESWITCH)

$(foreach,i,$(alllangiso) sdkoodev_$i) : $$@{$(PKGFORMAT:^".")}
sdkoodev_%{$(PKGFORMAT:^".")} :
	$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p Apache_OpenOffice_Dev_SDK -u $(OUT) -buildid $(BUILD) -msitemplate $(MSISDKOOTEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -dontstrip -format $(@:e:s/.//) $(VERBOSESWITCH)

$(foreach,i,$(alllangiso) ure_$i) : $$@{$(PKGFORMAT:^".")}
ure_%{$(PKGFORMAT:^".")} :




Globals
{
    Settings
    {
        variables
        {
            APACHEPROJECTNAME Apache OpenOffice
            OOOBASEVERSION 3.5
            OOOPACKAGEVERSION 3.5.0
            UREPACKAGEVERSION 3.5.0
            URELAYERVERSION 1
            BASISROOTNAME ApacheOpenOffice
            UNIXBASISROOTNAME apacheopenoffice
            HIDELICENSEDIALOG 1
            PACKAGEPREFIX 
            BASISPACKAGEPREFIX aoobasis
            UREPACKAGEPREFIX apacheopenoffice
            SOLSUREPACKAGEPREFIX apacheopenoffice
            USE_FILEVERSION 1
            LIBRARYVERSION 9.5.0
            POOLPRODUCT 1
            PROGRESSBARCOLOR 14,133,205
            PROGRESSSIZE 320,7
            PROGRESSPOSITION 185,206
            PROGRESSFRAMECOLOR 207,208,211
            NATIVEPROGRESS true
            REGISTRYLAYERNAME Layers
            SERVICEPACK 1
            UPDATE_DATABASE 1
            CREATE_MSP_INSTALLSET 0
            UPDATE_DATABASE_LISTNAME finals_instsetoo.txt
            PACKAGEMAP package_names.txt,package_names_ext.txt
            WINDOWSPATCHLEVEL 8
            OOOVENDOR Apache Software Foundation
            AOODOWNLOADNAME 1
            STARTCENTER_LAYOUT_STYLE 0
            NOLANGUAGESELECTIONPRODUCT 0
            BUILDIDCWS {buildidcws}
			WINDOWSPATCHLEVEL 8
			OOOVENDOR Apache Software Foundation
			OOODOWNLOADNAME 1
			STARTCENTER_LAYOUT_STYLE 0
			NOLANGUAGESELECTIONPRODUCT 0
			BUILDIDCWS {buildidcws}
            OPENSOURCE 1
            SERVICETAG_PRODUCTNAME Apache OpenOffice 3.5
            SERVICETAG_PRODUCTVERSION 3.5
            SERVICETAG_PARENTNAME Apache OpenOffice 3.5
            SERVICETAG_SOURCE {buildsource}{minor}(Build:{buildid})
            SERVICETAG_URN urn:uuid:500061aa-5666-11e0-8e00-080020a9ed93
            REGISTRATION_HOST https://registration.openoffice.org
        }
    }
}

Apache_OpenOffice
{
    Settings
    {
        variables
        {
            PRODUCTNAME Apache OpenOffice
            PRODUCTVERSION 3.5.0
            PRODUCTEXTENSION 
            LONG_PRODUCTEXTENSION 
            SHORT_PRODUCTEXTENSION 
            POSTVERSIONEXTENSION
            POSTVERSIONEXTENSIONUNIX
            BRANDPACKAGEVERSION 3
            USERDIRPRODUCTVERSION 3
            ABOUTBOXPRODUCTVERSION 3.5.0
            BASEPRODUCTVERSION 3.5
            PCPFILENAME openoffice.pcp
            UPDATEURL http://www.openoffice.org/projects/update/aoo35/check.Update
            ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt,version.lst
            REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
            ADDSYSTEMINTEGRATION 1
            EVAL
            FILEFORMATNAME OpenOffice.org XML
            FILEFORMATVERSION 1.0
            WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
            PACKAGEVERSION 3.5.0
            PACKAGEREVISION {milestone}
            LICENSENAME ALv2
            GLOBALFILEGID gid_File_Lib_Vcl
            GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
            SPELLCHECKERFILE spellchecker_selection.txt
            OPENSOURCE 1
            SETSTATICPATH 1
            AOODOWNLOADNAME 1
            AOODOWNLOADNAMEPREFIX Apache_OpenOffice
            XPDINSTALLER 0
            BETAUPGRADECODE
            STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
            CHANGETARGETDIR 1
            USE_FILEVERSION 1
            LIBRARYVERSION 9.5.0
            PATCHCODEFILE ooo_patchcodes.txt
            DOWNLOADBANNER	ooobanner.bmp
            DOWNLOADBITMAP	ooobitmap.bmp
            DOWNLOADSETUPICO	ooosetup.ico
            RELATIVE_PATHES_IN_DDF 1
            STARTCENTER_ADDFEATURE_URL http://extensions.openoffice.org/
            STARTCENTER_INFO_URL http://www.openoffice.org
            STARTCENTER_TEMPLREP_URL http://templates.openoffice.org
            STARTCENTER_LAYOUT_STYLE 0
            DICT_REPO_URL http://extensions.openoffice.org/dictionaries
            REGISTRATION_PRODUCT OpenOffice.org
            REGISTRATION_CID 926117
        }
        active			1
        compression		5
        script			setup_osl
        downloadname	Apache_OpenOffice_{productversion}_{os}_install_{languages}
        langpackdownloadname	Apache_OpenOffice_{productversion}_languagepack_{os}_install_{languages}
        include			{solarenvpath}/{os}/loader2,.,{localpath}/bin,{solarpath}/bin.{minor}/ooowoure,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
    }
}

Apache_OpenOffice_wJRE
{
    Settings
    {
        variables
        {
            PRODUCTNAME Apache OpenOffice
            PRODUCTVERSION 3.5.0
            PRODUCTEXTENSION 
            LONG_PRODUCTEXTENSION 
            SHORT_PRODUCTEXTENSION 
            POSTVERSIONEXTENSION
            POSTVERSIONEXTENSIONUNIX
            BRANDPACKAGEVERSION 3
            USERDIRPRODUCTVERSION 3
            ABOUTBOXPRODUCTVERSION 3.5.0
            BASEPRODUCTVERSION 3.5
            UPDATEURL http://www.openoffice.org/projects/update/aoo35/check.Update
            ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
            REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
            ADDSYSTEMINTEGRATION 1
            EVAL
            FILEFORMATNAME OpenOffice.org XML
            FILEFORMATVERSION 1.0
            WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
            PACKAGEVERSION 3.5.0
            PACKAGEREVISION {milestone}
            LICENSENAME ALv2
            WITHJREPRODUCT 1
            GLOBALFILEGID gid_File_Lib_Vcl
            GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
            SPELLCHECKERFILE spellchecker_selection.txt
            OPENSOURCE 1
            SETSTATICPATH 1
            AOODOWNLOADNAME 1
            AOODOWNLOADNAMEPREFIX Apache_OpenOffice_wJRE
            XPDINSTALLER 1
            BETAUPGRADECODE
            STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
            CHANGETARGETDIR 1
            USE_FILEVERSION 1
            LIBRARYVERSION 9.5.0
            PATCHCODEFILE ooo_patchcodes.txt
            JAVAPRODUCT 1
            DOWNLOADBANNER	ooobanner.bmp
            DOWNLOADBITMAP	ooobitmap.bmp
            DOWNLOADSETUPICO	ooosetup.ico
            RELATIVE_PATHES_IN_DDF 1
            STARTCENTER_ADDFEATURE_URL http://extensions.openoffice.org/
            STARTCENTER_INFO_URL http://www.openoffice.org
            STARTCENTER_TEMPLREP_URL http://templates.openoffice.org
            STARTCENTER_LAYOUT_STYLE 0
            DICT_REPO_URL http://extensions.openoffice.org/dictionaries
            REGISTRATION_PRODUCT OpenOffice.org
            REGISTRATION_CID 926117
        }
        active			1
        compression		5
        script			setup_osljre
        downloadname	Apache_OpenOffice_{productversion}_{os}_installwjre_{languages}
        include			{solarenvpath}/{os}/loader2,.,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
    }
}

Apache_OpenOffice_Dev
{
    Settings
    {
        variables
        {
            PRODUCTNAME AOO-Developer-Build
            PRODUCTVERSION 3.5.0
            PRODUCTEXTENSION 
            LONG_PRODUCTEXTENSION 
            SHORT_PRODUCTEXTENSION 
            BASISROOTNAME AOOdev
            UNIXBASISROOTNAME aoodev
            POSTVERSIONEXTENSION
            POSTVERSIONEXTENSIONUNIX
            BRANDPACKAGEVERSION 3
            USERDIRPRODUCTVERSION 3
            ABOUTBOXPRODUCTVERSION 3.5.0
            BASEPRODUCTVERSION 3.5
            DEVELOPMENTPRODUCT 1
            BASISPACKAGEPREFIX aoobasis-dev
            UREPACKAGEPREFIX aoodev
            SOLSUREPACKAGEPREFIX aoodev
            REGISTRYLAYERNAME LayerDev
            UPDATEURL http://www.openoffice.org/projects/update/aoo35/check.Update
            ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
            EVAL
            FILEFORMATNAME OpenOffice.org XML
            FILEFORMATVERSION 1.0
            WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
            PACKAGEVERSION 3.5.0
            PACKAGEREVISION {milestone}
            LICENSENAME ALv2
            GLOBALFILEGID gid_File_Lib_Vcl
            GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
            SPELLCHECKERFILE spellchecker_selection.txt
            OPENSOURCE 1
            SETSTATICPATH 1
            AOODOWNLOADNAME 1
            AOODOWNLOADNAMEPREFIX Apache_OpenOffice-Dev
            XPDINSTALLER 0
            BETAUPGRADECODE
            STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
            CHANGETARGETDIR 1
            USE_FILEVERSION 1
            JAVAPRODUCT 0
            LIBRARYVERSION 9.5.0
            PATCHCODEFILE ooodev_patchcodes.txt
            CODEFILENAME codes_ooodev.txt
            DOWNLOADBANNER	ooobanner.bmp
            DOWNLOADBITMAP	ooobitmap.bmp
            DOWNLOADSETUPICO	ooosetup.ico
            LOCALUSERDIR $ORIGIN/..
            RELATIVE_PATHES_IN_DDF 1
            STARTCENTER_ADDFEATURE_URL http://extensions.openoffice.org/
            STARTCENTER_INFO_URL http://www.openoffice.org
            STARTCENTER_TEMPLREP_URL http://templates.openoffice.org
            STARTCENTER_LAYOUT_STYLE 0
            DICT_REPO_URL http://extensions.openoffice.org/dictionaries
            REGISTRATION_PRODUCT OpenOffice.org
            REGISTRATION_CID 926117
            SERVICETAG_URN urn:uuid:1680b00d-e45c-11de-82d6-080020a9ed93
        }
        active			1
        compression		5
        script			setup_osl
        downloadname	Apache_OpenOffice-dev_{productversion}_{os}_install_{languages}
        langpackdownloadname	Apache_OpenOffice_{productversion}_languagepack_{os}_install_{languages}
        include			{solarenvpath}/{os}/loader2,.,{localpath}/bin/dev,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
    }
}

URE

            DONTUSESTARTMENUFOLDER 1
            RELATIVE_PATHES_IN_DDF 1
            NOLANGUAGESELECTIONPRODUCT 1
            AOODOWNLOADNAMEPREFIX Apache_OpenOffice-URE
            STARTCENTER_ADDFEATURE_URL http://extensions.openoffice.org/
            STARTCENTER_INFO_URL http://www.openoffice.org
            STARTCENTER_TEMPLREP_URL http://templates.openoffice.org
            STARTCENTER_LAYOUT_STYLE 0
            ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,version.lst
            PACKAGEMAP package_names_ext.txt
            DICT_REPO_URL http://extensions.openoffice.org/dictionaries
        }
        active 1
        compression 5

    }
}

Apache_OpenOffice_SDK
{
    Settings
    {
        downloadname Apache_OpenOffice-SDK_{packageversion}_{os}_install_{languages}
        variables
        {
            PRODUCTNAME Apache OpenOffice
            PRODUCTVERSION 3.5.0
            PRODUCTEXTENSION
            LONG_PRODUCTEXTENSION

            DOWNLOADSETUPICO ooosetup.ico
            DONTUSESTARTMENUFOLDER 1
            RELATIVE_PATHES_IN_DDF 1
            AOODOWNLOADNAMEPREFIX Apache_OpenOffice-SDK
            STARTCENTER_ADDFEATURE_URL http://extensions.openoffice.org/
            STARTCENTER_INFO_URL http://www.openoffice.org
            STARTCENTER_TEMPLREP_URL http://templates.openoffice.org
            STARTCENTER_LAYOUT_STYLE 0
            DICT_REPO_URL http://extensions.openoffice.org/dictionaries
        }
        active 1
        compression 5

    }
}

Apache_OpenOffice_Dev_SDK
{
    Settings
    {
        downloadname Apache_OpenOffice-Dev-SDK_{packageversion}_{os}_install_{languages}
        variables
        {
            PRODUCTNAME AOO-Developer-Build
            PRODUCTVERSION 3.5.0
            PRODUCTEXTENSION
            LONG_PRODUCTEXTENSION

            BRANDPACKAGEVERSION 3
            PACKAGEVERSION 3.5.0
            PACKAGEREVISION {milestone}
            BASISPACKAGEPREFIX aoobasis-dev
            UREPACKAGEPREFIX aoodev
            SOLSUREPACKAGEPREFIX aoodev
            REGISTRYLAYERNAME LayerDev
            DEVELOPMENTPRODUCT 1
            PACK_INSTALLED 1
            POOLPRODUCT 0
            DMG_VOLUMEEXTENSION SDK

            DOWNLOADSETUPICO ooosetup.ico
            DONTUSESTARTMENUFOLDER 1
            RELATIVE_PATHES_IN_DDF 1
            AOODOWNLOADNAMEPREFIX Apache_OpenOffice-Dev-SDK
            STARTCENTER_ADDFEATURE_URL http://extensions.openoffice.org/
            STARTCENTER_INFO_URL http://www.openoffice.org
            STARTCENTER_TEMPLREP_URL http://templates.openoffice.org
            STARTCENTER_LAYOUT_STYLE 0
            DICT_REPO_URL http://extensions.openoffice.org/dictionaries
        }
        active 1
        compression 5




// examples of the Office Development Kit. The script duplicates the template
// script and inserts the variables into the copied script.
// The Script was developed for the operating systems Microsoft Windows.
var regKeyOfficeCurrentUser = "HKEY_CURRENT_USER\\Software\\Apache OpenOffice\\UNO\\InstallPath\\";
var regKeyOfficeLocaleMachine = "HKEY_LOCAL_MACHINE\\Software\\Apache OpenOffice\\UNO\\InstallPath\\";
var 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\\Apache OpenOffice\\Basic 3.0\\sdk\n" +
        "set OO_SDK_HOME=" + oo_sdk_home  +
        "\n\n" +
        "REM Office installation directory.\n" +
        "REM Example: set OFFICE_HOME=C:\\Program Files\\Apache OpenOffice 3\n" +
        "set OFFICE_HOME=" + office_home +
        "\n\n" +
        "REM Example: set OFFICE_HOME=C:\\Program Files\\Apache OpenOffice\\Basis 3.0\n" +
        "set OFFICE_BASE_HOME=" + office_base_home +
        "\n\n" +
        "REM URE installation directory.\n" +
        "REM Example: set OO_SDK_URE_HOME=C:\\Program Files\\Apache OpenOffice\\URE\n" +
        "set OO_SDK_URE_HOME=" + oo_sdk_ure_home +
        "\n\n" +
        "REM Directory of the make command.\n" +

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

(-)a/main/odk/configure.pl (-3 / +6 lines)
235	else	235	else
236	{	236	{
237	# prepare URE path	237	# prepare URE path
238	$main::OO_SDK_URE_HOME_SUGGESTION = "/opt/openoffice.org/ure";	238	$main::OO_SDK_URE_HOME_SUGGESTION = "/opt/apacheopenoffice/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-716 sub searchprog Link Here
711		711
712	sub searchMacOffice	712	sub searchMacOffice
713	{	713	{
		714	if (-d "/Applications/Apache OpenOffice.app" ) {
		715	return "/Applications/Apache OpenOffice.app"
		716	}
714	if (-d "/Applications/OpenOffice.org.app" ) {	717	if (-d "/Applications/OpenOffice.org.app" ) {
715	return "/Applications/OpenOffice.org.app"	718	return "/Applications/OpenOffice.org.app"
716	}	719	}
Lines 729-737 sub searchMacOffice Link Here
729		732
730	sub searchoffice	733	sub searchoffice
731	{	734	{
732	my $offset = rindex($main::sdkpath, "/openoffice.org");	735	my $offset = rindex($main::sdkpath, "/apacheopenoffice");
733	my $tmpOffice = substr($main::sdkpath, 0, $offset);	736	my $tmpOffice = substr($main::sdkpath, 0, $offset);
734	my $officepath = "$tmpOffice/openoffice.org$main::OO_MAJORVERSION";	737	my $officepath = "$tmpOffice/apacheopenoffice$main::OO_MAJORVERSION";
735		738
736	# if ( $main::OO_MINORVERSION > 0) {	739	# if ( $main::OO_MINORVERSION > 0) {
737	# $officepath = "$officepath$main::OO_MINORVERSION";	740	# $officepath = "$officepath$main::OO_MINORVERSION";




		  <tr valign="top">
		  <td class="cell20"><b>OFFICE_HOME</b></td>
		  <td class="cell80">Path to an existing Apache OpenOffice 
		  base installation, e.g. &quot;/opt/apacheopenoffice3&quot;. Be sure 
		  that it is not a user installation only. Exactly one of OFFICE_HOME
          and OO_SDK_URE_HOME must be set. The other should be either unset or
          set to an empty value.</td>

          <tr>
          <td class="cell20"><b>OO_SDK_URE_HOME</b></td>
          <td class="cell80">Path to an existing UNO Runtime Environment
          installation, e.g. &quot;/opt/apacheopenoffice/ure&quot;. Exactly one of
          OFFICE_HOME and OO_SDK_URE_HOME must be set. The other should be
          either unset or set to an empty value.</td>
          </tr>

		  the output is generated in the SDK directory itself. If an output 
		  directory is specified, the output is generated in a SDK dependent 
		  subdirectory in this directory (e.g. &lt;OO_SDK_OUTPUT_DIR&gt;
		  /Apache OpenOffice %PRODUCT_RELEASE%/LINUXExample.out)</td>
		  </tr>
		  <tr>
		  <td class="cell20"><b>SDK_AUTO_DEPLOYMENT</b></td>

Lines 23-29 Link Here

(-)a/main/odk/docs/notsupported.html (-1 / +1 lines)
23	-->	23	-->
24	<html>	24	<html>
25	<head>	25	<head>
26	<title>OpenOffice.org %PRODUCT_RELEASE% SDK - Not supported page</title>	26	<title>Apache OpenOffice %PRODUCT_RELEASE% SDK - Not supported page</title>
27	<link rel="stylesheet" type="text/css" href="sdk_styles.css">	27	<link rel="stylesheet" type="text/css" href="sdk_styles.css">
28	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">	28	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
29	<meta name="author" content="Jürgen Schmidt">	29	<meta name="author" content="Jürgen Schmidt">

Lines 20-26 Link Here

(-)a/main/odk/examples/cpp/StatusbarController/ModifiedStatusbarController/project.mk (-1 / +1 lines)
20	#**************************************************************	20	#**************************************************************
21		21
22	DESCRIPTION_OOO_MIN_VER=3.5.0	22	DESCRIPTION_OOO_MIN_VER=3.5.0
23	DESCRIPTION_DEP_NAME=OpenOffice.org $(DESCRIPTION_OOO_MIN_VER)	23	DESCRIPTION_DEP_NAME=Apache OpenOffice $(DESCRIPTION_OOO_MIN_VER)
24		24
25	EXTENSION_ID=org.apache.openoffice.framework.statusbar.ModifiedStatus	25	EXTENSION_ID=org.apache.openoffice.framework.statusbar.ModifiedStatus
26	EXTENSION_VERSION=0.0.1	26	EXTENSION_VERSION=0.0.1

Lines 20-26 Link Here

(-)a/main/odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/project.mk (-1 / +1 lines)
20	#**************************************************************	20	#**************************************************************
21		21
22	DESCRIPTION_OOO_MIN_VER=3.5.0	22	DESCRIPTION_OOO_MIN_VER=3.5.0
23	DESCRIPTION_DEP_NAME=OpenOffice.org $(DESCRIPTION_OOO_MIN_VER)	23	DESCRIPTION_DEP_NAME=Apache OpenOffice $(DESCRIPTION_OOO_MIN_VER)
24		24
25	EXTENSION_ID=org.apache.openoffice.framework.statusbar.SelectionMode	25	EXTENSION_ID=org.apache.openoffice.framework.statusbar.SelectionMode
26	EXTENSION_VERSION=0.0.1	26	EXTENSION_VERSION=0.0.1

Lines 20-26 Link Here

(-)a/main/odk/examples/cpp/StatusbarController/WordCountStatusbarController/project.mk (-1 / +1 lines)
20	#**************************************************************	20	#**************************************************************
21		21
22	DESCRIPTION_OOO_MIN_VER=3.5.0	22	DESCRIPTION_OOO_MIN_VER=3.5.0
23	DESCRIPTION_DEP_NAME=OpenOffice.org $(DESCRIPTION_OOO_MIN_VER)	23	DESCRIPTION_DEP_NAME=Apache OpenOffice $(DESCRIPTION_OOO_MIN_VER)
24		24
25	EXTENSION_ID=org.apache.openoffice.framework.statusbar.StatusWordCount	25	EXTENSION_ID=org.apache.openoffice.framework.statusbar.StatusWordCount
26	EXTENSION_VERSION=0.0.1	26	EXTENSION_VERSION=0.0.1

Lines 233-239 void SAL_CALL BaseDispatch::dispatch( const URL& aURL, const Sequence < Property Link Here

(-)a/main/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx (-1 / +1 lines)
233	{	233	{
234	if ( !aURL.Path.compareToAscii( RTL_CONSTASCII_STRINGPARAM( "ImageButtonCmd" ) ) )	234	if ( !aURL.Path.compareToAscii( RTL_CONSTASCII_STRINGPARAM( "ImageButtonCmd" ) ) )
235	{	235	{
236	// open the OpenOffice.org web page	236	// open the Apache OpenOffice web page
237	::rtl::OUString sURL( RTL_CONSTASCII_USTRINGPARAM( "http://www.openoffice.org" ) );	237	::rtl::OUString sURL( RTL_CONSTASCII_USTRINGPARAM( "http://www.openoffice.org" ) );
238	Reference< XSystemShellExecute > xSystemShellExecute( mxMSF->createInstance(	238	Reference< XSystemShellExecute > xSystemShellExecute( mxMSF->createInstance(
239	::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.system.SystemShellExecute" ) ) ), UNO_QUERY );	239	::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.system.SystemShellExecute" ) ) ), UNO_QUERY );

Lines 31-36 Link Here

(-)a/main/odk/examples/cpp/custompanel/description.xml (-1 / +1 lines)
31	<name>Custom Tool Panel Example</name>	31	<name>Custom Tool Panel Example</name>
32	</display-name>	32	</display-name>
33	<dependencies>	33	<dependencies>
34	<OpenOffice.org-minimal-version value="3.4" d:name="OpenOffice.org 3.4"/>	34	<OpenOffice.org-minimal-version value="3.4" d:name="Apache OpenOffice 3.4"/>
35	</dependencies>	35	</dependencies>
36	</description>	36	</description>

Lines 19-25 Link Here

(-)a/main/odk/pack/copying/dk.mk (-1 / +1 lines)
19	#	19	#
20	#**************************************************************	20	#**************************************************************
21		21
22	# OpenOffice.org @@RELEASE@@ SDK dependent settings	22	# Apache OpenOffice @@RELEASE@@ SDK dependent settings
23	SDKVERSION=@@RELEASE@@	23	SDKVERSION=@@RELEASE@@
24	BUILDID=@@BUILDID@@	24	BUILDID=@@BUILDID@@
25	SCM_REVISION=@@SCMREVISION@@	25	SCM_REVISION=@@SCMREVISION@@




TOPIC:
com.sun.star.task.JobExecutor

LINK:Documentation/DevGuide/Database/Data_Sources_in_Apache_OpenOffice_API#DatabaseContext
DESCR:Database - Data Sources in Apache OpenOffice API - DatabaseContext
REF:
com.sun.star.sdb.Connection
com.sun.star.sdb.DatabaseContext

com.sun.star.sheet.XSheetAnnotationAnchor
TOPIC:

LINK:Documentation/DevGuide/OfficeDev/Frame-Controller-Model_Paradigm_in_Apache_OpenOffice
DESCR:OfficeDev - Frame-Controller-Model Paradigm in Apache OpenOffice
REF:
TOPIC:
com.sun.star.frame.XController

Lines 30-36 if [ "$OSTYPE" = "Darwin" ] Link Here

(-)a/main/odk/setsdkenv_unix (-1 / +1 lines)
30	then	30	then
31	OO_SDK_NAME=`basename $OO_SDK_HOME`	31	OO_SDK_NAME=`basename $OO_SDK_HOME`
32	else	32	else
33	OO_SDK_NAME=openoffice.org${OOVERSION}_sdk	33	OO_SDK_NAME=apacheopenoffice${OOVERSION}_sdk
34	fi	34	fi
35		35
36	export OO_SDK_HOME	36	export OO_SDK_HOME




export OO_SDK_NAME

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

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

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


SDK_AUTO_DEPLOYMENT=@SDK_AUTO_DEPLOYMENT@
export SDK_AUTO_DEPLOYMENT

# Check installation path for the Apache OpenOffice Development Kit.
if [ -z "${OO_SDK_HOME}" ]
then
    echo Error: Please insert a correct value for the variable OO_SDK_HOME.




REM are necessary for building the examples of the Office Development Kit.
REM The Script was developed for the operating systems Windows.
REM The SDK name
REM Example: set OO_SDK_NAME=apacheopenoffice3.0_sdk
set OO_SDK_NAME=apacheopenoffice3.0_sdk

REM Installation directory of the Software Development Kit.
REM Example: set OO_SDK_HOME=C:\Program Files\Apache OpenOffice\Basic 3.0\sdk
set OO_SDK_HOME=

REM Office installation directory.
REM Example: set OFFICE_HOME=C:\Program Files\Apache OpenOffice 3
set OFFICE_HOME=

REM Example: set OFFICE_HOME=C:\Program Files\Apache OpenOffice\Basis 3.0
set OFFICE_BASE_HOME=

REM URE installation directory.
REM Example: set OO_SDK_URE_HOME=C:\Program Files\Apache OpenOffice\URE
set OO_SDK_URE_HOME=

REM Directory of the make command.

set OO_SDK_JAVA_HOME=

REM Special output directory
REM Example: set OO_SDK_OUT=C:\apacheopenoffice3.0_sdk
set OO_SDK_OUT=

REM Automatic deployment

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\\OpenOffice.org\\UNO\\InstallPath";	191	final String SUBKEYNAME = "Software\\Apache 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\OpenOffice.org\UNO\InstallPath" from the	64	* default value of the key "Software\Apache 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=3.5	25	PRODUCT_RELEASE=3.5
26	OFFICENAME=OpenOffice.org	26	OFFICENAME=Apache OpenOffice
27	SDKDIRNAME=openoffice.org$(PRODUCT_RELEASE)_sdk	27	SDKDIRNAME=apacheopenoffice$(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 31-33 msvcr80.dll Link Here

(-)a/main/postprocess/rebase/no_rebase.txt (+2 lines)
31	msvcr90d.dll	31	msvcr90d.dll
32	msvcr90.dll	32	msvcr90.dll
33	msvcr100.dll	33	msvcr100.dll
		34	msvcr100d.dll
		35	dbghelp.dll




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


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


        ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
        ModuleID = gid_Module_Root_Reg_##name; \
        Subkey = STRING(CONCAT2(.,key)); \
        Value = STRING(CONCAT2(Apache 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(Apache 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(Apache 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(Apache 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(Apache OpenOffice.,name,\shell\new)); \
        REG_VALUE_LNG(NEW) \
    End \
    RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_New_Command) \
        ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
        ModuleID = modid; \
        Subkey = STRING(CONCAT3(Apache 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(Apache 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(Apache 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(Apache 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(Apache OpenOffice.,name)); \
        Styles = (); \
    End


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


Lines 30-38 Installation gid_Installation_Ooo Link Here

(-)a/main/scp2/source/ooo/installation_ooo.scp (-3 / +3 lines)
30	OOoBaseVersion = "${OOOBASEVERSION}";	30	OOoBaseVersion = "${OOOBASEVERSION}";
31	UserDirProductVersion = "${USERDIRPRODUCTVERSION}";	31	UserDirProductVersion = "${USERDIRPRODUCTVERSION}";
32	JavaVersion = "${JAVAVERSION}";	32	JavaVersion = "${JAVAVERSION}";
33	SxwFormatName = "OpenOffice.org";	33	SxwFormatName = "OpenOffice.org XML";
34	SxwFormatVersion = "1.1";	34	SxwFormatVersion = "1.0";
35	VendorName = "OpenOffice.org";	35	VendorName = "Apache OpenOffice";
36	#ifdef WNT	36	#ifdef WNT
37	DefaultDestPath = "<winprogpath>\${PRODUCTNAME}${PRODUCTVERSION}";	37	DefaultDestPath = "<winprogpath>\${PRODUCTNAME}${PRODUCTVERSION}";
38	#else	38	#else




    ModuleID = gid_Module_Root;
    Subkey = "Software\Microsoft\Windows\CurrentVersion\Uninstall\%PRODUCTNAME %PRODUCTVERSION";
    Name = "Publisher";
    Value = "Apache OpenOffice project community";
End

RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Uninstall_Staroffice_Uninstallstring


RegistryItem gid_Regitem_Software_Openoffice_Productname_Productversion_Path
	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
	Subkey = "Software\Apache 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\Apache 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\Apache 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\Apache 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\Apache 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\Apache 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\Apache 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\Apache OpenOffice\UNO\InstallPath";
    ModuleID = gid_Module_Root;
    Value  = "<progpath>\program";
End

RegistryItem gid_Regitem_Software_Openofficeorg_Uno_Installpath_Branded
    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
    Subkey = "Software\Apache OpenOffice\UNO\InstallPath";
    ModuleID = gid_Module_Root;
    Name = "%PRODUCTNAME %PRODUCTVERSION";
    Value  = "<progpath>\program";

Lines 28-37 en-US = "&New" Link Here

(-)a/main/scp2/source/ooo/registryitem_ooo.ulf (-2 / +2 lines)
28	en-US = "&Install"	28	en-US = "&Install"
29		29
30	[STR_REG_VAL_SO60_CONFIGFILE]	30	[STR_REG_VAL_SO60_CONFIGFILE]
31	en-US = "%SXWFORMATNAME %SXWFORMATVERSION Configuration File"	31	en-US = "OpenOffice.org 1.1 Configuration File"
32		32
33	[STR_REG_VAL_SO50_TEMPLATE_OOO]	33	[STR_REG_VAL_SO50_TEMPLATE_OOO]
34	en-US = "StarOffice 5.0 Template"	34	en-US = "StarOffice 5.0 Template"
35		35
36	[STR_REG_VAL_APPCAPABILITY_DESCRIPTION_OOO]	36	[STR_REG_VAL_APPCAPABILITY_DESCRIPTION_OOO]
37	en-US = "OpenOffice.org"	37	en-US = "office productivity suite based on Apache OpenOffice project"

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\OpenOffice.org\%PRODUCTNAME";	1319	Subkey = "Software\Apache 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 = "OpenOffice.org";	41	HostName = "Apache OpenOffice";
42	#else	42	#else
43	HostName = "openoffice.org";	43	HostName = "apacheopenoffice";
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\OpenOffice.org";	28	Subkey = "Software\Apache 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";




#ifndef WNT
Directory gid_Dir_Ooo_Openofficeorg_Sdk
    ParentID = PREDEFINED_PROGDIR;
  #ifdef WNT
    HostName = "${BASISROOTNAME}";
  #else
    HostName = "${UNIXBASISROOTNAME}";
  #endif
End
#endif

#ifndef WNT
Directory gid_Dir_Ooo_Basis_Sdk
    ParentID = gid_Dir_Ooo_Openofficeorg_Sdk;
  #ifdef WNT
    HostName = "Basis ${OOOBASEVERSION}";
  #else
    HostName = "basis${OOOBASEVERSION}";
  #endif
    Styles = (BASISDIRECTORY);
End
#endif

Directory gid_Dir_Basis_Sdk
#if defined MACOSX
    ParentID = PREDEFINED_PROGDIR;
    DosName = "Apache_OpenOffice_SDK";
    DosName = "OpenOffice.org_SDK";
#else
  #if defined WNT
    ParentID = gid_Dir_Sdkoo_Root;




    ModuleID = gid_Module_Optional_Winexplorerext;
    Styles = (X64);
    Subkey = "Folder\shellex\ColumnHandlers\{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}";
    Value = "Apache OpenOffice Column Handler";
    Val64 = "Apache OpenOffice Column Handler";
End

RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer32

    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
    ModuleID = gid_Module_Root;
    Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}";
// Better?: "OpenOffice.org Format Filter"
// old:    Value = "opendocument.org Filter";
	Styles = (X64_ONLY); // Values: X64
    Value = "OpenDocument Format Filter";
    Val64 = "OpenDocument Format Filter";

    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
    ModuleID = gid_Module_Root;
    Subkey = "CLSID\{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
//? Better: "OpenOffice.org Persistent Handler"
// old:    Value = "opendocument.org Persistent Handler";
	Styles = (X64); // Values: X64
    Value = "OpenDocument Format Persistent Handler";
    Val64 = "OpenDocument Format Persistent Handler";

Lines 187-193 SCP1FILES += \ Link Here

(-)a/main/scp2/util/makefile.mk (-1 / +1 lines)
187	.ENDIF	187	.ENDIF
188		188
189	# ------------------------------------------------------------------------	189	# ------------------------------------------------------------------------
190	# OpenOffice.org with JRE	190	# Apache OpenOffice with JRE
191		191
192	SCP2LINK_PRODUCT_TYPE=osl	192	SCP2LINK_PRODUCT_TYPE=osl
193	SCP2TARGET = setup_osljre	193	SCP2TARGET = setup_osljre

Lines 80-86 SunOS) Link Here

(-)a/main/setup_native/scripts/langpackscript.sh (-1 / +1 lines)
80	;;	80	;;
81	Linux)	81	Linux)
82	SEARCHPACKAGENAME="BASISPACKAGEPREFIXPLACEHOLDEROOOBASEVERSIONPLACEHOLDER-core01"	82	SEARCHPACKAGENAME="BASISPACKAGEPREFIXPLACEHOLDEROOOBASEVERSIONPLACEHOLDER-core01"
83	FIXPATH="/openoffice.org"	83	FIXPATH="/apachopenoffice"
84	echo	84	echo
85	echo "Searching for the FULLPRODUCTNAMELONGPLACEHOLDER installation ..."	85	echo "Searching for the FULLPRODUCTNAMELONGPLACEHOLDER installation ..."
86	RPMNAME=`rpm -qa \| grep $SEARCHPACKAGENAME`	86	RPMNAME=`rpm -qa \| grep $SEARCHPACKAGENAME`




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

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

case "$1" in
'start')
    EXTENSIONDIR=/opt/apacheopenoffice${OOOBRANDPACKAGEVERSION}/share/extension/install
    for FILE in $EXTENSIONDIR/*.oxt
    do
	#We check if the file exist, because if there is no extension

		#list. That is, it has not been installed (with unopkg) yet.
		#Therefore we do it now.
		echo installing $FILE
		/opt/apacheopenoffice${OOOBRANDPACKAGEVERSION}/program/unopkg add --shared --bundled "$FILE" '-env:UserInstallation=file://$INSTDIR' '-env:UNO_JAVA_JFW_INSTALL_DATA=$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1'
		#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/apacheopenoffice${OOOBRANDPACKAGEVERSION}/program/unopkg remove --shared --bundled "`basename $LINE`" '-env:UserInstallation=file://$INSTDIR' '-env:UNO_JAVA_JFW_INSTALL_DATA=$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1'
# 	    REMOVED=1
# 	else
# 	    NEWCONTENT+=$LINE 




platform=`uname -s`
case $$platform in
SunOS)
  BASISPACKAGE=apacheopenoffice-core01
  BASISDIR=`pkginfo -r $$BASISPACKAGE`
  PRODUCTINSTALLLOCATION="$$BASEDIR"
  ;;
Linux)
  BASISPACKAGE=apacheopenoffice-core01
  BASISDIR=`rpm -q --queryformat "%{INSTALLPREFIX}" $$BASISPACKAGE`
  PRODUCTINSTALLLOCATION="$$RPM_INSTALL_PREFIX"
  ;;

esac

# creating link to basis layer
if [ -d $$BASISDIR/apacheopenoffice/basisBASISDIRECTORYVERSION ]
then
      ln -s $$BASISDIR/apacheopenoffice/basisBASISDIRECTORYVERSION $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/basis-link >/dev/null 2>&1
else
      ln -s ../apacheopenoffice/basisBASISDIRECTORYVERSION $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/basis-link >/dev/null 2>&1
fi

exit 0




esac

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

exit 0

  ;;
esac

if [ -h $$PRODUCTINSTALLLOCATION/apacheopenoffice/basisBASISDIRECTORYVERSION/ure-link -a $$LASTUNINSTALL -eq 1 ]
then
  rm -f $$PRODUCTINSTALLLOCATION/apacheopenoffice/basisBASISDIRECTORYVERSION/ure-link 2>/dev/null
  rmdir $$PRODUCTINSTALLLOCATION/apacheopenoffice/basisBASISDIRECTORYVERSION 2>/dev/null
  rmdir $$PRODUCTINSTALLLOCATION/apacheopenoffice 2>/dev/null
fi

exit 0

Lines 124-131 UINT GetInstallProperty(MSIHANDLE handle, LPCTSTR name, CharacterBuffer_t* buffe Link Here

(-)a/main/setup_native/source/win32/customactions/languagepacks/lngpckinsthelper.cxx (-2 / +2 lines)
124	Try to find the installation path to an already installed product.	124	Try to find the installation path to an already installed product.
125	The installation path will be written in the Windows registry	125	The installation path will be written in the Windows registry
126	during the installation. There may exist different products in	126	during the installation. There may exist different products in
127	parallel e.g. StarOffice, StarSuite, OpenOffice.org. It will be	127	parallel e.g. StarOffice, StarSuite, OpenOffice.org, Apache OpenOffice.
128	searched in this order for an installed product. If a product	128	It will be searched in this order for an installed product. If a product
129	will be found the path to the product will be set in the property	129	will be found the path to the product will be set in the property
130	"INSTALLLOCATION" else nothing will be done.	130	"INSTALLLOCATION" else nothing will be done.
131	*/	131	*/

Lines 113-118 static BOOL CheckExtensionInRegistry( LPCSTR lpSubKey ) Link Here

(-)a/main/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx (+4 lines)
113	bRet = true;	113	bRet = true;
114	}	114	}
115	else if ( strncmp( szBuffer, "OpenOffice.org.", 15 ) == 0 )	115	else if ( strncmp( szBuffer, "OpenOffice.org.", 15 ) == 0 )
		116	{ // We will replace registration for our (former) own types, too
		117	bRet = true;
		118	}
		119	else if ( strncmp( szBuffer, "Apache OpenOffice.", 15 ) == 0 )
116	{ // We will replace registration for our own types, too	120	{ // We will replace registration for our own types, too
117	bRet = true;	121	bRet = true;
118	}	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"OpenOffice.org"),//FORWARD_KEY_PREFIX(L"soffice6"),	80	FORWARD_KEY_PREFIX(L"Apache 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"OpenOffice.org.reg4msdocmsi"),//PRIVATE_BACKUP_KEY_NAME(L"soffice6.bak"),	83	PRIVATE_BACKUP_KEY_NAME(L"Apache 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 45-51 Link Here

(-)a/main/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.hxx (-2 / +2 lines)
45	document display name is convertable to an ANSI	45	document display name is convertable to an ANSI
46	string and if not returns an english default.	46	string and if not returns an english default.
47	So we avoid garbage if soemone for instance	47	So we avoid garbage if soemone for instance
48	installs an japanese StarOffice/OpenOffice	48	installs an japanese version
49	under a German Windows 98 for instance.	49	under a German Windows 98 for instance.
50	*/	50	*/
51	class RegistrationContextInformation	51	class RegistrationContextInformation
Lines 150-156 public: Link Here
150	*/	150	*/
151	std::wstring GetOpenOfficeFriendlyAppName() const;	151	std::wstring GetOpenOfficeFriendlyAppName() const;
152		152
153	/** The path to the StarOffice/OpenOffice executable	153	/** The path to the office executable
154	*/	154	*/
155	std::wstring GetOpenOfficeExecutablePath() const;	155	std::wstring GetOpenOfficeExecutablePath() const;
156		156

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

(-)a/main/setup_native/source/win32/customactions/relnotes/relnotes.cxx (-2 / +3 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( "OpenOffice.org" ) );	161	std::wstring::size_type nIndex = prodname.find( TEXT( "Apache OpenOffice" ) );
162	if( std::wstring::npos == nIndex )	162	if( std::wstring::npos == nIndex )
163	return ERROR_SUCCESS;	163	return ERROR_SUCCESS;
164		164
Lines 170-176 extern "C" UINT __stdcall ShowSurveyAfter( MSIHANDLE handle ) Link Here
170	aExecInf.cbSize = sizeof( aExecInf );	170	aExecInf.cbSize = sizeof( aExecInf );
171	aExecInf.fMask = SEE_MASK_FLAG_DDEWAIT \| SEE_MASK_FLAG_NO_UI;	171	aExecInf.fMask = SEE_MASK_FLAG_DDEWAIT \| SEE_MASK_FLAG_NO_UI;
172	aExecInf.lpVerb = TEXT("open");	172	aExecInf.lpVerb = TEXT("open");
173	aExecInf.lpFile = TEXT("http://surveys.services.openoffice.org/deinstall");	173	//aExecInf.lpFile = TEXT("http://surveys.services.openoffice.org/deinstall");
		174	aExecInf.lpFile = TEXT("http://www.openoffice.org/support/");
174	aExecInf.lpDirectory = NULL;	175	aExecInf.lpDirectory = NULL;
175	aExecInf.nShow = SW_SHOWNORMAL;	176	aExecInf.nShow = SW_SHOWNORMAL;
176		177




    </MSDN>
    
    We add the following entries to the respective registry key
    "{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}"="Apache OpenOffice Column Handler"
    "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}"="Apache OpenOffice Infotip Handler"
    "{63542C48-9552-494A-84F7-73AA6A7C99C1}"="Apache OpenOffice Property Sheet Handler"
    "{3B092F0C-7696-40E3-A80F-68D74DA84210}"="Apache OpenOffice Thumbnail Viewer"
    
    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("Apache OpenOffice Column Handler") };
RegistryEntry InfotipHandler = { TEXT("{087B3AE3-E237-4467-B8DB-5A38AB959AC9}"), TEXT("Apache OpenOffice Infotip Handler") };
RegistryEntry PropHandler = { TEXT("{63542C48-9552-494A-84F7-73AA6A7C99C1}"), TEXT("Apache OpenOffice Property Sheet Handler") };
RegistryEntry ThumbViewer = { TEXT("{3B092F0C-7696-40E3-A80F-68D74DA84210}"), TEXT("Apache OpenOffice Thumbnail Viewer") };

BOOL GetMsiProp( MSIHANDLE hMSI, const char* pPropName, char** ppValue )
{

Lines 7-13 Link Here

(-)a/main/setup_native/source/win32/stwrapper/stwrapper.manifest (-1 / +1 lines)
7	version="1.0.0.0"	7	version="1.0.0.0"
8	processorArchitecture="x86"	8	processorArchitecture="x86"
9	/>	9	/>
10	<description>OpenOffice.org Installer</description>	10	<description>Apache OpenOffice Installer</description>
11	<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">	11	<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
12	<security>	12	<security>
13	<requestedPrivileges>	13	<requestedPrivileges>

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("OpenOffice.org Column Handler")	43	#define COLUMN_HANDLER_DESCRIPTIVE_NAME TEXT("Apache OpenOffice Column Handler")
44	#define INFOTIP_HANDLER_DESCRIPTIVE_NAME TEXT("OpenOffice.org Infotip Handler")	44	#define INFOTIP_HANDLER_DESCRIPTIVE_NAME TEXT("Apache OpenOffice Infotip Handler")
45	#define PROPSHEET_HANDLER_DESCRIPTIVE_NAME TEXT("OpenOffice.org Property Sheet Handler")	45	#define PROPSHEET_HANDLER_DESCRIPTIVE_NAME TEXT("Apache OpenOffice Property Sheet Handler")
46	#define THUMBVIEWER_HANDLER_DESCRIPTIVAE_NAME TEXT("OpenOffice.org Thumbnail Viewer")	46	#define THUMBVIEWER_HANDLER_DESCRIPTIVAE_NAME TEXT("Apache 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 405-411 namespace /* private */ { Link Here

(-)a/main/shell/source/unix/sysshell/recently_used_file_handler.cxx (-1 / +1 lines)
405	};	405	};
406		406
407	//------------------------------------------------	407	//------------------------------------------------
408	const char* GROUP_OOO = "openoffice.org";	408	const char* GROUP_OOO = "apacheopenoffice";
409	const char* GROUP_STAR_OFFICE = "staroffice";	409	const char* GROUP_STAR_OFFICE = "staroffice";
410	const char* GROUP_STAR_SUITE = "starsuite";	410	const char* GROUP_STAR_SUITE = "starsuite";
411		411

Lines 1197-1203 namespace /* private */ Link Here

(-)a/main/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx (-2 / +2 lines)
1197	std::string ClsidEntry = CLSID_GUID_ENTRY;	1197	std::string ClsidEntry = CLSID_GUID_ENTRY;
1198	SubstitutePlaceholder(ClsidEntry, GUID_PLACEHOLDER, ClsidToString(FilterGuid));	1198	SubstitutePlaceholder(ClsidEntry, GUID_PLACEHOLDER, ClsidToString(FilterGuid));
1199		1199
1200	if (!SetRegistryKey(HKEY_CLASSES_ROOT, ClsidEntry.c_str(), "", "OpenOffice.org Filter"))	1200	if (!SetRegistryKey(HKEY_CLASSES_ROOT, ClsidEntry.c_str(), "", "OpenOffice.org XML Filter"))
1201	return E_FAIL;	1201	return E_FAIL;
1202		1202
1203	ClsidEntry = CLSID_GUID_INPROC_ENTRY;	1203	ClsidEntry = CLSID_GUID_INPROC_ENTRY;
Lines 1225-1231 namespace /* private */ Link Here
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(), "", "OpenOffice.org Persistent Handler"))	1228	if (!SetRegistryKey(HKEY_CLASSES_ROOT, ClsidEntry_Persist.c_str(), "", "Apache 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"OpenOffice.org", L"Title" },	59	{ PKEY_Title, L"Apache OpenOffice", L"Title" },
60	{ PKEY_Author, L"OpenOffice.org", L"Author" },	60	{ PKEY_Author, L"Apache OpenOffice", L"Author" },
61	{ PKEY_Subject, L"OpenOffice.org", L"Subject" },	61	{ PKEY_Subject, L"Apache OpenOffice", L"Subject" },
62	{ PKEY_Keywords, L"OpenOffice.org", L"Keyword" },	62	{ PKEY_Keywords, L"Apache OpenOffice", L"Keyword" },
63	{ PKEY_Comment, L"OpenOffice.org", L"Comments" },	63	{ PKEY_Comment, L"Apache 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 (-2 / +2 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="OpenOffice.shlxthdl" type="win32" />	3	<assemblyIdentity version="1.0.0.0" processorArchitecture="x86" name="Apache_OpenOffice.shlxthdl" type="win32" />
4	<description>OpenOffice Shell Extension</description>	4	<description>Apache 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 80-86 namespace /* private */ Link Here

(-)a/main/shell/source/win32/simplemail/smplmailclient.cxx (-1 / +1 lines)
80	{	80	{
81	rtl::OUString altSenddocUrl;	81	rtl::OUString altSenddocUrl;
82	HKEY hkey;	82	HKEY hkey;
83	LONG lret = RegOpenKeyW(HKEY_CURRENT_USER, L"Software\\OpenOffice.org\\SendAsEMailClient", &hkey);	83	LONG lret = RegOpenKeyW(HKEY_CURRENT_USER, L"Software\\Apache OpenOffice\\SendAsEMailClient", &hkey);
84	if (lret == ERROR_SUCCESS)	84	if (lret == ERROR_SUCCESS)
85	{	85	{
86	wchar_t buff[MAX_PATH];	86	wchar_t buff[MAX_PATH];





sub get_downloadname_productname
{
    my ($allvariables) = @_;

	my $start = "Apache_OpenOffice";

	if ( $allvariables->{'PRODUCTNAME'} eq "OpenOffice.org" ) { $start .= ""; }

	if ( $allvariables->{'PRODUCTNAME'} eq "OOo-dev" ) { $start .= "-Dev"; }

	if (( $allvariables->{'PRODUCTNAME'} eq "OpenOffice.org" ) && ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start .= "-SDK"; }

    my $start;

    if ( $allvariables->{'AOODOWNLOADNAMEPREFIX'} )
    {
        $start = $allvariables->{'AOODOWNLOADNAMEPREFIX'};
    }
    else
    {
        $start = "Apache_OpenOffice";
        if ( $allvariables->{'PRODUCTNAME'} eq "Apache OpenOffice" ) 
        {
            if ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )
            {
                $start .= "-SDK"; 
            }
        }

        if ( $allvariables->{'PRODUCTNAME'} eq "AOO-Developer-Build" ) 
        {
            if ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )
            {
                $start .= "-Dev-SDK"; 
            }
            else
            {
                $start .= "-Dev";
            }
        }

        if ( $allvariables->{'PRODUCTNAME'} eq "URE" )
        {
            $start .= "-URE";
        }
    }

    return $start;
}

#########################################################


	# evaluating the name of the download file

	if ( $allvariableshashref->{'AOODOWNLOADNAME'} ) 
    { 
        $downloadname = set_download_filename($languagestringref, $allvariableshashref); 
    }
	else 
    { 
        $downloadname = resolve_variables_in_downloadname($allvariableshashref, $downloadname, $languagestringref); 
    }

	if ( ! $installer::globals::iswindowsbuild )	# Unix specific part
	{

		my $getuidlibrary = "";
		if (( $installer::globals::issolarisbuild ) || ( $installer::globals::islinuxbuild )) {	$getuidlibrary = get_path_for_library($includepatharrayref); }

		if ( $allvariableshashref->{'AOODOWNLOADNAME'} )
		{
			my $downloadfile = create_tar_gz_file_from_directory($installationdir, $getuidlibrary, $downloaddir, $downloadname);
		}




	my $line = "";
	my $infoline = "";
		
	# %product Apache OpenOffice Software
	# %version 2.0
	# %description A really great software
	# %copyright 1999-2003 by OOo
	# %vendor Apache OpenOffice project
	# %license /test/replace/01/LICENSE01
	# %readme /test/replace/01/README01
	# %requires foo

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

				}
			}

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

Lines 333-339 sub replace_variables_in_scriptfile Link Here

(-)a/main/solenv/bin/modules/installer/simplepackage.pm (-2 / +5 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 "OpenOffice.org" ) { $scriptname = "org.openoffice.script"; }	336	if ( $allvariables->{'PRODUCTNAME'} eq "Apache OpenOffice" )
		337	{
		338	$scriptname = "org.openoffice.script";
		339	}
337		340
338	replace_one_variable_in_shellscript($scriptfile, $scriptname, "SEARCHSCRIPTNAME" );	341	replace_one_variable_in_shellscript($scriptfile, $scriptname, "SEARCHSCRIPTNAME" );
339	}	342	}
Lines 616-622 sub create_simple_package Link Here
616		619
617	my $locallanguage = $installer::globals::csp_languagestring;	620	my $locallanguage = $installer::globals::csp_languagestring;
618		621
619	if ( $allvariables->{'OOODOWNLOADNAME'} )	622	if ( $allvariables->{'AOODOWNLOADNAME'} )
620	{	623	{
621	$packagename = installer::download::set_download_filename(\$locallanguage, $allvariables);	624	$packagename = installer::download::set_download_filename(\$locallanguage, $allvariables);
622	}	625	}

Lines 884-890 sub change_patchmetadata_table Link Here

(-)a/main/solenv/bin/modules/installer/windows/msp.pm (-1 / +1 lines)
884	if ( $allvariables->{'PROPERTYTABLEPRODUCTNAME'} ) { $targetproductnamevalue = $allvariables->{'PROPERTYTABLEPRODUCTNAME'}; }	884	if ( $allvariables->{'PROPERTYTABLEPRODUCTNAME'} ) { $targetproductnamevalue = $allvariables->{'PROPERTYTABLEPRODUCTNAME'}; }
885		885
886	my $manufacturerstring = "ManufacturerName";	886	my $manufacturerstring = "ManufacturerName";
887	my $manufacturervalue = "OpenOffice.org";	887	my $manufacturervalue = "Apache OpenOffice";
888	if ( $installer::globals::longmanufacturer ) { $manufacturervalue = $installer::globals::longmanufacturer; }	888	if ( $installer::globals::longmanufacturer ) { $manufacturervalue = $installer::globals::longmanufacturer; }
889		889
890	my $displaynamestring = "DisplayName";	890	my $displaynamestring = "DisplayName";

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 = "OpenOffice.org";	642	my $openofficeproductname = "Apache OpenOffice";
643	my $sunname = "";	643	my $sunname = "";
644		644
645		645





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

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


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

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

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

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


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

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


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

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

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: openoffice.org-desktop-integration, openoffice.org-unbundled	4	Provides: apache_openoffice-desktop-integration, openoffice.org-unbundled
5	Conflicts: openofficeorg-desktop-integration, openofficeorg-debian-menus, openoffice.org-bundled	5	Conflicts: apache_openoffice-desktop-integration, openofficeorg-desktop-integration, openofficeorg-debian-menus, openoffice.org-bundled
6	Replaces: openofficeorg-desktop-integration, openofficeorg-debian-menus	6	Replaces: apache_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: openoffice.org3-desktop-integration	30	Provides: apache_openoffice3-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: openoffice.org3-desktop-integration	36	Provides: apache_openoffice3-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




.ENDIF

# CAUTION! here the parsing result from openoffice.lst is NOT available, so this is hardcoded
# but should not be.
# It has to be equal to PRODUCTNAME:l:s/\s/\_/g - see solenv/bin/modules/installer/setupscript.pm
PRODUCTLIST = apache_openoffice

# default values to minimize maintainance effort


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

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

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


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: openoffice.org3-desktop-integration	32	Provides: apache_openoffice3-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-41 eval 'exec perl -wS $0 ${1+"$@"}' Link Here

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

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 = 'OpenOffice.org';	24	$productname = 'Apache 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 121-128 cp printeradmin.sh ${DESTDIR}/usr/bin/${PREFIX}-printeradmin Link Here

(-)a/main/sysui/desktop/share/create_tree.sh (-2 / +2 lines)
121	chmod 0755 ${DESTDIR}/usr/bin/${PREFIX} ${DESTDIR}/usr/bin/${PREFIX}-printeradmin	121	chmod 0755 ${DESTDIR}/usr/bin/${PREFIX} ${DESTDIR}/usr/bin/${PREFIX}-printeradmin
122		122
123	mkdir -p ${DESTDIR}/usr/share/mime/packages	123	mkdir -p ${DESTDIR}/usr/share/mime/packages
124	cp openoffice.org.xml ${DESTDIR}/usr/share/mime/packages/	124	cp apacheopenoffice.xml ${DESTDIR}/usr/share/mime/packages/
125	chmod 0644 ${DESTDIR}/usr/share/mime/packages/openoffice.org.xml	125	chmod 0644 ${DESTDIR}/usr/share/mime/packages/apacheopenoffice.xml
126		126
127	mkdir -p ${DESTDIR}/usr/share/applications	127	mkdir -p ${DESTDIR}/usr/share/applications
128	for i in `cat launcherlist`; do	128	for i in `cat launcherlist`; do




#
# Create shared mime info xml file
#
$(COMMONMISC)$/{$(PRODUCTLIST)}$/apacheopenoffice.xml : ../mimetypes/{$(MIMELIST)}.desktop create_mime_xml.pl
$(COMMONMISC)$/{$(PRODUCTLIST)}$/apacheopenoffice.xml : $(ULFDIR)$/documents.ulf
	@echo Create shared mime info xml file ..
	@echo ---------------------------------
	@$(PERL) create_mime_xml.pl $< > $@.$(INPATH)

	@@-$(MKDIRHIER) $(@:d)
	@echo Creating GNOME .keys file for $(@:d:d:f) ..
	@echo ---------------------------------
	@$(PERL) brand.pl -p "$(PRODUCTNAME.$(@:d:d:f))" -u $(UNIXFILENAME.$(@:d:d:f)) --iconprefix "$(ICONPREFIX.$(@:d:d:f))-" $< $(MISC)/$(@:d:d:f)
	@$(PERL) translate.pl -p "$(PRODUCTNAME.$(@:d:d:f))" -d $(MISC)/$(@:d:d:f) --ext "keys" --key "description" $(ULFDIR)$/documents.ulf
	@cat $(MISC)/$(@:d:d:f)/{$(MIMELIST)}.keys > $@.$(INPATH)
	@mv -f $@.$(INPATH) $@


	$(COMMONMISC)$/{$(PRODUCTLIST)}$/create_tree.sh \
	$(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.keys \
	$(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.mime \
	$(COMMONMISC)$/{$(PRODUCTLIST)}$/apacheopenoffice.xml	\
	$(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.applications \
	$(COMMONMISC)$/{$(PRODUCTLIST)}$/{openoffice printeradmin}.sh
	@touch $@

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 = "OpenOffice.org";	35	$productname = "Apache OpenOffice";
36	$workdir = ".";	36	$workdir = ".";
37		37
38	while ($_ = $ARGV[0], /^-/) {	38	while ($_ = $ARGV[0], /^-/) {




# --- openoffice.xml---------------------------

.IF "$(common_build)"=="TRUE"
# Copy the apacheopenoffice.xml file to $(MISC) 
#$(MISC)/$(foreach,i,$(PRODUCTLIST) $i/$i.xml) :  $(COMMONMISC)/$$(@:b)/apacheopenoffice.xml
$(MISC)/$(foreach,i,$(PRODUCTLIST) $(MISC)/$i/apacheopenoffice.xml) :  $(COMMONMISC)/$$(@:b)/apacheopenoffice.xml
	$(MKDIRHIER) $(@:d)
	echo hier hier $@
	cat $< | tr -d "\015" > $@

# --- packaging ---------------------------------------------------

#$(PKGFILES) : $(MISC)/{$(PRODUCTLIST)}/{copyright pkginfo depend mailcap postinstall postremove} makefile.mk $(MISC)/$$(@:b:b:s/-desktop-integration//)/$$(@:b:b:s/-desktop-integration//).xml
$(PKGFILES) : $(MISC)/{$(PRODUCTLIST)}/{copyright pkginfo depend mailcap postinstall postremove} makefile.mk $(MISC)/$$(@:b:b:s/-desktop-integration//)/apacheopenoffice.xml
$(PKGFILES) : $(MISC)$/{$(PRODUCTLIST)}$/prototype
	@-$(RM) $(BIN)$/$(@:f)
	@$(MKDIRHIER) $(@:d)

Lines 21-27 d none share/mime/packages 0755 root other Link Here

(-)a/main/sysui/desktop/solaris/prototype (-1 / +1 lines)
21	!default 0644 root bin	21	!default 0644 root bin
22	e build etc/mime.types=./mime.types	22	e build etc/mime.types=./mime.types
23	e build etc/mailcap=mailcap	23	e build etc/mailcap=mailcap
24	f none usr/share/mime/packages/%PREFIX.xml=%SOURCE/openoffice.org.xml	24	f none usr/share/mime/packages/%PREFIX.xml=%SOURCE/apacheopenoffice.xml
25	f none usr/share/application-registry/%PREFIX.applications=%SOURCE/openoffice.applications	25	f none usr/share/application-registry/%PREFIX.applications=%SOURCE/openoffice.applications
26	s none usr/share/applications/%PREFIX-writer.desktop=../../../opt/%PREFIX/share/xdg/writer.desktop	26	s none usr/share/applications/%PREFIX-writer.desktop=../../../opt/%PREFIX/share/xdg/writer.desktop
27	s none usr/share/applications/%PREFIX-calc.desktop=../../../opt/%PREFIX/share/xdg/calc.desktop	27	s none usr/share/applications/%PREFIX-calc.desktop=../../../opt/%PREFIX/share/xdg/calc.desktop

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: openoffice.org3-desktop-integration	35	Provides: apacheopenoffice3-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 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\\OpenOffice.org\\Accessibility\\AtToolSupport",	1170	"Software\\Aapche 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\\OpenOffice.org\\Accessibility\\AtToolSupport",	1248	"Software\\Apache 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\\OpenOffice.org\\Accessibility\\AtToolSupport",	6305	"Software\\Apache OpenOffice\\Accessibility\\AtToolSupport",
6306	&hkey) )	6306	&hkey) )
6307	{	6307	{
6308	DWORD dwType = 0;	6308	DWORD dwType = 0;

Return to issue 121388

Lines 6547-6554 com.sun.star.task.JobExecutor Link Here

(-)a/main/odk/pack/copying/idl_chapter_refs.txt (-4 / +4 lines)
6547	TOPIC:	6547	TOPIC:
6548	com.sun.star.task.JobExecutor	6548	com.sun.star.task.JobExecutor
6549		6549
6550	LINK:Documentation/DevGuide/Database/Data_Sources_in_OpenOffice.org_API#DatabaseContext	6550	LINK:Documentation/DevGuide/Database/Data_Sources_in_Apache_OpenOffice_API#DatabaseContext
6551	DESCR:Database - Data Sources in OpenOffice.org API - DatabaseContext	6551	DESCR:Database - Data Sources in Apache OpenOffice API - DatabaseContext
6552	REF:	6552	REF:
6553	com.sun.star.sdb.Connection	6553	com.sun.star.sdb.Connection
6554	com.sun.star.sdb.DatabaseContext	6554	com.sun.star.sdb.DatabaseContext
Lines 7510-7517 com.sun.star.table.CellAddress Link Here
7510	com.sun.star.sheet.XSheetAnnotationAnchor	7510	com.sun.star.sheet.XSheetAnnotationAnchor
7511	TOPIC:	7511	TOPIC:
7512		7512
7513	LINK:Documentation/DevGuide/OfficeDev/Frame-Controller-Model_Paradigm_in_OpenOffice.org	7513	LINK:Documentation/DevGuide/OfficeDev/Frame-Controller-Model_Paradigm_in_Apache_OpenOffice
7514	DESCR:OfficeDev - Frame-Controller-Model Paradigm in OpenOffice.org	7514	DESCR:OfficeDev - Frame-Controller-Model Paradigm in Apache OpenOffice
7515	REF:	7515	REF:
7516	TOPIC:	7516	TOPIC:
7517	com.sun.star.frame.XController	7517	com.sun.star.frame.XController

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(OpenOffice.org.,name)); \	389	Name = STRING(CONCAT2(Apache 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(OpenOffice.org.,name)); \	398	Name = STRING(CONCAT2(Apache 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(OpenOffice.org.,name)); \	407	Value = STRING(CONCAT2(Apache 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(OpenOffice.org.,name)); \	415	Subkey = STRING(CONCAT2(Apache 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(OpenOffice.org.,name,\DefaultIcon)); \	423	Subkey = STRING(CONCAT3(Apache 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(OpenOffice.org.,name,\shell)); \	431	Subkey = STRING(CONCAT3(Apache 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(OpenOffice.org.,name,\shell\new)); \	439	Subkey = STRING(CONCAT3(Apache 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(OpenOffice.org.,name,\shell\new\command)); \	445	Subkey = STRING(CONCAT3(Apache 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(OpenOffice.org.,name,\shell\open\command)); \	453	Subkey = STRING(CONCAT3(Apache 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(OpenOffice.org.,name,\shell\print\command)); \	461	Subkey = STRING(CONCAT3(Apache 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(OpenOffice.org.,name,\shell\printto\command)); \	469	Subkey = STRING(CONCAT3(Apache 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(OpenOffice.org.,name)); \	479	Value = STRING(CONCAT2(Apache 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(OpenOffice.org.,name)); \	489	Value = STRING(CONCAT2(Apache OpenOffice.,name)); \
490	Styles = (); \	490	Styles = (); \
491	End	491	End
492		492

Lines 195-227 $(MAKETARGETS){$(PKGFORMAT:^".")} : $(ADDDEPS) Link Here

(-)a/main/instsetoo_native/util/makefile.mk (-9 / +9 lines)
195	.ENDIF # "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"	195	.ENDIF # "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
196	.ENDIF # "$(MAKETARGETS)"!=""	196	.ENDIF # "$(MAKETARGETS)"!=""
197	openoffice_%{$(PKGFORMAT:^".") .archive} :	197	openoffice_%{$(PKGFORMAT:^".") .archive} :
198	$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)	198	$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p Apache_OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
199	$(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OpenOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml	199	$(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product Apache_OpenOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
200		200
201	$(foreach,i,$(alllangiso) openofficewithjre_$i) : $$@{$(PKGFORMAT:^".")}	201	$(foreach,i,$(alllangiso) openofficewithjre_$i) : $$@{$(PKGFORMAT:^".")}
202	openofficewithjre_%{$(PKGFORMAT:^".")} :	202	openofficewithjre_%{$(PKGFORMAT:^".")} :
203	$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_wJRE -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)	203	$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p Aapche_OpenOffice_wJRE -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
204		204
205	$(foreach,i,$(alllangiso) openofficedev_$i) : $$@{$(PKGFORMAT:^".")}	205	$(foreach,i,$(alllangiso) openofficedev_$i) : $$@{$(PKGFORMAT:^".")}
206	openofficedev_%{$(PKGFORMAT:^".")} :	206	openofficedev_%{$(PKGFORMAT:^".")} :
207	$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)	207	$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p Apache_OpenOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
208	$(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OpenOffice_Dev --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml	208	$(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product Apache_OpenOffice_Dev --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
209		209
210	$(foreach,i,$(alllangiso) ooolanguagepack_$i) : $$@{$(PKGFORMAT:^".")}	210	$(foreach,i,$(alllangiso) ooolanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
211	ooolanguagepack_%{$(PKGFORMAT:^".")} :	211	ooolanguagepack_%{$(PKGFORMAT:^".")} :
212	$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -languagepack -format $(@:e:s/.//) $(VERBOSESWITCH)	212	$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p Apache_OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -languagepack -format $(@:e:s/.//) $(VERBOSESWITCH)
213		213
214	$(foreach,i,$(alllangiso) ooodevlanguagepack_$i) : $$@{$(PKGFORMAT:^".")}	214	$(foreach,i,$(alllangiso) ooodevlanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
215	ooodevlanguagepack_%{$(PKGFORMAT:^".")} :	215	ooodevlanguagepack_%{$(PKGFORMAT:^".")} :
216	$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -languagepack -format $(@:e:s/.//) $(VERBOSESWITCH)	216	$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p Apache_OpenOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -languagepack -format $(@:e:s/.//) $(VERBOSESWITCH)
217		217
218	$(foreach,i,$(alllangiso) sdkoo_$i) : $$@{$(PKGFORMAT:^".")}	218	$(foreach,i,$(alllangiso) sdkoo_$i) : $$@{$(PKGFORMAT:^".")}
219	sdkoo_%{$(PKGFORMAT:^".")} :	219	sdkoo_%{$(PKGFORMAT:^".")} :
220	$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_SDK -u $(OUT) -buildid $(BUILD) -msitemplate $(MSISDKOOTEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -dontstrip -format $(@:e:s/.//) $(VERBOSESWITCH)	220	$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p Apache_OpenOffice_SDK -u $(OUT) -buildid $(BUILD) -msitemplate $(MSISDKOOTEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -dontstrip -format $(@:e:s/.//) $(VERBOSESWITCH)
221		221
222	$(foreach,i,$(alllangiso) sdkoodev_$i) : $$@{$(PKGFORMAT:^".")}	222	$(foreach,i,$(alllangiso) sdkoodev_$i) : $$@{$(PKGFORMAT:^".")}
223	sdkoodev_%{$(PKGFORMAT:^".")} :	223	sdkoodev_%{$(PKGFORMAT:^".")} :
224	$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_Dev_SDK -u $(OUT) -buildid $(BUILD) -msitemplate $(MSISDKOOTEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -dontstrip -format $(@:e:s/.//) $(VERBOSESWITCH)	224	$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p Apache_OpenOffice_Dev_SDK -u $(OUT) -buildid $(BUILD) -msitemplate $(MSISDKOOTEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -dontstrip -format $(@:e:s/.//) $(VERBOSESWITCH)
225		225
226	$(foreach,i,$(alllangiso) ure_$i) : $$@{$(PKGFORMAT:^".")}	226	$(foreach,i,$(alllangiso) ure_$i) : $$@{$(PKGFORMAT:^".")}
227	ure_%{$(PKGFORMAT:^".")} :	227	ure_%{$(PKGFORMAT:^".")} :

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\\OpenOffice.org\\UNO\\InstallPath\\";	25	var regKeyOfficeCurrentUser = "HKEY_CURRENT_USER\\Software\\Apache OpenOffice\\UNO\\InstallPath\\";
26	var regKeyOfficeLocaleMachine = "HKEY_LOCAL_MACHINE\\Software\\OpenOffice.org\\UNO\\InstallPath\\";	26	var regKeyOfficeLocaleMachine = "HKEY_LOCAL_MACHINE\\Software\\Apache 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\\OpenOffice.org\\Basic 3.0\\sdk\n" +	926	"REM Example: set OO_SDK_HOME=C:\\Program Files\\Apache OpenOffice\\Basic 3.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\\OpenOffice.org 3\n" +	930	"REM Example: set OFFICE_HOME=C:\\Program Files\\Apache OpenOffice 3\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\\OpenOffice.org\\Basis 3.0\n" +	933	"REM Example: set OFFICE_HOME=C:\\Program Files\\Apache OpenOffice\\Basis 3.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\\OpenOffice.org\\URE\n" +	937	"REM Example: set OO_SDK_URE_HOME=C:\\Program Files\\Apache 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 188-194 Link Here

(-)a/main/odk/docs/install.html (-3 / +3 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/openoffice.org3". Be sure	191	base installation, e.g. "/opt/apacheopenoffice3". 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/openoffice.org/ure". Exactly one of	208	installation, e.g. "/opt/apacheopenoffice/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>
Lines 259-265 Link Here
259	the output is generated in the SDK directory itself. If an output	259	the output is generated in the SDK directory itself. If an output
260	directory is specified, the output is generated in a SDK dependent	260	directory is specified, the output is generated in a SDK dependent
261	subdirectory in this directory (e.g. <OO_SDK_OUTPUT_DIR>	261	subdirectory in this directory (e.g. <OO_SDK_OUTPUT_DIR>
262	/OpenOffice.org %PRODUCT_RELEASE%/LINUXExample.out)</td>	262	/Apache OpenOffice %PRODUCT_RELEASE%/LINUXExample.out)</td>
263	</tr>	263	</tr>
264	<tr>	264	<tr>
265	<td class="cell20"><b>SDK_AUTO_DEPLOYMENT</b></td>	265	<td class="cell20"><b>SDK_AUTO_DEPLOYMENT</b></td>

Lines 1-4 Link Here

(-)a/main/odk/docs/tools.html (-3 / +3 lines)
1	<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">	1	<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
2	<!--	2	<!--
3	#**************************************************************	3	#**************************************************************
4	#	4	#
Lines 23-29 Link Here
23	-->	23	-->
24	<html>	24	<html>
25	<head>	25	<head>
26	<title>OpenOffice.org %PRODUCT_RELEASE% SDK - Development Tools</title>	26	<title>Apache OpenOffice %PRODUCT_RELEASE% SDK - Development Tools</title>
27	<link rel="stylesheet" type="text/css" href="sdk_styles.css">	27	<link rel="stylesheet" type="text/css" href="sdk_styles.css">
28	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">	28	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
29	<meta name="author" content="Jürgen Schmidt">	29	<meta name="author" content="Jürgen Schmidt">
Lines 168-174 Link Here
168	office installation. UNO packages are UNO components (single libraries or	168	office installation. UNO packages are UNO components (single libraries or
169	Jar files or more complex zip files that contains one or more libraries\|	169	Jar files or more complex zip files that contains one or more libraries\|
170	Jar files, type libraries and configuration items), scripts and	170	Jar files, type libraries and configuration items), scripts and
171	OpenOffice.org %PRODUCT_RELEASE% Basic libraries as zip package. 'unopkg' is not part of the	171	Apache OpenOffice %PRODUCT_RELEASE% Basic libraries as zip package. 'unopkg' is not part of the
172	SDK but comes with the office directly and is a development tool as well	172	SDK but comes with the office directly and is a development tool as well
173	as an end user tool to deploy extension into an office installation.</p>	173	as an end user tool to deploy extension into an office installation.</p>
174	<p>More details concerning deployment and this tool can be find in the	174	<p>More details concerning deployment and this tool can be find in the

Lines 29-44 OO_SDK_NAME=@OO_SDK_NAME@ Link Here

(-)a/main/odk/setsdkenv_unix.sh.in (-4 / +4 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/openoffice.org/basis3.0/sdk	32	# Example: OO_SDK_HOME=/opt/apacheopenoffice/basis3.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/openoffice.org3	36	# Example: OFFICE_HOME=/opt/apacheopenoffice3
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/openoffice.org/ure	41	# Example: OO_SDK_URE_HOME=/opt/apacheopenoffice/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 78-84 OO_SDK_OUTPUT_DIR=@OO_SDK_OUTPUT_DIR@ Link Here
78	SDK_AUTO_DEPLOYMENT=@SDK_AUTO_DEPLOYMENT@	78	SDK_AUTO_DEPLOYMENT=@SDK_AUTO_DEPLOYMENT@
79	export SDK_AUTO_DEPLOYMENT	79	export SDK_AUTO_DEPLOYMENT
80		80
81	# Check installation path for the OpenOffice Development Kit.	81	# Check installation path for the Apache OpenOffice Development Kit.
82	if [ -z "${OO_SDK_HOME}" ]	82	if [ -z "${OO_SDK_HOME}" ]
83	then	83	then
84	echo Error: Please insert a correct value for the variable OO_SDK_HOME.	84	echo Error: Please insert a correct value for the variable OO_SDK_HOME.

Lines 23-44 REM This script sets all enviroment variables, which Link Here

(-)a/main/odk/setsdkenv_windows.template (-7 / +7 lines)
23	REM are necessary for building the examples of the Office Development Kit.	23	REM are necessary for building the examples of the Office Development Kit.
24	REM The Script was developed for the operating systems Windows.	24	REM The Script was developed for the operating systems Windows.
25	REM The SDK name	25	REM The SDK name
26	REM Example: set OO_SDK_NAME=openoffice3.0_sdk	26	REM Example: set OO_SDK_NAME=apacheopenoffice3.0_sdk
27	set OO_SDK_NAME=openoffice.org3.0_sdk	27	set OO_SDK_NAME=apacheopenoffice3.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\OpenOffice.org\Basic 3.0\sdk	30	REM Example: set OO_SDK_HOME=C:\Program Files\Apache OpenOffice\Basic 3.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\OpenOffice.org 3	34	REM Example: set OFFICE_HOME=C:\Program Files\Apache OpenOffice 3
35	set OFFICE_HOME=	35	set OFFICE_HOME=
36		36
37	REM Example: set OFFICE_HOME=C:\Program Files\OpenOffice.org\Basis 3.0	37	REM Example: set OFFICE_HOME=C:\Program Files\Apache OpenOffice\Basis 3.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\OpenOffice.org\URE	41	REM Example: set OO_SDK_URE_HOME=C:\Program Files\Apache 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 73-79 REM Example: set OO_SDK_JAVA_HOME=C:\Program Files\Java\jdk1.6.0_05 Link Here
73	set OO_SDK_JAVA_HOME=	73	set OO_SDK_JAVA_HOME=
74		74
75	REM Special output directory	75	REM Special output directory
76	REM Example: set OO_SDK_OUT=C:\openoffice.org3.0_sdk	76	REM Example: set OO_SDK_OUT=C:\apacheopenoffice3.0_sdk
77	set OO_SDK_OUT=	77	set OO_SDK_OUT=
78		78
79	REM Automatic deployment	79	REM Automatic deployment

Lines 53-74 End Link Here

(-)a/main/scp2/source/sdkoo/sdkoo.scp (-10 / +1 lines)
53	#ifndef WNT	53	#ifndef WNT
54	Directory gid_Dir_Ooo_Openofficeorg_Sdk	54	Directory gid_Dir_Ooo_Openofficeorg_Sdk
55	ParentID = PREDEFINED_PROGDIR;	55	ParentID = PREDEFINED_PROGDIR;
56	#ifdef WNT
57	HostName = "${BASISROOTNAME}";
58	#else
59	HostName = "${UNIXBASISROOTNAME}";	56	HostName = "${UNIXBASISROOTNAME}";
60	#endif
61	End	57	End
62	#endif	58	#endif
63		59
64	#ifndef WNT	60	#ifndef WNT
65	Directory gid_Dir_Ooo_Basis_Sdk	61	Directory gid_Dir_Ooo_Basis_Sdk
66	ParentID = gid_Dir_Ooo_Openofficeorg_Sdk;	62	ParentID = gid_Dir_Ooo_Openofficeorg_Sdk;
67	#ifdef WNT
68	HostName = "Basis ${OOOBASEVERSION}";
69	#else
70	HostName = "basis${OOOBASEVERSION}";	63	HostName = "basis${OOOBASEVERSION}";
71	#endif
72	Styles = (BASISDIRECTORY);	64	Styles = (BASISDIRECTORY);
73	End	65	End
74	#endif	66	#endif
Lines 78-85 End Link Here
78	Directory gid_Dir_Basis_Sdk	70	Directory gid_Dir_Basis_Sdk
79	#if defined MACOSX	71	#if defined MACOSX
80	ParentID = PREDEFINED_PROGDIR;	72	ParentID = PREDEFINED_PROGDIR;
81	// DosName = "OpenOffice.org${OOOBASEVERSION}_SDK";	73	DosName = "Apache_OpenOffice_SDK";
82	DosName = "OpenOffice.org_SDK";
83	#else	74	#else
84	#if defined WNT	75	#if defined WNT
85	ParentID = gid_Dir_Sdkoo_Root;	76	ParentID = gid_Dir_Sdkoo_Root;

Lines 77-84 RegistryItem gid_Regitem_Folder_shellex_ColumnHandlers_C52AF81D_F7A0_4AAB_8E87_F Link Here

(-)a/main/scp2/source/winexplorerext/registryitem_winexplorerext.scp (-6 / +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 = "OpenOffice.org Column Handler";	80	Value = "Apache OpenOffice Column Handler";
81	Val64 = "OpenOffice.org Column Handler";	81	Val64 = "Apache 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 108-115 RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262 Link Here
108	ParentID = PREDEFINED_HKEY_CLASSES_ROOT;	108	ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
109	ModuleID = gid_Module_Root;	109	ModuleID = gid_Module_Root;
110	Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}";	110	Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}";
111	// Better?: "OpenOffice.org Format Filter"
112	// old: Value = "opendocument.org Filter";
113	Styles = (X64_ONLY); // Values: X64	111	Styles = (X64_ONLY); // Values: X64
114	Value = "OpenDocument Format Filter";	112	Value = "OpenDocument Format Filter";
115	Val64 = "OpenDocument Format Filter";	113	Val64 = "OpenDocument Format Filter";
Lines 138-145 RegistryItem gid_Regitem_Clsid_7BC0E713_5703_45BE_A29D_5D46D8B39262 Link Here
138	ParentID = PREDEFINED_HKEY_CLASSES_ROOT;	136	ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
139	ModuleID = gid_Module_Root;	137	ModuleID = gid_Module_Root;
140	Subkey = "CLSID\{7BC0E713-5703-45BE-A29D-5D46D8B39262}";	138	Subkey = "CLSID\{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
141	//? Better: "OpenOffice.org Persistent Handler"
142	// old: Value = "opendocument.org Persistent Handler";
143	Styles = (X64); // Values: X64	139	Styles = (X64); // Values: X64
144	Value = "OpenDocument Format Persistent Handler";	140	Value = "OpenDocument Format Persistent Handler";
145	Val64 = "OpenDocument Format Persistent Handler";	141	Val64 = "OpenDocument Format Persistent Handler";

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/openoffice.org/basis${OOOBASEVERSION}"	52	OOO_BASE_DIR="/opt/apacheopenoffice/basis${OOOBASEVERSION}"
53		53
54	case "$1" in	54	case "$1" in
55	'start')	55	'start')
56	EXTENSIONDIR=/opt/openoffice.org${OOOBRANDPACKAGEVERSION}/share/extension/install	56	EXTENSIONDIR=/opt/apacheopenoffice${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/openoffice.org${OOOBRANDPACKAGEVERSION}/program/unopkg add --shared --bundled "$FILE" '-env:UserInstallation=file://$INSTDIR' '-env:UNO_JAVA_JFW_INSTALL_DATA=$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1'	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'
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/openoffice.org${OOOBRANDPACKAGEVERSION}/program/unopkg remove --shared --bundled "`basename $LINE`" '-env:UserInstallation=file://$INSTDIR' '-env:UNO_JAVA_JFW_INSTALL_DATA=$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1'	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'
102	# REMOVED=1	102	# REMOVED=1
103	# else	103	# else
104	# NEWCONTENT+=$LINE	104	# NEWCONTENT+=$LINE

Lines 29-40 END Link Here

(-)a/main/setup_native/source/packinfo/shellscripts_brand.txt (-5 / +5 lines)
29	platform=`uname -s`	29	platform=`uname -s`
30	case $$platform in	30	case $$platform in
31	SunOS)	31	SunOS)
32	BASISPACKAGE=openofficeorg-core01	32	BASISPACKAGE=apacheopenoffice-core01
33	BASISDIR=`pkginfo -r $$BASISPACKAGE`	33	BASISDIR=`pkginfo -r $$BASISPACKAGE`
34	PRODUCTINSTALLLOCATION="$$BASEDIR"	34	PRODUCTINSTALLLOCATION="$$BASEDIR"
35	;;	35	;;
36	Linux)	36	Linux)
37	BASISPACKAGE=openoffice.org-core01	37	BASISPACKAGE=apacheopenoffice-core01
38	BASISDIR=`rpm -q --queryformat "%{INSTALLPREFIX}" $$BASISPACKAGE`	38	BASISDIR=`rpm -q --queryformat "%{INSTALLPREFIX}" $$BASISPACKAGE`
39	PRODUCTINSTALLLOCATION="$$RPM_INSTALL_PREFIX"	39	PRODUCTINSTALLLOCATION="$$RPM_INSTALL_PREFIX"
40	;;	40	;;
Lines 44-54 Linux) Link Here
44	esac	44	esac
45		45
46	# creating link to basis layer	46	# creating link to basis layer
47	if [ -d $$BASISDIR/openoffice.org/basisBASISDIRECTORYVERSION ]	47	if [ -d $$BASISDIR/apacheopenoffice/basisBASISDIRECTORYVERSION ]
48	then	48	then
49	ln -s $$BASISDIR/openoffice.org/basisBASISDIRECTORYVERSION $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/basis-link >/dev/null 2>&1	49	ln -s $$BASISDIR/apacheopenoffice/basisBASISDIRECTORYVERSION $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/basis-link >/dev/null 2>&1
50	else	50	else
51	ln -s ../openoffice.org/basisBASISDIRECTORYVERSION $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/basis-link >/dev/null 2>&1	51	ln -s ../apacheopenoffice/basisBASISDIRECTORYVERSION $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/basis-link >/dev/null 2>&1
52	fi	52	fi
53		53
54	exit 0	54	exit 0

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}"="OpenOffice.org Column Handler"	57	"{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}"="Apache OpenOffice Column Handler"
58	"{087B3AE3-E237-4467-B8DB-5A38AB959AC9}"="OpenOffice.org Infotip Handler"	58	"{087B3AE3-E237-4467-B8DB-5A38AB959AC9}"="Apache OpenOffice Infotip Handler"
59	"{63542C48-9552-494A-84F7-73AA6A7C99C1}"="OpenOffice.org Property Sheet Handler"	59	"{63542C48-9552-494A-84F7-73AA6A7C99C1}"="Apache OpenOffice Property Sheet Handler"
60	"{3B092F0C-7696-40E3-A80F-68D74DA84210}"="OpenOffice.org Thumbnail Viewer"	60	"{3B092F0C-7696-40E3-A80F-68D74DA84210}"="Apache 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("OpenOffice.org Column Handler") };	93	RegistryEntry ColumnHandler = { TEXT("{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}"), TEXT("Apache OpenOffice Column Handler") };
94	RegistryEntry InfotipHandler = { TEXT("{087B3AE3-E237-4467-B8DB-5A38AB959AC9}"), TEXT("OpenOffice.org Infotip Handler") };	94	RegistryEntry InfotipHandler = { TEXT("{087B3AE3-E237-4467-B8DB-5A38AB959AC9}"), TEXT("Apache OpenOffice Infotip Handler") };
95	RegistryEntry PropHandler = { TEXT("{63542C48-9552-494A-84F7-73AA6A7C99C1}"), TEXT("OpenOffice.org Property Sheet Handler") };	95	RegistryEntry PropHandler = { TEXT("{63542C48-9552-494A-84F7-73AA6A7C99C1}"), TEXT("Apache OpenOffice Property Sheet Handler") };
96	RegistryEntry ThumbViewer = { TEXT("{3B092F0C-7696-40E3-A80F-68D74DA84210}"), TEXT("OpenOffice.org Thumbnail Viewer") };	96	RegistryEntry ThumbViewer = { TEXT("{3B092F0C-7696-40E3-A80F-68D74DA84210}"), TEXT("Apache 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 461-481 sub get_downloadname_language Link Here

(-)a/main/solenv/bin/modules/installer/download.pm (-15 / +44 lines)
461		461
462	sub get_downloadname_productname	462	sub get_downloadname_productname
463	{	463	{
464	my ($allvariables) = @_;	464	my ($allvariables) = @_;
465
466	my $start = "Apache_OpenOffice";
467
468	if ( $allvariables->{'PRODUCTNAME'} eq "OpenOffice.org" ) { $start .= ""; }
469
470	if ( $allvariables->{'PRODUCTNAME'} eq "OOo-dev" ) { $start .= "-Dev"; }
471
472	if (( $allvariables->{'PRODUCTNAME'} eq "OpenOffice.org" ) && ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start .= "-SDK"; }
473		465
474	if (( $allvariables->{'PRODUCTNAME'} eq "OOo-dev" ) && ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start .= "-Dev-SDK"; }	466	my $start;
475		467
476	if ( $allvariables->{'PRODUCTNAME'} eq "URE" ) { $start .= "-URE"; }	468	if ( $allvariables->{'AOODOWNLOADNAMEPREFIX'} )
		469	{
		470	$start = $allvariables->{'AOODOWNLOADNAMEPREFIX'};
		471	}
		472	else
		473	{
		474	$start = "Apache_OpenOffice";
		475	if ( $allvariables->{'PRODUCTNAME'} eq "Apache OpenOffice" )
		476	{
		477	if ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )
		478	{
		479	$start .= "-SDK";
		480	}
		481	}
		482
		483	if ( $allvariables->{'PRODUCTNAME'} eq "AOO-Developer-Build" )
		484	{
		485	if ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )
		486	{
		487	$start .= "-Dev-SDK";
		488	}
		489	else
		490	{
		491	$start .= "-Dev";
		492	}
		493	}
		494
		495	if ( $allvariables->{'PRODUCTNAME'} eq "URE" )
		496	{
		497	$start .= "-URE";
		498	}
		499	}
477		500
478	return $start;	501	return $start;
479	}	502	}
480		503
481	#########################################################	504	#########################################################
Lines 1968-1975 sub create_download_sets Link Here
1968		1991
1969	# evaluating the name of the download file	1992	# evaluating the name of the download file
1970		1993
1971	if ( $allvariableshashref->{'OOODOWNLOADNAME'} ) { $downloadname = set_download_filename($languagestringref, $allvariableshashref); }	1994	if ( $allvariableshashref->{'AOODOWNLOADNAME'} )
1972	else { $downloadname = resolve_variables_in_downloadname($allvariableshashref, $downloadname, $languagestringref); }	1995	{
		1996	$downloadname = set_download_filename($languagestringref, $allvariableshashref);
		1997	}
		1998	else
		1999	{
		2000	$downloadname = resolve_variables_in_downloadname($allvariableshashref, $downloadname, $languagestringref);
		2001	}
1973		2002
1974	if ( ! $installer::globals::iswindowsbuild ) # Unix specific part	2003	if ( ! $installer::globals::iswindowsbuild ) # Unix specific part
1975	{	2004	{
Lines 1978-1984 sub create_download_sets Link Here
1978	my $getuidlibrary = "";	2007	my $getuidlibrary = "";
1979	if (( $installer::globals::issolarisbuild ) \|\| ( $installer::globals::islinuxbuild )) { $getuidlibrary = get_path_for_library($includepatharrayref); }	2008	if (( $installer::globals::issolarisbuild ) \|\| ( $installer::globals::islinuxbuild )) { $getuidlibrary = get_path_for_library($includepatharrayref); }
1980		2009
1981	if ( $allvariableshashref->{'OOODOWNLOADNAME'} )	2010	if ( $allvariableshashref->{'AOODOWNLOADNAME'} )
1982	{	2011	{
1983	my $downloadfile = create_tar_gz_file_from_directory($installationdir, $getuidlibrary, $downloaddir, $downloadname);	2012	my $downloadfile = create_tar_gz_file_from_directory($installationdir, $getuidlibrary, $downloaddir, $downloadname);
1984	}	2013	}

Lines 326-336 sub create_epm_header Link Here

(-)a/main/solenv/bin/modules/installer/epmfile.pm (-4 / +4 lines)
326	my $line = "";	326	my $line = "";
327	my $infoline = "";	327	my $infoline = "";
328		328
329	# %product OpenOffice.org Software	329	# %product Apache OpenOffice Software
330	# %version 2.0	330	# %version 2.0
331	# %description A really great software	331	# %description A really great software
332	# %copyright 1999-2003 by OOo	332	# %copyright 1999-2003 by OOo
333	# %vendor OpenOffice.org	333	# %vendor Apache OpenOffice project
334	# %license /test/replace/01/LICENSE01	334	# %license /test/replace/01/LICENSE01
335	# %readme /test/replace/01/README01	335	# %readme /test/replace/01/README01
336	# %requires foo	336	# %requires foo
Lines 492-498 sub create_epm_header Link Here
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 = "openoffice.org3/program/" . $licensefilename;	495	my $licpath = "apacheopenoffice3/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 'openoffice.org' )	553	if ( $installer::globals::debian && $variableshashref->{'UNIXPRODUCTNAME'} eq 'apache 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 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\\OpenOffice.org\\CrashReport"),	96	TEXT("SOFTWARE\\Apache 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\\OpenOffice.org\\CrashReport"),	105	TEXT("SOFTWARE\\Apache 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\\OpenOffice.org\\CrashReport"),	116	TEXT("SOFTWARE\\Apache 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\\OpenOffice.org\\CrashReport"),	125	TEXT("SOFTWARE\\Apache 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\\OpenOffice.org\\CrashReport"),	134	TEXT("SOFTWARE\\Apache 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\\OpenOffice.org\\CrashReport"),	148	TEXT("SOFTWARE\\Apache 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\\OpenOffice.org\\CrashReport"),	158	TEXT("SOFTWARE\\Apache 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\\OpenOffice.org\\CrashReport"),	166	TEXT("SOFTWARE\\Apache 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\\OpenOffice.org\\CrashReport"),	176	TEXT("SOFTWARE\\Apache 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\\OpenOffice.org\\CrashReport"),	184	TEXT("SOFTWARE\\Apache 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 40-47 PKGDIR=$(BIN) Link Here

(-)a/main/sysui/desktop/productversion.mk (-8 / +9 lines)
40	.ENDIF	40	.ENDIF
41		41
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. When replacing with $(UNIXBASISROOTNAME) it will be empty (!)	43	# but should not be.
44	PRODUCTLIST = openoffice.org	44	# It has to be equal to PRODUCTNAME:l:s/\s/\_/g - see solenv/bin/modules/installer/setupscript.pm
		45	PRODUCTLIST = apache_openoffice
45		46
46	# default values to minimize maintainance effort	47	# default values to minimize maintainance effort
47		48
Lines 65-75 ICONVERSION = $(PRODUCTVERSIONSHORT:s/.//g) Link Here
65	UNIXWRAPPERNAME *= '$${{UNIXPRODUCTNAME}}$${{BRANDPACKAGEVERSION}}'	66	UNIXWRAPPERNAME *= '$${{UNIXPRODUCTNAME}}$${{BRANDPACKAGEVERSION}}'
66		67
67	# CAUTION! $(UNIXBASISROOTNAME) from openoffice.lst NOT available (!)	68	# CAUTION! $(UNIXBASISROOTNAME) from openoffice.lst NOT available (!)
68	PRODUCTNAME.openoffice.org = OpenOffice.org	69	PRODUCTNAME.apache_openoffice = Apache OpenOffice
69		70
70	PRODUCTVERSION.openoffice.org = $(PRODUCTVERSION)	71	PRODUCTVERSION.apache_openoffice = $(PRODUCTVERSION)
71	PRODUCTVERSIONSHORT.openoffice.org = $(PRODUCTVERSIONSHORT)	72	PRODUCTVERSIONSHORT.apache_openoffice = $(PRODUCTVERSIONSHORT)
72	PKGVERSION.openoffice.org = $(PKGVERSION)	73	PKGVERSION.apache_openoffice = $(PKGVERSION)
73	UNIXFILENAME.openoffice.org = $(PRODUCTNAME.openoffice.org:l)$(PRODUCTVERSIONSHORT.openoffice.org)	74	UNIXFILENAME.apache_openoffice = $(PRODUCTNAME.apache_openoffice:l:s/ /_/g)$(PRODUCTVERSIONSHORT.apache_openoffice)
74	ICONPREFIX.openoffice.org = $(UNIXFILENAME.openoffice.org:s/.//g)	75	ICONPREFIX.apache_openoffice = $(UNIXFILENAME.apache_openoffice:s/.//g)
75		76

Lines 157-164 $(LAUNCHERFLAGFILE) : $(LAUNCHERDEPN) Link Here

(-)a/main/sysui/desktop/share/makefile.mk (-5 / +5 lines)
157	#	157	#
158	# Create shared mime info xml file	158	# Create shared mime info xml file
159	#	159	#
160	$(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.org.xml : ../mimetypes/{$(MIMELIST)}.desktop create_mime_xml.pl	160	$(COMMONMISC)$/{$(PRODUCTLIST)}$/apacheopenoffice.xml : ../mimetypes/{$(MIMELIST)}.desktop create_mime_xml.pl
161	$(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.org.xml : $(ULFDIR)$/documents.ulf	161	$(COMMONMISC)$/{$(PRODUCTLIST)}$/apacheopenoffice.xml : $(ULFDIR)$/documents.ulf
162	@echo Create shared mime info xml file ..	162	@echo Create shared mime info xml file ..
163	@echo ---------------------------------	163	@echo ---------------------------------
164	@$(PERL) create_mime_xml.pl $< > $@.$(INPATH)	164	@$(PERL) create_mime_xml.pl $< > $@.$(INPATH)
Lines 173-180 $(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.keys : ../mimetypes/{$(MIMELIST)}.ke Link Here
173	@@-$(MKDIRHIER) $(@:d)	173	@@-$(MKDIRHIER) $(@:d)
174	@echo Creating GNOME .keys file for $(@:d:d:f) ..	174	@echo Creating GNOME .keys file for $(@:d:d:f) ..
175	@echo ---------------------------------	175	@echo ---------------------------------
176	@$(PERL) brand.pl -p $(PRODUCTNAME.$(@:d:d:f)) -u $(UNIXFILENAME.$(@:d:d:f)) --iconprefix "$(ICONPREFIX.$(@:d:d:f))-" $< $(MISC)/$(@:d:d:f)	176	@$(PERL) brand.pl -p "$(PRODUCTNAME.$(@:d:d:f))" -u $(UNIXFILENAME.$(@:d:d:f)) --iconprefix "$(ICONPREFIX.$(@:d:d:f))-" $< $(MISC)/$(@:d:d:f)
177	@$(PERL) translate.pl -p $(PRODUCTNAME.$(@:d:d:f)) -d $(MISC)/$(@:d:d:f) --ext "keys" --key "description" $(ULFDIR)$/documents.ulf	177	@$(PERL) translate.pl -p "$(PRODUCTNAME.$(@:d:d:f))" -d $(MISC)/$(@:d:d:f) --ext "keys" --key "description" $(ULFDIR)$/documents.ulf
178	@cat $(MISC)/$(@:d:d:f)/{$(MIMELIST)}.keys > $@.$(INPATH)	178	@cat $(MISC)/$(@:d:d:f)/{$(MIMELIST)}.keys > $@.$(INPATH)
179	@mv -f $@.$(INPATH) $@	179	@mv -f $@.$(INPATH) $@
180		180
Lines 249-255 $(COMMONMISC)$/{$(PRODUCTLIST)}$/build.flag : $(ICONDEPN) \ Link Here
249	$(COMMONMISC)$/{$(PRODUCTLIST)}$/create_tree.sh \	249	$(COMMONMISC)$/{$(PRODUCTLIST)}$/create_tree.sh \
250	$(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.keys \	250	$(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.keys \
251	$(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.mime \	251	$(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.mime \
252	$(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.org.xml \	252	$(COMMONMISC)$/{$(PRODUCTLIST)}$/apacheopenoffice.xml \
253	$(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.applications \	253	$(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.applications \
254	$(COMMONMISC)$/{$(PRODUCTLIST)}$/{openoffice printeradmin}.sh	254	$(COMMONMISC)$/{$(PRODUCTLIST)}$/{openoffice printeradmin}.sh
255	@touch $@	255	@touch $@

Lines 94-102 $(MISC)/{$(PRODUCTLIST)}/postremove : $$(@:f) Link Here

(-)a/main/sysui/desktop/solaris/makefile.mk (-4 / +4 lines)
94	# --- openoffice.xml---------------------------	94	# --- openoffice.xml---------------------------
95		95
96	.IF "$(common_build)"=="TRUE"	96	.IF "$(common_build)"=="TRUE"
97	# Copy the openoffice.org.xml file to $(MISC)	97	# Copy the apacheopenoffice.xml file to $(MISC)
98	#$(MISC)/$(foreach,i,$(PRODUCTLIST) $i/$i.xml) : $(COMMONMISC)/$$(@:b)/openoffice.org.xml	98	#$(MISC)/$(foreach,i,$(PRODUCTLIST) $i/$i.xml) : $(COMMONMISC)/$$(@:b)/apacheopenoffice.xml
99	$(MISC)/$(foreach,i,$(PRODUCTLIST) $(MISC)/$i/openoffice.org.xml) : $(COMMONMISC)/$$(@:b)/openoffice.org.xml	99	$(MISC)/$(foreach,i,$(PRODUCTLIST) $(MISC)/$i/apacheopenoffice.xml) : $(COMMONMISC)/$$(@:b)/apacheopenoffice.xml
100	$(MKDIRHIER) $(@:d)	100	$(MKDIRHIER) $(@:d)
101	echo hier hier $@	101	echo hier hier $@
102	cat $< \| tr -d "\015" > $@	102	cat $< \| tr -d "\015" > $@
Lines 112-118 $(MISC)/{$(PRODUCTLIST)}$/prototype : $$(@:f) ../productversion.mk makefile.mk Link Here
112	# --- packaging ---------------------------------------------------	112	# --- packaging ---------------------------------------------------
113		113
114	#$(PKGFILES) : $(MISC)/{$(PRODUCTLIST)}/{copyright pkginfo depend mailcap postinstall postremove} makefile.mk $(MISC)/$$(@:b:b:s/-desktop-integration//)/$$(@:b:b:s/-desktop-integration//).xml	114	#$(PKGFILES) : $(MISC)/{$(PRODUCTLIST)}/{copyright pkginfo depend mailcap postinstall postremove} makefile.mk $(MISC)/$$(@:b:b:s/-desktop-integration//)/$$(@:b:b:s/-desktop-integration//).xml
115	$(PKGFILES) : $(MISC)/{$(PRODUCTLIST)}/{copyright pkginfo depend mailcap postinstall postremove} makefile.mk $(MISC)/$$(@:b:b:s/-desktop-integration//)/openoffice.org.xml	115	$(PKGFILES) : $(MISC)/{$(PRODUCTLIST)}/{copyright pkginfo depend mailcap postinstall postremove} makefile.mk $(MISC)/$$(@:b:b:s/-desktop-integration//)/apacheopenoffice.xml
116	$(PKGFILES) : $(MISC)$/{$(PRODUCTLIST)}$/prototype	116	$(PKGFILES) : $(MISC)$/{$(PRODUCTLIST)}$/prototype
117	@-$(RM) $(BIN)$/$(@:f)	117	@-$(RM) $(BIN)$/$(@:f)
118	@$(MKDIRHIER) $(@:d)	118	@$(MKDIRHIER) $(@:d)