You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by or...@apache.org on 2013/01/10 11:10:59 UTC
svn commit: r1431253 [1/4] - in /openoffice/trunk/main:
cli_ure/source/basetypes/ cli_ure/source/native/ cli_ure/source/ure/
cli_ure/unotypes/ cppuhelper/source/ desktop/util/
desktop/win32/source/applauncher/ooo/ filter/source/config/cache/
filter/sou...
Author: orw
Date: Thu Jan 10 10:10:56 2013
New Revision: 1431253
URL: http://svn.apache.org/viewvc?rev=1431253&view=rev
Log:
#121388# - Adapt naming "OpenOffice.org" --> "Apache OpenOffice"
-- impact on corresponding strings in the UI, folder names, package names, ...
Modified:
openoffice/trunk/main/cli_ure/source/basetypes/assembly.cs
openoffice/trunk/main/cli_ure/source/native/assembly.cxx
openoffice/trunk/main/cli_ure/source/native/native_bootstrap.cxx
openoffice/trunk/main/cli_ure/source/ure/assembly.cs
openoffice/trunk/main/cli_ure/unotypes/makefile.mk
openoffice/trunk/main/cppuhelper/source/findsofficepath.c
openoffice/trunk/main/desktop/util/ooverinfo.rc
openoffice/trunk/main/desktop/util/verinfo.rc
openoffice/trunk/main/desktop/win32/source/applauncher/ooo/verinfo.rc
openoffice/trunk/main/filter/source/config/cache/constant.hxx
openoffice/trunk/main/filter/source/config/cache/filtercache.cxx
openoffice/trunk/main/filter/source/config/cache/filtercache.hxx
openoffice/trunk/main/filter/source/config/fragments/filters/StarOffice_XML__Calc__ui.xcu
openoffice/trunk/main/filter/source/config/fragments/filters/StarOffice_XML__Chart__ui.xcu
openoffice/trunk/main/filter/source/config/fragments/filters/StarOffice_XML__Draw__ui.xcu
openoffice/trunk/main/filter/source/config/fragments/filters/StarOffice_XML__Impress__ui.xcu
openoffice/trunk/main/filter/source/config/fragments/filters/StarOffice_XML__Math__ui.xcu
openoffice/trunk/main/filter/source/config/fragments/filters/StarOffice_XML__Writer__ui.xcu
openoffice/trunk/main/filter/source/config/fragments/filters/calc_StarOffice_XML_Calc_Template_ui.xcu
openoffice/trunk/main/filter/source/config/fragments/filters/draw_StarOffice_XML_Draw_Template_ui.xcu
openoffice/trunk/main/filter/source/config/fragments/filters/impress_StarOffice_XML_Draw_ui.xcu
openoffice/trunk/main/filter/source/config/fragments/filters/impress_StarOffice_XML_Impress_Template_ui.xcu
openoffice/trunk/main/filter/source/config/fragments/filters/writer_StarOffice_XML_Writer_Template_ui.xcu
openoffice/trunk/main/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_GlobalDocument_ui.xcu
openoffice/trunk/main/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_ui.xcu
openoffice/trunk/main/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_Web_Template_ui.xcu
openoffice/trunk/main/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_ui.xcu
openoffice/trunk/main/filter/source/config/fragments/types/draw_StarOffice_XML_Draw.xcu
openoffice/trunk/main/filter/source/config/fragments/types/impress_StarOffice_XML_Impress.xcu
openoffice/trunk/main/filter/source/config/fragments/types/math_StarOffice_XML_Math.xcu
openoffice/trunk/main/filter/source/config/fragments/types/writer_Lotus_1_2_3_10_DOS_StarWriter.xcu
openoffice/trunk/main/filter/source/config/fragments/types/writer_Lotus_1_2_3_10_WIN_StarWriter.xcu
openoffice/trunk/main/filter/source/config/fragments/types/writer_StarOffice_XML_Writer.xcu
openoffice/trunk/main/filter/source/config/fragments/types/writer_StarWriter_30.xcu
openoffice/trunk/main/filter/source/config/fragments/types/writer_StarWriter_40.xcu
openoffice/trunk/main/filter/source/config/fragments/types/writer_StarWriter_50.xcu
openoffice/trunk/main/framework/inc/classes/filtercachedata.hxx
openoffice/trunk/main/helpcontent2/source/text/shared/00/00000021.xhp
openoffice/trunk/main/helpcontent2/source/text/shared/01/06150200.xhp
openoffice/trunk/main/helpcontent2/source/text/shared/guide/assistive.xhp
openoffice/trunk/main/helpcontent2/source/text/shared/guide/language_select.xhp
openoffice/trunk/main/helpcontent2/source/text/shared/guide/scripting.xhp
openoffice/trunk/main/helpcontent2/source/text/shared/optionen/improvement.xhp
openoffice/trunk/main/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
openoffice/trunk/main/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt
openoffice/trunk/main/instsetoo_native/util/makefile.mk
openoffice/trunk/main/instsetoo_native/util/openoffice.lst
openoffice/trunk/main/odk/cfgWin.js
openoffice/trunk/main/odk/configure.pl
openoffice/trunk/main/odk/docs/install.html
openoffice/trunk/main/odk/docs/notsupported.html
openoffice/trunk/main/odk/docs/tools.html
openoffice/trunk/main/odk/examples/cpp/StatusbarController/ModifiedStatusbarController/project.mk
openoffice/trunk/main/odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/project.mk
openoffice/trunk/main/odk/examples/cpp/StatusbarController/WordCountStatusbarController/project.mk
openoffice/trunk/main/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx
openoffice/trunk/main/odk/examples/cpp/custompanel/description.xml
openoffice/trunk/main/odk/pack/copying/dk.mk
openoffice/trunk/main/odk/pack/copying/idl_chapter_refs.txt
openoffice/trunk/main/odk/setsdkenv_unix
openoffice/trunk/main/odk/setsdkenv_unix.sh.in
openoffice/trunk/main/odk/setsdkenv_windows.template
openoffice/trunk/main/odk/source/com/sun/star/lib/loader/InstallationFinder.java
openoffice/trunk/main/odk/source/unoapploader/win/unoapploader.c
openoffice/trunk/main/odk/util/makefile.pmk
openoffice/trunk/main/officecfg/registry/data/org/openoffice/Setup.xcu
openoffice/trunk/main/postprocess/rebase/no_rebase.txt
openoffice/trunk/main/readlicense_oo/docs/readme/readme.xrm
openoffice/trunk/main/sc/source/ui/vba/vbawindow.cxx
openoffice/trunk/main/sc/xml/ScXMLExport.xml
openoffice/trunk/main/sc/xml/ScXMLImport.xml
openoffice/trunk/main/scp2/inc/macros.inc
openoffice/trunk/main/scp2/source/ooo/installation_ooo.scp
openoffice/trunk/main/scp2/source/ooo/registryitem_ooo.scp
openoffice/trunk/main/scp2/source/ooo/registryitem_ooo.ulf
openoffice/trunk/main/scp2/source/ooo/ure.scp
openoffice/trunk/main/scp2/source/ooo/ure_standalone.scp
openoffice/trunk/main/scp2/source/quickstart/registryitem_quickstart.scp
openoffice/trunk/main/scp2/source/sdkoo/sdkoo.scp
openoffice/trunk/main/scp2/source/winexplorerext/registryitem_winexplorerext.scp
openoffice/trunk/main/scp2/util/makefile.mk
openoffice/trunk/main/setup_native/scripts/langpackscript.sh
openoffice/trunk/main/setup_native/scripts/update.sh
openoffice/trunk/main/setup_native/source/opensolaris/bundledextensions/README
openoffice/trunk/main/setup_native/source/opensolaris/bundledextensions/ooo_bundled_extensions.xml
openoffice/trunk/main/setup_native/source/opensolaris/bundledextensions/svc-ooo_bundled_extensions
openoffice/trunk/main/setup_native/source/packinfo/package_names.txt
openoffice/trunk/main/setup_native/source/packinfo/packinfo_office.txt
openoffice/trunk/main/setup_native/source/packinfo/packinfo_office_lang.txt
openoffice/trunk/main/setup_native/source/packinfo/packinfo_sdkoo.txt
openoffice/trunk/main/setup_native/source/packinfo/shellscripts_brand.txt
openoffice/trunk/main/setup_native/source/packinfo/shellscripts_core01.txt
openoffice/trunk/main/setup_native/source/win32/customactions/languagepacks/lngpckinsthelper.cxx
openoffice/trunk/main/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
openoffice/trunk/main/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx
openoffice/trunk/main/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.cxx
openoffice/trunk/main/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.hxx
openoffice/trunk/main/setup_native/source/win32/customactions/relnotes/relnotes.cxx
openoffice/trunk/main/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx
openoffice/trunk/main/setup_native/source/win32/stwrapper/stwrapper.manifest
openoffice/trunk/main/shell/inc/internal/config.hxx
openoffice/trunk/main/shell/source/unix/sysshell/recently_used_file_handler.cxx
openoffice/trunk/main/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
openoffice/trunk/main/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
openoffice/trunk/main/shell/source/win32/shlxthandler/res/shlxthdl.manifest
openoffice/trunk/main/shell/source/win32/sysmail/sysmailclient.cxx
openoffice/trunk/main/solenv/bin/modules/installer/download.pm
openoffice/trunk/main/solenv/bin/modules/installer/epmfile.pm
openoffice/trunk/main/solenv/bin/modules/installer/simplepackage.pm
openoffice/trunk/main/solenv/bin/modules/installer/windows/msp.pm
openoffice/trunk/main/solenv/bin/modules/installer/ziplist.pm
openoffice/trunk/main/svx/source/dialog/sendreportw32.cxx
openoffice/trunk/main/sysui/desktop/debian/control
openoffice/trunk/main/sysui/desktop/freedesktop/freedesktop-menus.spec
openoffice/trunk/main/sysui/desktop/macosx/Info.plist
openoffice/trunk/main/sysui/desktop/mandriva/mandriva-menus.spec
openoffice/trunk/main/sysui/desktop/productversion.mk
openoffice/trunk/main/sysui/desktop/redhat/redhat-menus.spec
openoffice/trunk/main/sysui/desktop/share/brand.pl
openoffice/trunk/main/sysui/desktop/share/create_mime_xml.pl
openoffice/trunk/main/sysui/desktop/share/create_tree.sh
openoffice/trunk/main/sysui/desktop/share/makefile.mk
openoffice/trunk/main/sysui/desktop/share/translate.pl
openoffice/trunk/main/sysui/desktop/solaris/makefile.mk
openoffice/trunk/main/sysui/desktop/solaris/prototype
openoffice/trunk/main/sysui/desktop/suse/suse-menus.spec
openoffice/trunk/main/unoil/climaker/makefile.mk
openoffice/trunk/main/vcl/source/app/settings.cxx
openoffice/trunk/main/vcl/source/window/toolbox.cxx
openoffice/trunk/main/xmerge/source/activesync/XMergeFilter.cpp
openoffice/trunk/main/xmerge/source/aportisdoc/converter.xml
openoffice/trunk/main/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/package.html
openoffice/trunk/main/xmerge/source/htmlsoff/converter.xml
openoffice/trunk/main/xmerge/source/htmlsoff/package.html
openoffice/trunk/main/xmerge/source/minicalc/converter.xml
openoffice/trunk/main/xmerge/source/pexcel/converter.xml
openoffice/trunk/main/xmerge/source/pocketword/converter.xml
openoffice/trunk/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentDeserializerImpl.java
openoffice/trunk/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentSerializerImpl.java
openoffice/trunk/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PluginFactoryImpl.java
openoffice/trunk/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordDocument.java
openoffice/trunk/main/xmerge/source/wordsmith/converter.xml
openoffice/trunk/main/xmerge/source/xmerge/build.xml
openoffice/trunk/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java
openoffice/trunk/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java
openoffice/trunk/main/xmerge/source/xmerge/java/org/openoffice/xmerge/util/OfficeUtil.java
openoffice/trunk/main/xmerge/util/build.xml
openoffice/trunk/main/xmerge/util/xmerge.mf
openoffice/trunk/main/xmlsecurity/source/dialogs/digitalsignaturesdialog.src
openoffice/trunk/main/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
Modified: openoffice/trunk/main/cli_ure/source/basetypes/assembly.cs
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cli_ure/source/basetypes/assembly.cs?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/cli_ure/source/basetypes/assembly.cs (original)
+++ openoffice/trunk/main/cli_ure/source/basetypes/assembly.cs Thu Jan 10 10:10:56 2013
@@ -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")]
Modified: openoffice/trunk/main/cli_ure/source/native/assembly.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cli_ure/source/native/assembly.cxx?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/cli_ure/source/native/assembly.cxx (original)
+++ openoffice/trunk/main/cli_ure/source/native/assembly.cxx Thu Jan 10 10:10:56 2013
@@ -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" )];
Modified: openoffice/trunk/main/cli_ure/source/native/native_bootstrap.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cli_ure/source/native/native_bootstrap.cxx?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/cli_ure/source/native/native_bootstrap.cxx (original)
+++ openoffice/trunk/main/cli_ure/source/native/native_bootstrap.cxx Thu Jan 10 10:10:56 2013
@@ -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.
*/
Modified: openoffice/trunk/main/cli_ure/source/ure/assembly.cs
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cli_ure/source/ure/assembly.cs?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/cli_ure/source/ure/assembly.cs (original)
+++ openoffice/trunk/main/cli_ure/source/ure/assembly.cs Thu Jan 10 10:10:56 2013
@@ -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")]
Modified: openoffice/trunk/main/cli_ure/unotypes/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cli_ure/unotypes/makefile.mk?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/cli_ure/unotypes/makefile.mk (original)
+++ openoffice/trunk/main/cli_ure/unotypes/makefile.mk Thu Jan 10 10:10:56 2013
@@ -54,8 +54,8 @@ $(OUT)$/bin$/cli_uretypes.dll : $(BIN)$/
--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.
Modified: openoffice/trunk/main/cppuhelper/source/findsofficepath.c
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cppuhelper/source/findsofficepath.c?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/cppuhelper/source/findsofficepath.c (original)
+++ openoffice/trunk/main/cppuhelper/source/findsofficepath.c Thu Jan 10 10:10:56 2013
@@ -86,7 +86,7 @@ static char* getPathFromRegistryKey( HKE
*/
static char* platformSpecific()
{
- const char* SUBKEYNAME = "Software\\OpenOffice.org\\UNO\\InstallPath";
+ const char* SUBKEYNAME = "Software\\Apache OpenOffice\\UNO\\InstallPath";
char* path = NULL;
Modified: openoffice/trunk/main/desktop/util/ooverinfo.rc
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/desktop/util/ooverinfo.rc?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/desktop/util/ooverinfo.rc (original)
+++ openoffice/trunk/main/desktop/util/ooverinfo.rc Thu Jan 10 10:10:56 2013
@@ -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"
Modified: openoffice/trunk/main/desktop/util/verinfo.rc
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/desktop/util/verinfo.rc?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/desktop/util/verinfo.rc (original)
+++ openoffice/trunk/main/desktop/util/verinfo.rc Thu Jan 10 10:10:56 2013
@@ -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"
Modified: openoffice/trunk/main/desktop/win32/source/applauncher/ooo/verinfo.rc
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/desktop/win32/source/applauncher/ooo/verinfo.rc?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/desktop/win32/source/applauncher/ooo/verinfo.rc (original)
+++ openoffice/trunk/main/desktop/win32/source/applauncher/ooo/verinfo.rc Thu Jan 10 10:10:56 2013
@@ -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"
Modified: openoffice/trunk/main/filter/source/config/cache/constant.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/filter/source/config/cache/constant.hxx?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/filter/source/config/cache/constant.hxx (original)
+++ openoffice/trunk/main/filter/source/config/cache/constant.hxx Thu Jan 10 10:10:56 2013
@@ -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.
Modified: openoffice/trunk/main/filter/source/config/cache/filtercache.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/filter/source/config/cache/filtercache.cxx?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/filter/source/config/cache/filtercache.cxx (original)
+++ openoffice/trunk/main/filter/source/config/cache/filtercache.cxx Thu Jan 10 10:10:56 2013
@@ -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 FilterC
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 eRequi
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(
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(
::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(
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)
{
Modified: openoffice/trunk/main/filter/source/config/cache/filtercache.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/filter/source/config/cache/filtercache.hxx?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/filter/source/config/cache/filtercache.hxx (original)
+++ openoffice/trunk/main/filter/source/config/cache/filtercache.hxx Thu Jan 10 10:10:56 2013
@@ -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
Modified: openoffice/trunk/main/filter/source/config/fragments/filters/StarOffice_XML__Calc__ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/filter/source/config/fragments/filters/StarOffice_XML__Calc__ui.xcu?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/filter/source/config/fragments/filters/StarOffice_XML__Calc__ui.xcu (original)
+++ openoffice/trunk/main/filter/source/config/fragments/filters/StarOffice_XML__Calc__ui.xcu Thu Jan 10 10:10:56 2013
@@ -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>
Modified: openoffice/trunk/main/filter/source/config/fragments/filters/StarOffice_XML__Chart__ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/filter/source/config/fragments/filters/StarOffice_XML__Chart__ui.xcu?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/filter/source/config/fragments/filters/StarOffice_XML__Chart__ui.xcu (original)
+++ openoffice/trunk/main/filter/source/config/fragments/filters/StarOffice_XML__Chart__ui.xcu Thu Jan 10 10:10:56 2013
@@ -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>
Modified: openoffice/trunk/main/filter/source/config/fragments/filters/StarOffice_XML__Draw__ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/filter/source/config/fragments/filters/StarOffice_XML__Draw__ui.xcu?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/filter/source/config/fragments/filters/StarOffice_XML__Draw__ui.xcu (original)
+++ openoffice/trunk/main/filter/source/config/fragments/filters/StarOffice_XML__Draw__ui.xcu Thu Jan 10 10:10:56 2013
@@ -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>
Modified: openoffice/trunk/main/filter/source/config/fragments/filters/StarOffice_XML__Impress__ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/filter/source/config/fragments/filters/StarOffice_XML__Impress__ui.xcu?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/filter/source/config/fragments/filters/StarOffice_XML__Impress__ui.xcu (original)
+++ openoffice/trunk/main/filter/source/config/fragments/filters/StarOffice_XML__Impress__ui.xcu Thu Jan 10 10:10:56 2013
@@ -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>
Modified: openoffice/trunk/main/filter/source/config/fragments/filters/StarOffice_XML__Math__ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/filter/source/config/fragments/filters/StarOffice_XML__Math__ui.xcu?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/filter/source/config/fragments/filters/StarOffice_XML__Math__ui.xcu (original)
+++ openoffice/trunk/main/filter/source/config/fragments/filters/StarOffice_XML__Math__ui.xcu Thu Jan 10 10:10:56 2013
@@ -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>
Modified: openoffice/trunk/main/filter/source/config/fragments/filters/StarOffice_XML__Writer__ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/filter/source/config/fragments/filters/StarOffice_XML__Writer__ui.xcu?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/filter/source/config/fragments/filters/StarOffice_XML__Writer__ui.xcu (original)
+++ openoffice/trunk/main/filter/source/config/fragments/filters/StarOffice_XML__Writer__ui.xcu Thu Jan 10 10:10:56 2013
@@ -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>
Modified: openoffice/trunk/main/filter/source/config/fragments/filters/calc_StarOffice_XML_Calc_Template_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/filter/source/config/fragments/filters/calc_StarOffice_XML_Calc_Template_ui.xcu?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/filter/source/config/fragments/filters/calc_StarOffice_XML_Calc_Template_ui.xcu (original)
+++ openoffice/trunk/main/filter/source/config/fragments/filters/calc_StarOffice_XML_Calc_Template_ui.xcu Thu Jan 10 10:10:56 2013
@@ -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>
Modified: openoffice/trunk/main/filter/source/config/fragments/filters/draw_StarOffice_XML_Draw_Template_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/filter/source/config/fragments/filters/draw_StarOffice_XML_Draw_Template_ui.xcu?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/filter/source/config/fragments/filters/draw_StarOffice_XML_Draw_Template_ui.xcu (original)
+++ openoffice/trunk/main/filter/source/config/fragments/filters/draw_StarOffice_XML_Draw_Template_ui.xcu Thu Jan 10 10:10:56 2013
@@ -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>
Modified: openoffice/trunk/main/filter/source/config/fragments/filters/impress_StarOffice_XML_Draw_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/filter/source/config/fragments/filters/impress_StarOffice_XML_Draw_ui.xcu?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/filter/source/config/fragments/filters/impress_StarOffice_XML_Draw_ui.xcu (original)
+++ openoffice/trunk/main/filter/source/config/fragments/filters/impress_StarOffice_XML_Draw_ui.xcu Thu Jan 10 10:10:56 2013
@@ -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>
Modified: openoffice/trunk/main/filter/source/config/fragments/filters/impress_StarOffice_XML_Impress_Template_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/filter/source/config/fragments/filters/impress_StarOffice_XML_Impress_Template_ui.xcu?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/filter/source/config/fragments/filters/impress_StarOffice_XML_Impress_Template_ui.xcu (original)
+++ openoffice/trunk/main/filter/source/config/fragments/filters/impress_StarOffice_XML_Impress_Template_ui.xcu Thu Jan 10 10:10:56 2013
@@ -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>
Modified: openoffice/trunk/main/filter/source/config/fragments/filters/writer_StarOffice_XML_Writer_Template_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/filter/source/config/fragments/filters/writer_StarOffice_XML_Writer_Template_ui.xcu?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/filter/source/config/fragments/filters/writer_StarOffice_XML_Writer_Template_ui.xcu (original)
+++ openoffice/trunk/main/filter/source/config/fragments/filters/writer_StarOffice_XML_Writer_Template_ui.xcu Thu Jan 10 10:10:56 2013
@@ -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>
Modified: openoffice/trunk/main/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_GlobalDocument_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_GlobalDocument_ui.xcu?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_GlobalDocument_ui.xcu (original)
+++ openoffice/trunk/main/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_GlobalDocument_ui.xcu Thu Jan 10 10:10:56 2013
@@ -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>
Modified: openoffice/trunk/main/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_ui.xcu?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_ui.xcu (original)
+++ openoffice/trunk/main/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_ui.xcu Thu Jan 10 10:10:56 2013
@@ -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>
Modified: openoffice/trunk/main/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_Web_Template_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_Web_Template_ui.xcu?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_Web_Template_ui.xcu (original)
+++ openoffice/trunk/main/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_Web_Template_ui.xcu Thu Jan 10 10:10:56 2013
@@ -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>
Modified: openoffice/trunk/main/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_ui.xcu?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_ui.xcu (original)
+++ openoffice/trunk/main/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_ui.xcu Thu Jan 10 10:10:56 2013
@@ -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>
Modified: openoffice/trunk/main/filter/source/config/fragments/types/draw_StarOffice_XML_Draw.xcu
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/filter/source/config/fragments/types/draw_StarOffice_XML_Draw.xcu?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/filter/source/config/fragments/types/draw_StarOffice_XML_Draw.xcu (original)
+++ openoffice/trunk/main/filter/source/config/fragments/types/draw_StarOffice_XML_Draw.xcu Thu Jan 10 10:10:56 2013
@@ -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>
Modified: openoffice/trunk/main/filter/source/config/fragments/types/impress_StarOffice_XML_Impress.xcu
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/filter/source/config/fragments/types/impress_StarOffice_XML_Impress.xcu?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/filter/source/config/fragments/types/impress_StarOffice_XML_Impress.xcu (original)
+++ openoffice/trunk/main/filter/source/config/fragments/types/impress_StarOffice_XML_Impress.xcu Thu Jan 10 10:10:56 2013
@@ -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>
Modified: openoffice/trunk/main/filter/source/config/fragments/types/math_StarOffice_XML_Math.xcu
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/filter/source/config/fragments/types/math_StarOffice_XML_Math.xcu?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/filter/source/config/fragments/types/math_StarOffice_XML_Math.xcu (original)
+++ openoffice/trunk/main/filter/source/config/fragments/types/math_StarOffice_XML_Math.xcu Thu Jan 10 10:10:56 2013
@@ -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>
Modified: openoffice/trunk/main/filter/source/config/fragments/types/writer_Lotus_1_2_3_10_DOS_StarWriter.xcu
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/filter/source/config/fragments/types/writer_Lotus_1_2_3_10_DOS_StarWriter.xcu?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/filter/source/config/fragments/types/writer_Lotus_1_2_3_10_DOS_StarWriter.xcu (original)
+++ openoffice/trunk/main/filter/source/config/fragments/types/writer_Lotus_1_2_3_10_DOS_StarWriter.xcu Thu Jan 10 10:10:56 2013
@@ -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>
Modified: openoffice/trunk/main/filter/source/config/fragments/types/writer_Lotus_1_2_3_10_WIN_StarWriter.xcu
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/filter/source/config/fragments/types/writer_Lotus_1_2_3_10_WIN_StarWriter.xcu?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/filter/source/config/fragments/types/writer_Lotus_1_2_3_10_WIN_StarWriter.xcu (original)
+++ openoffice/trunk/main/filter/source/config/fragments/types/writer_Lotus_1_2_3_10_WIN_StarWriter.xcu Thu Jan 10 10:10:56 2013
@@ -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>
Modified: openoffice/trunk/main/filter/source/config/fragments/types/writer_StarOffice_XML_Writer.xcu
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/filter/source/config/fragments/types/writer_StarOffice_XML_Writer.xcu?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/filter/source/config/fragments/types/writer_StarOffice_XML_Writer.xcu (original)
+++ openoffice/trunk/main/filter/source/config/fragments/types/writer_StarOffice_XML_Writer.xcu Thu Jan 10 10:10:56 2013
@@ -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>
Modified: openoffice/trunk/main/filter/source/config/fragments/types/writer_StarWriter_30.xcu
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/filter/source/config/fragments/types/writer_StarWriter_30.xcu?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/filter/source/config/fragments/types/writer_StarWriter_30.xcu (original)
+++ openoffice/trunk/main/filter/source/config/fragments/types/writer_StarWriter_30.xcu Thu Jan 10 10:10:56 2013
@@ -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>
Modified: openoffice/trunk/main/filter/source/config/fragments/types/writer_StarWriter_40.xcu
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/filter/source/config/fragments/types/writer_StarWriter_40.xcu?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/filter/source/config/fragments/types/writer_StarWriter_40.xcu (original)
+++ openoffice/trunk/main/filter/source/config/fragments/types/writer_StarWriter_40.xcu Thu Jan 10 10:10:56 2013
@@ -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>
Modified: openoffice/trunk/main/filter/source/config/fragments/types/writer_StarWriter_50.xcu
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/filter/source/config/fragments/types/writer_StarWriter_50.xcu?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/filter/source/config/fragments/types/writer_StarWriter_50.xcu (original)
+++ openoffice/trunk/main/filter/source/config/fragments/types/writer_StarWriter_50.xcu Thu Jan 10 10:10:56 2013
@@ -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>
Modified: openoffice/trunk/main/framework/inc/classes/filtercachedata.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/framework/inc/classes/filtercachedata.hxx?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/framework/inc/classes/filtercachedata.hxx (original)
+++ openoffice/trunk/main/framework/inc/classes/filtercachedata.hxx Thu Jan 10 10:10:56 2013
@@ -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 ...
Modified: openoffice/trunk/main/helpcontent2/source/text/shared/00/00000021.xhp
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/helpcontent2/source/text/shared/00/00000021.xhp?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/helpcontent2/source/text/shared/00/00000021.xhp (original)
+++ openoffice/trunk/main/helpcontent2/source/text/shared/00/00000021.xhp Thu Jan 10 10:10:56 2013
@@ -217,7 +217,7 @@
<paragraph xml-lang="en-US" id="par_id0514200811565762" role="tablecontent" l10n="NEW">ODF 1.2</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id0519200811530440" role="tablecontent" l10n="NEW">to be announced</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0519200811530440" role="tablecontent" l10n="NEW">2011-09-29</paragraph>
</tablecell>
<tablecell>
<paragraph role="tablecontent" id="par_id0519200811530471" xml-lang="en-US" l10n="NEW">OpenOffice.org 3, StarOffice 9, Apache Open Office</paragraph>
@@ -263,7 +263,7 @@
<paragraph role="heading" id="hd_id3154299" xml-lang="en-US" level="2" l10n="U" oldref="38">Definition of the XML formats</paragraph>
<paragraph role="paragraph" id="par_idN10AAD" xml-lang="en-US" l10n="NEW">The schema for the OpenDocument formats can be found on the <link href="http://www.oasis-open.org">www.oasis-open.org</link> web site.</paragraph>
<paragraph role="paragraph" id="par_id3149561" xml-lang="en-US" l10n="CHG" oldref="39">The DTD (Document Type Description) files for the older formats can be found in the installation folder.<comment>removed path</comment></paragraph>
-<paragraph role="paragraph" id="par_id3152596" xml-lang="en-US" l10n="U" oldref="40">Note that the formats are subject to certain licenses. You can find notes on the licenses at the start of the DTD files. More detailed information can be found on the <link href="http://www.openoffice.org" name="OpenOffice.org">OpenOffice.org</link> website.</paragraph>
+<paragraph role="paragraph" id="par_id3152596" xml-lang="en-US" l10n="U" oldref="40">Note that the formats are subject to certain licenses. You can find notes on the licenses at the start of the DTD files. More detailed information can be found on the <link href="http://www.openoffice.org" name="Apache OpenOffice">Apache OpenOffice</link> website.</paragraph>
<section id="relatedtopics">
<embed href="text/shared/guide/doc_open.xhp#doc_open"/>
<embed href="text/shared/guide/doc_save.xhp#doc_save"/>
Modified: openoffice/trunk/main/helpcontent2/source/text/shared/01/06150200.xhp
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/helpcontent2/source/text/shared/01/06150200.xhp?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/helpcontent2/source/text/shared/01/06150200.xhp (original)
+++ openoffice/trunk/main/helpcontent2/source/text/shared/01/06150200.xhp Thu Jan 10 10:10:56 2013
@@ -65,7 +65,7 @@
<paragraph role="heading" id="hd_id3163802" xml-lang="en-US" level="3" l10n="U" oldref="15">Transform file</paragraph>
<bookmark xml-lang="en-US" branch="hid/FILTER_HID_XML_FILTER_TEST_IMPORT_DISPLAY_SOURCE" id="bm_id3149812" localize="false"/>
<paragraph role="heading" id="hd_id3147242" xml-lang="en-US" level="4" l10n="U" oldref="16">Display source</paragraph>
-<paragraph role="paragraph" id="par_id3150444" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="HID_XML_FILTER_TEST_IMPORT_DISPLAY_SOURCE">Opens the <embedvar href="text/shared/01/06150210.xhp#xmlfilteroutput"/> window, where the XML source of the selected document is displayed. The document is used to test the import filter.</ahelp> The <emph>Validate</emph> button in the window validates the XML source of the document against the OpenOffice.org DTD.</paragraph>
+<paragraph role="paragraph" id="par_id3150444" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="HID_XML_FILTER_TEST_IMPORT_DISPLAY_SOURCE">Opens the <embedvar href="text/shared/01/06150210.xhp#xmlfilteroutput"/> window, where the XML source of the selected document is displayed. The document is used to test the import filter.</ahelp> The <emph>Validate</emph> button in the window validates the XML source of the document.</paragraph>
<bookmark xml-lang="en-US" branch="hid/FILTER_HID_XML_FILTER_TEST_IMPORT_BROWSE" id="bm_id3154577" localize="false"/>
<paragraph role="heading" id="hd_id3147078" xml-lang="en-US" level="4" l10n="U" oldref="18">Browse</paragraph>
<paragraph role="paragraph" id="par_id3149885" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="HID_XML_FILTER_TEST_IMPORT_BROWSE">Opens a file selection dialog. The selected file is opened using the current XML import filter.</ahelp></paragraph>
Modified: openoffice/trunk/main/helpcontent2/source/text/shared/guide/assistive.xhp
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/helpcontent2/source/text/shared/guide/assistive.xhp?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/helpcontent2/source/text/shared/guide/assistive.xhp (original)
+++ openoffice/trunk/main/helpcontent2/source/text/shared/guide/assistive.xhp Thu Jan 10 10:10:56 2013
@@ -43,7 +43,7 @@
<paragraph role="heading" id="hd_id3147399" xml-lang="en-US" level="1" l10n="U" oldref="22"><variable id="assistive"><link href="text/shared/guide/assistive.xhp" name="Assistive Tools in $[officename]">Assistive Tools in $[officename]</link>
</variable></paragraph>
<paragraph role="paragraph" id="par_id3143267" xml-lang="en-US" l10n="U" oldref="25">$[officename] supports some assistive technology tools like screen magnification software, screen readers, and on-screen keyboards. Most of these tools communicate with $[officename] by means of the Java(TM) Access Bridge software, that uses the Java Accessibility API, a part of the Java runtime environment.</paragraph>
-<paragraph role="tip" id="par_id8847010" xml-lang="en-US" l10n="NEW">A current list of supported assistive tools can be found on the OpenOffice.org Wiki at <link href="http://wiki.services.openoffice.org/wiki/Accessibility">http://wiki.services.openoffice.org/wiki/Accessibility</link>.</paragraph>
+<paragraph role="tip" id="par_id8847010" xml-lang="en-US" l10n="NEW">A current list of supported assistive tools can be found on the Apache OpenOffice Wiki at <link href="http://wiki.services.openoffice.org/wiki/Accessibility">http://wiki.services.openoffice.org/wiki/Accessibility</link>.</paragraph>
<paragraph role="heading" id="hd_id3145345" xml-lang="en-US" level="2" l10n="U" oldref="12">Requirements to use assistive tools in $[officename]</paragraph>
<list type="unordered">
<listitem>
Modified: openoffice/trunk/main/helpcontent2/source/text/shared/guide/language_select.xhp
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/helpcontent2/source/text/shared/guide/language_select.xhp?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/helpcontent2/source/text/shared/guide/language_select.xhp (original)
+++ openoffice/trunk/main/helpcontent2/source/text/shared/guide/language_select.xhp Thu Jan 10 10:10:56 2013
@@ -148,7 +148,7 @@
<paragraph xml-lang="en-US" id="par_id121158" role="paragraph" l10n="NEW">Select another UI language in the "User interface" listbox.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3806878" role="paragraph" l10n="NEW">Click OK and restart the OpenOffice.org software.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3806878" role="paragraph" l10n="NEW">Click OK and restart the %PRODUCTNAME software.</paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_id130619" role="paragraph" l10n="NEW">If the listbox doesn't list the language that you want, see "Adding More UI Languages".</paragraph>
Modified: openoffice/trunk/main/helpcontent2/source/text/shared/guide/scripting.xhp
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/helpcontent2/source/text/shared/guide/scripting.xhp?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/helpcontent2/source/text/shared/guide/scripting.xhp (original)
+++ openoffice/trunk/main/helpcontent2/source/text/shared/guide/scripting.xhp Thu Jan 10 10:10:56 2013
@@ -60,7 +60,7 @@
<paragraph xml-lang="en-US" id="par_id6797082" role="paragraph" l10n="CHG">Python</paragraph>
</listitem>
</list>
- <paragraph xml-lang="en-US" id="par_idN1091F" role="paragraph" l10n="NEW">In addition, developers can use high-level languages, for example Java programming language, to control %PRODUCTNAME externally. See the API project at OpenOffice.org.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN1091F" role="paragraph" l10n="NEW">In addition, developers can use high-level languages, for example Java programming language, to control %PRODUCTNAME externally. See the API project at Apache OpenOffice.</paragraph>
<paragraph xml-lang="en-US" id="par_idN10751" role="heading" level="2" l10n="NEW">To assign a script to a new menu entry</paragraph>
<list type="ordered">
<listitem>
Modified: openoffice/trunk/main/helpcontent2/source/text/shared/optionen/improvement.xhp
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/helpcontent2/source/text/shared/optionen/improvement.xhp?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/helpcontent2/source/text/shared/optionen/improvement.xhp (original)
+++ openoffice/trunk/main/helpcontent2/source/text/shared/optionen/improvement.xhp Thu Jan 10 10:10:56 2013
@@ -46,7 +46,7 @@
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#improvement"/>
</section>
- <paragraph xml-lang="en-US" id="par_id0526200903594966" role="paragraph" l10n="NEW">The Improvement Program was initiated by the User Experience project to improve the usability of %PRODUCTNAME. The User Experience project can be found at the OpenOffice.org web site: <link href="http://ux.openoffice.org/">http://ux.openoffice.org/</link>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0526200903594966" role="paragraph" l10n="NEW">The Improvement Program was initiated by the User Experience project to improve the usability of %PRODUCTNAME. The User Experience project can be found at the Apache OpenOffice website: <link href="http://ux.openoffice.org/">http://ux.openoffice.org/</link>.</paragraph>
<paragraph xml-lang="en-US" id="par_id0526200903594946" role="paragraph" l10n="NEW">The second time you start your new %PRODUCTNAME software, you see a window that gives information about the Improvement Program. </paragraph>
<paragraph xml-lang="en-US" id="par_id0526200904094345" role="paragraph" l10n="NEW">At this time you can choose to accept or deny your participation.</paragraph>
<list type="ordered">
Modified: openoffice/trunk/main/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt (original)
+++ openoffice/trunk/main/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt Thu Jan 10 10:10:56 2013
@@ -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
Modified: openoffice/trunk/main/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt (original)
+++ openoffice/trunk/main/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt Thu Jan 10 10:10:56 2013
@@ -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
Modified: openoffice/trunk/main/instsetoo_native/util/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/instsetoo_native/util/makefile.mk?rev=1431253&r1=1431252&r2=1431253&view=diff
==============================================================================
--- openoffice/trunk/main/instsetoo_native/util/makefile.mk (original)
+++ openoffice/trunk/main/instsetoo_native/util/makefile.mk Thu Jan 10 10:10:56 2013
@@ -195,33 +195,33 @@ $(MAKETARGETS){$(PKGFORMAT:^".")} : $(AD
.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:^".")} :