Author: jsc
Date: Mon Mar 3 16:37:25 2014
New Revision: 1573602
URL: http://svn.apache.org/r1573602
Log:
#124311# merge fixes from AOO410 branch
Modified:
openoffice/trunk/main/cui/source/dialogs/about.cxx
openoffice/trunk/main/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp
openoffice/trunk/main/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp
openoffice/trunk/main/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Image.bmp
openoffice/trunk/main/instsetoo_native/util/openoffice.lst
openoffice/trunk/main/setup_native/source/win32/nsis/ooobitmap.bmp
openoffice/trunk/main/setup_native/source/win32/nsis/ooosdkbitmap.bmp
Modified: openoffice/trunk/main/cui/source/dialogs/about.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/cui/source/dialogs/about.cxx?rev=1573602&r1=1573601&r2=1573602&view=diff
==============================================================================
--- openoffice/trunk/main/cui/source/dialogs/about.cxx (original)
+++ openoffice/trunk/main/cui/source/dialogs/about.cxx Mon Mar 3 16:37:25 2014
@@ -311,7 +311,7 @@ AboutDialog::AboutDialog( Window* pParen
sbcopyright.appendAscii("Copyright ");
sbcopyright.append((sal_Unicode)0x00a9);
sbcopyright.appendAscii(" ");
- rtl::OUString sYear( RTL_CONSTASCII_USTRINGPARAM("2013") );
+ rtl::OUString sYear( RTL_CONSTASCII_USTRINGPARAM("2014") );
if (vendor.EqualsAscii("Apache Software Foundation")) {
sbcopyright.append(sYear);
sbcopyright.appendAscii(" The Apache Software Foundation.\n\n");
Modified:
openoffice/trunk/main/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp?rev=1573602&r1=1573601&r2=1573602&view=diff
==============================================================================
Binary files - no diff available.
Modified:
openoffice/trunk/main/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp?rev=1573602&r1=1573601&r2=1573602&view=diff
==============================================================================
Binary files - no diff available.
Modified:
openoffice/trunk/main/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Image.bmp
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Image.bmp?rev=1573602&r1=1573601&r2=1573602&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/trunk/main/instsetoo_native/util/openoffice.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/instsetoo_native/util/openoffice.lst?rev=1573602&r1=1573601&r2=1573602&view=diff
==============================================================================
--- openoffice/trunk/main/instsetoo_native/util/openoffice.lst (original)
+++ openoffice/trunk/main/instsetoo_native/util/openoffice.lst Mon Mar 3
16:37:25 2014
@@ -321,7 +321,7 @@ Apache_OpenOffice_Beta_SDK
DOWNLOADSETUPICO ooosetup.ico
DONTUSESTARTMENUFOLDER 1
RELATIVE_PATHES_IN_DDF 1
- AOODOWNLOADNAMEPREFIX Apache_OpenOffice-Beta-SDK
+ AOODOWNLOADNAMEPREFIX Apache_OpenOffice_Beta-SDK
STARTCENTER_ADDFEATURE_URL http://extensions.openoffice.org/
STARTCENTER_INFO_URL http://www.openoffice.org
STARTCENTER_TEMPLREP_URL http://templates.openoffice.org
Modified: openoffice/trunk/main/setup_native/source/win32/nsis/ooobitmap.bmp
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/win32/nsis/ooobitmap.bmp?rev=1573602&r1=1573601&r2=1573602&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/trunk/main/setup_native/source/win32/nsis/ooosdkbitmap.bmp
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/win32/nsis/ooosdkbitmap.bmp?rev=1573602&r1=1573601&r2=1573602&view=diff
==============================================================================
Binary files - no diff available.
