diff options
144 files changed, 765 insertions, 735 deletions
diff --git a/cli_ure/source/basetypes/assembly.cs b/cli_ure/source/basetypes/assembly.cs index b4e31b44d67f..b26b4f7c6a92 100644 --- a/cli_ure/source/basetypes/assembly.cs +++ b/cli_ure/source/basetypes/assembly.cs @@ -20,4 +20,4 @@ *************************************************************/ [assembly:System.Reflection.AssemblyDescription( "CLI-UNO: Language Binding specific types" )] -[assembly:System.Reflection.AssemblyCompany( "OpenOffice.org" )] +[assembly: System.Reflection.AssemblyCompany("Apache Software Foundation")] diff --git a/cli_ure/source/native/assembly.cxx b/cli_ure/source/native/assembly.cxx index 6cea0ea79eb5..63db46af0118 100644 --- a/cli_ure/source/native/assembly.cxx +++ b/cli_ure/source/native/assembly.cxx @@ -29,4 +29,4 @@ [assembly:System::Reflection::AssemblyProduct( "CLI-UNO Language Binding" )]; [assembly:System::Reflection::AssemblyDescription( "CLI-UNO Helper Library" )]; [assembly:System::Reflection::AssemblyDelaySign(true)]; -[assembly:System::Reflection::AssemblyCompany( "OpenOffice.org" )]; +[assembly:System::Reflection::AssemblyCompany( "Apache Software Foundation" )]; diff --git a/cli_ure/source/native/native_bootstrap.cxx b/cli_ure/source/native/native_bootstrap.cxx index 53098af2e360..ef013718b3f4 100644 --- a/cli_ure/source/native/native_bootstrap.cxx +++ b/cli_ure/source/native/native_bootstrap.cxx @@ -52,7 +52,9 @@ namespace cli_ure { WCHAR * resolveLink(WCHAR * path); } -#define INSTALL_PATH L"Software\\OpenOffice.org\\UNO\\InstallPath" +// INSTALL_PATH value needs to correspond to the Windows registry subkey +// in main\scp2\source\ooo\registryitem_ooo.scp +#define INSTALL_PATH L"Software\\Apache OpenOffice\\UNO\\InstallPath" #define BASIS_LINK L"\\basis-link" #define URE_LINK L"\\ure-link" #define URE_BIN L"\\bin" @@ -128,7 +130,7 @@ void oneDirUp(LPTSTR io_path) for example c:/openoffice.org 3/program This path is either obtained from the environment variable UNO_PATH or the registry item - "Software\\OpenOffice.org\\UNO\\InstallPath" + "Software\\Apache OpenOffice\\UNO\\InstallPath" either in HKEY_CURRENT_USER or HKEY_LOCAL_MACHINE The return value must be freed with delete[] */ @@ -330,8 +332,8 @@ namespace util Bootstrapping requires the existence of many libraries which are contained in an URE installation. To find and load these libraries the Windows - registry keys HKEY_CURRENT_USER\Software\OpenOffice.org\Layer\URE\1 - and HKEY_LOCAL_MACHINE\Software\OpenOffice.org\Layer\URE\1 are examined. + registry keys HKEY_CURRENT_USER\Software\Apache OpenOffice\Layer\URE\1 + and HKEY_LOCAL_MACHINE\Software\Apache OpenOffice\Layer\URE\1 are examined. These contain a named value UREINSTALLLOCATION which holds a path to the URE installation folder. */ diff --git a/cli_ure/source/ure/assembly.cs b/cli_ure/source/ure/assembly.cs index f6917d0de802..97add1c15990 100644 --- a/cli_ure/source/ure/assembly.cs +++ b/cli_ure/source/ure/assembly.cs @@ -20,4 +20,4 @@ *************************************************************/ [assembly:System.Reflection.AssemblyDescription( "CLI-UNO Runtime Library" )] -[assembly:System.Reflection.AssemblyCompany( "OpenOffice.org" )] +[assembly: System.Reflection.AssemblyCompany("Apache Software Foundation")] diff --git a/cli_ure/unotypes/makefile.mk b/cli_ure/unotypes/makefile.mk index 3ec6463a81c8..7485a34c02d9 100644 --- a/cli_ure/unotypes/makefile.mk +++ b/cli_ure/unotypes/makefile.mk @@ -54,8 +54,8 @@ $(OUT)$/bin$/cli_uretypes.dll : $(BIN)$/climaker.exe $(SOLARBINDIR)$/types.rdb $ --out $@ \ --keyfile $(BIN)$/cliuno.snk \ --assembly-version $(CLI_URETYPES_NEW_VERSION) \ - --assembly-description "This assembly contains metadata for the StarOffice/OpenOffice.org API." \ - --assembly-company "OpenOffice.org" \ + --assembly-description "This assembly contains metadata for the Apache OpenOffice API." \ + --assembly-company "Apache Software Foundation" \ $(SOLARBINDIR)$/udkapi.rdb #do not forget to deliver cli_uretypes.config. It is NOT embedded in the policy file. diff --git a/cppuhelper/source/findsofficepath.c b/cppuhelper/source/findsofficepath.c index 63c6de1b46b8..8daa795a3599 100644 --- a/cppuhelper/source/findsofficepath.c +++ b/cppuhelper/source/findsofficepath.c @@ -86,7 +86,7 @@ static char* getPathFromRegistryKey( HKEY hroot, const char* subKeyName ) */ static char* platformSpecific() { - const char* SUBKEYNAME = "Software\\OpenOffice.org\\UNO\\InstallPath"; + const char* SUBKEYNAME = "Software\\Apache OpenOffice\\UNO\\InstallPath"; char* path = NULL; diff --git a/desktop/util/ooverinfo.rc b/desktop/util/ooverinfo.rc index 9c4fe7bce277..756896baad29 100644 --- a/desktop/util/ooverinfo.rc +++ b/desktop/util/ooverinfo.rc @@ -59,7 +59,7 @@ VS_VERSION_INFO versioninfo block "040704E4" { // German StringTable - value "CompanyName", "OpenOffice.org\0" + value "CompanyName", "Apache Software Foundation\0" value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0" value "FileVersion", PPS(VER_LEVEL) "\0" value "ProductVersion", PPS(VER_LEVEL) "\0" @@ -71,7 +71,7 @@ VS_VERSION_INFO versioninfo block "040904E4" { // International StringTable - value "CompanyName", "OpenOffice.org\0" + value "CompanyName", "Apache Software Foundation\0" value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0" value "FileVersion", PPS(VER_LEVEL) "\0" value "ProductVersion", PPS(VER_LEVEL) "\0" diff --git a/desktop/util/verinfo.rc b/desktop/util/verinfo.rc index 968898b0fcfa..e9068be1a7e4 100644 --- a/desktop/util/verinfo.rc +++ b/desktop/util/verinfo.rc @@ -64,7 +64,7 @@ VS_VERSION_INFO versioninfo block "040704E4" { // German StringTable - value "CompanyName", "Oracle\0" + value "CompanyName", "Apache Software Foundation\0" value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0" value "FileVersion", PPS(VER_LEVEL) "\0" value "ProductVersion", PPS(VER_LEVEL) "\0" @@ -76,7 +76,7 @@ VS_VERSION_INFO versioninfo block "040904E4" { // International StringTable - value "CompanyName", "Oracle\0" + value "CompanyName", "Apache Software Foundation\0" value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0" value "FileVersion", PPS(VER_LEVEL) "\0" value "ProductVersion", PPS(VER_LEVEL) "\0" diff --git a/desktop/win32/source/applauncher/ooo/verinfo.rc b/desktop/win32/source/applauncher/ooo/verinfo.rc index a6e4af2c4a45..09e26f450bfd 100755 --- a/desktop/win32/source/applauncher/ooo/verinfo.rc +++ b/desktop/win32/source/applauncher/ooo/verinfo.rc @@ -59,7 +59,7 @@ VS_VERSION_INFO versioninfo block "040704E4" { // German StringTable - value "CompanyName", "OpenOffice.org\0" + value "CompanyName", "Apache Software Foundation\0" value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0" value "FileVersion", PPS(VER_LEVEL) "\0" value "ProductVersion", PPS(VER_LEVEL) "\0" @@ -71,7 +71,7 @@ VS_VERSION_INFO versioninfo block "040904E4" { // International StringTable - value "CompanyName", "OpenOffice.org\0" + value "CompanyName", "Apache Software Foundation\0" value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0" value "FileVersion", PPS(VER_LEVEL) "\0" value "ProductVersion", PPS(VER_LEVEL) "\0" diff --git a/filter/source/config/cache/constant.hxx b/filter/source/config/cache/constant.hxx index 245b9ae2b713..c0b6f9c9a7c1 100644 --- a/filter/source/config/cache/constant.hxx +++ b/filter/source/config/cache/constant.hxx @@ -193,7 +193,7 @@ extern rtl::OUString pFilterStrings[]; /** @short some default values. */ #define DEFAULT_OFFICELOCALE _FILTER_CONFIG_FROM_ASCII_("en-US") -#define DEFAULT_FORMATNAME _FILTER_CONFIG_FROM_ASCII_("OpenOffice") +#define DEFAULT_FORMATNAME _FILTER_CONFIG_FROM_ASCII_("OpenOffice.org XML") #define DEFAULT_FORMATVERSION _FILTER_CONFIG_FROM_ASCII_("1.0") /** @short used for the queries of the FilterFactory service. diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx index 2e14949cc3c6..7c3952c01152 100644 --- a/filter/source/config/cache/filtercache.cxx +++ b/filter/source/config/cache/filtercache.cxx @@ -120,8 +120,9 @@ FilterCache* FilterCache::clone() const pClone->m_lURLPattern2Types = m_lURLPattern2Types; pClone->m_sActLocale = m_sActLocale; - pClone->m_sFormatName = m_sFormatName; - pClone->m_sFormatVersion = m_sFormatVersion; + pClone->m_sProductName = m_sProductName; + pClone->m_sOOoXMLFormatName = m_sOOoXMLFormatName; + pClone->m_sOOoXMLFormatVersion = m_sOOoXMLFormatVersion; pClone->m_eFillState = m_eFillState; @@ -178,8 +179,9 @@ void FilterCache::takeOver(const FilterCache& rClone) m_lChangedContentHandlers.clear(); m_sActLocale = rClone.m_sActLocale; - m_sFormatName = rClone.m_sFormatName; - m_sFormatVersion = rClone.m_sFormatVersion; + m_sProductName = rClone.m_sProductName; + m_sOOoXMLFormatName = rClone.m_sOOoXMLFormatName; + m_sOOoXMLFormatVersion = rClone.m_sOOoXMLFormatVersion; m_eFillState = rClone.m_eFillState; @@ -242,21 +244,20 @@ void FilterCache::load(EFillState eRequired, m_sActLocale = DEFAULT_OFFICELOCALE; } - impl_getDirectCFGValue(CFGDIRECTKEY_FORMATNAME) >>= m_sFormatName; - if (!m_sFormatName.getLength()) - impl_getDirectCFGValue(CFGDIRECTKEY_PRODUCTNAME) >>= m_sFormatName; + impl_getDirectCFGValue(CFGDIRECTKEY_PRODUCTNAME) >>= m_sProductName; - if (!m_sFormatName.getLength()) + impl_getDirectCFGValue(CFGDIRECTKEY_FORMATNAME) >>= m_sOOoXMLFormatName; + if (!m_sOOoXMLFormatName.getLength()) { _FILTER_CONFIG_LOG_1_("FilterCache::ctor() ... could not specify format name => use default \"%s\"\n", _FILTER_CONFIG_TO_ASCII_(DEFAULT_FORMATNAME)); - m_sFormatName = DEFAULT_FORMATNAME; + m_sOOoXMLFormatName = DEFAULT_FORMATNAME; } - impl_getDirectCFGValue(CFGDIRECTKEY_FORMATVERSION) >>= m_sFormatVersion; - if (!m_sFormatVersion.getLength()) + impl_getDirectCFGValue(CFGDIRECTKEY_FORMATVERSION) >>= m_sOOoXMLFormatVersion; + if (!m_sOOoXMLFormatVersion.getLength()) { _FILTER_CONFIG_LOG_1_("FilterCache::ctor() ... could not specify format version => use default \"%s\"\n", _FILTER_CONFIG_TO_ASCII_(DEFAULT_FORMATVERSION)); - m_sFormatVersion = DEFAULT_FORMATVERSION; + m_sOOoXMLFormatVersion = DEFAULT_FORMATVERSION; } // Support the old configuration support. Read it only one times during office runtime! @@ -1663,13 +1664,15 @@ void FilterCache::impl_readPatchUINames(const css::uno::Reference< css::containe CacheItem& rItem) throw(css::uno::Exception) { - static ::rtl::OUString FORMATNAME_VAR = ::rtl::OUString::createFromAscii("%productname%" ); - static ::rtl::OUString FORMATVERSION_VAR = ::rtl::OUString::createFromAscii("%formatversion%"); + static ::rtl::OUString PRODUCTNAME_VAR = ::rtl::OUString::createFromAscii("%productname%"); + static ::rtl::OUString FORMATNAME_VAR = ::rtl::OUString::createFromAscii("%oooxmlformatname%" ); + static ::rtl::OUString FORMATVERSION_VAR = ::rtl::OUString::createFromAscii("%oooxmlformatversion%"); // SAFE -> ---------------------------------- ::osl::ResettableMutexGuard aLock(m_aLock); - ::rtl::OUString sFormatName = m_sFormatName ; - ::rtl::OUString sFormatVersion = m_sFormatVersion; + ::rtl::OUString sProductName = m_sProductName; + ::rtl::OUString sFormatName = m_sOOoXMLFormatName; + ::rtl::OUString sFormatVersion = m_sOOoXMLFormatVersion; ::rtl::OUString sActLocale = m_sActLocale ; aLock.clear(); // <- SAFE ---------------------------------- @@ -1683,7 +1686,7 @@ void FilterCache::impl_readPatchUINames(const css::uno::Reference< css::containe ::comphelper::SequenceAsVector< ::rtl::OUString >::const_iterator pLocale ; ::comphelper::SequenceAsHashMap lUINames; - // patch %PRODUCTNAME and %FORMATNAME + // patch %productname%, %oooxmlformatname% and %oooxmlformatversion% for ( pLocale = lLocales.begin(); pLocale != lLocales.end() ; ++pLocale ) @@ -1694,13 +1697,20 @@ void FilterCache::impl_readPatchUINames(const css::uno::Reference< css::containe xUIName->getByName(sLocale) >>= sValue; // replace %productname% - sal_Int32 nIndex = sValue.indexOf(FORMATNAME_VAR); + sal_Int32 nIndex = sValue.indexOf(PRODUCTNAME_VAR); + while(nIndex != -1) + { + sValue = sValue.replaceAt(nIndex, PRODUCTNAME_VAR.getLength(), sProductName); + nIndex = sValue.indexOf(PRODUCTNAME_VAR, nIndex); + } + // replace %oooxmlformatname% + nIndex = sValue.indexOf(FORMATNAME_VAR); while(nIndex != -1) { sValue = sValue.replaceAt(nIndex, FORMATNAME_VAR.getLength(), sFormatName); nIndex = sValue.indexOf(FORMATNAME_VAR, nIndex); } - // replace %formatversion% + // replace %oooxmlformatversion% nIndex = sValue.indexOf(FORMATVERSION_VAR); while(nIndex != -1) { diff --git a/filter/source/config/cache/filtercache.hxx b/filter/source/config/cache/filtercache.hxx index f36b18cf95f9..c955e1ab6541 100644 --- a/filter/source/config/cache/filtercache.hxx +++ b/filter/source/config/cache/filtercache.hxx @@ -236,13 +236,15 @@ class FilterCache : public BaseLock used to work with localized configuration values. */ ::rtl::OUString m_sActLocale; + ::rtl::OUString m_sProductName; + //--------------------------------------- /** TODO */ - ::rtl::OUString m_sFormatName; + ::rtl::OUString m_sOOoXMLFormatName; //--------------------------------------- /** TODO */ - ::rtl::OUString m_sFormatVersion; + ::rtl::OUString m_sOOoXMLFormatVersion; //--------------------------------------- /** @short contains status, which cache items/properties diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Calc__ui.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Calc__ui.xcu index 1030fb31f291..5c009307813e 100644 --- a/filter/source/config/fragments/filters/StarOffice_XML__Calc__ui.xcu +++ b/filter/source/config/fragments/filters/StarOffice_XML__Calc__ui.xcu @@ -21,7 +21,7 @@ <node oor:name="StarOffice XML (Calc)"> <prop oor:name="UIName"> - <value xml:lang="en-US">%productname% %formatversion% Spreadsheet</value> - <value xml:lang="x-translate">%productname% %formatversion% Spreadsheet</value> + <value xml:lang="en-US">%oooxmlformatname% %oooxmlformatversion% Spreadsheet</value> + <value xml:lang="x-translate">%oooxmlformatname% %oooxmlformatversion% Spreadsheet</value> </prop> </node> diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Chart__ui.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Chart__ui.xcu index 01bc226f744d..f33ec19b005c 100644 --- a/filter/source/config/fragments/filters/StarOffice_XML__Chart__ui.xcu +++ b/filter/source/config/fragments/filters/StarOffice_XML__Chart__ui.xcu @@ -21,7 +21,7 @@ <node oor:name="StarOffice XML (Chart)"> <prop oor:name="UIName"> - <value xml:lang="en-US">%productname% %formatversion% Chart</value> - <value xml:lang="x-translate">%productname% %formatversion% Chart</value> + <value xml:lang="en-US">%oooxmlformatname% %oooxmlformatversion% Chart</value> + <value xml:lang="x-translate">%oooxmlformatname% %oooxmlformatversion% Chart</value> </prop> </node> diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Draw__ui.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Draw__ui.xcu index 639171b08968..1e970ccd2192 100644 --- a/filter/source/config/fragments/filters/StarOffice_XML__Draw__ui.xcu +++ b/filter/source/config/fragments/filters/StarOffice_XML__Draw__ui.xcu @@ -21,7 +21,7 @@ <node oor:name="StarOffice XML (Draw)"> <prop oor:name="UIName"> - <value xml:lang="en-US">%productname% %formatversion% Drawing</value> - <value xml:lang="x-translate">%productname% %formatversion% Drawing</value> + <value xml:lang="en-US">%oooxmlformatname% %oooxmlformatversion% Drawing</value> + <value xml:lang="x-translate">%oooxmlformatname% %oooxmlformatversion% Drawing</value> </prop> </node> diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Impress__ui.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Impress__ui.xcu index d589eb0712c1..b38d9d2d2943 100644 --- a/filter/source/config/fragments/filters/StarOffice_XML__Impress__ui.xcu +++ b/filter/source/config/fragments/filters/StarOffice_XML__Impress__ui.xcu @@ -21,7 +21,7 @@ <node oor:name="StarOffice XML (Impress)"> <prop oor:name="UIName"> - <value xml:lang="en-US">%productname% %formatversion% Presentation</value> - <value xml:lang="x-translate">%productname% %formatversion% Presentation</value> + <value xml:lang="en-US">%oooxmlformatname% %oooxmlformatversion% Presentation</value> + <value xml:lang="x-translate">%oooxmlformatname% %oooxmlformatversion% Presentation</value> </prop> </node> diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Math__ui.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Math__ui.xcu index 4c8b5c2aff81..483263d23f74 100644 --- a/filter/source/config/fragments/filters/StarOffice_XML__Math__ui.xcu +++ b/filter/source/config/fragments/filters/StarOffice_XML__Math__ui.xcu @@ -21,7 +21,7 @@ <node oor:name="StarOffice XML (Math)"> <prop oor:name="UIName"> - <value xml:lang="en-US">%productname% %formatversion% Formula</value> - <value xml:lang="x-translate">%productname% %formatversion% Formula</value> + <value xml:lang="en-US">%oooxmlformatname% %oooxmlformatversion% Formula</value> + <value xml:lang="x-translate">%oooxmlformatname% %oooxmlformatversion% Formula</value> </prop> </node> diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Writer__ui.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Writer__ui.xcu index 3e23cfcbeb0d..c6ac5ee8cc23 100644 --- a/filter/source/config/fragments/filters/StarOffice_XML__Writer__ui.xcu +++ b/filter/source/config/fragments/filters/StarOffice_XML__Writer__ui.xcu @@ -21,7 +21,7 @@ <node oor:name="StarOffice XML (Writer)"> <prop oor:name="UIName"> - <value xml:lang="en-US">%productname% %formatversion% Text Document</value> - <value xml:lang="x-translate">%productname% %formatversion% Text Document</value> + <value xml:lang="en-US">%oooxmlformatname% %oooxmlformatversion% Text Document</value> + <value xml:lang="x-translate">%oooxmlformatname% %oooxmlformatversion% Text Document</value> </prop> </node> diff --git a/filter/source/config/fragments/filters/calc_StarOffice_XML_Calc_Template_ui.xcu b/filter/source/config/fragments/filters/calc_StarOffice_XML_Calc_Template_ui.xcu index 2384e6c067f3..e01a8ae99311 100644 --- a/filter/source/config/fragments/filters/calc_StarOffice_XML_Calc_Template_ui.xcu +++ b/filter/source/config/fragments/filters/calc_StarOffice_XML_Calc_Template_ui.xcu @@ -21,7 +21,7 @@ <node oor:name="calc_StarOffice_XML_Calc_Template"> <prop oor:name="UIName"> - <value xml:lang="en-US">%productname% %formatversion% Spreadsheet Template</value> - <value xml:lang="x-translate">%productname% %formatversion% Spreadsheet Template</value> + <value xml:lang="en-US">%oooxmlformatname% %oooxmlformatversion% Spreadsheet Template</value> + <value xml:lang="x-translate">%oooxmlformatname% %oooxmlformatversion% Spreadsheet Template</value> </prop> </node> diff --git a/filter/source/config/fragments/filters/draw_StarOffice_XML_Draw_Template_ui.xcu b/filter/source/config/fragments/filters/draw_StarOffice_XML_Draw_Template_ui.xcu index 9c1e39d02de2..2883e1b326ba 100644 --- a/filter/source/config/fragments/filters/draw_StarOffice_XML_Draw_Template_ui.xcu +++ b/filter/source/config/fragments/filters/draw_StarOffice_XML_Draw_Template_ui.xcu @@ -21,7 +21,7 @@ <node oor:name="draw_StarOffice_XML_Draw_Template"> <prop oor:name="UIName"> - <value xml:lang="en-US">%productname% %formatversion% Drawing Template</value> - <value xml:lang="x-translate">%productname% %formatversion% Drawing Template</value> + <value xml:lang="en-US">%oooxmlformatname% %oooxmlformatversion% Drawing Template</value> + <value xml:lang="x-translate">%oooxmlformatname% %oooxmlformatversion% Drawing Template</value> </prop> </node> diff --git a/filter/source/config/fragments/filters/impress_StarOffice_XML_Draw_ui.xcu b/filter/source/config/fragments/filters/impress_StarOffice_XML_Draw_ui.xcu index 8264132be4ff..3f7af4cb6b6a 100644 --- a/filter/source/config/fragments/filters/impress_StarOffice_XML_Draw_ui.xcu +++ b/filter/source/config/fragments/filters/impress_StarOffice_XML_Draw_ui.xcu @@ -21,7 +21,7 @@ <node oor:name="impress_StarOffice_XML_Draw"> <prop oor:name="UIName"> - <value xml:lang="en-US">%productname% %formatversion% Drawing (%productname% Impress)</value> - <value xml:lang="x-translate">%productname% %formatversion% Drawing (%productname% Impress)</value> + <value xml:lang="en-US">%oooxmlformatname% %oooxmlformatversion% Drawing (%productname% Impress)</value> + <value xml:lang="x-translate">%oooxmlformatname% %oooxmlformatversion% Drawing (%productname% Impress)</value> </prop> </node> diff --git a/filter/source/config/fragments/filters/impress_StarOffice_XML_Impress_Template_ui.xcu b/filter/source/config/fragments/filters/impress_StarOffice_XML_Impress_Template_ui.xcu index 90994f0fc574..b682695aa5f3 100644 --- a/filter/source/config/fragments/filters/impress_StarOffice_XML_Impress_Template_ui.xcu +++ b/filter/source/config/fragments/filters/impress_StarOffice_XML_Impress_Template_ui.xcu @@ -21,7 +21,7 @@ <node oor:name="impress_StarOffice_XML_Impress_Template"> <prop oor:name="UIName"> - <value xml:lang="en-US">%productname% %formatversion% Presentation Template</value> - <value xml:lang="x-translate">%productname% %formatversion% Presentation Template</value> + <value xml:lang="en-US">%oooxmlformatname% %oooxmlformatversion% Presentation Template</value> + <value xml:lang="x-translate">%oooxmlformatname% %oooxmlformatversion% Presentation Template</value> </prop> </node> diff --git a/filter/source/config/fragments/filters/writer_StarOffice_XML_Writer_Template_ui.xcu b/filter/source/config/fragments/filters/writer_StarOffice_XML_Writer_Template_ui.xcu index 4acb0bbd6d0d..9d2a6697c6a7 100644 --- a/filter/source/config/fragments/filters/writer_StarOffice_XML_Writer_Template_ui.xcu +++ b/filter/source/config/fragments/filters/writer_StarOffice_XML_Writer_Template_ui.xcu @@ -21,7 +21,7 @@ <node oor:name="writer_StarOffice_XML_Writer_Template"> <prop oor:name="UIName"> - <value xml:lang="en-US">%productname% %formatversion% Text Document Template</value> - <value xml:lang="x-translate">%productname% %formatversion% Text Document Template</value> + <value xml:lang="en-US">%oooxmlformatname% %oooxmlformatversion% Text Document Template</value> + <value xml:lang="x-translate">%oooxmlformatname% %oooxmlformatversion% Text Document Template</value> </prop> </node> diff --git a/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_GlobalDocument_ui.xcu b/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_GlobalDocument_ui.xcu index fe6270589c2c..5861f399434d 100644 --- a/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_GlobalDocument_ui.xcu +++ b/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_GlobalDocument_ui.xcu @@ -21,7 +21,7 @@ <node oor:name="writer_globaldocument_StarOffice_XML_Writer_GlobalDocument"> <prop oor:name="UIName"> - <value xml:lang="en-US">%productname% %formatversion% Master Document</value> - <value xml:lang="x-translate">%productname% %formatversion% Master Document</value> + <value xml:lang="en-US">%oooxmlformatname% %oooxmlformatversion% Master Document</value> + <value xml:lang="x-translate">%oooxmlformatname% %oooxmlformatversion% Master Document</value> </prop> </node> diff --git a/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_ui.xcu b/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_ui.xcu index baf252ad79a1..1ab25959d0f6 100644 --- a/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_ui.xcu +++ b/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_ui.xcu @@ -21,7 +21,7 @@ <node oor:name="writer_globaldocument_StarOffice_XML_Writer"> <prop oor:name="UIName"> - <value xml:lang="en-US">%productname% %formatversion% Text Document</value> - <value xml:lang="x-translate">%productname% %formatversion% Text Document</value> + <value xml:lang="en-US">%oooxmlformatname% %oooxmlformatversion% Text Document</value> + <value xml:lang="x-translate">%oooxmlformatname% %oooxmlformatversion% Text Document</value> </prop> </node> diff --git a/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_Web_Template_ui.xcu b/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_Web_Template_ui.xcu index 21478fe0fb99..8072ee6ad365 100644 --- a/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_Web_Template_ui.xcu +++ b/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_Web_Template_ui.xcu @@ -21,7 +21,7 @@ <node oor:name="writer_web_StarOffice_XML_Writer_Web_Template"> <prop oor:name="UIName"> - <value xml:lang="en-US">%productname% %formatversion% HTML Template</value> - <value xml:lang="x-translate">%productname% %formatversion% HTML Template</value> + <value xml:lang="en-US">%oooxmlformatname% %oooxmlformatversion% HTML Template</value> + <value xml:lang="x-translate">%oooxmlformatname% %oooxmlformatversion% HTML Template</value> </prop> </node> diff --git a/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_ui.xcu b/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_ui.xcu index a86716012456..2f769db457b7 100644 --- a/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_ui.xcu +++ b/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_ui.xcu @@ -21,7 +21,7 @@ <node oor:name="writer_web_StarOffice_XML_Writer"> <prop oor:name="UIName"> - <value xml:lang="en-US">%productname% %formatversion% Text Document (%productname% Writer/Web)</value> - <value xml:lang="x-translate">%productname% %formatversion% Text Document (%productname% Writer/Web)</value> + <value xml:lang="en-US">%oooxmlformatname% %oooxmlformatversion% Text Document (%productname% Writer/Web)</value> + <value xml:lang="x-translate">%oooxmlformatname% %oooxmlformatversion% Text Document (%productname% Writer/Web)</value> </prop> </node> diff --git a/filter/source/config/fragments/types/draw_StarOffice_XML_Draw.xcu b/filter/source/config/fragments/types/draw_StarOffice_XML_Draw.xcu index 5e6bc780d806..b401252f7979 100644 --- a/filter/source/config/fragments/types/draw_StarOffice_XML_Draw.xcu +++ b/filter/source/config/fragments/types/draw_StarOffice_XML_Draw.xcu @@ -27,7 +27,7 @@ <prop oor:name="Preferred"><value>false</value></prop> <prop oor:name="PreferredFilter"><value>StarOffice XML (Draw)</value></prop> <prop oor:name="UIName"> - <value>%productname% %formatversion% Zeichnung</value> + <value>%oooxmlformatname% %oooxmlformatversion% Zeichnung</value> </prop> <prop oor:name="ClipboardFormat"><value>Draw 6.0</value></prop> </node> diff --git a/filter/source/config/fragments/types/impress_StarOffice_XML_Impress.xcu b/filter/source/config/fragments/types/impress_StarOffice_XML_Impress.xcu index 8aa23ab96a0d..5fe2b904711c 100644 --- a/filter/source/config/fragments/types/impress_StarOffice_XML_Impress.xcu +++ b/filter/source/config/fragments/types/impress_StarOffice_XML_Impress.xcu @@ -27,7 +27,7 @@ <prop oor:name="Preferred"><value>false</value></prop> <prop oor:name="PreferredFilter"><value>StarOffice XML (Impress)</value></prop> <prop oor:name="UIName"> - <value>%productname% %formatversion% Präsentation</value> + <value>%oooxmlformatname% %oooxmlformatversion% Präsentation</value> </prop> <prop oor:name="ClipboardFormat"><value>Impress 6.0</value></prop> </node> diff --git a/filter/source/config/fragments/types/math_StarOffice_XML_Math.xcu b/filter/source/config/fragments/types/math_StarOffice_XML_Math.xcu index c2a63dbc1f83..a68492fceded 100644 --- a/filter/source/config/fragments/types/math_StarOffice_XML_Math.xcu +++ b/filter/source/config/fragments/types/math_StarOffice_XML_Math.xcu @@ -27,7 +27,7 @@ <prop oor:name="Preferred"><value>false</value></prop> <prop oor:name="PreferredFilter"><value>StarOffice XML (Math)</value></prop> <prop oor:name="UIName"> - <value>%productname% %formatversion% Formel</value> + <value>%oooxmlformatname% %oooxmlformatversion% Formel</value> </prop> <prop oor:name="ClipboardFormat"><value>Math 6.0</value></prop> </node> diff --git a/filter/source/config/fragments/types/writer_Lotus_1_2_3_10_DOS_StarWriter.xcu b/filter/source/config/fragments/types/writer_Lotus_1_2_3_10_DOS_StarWriter.xcu index 7f5f06b43774..5e866f4c9f73 100644 --- a/filter/source/config/fragments/types/writer_Lotus_1_2_3_10_DOS_StarWriter.xcu +++ b/filter/source/config/fragments/types/writer_Lotus_1_2_3_10_DOS_StarWriter.xcu @@ -27,7 +27,7 @@ <prop oor:name="Preferred"><value>false</value></prop> <prop oor:name="PreferredFilter"><value>Lotus 1-2-3 1.0 (DOS) (StarWriter)</value></prop> <prop oor:name="UIName"> - <value>Lotus 1-2-3 1.0 (DOS) (%productname% %formatversion% Writer)</value> + <value>Lotus 1-2-3 1.0 (DOS) (%productname% Writer)</value> </prop> <prop oor:name="ClipboardFormat"/> </node> diff --git a/filter/source/config/fragments/types/writer_Lotus_1_2_3_10_WIN_StarWriter.xcu b/filter/source/config/fragments/types/writer_Lotus_1_2_3_10_WIN_StarWriter.xcu index 5c592972a4a6..462e550d6888 100644 --- a/filter/source/config/fragments/types/writer_Lotus_1_2_3_10_WIN_StarWriter.xcu +++ b/filter/source/config/fragments/types/writer_Lotus_1_2_3_10_WIN_StarWriter.xcu @@ -27,7 +27,7 @@ <prop oor:name="Preferred"><value>false</value></prop> <prop oor:name="PreferredFilter"><value>Lotus 1-2-3 1.0 (WIN) (StarWriter)</value></prop> <prop oor:name="UIName"> - <value>Lotus 1-2-3 1.0 (WIN) (%productname% %formatversion% Writer)</value> + <value>Lotus 1-2-3 1.0 (WIN) (%productname% Writer)</value> </prop> <prop oor:name="ClipboardFormat"/> </node> diff --git a/filter/source/config/fragments/types/writer_StarOffice_XML_Writer.xcu b/filter/source/config/fragments/types/writer_StarOffice_XML_Writer.xcu index d06018c14d49..a27899aa5e9b 100644 --- a/filter/source/config/fragments/types/writer_StarOffice_XML_Writer.xcu +++ b/filter/source/config/fragments/types/writer_StarOffice_XML_Writer.xcu @@ -27,7 +27,7 @@ <prop oor:name="Preferred"><value>false</value></prop> <prop oor:name="PreferredFilter"><value>StarOffice XML (Writer)</value></prop> <prop oor:name="UIName"> - <value>%productname% %formatversion% Textdokument</value> + <value>%oooxmlformatname% %oooxmlformatversion% Textdokument</value> </prop> <prop oor:name="ClipboardFormat"><value>Writer 6.0</value></prop> </node> diff --git a/filter/source/config/fragments/types/writer_StarWriter_30.xcu b/filter/source/config/fragments/types/writer_StarWriter_30.xcu index 6bfb4327167b..693ed1d10e04 100644 --- a/filter/source/config/fragments/types/writer_StarWriter_30.xcu +++ b/filter/source/config/fragments/types/writer_StarWriter_30.xcu @@ -27,7 +27,7 @@ <prop oor:name="Preferred"><value>false</value></prop> <prop oor:name="PreferredFilter"><value>StarWriter 3.0</value></prop> <prop oor:name="UIName"> - <value>StarWriter 3.0 (%productname% %formatversion% Globaldokument)</value> + <value>StarWriter 3.0 (%productname% Globaldokument)</value> </prop> <prop oor:name="ClipboardFormat"><value>StarWriter 3.0</value></prop> </node> diff --git a/filter/source/config/fragments/types/writer_StarWriter_40.xcu b/filter/source/config/fragments/types/writer_StarWriter_40.xcu index 47fce5d365c7..ffca2d6163cb 100644 --- a/filter/source/config/fragments/types/writer_StarWriter_40.xcu +++ b/filter/source/config/fragments/types/writer_StarWriter_40.xcu @@ -27,7 +27,7 @@ <prop oor:name="Preferred"><value>false</value></prop> <prop oor:name="PreferredFilter"><value>StarWriter 4.0</value></prop> <prop oor:name="UIName"> - <value>StarWriter 4.0 (%productname% %formatversion% Globaldokument)</value> + <value>StarWriter 4.0 (%productname% Globaldokument)</value> </prop> <prop oor:name="ClipboardFormat"><value>StarWriter 4.0</value></prop> </node> diff --git a/filter/source/config/fragments/types/writer_StarWriter_50.xcu b/filter/source/config/fragments/types/writer_StarWriter_50.xcu index 913ee9108a69..c981834f4e6b 100644 --- a/filter/source/config/fragments/types/writer_StarWriter_50.xcu +++ b/filter/source/config/fragments/types/writer_StarWriter_50.xcu @@ -27,7 +27,7 @@ <prop oor:name="Preferred"><value>false</value></prop> <prop oor:name="PreferredFilter"><value>StarWriter 5.0</value></prop> <prop oor:name="UIName"> - <value>StarWriter 5.0 (%productname% %formatversion% Globaldokument)</value> + <value>StarWriter 5.0 (%productname% Globaldokument)</value> </prop> <prop oor:name="ClipboardFormat"><value>StarWriter 5.0</value></prop> </node> diff --git a/framework/inc/classes/filtercachedata.hxx b/framework/inc/classes/filtercachedata.hxx index 7c4e781b57bc..f9367f358a76 100644 --- a/framework/inc/classes/filtercachedata.hxx +++ b/framework/inc/classes/filtercachedata.hxx @@ -84,12 +84,6 @@ namespace framework{ #define CFG_ENCODING_OPEN DECLARE_ASCII("[\'" ) /// used to start encoding of set names #define CFG_ENCODING_CLOSE DECLARE_ASCII("\']" ) /// used to finish encoding of set names -#define PRODUCTNAME_VARIABLE DECLARE_ASCII("%productname%") -#define PRODUCTNAME_VARLENGTH 13 -#define PRODUCTNAME_FALLBACK DECLARE_ASCII("StarOffice" ) /// fallback, if configuration can't give us current set product name ... -#define FORMATVERSION_VARIABLE DECLARE_ASCII("%formatversion%" ) -#define FORMATVERSION_VARLENGTH 15 -#define FORMATVERSION_FALLBACK DECLARE_ASCII("6.0/7" ) //***************************************************************************************************************** // We know some default values ... diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt index 661b9a4be210..25a4ad71bb03 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt @@ -1,7 +1,7 @@ Signature_ Root Key Name Type s72 i2 s255 S255 I2 RegLocator Signature_ -installuser 1 Software\OpenOffice.org\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2 -installuser_ 1 Software\OpenOffice.org\Layers_\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2 -installmachine 2 Software\OpenOffice.org\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2 -installmachine_ 2 Software\OpenOffice.org\Layers_\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2 +installuser 1 Software\Apache OpenOffice\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2 +installuser_ 1 Software\Apache OpenOffice\Layers_\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2 +installmachine 2 Software\Apache OpenOffice\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2 +installmachine_ 2 Software\Apache OpenOffice\Layers_\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2 diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt index 072fdcf6c291..1b4471857ed3 100644 --- a/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt +++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt @@ -1,7 +1,7 @@ Signature_ Root Key Name Type s72 i2 s255 S255 I2 RegLocator Signature_ -basisinstalluser 1 Software\OpenOffice.org\Layers\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2 -basisinstalluser_ 1 Software\OpenOffice.org\Layers_\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2 -basisinstallmachine 2 Software\OpenOffice.org\Layers\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2 -basisinstallmachine_ 2 Software\OpenOffice.org\Layers_\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2 +basisinstalluser 1 Software\Apache OpenOffice\Layers\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2 +basisinstalluser_ 1 Software\Apache OpenOffice\Layers_\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2 +basisinstallmachine 2 Software\Apache OpenOffice\Layers\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2 +basisinstallmachine_ 2 Software\Apache OpenOffice\Layers_\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2 diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk index 3fda72e8b293..3472278b6ae3 100644 --- a/instsetoo_native/util/makefile.mk +++ b/instsetoo_native/util/makefile.mk @@ -195,33 +195,33 @@ $(MAKETARGETS){$(PKGFORMAT:^".")} : $(ADDDEPS) .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 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 OpenOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml + $(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 OpenOffice_wJRE -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH) + $(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 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 OpenOffice_Dev --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml + $(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 OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -languagepack -format $(@:e:s/.//) $(VERBOSESWITCH) + $(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 OpenOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -languagepack -format $(@:e:s/.//) $(VERBOSESWITCH) + $(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 OpenOffice_SDK -u $(OUT) -buildid $(BUILD) -msitemplate $(MSISDKOOTEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -dontstrip -format $(@:e:s/.//) $(VERBOSESWITCH) + $(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 OpenOffice_Dev_SDK -u $(OUT) -buildid $(BUILD) -msitemplate $(MSISDKOOTEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -dontstrip -format $(@:e:s/.//) $(VERBOSESWITCH) + $(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:^".")} : diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst index 8b23d2a9ca8b..d3bbc672e90a 100644 --- a/instsetoo_native/util/openoffice.lst +++ b/instsetoo_native/util/openoffice.lst @@ -1,250 +1,240 @@ Globals { - Settings - { - variables - { - OOOBASEVERSION 3.5 - OOOPACKAGEVERSION 3.5.0 - UREPACKAGEVERSION 3.5.0 - URELAYERVERSION 1 - BASISROOTNAME OpenOffice.org - UNIXBASISROOTNAME openoffice.org - SERVICETAG_PRODUCTNAME OpenOffice.org 3.5 - SERVICETAG_PRODUCTVERSION 3.5 - SERVICETAG_PARENTNAME OpenOffice.org 3.5 - SERVICETAG_SOURCE {buildsource}{minor}(Build:{buildid}) - SERVICETAG_URN urn:uuid:500061aa-5666-11e0-8e00-080020a9ed93 - HIDELICENSEDIALOG 1 - PACKAGEPREFIX - BASISPACKAGEPREFIX ooobasis - UREPACKAGEPREFIX openoffice.org - SOLSUREPACKAGEPREFIX openofficeorg - USE_FILEVERSION 1 - LIBRARYVERSION 9.5.0 - POOLPRODUCT 1 - REGISTRATION_HOST https://registration.openoffice.org - REGISTRATIONURL http://survey.services.openoffice.org/user/index.php - 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 - OOODOWNLOADNAME 1 - STARTCENTER_LAYOUT_STYLE 0 - NOLANGUAGESELECTIONPRODUCT 0 - BUILDIDCWS {buildidcws} + 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} OPENSOURCE 1 - } - } + OOOXMLFILEFORMATNAME OpenOffice.org XML + OOOXMLFILEFORMATVERSION 1.0 + WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.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 + REGISTRATION_PRODUCT OpenOffice.org + REGISTRATION_CID 926117 + } + } } -OpenOffice +Apache_OpenOffice { - Settings - { - variables - { - PRODUCTNAME OpenOffice.org - PRODUCTVERSION 3.5.0 - PRODUCTEXTENSION - LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION + 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 + BRANDPACKAGEVERSION 3 + USERDIRPRODUCTVERSION 3 + ABOUTBOXPRODUCTVERSION 3.5.0 + BASEPRODUCTVERSION 3.5 PCPFILENAME openoffice.pcp - UPDATEURL http://update38.services.openoffice.org/ProductUpdateService/check.Update - ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF - 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 - 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 - OOODOWNLOADNAME 1 - 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 - REGISTRATION_PRODUCT OpenOffice.org - REGISTRATION_CID 926117 - DICT_REPO_URL http://extensions.openoffice.org/dictionaries - } - 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 - } + 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 + 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 + } + 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 + } } -OpenOffice_wJRE +Apache_OpenOffice_wJRE { - Settings - { - variables - { - PRODUCTNAME OpenOffice.org - PRODUCTVERSION 3.5.0 - PRODUCTEXTENSION - LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION - POSTVERSIONEXTENSION - POSTVERSIONEXTENSIONUNIX - BRANDPACKAGEVERSION 3 - USERDIRPRODUCTVERSION 3 - ABOUTBOXPRODUCTVERSION 3.5.0 - BASEPRODUCTVERSION 3.5 - UPDATEURL http://update38.services.openoffice.org/ProductUpdateService/check.Update - ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF - 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 - 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 - OOODOWNLOADNAME 1 - 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 - REGISTRATION_PRODUCT OpenOffice.org - REGISTRATION_CID 926117 - DICT_REPO_URL http://extensions.openoffice.org/dictionaries - } - 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 - } + 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 + 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 + } + 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 + } } -OpenOffice_Dev +Apache_OpenOffice_Dev { - Settings - { - variables - { - PRODUCTNAME OOo-dev - PRODUCTVERSION 3.5.0 - PRODUCTEXTENSION - LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION - BASISROOTNAME OOo-dev - UNIXBASISROOTNAME ooo-dev - POSTVERSIONEXTENSION - POSTVERSIONEXTENSIONUNIX - BRANDPACKAGEVERSION 3 - USERDIRPRODUCTVERSION 3 - ABOUTBOXPRODUCTVERSION 3.5.0 - BASEPRODUCTVERSION 3.5 - DEVELOPMENTPRODUCT 1 - BASISPACKAGEPREFIX ooobasis-dev - UREPACKAGEPREFIX ooodev - SOLSUREPACKAGEPREFIX ooodev - REGISTRYLAYERNAME LayerDev - SERVICETAG_URN urn:uuid:1680b00d-e45c-11de-82d6-080020a9ed93 - UPDATEURL http://update38.services.openoffice.org/ProductUpdateService/check.Update - ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF - ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst - EVAL - FILEFORMATNAME OpenOffice.org - 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 - OOODOWNLOADNAME 1 - 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 - REGISTRATION_PRODUCT OpenOffice.org - REGISTRATION_CID 926117 - DICT_REPO_URL http://extensions.openoffice.org/dictionaries - } - 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 - } + 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 + 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 + 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 @@ -273,13 +263,14 @@ URE DONTUSESTARTMENUFOLDER 1 RELATIVE_PATHES_IN_DDF 1 NOLANGUAGESELECTIONPRODUCT 1 - STARTCENTER_ADDFEATURE_URL http://extensions.openoffice.org/ - STARTCENTER_INFO_URL http://www.openoffice.org - STARTCENTER_TEMPLREP_URL http://templates.openoffice.org + 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 + PACKAGEMAP package_names_ext.txt + DICT_REPO_URL http://extensions.openoffice.org/dictionaries } active 1 compression 5 @@ -288,14 +279,14 @@ URE } } -OpenOffice_SDK +Apache_OpenOffice_SDK { Settings { downloadname Apache_OpenOffice-SDK_{packageversion}_{os}_install_{languages} variables { - PRODUCTNAME OpenOffice.org + PRODUCTNAME Apache OpenOffice PRODUCTVERSION 3.5.0 PRODUCTEXTENSION LONG_PRODUCTEXTENSION @@ -321,11 +312,12 @@ OpenOffice_SDK DOWNLOADSETUPICO ooosetup.ico DONTUSESTARTMENUFOLDER 1 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 + 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 + DICT_REPO_URL http://extensions.openoffice.org/dictionaries } active 1 compression 5 @@ -334,14 +326,14 @@ OpenOffice_SDK } } -OpenOffice_Dev_SDK +Apache_OpenOffice_Dev_SDK { Settings { downloadname Apache_OpenOffice-Dev-SDK_{packageversion}_{os}_install_{languages} variables { - PRODUCTNAME OOo-dev + PRODUCTNAME AOO-Developer-Build PRODUCTVERSION 3.5.0 PRODUCTEXTENSION LONG_PRODUCTEXTENSION @@ -353,11 +345,11 @@ OpenOffice_Dev_SDK BRANDPACKAGEVERSION 3 PACKAGEVERSION 3.5.0 PACKAGEREVISION {milestone} - BASISPACKAGEPREFIX ooobasis-dev - UREPACKAGEPREFIX ooodev - SOLSUREPACKAGEPREFIX ooodev + BASISPACKAGEPREFIX aoobasis-dev + UREPACKAGEPREFIX aoodev + SOLSUREPACKAGEPREFIX aoodev REGISTRYLAYERNAME LayerDev - DEVELOPMENTPRODUCT 1 + DEVELOPMENTPRODUCT 1 PACK_INSTALLED 1 POOLPRODUCT 0 DMG_VOLUMEEXTENSION SDK @@ -374,11 +366,12 @@ OpenOffice_Dev_SDK DOWNLOADSETUPICO ooosetup.ico DONTUSESTARTMENUFOLDER 1 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 + 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 + DICT_REPO_URL http://extensions.openoffice.org/dictionaries } active 1 compression 5 diff --git a/odk/cfgWin.js b/odk/cfgWin.js index 95bde9a93449..11a2b6c87675 100644 --- a/odk/cfgWin.js +++ b/odk/cfgWin.js @@ -22,8 +22,8 @@ // examples of the Office Development Kit. The script duplicates the template // script and inserts the variables into the copied script. // The Script was developed for the operating systems Microsoft Windows. -var regKeyOfficeCurrentUser = "HKEY_CURRENT_USER\\Software\\OpenOffice.org\\UNO\\InstallPath\\"; -var regKeyOfficeLocaleMachine = "HKEY_LOCAL_MACHINE\\Software\\OpenOffice.org\\UNO\\InstallPath\\"; +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"; @@ -923,18 +923,18 @@ function writeBatFile(fdir, file) "set OO_SDK_NAME=" + oo_sdk_name + "\n\n" + "REM Installation directory of the Software Development Kit.\n" + - "REM Example: set OO_SDK_HOME=C:\\Program Files\\OpenOffice.org\\Basic 3.0\\sdk\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\\OpenOffice.org 3\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\\OpenOffice.org\\Basis 3.0\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\\OpenOffice.org\\URE\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" + diff --git a/odk/configure.pl b/odk/configure.pl index cff35a156ba7..27cfb66bbeed 100755 --- a/odk/configure.pl +++ b/odk/configure.pl @@ -235,7 +235,7 @@ if ( $main::OFFICE_OR_URE eq "Office" ) else { # prepare URE path - $main::OO_SDK_URE_HOME_SUGGESTION = "/opt/openoffice.org/ure"; + $main::OO_SDK_URE_HOME_SUGGESTION = "/opt/apacheopenoffice/ure"; $main::OO_SDK_URE_HOME_SUGGESTION = "" unless -e "$main::OO_SDK_URE_HOME_SUGGESTION/bin/uno"; for (;;) @@ -711,6 +711,9 @@ sub searchprog sub searchMacOffice { + if (-d "/Applications/Apache OpenOffice.app" ) { + return "/Applications/Apache OpenOffice.app" + } if (-d "/Applications/OpenOffice.org.app" ) { return "/Applications/OpenOffice.org.app" } @@ -729,9 +732,9 @@ sub searchMacOffice sub searchoffice { - my $offset = rindex($main::sdkpath, "/openoffice.org"); + my $offset = rindex($main::sdkpath, "/apacheopenoffice"); my $tmpOffice = substr($main::sdkpath, 0, $offset); - my $officepath = "$tmpOffice/openoffice.org$main::OO_MAJORVERSION"; + my $officepath = "$tmpOffice/apacheopenoffice$main::OO_MAJORVERSION"; # if ( $main::OO_MINORVERSION > 0) { # $officepath = "$officepath$main::OO_MINORVERSION"; diff --git a/odk/docs/install.html b/odk/docs/install.html index 0e24fa275eb7..d02f635539df 100644 --- a/odk/docs/install.html +++ b/odk/docs/install.html @@ -188,7 +188,7 @@ <tr valign="top"> <td class="cell20"><b>OFFICE_HOME</b></td> <td class="cell80">Path to an existing Apache OpenOffice - base installation, e.g. "/opt/openoffice.org3". Be sure + base installation, e.g. "/opt/apacheopenoffice3". Be sure that it is not a user installation only. Exactly one of OFFICE_HOME and OO_SDK_URE_HOME must be set. The other should be either unset or set to an empty value.</td> @@ -205,7 +205,7 @@ <tr> <td class="cell20"><b>OO_SDK_URE_HOME</b></td> <td class="cell80">Path to an existing UNO Runtime Environment - installation, e.g. "/opt/openoffice.org/ure". Exactly one of + installation, e.g. "/opt/apacheopenoffice/ure". Exactly one of OFFICE_HOME and OO_SDK_URE_HOME must be set. The other should be either unset or set to an empty value.</td> </tr> @@ -259,7 +259,7 @@ 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. <OO_SDK_OUTPUT_DIR> - /OpenOffice.org %PRODUCT_RELEASE%/LINUXExample.out)</td> + /Apache OpenOffice %PRODUCT_RELEASE%/LINUXExample.out)</td> </tr> <tr> <td class="cell20"><b>SDK_AUTO_DEPLOYMENT</b></td> diff --git a/odk/docs/notsupported.html b/odk/docs/notsupported.html index e12e71d6ab7d..b33c29f8c805 100644 --- a/odk/docs/notsupported.html +++ b/odk/docs/notsupported.html @@ -23,7 +23,7 @@ --> <html> <head> - <title>OpenOffice.org %PRODUCT_RELEASE% SDK - Not supported page</title> + <title>Apache OpenOffice %PRODUCT_RELEASE% SDK - Not supported page</title> <link rel="stylesheet" type="text/css" href="sdk_styles.css"> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> <meta name="author" content="Jürgen Schmidt"> diff --git a/odk/docs/tools.html b/odk/docs/tools.html index bb94b6cef338..f994f827ae20 100644 --- a/odk/docs/tools.html +++ b/odk/docs/tools.html @@ -1,4 +1,4 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> <!-- #************************************************************** # @@ -23,7 +23,7 @@ --> <html> <head> - <title>OpenOffice.org %PRODUCT_RELEASE% SDK - Development Tools</title> + <title>Apache OpenOffice %PRODUCT_RELEASE% SDK - Development Tools</title> <link rel="stylesheet" type="text/css" href="sdk_styles.css"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta name="author" content="Jürgen Schmidt"> @@ -168,7 +168,7 @@ office installation. UNO packages are UNO components (single libraries or Jar files or more complex zip files that contains one or more libraries| Jar files, type libraries and configuration items), scripts and - OpenOffice.org %PRODUCT_RELEASE% Basic libraries as zip package. 'unopkg' is not part of the + Apache OpenOffice %PRODUCT_RELEASE% Basic libraries as zip package. 'unopkg' is not part of the SDK but comes with the office directly and is a development tool as well as an end user tool to deploy extension into an office installation.</p> <p>More details concerning deployment and this tool can be find in the diff --git a/odk/examples/cpp/StatusbarController/ModifiedStatusbarController/project.mk b/odk/examples/cpp/StatusbarController/ModifiedStatusbarController/project.mk index 631ff8148825..91a07fd7f690 100644 --- a/odk/examples/cpp/StatusbarController/ModifiedStatusbarController/project.mk +++ b/odk/examples/cpp/StatusbarController/ModifiedStatusbarController/project.mk @@ -20,7 +20,7 @@ #************************************************************** DESCRIPTION_OOO_MIN_VER=3.5.0 -DESCRIPTION_DEP_NAME=OpenOffice.org $(DESCRIPTION_OOO_MIN_VER) +DESCRIPTION_DEP_NAME=Apache OpenOffice $(DESCRIPTION_OOO_MIN_VER) EXTENSION_ID=org.apache.openoffice.framework.statusbar.ModifiedStatus EXTENSION_VERSION=0.0.1 diff --git a/odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/project.mk b/odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/project.mk index a65d034c77fe..38db42374c54 100644 --- a/odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/project.mk +++ b/odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/project.mk @@ -20,7 +20,7 @@ #************************************************************** DESCRIPTION_OOO_MIN_VER=3.5.0 -DESCRIPTION_DEP_NAME=OpenOffice.org $(DESCRIPTION_OOO_MIN_VER) +DESCRIPTION_DEP_NAME=Apache OpenOffice $(DESCRIPTION_OOO_MIN_VER) EXTENSION_ID=org.apache.openoffice.framework.statusbar.SelectionMode EXTENSION_VERSION=0.0.1 diff --git a/odk/examples/cpp/StatusbarController/WordCountStatusbarController/project.mk b/odk/examples/cpp/StatusbarController/WordCountStatusbarController/project.mk index 0f05b0a1e73d..0149b37ac74f 100644 --- a/odk/examples/cpp/StatusbarController/WordCountStatusbarController/project.mk +++ b/odk/examples/cpp/StatusbarController/WordCountStatusbarController/project.mk @@ -20,7 +20,7 @@ #************************************************************** DESCRIPTION_OOO_MIN_VER=3.5.0 -DESCRIPTION_DEP_NAME=OpenOffice.org $(DESCRIPTION_OOO_MIN_VER) +DESCRIPTION_DEP_NAME=Apache OpenOffice $(DESCRIPTION_OOO_MIN_VER) EXTENSION_ID=org.apache.openoffice.framework.statusbar.StatusWordCount EXTENSION_VERSION=0.0.1 diff --git a/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx b/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx index 0bfbfb61e69b..36f309950a27 100644 --- a/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx +++ b/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx @@ -233,7 +233,7 @@ void SAL_CALL BaseDispatch::dispatch( const URL& aURL, const Sequence < Property { if ( !aURL.Path.compareToAscii( RTL_CONSTASCII_STRINGPARAM( "ImageButtonCmd" ) ) ) { - // open the OpenOffice.org web page + // open the Apache OpenOffice web page ::rtl::OUString sURL( RTL_CONSTASCII_USTRINGPARAM( "http://www.openoffice.org" ) ); Reference< XSystemShellExecute > xSystemShellExecute( com::sun::star::system::SystemShellExecute::create( mxContext ) ); diff --git a/odk/examples/cpp/custompanel/description.xml b/odk/examples/cpp/custompanel/description.xml index 1dc8721a04a1..9bba0d616695 100644 --- a/odk/examples/cpp/custompanel/description.xml +++ b/odk/examples/cpp/custompanel/description.xml @@ -31,6 +31,6 @@ <name>Custom Tool Panel Example</name> </display-name> <dependencies> - <OpenOffice.org-minimal-version value="3.4" d:name="OpenOffice.org 3.4"/> + <OpenOffice.org-minimal-version value="3.4" d:name="Apache OpenOffice 3.4"/> </dependencies> </description> diff --git a/odk/pack/copying/dk.mk b/odk/pack/copying/dk.mk index ec06352e81a4..1b8ed2507f4c 100644 --- a/odk/pack/copying/dk.mk +++ b/odk/pack/copying/dk.mk @@ -19,7 +19,7 @@ # #************************************************************** -# OpenOffice.org @@RELEASE@@ SDK dependent settings +# Apache OpenOffice @@RELEASE@@ SDK dependent settings SDKVERSION=@@RELEASE@@ BUILDID=@@BUILDID@@ SCM_REVISION=@@SCMREVISION@@
\ No newline at end of file diff --git a/odk/pack/copying/idl_chapter_refs.txt b/odk/pack/copying/idl_chapter_refs.txt index 58d93cce9c1b..4095601a41d7 100644 --- a/odk/pack/copying/idl_chapter_refs.txt +++ b/odk/pack/copying/idl_chapter_refs.txt @@ -6547,8 +6547,8 @@ com.sun.star.task.JobExecutor TOPIC: com.sun.star.task.JobExecutor -LINK:Documentation/DevGuide/Database/Data_Sources_in_OpenOffice.org_API#DatabaseContext -DESCR:Database - Data Sources in OpenOffice.org API - DatabaseContext +LINK:Documentation/DevGuide/Database/Data_Sources_in_Apache_OpenOffice_API#DatabaseContext +DESCR:Database - Data Sources in Apache OpenOffice API - DatabaseContext REF: com.sun.star.sdb.Connection com.sun.star.sdb.DatabaseContext @@ -7510,8 +7510,8 @@ com.sun.star.table.CellAddress com.sun.star.sheet.XSheetAnnotationAnchor TOPIC: -LINK:Documentation/DevGuide/OfficeDev/Frame-Controller-Model_Paradigm_in_OpenOffice.org -DESCR:OfficeDev - Frame-Controller-Model Paradigm in OpenOffice.org +LINK:Documentation/DevGuide/OfficeDev/Frame-Controller-Model_Paradigm_in_Apache_OpenOffice +DESCR:OfficeDev - Frame-Controller-Model Paradigm in Apache OpenOffice REF: TOPIC: com.sun.star.frame.XController diff --git a/odk/setsdkenv_unix b/odk/setsdkenv_unix index 53954d166775..859767cf6c94 100644 --- a/odk/setsdkenv_unix +++ b/odk/setsdkenv_unix @@ -30,7 +30,7 @@ if [ "$OSTYPE" = "Darwin" ] then OO_SDK_NAME=`basename $OO_SDK_HOME` else - OO_SDK_NAME=openoffice.org${OOVERSION}_sdk + OO_SDK_NAME=apacheopenoffice${OOVERSION}_sdk fi export OO_SDK_HOME diff --git a/odk/setsdkenv_unix.sh.in b/odk/setsdkenv_unix.sh.in index 321def875827..24d2c1cecbd6 100644 --- a/odk/setsdkenv_unix.sh.in +++ b/odk/setsdkenv_unix.sh.in @@ -29,16 +29,16 @@ OO_SDK_NAME=@OO_SDK_NAME@ export OO_SDK_NAME # Installation directory of the Software Development Kit. -# Example: OO_SDK_HOME=/opt/openoffice.org/basis3.0/sdk +# Example: OO_SDK_HOME=/opt/apacheopenoffice/basis3.0/sdk OO_SDK_HOME='@OO_SDK_HOME@' # Office installation directory. -# Example: OFFICE_HOME=/opt/openoffice.org3 +# Example: OFFICE_HOME=/opt/apacheopenoffice3 OFFICE_HOME='@OFFICE_HOME@' OFFICE_BASE_HOME='@OFFICE_BASE_HOME@' # URE installation directory. -# Example: OO_SDK_URE_HOME=/opt/openoffice.org/ure +# Example: OO_SDK_URE_HOME=/opt/apacheopenoffice/ure OO_SDK_URE_HOME='@OO_SDK_URE_HOME@' export OO_SDK_URE_HOME @@ -78,7 +78,7 @@ OO_SDK_OUTPUT_DIR=@OO_SDK_OUTPUT_DIR@ SDK_AUTO_DEPLOYMENT=@SDK_AUTO_DEPLOYMENT@ export SDK_AUTO_DEPLOYMENT -# Check installation path for the OpenOffice Development Kit. +# Check installation path for the Apache OpenOffice Development Kit. if [ -z "${OO_SDK_HOME}" ] then echo Error: Please insert a correct value for the variable OO_SDK_HOME. diff --git a/odk/setsdkenv_windows.template b/odk/setsdkenv_windows.template index b0015ff09877..079214f17639 100644 --- a/odk/setsdkenv_windows.template +++ b/odk/setsdkenv_windows.template @@ -23,22 +23,22 @@ REM This script sets all enviroment variables, which REM are necessary for building the examples of the Office Development Kit. REM The Script was developed for the operating systems Windows. REM The SDK name -REM Example: set OO_SDK_NAME=openoffice3.0_sdk -set OO_SDK_NAME=openoffice.org3.0_sdk +REM Example: set OO_SDK_NAME=apacheopenoffice3.0_sdk +set OO_SDK_NAME=apacheopenoffice3.0_sdk REM Installation directory of the Software Development Kit. -REM Example: set OO_SDK_HOME=C:\Program Files\OpenOffice.org\Basic 3.0\sdk +REM Example: set OO_SDK_HOME=C:\Program Files\Apache OpenOffice\Basic 3.0\sdk set OO_SDK_HOME= REM Office installation directory. -REM Example: set OFFICE_HOME=C:\Program Files\OpenOffice.org 3 +REM Example: set OFFICE_HOME=C:\Program Files\Apache OpenOffice 3 set OFFICE_HOME= -REM Example: set OFFICE_HOME=C:\Program Files\OpenOffice.org\Basis 3.0 +REM Example: set OFFICE_HOME=C:\Program Files\Apache OpenOffice\Basis 3.0 set OFFICE_BASE_HOME= REM URE installation directory. -REM Example: set OO_SDK_URE_HOME=C:\Program Files\OpenOffice.org\URE +REM Example: set OO_SDK_URE_HOME=C:\Program Files\Apache OpenOffice\URE set OO_SDK_URE_HOME= REM Directory of the make command. @@ -73,7 +73,7 @@ REM Example: set OO_SDK_JAVA_HOME=C:\Program Files\Java\jdk1.6.0_05 set OO_SDK_JAVA_HOME= REM Special output directory -REM Example: set OO_SDK_OUT=C:\openoffice.org3.0_sdk +REM Example: set OO_SDK_OUT=C:\apacheopenoffice3.0_sdk set OO_SDK_OUT= REM Automatic deployment diff --git a/odk/source/com/sun/star/lib/loader/InstallationFinder.java b/odk/source/com/sun/star/lib/loader/InstallationFinder.java index 935256c7e729..6dbdcb190285 100644 --- a/odk/source/com/sun/star/lib/loader/InstallationFinder.java +++ b/odk/source/com/sun/star/lib/loader/InstallationFinder.java @@ -188,7 +188,7 @@ final class InstallationFinder { */ private static String getPathFromWindowsRegistry() { - final String SUBKEYNAME = "Software\\OpenOffice.org\\UNO\\InstallPath"; + final String SUBKEYNAME = "Software\\Apache OpenOffice\\UNO\\InstallPath"; String path = null; diff --git a/odk/source/unoapploader/win/unoapploader.c b/odk/source/unoapploader/win/unoapploader.c index b2cda49b3a01..83d0a75c52cc 100644 --- a/odk/source/unoapploader/win/unoapploader.c +++ b/odk/source/unoapploader/win/unoapploader.c @@ -61,7 +61,7 @@ void closeErrorFile(); * environment variable to the program directory of the UNO installation. * If no installation is specified by the user, the default installation on * the system will be taken. The default installation is read from the - * default value of the key "Software\OpenOffice.org\UNO\InstallPath" from the + * default value of the key "Software\Apache OpenOffice\UNO\InstallPath" from the * root key HKEY_CURRENT_USER in the Windows Registry. If this key is missing, * the key is read from the root key HKEY_LOCAL_MACHINE.</p> */ diff --git a/odk/util/makefile.pmk b/odk/util/makefile.pmk index c26bde3f0851..034fcb9cf3b0 100644 --- a/odk/util/makefile.pmk +++ b/odk/util/makefile.pmk @@ -23,8 +23,8 @@ # used for sdk common files PRODUCT_RELEASE=3.5 -OFFICENAME=OpenOffice.org -SDKDIRNAME=openoffice.org$(PRODUCT_RELEASE)_sdk +OFFICENAME=Apache OpenOffice +SDKDIRNAME=apacheopenoffice$(PRODUCT_RELEASE)_sdk OFFICEPRODUCTNAME=$(OFFICENAME) $(PRODUCT_RELEASE) TITLE=$(OFFICENAME) $(PRODUCT_RELEASE) SDK IDLDOCREFNAME="$(OFFICENAME) $(PRODUCT_RELEASE) API" diff --git a/officecfg/registry/data/org/openoffice/Setup.xcu b/officecfg/registry/data/org/openoffice/Setup.xcu index f965388e4acd..d1231dea434c 100644 --- a/officecfg/registry/data/org/openoffice/Setup.xcu +++ b/officecfg/registry/data/org/openoffice/Setup.xcu @@ -41,10 +41,10 @@ <value >${PRODUCTEXTENSION}</value> </prop> <prop oor:name="ooXMLFileFormatVersion" install:module="brand"> - <value >${FILEFORMATVERSION}</value> + <value >${OOOXMLFILEFORMATVERSION}</value> </prop> <prop oor:name="ooXMLFileFormatName" install:module="brand"> - <value >${FILEFORMATNAME}</value> + <value >${OOOXMLFILEFORMATNAME}</value> </prop> <prop oor:name="ooOpenSourceContext" install:module="brand"> <value >${OPENSOURCE}</value> diff --git a/postprocess/rebase/no_rebase.txt b/postprocess/rebase/no_rebase.txt index 8490f1c4e83a..a1462c9e9b6f 100644 --- a/postprocess/rebase/no_rebase.txt +++ b/postprocess/rebase/no_rebase.txt @@ -31,3 +31,5 @@ msvcr80.dll msvcr90d.dll msvcr90.dll msvcr100.dll +msvcr100d.dll +dbghelp.dll diff --git a/readlicense_oo/docs/readme/readme.xrm b/readlicense_oo/docs/readme/readme.xrm index b7004a0fbf32..0ce60b7350ff 100644 --- a/readlicense_oo/docs/readme/readme.xrm +++ b/readlicense_oo/docs/readme/readme.xrm @@ -39,13 +39,13 @@ <h1 id="Welcome" xml:lang="en-US">${PRODUCTNAME} ${PRODUCTVERSION} ReadMe</h1> <p id="LatestUpdates" xml:lang="en-US">For latest updates to this readme file, see <a href="http://www.openoffice.org/welcome/readme.html">http://www.openoffice.org/welcome/readme.html</a></p> <p id="A6" xml:lang="en-US">This file contains important information about this program. Please read this information very carefully before starting work.</p> - <p id="A7" xml:lang="en-US">The OpenOffice.org Community, responsible for the development of this product, would like to invite you to participate as a community member. As a new user, you can check out the ${PRODUCTNAME} site with helpful user information at <a href="http://www.openoffice.org/about_us/introduction.html">http://www.openoffice.org/about_us/introduction.html</a></p> - <p id="A9" xml:lang="en-US">Also read the sections below about getting involved in the OpenOffice.org project.</p> + <p id="A7" xml:lang="en-US">The Apache OpenOffice Community, responsible for the development of this product, would like to invite you to participate as a community member. As a new user, you can check out the ${PRODUCTNAME} site with helpful user information at <a href="http://www.openoffice.org/about_us/introduction.html">http://www.openoffice.org/about_us/introduction.html</a></p> + <p id="A9" xml:lang="en-US">Also read the sections below about getting involved in the Apache OpenOffice project.</p> <h3 id="A10" xml:lang="en-US">Is ${PRODUCTNAME} really free for any user? </h3> <p id="A11" xml:lang="en-US">${PRODUCTNAME} is free for use by everybody. You may take this copy of ${PRODUCTNAME} and install it on as many computers as you like, and use it for any purpose you like (including commercial, government, public administration and educational use). For further details see the license text delivered together with ${PRODUCTNAME} or <a href="http://www.openoffice.org/license.html">http://www.openoffice.org/license.html</a></p> <h3 id="A12" xml:lang="en-US">Why is ${PRODUCTNAME} free for any user?</h3> <p id="A13" xml:lang="en-US">You can use this copy of ${PRODUCTNAME} today free of charge because individual contributors and corporate sponsors have designed, developed, tested, translated, documented, supported, marketed, and helped in many other ways to make ${PRODUCTNAME} what it is today - the world's leading open-source office software.</p> - <p id="A13b" xml:lang="en-US">If you appreciate their efforts, and would like to ensure OpenOffice.org continues into the future, please consider contributing to the project - see <a href="http://contributing.openoffice.org">http://contributing.openoffice.org</a> for details. Everyone has a contribution to make.</p> + <p id="A13b" xml:lang="en-US">If you appreciate their efforts, and would like to ensure Apache OpenOffice continues into the future, please consider contributing to the project - see <a href="http://contributing.openoffice.org">http://contributing.openoffice.org</a> for details. Everyone has a contribution to make.</p> </div> <div id="Installation"> @@ -266,7 +266,7 @@ <div id="UserSupport"> <h2 id="support" xml:lang="en-US">User Support</h2> - <p id="support1" xml:lang="en-US">The main support page <a href="http://support.openoffice.org/">http://support.openoffice.org/</a> offers various possibilities for help with ${PRODUCTNAME}. Your question may have already been answered - check the Community Forum at <a href="http://user.services.openoffice.org">http://user.services.openoffice.org</a> or search the archives of the 'users@openoffice.org' mailing list at <a href="http://www.openoffice.org/mail_list.html">http://www.openoffice.org/mail_list.html</a>. Alternatively, you can send in your questions to <a href="mailto:users@openoffice.org">users@openoffice.org</a>. How to subscribe to the list (to get an email response) is explained on this page: <a href="http://wiki.services.openoffice.org/wiki/Website/Content/help/mailinglists">http://wiki.services.openoffice.org/wiki/Website/Content/help/mailinglists</a>.</p> + <p id="support1" xml:lang="en-US">The main support page <a href="http://support.openoffice.org/">http://support.openoffice.org/</a> offers various possibilities for help with ${PRODUCTNAME}. Your question may have already been answered - check the Community Forum at <a href="http://user.services.openoffice.org">http://user.services.openoffice.org</a> or search the archives of the 'users@openoffice.apache.org' mailing list at <a href="http://www.openoffice.org/mail_list.html">http://www.openoffice.org/mail_list.html</a>. Alternatively, you can send in your questions to <a href="mailto:users@openoffice.apache.org">users@openoffice.apache.org</a>. How to subscribe to the list (to get an email response) is explained on this page: <a href="http://wiki.services.openoffice.org/wiki/Website/Content/help/mailinglists">http://wiki.services.openoffice.org/wiki/Website/Content/help/mailinglists</a>.</p> <p id="faq" url="ahead" xml:lang="en-US">Also check the FAQ section at <a href="http://wiki.services.openoffice.org/wiki/Documentation/FAQ">http://wiki.services.openoffice.org/wiki/Documentation/FAQ.</a></p> </div> @@ -302,13 +302,13 @@ </ul> <h3 xml:lang="en-US">Joining the Project</h3> <p id="joining" xml:lang="en-US">You can make major contributions to this important open source project even if you have limited software design or coding experience. Yes, you!</p> - <p id="joining1" url="ahead" xml:lang="en-US">At <a href="http://openoffice.apache.org/get-involved.html">http://openoffice.apache.org/get-involved.html</a> you will find a first overview where you can start with, ranging from Localization, QA, user support to some real core coding projects. If you are not a developer, try the Documentation or the Marketing Project. The OpenOffice.org Marketing Project is applying both guerilla and traditional commercial techniques to marketing open source software, and we are doing it across language and cultural barriers, so you can help just by spreading the word and telling a friend about this office suite.</p> + <p id="joining1" url="ahead" xml:lang="en-US">At <a href="http://openoffice.apache.org/get-involved.html">http://openoffice.apache.org/get-involved.html</a> you will find a first overview where you can start with, ranging from Localization, QA, user support to some real core coding projects. If you are not a developer, try the Documentation or the Marketing Project. The Apache OpenOffice Marketing Project is applying both guerilla and traditional commercial techniques to marketing open source software, and we are doing it across language and cultural barriers, so you can help just by spreading the word and telling a friend about this office suite.</p> <p id="joining3" xml:lang="en-US">You can help by joining the marktig mailig list ooo-marketing@incubator.apache.org or visit the Marketing Communications & Information Network on <a href="http://marketing.openoffice.org">http://marketing.openoffice.org</a> where you can provide point communication contact with press, media, government agencies, consultants, schools, Linux Users Groups and developers in your country and local community.</p> </div> <div id="Credits"> <p id="credits" xml:lang="en-US">We hope you enjoy working with the new ${PRODUCTNAME} ${PRODUCTVERSION} and will join us online.</p> - <p id="credits2" xml:lang="en-US">The OpenOffice.org Community</p> + <p id="credits2" xml:lang="en-US">The Apache OpenOffice Community</p> </div> <div id="ModifiedSourceCode"> diff --git a/sc/source/ui/vba/vbawindow.cxx b/sc/source/ui/vba/vbawindow.cxx index 39c82fcff862..9531c6e09747 100644 --- a/sc/source/ui/vba/vbawindow.cxx +++ b/sc/source/ui/vba/vbawindow.cxx @@ -310,7 +310,7 @@ ScVbaWindow::ScrollWorkbookTabs( const uno::Any& /*Sheets*/, const uno::Any& /*P uno::Any SAL_CALL ScVbaWindow::getCaption() throw (uno::RuntimeException) { - static rtl::OUString sCrud(RTL_CONSTASCII_USTRINGPARAM(" - OpenOffice.org Calc" ) ); + static rtl::OUString sCrud(RTL_CONSTASCII_USTRINGPARAM(" - Apache OpenOffice Calc" ) ); static sal_Int32 nCrudLen = sCrud.getLength(); rtl::OUString sTitle; diff --git a/sc/xml/ScXMLExport.xml b/sc/xml/ScXMLExport.xml index 4de8ddf11245..e38a50ccd9cb 100644 --- a/sc/xml/ScXMLExport.xml +++ b/sc/xml/ScXMLExport.xml @@ -39,11 +39,11 @@ <status value="beta"/> <supported-service>com.sun.star.xml.XMLExportFilter</supported-service> <reference-docu xlink:href="http://xml.openoffice.org/" - xlink:title="general OpenOffice.org xml information" /> + xlink:title="general OpenOffice.org XML information" /> <reference-docu xlink:title="XML File Format Specification (draft)" xlink:href="http://xml.openoffice.org/xml_specification_draft.pdf" /> <reference-docu xlink:href="http://xml.openoffice.org/filter/" - xlink:title="Guide to implement XML-based filters in OpenOffice.org" /> + xlink:title="Guide to implement XML-based filters in Apache OpenOffice" /> </component-description> <component-description> @@ -57,11 +57,11 @@ <status value="beta"/> <supported-service>com.sun.star.xml.XMLExportFilter</supported-service> <reference-docu xlink:href="http://xml.openoffice.org/" - xlink:title="general OpenOffice.org xml information" /> + xlink:title="general OpenOffice.org XML information" /> <reference-docu xlink:title="XML File Format Specification (draft)" xlink:href="http://xml.openoffice.org/xml_specification_draft.pdf" /> <reference-docu xlink:href="http://xml.openoffice.org/filter/" - xlink:title="Guide to implement XML-based filters in OpenOffice.org" /> + xlink:title="Guide to implement XML-based filters in Apache OpenOffice" /> </component-description> <component-description> @@ -75,11 +75,11 @@ <status value="beta"/> <supported-service>com.sun.star.xml.XMLExportFilter</supported-service> <reference-docu xlink:href="http://xml.openoffice.org/" - xlink:title="general OpenOffice.org xml information" /> + xlink:title="general OpenOffice.org XML information" /> <reference-docu xlink:title="XML File Format Specification (draft)" xlink:href="http://xml.openoffice.org/xml_specification_draft.pdf" /> <reference-docu xlink:href="http://xml.openoffice.org/filter/" - xlink:title="Guide to implement XML-based filters in OpenOffice.org" /> + xlink:title="Guide to implement XML-based filters in Apache OpenOffice" /> </component-description> <component-description> @@ -93,11 +93,11 @@ <status value="beta"/> <supported-service>com.sun.star.xml.XMLExportFilter</supported-service> <reference-docu xlink:href="http://xml.openoffice.org/" - xlink:title="general OpenOffice.org xml information" /> + xlink:title="general OpenOffice.org XML information" /> <reference-docu xlink:title="XML File Format Specification (draft)" xlink:href="http://xml.openoffice.org/xml_specification_draft.pdf" /> <reference-docu xlink:href="http://xml.openoffice.org/filter/" - xlink:title="Guide to implement XML-based filters in OpenOffice.org" /> + xlink:title="Guide to implement XML-based filters in Apache OpenOffice" /> </component-description> <component-description> @@ -111,11 +111,11 @@ <status value="beta"/> <supported-service>com.sun.star.xml.XMLExportFilter</supported-service> <reference-docu xlink:href="http://xml.openoffice.org/" - xlink:title="general OpenOffice.org xml information" /> + xlink:title="general OpenOffice.org XML information" /> <reference-docu xlink:title="XML File Format Specification (draft)" xlink:href="http://xml.openoffice.org/xml_specification_draft.pdf" /> <reference-docu xlink:href="http://xml.openoffice.org/filter/" - xlink:title="Guide to implement XML-based filters in OpenOffice.org" /> + xlink:title="Guide to implement XML-based filters in Apache OpenOffice" /> </component-description> <project-build-dependency>cppu</project-build-dependency> <project-build-dependency>cppuhelper</project-build-dependency> diff --git a/sc/xml/ScXMLImport.xml b/sc/xml/ScXMLImport.xml index cb47c3b15cb6..fc67e0fb4034 100644 --- a/sc/xml/ScXMLImport.xml +++ b/sc/xml/ScXMLImport.xml @@ -39,11 +39,11 @@ <status value="beta"/> <supported-service>com.sun.star.xml.XMLImportFilter</supported-service> <reference-docu xlink:href="http://xml.openoffice.org/" - xlink:title="general OpenOffice.org xml information" /> + xlink:title="general OpenOffice.org XML information" /> <reference-docu xlink:title="XML File Format Specification (draft)" xlink:href="http://xml.openoffice.org/xml_specification_draft.pdf" /> <reference-docu xlink:href="http://xml.openoffice.org/filter/" - xlink:title="Guide to implement XML-based filters in OpenOffice.org" /> + xlink:title="Guide to implement XML-based filters in Apache OpenOffice" /> </component-description> <component-description> @@ -57,11 +57,11 @@ <status value="beta"/> <supported-service>com.sun.star.xml.XMLImportFilter</supported-service> <reference-docu xlink:href="http://xml.openoffice.org/" - xlink:title="general OpenOffice.org xml information" /> + xlink:title="general OpenOffice.org XML information" /> <reference-docu xlink:title="XML File Format Specification (draft)" xlink:href="http://xml.openoffice.org/xml_specification_draft.pdf" /> <reference-docu xlink:href="http://xml.openoffice.org/filter/" - xlink:title="Guide to implement XML-based filters in OpenOffice.org" /> + xlink:title="Guide to implement XML-based filters in Apache OpenOffice" /> </component-description> <component-description> @@ -75,11 +75,11 @@ <status value="beta"/> <supported-service>com.sun.star.xml.XMLImportFilter</supported-service> <reference-docu xlink:href="http://xml.openoffice.org/" - xlink:title="general OpenOffice.org xml information" /> + xlink:title="general OpenOffice.org XML information" /> <reference-docu xlink:title="XML File Format Specification (draft)" xlink:href="http://xml.openoffice.org/xml_specification_draft.pdf" /> <reference-docu xlink:href="http://xml.openoffice.org/filter/" - xlink:title="Guide to implement XML-based filters in OpenOffice.org" /> + xlink:title="Guide to implement XML-based filters in Apache OpenOffice" /> </component-description> <component-description> @@ -93,11 +93,11 @@ <status value="beta"/> <supported-service>com.sun.star.xml.XMLImportFilter</supported-service> <reference-docu xlink:href="http://xml.openoffice.org/" - xlink:title="general OpenOffice.org xml information" /> + xlink:title="general OpenOffice.org XML information" /> <reference-docu xlink:title="XML File Format Specification (draft)" xlink:href="http://xml.openoffice.org/xml_specification_draft.pdf" /> <reference-docu xlink:href="http://xml.openoffice.org/filter/" - xlink:title="Guide to implement XML-based filters in OpenOffice.org" /> + xlink:title="Guide to implement XML-based filters in Apache OpenOffice" /> </component-description> <component-description> @@ -111,11 +111,11 @@ <status value="beta"/> <supported-service>com.sun.star.xml.XMLImportFilter</supported-service> <reference-docu xlink:href="http://xml.openoffice.org/" - xlink:title="general OpenOffice.org xml information" /> + xlink:title="general OpenOffice.org XML information" /> <reference-docu xlink:title="XML File Format Specification (draft)" xlink:href="http://xml.openoffice.org/xml_specification_draft.pdf" /> <reference-docu xlink:href="http://xml.openoffice.org/filter/" - xlink:title="Guide to implement XML-based filters in OpenOffice.org" /> + xlink:title="Guide to implement XML-based filters in Apache OpenOffice" /> </component-description> <project-build-dependency>cppu</project-build-dependency> <project-build-dependency>cppuhelper</project-build-dependency> diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index fadf910be27e..ba592dff6cd5 100644 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -386,7 +386,7 @@ End ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \ ModuleID = modid; \ Subkey = STRING(CONCAT3(.,key,\OpenWithProgIDs)); \ - Name = STRING(CONCAT2(OpenOffice.org.,name)); \ + Name = STRING(CONCAT2(Apache OpenOffice.,name)); \ Value = " "; \ End @@ -395,7 +395,7 @@ End ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \ ModuleID = modid; \ Subkey = STRING(CONCAT3(.,key,\OpenWithProgIDs)); \ - Name = STRING(CONCAT2(OpenOffice.org.,name)); \ + Name = STRING(CONCAT2(Apache OpenOffice.,name)); \ Value = " "; \ End @@ -404,7 +404,7 @@ End ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \ ModuleID = gid_Module_Root_Reg_##name; \ Subkey = STRING(CONCAT2(.,key)); \ - Value = STRING(CONCAT2(OpenOffice.org.,name)); \ + Value = STRING(CONCAT2(Apache OpenOffice.,name)); \ ComponentCondition = STRING(CONCAT3(REGISTER_,cond,=1)); \ End @@ -412,7 +412,7 @@ End RegistryItem CONCAT2(gid_Regitem_Openoffice_,name) \ ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \ ModuleID = modid; \ - Subkey = STRING(CONCAT2(OpenOffice.org.,name)); \ + Subkey = STRING(CONCAT2(Apache OpenOffice.,name)); \ REG_VALUE_LNG(disp_name) \ End @@ -420,7 +420,7 @@ End RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Defaulticon) \ ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \ ModuleID = modid; \ - Subkey = STRING(CONCAT3(OpenOffice.org.,name,\DefaultIcon)); \ + Subkey = STRING(CONCAT3(Apache OpenOffice.,name,\DefaultIcon)); \ Value = "<progpath>\program\soffice.exe," STRING(icon_id); \ End @@ -428,7 +428,7 @@ End RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell) \ ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \ ModuleID = modid; \ - Subkey = STRING(CONCAT3(OpenOffice.org.,name,\shell)); \ + Subkey = STRING(CONCAT3(Apache OpenOffice.,name,\shell)); \ Value = STRING(default); \ End @@ -436,13 +436,13 @@ End RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_New) \ ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \ ModuleID = modid; \ - Subkey = STRING(CONCAT3(OpenOffice.org.,name,\shell\new)); \ + Subkey = STRING(CONCAT3(Apache OpenOffice.,name,\shell\new)); \ REG_VALUE_LNG(NEW) \ End \ RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_New_Command) \ ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \ ModuleID = modid; \ - Subkey = STRING(CONCAT3(OpenOffice.org.,name,\shell\new\command)); \ + Subkey = STRING(CONCAT3(Apache OpenOffice.,name,\shell\new\command)); \ Value = "\"<progpath>\program\\" STRING(app) "\" -n \"%1\""; \ End @@ -450,7 +450,7 @@ End RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_Open_Command) \ ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \ ModuleID = modid; \ - Subkey = STRING(CONCAT3(OpenOffice.org.,name,\shell\open\command)); \ + Subkey = STRING(CONCAT3(Apache OpenOffice.,name,\shell\open\command)); \ Value = "\"<progpath>\program\\" STRING(app) "\" -o \"%1\""; \ End @@ -458,7 +458,7 @@ End RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_Print_Command) \ ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \ ModuleID = modid; \ - Subkey = STRING(CONCAT3(OpenOffice.org.,name,\shell\print\command)); \ + Subkey = STRING(CONCAT3(Apache OpenOffice.,name,\shell\print\command)); \ Value = "\"<progpath>\program\\" STRING(app) "\" -p \"%1\""; \ End @@ -466,7 +466,7 @@ End RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_Printto_Command) \ ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \ ModuleID = modid; \ - Subkey = STRING(CONCAT3(OpenOffice.org.,name,\shell\printto\command)); \ + Subkey = STRING(CONCAT3(Apache OpenOffice.,name,\shell\printto\command)); \ Value = "\"<progpath>\program\\" STRING(app) "\" -pt \"%2\" \"%1\""; \ End @@ -476,7 +476,7 @@ End ModuleID = modid; \ Subkey = STRING(Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations); \ Name = STRING(CONCAT2(.,key)); \ - Value = STRING(CONCAT2(OpenOffice.org.,name)); \ + Value = STRING(CONCAT2(Apache OpenOffice.,name)); \ Styles = (); \ End @@ -486,7 +486,7 @@ End ModuleID = modid; \ Subkey = STRING(Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations); \ Name = STRING(CONCAT2(.,key)); \ - Value = STRING(CONCAT2(OpenOffice.org.,name)); \ + Value = STRING(CONCAT2(Apache OpenOffice.,name)); \ Styles = (); \ End diff --git a/scp2/source/ooo/installation_ooo.scp b/scp2/source/ooo/installation_ooo.scp index 85f49151ceca..b69b0058c7bc 100644 --- a/scp2/source/ooo/installation_ooo.scp +++ b/scp2/source/ooo/installation_ooo.scp @@ -30,9 +30,9 @@ Installation gid_Installation_Ooo OOoBaseVersion = "${OOOBASEVERSION}"; UserDirProductVersion = "${USERDIRPRODUCTVERSION}"; JavaVersion = "${JAVAVERSION}"; - SxwFormatName = "OpenOffice.org"; - SxwFormatVersion = "1.1"; - VendorName = "OpenOffice.org"; + SxwFormatName = "OpenOffice.org XML"; + SxwFormatVersion = "1.0"; + VendorName = "Apache OpenOffice"; #ifdef WNT DefaultDestPath = "<winprogpath>\${PRODUCTNAME}${PRODUCTVERSION}"; #else diff --git a/scp2/source/ooo/registryitem_ooo.scp b/scp2/source/ooo/registryitem_ooo.scp index f61e447543b2..87eba26057c0 100644 --- a/scp2/source/ooo/registryitem_ooo.scp +++ b/scp2/source/ooo/registryitem_ooo.scp @@ -218,7 +218,7 @@ RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Uninstall_Sta ModuleID = gid_Module_Root; Subkey = "Software\Microsoft\Windows\CurrentVersion\Uninstall\%PRODUCTNAME %PRODUCTVERSION"; Name = "Publisher"; - Value = "Sun Microsystems, Inc. for the OpenOffice.org-Community"; + Value = "Apache OpenOffice project community"; End RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Uninstall_Staroffice_Uninstallstring @@ -247,7 +247,7 @@ End RegistryItem gid_Regitem_Software_Openoffice_Productname_Productversion_Path ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; - Subkey = "Software\OpenOffice.org\%PRODUCTNAME\%PRODUCTVERSION"; + Subkey = "Software\Apache OpenOffice\%PRODUCTNAME\%PRODUCTVERSION"; ModuleID = gid_Module_Root; Name = "Path"; Value = "<progpath>\program\soffice.exe"; @@ -273,7 +273,7 @@ End RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Install ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; - Subkey = "Software\OpenOffice.org\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION"; + Subkey = "Software\Apache OpenOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION"; ModuleID = gid_Module_Root; Name = "INSTALLLOCATION"; Value = "[INSTALLLOCATION]"; @@ -318,7 +318,7 @@ End RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Officeinstall ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; - Subkey = "Software\OpenOffice.org\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION"; + Subkey = "Software\Apache OpenOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION"; ModuleID = gid_Module_Root; Name = "OFFICEINSTALLLOCATION"; Value = "[INSTALLLOCATION]"; @@ -345,7 +345,7 @@ End RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Basisinstall ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; - Subkey = "Software\OpenOffice.org\${REGISTRYLAYERNAME}\Basis\%OOOBASEVERSION"; + Subkey = "Software\Apache OpenOffice\${REGISTRYLAYERNAME}\Basis\%OOOBASEVERSION"; ModuleID = gid_Module_Root; Name = "BASISINSTALLLOCATION"; Value = "[INSTALLLOCATION]Basis\\"; @@ -354,7 +354,7 @@ End RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Basisinstall ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; - Subkey = "Software\OpenOffice.org\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION"; + Subkey = "Software\Apache OpenOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION"; ModuleID = gid_Module_Root; Name = "BASISINSTALLLOCATION"; Value = "[INSTALLLOCATION]Basis\\"; @@ -381,7 +381,7 @@ End RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Ureinstall ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; - Subkey = "Software\OpenOffice.org\${REGISTRYLAYERNAME}\URE\%URELAYERVERSION"; + Subkey = "Software\Apache OpenOffice\${REGISTRYLAYERNAME}\URE\%URELAYERVERSION"; ModuleID = gid_Module_Root; Name = "UREINSTALLLOCATION"; Value = "[INSTALLLOCATION]URE\\"; @@ -390,7 +390,7 @@ End RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Ureinstall ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; - Subkey = "Software\OpenOffice.org\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION"; + Subkey = "Software\Apache OpenOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION"; ModuleID = gid_Module_Root; Name = "UREINSTALLLOCATION"; Value = "[INSTALLLOCATION]URE\\"; @@ -513,14 +513,14 @@ End RegistryItem gid_Regitem_Software_Openofficeorg_Uno_Installpath ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; - Subkey = "Software\OpenOffice.org\UNO\InstallPath"; + Subkey = "Software\Apache OpenOffice\UNO\InstallPath"; ModuleID = gid_Module_Root; Value = "<progpath>\program"; End RegistryItem gid_Regitem_Software_Openofficeorg_Uno_Installpath_Branded ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; - Subkey = "Software\OpenOffice.org\UNO\InstallPath"; + Subkey = "Software\Apache OpenOffice\UNO\InstallPath"; ModuleID = gid_Module_Root; Name = "%PRODUCTNAME %PRODUCTVERSION"; Value = "<progpath>\program"; diff --git a/scp2/source/ooo/registryitem_ooo.ulf b/scp2/source/ooo/registryitem_ooo.ulf index 76ac98e36853..b20fb2416a00 100644 --- a/scp2/source/ooo/registryitem_ooo.ulf +++ b/scp2/source/ooo/registryitem_ooo.ulf @@ -28,10 +28,10 @@ en-US = "&New" en-US = "&Install" [STR_REG_VAL_SO60_CONFIGFILE] -en-US = "%SXWFORMATNAME %SXWFORMATVERSION Configuration File" +en-US = "OpenOffice.org 1.1 Configuration File" [STR_REG_VAL_SO50_TEMPLATE_OOO] en-US = "StarOffice 5.0 Template" [STR_REG_VAL_APPCAPABILITY_DESCRIPTION_OOO] -en-US = "OpenOffice.org" +en-US = "office productivity suite based on Apache OpenOffice project" diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index b32baf9859b7..3aac69b9deff 100644 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -1316,7 +1316,7 @@ End RegistryItem gid_Regitem_Path ModuleID = gid_Module_Root; ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - Subkey = "Software\OpenOffice.org\%PRODUCTNAME"; + Subkey = "Software\Apache OpenOffice\%PRODUCTNAME"; Name = "Path"; Value = "[INSTALLLOCATION]"; End diff --git a/scp2/source/ooo/ure_standalone.scp b/scp2/source/ooo/ure_standalone.scp index 4c34cae3a20e..2c65ada2558e 100644 --- a/scp2/source/ooo/ure_standalone.scp +++ b/scp2/source/ooo/ure_standalone.scp @@ -38,9 +38,9 @@ End Directory gid_Dir_Ooo_Openofficeorg ParentID = PREDEFINED_PROGDIR; #ifdef WNT - HostName = "OpenOffice.org"; + HostName = "Apache OpenOffice"; #else - HostName = "openoffice.org"; + HostName = "apacheopenoffice"; #endif Styles = (ISINSTALLLOCATION); End diff --git a/scp2/source/quickstart/registryitem_quickstart.scp b/scp2/source/quickstart/registryitem_quickstart.scp index 5ac2d1af4fba..804094bb7401 100644 --- a/scp2/source/quickstart/registryitem_quickstart.scp +++ b/scp2/source/quickstart/registryitem_quickstart.scp @@ -25,7 +25,7 @@ RegistryItem gid_Regitem_Software_OpenOffice_Quickstarterinstalled ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; - Subkey = "Software\OpenOffice.org"; + Subkey = "Software\Apache OpenOffice"; ModuleID = gid_Module_Optional_Quickstart; Name = "QuickStarterInstalled"; Value = "1"; diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp index 13750d24f920..968dd35a26cb 100644 --- a/scp2/source/sdkoo/sdkoo.scp +++ b/scp2/source/sdkoo/sdkoo.scp @@ -53,22 +53,14 @@ End #ifndef WNT Directory gid_Dir_Ooo_Openofficeorg_Sdk ParentID = PREDEFINED_PROGDIR; - #ifdef WNT - HostName = "${BASISROOTNAME}"; - #else HostName = "${UNIXBASISROOTNAME}"; - #endif End #endif #ifndef WNT Directory gid_Dir_Ooo_Basis_Sdk ParentID = gid_Dir_Ooo_Openofficeorg_Sdk; - #ifdef WNT - HostName = "Basis ${OOOBASEVERSION}"; - #else HostName = "basis${OOOBASEVERSION}"; - #endif Styles = (BASISDIRECTORY); End #endif @@ -78,8 +70,7 @@ End Directory gid_Dir_Basis_Sdk #if defined MACOSX ParentID = PREDEFINED_PROGDIR; - // DosName = "OpenOffice.org${OOOBASEVERSION}_SDK"; - DosName = "OpenOffice.org_SDK"; + DosName = "Apache_OpenOffice_SDK"; #else #if defined WNT ParentID = gid_Dir_Sdkoo_Root; diff --git a/scp2/source/winexplorerext/registryitem_winexplorerext.scp b/scp2/source/winexplorerext/registryitem_winexplorerext.scp index ce51acd82ef9..b1938c87761e 100644 --- a/scp2/source/winexplorerext/registryitem_winexplorerext.scp +++ b/scp2/source/winexplorerext/registryitem_winexplorerext.scp @@ -77,8 +77,8 @@ RegistryItem gid_Regitem_Folder_shellex_ColumnHandlers_C52AF81D_F7A0_4AAB_8E87_F ModuleID = gid_Module_Optional_Winexplorerext; Styles = (X64); Subkey = "Folder\shellex\ColumnHandlers\{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}"; - Value = "OpenOffice.org Column Handler"; - Val64 = "OpenOffice.org Column Handler"; + Value = "Apache OpenOffice Column Handler"; + Val64 = "Apache OpenOffice Column Handler"; End RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer32 @@ -108,8 +108,6 @@ RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262 ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Root; Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}"; -// Better?: "OpenOffice.org Format Filter" -// old: Value = "opendocument.org Filter"; Styles = (X64_ONLY); // Values: X64 Value = "OpenDocument Format Filter"; Val64 = "OpenDocument Format Filter"; @@ -138,8 +136,6 @@ RegistryItem gid_Regitem_Clsid_7BC0E713_5703_45BE_A29D_5D46D8B39262 ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Root; Subkey = "CLSID\{7BC0E713-5703-45BE-A29D-5D46D8B39262}"; -//? Better: "OpenOffice.org Persistent Handler" -// old: Value = "opendocument.org Persistent Handler"; Styles = (X64); // Values: X64 Value = "OpenDocument Format Persistent Handler"; Val64 = "OpenDocument Format Persistent Handler"; diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk index d767fc172d53..4fdcf700af3d 100644 --- a/scp2/util/makefile.mk +++ b/scp2/util/makefile.mk @@ -187,7 +187,7 @@ SCP1FILES += \ .ENDIF # ------------------------------------------------------------------------ -# OpenOffice.org with JRE +# Apache OpenOffice with JRE SCP2LINK_PRODUCT_TYPE=osl SCP2TARGET = setup_osljre diff --git a/setup_native/scripts/langpackscript.sh b/setup_native/scripts/langpackscript.sh index 61e7bc169081..6bd51f3420cc 100644 --- a/setup_native/scripts/langpackscript.sh +++ b/setup_native/scripts/langpackscript.sh @@ -80,7 +80,7 @@ SunOS) ;; Linux) SEARCHPACKAGENAME="BASISPACKAGEPREFIXPLACEHOLDEROOOBASEVERSIONPLACEHOLDER-core01" - FIXPATH="/openoffice.org" + FIXPATH="/apachopenoffice" echo echo "Searching for the FULLPRODUCTNAMELONGPLACEHOLDER installation ..." RPMNAME=`rpm -qa | grep $SEARCHPACKAGENAME` diff --git a/setup_native/scripts/update.sh b/setup_native/scripts/update.sh index 14a75484d991..91c5929b4ad0 100644 --- a/setup_native/scripts/update.sh +++ b/setup_native/scripts/update.sh @@ -58,7 +58,7 @@ make_tempfile() { # run_in_terminal () { - TMPCMD=`make_tempfile 'OpenOffice.org-Online-Update'` + TMPCMD=`make_tempfile 'Apache_OpenOffice-Online-Update'` cat >> $TMPCMD @@ -119,7 +119,7 @@ elevate() { update_pkg() { - ADMINFILE=`make_tempfile 'OpenOffice.org-Online-Update-admin'` + ADMINFILE=`make_tempfile 'Apache_OpenOffice-Online-Update-admin'` cat >> $ADMINFILE << EOF action=nocheck diff --git a/setup_native/source/opensolaris/bundledextensions/README b/setup_native/source/opensolaris/bundledextensions/README index f64c225d9df9..40a408cf539d 100644 --- a/setup_native/source/opensolaris/bundledextensions/README +++ b/setup_native/source/opensolaris/bundledextensions/README @@ -9,7 +9,7 @@ installed ooo_bundled_extensions.xml svc-ooo_bundled_extensions -are part of the OpenOffice.org IPS package. They must be added to the package +are part of the Apache OpenOffice IPS package. They must be added to the package after all other files have been added. Those other files are the SVR4 packages of OOo which can be imported by pkg (pkg import). The files have to be uploaded this way: @@ -26,7 +26,7 @@ bundled extensions. This path changes with every major release of OOo because of the version number which is part of a folder name. The current value is: -EXTENSIONPATH=/opt/openoffice.org3/share/extension/install +EXTENSIONPATH=/opt/apacheopenoffice3/share/extension/install The service was tested with OpenSolaris release 2009.6 and may not work with a previous release. @@ -38,7 +38,7 @@ What do these files do The three files constitute a SMF service. When this service is started, then it installes the bundled extensions which are contained in -/opt/openoffice.org3/share/extension/install. To install them, the service calls +/opt/apacheopenoffice3/share/extension/install. To install them, the service calls "unopkg add --shared ..." with the appropriate arguments. The service is started initially after the installation of @@ -58,7 +58,7 @@ file in every release. Otherwise IPS would not replace the installed version of The update procedure of OOo will replace 'installed'. 'installed' is associated with a restart_fmri of the service ooo_bundled_extensions. That is after copying 'installed' the service will be restarted. It then installes all -extensions contained in /opt/openoffice.org3/share/extension/install, because +extensions contained in /opt/apacheopenoffice3/share/extension/install, because the newly installed 'installed' file does not contain any entries yet, except for the version string. diff --git a/setup_native/source/opensolaris/bundledextensions/ooo_bundled_extensions.xml b/setup_native/source/opensolaris/bundledextensions/ooo_bundled_extensions.xml index 5932c73f77fb..614058c0117b 100644 --- a/setup_native/source/opensolaris/bundledextensions/ooo_bundled_extensions.xml +++ b/setup_native/source/opensolaris/bundledextensions/ooo_bundled_extensions.xml @@ -71,7 +71,7 @@ <template> <common_name> <loctext xml:lang="C"> - Installation of OpenOffice.org's bundled extensions. + Installation of Apache OpenOffice's bundled extensions. </loctext> </common_name> </template> diff --git a/setup_native/source/opensolaris/bundledextensions/svc-ooo_bundled_extensions b/setup_native/source/opensolaris/bundledextensions/svc-ooo_bundled_extensions index 142043dcf887..4cba1598e73b 100644 --- a/setup_native/source/opensolaris/bundledextensions/svc-ooo_bundled_extensions +++ b/setup_native/source/opensolaris/bundledextensions/svc-ooo_bundled_extensions @@ -49,11 +49,11 @@ #Create the folder which contains the temporary user installation INSTDIR=`/usr/bin/mktemp -d "/tmp/userinstall.XXXXXX"` -OOO_BASE_DIR="/opt/openoffice.org/basis${OOOBASEVERSION}" +OOO_BASE_DIR="/opt/apacheopenoffice/basis${OOOBASEVERSION}" case "$1" in 'start') - EXTENSIONDIR=/opt/openoffice.org${OOOBRANDPACKAGEVERSION}/share/extension/install + EXTENSIONDIR=/opt/apacheopenoffice${OOOBRANDPACKAGEVERSION}/share/extension/install for FILE in $EXTENSIONDIR/*.oxt do #We check if the file exist, because if there is no extension @@ -70,7 +70,7 @@ case "$1" in #list. That is, it has not been installed (with unopkg) yet. #Therefore we do it now. echo installing $FILE - /opt/openoffice.org${OOOBRANDPACKAGEVERSION}/program/unopkg add --shared --bundled "$FILE" '-env:UserInstallation=file://$INSTDIR' '-env:UNO_JAVA_JFW_INSTALL_DATA=$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1' + /opt/apacheopenoffice${OOOBRANDPACKAGEVERSION}/program/unopkg add --shared --bundled "$FILE" '-env:UserInstallation=file://$INSTDIR' '-env:UNO_JAVA_JFW_INSTALL_DATA=$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1' #Let us remember that this extensions has been installed #by adding the path name of the extension to the file #installed @@ -98,7 +98,7 @@ case "$1" in # #share/extension/install. Now we remove the installed # #extension # echo removing `basename $LINE` -# /opt/openoffice.org${OOOBRANDPACKAGEVERSION}/program/unopkg remove --shared --bundled "`basename $LINE`" '-env:UserInstallation=file://$INSTDIR' '-env:UNO_JAVA_JFW_INSTALL_DATA=$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1' +# /opt/apacheopenoffice${OOOBRANDPACKAGEVERSION}/program/unopkg remove --shared --bundled "`basename $LINE`" '-env:UserInstallation=file://$INSTDIR' '-env:UNO_JAVA_JFW_INSTALL_DATA=$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1' # REMOVED=1 # else # NEWCONTENT+=$LINE diff --git a/setup_native/source/packinfo/package_names.txt b/setup_native/source/packinfo/package_names.txt index 7e7276c2fa40..45deaaa63fe0 100644 --- a/setup_native/source/packinfo/package_names.txt +++ b/setup_native/source/packinfo/package_names.txt @@ -1,46 +1,46 @@ -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING Language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-base Base language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-binfilter Legacy filters (e.g. StarOffice 5.2) for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-calc Calc language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-draw Draw language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-fonts Language fonts module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-help Language help module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-impress Impress language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-math Math language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-onlineupd Online update language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-res Language resource module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-writer Writer language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-activex ActiveX control for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-base Base module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-binfilter Legacy filters (e.g. StarOffice 5.2) for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-calc Calc module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 Core module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 Office core module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 Office core module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 Office core module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 Office core module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 Office core module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 Office core module for OpenOffice.org %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING Language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-base Base language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-binfilter Legacy filters (e.g. StarOffice 5.2) for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-calc Calc language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-draw Draw language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-fonts Language fonts module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-help Language help module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-impress Impress language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-math Math language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-onlineupd Online update language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-res Language resource module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-writer Writer language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-activex ActiveX control for %APACHEPROJECTNAME %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-base Base module for %APACHEPROJECTNAME%OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-binfilter Legacy filters (e.g. StarOffice 5.2) for %APACHEPROJECTNAME %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-calc Calc module for %APACHEPROJECTNAME %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 Core module for %APACHEPROJECTNAME %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 Office core module for %APACHEPROJECTNAME %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 Office core module for %APACHEPROJECTNAME %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 Office core module for %APACHEPROJECTNAME %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 Office core module for %APACHEPROJECTNAME %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 Office core module for %APACHEPROJECTNAME %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 Office core module for %APACHEPROJECTNAME %OOOBASEVERSION %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-dict-gl Gl dictionary for %PRODUCTNAME %PRODUCTVERSION %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-dict-vi Vietnamese dictionary for %PRODUCTNAME %PRODUCTVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-draw Draw module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-emailmerge Email mailmerge module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-gnome-integratn Gnome integration module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-graphicfilter Graphic filter module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-headless Headless display module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-images Images module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-impress Impress module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-javafilter Java filter module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-kde-integration KDE integration module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-math Math module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-onlineupdate Online update modul for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-ooofonts Mailcap module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-ooolinguistic Linguistic module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-pyuno Pyuno module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-spellcheck English spellchecker module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-testtool Testtool module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-writer Writer module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-xsltfilter XSLT filter samples module for OpenOffice.org %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-draw Draw module for %APACHEPROJECTNAME %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-emailmerge Email mailmerge module for %APACHEPROJECTNAME %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-gnome-integratn Gnome integration module for %APACHEPROJECTNAME %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-graphicfilter Graphic filter module for %APACHEPROJECTNAME %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-headless Headless display module for %APACHEPROJECTNAME %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-images Images module for %APACHEPROJECTNAME %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-impress Impress module for %APACHEPROJECTNAME %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-javafilter Java filter module for %APACHEPROJECTNAME %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-kde-integration KDE integration module for %APACHEPROJECTNAME %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-math Math module for %APACHEPROJECTNAME %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-onlineupdate Online update modul for %APACHEPROJECTNAME %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-ooofonts Mailcap module for %APACHEPROJECTNAME %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-ooolinguistic Linguistic module for %APACHEPROJECTNAME %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-pyuno Pyuno module for %APACHEPROJECTNAME %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-spellcheck English spellchecker module for %APACHEPROJECTNAME %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-testtool Testtool module for %APACHEPROJECTNAME %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-writer Writer module for %APACHEPROJECTNAME %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-xsltfilter XSLT filter samples module for %APACHEPROJECTNAME %OOOBASEVERSION %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-af Af dictionary for %PRODUCTNAME %PRODUCTVERSION %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-cs Cs dictionary for %PRODUCTNAME %PRODUCTVERSION %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-da Da dictionary for %PRODUCTNAME %PRODUCTVERSION diff --git a/setup_native/source/packinfo/packinfo_office.txt b/setup_native/source/packinfo/packinfo_office.txt index 75328226117d..040014d6614a 100644 --- a/setup_native/source/packinfo/packinfo_office.txt +++ b/setup_native/source/packinfo/packinfo_office.txt @@ -48,7 +48,7 @@ findrequires = "find-requires-gnome.sh" copyright = "2012 by The Apache Software Foundation" solariscopyright = "solariscopyrightfile" vendor = "Apache Software Foundation" -description = "Gnome integration module for OpenOffice.org %OOOBASEVERSION" +description = "Gnome integration module for %APACHEPROJECTNAME %OOOBASEVERSION" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" End @@ -63,7 +63,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" copyright = "2012 by The Apache Software Foundation" solariscopyright = "solariscopyrightfile" vendor = "Apache Software Foundation" -description = "KDE integration module for OpenOffice.org %OOOBASEVERSION" +description = "KDE integration module for %APACHEPROJECTNAME %OOOBASEVERSION" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" End @@ -79,7 +79,7 @@ freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX copyright = "2012 by The Apache Software Foundation" solariscopyright = "solariscopyrightfile" vendor = "Apache Software Foundation" -description = "Core module for OpenOffice.org %OOOBASEVERSION" +description = "Core module for %APACHEPROJECTNAME %OOOBASEVERSION" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" End @@ -95,7 +95,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" copyright = "2012 by The Apache Software Foundation" solariscopyright = "solariscopyrightfile" vendor = "Apache Software Foundation" -description = "Writer module for OpenOffice.org %OOOBASEVERSION" +description = "Writer module for %APACHEPROJECTNAME %OOOBASEVERSION" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" End @@ -111,7 +111,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" copyright = "2012 by The Apache Software Foundation" solariscopyright = "solariscopyrightfile" vendor = "Apache Software Foundation" -description = "Calc module for OpenOffice.org %OOOBASEVERSION" +description = "Calc module for %APACHEPROJECTNAME %OOOBASEVERSION" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" End @@ -127,7 +127,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" copyright = "2012 by The Apache Software Foundation" solariscopyright = "solariscopyrightfile" vendor = "Apache Software Foundation" -description = "Draw module for OpenOffice.org %OOOBASEVERSION" +description = "Draw module for %APACHEPROJECTNAME %OOOBASEVERSION" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" End @@ -143,7 +143,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" copyright = "2012 by The Apache Software Foundation" solariscopyright = "solariscopyrightfile" vendor = "Apache Software Foundation" -description = "Impress module for OpenOffice.org %OOOBASEVERSION" +description = "Impress module for %APACHEPROJECTNAME %OOOBASEVERSION" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" End @@ -159,7 +159,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" copyright = "2012 by The Apache Software Foundation" solariscopyright = "solariscopyrightfile" vendor = "Apache Software Foundation" -description = "Base module for OpenOffice.org %OOOBASEVERSION" +description = "Base module for %APACHEPROJECTNAME %OOOBASEVERSION" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" End @@ -175,7 +175,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" copyright = "2012 by The Apache Software Foundation" solariscopyright = "solariscopyrightfile" vendor = "Apache Software Foundation" -description = "Math module for OpenOffice.org %OOOBASEVERSION" +description = "Math module for %APACHEPROJECTNAME %OOOBASEVERSION" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" End @@ -190,7 +190,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" copyright = "2012 by The Apache Software Foundation" solariscopyright = "solariscopyrightfile" vendor = "Apache Software Foundation" -description = "Legacy filters (e.g. StarOffice 5.2) for OpenOffice.org %OOOBASEVERSION" +description = "Legacy filters (e.g. StarOffice 5.2) for %APACHEPROJECTNAME %OOOBASEVERSION" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" End @@ -205,7 +205,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" copyright = "2012 by The Apache Software Foundation" solariscopyright = "solariscopyrightfile" vendor = "Apache Software Foundation" -description = "Graphic filter module for OpenOffice.org %OOOBASEVERSION" +description = "Graphic filter module for %APACHEPROJECTNAME %OOOBASEVERSION" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" End @@ -220,7 +220,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" copyright = "2012 by The Apache Software Foundation" solariscopyright = "solariscopyrightfile" vendor = "Apache Software Foundation" -description = "Usage tracking module for OpenOffice.org %OOOBASEVERSION" +description = "Usage tracking module for %APACHEPROJECTNAME %OOOBASEVERSION" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" End @@ -235,7 +235,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" copyright = "2012 by The Apache Software Foundation" solariscopyright = "solariscopyrightfile" vendor = "Apache Software Foundation" -description = "Testtool module for OpenOffice.org %OOOBASEVERSION" +description = "Testtool module for %APACHEPROJECTNAME %OOOBASEVERSION" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" End @@ -250,7 +250,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" copyright = "2012 by The Apache Software Foundation" solariscopyright = "solariscopyrightfile" vendor = "Apache Software Foundation" -description = "English spellchecker module for OpenOffice.org %OOOBASEVERSION" +description = "English spellchecker module for %APACHEPROJECTNAME %OOOBASEVERSION" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" End @@ -265,7 +265,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" copyright = "2012 by The Apache Software Foundation" solariscopyright = "solariscopyrightfile" vendor = "Apache Software Foundation" -description = "XSLT filter samples module for OpenOffice.org %OOOBASEVERSION" +description = "XSLT filter samples module for %APACHEPROJECTNAME %OOOBASEVERSION" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" End @@ -280,7 +280,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" copyright = "2012 by The Apache Software Foundation" solariscopyright = "solariscopyrightfile" vendor = "Apache Software Foundation" -description = "Java filter module for OpenOffice.org %OOOBASEVERSION" +description = "Java filter module for %APACHEPROJECTNAME %OOOBASEVERSION" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" End @@ -295,7 +295,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" copyright = "2012 by The Apache Software Foundation" solariscopyright = "solariscopyrightfile" vendor = "Apache Software Foundation" -description = "ActiveX control for OpenOffice.org %OOOBASEVERSION" +description = "ActiveX control for %APACHEPROJECTNAME %OOOBASEVERSION" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" End @@ -309,7 +309,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" copyright = "2012 by The Apache Software Foundation" solariscopyright = "solariscopyrightfile" vendor = "Apache Software Foundation" -description = "Online update modul for OpenOffice.org %OOOBASEVERSION" +description = "Online update modul for %APACHEPROJECTNAME %OOOBASEVERSION" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" End @@ -324,7 +324,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" copyright = "2012 by The Apache Software Foundation" solariscopyright = "solariscopyrightfile" vendor = "Apache Software Foundation" -description = "Pyuno module for OpenOffice.org %OOOBASEVERSION" +description = "Pyuno module for %APACHEPROJECTNAME %OOOBASEVERSION" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" End @@ -339,7 +339,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-pyuno" copyright = "2012 by The Apache Software Foundation" solariscopyright = "solariscopyrightfile" vendor = "Apache Software Foundation" -description = "Email mailmerge module for OpenOffice.org %OOOBASEVERSION" +description = "Email mailmerge module for %APACHEPROJECTNAME %OOOBASEVERSION" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" End @@ -354,7 +354,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" copyright = "2012 by The Apache Software Foundation" solariscopyright = "solariscopyrightfile" vendor = "Apache Software Foundation" -description = "Headless display module for OpenOffice.org %OOOBASEVERSION" +description = "Headless display module for %APACHEPROJECTNAME %OOOBASEVERSION" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" End @@ -369,7 +369,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" copyright = "2012 by The Apache Software Foundation" solariscopyright = "solariscopyrightfile" vendor = "Apache Software Foundation" -description = "Images module for OpenOffice.org %OOOBASEVERSION" +description = "Images module for %APACHEPROJECTNAME %OOOBASEVERSION" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" End @@ -384,7 +384,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" copyright = "2012 by The Apache Software Foundation" solariscopyright = "solariscopyrightfile" vendor = "Apache Software Foundation" -description = "Mailcap module for OpenOffice.org %OOOBASEVERSION" +description = "Mailcap module for %APACHEPROJECTNAME %OOOBASEVERSION" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" End @@ -399,7 +399,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" copyright = "2012 by The Apache Software Foundation" solariscopyright = "solariscopyrightfile" vendor = "Apache Software Foundation" -description = "Linguistic module for OpenOffice.org %OOOBASEVERSION" +description = "Linguistic module for %APACHEPROJECTNAME %OOOBASEVERSION" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" End @@ -415,7 +415,7 @@ freebsdrequires = "" copyright = "2012 by The Apache Software Foundation" solariscopyright = "solariscopyrightfile" vendor = "Apache Software Foundation" -description = "Office core module for OpenOffice.org %OOOBASEVERSION" +description = "Office core module for %APACHEPROJECTNAME %OOOBASEVERSION" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" End @@ -430,7 +430,7 @@ freebsdrequires = "" copyright = "2012 by The Apache Software Foundation" solariscopyright = "solariscopyrightfile" vendor = "Apache Software Foundation" -description = "Office core module for OpenOffice.org %OOOBASEVERSION" +description = "Office core module for %APACHEPROJECTNAME %OOOBASEVERSION" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" End @@ -446,7 +446,7 @@ freebsdrequires = "" copyright = "2012 by The Apache Software Foundation" solariscopyright = "solariscopyrightfile" vendor = "Apache Software Foundation" -description = "Office core module for OpenOffice.org %OOOBASEVERSION" +description = "Office core module for %APACHEPROJECTNAME %OOOBASEVERSION" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" End @@ -461,7 +461,7 @@ freebsdrequires = "" copyright = "2012 by The Apache Software Foundation" solariscopyright = "solariscopyrightfile" vendor = "Apache Software Foundation" -description = "Office core module for OpenOffice.org %OOOBASEVERSION" +description = "Office core module for %APACHEPROJECTNAME %OOOBASEVERSION" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" End @@ -476,7 +476,7 @@ freebsdrequires = "" copyright = "2012 by The Apache Software Foundation" solariscopyright = "solariscopyrightfile" vendor = "Apache Software Foundation" -description = "Office core module for OpenOffice.org %OOOBASEVERSION" +description = "Office core module for %APACHEPROJECTNAME %OOOBASEVERSION" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" End @@ -491,7 +491,7 @@ freebsdrequires = "" copyright = "2012 by The Apache Software Foundation" solariscopyright = "solariscopyrightfile" vendor = "Apache Software Foundation" -description = "Office core module for OpenOffice.org %OOOBASEVERSION" +description = "Office core module for %APACHEPROJECTNAME %OOOBASEVERSION" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" End @@ -1035,7 +1035,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-impress" copyright = "2012 by The Apache Software Foundation" solariscopyright = "solariscopyrightfile" vendor = "Apache Software Foundation" -description = "OpenGL slide transitions module for OpenOffice.org %OOOBASEVERSION" +description = "OpenGL slide transitions module for %APACHEPROJECTNAME %OOOBASEVERSION" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" End diff --git a/setup_native/source/packinfo/packinfo_office_lang.txt b/setup_native/source/packinfo/packinfo_office_lang.txt index 204f909c501e..fb4bb67a61c6 100644 --- a/setup_native/source/packinfo/packinfo_office_lang.txt +++ b/setup_native/source/packinfo/packinfo_office_lang.txt @@ -47,7 +47,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" copyright = "2012 by The Apache Software Foundation" solariscopyright = "solariscopyrightfile" vendor = "Apache Software Foundation" -description = "Language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING" +description = "Language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01" @@ -63,7 +63,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING" copyright = "2012 by The Apache Software Foundation" solariscopyright = "solariscopyrightfile" vendor = "Apache Software Foundation" -description = "Language fonts module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING" +description = "Language fonts module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01" @@ -79,7 +79,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING" copyright = "2012 by The Apache Software Foundation" solariscopyright = "solariscopyrightfile" vendor = "Apache Software Foundation" -description = "Language resource module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING" +description = "Language resource module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01" @@ -95,7 +95,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING" copyright = "2012 by The Apache Software Foundation" solariscopyright = "solariscopyrightfile" vendor = "Apache Software Foundation" -description = "Language help module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING" +description = "Language help module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01" @@ -111,7 +111,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING" copyright = "2012 by The Apache Software Foundation" solariscopyright = "solariscopyrightfile" vendor = "Apache Software Foundation" -description = "Writer language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING" +description = "Writer language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-writer" @@ -127,7 +127,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING" copyright = "2012 by The Apache Software Foundation" solariscopyright = "solariscopyrightfile" vendor = "Apache Software Foundation" -description = "Calc language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING" +description = "Calc language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-calc" @@ -143,7 +143,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING" copyright = "2012 by The Apache Software Foundation" solariscopyright = "solariscopyrightfile" vendor = "Apache Software Foundation" -description = "Impress language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING" +description = "Impress language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-impress" @@ -159,7 +159,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING" copyright = "2012 by The Apache Software Foundation" solariscopyright = "solariscopyrightfile" vendor = "Apache Software Foundation" -description = "Draw language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING" +description = "Draw language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-draw" @@ -175,7 +175,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING" copyright = "2012 by The Apache Software Foundation" solariscopyright = "solariscopyrightfile" vendor = "Apache Software Foundation" -description = "Math language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING" +description = "Math language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-math" @@ -191,7 +191,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING" copyright = "2012 by The Apache Software Foundation" solariscopyright = "solariscopyrightfile" vendor = "Apache Software Foundation" -description = "Base language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING" +description = "Base language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-base" @@ -207,7 +207,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING" copyright = "2012 by The Apache Software Foundation" solariscopyright = "solariscopyrightfile" vendor = "Apache Software Foundation" -description = "Legacy filters (e.g. StarOffice 5.2) for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING" +description = "Legacy filters (e.g. StarOffice 5.2) for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-binfilter" @@ -223,7 +223,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING" copyright = "2012 by The Apache Software Foundation" solariscopyright = "solariscopyrightfile" vendor = "Apache Software Foundation" -description = "Online update language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING" +description = "Online update language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-onlineupdate" diff --git a/setup_native/source/packinfo/packinfo_sdkoo.txt b/setup_native/source/packinfo/packinfo_sdkoo.txt index 8de7a0eb4035..e91440da75c2 100644 --- a/setup_native/source/packinfo/packinfo_sdkoo.txt +++ b/setup_native/source/packinfo/packinfo_sdkoo.txt @@ -29,7 +29,7 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" copyright = "2012 by The Apache Software Foundation" solariscopyright = "solariscopyrightfile" vendor = "Apache Software Foundation" -description = "Software Development Kit for OpenOffice.org %OOOBASEVERSION" +description = "Software Development Kit for %APACHEPROJECTNAME %OOOBASEVERSION" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" End diff --git a/setup_native/source/packinfo/shellscripts_brand.txt b/setup_native/source/packinfo/shellscripts_brand.txt index 10917d83287d..aa215a4ebb38 100644 --- a/setup_native/source/packinfo/shellscripts_brand.txt +++ b/setup_native/source/packinfo/shellscripts_brand.txt @@ -29,12 +29,12 @@ END platform=`uname -s` case $$platform in SunOS) - BASISPACKAGE=openofficeorg-core01 + BASISPACKAGE=apacheopenoffice-core01 BASISDIR=`pkginfo -r $$BASISPACKAGE` PRODUCTINSTALLLOCATION="$$BASEDIR" ;; Linux) - BASISPACKAGE=openoffice.org-core01 + BASISPACKAGE=apacheopenoffice-core01 BASISDIR=`rpm -q --queryformat "%{INSTALLPREFIX}" $$BASISPACKAGE` PRODUCTINSTALLLOCATION="$$RPM_INSTALL_PREFIX" ;; @@ -44,11 +44,11 @@ Linux) esac # creating link to basis layer -if [ -d $$BASISDIR/openoffice.org/basisBASISDIRECTORYVERSION ] +if [ -d $$BASISDIR/apacheopenoffice/basisBASISDIRECTORYVERSION ] then - ln -s $$BASISDIR/openoffice.org/basisBASISDIRECTORYVERSION $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/basis-link >/dev/null 2>&1 + ln -s $$BASISDIR/apacheopenoffice/basisBASISDIRECTORYVERSION $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/basis-link >/dev/null 2>&1 else - ln -s ../openoffice.org/basisBASISDIRECTORYVERSION $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/basis-link >/dev/null 2>&1 + ln -s ../apacheopenoffice/basisBASISDIRECTORYVERSION $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/basis-link >/dev/null 2>&1 fi exit 0 diff --git a/setup_native/source/packinfo/shellscripts_core01.txt b/setup_native/source/packinfo/shellscripts_core01.txt index 11a02a79c80c..c070ed691a4e 100644 --- a/setup_native/source/packinfo/shellscripts_core01.txt +++ b/setup_native/source/packinfo/shellscripts_core01.txt @@ -44,11 +44,11 @@ Linux) esac # creating link to ure -if [ -d $$UREDIR/openoffice.org/ure ] +if [ -d $$UREDIR/apacheopenoffice/ure ] then - ln -s $$UREDIR/openoffice.org/ure $$PRODUCTINSTALLLOCATION/openoffice.org/basisBASISDIRECTORYVERSION/ure-link >/dev/null 2>&1 + ln -s $$UREDIR/apacheopenoffice/ure $$PRODUCTINSTALLLOCATION/apacheopenoffice/basisBASISDIRECTORYVERSION/ure-link >/dev/null 2>&1 else - ln -s ../ure $$PRODUCTINSTALLLOCATION/openoffice.org/basisBASISDIRECTORYVERSION/ure-link >/dev/null 2>&1 + ln -s ../ure $$PRODUCTINSTALLLOCATION/apacheopenoffice/basisBASISDIRECTORYVERSION/ure-link >/dev/null 2>&1 fi exit 0 @@ -80,11 +80,11 @@ Linux) ;; esac -if [ -h $$PRODUCTINSTALLLOCATION/openoffice.org/basisBASISDIRECTORYVERSION/ure-link -a $$LASTUNINSTALL -eq 1 ] +if [ -h $$PRODUCTINSTALLLOCATION/apacheopenoffice/basisBASISDIRECTORYVERSION/ure-link -a $$LASTUNINSTALL -eq 1 ] then - rm -f $$PRODUCTINSTALLLOCATION/openoffice.org/basisBASISDIRECTORYVERSION/ure-link 2>/dev/null - rmdir $$PRODUCTINSTALLLOCATION/openoffice.org/basisBASISDIRECTORYVERSION 2>/dev/null - rmdir $$PRODUCTINSTALLLOCATION/openoffice.org 2>/dev/null + rm -f $$PRODUCTINSTALLLOCATION/apacheopenoffice/basisBASISDIRECTORYVERSION/ure-link 2>/dev/null + rmdir $$PRODUCTINSTALLLOCATION/apacheopenoffice/basisBASISDIRECTORYVERSION 2>/dev/null + rmdir $$PRODUCTINSTALLLOCATION/apacheopenoffice 2>/dev/null fi exit 0 diff --git a/setup_native/source/win32/customactions/languagepacks/lngpckinsthelper.cxx b/setup_native/source/win32/customactions/languagepacks/lngpckinsthelper.cxx index e637ee031b77..b1b6b73b56a3 100644 --- a/setup_native/source/win32/customactions/languagepacks/lngpckinsthelper.cxx +++ b/setup_native/source/win32/customactions/languagepacks/lngpckinsthelper.cxx @@ -124,8 +124,8 @@ UINT GetInstallProperty(MSIHANDLE handle, LPCTSTR name, CharacterBuffer_t* buffe Try to find the installation path to an already installed product. The installation path will be written in the Windows registry during the installation. There may exist different products in - parallel e.g. StarOffice, StarSuite, OpenOffice.org. It will be - searched in this order for an installed product. If a product + parallel e.g. StarOffice, StarSuite, OpenOffice.org, Apache OpenOffice. + It will be searched in this order for an installed product. If a product will be found the path to the product will be set in the property "INSTALLLOCATION" else nothing will be done. */ diff --git a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx index 3bbe292de3bc..20b66d114e4a 100644 --- a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx +++ b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx @@ -113,6 +113,10 @@ static BOOL CheckExtensionInRegistry( LPCSTR lpSubKey ) bRet = true; } else if ( strncmp( szBuffer, "OpenOffice.org.", 15 ) == 0 ) + { // We will replace registration for our (former) own types, too + bRet = true; + } + else if ( strncmp( szBuffer, "Apache OpenOffice.", 18 ) == 0 ) { // We will replace registration for our own types, too bRet = true; } diff --git a/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx b/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx index 7e2399476a4e..1f07a6a12ad4 100644 --- a/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx +++ b/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx @@ -77,10 +77,10 @@ namespace /* private */ Registrar::Registrar(const RegistrationContextInformation& RegContext) : m_ContextInformation(RegContext), - FORWARD_KEY_PREFIX(L"OpenOffice.org"),//FORWARD_KEY_PREFIX(L"soffice6"), + FORWARD_KEY_PREFIX(L"Apache OpenOffice"), DEFAULT_VALUE_NAME(L""), BACKUP_VALUE_NAME(L"Backup"), - PRIVATE_BACKUP_KEY_NAME(L"OpenOffice.org.reg4msdocmsi"),//PRIVATE_BACKUP_KEY_NAME(L"soffice6.bak"), + PRIVATE_BACKUP_KEY_NAME(L"Apache OpenOffice.reg4msdocmsi"),//PRIVATE_BACKUP_KEY_NAME(L"soffice6.bak"), REGISTRATION_STATE(L"Reg4MsDocState") { m_RootKey = WindowsRegistry().GetClassesRootKey(); diff --git a/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.cxx b/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.cxx index 06bbc323ca14..6a69c202e070 100644 --- a/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.cxx +++ b/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.cxx @@ -305,8 +305,7 @@ std::wstring RegistrationContextInformation::GetOpenOfficeExecutableName() const std::wstring RegistrationContextInformation::GetOpenOfficeCommandline(SHELL_COMMAND ShellCommand, OFFICE_APPLICATION OfficeApp) const { - // quote the path to OpenOffice, this is important - // for Windows 9x + // quote the path to Apache OpenOffice, this is important for Windows 9x std::wstring cmd_line = std::wstring(TEXT("\"")) + m_OOExecPath + std::wstring(TEXT("\"")); switch( OfficeApp ) diff --git a/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.hxx b/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.hxx index d1521299e33f..993df62fd546 100644 --- a/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.hxx +++ b/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.hxx @@ -45,7 +45,7 @@ document display name is convertable to an ANSI string and if not returns an english default. So we avoid garbage if soemone for instance - installs an japanese StarOffice/OpenOffice + installs an japanese version under a German Windows 98 for instance. */ class RegistrationContextInformation @@ -150,7 +150,7 @@ public: */ std::wstring GetOpenOfficeFriendlyAppName() const; - /** The path to the StarOffice/OpenOffice executable + /** The path to the office executable */ std::wstring GetOpenOfficeExecutablePath() const; diff --git a/setup_native/source/win32/customactions/relnotes/relnotes.cxx b/setup_native/source/win32/customactions/relnotes/relnotes.cxx index ab5769fb6c3c..ebedb80c3ac6 100644 --- a/setup_native/source/win32/customactions/relnotes/relnotes.cxx +++ b/setup_native/source/win32/customactions/relnotes/relnotes.cxx @@ -158,7 +158,7 @@ extern "C" UINT __stdcall ShowSurveyAfter( MSIHANDLE handle ) std::wstring prodname; GetMsiProp( handle, TEXT("ProductName"), prodname ); - std::wstring::size_type nIndex = prodname.find( TEXT( "OpenOffice.org" ) ); + std::wstring::size_type nIndex = prodname.find( TEXT( "Apache OpenOffice" ) ); if( std::wstring::npos == nIndex ) return ERROR_SUCCESS; @@ -170,7 +170,8 @@ extern "C" UINT __stdcall ShowSurveyAfter( MSIHANDLE handle ) aExecInf.cbSize = sizeof( aExecInf ); aExecInf.fMask = SEE_MASK_FLAG_DDEWAIT | SEE_MASK_FLAG_NO_UI; aExecInf.lpVerb = TEXT("open"); - aExecInf.lpFile = TEXT("http://surveys.services.openoffice.org/deinstall"); + //aExecInf.lpFile = TEXT("http://surveys.services.openoffice.org/deinstall"); + aExecInf.lpFile = TEXT("http://www.openoffice.org/support/"); aExecInf.lpDirectory = NULL; aExecInf.nShow = SW_SHOWNORMAL; diff --git a/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx b/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx index 58782275e20f..e795daf0e444 100644 --- a/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx +++ b/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx @@ -54,10 +54,10 @@ </MSDN> We add the following entries to the respective registry key - "{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}"="OpenOffice.org Column Handler" - "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}"="OpenOffice.org Infotip Handler" - "{63542C48-9552-494A-84F7-73AA6A7C99C1}"="OpenOffice.org Property Sheet Handler" - "{3B092F0C-7696-40E3-A80F-68D74DA84210}"="OpenOffice.org Thumbnail Viewer" + "{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}"="Apache OpenOffice Column Handler" + "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}"="Apache OpenOffice Infotip Handler" + "{63542C48-9552-494A-84F7-73AA6A7C99C1}"="Apache OpenOffice Property Sheet Handler" + "{3B092F0C-7696-40E3-A80F-68D74DA84210}"="Apache OpenOffice Thumbnail Viewer" These shell extensions are implemented in the 'shell' project. We ignore registration failures because of insufficient privileges. The reason is: On systems which restrict the @@ -90,10 +90,10 @@ struct RegistryEntry TCHAR* Value; }; -RegistryEntry ColumnHandler = { TEXT("{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}"), TEXT("OpenOffice.org Column Handler") }; -RegistryEntry InfotipHandler = { TEXT("{087B3AE3-E237-4467-B8DB-5A38AB959AC9}"), TEXT("OpenOffice.org Infotip Handler") }; -RegistryEntry PropHandler = { TEXT("{63542C48-9552-494A-84F7-73AA6A7C99C1}"), TEXT("OpenOffice.org Property Sheet Handler") }; -RegistryEntry ThumbViewer = { TEXT("{3B092F0C-7696-40E3-A80F-68D74DA84210}"), TEXT("OpenOffice.org Thumbnail Viewer") }; +RegistryEntry ColumnHandler = { TEXT("{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}"), TEXT("Apache OpenOffice Column Handler") }; +RegistryEntry InfotipHandler = { TEXT("{087B3AE3-E237-4467-B8DB-5A38AB959AC9}"), TEXT("Apache OpenOffice Infotip Handler") }; +RegistryEntry PropHandler = { TEXT("{63542C48-9552-494A-84F7-73AA6A7C99C1}"), TEXT("Apache OpenOffice Property Sheet Handler") }; +RegistryEntry ThumbViewer = { TEXT("{3B092F0C-7696-40E3-A80F-68D74DA84210}"), TEXT("Apache OpenOffice Thumbnail Viewer") }; BOOL GetMsiProp( MSIHANDLE hMSI, const char* pPropName, char** ppValue ) { diff --git a/setup_native/source/win32/stwrapper/stwrapper.manifest b/setup_native/source/win32/stwrapper/stwrapper.manifest index ec639e45cb04..2439b5fb94a4 100644 --- a/setup_native/source/win32/stwrapper/stwrapper.manifest +++ b/setup_native/source/win32/stwrapper/stwrapper.manifest @@ -7,7 +7,7 @@ version="1.0.0.0" processorArchitecture="x86" /> - <description>OpenOffice.org Installer</description> + <description>Apache OpenOffice Installer</description> <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> <security> <requestedPrivileges> diff --git a/shell/inc/internal/config.hxx b/shell/inc/internal/config.hxx index 5844c02a1262..ffbba1d3c35c 100644 --- a/shell/inc/internal/config.hxx +++ b/shell/inc/internal/config.hxx @@ -40,10 +40,10 @@ #define MODULE_NAME_FILTER TEXT("ooofilt.dll") #endif -#define COLUMN_HANDLER_DESCRIPTIVE_NAME TEXT("OpenOffice.org Column Handler") -#define INFOTIP_HANDLER_DESCRIPTIVE_NAME TEXT("OpenOffice.org Infotip Handler") -#define PROPSHEET_HANDLER_DESCRIPTIVE_NAME TEXT("OpenOffice.org Property Sheet Handler") -#define THUMBVIEWER_HANDLER_DESCRIPTIVAE_NAME TEXT("OpenOffice.org Thumbnail Viewer") +#define COLUMN_HANDLER_DESCRIPTIVE_NAME TEXT("Apache OpenOffice Column Handler") +#define INFOTIP_HANDLER_DESCRIPTIVE_NAME TEXT("Apache OpenOffice Infotip Handler") +#define PROPSHEET_HANDLER_DESCRIPTIVE_NAME TEXT("Apache OpenOffice Property Sheet Handler") +#define THUMBVIEWER_HANDLER_DESCRIPTIVAE_NAME TEXT("Apache OpenOffice Thumbnail Viewer") #define META_CONTENT_NAME "meta.xml" #define DOC_CONTENT_NAME "content.xml" diff --git a/shell/source/unix/sysshell/recently_used_file_handler.cxx b/shell/source/unix/sysshell/recently_used_file_handler.cxx index 9438956adee3..8c2fc1d44104 100644 --- a/shell/source/unix/sysshell/recently_used_file_handler.cxx +++ b/shell/source/unix/sysshell/recently_used_file_handler.cxx @@ -405,7 +405,7 @@ namespace /* private */ { }; //------------------------------------------------ - const char* GROUP_OOO = "openoffice.org"; + const char* GROUP_OOO = "apacheopenoffice"; const char* GROUP_STAR_OFFICE = "staroffice"; const char* GROUP_STAR_SUITE = "starsuite"; diff --git a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx index 80edb95b24e0..982478006ae3 100644 --- a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx +++ b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx @@ -1197,7 +1197,7 @@ namespace /* private */ std::string ClsidEntry = CLSID_GUID_ENTRY; SubstitutePlaceholder(ClsidEntry, GUID_PLACEHOLDER, ClsidToString(FilterGuid)); - if (!SetRegistryKey(HKEY_CLASSES_ROOT, ClsidEntry.c_str(), "", "OpenOffice.org Filter")) + if (!SetRegistryKey(HKEY_CLASSES_ROOT, ClsidEntry.c_str(), "", "OpenOffice.org XML Filter")) return E_FAIL; ClsidEntry = CLSID_GUID_INPROC_ENTRY; @@ -1225,7 +1225,7 @@ namespace /* private */ SubstitutePlaceholder(ClsidEntry_Persist, GUID_PLACEHOLDER, ClsidToString(PersistentGuid)); - if (!SetRegistryKey(HKEY_CLASSES_ROOT, ClsidEntry_Persist.c_str(), "", "OpenOffice.org Persistent Handler")) + if (!SetRegistryKey(HKEY_CLASSES_ROOT, ClsidEntry_Persist.c_str(), "", "Apache OpenOffice Persistent Handler")) return E_FAIL; // Add missing entry diff --git a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx index a27ccd559f5e..913886c73ec3 100644 --- a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx +++ b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx @@ -56,11 +56,11 @@ struct PROPERTYMAP PROPERTYMAP g_rgPROPERTYMAP[] = { - { PKEY_Title, L"OpenOffice.org", L"Title" }, - { PKEY_Author, L"OpenOffice.org", L"Author" }, - { PKEY_Subject, L"OpenOffice.org", L"Subject" }, - { PKEY_Keywords, L"OpenOffice.org", L"Keyword" }, - { PKEY_Comment, L"OpenOffice.org", L"Comments" }, + { PKEY_Title, L"Apache OpenOffice", L"Title" }, + { PKEY_Author, L"Apache OpenOffice", L"Author" }, + { PKEY_Subject, L"Apache OpenOffice", L"Subject" }, + { PKEY_Keywords, L"Apache OpenOffice", L"Keyword" }, + { PKEY_Comment, L"Apache OpenOffice", L"Comments" }, }; size_t gPropertyMapTableSize = sizeof(g_rgPROPERTYMAP)/sizeof(g_rgPROPERTYMAP[0]); diff --git a/shell/source/win32/shlxthandler/res/shlxthdl.manifest b/shell/source/win32/shlxthandler/res/shlxthdl.manifest index a785006a9601..6af0aa25a21b 100644 --- a/shell/source/win32/shlxthandler/res/shlxthdl.manifest +++ b/shell/source/win32/shlxthandler/res/shlxthdl.manifest @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> -<assemblyIdentity version="1.0.0.0" processorArchitecture="x86" name="OpenOffice.shlxthdl" type="win32" /> -<description>OpenOffice Shell Extension</description> +<assemblyIdentity version="1.0.0.0" processorArchitecture="x86" name="Apache_OpenOffice.shlxthdl" type="win32" /> +<description>Apache OpenOffice Shell Extension</description> <dependency> <dependentAssembly> <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="X86" diff --git a/shell/source/win32/sysmail/sysmailclient.cxx b/shell/source/win32/sysmail/sysmailclient.cxx index f3933e1006cb..0918d8bcbceb 100644 --- a/shell/source/win32/sysmail/sysmailclient.cxx +++ b/shell/source/win32/sysmail/sysmailclient.cxx @@ -129,7 +129,7 @@ namespace /* private */ { rtl::OUString altSenddocUrl; HKEY hkey; - LONG lret = RegOpenKeyW(HKEY_CURRENT_USER, L"Software\\OpenOffice.org\\SendAsEMailClient", &hkey); + LONG lret = RegOpenKeyW(HKEY_CURRENT_USER, L"Software\\Apache OpenOffice\\SendAsEMailClient", &hkey); if (lret == ERROR_SUCCESS) { wchar_t buff[MAX_PATH]; diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm index ccfdf0c91741..f5b0f308ab3d 100644 --- a/solenv/bin/modules/installer/download.pm +++ b/solenv/bin/modules/installer/download.pm @@ -463,17 +463,40 @@ sub get_downloadname_productname { my ($allvariables) = @_; - my $start = "Apache_OpenOffice"; + my $start; - 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"; } + 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 "OOo-dev" ) && ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start .= "-Dev-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"; } + if ( $allvariables->{'PRODUCTNAME'} eq "URE" ) + { + $start .= "-URE"; + } + } return $start; } @@ -1968,8 +1991,14 @@ sub create_download_sets # evaluating the name of the download file - if ( $allvariableshashref->{'OOODOWNLOADNAME'} ) { $downloadname = set_download_filename($languagestringref, $allvariableshashref); } - else { $downloadname = resolve_variables_in_downloadname($allvariableshashref, $downloadname, $languagestringref); } + if ( $allvariableshashref->{'AOODOWNLOADNAME'} ) + { + $downloadname = set_download_filename($languagestringref, $allvariableshashref); + } + else + { + $downloadname = resolve_variables_in_downloadname($allvariableshashref, $downloadname, $languagestringref); + } if ( ! $installer::globals::iswindowsbuild ) # Unix specific part { @@ -1978,7 +2007,7 @@ sub create_download_sets my $getuidlibrary = ""; if (( $installer::globals::issolarisbuild ) || ( $installer::globals::islinuxbuild )) { $getuidlibrary = get_path_for_library($includepatharrayref); } - if ( $allvariableshashref->{'OOODOWNLOADNAME'} ) + if ( $allvariableshashref->{'AOODOWNLOADNAME'} ) { my $downloadfile = create_tar_gz_file_from_directory($installationdir, $getuidlibrary, $downloaddir, $downloadname); } diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm index e14dab64e10e..e6027d4ff51f 100644 --- a/solenv/bin/modules/installer/epmfile.pm +++ b/solenv/bin/modules/installer/epmfile.pm @@ -326,11 +326,11 @@ sub create_epm_header my $line = ""; my $infoline = ""; - # %product OpenOffice.org Software + # %product Apache OpenOffice Software # %version 2.0 # %description A really great software # %copyright 1999-2003 by OOo - # %vendor OpenOffice.org + # %vendor Apache OpenOffice project # %license /test/replace/01/LICENSE01 # %readme /test/replace/01/README01 # %requires foo @@ -492,7 +492,7 @@ sub create_epm_header { # refer to the license in the matching AOO installation # TODO: sync AOO dest license full path with lpacks/sdks/exts - my $licpath = "openoffice.org3/program/" . $licensefilename; + my $licpath = "apacheopenoffice3/program/" . $licensefilename; $foundlicensefile = 1; $line = "%license " . $licpath . "\n"; push(@epmheader, $line); @@ -550,7 +550,7 @@ sub create_epm_header } } - if ( $installer::globals::debian && $variableshashref->{'UNIXPRODUCTNAME'} eq 'openoffice.org' ) + if ( $installer::globals::debian && $variableshashref->{'UNIXPRODUCTNAME'} eq 'apache openoffice' ) { $line = "%provides" . " openoffice.org-unbundled\n"; push(@epmheader, $line); diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm index eedf272d26a4..ce29b1ec6efa 100644 --- a/solenv/bin/modules/installer/simplepackage.pm +++ b/solenv/bin/modules/installer/simplepackage.pm @@ -333,7 +333,10 @@ sub replace_variables_in_scriptfile replace_one_variable_in_shellscript($scriptfile, $allvariables->{'PRODUCTVERSION'}, "PRODUCTVERSION" ); my $scriptname = lc($allvariables->{'PRODUCTNAME'}) . "\.script"; - if ( $allvariables->{'PRODUCTNAME'} eq "OpenOffice.org" ) { $scriptname = "org.openoffice.script"; } + if ( $allvariables->{'PRODUCTNAME'} eq "Apache OpenOffice" ) + { + $scriptname = "org.openoffice.script"; + } replace_one_variable_in_shellscript($scriptfile, $scriptname, "SEARCHSCRIPTNAME" ); } @@ -616,7 +619,7 @@ sub create_simple_package my $locallanguage = $installer::globals::csp_languagestring; - if ( $allvariables->{'OOODOWNLOADNAME'} ) + if ( $allvariables->{'AOODOWNLOADNAME'} ) { $packagename = installer::download::set_download_filename(\$locallanguage, $allvariables); } diff --git a/solenv/bin/modules/installer/windows/msp.pm b/solenv/bin/modules/installer/windows/msp.pm index 033cbf6cf932..10dc7287f809 100644 --- a/solenv/bin/modules/installer/windows/msp.pm +++ b/solenv/bin/modules/installer/windows/msp.pm @@ -884,7 +884,7 @@ sub change_patchmetadata_table if ( $allvariables->{'PROPERTYTABLEPRODUCTNAME'} ) { $targetproductnamevalue = $allvariables->{'PROPERTYTABLEPRODUCTNAME'}; } my $manufacturerstring = "ManufacturerName"; - my $manufacturervalue = "OpenOffice.org"; + my $manufacturervalue = "Apache OpenOffice"; if ( $installer::globals::longmanufacturer ) { $manufacturervalue = $installer::globals::longmanufacturer; } my $displaynamestring = "DisplayName"; diff --git a/solenv/bin/modules/installer/ziplist.pm b/solenv/bin/modules/installer/ziplist.pm index 730696266d43..05a3c7807149 100644 --- a/solenv/bin/modules/installer/ziplist.pm +++ b/solenv/bin/modules/installer/ziplist.pm @@ -639,7 +639,7 @@ sub set_manufacturer { my ($allvariables) = @_; - my $openofficeproductname = "OpenOffice.org"; + my $openofficeproductname = "Apache OpenOffice"; my $sunname = ""; diff --git a/svx/source/dialog/sendreportw32.cxx b/svx/source/dialog/sendreportw32.cxx index d7761c0271ae..9b4ca0223c4b 100644 --- a/svx/source/dialog/sendreportw32.cxx +++ b/svx/source/dialog/sendreportw32.cxx @@ -93,7 +93,7 @@ namespace svx{ if ( ERROR_SUCCESS == RegReadValue( HKEY_CURRENT_USER, - TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"), + TEXT("SOFTWARE\\Apache OpenOffice\\CrashReport"), TEXT("HTTPProxyServer"), szBuffer, sizeof(szBuffer) ) ) @@ -102,7 +102,7 @@ namespace svx{ DWORD dwProxyPort; if ( ERROR_SUCCESS == RegReadValue( HKEY_CURRENT_USER, - TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"), + TEXT("SOFTWARE\\Apache OpenOffice\\CrashReport"), TEXT("HTTPProxyPort"), &dwProxyPort, sizeof(dwProxyPort) ) ) @@ -113,7 +113,7 @@ namespace svx{ if ( ERROR_SUCCESS == RegReadValue( HKEY_CURRENT_USER, - TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"), + TEXT("SOFTWARE\\Apache OpenOffice\\CrashReport"), TEXT("ReturnAddress"), szBuffer, sizeof(szBuffer) ) ) @@ -122,7 +122,7 @@ namespace svx{ DWORD fAllowContact = sal_False; RegReadValue( HKEY_CURRENT_USER, - TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"), + TEXT("SOFTWARE\\Apache OpenOffice\\CrashReport"), TEXT("AllowContact"), &fAllowContact, sizeof(fAllowContact) ); @@ -131,7 +131,7 @@ namespace svx{ DWORD uInternetConnection = 0; RegReadValue( HKEY_CURRENT_USER, - TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"), + TEXT("SOFTWARE\\Apache OpenOffice\\CrashReport"), TEXT("HTTPConnection"), &uInternetConnection, sizeof(uInternetConnection) ); @@ -145,7 +145,7 @@ namespace svx{ const _TCHAR *lpHTTPProxyServer = reinterpret_cast<LPCTSTR>(maParams.maHTTPProxyServer.GetBuffer()); RegWriteValue( HKEY_CURRENT_USER, - TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"), + TEXT("SOFTWARE\\Apache OpenOffice\\CrashReport"), TEXT("HTTPProxyServer"), REG_SZ, lpHTTPProxyServer, sizeof(TCHAR) * (_tcslen(lpHTTPProxyServer) + 1) ); @@ -155,7 +155,7 @@ namespace svx{ RegWriteValue( HKEY_CURRENT_USER, - TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"), + TEXT("SOFTWARE\\Apache OpenOffice\\CrashReport"), TEXT("HTTPProxyPort"), REG_DWORD, &dwProxyPort, sizeof(DWORD) ); @@ -163,7 +163,7 @@ namespace svx{ DWORD fAllowContact = IsContactAllowed(); RegWriteValue( HKEY_CURRENT_USER, - TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"), + TEXT("SOFTWARE\\Apache OpenOffice\\CrashReport"), TEXT("AllowContact"), REG_DWORD, &fAllowContact, sizeof(DWORD) ); @@ -173,7 +173,7 @@ namespace svx{ RegWriteValue( HKEY_CURRENT_USER, - TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"), + TEXT("SOFTWARE\\Apache OpenOffice\\CrashReport"), TEXT("HTTPConnection"), REG_DWORD, &uInternetConnection, sizeof(DWORD) ); @@ -181,7 +181,7 @@ namespace svx{ const _TCHAR *lpEmail = reinterpret_cast<LPCTSTR>(GetEMailAddress().GetBuffer()); RegWriteValue( HKEY_CURRENT_USER, - TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"), + TEXT("SOFTWARE\\Apache OpenOffice\\CrashReport"), TEXT("ReturnAddress"), REG_SZ, lpEmail, sizeof(TCHAR) * (_tcslen(lpEmail) + 1) ); diff --git a/sysui/desktop/debian/control b/sysui/desktop/debian/control index 3dd2d9cc0538..e93a0a563b55 100644 --- a/sysui/desktop/debian/control +++ b/sysui/desktop/debian/control @@ -1,6 +1,6 @@ Description: %productname desktop integration Maintainer: Apache Software Foundation Architecture: all -Provides: openoffice.org-desktop-integration, openoffice.org-unbundled -Conflicts: openofficeorg-desktop-integration, openofficeorg-debian-menus, openoffice.org-bundled -Replaces: openofficeorg-desktop-integration, openofficeorg-debian-menus +Provides: apache_openoffice-desktop-integration, openoffice.org-unbundled +Conflicts: apache_openoffice-desktop-integration, openofficeorg-desktop-integration, openofficeorg-debian-menus, openoffice.org-bundled +Replaces: apache_openoffice-desktop-integration, openofficeorg-debian-menus diff --git a/sysui/desktop/freedesktop/freedesktop-menus.spec b/sysui/desktop/freedesktop/freedesktop-menus.spec index 640e6f6c8477..da64d19d1e1c 100644 --- a/sysui/desktop/freedesktop/freedesktop-menus.spec +++ b/sysui/desktop/freedesktop/freedesktop-menus.spec @@ -27,7 +27,7 @@ Name: %pkgprefix-freedesktop-menus #BuildRequires: perl Group: Office License: ALv2 -Provides: openoffice.org3-desktop-integration +Provides: apache_openoffice3-desktop-integration Conflicts: %pkgprefix-suse-menus Conflicts: %pkgprefix-debian-menus Conflicts: %pkgprefix-redhat-menus diff --git a/sysui/desktop/macosx/Info.plist b/sysui/desktop/macosx/Info.plist index 157e907ab00c..03b09a8ca4d7 100644 --- a/sysui/desktop/macosx/Info.plist +++ b/sysui/desktop/macosx/Info.plist @@ -32,7 +32,7 @@ <key>UTTypeIdentifier</key> <string>org.openoffice.text</string> <key>UTTypeDescription</key> - <string>${FILEFORMATNAME} ${FILEFORMATVERSION} Text</string> + <string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Text</string> <key>UTTypeConformsTo</key> <array> <string>public.data</string> @@ -80,7 +80,7 @@ <key>UTTypeIdentifier</key> <string>org.openoffice.spreadsheet</string> <key>UTTypeDescription</key> - <string>${FILEFORMATNAME} ${FILEFORMATVERSION} Spreadsheet</string> + <string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Spreadsheet</string> <key>UTTypeConformsTo</key> <array> <string>public.data</string> @@ -128,7 +128,7 @@ <key>UTTypeIdentifier</key> <string>org.openoffice.presentation</string> <key>UTTypeDescription</key> - <string>${FILEFORMATNAME} ${FILEFORMATVERSION} Presentation</string> + <string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Presentation</string> <key>UTTypeConformsTo</key> <array> <string>public.data</string> @@ -178,7 +178,7 @@ <key>UTTypeIdentifier</key> <string>org.openoffice.graphics</string> <key>UTTypeDescription</key> - <string>${FILEFORMATNAME} ${FILEFORMATVERSION} Drawing</string> + <string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Drawing</string> <key>UTTypeConformsTo</key> <array> <string>public.data</string> @@ -226,7 +226,7 @@ <key>UTTypeIdentifier</key> <string>org.openoffice.text-master</string> <key>UTTypeDescription</key> - <string>${FILEFORMATNAME} ${FILEFORMATVERSION} Master</string> + <string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Master</string> <key>UTTypeConformsTo</key> <array> <string>public.data</string> @@ -272,7 +272,7 @@ <key>UTTypeIdentifier</key> <string>org.openoffice.formula</string> <key>UTTypeDescription</key> - <string>${FILEFORMATNAME} ${FILEFORMATVERSION} Formula</string> + <string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Formula</string> <key>UTTypeConformsTo</key> <array> <string>public.data</string> @@ -320,7 +320,7 @@ <key>UTTypeIdentifier</key> <string>org.openoffice.text-template</string> <key>UTTypeDescription</key> - <string>${FILEFORMATNAME} ${FILEFORMATVERSION} Text Template</string> + <string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Text Template</string> <key>UTTypeConformsTo</key> <array> <string>public.data</string> @@ -366,7 +366,7 @@ <key>UTTypeIdentifier</key> <string>org.openoffice.spreadsheet-template</string> <key>UTTypeDescription</key> - <string>${FILEFORMATNAME} ${FILEFORMATVERSION} Spreadsheet Template</string> + <string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Spreadsheet Template</string> <key>UTTypeConformsTo</key> <array> <string>public.data</string> @@ -412,7 +412,7 @@ <key>UTTypeIdentifier</key> <string>org.openoffice.presentation-template</string> <key>UTTypeDescription</key> - <string>${FILEFORMATNAME} ${FILEFORMATVERSION} Presentation Template</string> + <string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Presentation Template</string> <key>UTTypeConformsTo</key> <array> <string>public.data</string> @@ -458,7 +458,7 @@ <key>UTTypeIdentifier</key> <string>org.openoffice.graphics-template</string> <key>UTTypeDescription</key> - <string>${FILEFORMATNAME} ${FILEFORMATVERSION} Drawing Template</string> + <string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Drawing Template</string> <key>UTTypeConformsTo</key> <array> <string>public.data</string> @@ -868,7 +868,7 @@ <key>CFBundleTypeIconFile</key> <string>text.icns</string> <key>CFBundleTypeName</key> - <string>${FILEFORMATNAME} ${FILEFORMATVERSION} Text</string> + <string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Text</string> <key>CFBundleTypeRole</key> <string>Editor</string> <key>LSIsAppleDefaultForType</key> @@ -906,7 +906,7 @@ <key>CFBundleTypeIconFile</key> <string>spreadsheet.icns</string> <key>CFBundleTypeName</key> - <string>${FILEFORMATNAME} ${FILEFORMATVERSION} Spreadsheet</string> + <string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Spreadsheet</string> <key>CFBundleTypeRole</key> <string>Editor</string> <key>LSIsAppleDefaultForType</key> @@ -946,7 +946,7 @@ <key>CFBundleTypeIconFile</key> <string>presentation.icns</string> <key>CFBundleTypeName</key> - <string>${FILEFORMATNAME} ${FILEFORMATVERSION} Presentation</string> + <string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Presentation</string> <key>CFBundleTypeRole</key> <string>Editor</string> <key>LSIsAppleDefaultForType</key> @@ -984,7 +984,7 @@ <key>CFBundleTypeIconFile</key> <string>drawing.icns</string> <key>CFBundleTypeName</key> - <string>${FILEFORMATNAME} ${FILEFORMATVERSION} Drawing</string> + <string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Drawing</string> <key>CFBundleTypeRole</key> <string>Editor</string> <key>LSIsAppleDefaultForType</key> @@ -1020,7 +1020,7 @@ <key>CFBundleTypeIconFile</key> <string>master-document.icns</string> <key>CFBundleTypeName</key> - <string>${FILEFORMATNAME} ${FILEFORMATVERSION} Master</string> + <string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Master</string> <key>CFBundleTypeRole</key> <string>Editor</string> <key>LSIsAppleDefaultForType</key> @@ -1058,7 +1058,7 @@ <key>CFBundleTypeIconFile</key> <string>formula.icns</string> <key>CFBundleTypeName</key> - <string>${FILEFORMATNAME} ${FILEFORMATVERSION} Formula</string> + <string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Formula</string> <key>CFBundleTypeRole</key> <string>Editor</string> <key>LSIsAppleDefaultForType</key> @@ -1094,7 +1094,7 @@ <key>CFBundleTypeIconFile</key> <string>text-template.icns</string> <key>CFBundleTypeName</key> - <string>${FILEFORMATNAME} ${FILEFORMATVERSION} Text Template</string> + <string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Text Template</string> <key>CFBundleTypeRole</key> <string>Editor</string> <key>LSIsAppleDefaultForType</key> @@ -1130,7 +1130,7 @@ <key>CFBundleTypeIconFile</key> <string>spreadsheet-template.icns</string> <key>CFBundleTypeName</key> - <string>${FILEFORMATNAME} ${FILEFORMATVERSION} Spreadsheet Template</string> + <string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Spreadsheet Template</string> <key>CFBundleTypeRole</key> <string>Editor</string> <key>LSIsAppleDefaultForType</key> @@ -1166,7 +1166,7 @@ <key>CFBundleTypeIconFile</key> <string>presentation-template.icns</string> <key>CFBundleTypeName</key> - <string>${FILEFORMATNAME} ${FILEFORMATVERSION} Presentation Template</string> + <string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Presentation Template</string> <key>CFBundleTypeRole</key> <string>Editor</string> <key>LSIsAppleDefaultForType</key> @@ -1202,7 +1202,7 @@ <key>CFBundleTypeIconFile</key> <string>drawing-template.icns</string> <key>CFBundleTypeName</key> - <string>${FILEFORMATNAME} ${FILEFORMATVERSION} Drawing Template</string> + <string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Drawing Template</string> <key>CFBundleTypeRole</key> <string>Editor</string> <key>LSIsAppleDefaultForType</key> diff --git a/sysui/desktop/mandriva/mandriva-menus.spec b/sysui/desktop/mandriva/mandriva-menus.spec index abcdb55dcea7..1ea7015821db 100644 --- a/sysui/desktop/mandriva/mandriva-menus.spec +++ b/sysui/desktop/mandriva/mandriva-menus.spec @@ -33,7 +33,7 @@ BuildArch: noarch # here and check for the 'mandriva-release' in the future (next year). # Requires: mandrake-release -Provides: openoffice.org3-desktop-integration +Provides: apache_openoffice3-desktop-integration %define _unpackaged_files_terminate_build 0 %define _binary_filedigest_algorithm 1 diff --git a/sysui/desktop/productversion.mk b/sysui/desktop/productversion.mk index 12776374f40d..f1705a310f0c 100644 --- a/sysui/desktop/productversion.mk +++ b/sysui/desktop/productversion.mk @@ -40,8 +40,9 @@ PKGDIR=$(BIN) .ENDIF # CAUTION! here the parsing result from openoffice.lst is NOT available, so this is hardcoded -# but should not be. When replacing with $(UNIXBASISROOTNAME) it will be empty (!) -PRODUCTLIST = openoffice.org +# but should not be. +# It has to be equal to PRODUCTNAME:l:s/\s/\_/g - see solenv/bin/modules/installer/setupscript.pm +PRODUCTLIST = apache_openoffice # default values to minimize maintainance effort @@ -65,11 +66,11 @@ ICONVERSION = $(PRODUCTVERSIONSHORT:s/.//g) UNIXWRAPPERNAME *= '$${{UNIXPRODUCTNAME}}$${{BRANDPACKAGEVERSION}}' # CAUTION! $(UNIXBASISROOTNAME) from openoffice.lst NOT available (!) -PRODUCTNAME.openoffice.org = OpenOffice.org +PRODUCTNAME.apache_openoffice = Apache OpenOffice -PRODUCTVERSION.openoffice.org = $(PRODUCTVERSION) -PRODUCTVERSIONSHORT.openoffice.org = $(PRODUCTVERSIONSHORT) -PKGVERSION.openoffice.org = $(PKGVERSION) -UNIXFILENAME.openoffice.org = $(PRODUCTNAME.openoffice.org:l)$(PRODUCTVERSIONSHORT.openoffice.org) -ICONPREFIX.openoffice.org = $(UNIXFILENAME.openoffice.org:s/.//g) +PRODUCTVERSION.apache_openoffice = $(PRODUCTVERSION) +PRODUCTVERSIONSHORT.apache_openoffice = $(PRODUCTVERSIONSHORT) +PKGVERSION.apache_openoffice = $(PKGVERSION) +UNIXFILENAME.apache_openoffice = $(PRODUCTNAME.apache_openoffice:l:s/ /_/g)$(PRODUCTVERSIONSHORT.apache_openoffice) +ICONPREFIX.apache_openoffice = $(UNIXFILENAME.apache_openoffice:s/.//g) diff --git a/sysui/desktop/redhat/redhat-menus.spec b/sysui/desktop/redhat/redhat-menus.spec index 6ce824cb2807..8fa8f1e695eb 100644 --- a/sysui/desktop/redhat/redhat-menus.spec +++ b/sysui/desktop/redhat/redhat-menus.spec @@ -29,7 +29,7 @@ Vendor: Apache Software Foundation AutoReqProv: no BuildArch: noarch Requires: redhat-release -Provides: openoffice.org3-desktop-integration +Provides: apache_openoffice3-desktop-integration %define _unpackaged_files_terminate_build 0 %define _binary_filedigest_algorithm 1 %define _binary_payload w9.gzdio diff --git a/sysui/desktop/share/brand.pl b/sysui/desktop/share/brand.pl index 0e7fb0c75d15..d52fc64c5655 100644 --- a/sysui/desktop/share/brand.pl +++ b/sysui/desktop/share/brand.pl @@ -34,8 +34,8 @@ eval 'exec perl -wS $0 ${1+"$@"}' $destdir = pop @ARGV; mkdir $destdir,0777; -$productname = "OpenOffice.org"; -$productfilename = "openoffice"; +$productname = "Apache OpenOffice"; +$productfilename = "apacheopenoffice"; $prefix = ""; $iconprefix = ""; diff --git a/sysui/desktop/share/create_mime_xml.pl b/sysui/desktop/share/create_mime_xml.pl index 47f85da01193..5521cc804341 100644 --- a/sysui/desktop/share/create_mime_xml.pl +++ b/sysui/desktop/share/create_mime_xml.pl @@ -21,7 +21,7 @@ # ************************************************************* use File::Basename; $basedir = dirname($0); -$productname = 'OpenOffice.org'; +$productname = 'Apache OpenOffice'; $mimedir = $basedir.'/../mimetypes'; $FS= ' '; # field seperator (space) - for documents.ulf diff --git a/sysui/desktop/share/create_tree.sh b/sysui/desktop/share/create_tree.sh index 300273a37979..f86b60bb93b9 100644 --- a/sysui/desktop/share/create_tree.sh +++ b/sysui/desktop/share/create_tree.sh @@ -121,8 +121,8 @@ cp printeradmin.sh ${DESTDIR}/usr/bin/${PREFIX}-printeradmin chmod 0755 ${DESTDIR}/usr/bin/${PREFIX} ${DESTDIR}/usr/bin/${PREFIX}-printeradmin mkdir -p ${DESTDIR}/usr/share/mime/packages -cp openoffice.org.xml ${DESTDIR}/usr/share/mime/packages/ -chmod 0644 ${DESTDIR}/usr/share/mime/packages/openoffice.org.xml +cp apacheopenoffice.xml ${DESTDIR}/usr/share/mime/packages/ +chmod 0644 ${DESTDIR}/usr/share/mime/packages/apacheopenoffice.xml mkdir -p ${DESTDIR}/usr/share/applications for i in `cat launcherlist`; do diff --git a/sysui/desktop/share/makefile.mk b/sysui/desktop/share/makefile.mk index fc8c648a1b48..4fb0b9ad38d1 100644 --- a/sysui/desktop/share/makefile.mk +++ b/sysui/desktop/share/makefile.mk @@ -157,8 +157,8 @@ $(LAUNCHERFLAGFILE) : $(LAUNCHERDEPN) # # Create shared mime info xml file # -$(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.org.xml : ../mimetypes/{$(MIMELIST)}.desktop create_mime_xml.pl -$(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.org.xml : $(ULFDIR)$/documents.ulf +$(COMMONMISC)$/{$(PRODUCTLIST)}$/apacheopenoffice.xml : ../mimetypes/{$(MIMELIST)}.desktop create_mime_xml.pl +$(COMMONMISC)$/{$(PRODUCTLIST)}$/apacheopenoffice.xml : $(ULFDIR)$/documents.ulf @echo Create shared mime info xml file .. @echo --------------------------------- @$(PERL) create_mime_xml.pl $< > $@.$(INPATH) @@ -173,8 +173,8 @@ $(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.keys : ../mimetypes/{$(MIMELIST)}.ke @@-$(MKDIRHIER) $(@:d) @echo Creating GNOME .keys file for $(@:d:d:f) .. @echo --------------------------------- - @$(PERL) brand.pl -p $(PRODUCTNAME.$(@:d:d:f)) -u $(UNIXFILENAME.$(@:d:d:f)) --iconprefix "$(ICONPREFIX.$(@:d:d:f))-" $< $(MISC)/$(@:d:d:f) - @$(PERL) translate.pl -p $(PRODUCTNAME.$(@:d:d:f)) -d $(MISC)/$(@:d:d:f) --ext "keys" --key "description" $(ULFDIR)$/documents.ulf + @$(PERL) brand.pl -p "$(PRODUCTNAME.$(@:d:d:f))" -u $(UNIXFILENAME.$(@:d:d:f)) --iconprefix "$(ICONPREFIX.$(@:d:d:f))-" $< $(MISC)/$(@:d:d:f) + @$(PERL) translate.pl -p "$(PRODUCTNAME.$(@:d:d:f))" -d $(MISC)/$(@:d:d:f) --ext "keys" --key "description" $(ULFDIR)$/documents.ulf @cat $(MISC)/$(@:d:d:f)/{$(MIMELIST)}.keys > $@.$(INPATH) @mv -f $@.$(INPATH) $@ @@ -249,7 +249,7 @@ $(COMMONMISC)$/{$(PRODUCTLIST)}$/build.flag : $(ICONDEPN) \ $(COMMONMISC)$/{$(PRODUCTLIST)}$/create_tree.sh \ $(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.keys \ $(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.mime \ - $(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.org.xml \ + $(COMMONMISC)$/{$(PRODUCTLIST)}$/apacheopenoffice.xml \ $(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.applications \ $(COMMONMISC)$/{$(PRODUCTLIST)}$/{openoffice printeradmin}.sh @touch $@ diff --git a/sysui/desktop/share/translate.pl b/sysui/desktop/share/translate.pl index 330272e7d691..783d0c0b59ed 100644 --- a/sysui/desktop/share/translate.pl +++ b/sysui/desktop/share/translate.pl @@ -32,7 +32,7 @@ eval 'exec perl -wS $0 ${1+"$@"}' # my ($prefix, $ext, $key); -$productname = "OpenOffice.org"; +$productname = "Apache OpenOffice"; $workdir = "."; while ($_ = $ARGV[0], /^-/) { diff --git a/sysui/desktop/solaris/makefile.mk b/sysui/desktop/solaris/makefile.mk index 0f1dde628da1..007195aabef2 100644 --- a/sysui/desktop/solaris/makefile.mk +++ b/sysui/desktop/solaris/makefile.mk @@ -94,9 +94,9 @@ $(MISC)/{$(PRODUCTLIST)}/postremove : $$(@:f) # --- openoffice.xml--------------------------- .IF "$(common_build)"=="TRUE" -# Copy the openoffice.org.xml file to $(MISC) -#$(MISC)/$(foreach,i,$(PRODUCTLIST) $i/$i.xml) : $(COMMONMISC)/$$(@:b)/openoffice.org.xml -$(MISC)/$(foreach,i,$(PRODUCTLIST) $(MISC)/$i/openoffice.org.xml) : $(COMMONMISC)/$$(@:b)/openoffice.org.xml +# Copy the apacheopenoffice.xml file to $(MISC) +#$(MISC)/$(foreach,i,$(PRODUCTLIST) $i/$i.xml) : $(COMMONMISC)/$$(@:b)/apacheopenoffice.xml +$(MISC)/$(foreach,i,$(PRODUCTLIST) $(MISC)/$i/apacheopenoffice.xml) : $(COMMONMISC)/$$(@:b)/apacheopenoffice.xml $(MKDIRHIER) $(@:d) echo hier hier $@ cat $< | tr -d "\015" > $@ @@ -112,7 +112,7 @@ $(MISC)/{$(PRODUCTLIST)}$/prototype : $$(@:f) ../productversion.mk makefile.mk # --- packaging --------------------------------------------------- #$(PKGFILES) : $(MISC)/{$(PRODUCTLIST)}/{copyright pkginfo depend mailcap postinstall postremove} makefile.mk $(MISC)/$$(@:b:b:s/-desktop-integration//)/$$(@:b:b:s/-desktop-integration//).xml -$(PKGFILES) : $(MISC)/{$(PRODUCTLIST)}/{copyright pkginfo depend mailcap postinstall postremove} makefile.mk $(MISC)/$$(@:b:b:s/-desktop-integration//)/openoffice.org.xml +$(PKGFILES) : $(MISC)/{$(PRODUCTLIST)}/{copyright pkginfo depend mailcap postinstall postremove} makefile.mk $(MISC)/$$(@:b:b:s/-desktop-integration//)/apacheopenoffice.xml $(PKGFILES) : $(MISC)$/{$(PRODUCTLIST)}$/prototype @-$(RM) $(BIN)$/$(@:f) @$(MKDIRHIER) $(@:d) diff --git a/sysui/desktop/solaris/prototype b/sysui/desktop/solaris/prototype index ef541c3134ea..dda571d0f1b0 100644 --- a/sysui/desktop/solaris/prototype +++ b/sysui/desktop/solaris/prototype @@ -21,7 +21,7 @@ d none share/mime/packages 0755 root other !default 0644 root bin e build etc/mime.types=./mime.types e build etc/mailcap=mailcap -f none usr/share/mime/packages/%PREFIX.xml=%SOURCE/openoffice.org.xml +f none usr/share/mime/packages/%PREFIX.xml=%SOURCE/apacheopenoffice.xml f none usr/share/application-registry/%PREFIX.applications=%SOURCE/openoffice.applications s none usr/share/applications/%PREFIX-writer.desktop=../../../opt/%PREFIX/share/xdg/writer.desktop s none usr/share/applications/%PREFIX-calc.desktop=../../../opt/%PREFIX/share/xdg/calc.desktop diff --git a/sysui/desktop/suse/suse-menus.spec b/sysui/desktop/suse/suse-menus.spec index 0f7a56affc06..8d02c9eaa4e6 100644 --- a/sysui/desktop/suse/suse-menus.spec +++ b/sysui/desktop/suse/suse-menus.spec @@ -32,7 +32,7 @@ BuildArch: noarch Requires: /etc/SuSE-release # .. but not for Sun JDS Conflicts: SunDesktopVersion -Provides: openoffice.org3-desktop-integration +Provides: apacheopenoffice3-desktop-integration %define _unpackaged_files_terminate_build 0 %define _binary_filedigest_algorithm 1 %define _binary_payload w9.gzdio diff --git a/unoil/climaker/makefile.mk b/unoil/climaker/makefile.mk index 8e51b26b8cc6..2d7404e14e3a 100644 --- a/unoil/climaker/makefile.mk +++ b/unoil/climaker/makefile.mk @@ -64,8 +64,8 @@ $(BIN)/cli_oootypes.dll : $(RDB) $(EXTRA_RDB) version.txt $(CLIMAKER) $(CLIMAKERFLAGS) \ --out $@ \ --assembly-version $(CLI_OOOTYPES_NEW_VERSION) \ - --assembly-company "OpenOffice.org" \ - --assembly-description "This assembly contains metadata for the StarOffice/OpenOffice.org API." \ + --assembly-company "Apache OpenOffice" \ + --assembly-description "This assembly contains metadata for the Apache OpenOffice API." \ -X $(EXTRA_RDB) \ -r $(SOLARBINDIR)$/cli_uretypes.dll \ --keyfile $(SOLARBINDIR)$/cliuno.snk \ diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index 5e9c62f71fb9..e66ce73a5e4b 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -1167,7 +1167,7 @@ sal_Bool MiscSettings::GetEnableATToolSupport() const HKEY hkey; if( ERROR_SUCCESS == RegOpenKey(HKEY_CURRENT_USER, - "Software\\OpenOffice.org\\Accessibility\\AtToolSupport", + "Software\\Aapche OpenOffice\\Accessibility\\AtToolSupport", &hkey) ) { DWORD dwType; @@ -1245,7 +1245,7 @@ void MiscSettings::SetEnableATToolSupport( sal_Bool bEnable ) // If the accessibility key in the Windows registry exists, change it synchronously if( ERROR_SUCCESS == RegOpenKey(HKEY_CURRENT_USER, - "Software\\OpenOffice.org\\Accessibility\\AtToolSupport", + "Software\\Apache OpenOffice\\Accessibility\\AtToolSupport", &hkey) ) { DWORD dwType; diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index a26ffdeaa54a..4ee5fd360f58 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -6302,7 +6302,7 @@ void ToolBox::ImplDisableFlatButtons() HKEY hkey; if( ERROR_SUCCESS == RegOpenKey(HKEY_CURRENT_USER, - "Software\\OpenOffice.org\\Accessibility\\AtToolSupport", + "Software\\Apache OpenOffice\\Accessibility\\AtToolSupport", &hkey) ) { DWORD dwType = 0; diff --git a/xmerge/source/activesync/XMergeFilter.cpp b/xmerge/source/activesync/XMergeFilter.cpp index 01126a645594..53a1750abba4 100644 --- a/xmerge/source/activesync/XMergeFilter.cpp +++ b/xmerge/source/activesync/XMergeFilter.cpp @@ -38,8 +38,8 @@ const LPTSTR CXMergeFilter::m_pszPSWExportCLSID = _T("{BDD611C3-7BAB-460F-8711-5B9AC9EF6020}"); const LPTSTR CXMergeFilter::m_pszPSWExportExt = _T("sxw"); -const LPTSTR CXMergeFilter::m_pszPSWExportDesc = _T("OpenOffice.org Writer XML Document"); -const LPTSTR CXMergeFilter::m_pszPSWExportShortDesc = _T("OpenOffice.org Writer"); +const LPTSTR CXMergeFilter::m_pszPSWExportDesc = _T("OpenOffice.org XML Writer Document"); +const LPTSTR CXMergeFilter::m_pszPSWExportShortDesc = _T("OpenOffice.org XML Writer"); const LPTSTR CXMergeFilter::m_pszPSWImportCLSID = _T("{CB43F086-838D-4FA4-B5F6-3406B9A57439}"); const LPTSTR CXMergeFilter::m_pszPSWImportExt = _T("psw"); @@ -48,8 +48,8 @@ const LPTSTR CXMergeFilter::m_pszPSWImportShortDesc = _T("Pocket Word"); const LPTSTR CXMergeFilter::m_pszPXLExportCLSID = _T("{C6AB3E74-9F4F-4370-8120-A8A6FABB7A7C}"); const LPTSTR CXMergeFilter::m_pszPXLExportExt = _T("sxc"); -const LPTSTR CXMergeFilter::m_pszPXLExportDesc = _T("OpenOffice.org Calc XML Document"); -const LPTSTR CXMergeFilter::m_pszPXLExportShortDesc = _T("OpenOffice.org Calc"); +const LPTSTR CXMergeFilter::m_pszPXLExportDesc = _T("OpenOffice.org XML Calc Document"); +const LPTSTR CXMergeFilter::m_pszPXLExportShortDesc = _T("OpenOffice.org XML Calc"); const LPTSTR CXMergeFilter::m_pszPXLImportCLSID = _T("{43887C67-4D5D-4127-BAAC-87A288494C7C}"); const LPTSTR CXMergeFilter::m_pszPXLImportExt = _T("pxl"); @@ -237,7 +237,7 @@ STDMETHODIMP CXMergeFilter::NextConvertFile(int nConversion, CFF_CONVERTINFO *pc } } - // Get the StarOffice/OpenOffice class directory + // Get the Apache OpenOffice class directory if (m_szClasspath == NULL) { m_szClasspath = GetXMergeClassPath(); diff --git a/xmerge/source/aportisdoc/converter.xml b/xmerge/source/aportisdoc/converter.xml index d7c3702b39ad..8635720e1b28 100644 --- a/xmerge/source/aportisdoc/converter.xml +++ b/xmerge/source/aportisdoc/converter.xml @@ -29,7 +29,7 @@ <converter-description> StarWriter XML to/from AportisDoc conversion </converter-description> - <converter-vendor>OpenOffice.org</converter-vendor> + <converter-vendor>Apache OpenOffice</converter-vendor> <converter-class-impl> org.openoffice.xmerge.converter.xml.sxw.aportisdoc.PluginFactoryImpl </converter-class-impl> diff --git a/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/package.html b/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/package.html index 74e86e6cba41..8133364461bc 100644 --- a/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/package.html +++ b/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/package.html @@ -163,7 +163,7 @@ then passed back to the client via the <code>ConvertData</code> object.</p> <tt><text:change*></tt> [Not implemented yet]</p> <p>Change tracking elements are not supported yet on the current - OpenOffice XML filters, will have to watch out on this. The text + OpenOffice.org XML filters, will have to watch out on this. The text within these elements have to be interpreted properly during the conversion process.</p> </li> diff --git a/xmerge/source/htmlsoff/converter.xml b/xmerge/source/htmlsoff/converter.xml index 69cacc7d988e..932056d4cbd8 100644 --- a/xmerge/source/htmlsoff/converter.xml +++ b/xmerge/source/htmlsoff/converter.xml @@ -30,7 +30,7 @@ <converter-description> Converter which performs xslt transformations </converter-description> - <converter-vendor>OpenOffice.org</converter-vendor> + <converter-vendor>Apache OpenOffice</converter-vendor> <converter-class-impl> org.openoffice.xmerge.converter.xml.xslt.PluginFactoryImpl </converter-class-impl> diff --git a/xmerge/source/htmlsoff/package.html b/xmerge/source/htmlsoff/package.html index a9c722dcd6e8..32b76f58acb7 100644 --- a/xmerge/source/htmlsoff/package.html +++ b/xmerge/source/htmlsoff/package.html @@ -38,8 +38,8 @@ Transformation</B></FONT></FONT></P> of one or more XSLT style sheets, which are used in the DocumentSerializer and DocumentDeserializer, to perform the actual translations. The location of these stylesheets is extracted from the {@link org.openoffice.xmerge.util.registry.ConverterInfo ConverterInfo} data structure, and are specified using the optional converter-xslt-serialize and converter-xsltdeserialize tags in a plugins converter.xml file. Please refer to the SDK document for more information about how to implement a Plugin Configuration XML File for a specific plugin. -A sample OpenOffice to Html stylesheet and Html to -Openffice stylesheet, has been provided as a sample implementation. +A sample OpenOffice.org XML to Html stylesheet and Html to +Openffice.org XML stylesheet, has been provided as a sample implementation. The converter also makes use of an XsltPlugin.properties file, which may be edited by the user to provide MIME-TYPE to file extension mappings. This file is used by the {@link org.openoffice.xmerge.converter.xml.xslt.PluginFactoryImpl getDeviceFileExtension} method. </p> diff --git a/xmerge/source/minicalc/converter.xml b/xmerge/source/minicalc/converter.xml index 149ce1e9ea1e..e41a4d3ede0f 100644 --- a/xmerge/source/minicalc/converter.xml +++ b/xmerge/source/minicalc/converter.xml @@ -29,7 +29,7 @@ <converter-description> StarCalc XML to/from Minicalc 6.4 conversion </converter-description> - <converter-vendor>OpenOffice.org</converter-vendor> + <converter-vendor>Apache OpenOffice</converter-vendor> <converter-class-impl> org.openoffice.xmerge.converter.xml.sxc.minicalc.PluginFactoryImpl </converter-class-impl> diff --git a/xmerge/source/pexcel/converter.xml b/xmerge/source/pexcel/converter.xml index 7a6d0fc7bec1..9f6cec0abe35 100644 --- a/xmerge/source/pexcel/converter.xml +++ b/xmerge/source/pexcel/converter.xml @@ -29,7 +29,7 @@ <converter-description> StarCalc XML to/from Pocket Excel 2.0 conversion </converter-description> - <converter-vendor>OpenOffice.org</converter-vendor> + <converter-vendor>Apache OpenOffice</converter-vendor> <converter-class-impl> org.openoffice.xmerge.converter.xml.sxc.pexcel.PluginFactoryImpl </converter-class-impl> diff --git a/xmerge/source/pocketword/converter.xml b/xmerge/source/pocketword/converter.xml index f1e65ab05ee5..557a1e89c1b8 100644 --- a/xmerge/source/pocketword/converter.xml +++ b/xmerge/source/pocketword/converter.xml @@ -30,10 +30,10 @@ Pocket Word </converter-display-name> <converter-description> - OpenOffice Writer XML to/from Pocket Word conversion. + OpenOffice.org XML Writer to/from Pocket Word conversion. </converter-description> <converter-vendor> - OpenOffice.org + Apache OpenOffice </converter-vendor> <converter-class-impl> org.openoffice.xmerge.converter.xml.sxw.pocketword.PluginFactoryImpl diff --git a/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentDeserializerImpl.java b/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentDeserializerImpl.java index b45d8a38891f..7fcdadf60a8b 100644 --- a/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentDeserializerImpl.java +++ b/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentDeserializerImpl.java @@ -53,7 +53,7 @@ import org.w3c.dom.Element; * org.openoffice.xmerge.converter.xml.sxw.pocketword.PluginFactoryImpl * PluginFactoryImpl}.</p> * - * <p>This converts a Pocket Word file to an OpenOffice Writer XML DOM.</p> + * <p>This converts a Pocket Word file to an OpenOffice.org XML Writer DOM.</p> * * @author Mark Murnane * @version 1.1 @@ -94,7 +94,7 @@ public final class DocumentDeserializerImpl /** * <p>Convert the data passed into the <code>DocumentDeserializer</code> - * constructor into the OpenOffice Writer <code>Document</code> + * constructor into the OpenOffice.org XML Writer <code>Document</code> * format.</p> * * <p>This method may or may not be thread-safe. It is expected @@ -120,7 +120,7 @@ public final class DocumentDeserializerImpl } catch (Exception e) { e.printStackTrace(); - throw new ConvertException("Error building OpenOffice Writer DOM: " + throw new ConvertException("Error building OpenOffice.org XML Writer DOM: " + e.toString()); } diff --git a/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentSerializerImpl.java b/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentSerializerImpl.java index 0ec52ae55c47..04e0ef32673f 100644 --- a/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentSerializerImpl.java +++ b/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentSerializerImpl.java @@ -48,7 +48,7 @@ import java.io.IOException; * org.openoffice.xmerge.converter.xml.sxw.pocketword.PluginFactoryImpl * PluginFactoryImpl}.</p> * - * <p>This converts an OpenOffice Writer XML files to a Pocket Word file<.</p> + * <p>This converts an OpenOffice.org XML Writer files to a Pocket Word file<.</p> * * @author Mark Murnane * @version 1.1 diff --git a/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PluginFactoryImpl.java b/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PluginFactoryImpl.java index 2beb0ba7e8f1..26c8f40d7aaa 100644 --- a/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PluginFactoryImpl.java +++ b/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PluginFactoryImpl.java @@ -69,7 +69,7 @@ public final class PluginFactoryImpl extends SxwPluginFactory /** * <p>The <code>DocumentSerializer</code> is used to convert - * from the OpenOffice Writer <code>Document</code> format + * from the OpenOffice.org XML Writer <code>Document</code> format * to the Pocket Word <code>Document</code> format.</p> * * <p>The <code>ConvertData</code> object is passed along to the @@ -92,7 +92,7 @@ public final class PluginFactoryImpl extends SxwPluginFactory /** * The <code>DocumentDeserializer</code> is used to convert * from the Pocket Word <code>Document</code> format to - * the OpenOffice Writer <code>Document</code> format.</p> + * the OpenOffice.org XML Writer <code>Document</code> format.</p> * * The <code>ConvertData</code> object is passed along to the * created <code>DocumentDeserializer</code> via its constructor. diff --git a/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordDocument.java b/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordDocument.java index 47f54bca77f2..2e6da2674c34 100644 --- a/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordDocument.java +++ b/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordDocument.java @@ -41,7 +41,7 @@ import java.util.Vector; * <p>Class representing a Pocket Word Document.</p> * * <p><code>PocketWordDocument</code> is used to create new Pocket Word documents - * and to read existing data to allow for conversion to OpenOffice Writer + * and to read existing data to allow for conversion to OpenOffice.org XML Writer * format.</p> * * @author Mark Murnane diff --git a/xmerge/source/wordsmith/converter.xml b/xmerge/source/wordsmith/converter.xml index a5b9297f4e96..f72978bfc1f8 100644 --- a/xmerge/source/wordsmith/converter.xml +++ b/xmerge/source/wordsmith/converter.xml @@ -27,7 +27,7 @@ <converter-description> StarWriter XML to/from WordSmith conversion </converter-description> - <converter-vendor>OpenOffice.org</converter-vendor> + <converter-vendor>Apache OpenOffice</converter-vendor> <converter-class-impl> org.openoffice.xmerge.converter.xml.sxw.wordsmith.PluginFactoryImpl </converter-class-impl> diff --git a/xmerge/source/xmerge/build.xml b/xmerge/source/xmerge/build.xml index 7703cd8cc14a..11a6f4445f5f 100644 --- a/xmerge/source/xmerge/build.xml +++ b/xmerge/source/xmerge/build.xml @@ -64,8 +64,8 @@ includes="**/*.properties" /> <manifest> <attribute name="Main-Class" value="org.openoffice.xmerge.test.Driver"/> - <attribute name="Specification-Title" value="OpenOffice XMerge Framework"/> - <attribute name="Specification-Vendor" value="OpenOffice.org"/> + <attribute name="Specification-Title" value="Apache OpenOffice XMerge Framework"/> + <attribute name="Specification-Vendor" value="Apache OpenOffice"/> <attribute name="Specification-Version" value="0.6.0"/> <attribute name="Implementation-Version" value="#IMPL-VERSION#"/> <attribute name="Class-Path" value="xml-apis.jar xercesImpl.jar serializer.jar"/> diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java index 9c23e0cf9401..c301c93efe3e 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java @@ -369,7 +369,7 @@ public class DOMDocument /** * <p>Creates a new DOM <code>Document</code> containing minimum - * OpenOffice XML tags.</p> + * OpenOffice.org XML tags.</p> * * <p>This method uses the subclass * <code>getOfficeClassAttribute</code> method to get the diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java index b68402c69ec5..1747e0afef39 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java @@ -1022,7 +1022,7 @@ public abstract class OfficeDocument /** * <p>Creates a new DOM <code>Document</code> containing minimum - * OpenOffice XML tags.</p> + * OpenOffice.org XML tags.</p> * * <p>This method uses the subclass * <code>getOfficeClassAttribute</code> method to get the @@ -1061,7 +1061,7 @@ public abstract class OfficeDocument /** * <p>Creates a new DOM <code>Document</code> containing minimum - * OpenOffice XML tags.</p> + * OpenOffice.org XML tags.</p> * * <p>This method uses the subclass * <code>getOfficeClassAttribute</code> method to get the diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/OfficeUtil.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/OfficeUtil.java index a9223c341f85..7530ccfbe17f 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/OfficeUtil.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/OfficeUtil.java @@ -43,7 +43,7 @@ public class OfficeUtil implements OfficeConstants { /** * <p>Method to replace whitespace character within text with appropriate - * OpenOffice tags.</p> + * OpenOffice.org XML tags.</p> * * @param text The text to parse for whitespace. * diff --git a/xmerge/util/build.xml b/xmerge/util/build.xml index 2f72e6f40633..81b49d25dc2b 100644 --- a/xmerge/util/build.xml +++ b/xmerge/util/build.xml @@ -53,8 +53,8 @@ nodeprecated="true" nodeprecatedlist="true" use="true" - Doctitle="OpenOffice XMerge API" - windowtitle="OpenOffice XMerge API" + Doctitle="Apache OpenOffice XMerge API" + windowtitle="Apache OpenOffice XMerge API" classpathref="classpath"> <fileset dir="../source/bridge" defaultexcludes="yes"> <include name="**/*.java"/> diff --git a/xmerge/util/xmerge.mf b/xmerge/util/xmerge.mf index 89d942f17b5c..9699a69aa4d1 100644 --- a/xmerge/util/xmerge.mf +++ b/xmerge/util/xmerge.mf @@ -1,8 +1,8 @@ Manifest-Version: 1.0 Main-Class: org.openoffice.xmerge.test.Driver Class-Path: xml-apis.jar xercesImpl.jar serializer.jar -Specification-Title: OpenOffice XMerge Framework -Specification-Vendor: OpenOffice.org +Specification-Title: Apache OpenOffice XMerge Framework +Specification-Vendor: Apache OpenOffice Specification-Version: 0.6.0 Implementation-Version: #IMPL-VERSION# diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.src b/xmlsecurity/source/dialogs/digitalsignaturesdialog.src index 2e6313d86a60..f0b3fc065340 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.src +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.src @@ -200,7 +200,7 @@ ErrorBox RID_XMLSECDLG_OLD_ODF_FORMAT Buttons = WB_OK ; DefButton = WB_DEF_OK ; Message [ en-US ] = - "This document contains signatures in ODF 1.1 (OpenOffice.org 2.x) format. " + "This document contains signatures in ODF 1.1 format. " "Signing documents in %PRODUCTNAME %PRODUCTVERSION requires ODF 1.2 format version. " "Thus no signatures can be added or removed to this document.\n\n" "Save document in ODF 1.2 format and add all desired signatures again."; diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx index 90313710b746..0738bee9dd5f 100644 --- a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx +++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx @@ -87,7 +87,7 @@ using ::rtl::OString; #define IMPLEMENTATION_NAME "com.sun.star.xml.security.bridge.xmlsec.NSSInitializer_NssImpl" -#define ROOT_CERTS "Root Certs for OpenOffice.org" +#define ROOT_CERTS "Root Certs for Apache OpenOffice" extern "C" void nsscrypto_finalize(); |