diff -r aoo-4.1.3-fresh/main/LICENSE aoo-4.1.4-fresh/main/LICENSE
1052,1054c1052,1053
< Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
< and Clark Cooper
< Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006 Expat maintainers.
---
> Copyright (c) 1998-2000 Thai Open Source Software Center Ltd and Clark Cooper
> Copyright (c) 2001-2016 Expat maintainers
diff -r aoo-4.1.3-fresh/main/LICENSE_ALv2 aoo-4.1.4-fresh/main/LICENSE_ALv2
190c190
< Copyright 2011, 2012, 2013, 2014, 2015, 2016 Apache Software Foundation
---
> Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017 Apache Software Foundation
diff -r aoo-4.1.3-fresh/main/NOTICE aoo-4.1.4-fresh/main/NOTICE
2c2
< Copyright 2011, 2016 The Apache Software Foundation
---
> Copyright 2011, 2017 The Apache Software Foundation
diff -r aoo-4.1.3-fresh/main/configure.in aoo-4.1.4-fresh/main/configure.in
3410,3420d3409
< if test "$_os" = "Darwin"; then
< AC_MSG_CHECKING([which PackageMaker EPM thinks to use])
< _pm=`strings $EPM | grep PackageMaker | cut -d" " -f1`
< if test "$_pm" = "/Developer/Applications/PackageMaker.app/Contents/MacOS/PackageMaker"; then
< AC_MSG_ERROR([$_pm; PackageMaker expected in wrong path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker)])
< elif test "$_pm" = "/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker"; then
< AC_MSG_RESULT([$_pm, ok])
< else # we never should get here, but go safe
< AC_MSG_ERROR([$_pm; PackageMaker expected in unknown path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker)])
< fi
< fi
3527,3538d3515
< if echo "$PKGFORMAT" | $EGREP osx 2>&1 >/dev/null; then
< if test "$_os" = "Darwin"; then
< AC_MSG_CHECKING([for PackageMaker availability])
< if ! test -x /Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker; then
< AC_MSG_ERROR([not installed. Please install Apples Dev Tools])
< else
< AC_MSG_RESULT([ok])
< fi
< else
< AC_MSG_ERROR([PackageMaker needed to build OSX packages and you are not on OSX...])
< fi
< fi
diff -r aoo-4.1.3-fresh/main/cui/source/dialogs/about.cxx aoo-4.1.4-fresh/main/cui/source/dialogs/about.cxx
314c314
< rtl::OUString sYear( RTL_CONSTASCII_USTRINGPARAM("2016") );
---
> rtl::OUString sYear( RTL_CONSTASCII_USTRINGPARAM("2017") );
Binary files aoo-4.1.3-fresh/main/default_images/introabout/beta/intro.png and aoo-4.1.4-fresh/main/default_images/introabout/beta/intro.png differ
Binary files aoo-4.1.3-fresh/main/default_images/introabout/intro.png and aoo-4.1.4-fresh/main/default_images/introabout/intro.png differ
Binary files aoo-4.1.3-fresh/main/default_images/introabout/logo.png and aoo-4.1.4-fresh/main/default_images/introabout/logo.png differ
diff -r aoo-4.1.3-fresh/main/desktop/win32/source/setup/setup.cpp aoo-4.1.4-fresh/main/desktop/win32/source/setup/setup.cpp
84,85c84,87
< #define PRODUCTCODE_X86 TEXT( "{E503B4BF-F7BB-3D5F-8BC8-F694B1CFF942}" )
< #define PRODUCTCODE_X64 TEXT( "{350AA351-21FA-3270-8B7A-835434E766AD}" )
---
> // Microsoft Visual C++ 2008 Redistributable - x86 9.0.30729.6161
> #define PRODUCTCODE_X86 TEXT( "{9BE518E6-ECC6-35A9-88E4-87755C07200F}" )
> // Microsoft Visual C++ 2008 Redistributable - x64 9.0.30729.6161
> #define PRODUCTCODE_X64 TEXT( "{5FCE6D76-F5DC-37AB-B2B8-22AB8CEDB1D4}" )
Only in aoo-4.1.3-fresh/main/expat: expat-2.1.0.patch
Only in aoo-4.1.4-fresh/main/expat: expat-2.2.3.patch
diff -r aoo-4.1.3-fresh/main/expat/expat-winapi.patch aoo-4.1.4-fresh/main/expat/expat-winapi.patch
1,2c1,3
< --- misc/expat-2.1.0/lib/expat_external.h 2009-11-16 08:53:17.375000000 +0000
< +++ misc/build/expat-2.1.0/lib/expat_external.h 2009-11-16 08:53:34.703125000 +0000
---
> diff -ur misc/expat-2.2.3/lib/expat_external.h misc/build/expat-2.2.3/lib/expat_external.h
> --- misc/expat-2.2.3/lib/expat_external.h 2016-06-21 05:58:38.000000000 -0700
> +++ misc/build/expat-2.2.3/lib/expat_external.h 2016-07-31 17:10:53.551556000 -0700
diff -r aoo-4.1.3-fresh/main/expat/makefile.mk aoo-4.1.4-fresh/main/expat/makefile.mk
41,42c41,42
< TARFILE_NAME=expat-2.1.0
< TARFILE_MD5=dd7dab7a5fea97d2a6a43f511449b7cd
---
> TARFILE_NAME=expat-2.2.3
> TARFILE_MD5=f053af63ef5f39bd9b78d01fbc203334
diff -r aoo-4.1.3-fresh/main/expat/prj/d.lst aoo-4.1.4-fresh/main/expat/prj/d.lst
3,4c3,4
< ..\%__SRC%\misc\build\expat-2.1.0\lib\expat.h %_DEST%\inc%_EXT%\external\expat.h
< ..\%__SRC%\misc\build\expat-2.1.0\lib\expat_external.h %_DEST%\inc%_EXT%\external\expat_external.h
---
> ..\%__SRC%\misc\build\expat-2.2.3\lib\expat.h %_DEST%\inc%_EXT%\external\expat.h
> ..\%__SRC%\misc\build\expat-2.2.3\lib\expat_external.h %_DEST%\inc%_EXT%\external\expat_external.h
diff -r aoo-4.1.3-fresh/main/extensions.lst aoo-4.1.4-fresh/main/extensions.lst
28c28
< # http:// URLs can be prefixed by an MD5 checksum. If that is present then it is an error if
---
> # https:// URLs can be prefixed by an MD5 checksum. If that is present then it is an error if
42c42
< 47edc7a64a9a1e1f7d6e5dfa82ae0c91 https://sourceforge.net/projects/aoo-extensions/files/17102/29/dict-en.oxt/download "dict-en.oxt"
---
> 78c5505c04bcd5a315b6dbd7ed91e8ec https://sourceforge.net/projects/aoo-extensions/files/17102/36/dict-en-20170901.oxt/download "dict-en-20170901.oxt"
46c46
< e2eab80772ab1aa09716954219351a80 http://sourceforge.net/projects/aoo-extensions/files/1470/1/en_US.oxt/download "en_US.oxt"
---
> e2eab80772ab1aa09716954219351a80 https://sourceforge.net/projects/aoo-extensions/files/1470/1/en_US.oxt/download "en_US.oxt"
50c50
< cf68110f1097cd8c2f7eb41dfbbfe86d https://sourceforge.net/projects/aoo-extensions/files/1075/14/dict-de_de-frami_2015-12-28.oxt/download "dict-de_de-frami_2015-12-28.oxt"
---
> ea35a6a6761655107da3e99ee56c171f https://sourceforge.net/projects/aoo-extensions/files/1075/15/dict-de_de-frami_2017-01-12.oxt/download "dict-de_de-frami_2017-01-12.oxt"
54c54
< 5c0de383ef649cffefc128cfb36b4d43 http://sourceforge.net/projects/aoo-extensions/files/1456/6/nl-dict-v2.00g.oxt/download "nl-dict-v2.00g.oxt"
---
> 5c0de383ef649cffefc128cfb36b4d43 https://sourceforge.net/projects/aoo-extensions/files/1456/6/nl-dict-v2.00g.oxt/download "nl-dict-v2.00g.oxt"
66c66
< 59dd45e6785ed644adbbd73f4f126182 http://sourceforge.net/projects/aoo-extensions/files/1657/3/es_es.oxt/download "es_es.oxt"
---
> 1b999fcef948148e269161a08e7acf20 https://sourceforge.net/projects/aoo-extensions/files/1657/4/es_es.oxt/download "es_es.oxt"
70,71c70,71
< b38cba04b6513dd42b031199d617cce6 http://sourceforge.net/projects/aoo-extensions/files/1388/12/DanskeSynonymer.oxt/download "DanskeSynonymer.oxt"
< 6ee1e24fb17e44577d8e3200f3e44adc http://sourceforge.net/projects/aoo-extensions/files/1429/6/dict-da-current.oxt/download "dict-da-current.oxt"
---
> b38cba04b6513dd42b031199d617cce6 https://sourceforge.net/projects/aoo-extensions/files/1388/12/DanskeSynonymer.oxt/download "DanskeSynonymer.oxt"
> 6ee1e24fb17e44577d8e3200f3e44adc https://sourceforge.net/projects/aoo-extensions/files/1429/6/dict-da-current.oxt/download "dict-da-current.oxt"
75c75
< d8d4a3d5c6abfde1b4c81cc1ddd1afa0 http://sourceforge.net/projects/aoo-extensions/files/17703/0/openoffice-spellcheck-lt-1.3.oxt/download "openoffice-spellcheck-lt-1.3.oxt"
---
> d8d4a3d5c6abfde1b4c81cc1ddd1afa0 https://sourceforge.net/projects/aoo-extensions/files/17703/0/openoffice-spellcheck-lt-1.3.oxt/download "openoffice-spellcheck-lt-1.3.oxt"
83c83
< 93921f14809a22770f1bd89af65015bc http://sourceforge.net/projects/aoo-extensions/files/3233/3/dict_ru_ru-0.3.7.oxt/download "dict-ru.oxt"
---
> 93921f14809a22770f1bd89af65015bc https://sourceforge.net/projects/aoo-extensions/files/3233/3/dict_ru_ru-0.3.7.oxt/download "dict_ru_ru-0.3.7.oxt"
87c87
< 5a7cec122a215c9f6a906ecb8ad46ee6 http://sourceforge.net/projects/aoo-extensions/files/1143/11/dict-sk.oxt/download "dict-sk.oxt"
---
> 5a7cec122a215c9f6a906ecb8ad46ee6 https://sourceforge.net/projects/aoo-extensions/files/1143/11/dict-sk.oxt/download "dict-sk.oxt"
95c95
< 368c87a186ea4b4e170c57c3216a7c4d https://sourceforge.net/projects/aoo-extensions/files/1697/11/dict-de_at-frami_2015-12-28.oxt/download "dict-de_at-frami_2015-12-28.oxt"
---
> 0cf6783cb0f1355ef3869aa9699700b3 https://sourceforge.net/projects/aoo-extensions/files/1697/12/dict-de_at-frami_2017-01-12.oxt/download "dict-de_at-frami_2017-01-12.oxt"
99c99
< 53a2825eb0809bd00b910fb8bef7775e https://sourceforge.net/projects/aoo-extensions/files/1699/11/dict-de_ch-frami_2015-12-28.oxt/download "dict-de_ch-frami_2015-12-28.oxt"
---
> 48f7f27f22bf1006a6d9f91d55a7cffc https://sourceforge.net/projects/aoo-extensions/files/1699/12/dict-de_ch-frami_2017-01-12.oxt/download "dict-de_ch-frami_2017-01-12.oxt"
103c103
< a22266cfa40fb23a79be27a239321a3f http://sourceforge.net/projects/aoo-extensions/files/1009/1/km_spellchecker_OOo30_V_1.0.2.oxt/download "km_spellchecker_OOo30_V_1.0.2.oxt"
---
> a22266cfa40fb23a79be27a239321a3f https://sourceforge.net/projects/aoo-extensions/files/1009/1/km_spellchecker_OOo30_V_1.0.2.oxt/download "km_spellchecker_OOo30_V_1.0.2.oxt"
111c111
< f408bb4a333bea2aec86bffaa4ffa229 http://sourceforge.net/projects/aoo-extensions/files/1383/2/xuxen_4_OOo3.oxt/download "xuxen_4_OOo3.oxt"
---
> f408bb4a333bea2aec86bffaa4ffa229 https://sourceforge.net/projects/aoo-extensions/files/1383/2/xuxen_4_OOo3.oxt/download "xuxen_4_OOo3.oxt"
115,116c115,116
< 76345f925e34fef2d29bade4f29108e9 http://sourceforge.net/projects/aoo-extensions/files/3423/4/lightproof-hu_HU-1.3.oxt/download "lightproof-hu_HU-1.3.oxt"
< d320e43e815c2dfd599dbfb7cd0e41fb http://sourceforge.net/projects/aoo-extensions/files/1283/9/dict-hu.oxt/download "dict-hu.oxt"
---
> 76345f925e34fef2d29bade4f29108e9 https://sourceforge.net/projects/aoo-extensions/files/3423/4/lightproof-hu_HU-1.3.oxt/download "lightproof-hu_HU-1.3.oxt"
> d320e43e815c2dfd599dbfb7cd0e41fb https://sourceforge.net/projects/aoo-extensions/files/1283/9/dict-hu.oxt/download "dict-hu.oxt"
120c120
< ed5702f25c8f5e36f97cafc606470c42 http://sourceforge.net/projects/aoo-extensions/files/3932/1/asturianu.oxt/download "asturianu.oxt"
---
> 931373dea3bed9621dd55713b53b38ae https://sourceforge.net/projects/aoo-extensions/files/3932/2/ort_ast_20150417_2259.oxt/download "ort_ast_20150417_2259.oxt"
128c128
< 32ab4edf1496a7cf5469ee1643eb0128 http://sourceforge.net/projects/aoo-extensions/files/5959/1/dict-sv.oxt/download "dict-sv.oxt"
---
> 32ab4edf1496a7cf5469ee1643eb0128 https://sourceforge.net/projects/aoo-extensions/files/5959/1/dict-sv.oxt/download "dict-sv.oxt"
132c132
< c20c155c47174c1b0ec0a53618044ac3 http://sourceforge.net/projects/aoo-extensions/files/5968/0/Korean_spell-checker-0.5.6_OOo.oxt/download "Korean_spell-checker-0.5.6_OOo.oxt"
---
> c20c155c47174c1b0ec0a53618044ac3 https://sourceforge.net/projects/aoo-extensions/files/5968/0/Korean_spell-checker-0.5.6_OOo.oxt/download "Korean_spell-checker-0.5.6_OOo.oxt"
136c136
< a69f9221864b1360e38ff3f0b0cc9222 http://sourceforge.net/projects/aoo-extensions/files/806/4/pl-dict.oxt/download "pl-dict.oxt"
---
> a69f9221864b1360e38ff3f0b0cc9222 https://sourceforge.net/projects/aoo-extensions/files/806/4/pl-dict.oxt/download "pl-dict.oxt"
140c140
< 57b12ab5d523711198c0f32dc37ecca6 https://sourceforge.net/projects/aoo-extensions/files/1196/38/oo3x-pt-pt-16.7.4.1.oxt/download "oo3x-pt-pt-16.7.4.1.oxt"
---
> a1414b7be0cacb7a810166833a02fa66 https://sourceforge.net/projects/aoo-extensions/files/1196/41/oo3x-pt-pt-17.5.29.1.oxt/download "oo3x-pt-pt-17.5.29.1.oxt"
144c144
< ed1c612a462490b541297a8522f667d0 http://sourceforge.net/projects/aoo-extensions/files/1205/3/catalan.oxt/download "dict-ca.oxt"
---
> 4cf4e4a9d85f14761d38943b7e1fd76d https://sourceforge.net/projects/aoo-extensions/files/1205/5/ca.3.0.0.oxt/download "ca.3.0.0.oxt"
148c148
< 3b87a28bf1ff2a8beb76a5b501f40d1c http://sourceforge.net/projects/aoo-extensions/files/1475/0/avl.oxt/download "dict-ca-xv.oxt"
---
> d425579a9a2e26663abaecdd661be419 https://sourceforge.net/projects/aoo-extensions/files/1475/1/ca-valencia.3.0.0.oxt/download "ca-valencia.3.0.0.oxt"
152c152
< 6112a73444a1ad3cf70736649e228f0f http://sourceforge.net/projects/aoo-extensions/files/1395/0/dict_valencian_llit.oxt/download "dict-ca-xr.oxt"
---
> 6112a73444a1ad3cf70736649e228f0f https://sourceforge.net/projects/aoo-extensions/files/1395/0/dict_valencian_llit.oxt/download "dict_valencian_llit.oxt"
diff -r aoo-4.1.3-fresh/main/external_deps.lst aoo-4.1.4-fresh/main/external_deps.lst
228,230c228,230
< MD5 = dd7dab7a5fea97d2a6a43f511449b7cd
< name = expat-2.1.0.tar.gz
< URL1 = http://sourceforge.net/projects/expat/files/expat/2.1.0/expat-2.1.0.tar.gz/download
---
> MD5 = f053af63ef5f39bd9b78d01fbc203334
> name = expat-2.2.3.tar.bz2
> URL1 = https://sourceforge.net/projects/expat/files/expat/2.2.3/expat-2.2.3.tar.bz2
diff -r aoo-4.1.3-fresh/main/filter/source/msfilter/svdfppt.cxx aoo-4.1.4-fresh/main/filter/source/msfilter/svdfppt.cxx
4385a4386,4390
> if (nLevelAnz > 5)
> {
> throw std::range_error("Bad input file, Too many stylesheet levels");
> }
>
diff -r aoo-4.1.3-fresh/main/instsetoo_native/util/openoffice.lst aoo-4.1.4-fresh/main/instsetoo_native/util/openoffice.lst
9,10c9,10
< OOOPACKAGEVERSION 4.1.3
< UREPACKAGEVERSION 4.1.3
---
> OOOPACKAGEVERSION 4.1.4
> UREPACKAGEVERSION 4.1.4
62,63c62,63
< PRODUCTVERSION 4.1.3
< PREVIOUS_VERSION 4.1.2
---
> PRODUCTVERSION 4.1.4
> PREVIOUS_VERSION 4.1.3
71c71
< ABOUTBOXPRODUCTVERSION 4.1.3
---
> ABOUTBOXPRODUCTVERSION 4.1.4
74c74
< UPDATEURL https://ooo-updates.apache.org/aoo413/check.Update
---
> UPDATEURL https://ooo-updates.apache.org/aoo414/check.Update
79c79
< PACKAGEVERSION 4.1.3
---
> PACKAGEVERSION 4.1.4
123c123
< PRODUCTVERSION 4.1.3
---
> PRODUCTVERSION 4.1.4
131c131
< ABOUTBOXPRODUCTVERSION 4.1.3
---
> ABOUTBOXPRODUCTVERSION 4.1.4
133c133
< UPDATEURL https://ooo-updates.apache.org/aoo413/check.Update
---
> UPDATEURL https://ooo-updates.apache.org/aoo414/check.Update
138c138
< PACKAGEVERSION 4.1.3
---
> PACKAGEVERSION 4.1.4
183c183
< PRODUCTVERSION 4.1.3
---
> PRODUCTVERSION 4.1.4
193c193
< ABOUTBOXPRODUCTVERSION 4.1.3
---
> ABOUTBOXPRODUCTVERSION 4.1.4
200c200
< UPDATEURL https://ooo-updates.apache.org/aoo413/check.Update
---
> UPDATEURL https://ooo-updates.apache.org/aoo414/check.Update
203c203
< PACKAGEVERSION 4.1.3
---
> PACKAGEVERSION 4.1.4
254c254
< PRODUCTVERSION 4.1.3
---
> PRODUCTVERSION 4.1.4
261c261
< PACKAGEVERSION 4.1.3
---
> PACKAGEVERSION 4.1.4
302c302
< PRODUCTVERSION 4.1.3
---
> PRODUCTVERSION 4.1.4
308c308
< PACKAGEVERSION 4.1.3
---
> PACKAGEVERSION 4.1.4
313c313
< DATABASENAME openofficeorg413betasdk
---
> DATABASENAME openofficeorg414betasdk
348c348
< PRODUCTVERSION 4.1.3
---
> PRODUCTVERSION 4.1.4
357c357
< PACKAGEVERSION 4.1.3
---
> PACKAGEVERSION 4.1.4
401c401
< PRODUCTVERSION 4.1.3
---
> PRODUCTVERSION 4.1.4
411c411
< ABOUTBOXPRODUCTVERSION 4.1.3
---
> ABOUTBOXPRODUCTVERSION 4.1.4
413c413
< UPDATEURL https://ooo-updates.apache.org/aoo413/check.Update
---
> UPDATEURL https://ooo-updates.apache.org/aoo414/check.Update
418c418
< PACKAGEVERSION 4.1.3
---
> PACKAGEVERSION 4.1.4
diff -r aoo-4.1.3-fresh/main/odk/util/makefile.pmk aoo-4.1.4-fresh/main/odk/util/makefile.pmk
25c25
< PRODUCT_RELEASE=4.1.3
---
> PRODUCT_RELEASE=4.1.4
Binary files aoo-4.1.3-fresh/main/ooo_custom_images/dev/introabout/intro.png and aoo-4.1.4-fresh/main/ooo_custom_images/dev/introabout/intro.png differ
Binary files aoo-4.1.3-fresh/main/ooo_custom_images/dev_nologo/introabout/intro.png and aoo-4.1.4-fresh/main/ooo_custom_images/dev_nologo/introabout/intro.png differ
Binary files aoo-4.1.3-fresh/main/ooo_custom_images/nologo/introabout/intro.png and aoo-4.1.4-fresh/main/ooo_custom_images/nologo/introabout/intro.png differ
diff -r aoo-4.1.3-fresh/main/qadevOOo/runner/makefile.mk aoo-4.1.4-fresh/main/qadevOOo/runner/makefile.mk
39c39
< .IF "$(SOLAR_JAVA)"=="TRUE" && "$(L10N_framework)"==""
---
> .IF "$(SOLAR_JAVA)"=="TRUE" && "$(L10N_framework)"=="" && "$(ANT_HOME)"!="NO_ANT_HOME"
diff -r aoo-4.1.3-fresh/main/rat-excludes aoo-4.1.4-fresh/main/rat-excludes
1474a1475,1510
>
> ##############################################################################
> #
> # exclude generated files during the build, e.g. config files, environment scripts
> #
>
> main/config.log
> main/config.parms
> main/config.status
> main/configure
> main/warn
> main/autom4te.cache/*
>
> main/SolarisX86Env.Set*
> main/SolarisSparcEnv.Set*
> main/LinuxX86Env.Set*
> main/LinuxX86-64Env.Set*
> main/LinuxIA64Env.Set*
> main/LinuxSparcEnv.Set*
> main/LinuxPPCEnv.Set*
> main/LinuxPPC64Env.Set*
> main/LinuxS390Env.Set*
> main/LinuxS390XEnv.Set*
> main/LinuxM68KEnv.Set*
> main/LinuxHPPAEnv.Set*
> main/LinuxAlphaEnv.Set*
> main/LinuxARMEnv.Set*
> main/LinuxMIPSEnv.Set*
> main/FreeBSDX86Env.Set*
> main/FreeBSDAMDEnv.Set*
> main/MacOSXX64Env.Set*
> main/MacOSXX86Env.Set*
> main/MacOSXPPCEnv.Set*
> main/winenv.set*
> main/winmingw.set*
>
diff -r aoo-4.1.3-fresh/main/sc/source/core/data/documen2.cxx aoo-4.1.4-fresh/main/sc/source/core/data/documen2.cxx
232c232,235
< pLinkManager = new sfx2::LinkManager( pDocShell );
---
> {
> pLinkManager = new sfx2::LinkManager(pDocShell);
> pLinkManager->SetAutoAskUpdateAllLinks();
> }
271a275
> pLinkManager->SetAutoAskUpdateAllLinks();
diff -r aoo-4.1.3-fresh/main/scp2/source/ooo/module_langpack.ulf aoo-4.1.4-fresh/main/scp2/source/ooo/module_langpack.ulf
341a342,353
> [STR_NAME_MODULE_LANGPACK_CA_XR]
> en-US = "Catalan (Valencia RACV)"
>
> [STR_DESC_MODULE_LANGPACK_CA_XR]
> en-US = "Installs Catalan (Valencia RACV) support in %PRODUCTNAME %PRODUCTVERSION"
>
> [STR_NAME_MODULE_LANGPACK_CA_XV]
> en-US = "Catalan (Valencia AVL)"
>
> [STR_DESC_MODULE_LANGPACK_CA_XV]
> en-US = "Installs Catalan (Valencia AVL) support in %PRODUCTNAME %PRODUCTVERSION"
>
diff -r aoo-4.1.3-fresh/main/scripting/source/provider/ProviderCache.cxx aoo-4.1.4-fresh/main/scripting/source/provider/ProviderCache.cxx
203c203
< catch ( RuntimeException& e )
---
> catch ( Exception& e )
diff -r aoo-4.1.3-fresh/main/sdext/prj/build.lst aoo-4.1.4-fresh/main/sdext/prj/build.lst
1c1
< dx sdext : L10N:l10n offuh comphelper unotools readlicense_oo cppu tools cppuhelper sal javaunohelper officecfg LIBXSLT:libxslt xmlhelp NULL
---
> dx sdext : L10N:l10n offuh comphelper unotools readlicense_oo cppu tools cppuhelper sal javaunohelper officecfg LIBXSLT:libxslt xmlhelp rsc NULL
diff -r aoo-4.1.3-fresh/main/sfx2/inc/sfx2/linkmgr.hxx aoo-4.1.4-fresh/main/sfx2/inc/sfx2/linkmgr.hxx
57a58,64
>
> sal_Bool mAutoAskUpdateAllLinks;
> sal_Bool mUpdateAsked;
> sal_Bool mAllowUpdate;
>
> sal_Bool GetUserAllowsLinkUpdate(Window *pParent);
> void SetUserAllowsLinkUpdate(SvBaseLink *pLink, sal_Bool allows);
107a115,118
>
> // Automatically ask user about update all links, on first insert
> void SetAutoAskUpdateAllLinks();
>
diff -r aoo-4.1.3-fresh/main/sfx2/source/appl/linkmgr2.cxx aoo-4.1.4-fresh/main/sfx2/source/appl/linkmgr2.cxx
68c68,70
< : pPersist( p )
---
> : pPersist(p),
> mUpdateAsked(sal_False),
> mAutoAskUpdateAllLinks(sal_False)
72d73
<
159a161,166
> Window *parent = GetPersist()->GetDialogParent();
> if (mAutoAskUpdateAllLinks)
> {
> SetUserAllowsLinkUpdate(pLink, GetUserAllowsLinkUpdate(parent));
> }
>
270a278,306
> void LinkManager::SetAutoAskUpdateAllLinks()
> {
> mAutoAskUpdateAllLinks = sal_True;
> }
>
> sal_Bool LinkManager::GetUserAllowsLinkUpdate(Window *pParentWin)
> {
> if (!mUpdateAsked)
> {
> if (QueryBox(pParentWin, WB_YES_NO | WB_DEF_NO, SfxResId(STR_QUERY_UPDATE_LINKS)).Execute() == RET_YES)
> mAllowUpdate = sal_True;
> else
> mAllowUpdate = sal_False;
> mUpdateAsked = sal_True;
> }
> return mAllowUpdate;
> }
>
> void LinkManager::SetUserAllowsLinkUpdate(SvBaseLink *pLink, sal_Bool allows)
> {
> SfxObjectShell* pShell = pLink->GetLinkManager()->GetPersist();
>
> if (pShell)
> {
> comphelper::EmbeddedObjectContainer& rEmbeddedObjectContainer = pShell->getEmbeddedObjectContainer();
> rEmbeddedObjectContainer.setUserAllowsLinkUpdate(allows);
> }
> }
>
312c348
< // Graphic-Links noch nicht updaten
---
> // do not update graphic links yet
316,317c352,355
<
< if( bAskUpdate )
---
>
> sal_Bool allows = sal_True;
>
> if (bAskUpdate)
319,322c357,358
< int nRet = QueryBox( pParentWin, WB_YES_NO | WB_DEF_YES, SfxResId( STR_QUERY_UPDATE_LINKS ) ).Execute();
< if( RET_YES != nRet )
< {
< SfxObjectShell* pShell = pLink->GetLinkManager()->GetPersist();
---
> allows = GetUserAllowsLinkUpdate(pParentWin);
> }
324,328c360,361
< if(pShell)
< {
< comphelper::EmbeddedObjectContainer& rEmbeddedObjectContainer = pShell->getEmbeddedObjectContainer();
< rEmbeddedObjectContainer.setUserAllowsLinkUpdate(false);
< }
---
> SetUserAllowsLinkUpdate(pLink, allows);
> bAskUpdate = sal_False; // one time is OK
330,333c363,364
< return ; // es soll nichts geupdatet werden
< }
< bAskUpdate = sal_False; // einmal reicht
< }
---
> if (allows)
> pLink->Update();
335d365
< pLink->Update();
diff -r aoo-4.1.3-fresh/main/solenv/bin/modules/installer/download.pm aoo-4.1.4-fresh/main/solenv/bin/modules/installer/download.pm
1184a1185
> elsif ( $language eq "af" ) { $nsislanguage = "Afrikaans"; }
1186a1188,1190
> elsif ( $language eq "hy" ) { $nsislanguage = "Armenian"; }
> elsif ( $language eq "ast" ) { $nsislanguage = "Asturian"; }
> elsif ( $language eq "eu" ) { $nsislanguage = "Basque"; }
1193,1194c1197
< elsif ( $language eq "de" ) { $nsislanguage = "German"; }
< elsif ( $language eq "de-LU" ) { $nsislanguage = "Luxembourgish"; }
---
> elsif ( $language eq "en-GB" ) { $nsislanguage = "English"; }
1197d1199
< elsif ( $language eq "el" ) { $nsislanguage = "Greek"; }
1200c1202,1204
< elsif ( $language eq "hu" ) { $nsislanguage = "Hungarian"; }
---
> elsif ( $language eq "gl" ) { $nsislanguage = "Galician"; }
> elsif ( $language eq "de" ) { $nsislanguage = "German"; }
> elsif ( $language eq "el" ) { $nsislanguage = "Greek"; }
1201a1206
> elsif ( $language eq "hu" ) { $nsislanguage = "Hungarian"; }
1204a1210,1211
> elsif ( $language eq "ja" ) { $nsislanguage = "Japanese"; }
> elsif ( $language eq "ko" ) { $nsislanguage = "Korean"; }
1206a1214
> elsif ( $language eq "de-LU" ) { $nsislanguage = "Luxembourgish"; }
1208a1217
> elsif ( $language eq "nb" ) { $nsislanguage = "Norwegian"; }
1211,1214c1220
< elsif ( $language eq "es" ) { $nsislanguage = "Spanish"; }
< elsif ( $language eq "sl" ) { $nsislanguage = "Slovenian"; }
< elsif ( $language eq "sv" ) { $nsislanguage = "Swedish"; }
< elsif ( $language eq "sk" ) { $nsislanguage = "Slovak"; }
---
> elsif ( $language eq "nn" ) { $nsislanguage = "NorwegianNynorsk"; }
1216d1221
< elsif ( $language eq "pt-BR" ) { $nsislanguage = "PortugueseBR"; }
1217a1223
> elsif ( $language eq "pt-BR" ) { $nsislanguage = "PortugueseBR"; }
1220c1226
< elsif ( $language eq "sh" ) { $nsislanguage = "SerbianLatin"; }
---
> elsif ( $language eq "gd" ) { $nsislanguage = "ScotsGaelic"; }
1223,1228c1229
< elsif ( $language eq "uk" ) { $nsislanguage = "Ukrainian"; }
< elsif ( $language eq "tr" ) { $nsislanguage = "Turkish"; }
< elsif ( $language eq "ja" ) { $nsislanguage = "Japanese"; }
< elsif ( $language eq "ko" ) { $nsislanguage = "Korean"; }
< elsif ( $language eq "th" ) { $nsislanguage = "Thai"; }
< elsif ( $language eq "vi" ) { $nsislanguage = "Vietnamese"; }
---
> elsif ( $language eq "sh" ) { $nsislanguage = "SerbianLatin"; }
1229a1231,1235
> elsif ( $language eq "sl" ) { $nsislanguage = "Slovenian"; }
> elsif ( $language eq "sk" ) { $nsislanguage = "Slovak"; }
> elsif ( $language eq "es" ) { $nsislanguage = "Spanish"; }
> elsif ( $language eq "sv" ) { $nsislanguage = "Swedish"; }
> elsif ( $language eq "th" ) { $nsislanguage = "Thai"; }
1230a1237,1240
> elsif ( $language eq "tr" ) { $nsislanguage = "Turkish"; }
> elsif ( $language eq "uk" ) { $nsislanguage = "Ukrainian"; }
> elsif ( $language eq "vi" ) { $nsislanguage = "Vietnamese"; }
> elsif ( $language eq "cy" ) { $nsislanguage = "Welsh"; }
1374c1384
< # !define MUI_TEXT_DIRECTORY_TITLE "Zielverzeichnis auswählen"
---
> # !define MUI_TEXT_DIRECTORY_TITLE "Zielverzeichnis auswählen"
diff -r aoo-4.1.3-fresh/main/solenv/bin/srcrelease.xml aoo-4.1.4-fresh/main/solenv/bin/srcrelease.xml
30c30
<
---
>
32c32
<
---
>
34a35
>
77a79
>
93a96
>
diff -r aoo-4.1.3-fresh/main/solenv/inc/minor.mk aoo-4.1.4-fresh/main/solenv/inc/minor.mk
21,25c21,25
< RSCVERSION=413
< RSCREVISION=413m1(Build:9783)
< BUILD=9783
< LAST_MINOR=m1
< SOURCEVERSION=AOO413
---
> RSCVERSION=414
> RSCREVISION=414m5(Build:9788)
> BUILD=9788
> LAST_MINOR=m5
> SOURCEVERSION=AOO414
diff -r aoo-4.1.3-fresh/main/stlport/systemstl/functional aoo-4.1.4-fresh/main/stlport/systemstl/functional
34a35,36
> #elif defined(__cplusplus) && (__cplusplus >= 201103L)
> #include_next
diff -r aoo-4.1.3-fresh/main/svl/Library_passwordcontainer.mk aoo-4.1.4-fresh/main/svl/Library_passwordcontainer.mk
39a40,50
> ifeq ($(GUI),UNX)
> ifeq ($(COM),GCC)
> ifeq ($(CPUNAME),INTEL)
> $(eval $(call gb_Library_set_ldflags,passwordcontainer,\
> $(gb_LinkTarget_LDFLAGS) \
> -Wl$(COMMA)--start-group -lc -Wl$(COMMA)--end-group \
> ))
> endif
> endif
> endif
>
diff -r aoo-4.1.3-fresh/main/svtools/inc/svtools/treelist.hxx aoo-4.1.4-fresh/main/svtools/inc/svtools/treelist.hxx
407c407
< return pData->IsExpanded();
---
> return pData && pData->IsExpanded();
414c414
< return pData->IsSelected();
---
> return pData && pData->IsSelected();
421c421
< return pData->HasFocus();
---
> return pData && pData->HasFocus();
diff -r aoo-4.1.3-fresh/main/svtools/source/contnr/svtreebx.cxx aoo-4.1.4-fresh/main/svtools/source/contnr/svtreebx.cxx
2760,2785c2760,2785
< if ( pEntry->HasChildsOnDemand() || pEntry->HasChilds() )
< {
< rStateSet.AddState( AccessibleStateType::EXPANDABLE );
< if ( IsExpanded( pEntry ) )
< rStateSet.AddState( (sal_Int16)AccessibleStateType::EXPANDED );
< }
<
< if ( GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED )
< rStateSet.AddState( AccessibleStateType::CHECKED );
< if ( IsEntryVisible( pEntry ) )
< rStateSet.AddState( AccessibleStateType::VISIBLE );
< if ( IsSelected( pEntry ) )
< rStateSet.AddState( AccessibleStateType::SELECTED );
< if ( IsEnabled() )
< {
< rStateSet.AddState( AccessibleStateType::ENABLED );
< rStateSet.AddState( AccessibleStateType::FOCUSABLE );
< rStateSet.AddState( AccessibleStateType::SELECTABLE );
< SvViewDataEntry* pViewDataNewCur = 0;
< if( pEntry )
< {
< pViewDataNewCur= GetViewDataEntry(pEntry);
< if(pViewDataNewCur->HasFocus())
< rStateSet.AddState( AccessibleStateType::FOCUSED );
< }
< }
---
> if ( pEntry )
> {
> if ( pEntry->HasChildsOnDemand() || pEntry->HasChilds() )
> {
> rStateSet.AddState( AccessibleStateType::EXPANDABLE );
> if ( IsExpanded( pEntry ) )
> rStateSet.AddState( (sal_Int16)AccessibleStateType::EXPANDED );
> }
>
> if ( GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED )
> rStateSet.AddState( AccessibleStateType::CHECKED );
> if ( IsEntryVisible( pEntry ) )
> rStateSet.AddState( AccessibleStateType::VISIBLE );
> if ( IsSelected( pEntry ) )
> rStateSet.AddState( AccessibleStateType::SELECTED );
> if ( IsEnabled() )
> {
> rStateSet.AddState( AccessibleStateType::ENABLED );
> rStateSet.AddState( AccessibleStateType::FOCUSABLE );
> rStateSet.AddState( AccessibleStateType::SELECTABLE );
> SvViewDataEntry* pViewDataNewCur = 0;
> pViewDataNewCur = GetViewDataEntry(pEntry);
> if( pViewDataNewCur && pViewDataNewCur->HasFocus() )
> rStateSet.AddState( AccessibleStateType::FOCUSED );
> }
> }
diff -r aoo-4.1.3-fresh/main/sw/source/filter/ww8/ww8par2.cxx aoo-4.1.4-fresh/main/sw/source/filter/ww8/ww8par2.cxx
4535c4535
< aCHPXOffsets[stcp].mnSize = 0;
---
> aCHPXOffsets.at(stcp).mnSize = 0;
4541,4542c4541,4542
< aCHPXOffsets[stcp].mnOffset = rSt.Tell();
< aCHPXOffsets[stcp].mnSize = nRemainder;
---
> aCHPXOffsets.at(stcp).mnOffset = rSt.Tell();
> aCHPXOffsets.at(stcp).mnSize = nRemainder;
4544,4545c4544,4545
< Word2CHPX aChpx = ReadWord2Chpx(rSt, aCHPXOffsets[stcp].mnOffset,
< aCHPXOffsets[stcp].mnSize);
---
> Word2CHPX aChpx = ReadWord2Chpx(rSt, aCHPXOffsets.at(stcp).mnOffset,
> aCHPXOffsets.at(stcp).mnSize);
diff -r aoo-4.1.3-fresh/main/sw/source/filter/ww8/ww8scan.cxx aoo-4.1.4-fresh/main/sw/source/filter/ww8/ww8scan.cxx
6469a6470,6475
> // Check size consistency
> if(nMax > nFFn)
> {
> throw std::out_of_range("WW8 beyond end of buffer");
> }
>
6587a6594
>
diff -r aoo-4.1.3-fresh/main/sysui/desktop/productversion.mk aoo-4.1.4-fresh/main/sysui/desktop/productversion.mk
50c50
< PRODUCTVERSION = 4.1.3
---
> PRODUCTVERSION = 4.1.4