[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - cui/source instsetoo_native/inc_ooolangpack instsetoo_native/inc_openoffice instsetoo_native/inc_sdkoo instsetoo_native/util setup_native/source solenv/bin

[Andre Fischer]

 cui/source/dialogs/about.cxx                                            |    2 +-
 instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp |binary
 instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp  |binary
 instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Image.bmp       |binary
 instsetoo_native/util/openoffice.lst                                    |    2 +-
 setup_native/source/win32/nsis/ooobitmap.bmp                            |binary
 setup_native/source/win32/nsis/ooosdkbitmap.bmp                         |binary
 solenv/bin/modules/installer/globals.pm                                 |    2 +-
 8 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 66f974e05bfa78dbfafb4283dd79bca1eaf47f1d
Author: Andre Fischer <af at apache.org>
Date:   Mon Mar 3 17:04:10 2014 +0000

    124272: Wrong initialization of  (merged from branch AOO410).

diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index e9cf323..e8eb679 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -156,7 +156,7 @@ BEGIN
     $fontsfoldername = "Fonts";
     $fontsdirparent = "";
     $fontsdirhostname = "truetype";
-    $fontsdirname = $fontsdirhostname;
+    $fontsdirname = "";
     $officefolder = "OfficeFolder";
     $officemenufolder = "OfficeMenuFolder";
     $startupfolder = "StartupFolder";
commit ad9eed11117acf5b693b641cf6d130739e04aa5e
Author: Jürgen Schmidt <jsc at apache.org>
Date:   Mon Mar 3 16:37:25 2014 +0000

    #124311# merge fixes from AOO410 branch

diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 7dfe13d..13b87e3 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -311,7 +311,7 @@ AboutDialog::AboutDialog( Window* pParent, const ResId  & rId ) :
     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");
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp
index da145cb..5e1a944 100644
Binary files a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp and b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp differ
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp
index da145cb..5e1a944 100644
Binary files a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp and b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp differ
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Image.bmp b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Image.bmp
index 51f8892..5d89ff4 100644
Binary files a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Image.bmp and b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Image.bmp differ
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index 6621328..2017ef0 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -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
diff --git a/setup_native/source/win32/nsis/ooobitmap.bmp b/setup_native/source/win32/nsis/ooobitmap.bmp
index 57ca123..5e1a944 100644
Binary files a/setup_native/source/win32/nsis/ooobitmap.bmp and b/setup_native/source/win32/nsis/ooobitmap.bmp differ
diff --git a/setup_native/source/win32/nsis/ooosdkbitmap.bmp b/setup_native/source/win32/nsis/ooosdkbitmap.bmp
index b2a3f3e..5d89ff4 100644
Binary files a/setup_native/source/win32/nsis/ooosdkbitmap.bmp and b/setup_native/source/win32/nsis/ooosdkbitmap.bmp differ