View | Details | Raw Unified | Return to issue 127568
Collapse All | Expand All

(-)aoo-4.1.3-fresh/main/LICENSE (-4 / +2 lines)
Lines 1052-1054 Link Here
1052
Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
1052
Copyright (c) 1998-2000 Thai Open Source Software Center Ltd and Clark Cooper
1053
                               and Clark Cooper
1053
Copyright (c) 2001-2016 Expat maintainers
1054
Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006 Expat maintainers.
1055
--
(-)aoo-4.1.3-fresh/main/LICENSE_ALv2 (-2 / +1 lines)
Line 190 Link Here
190
   Copyright 2011, 2012, 2013, 2014, 2015, 2016 Apache Software Foundation
190
   Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017 Apache Software Foundation
191
--
(-)aoo-4.1.3-fresh/main/NOTICE (-2 / +1 lines)
Line 2 Link Here
2
Copyright 2011, 2016 The Apache Software Foundation
2
Copyright 2011, 2017 The Apache Software Foundation
3
--
(-)aoo-4.1.3-fresh/main/configure.in (-23 lines)
Lines 3410-3420 Link Here
3410
	       if test "$_os" = "Darwin"; then
3411
                  AC_MSG_CHECKING([which PackageMaker EPM thinks to use])
3412
        	  _pm=`strings $EPM | grep PackageMaker | cut -d" " -f1`
3413
        	  if test "$_pm" = "/Developer/Applications/PackageMaker.app/Contents/MacOS/PackageMaker"; then
3414
          	     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)])
3415
        	  elif test "$_pm" = "/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker"; then
3416
          	     AC_MSG_RESULT([$_pm, ok])
3417
        	  else # we never should get here, but go safe
3418
		     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)])
3419
		  fi
3420
	       fi
Lines 3527-3538 Link Here
3527
   if echo "$PKGFORMAT" | $EGREP osx 2>&1 >/dev/null; then
3528
      if test "$_os" = "Darwin"; then
3529
         AC_MSG_CHECKING([for PackageMaker availability])
3530
         if ! test -x /Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker; then
3531
            AC_MSG_ERROR([not installed. Please install Apples Dev Tools])
3532
         else
3533
            AC_MSG_RESULT([ok])
3534
         fi
3535
      else
3536
         AC_MSG_ERROR([PackageMaker needed to build OSX packages and you are not on OSX...])
3537
       fi
3538
   fi
(-)aoo-4.1.3-fresh/main/cui/source/dialogs/about.cxx (-2 / +1 lines)
Line 314 Link Here
314
    rtl::OUString sYear( RTL_CONSTASCII_USTRINGPARAM("2016") );
314
    rtl::OUString sYear( RTL_CONSTASCII_USTRINGPARAM("2017") );
315
--
(-)aoo-4.1.3-fresh/main/desktop/win32/source/setup/setup.cpp (-3 / +4 lines)
Lines 84-85 Link Here
84
#define PRODUCTCODE_X86     TEXT( "{E503B4BF-F7BB-3D5F-8BC8-F694B1CFF942}" )
84
// Microsoft Visual C++ 2008 Redistributable - x86 9.0.30729.6161
85
#define PRODUCTCODE_X64     TEXT( "{350AA351-21FA-3270-8B7A-835434E766AD}" )
85
#define PRODUCTCODE_X86     TEXT( "{9BE518E6-ECC6-35A9-88E4-87755C07200F}" )
86
--
86
// Microsoft Visual C++ 2008 Redistributable - x64 9.0.30729.6161
87
#define PRODUCTCODE_X64     TEXT( "{5FCE6D76-F5DC-37AB-B2B8-22AB8CEDB1D4}" )
(-)aoo-4.1.3-fresh/main/expat/expat-winapi.patch (-3 / +3 lines)
Lines 1-2 Link Here
1
--- misc/expat-2.1.0/lib/expat_external.h	2009-11-16 08:53:17.375000000 +0000
1
diff -ur misc/expat-2.2.3/lib/expat_external.h misc/build/expat-2.2.3/lib/expat_external.h
2
+++ misc/build/expat-2.1.0/lib/expat_external.h	2009-11-16 08:53:34.703125000 +0000
2
--- misc/expat-2.2.3/lib/expat_external.h	2016-06-21 05:58:38.000000000 -0700
3
--
3
+++ misc/build/expat-2.2.3/lib/expat_external.h	2016-07-31 17:10:53.551556000 -0700
(-)aoo-4.1.3-fresh/main/expat/makefile.mk (-3 / +2 lines)
Lines 41-42 Link Here
41
TARFILE_NAME=expat-2.1.0
41
TARFILE_NAME=expat-2.2.3
42
TARFILE_MD5=dd7dab7a5fea97d2a6a43f511449b7cd 
42
TARFILE_MD5=f053af63ef5f39bd9b78d01fbc203334
43
--
(-)aoo-4.1.3-fresh/main/expat/prj/d.lst (-3 / +2 lines)
Lines 3-4 Link Here
3
..\%__SRC%\misc\build\expat-2.1.0\lib\expat.h %_DEST%\inc%_EXT%\external\expat.h
3
..\%__SRC%\misc\build\expat-2.2.3\lib\expat.h %_DEST%\inc%_EXT%\external\expat.h
4
..\%__SRC%\misc\build\expat-2.1.0\lib\expat_external.h %_DEST%\inc%_EXT%\external\expat_external.h
4
..\%__SRC%\misc\build\expat-2.2.3\lib\expat_external.h %_DEST%\inc%_EXT%\external\expat_external.h
5
--
(-)aoo-4.1.3-fresh/main/extensions.lst (-48 / +25 lines)
Line 28 Link Here
28
# http:// URLs can be prefixed by an MD5 checksum.  If that is present then it is an error if
28
# https:// URLs can be prefixed by an MD5 checksum.  If that is present then it is an error if
29
--
Line 42 Link Here
42
    47edc7a64a9a1e1f7d6e5dfa82ae0c91 https://sourceforge.net/projects/aoo-extensions/files/17102/29/dict-en.oxt/download "dict-en.oxt"
42
    78c5505c04bcd5a315b6dbd7ed91e8ec https://sourceforge.net/projects/aoo-extensions/files/17102/36/dict-en-20170901.oxt/download "dict-en-20170901.oxt"
43
--
Line 46 Link Here
46
    e2eab80772ab1aa09716954219351a80 http://sourceforge.net/projects/aoo-extensions/files/1470/1/en_US.oxt/download "en_US.oxt"
46
    e2eab80772ab1aa09716954219351a80 https://sourceforge.net/projects/aoo-extensions/files/1470/1/en_US.oxt/download "en_US.oxt"
47
--
Line 50 Link Here
50
    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"
50
    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"
51
--
Line 54 Link Here
54
    5c0de383ef649cffefc128cfb36b4d43 http://sourceforge.net/projects/aoo-extensions/files/1456/6/nl-dict-v2.00g.oxt/download "nl-dict-v2.00g.oxt"
54
    5c0de383ef649cffefc128cfb36b4d43 https://sourceforge.net/projects/aoo-extensions/files/1456/6/nl-dict-v2.00g.oxt/download "nl-dict-v2.00g.oxt"
55
--
Line 66 Link Here
66
    59dd45e6785ed644adbbd73f4f126182 http://sourceforge.net/projects/aoo-extensions/files/1657/3/es_es.oxt/download "es_es.oxt"
66
    1b999fcef948148e269161a08e7acf20 https://sourceforge.net/projects/aoo-extensions/files/1657/4/es_es.oxt/download "es_es.oxt"
67
--
Lines 70-71 Link Here
70
    b38cba04b6513dd42b031199d617cce6 http://sourceforge.net/projects/aoo-extensions/files/1388/12/DanskeSynonymer.oxt/download "DanskeSynonymer.oxt"
70
    b38cba04b6513dd42b031199d617cce6 https://sourceforge.net/projects/aoo-extensions/files/1388/12/DanskeSynonymer.oxt/download "DanskeSynonymer.oxt"
71
    6ee1e24fb17e44577d8e3200f3e44adc http://sourceforge.net/projects/aoo-extensions/files/1429/6/dict-da-current.oxt/download "dict-da-current.oxt"
71
    6ee1e24fb17e44577d8e3200f3e44adc https://sourceforge.net/projects/aoo-extensions/files/1429/6/dict-da-current.oxt/download "dict-da-current.oxt"
72
--
Line 75 Link Here
75
    d8d4a3d5c6abfde1b4c81cc1ddd1afa0 http://sourceforge.net/projects/aoo-extensions/files/17703/0/openoffice-spellcheck-lt-1.3.oxt/download "openoffice-spellcheck-lt-1.3.oxt"
75
    d8d4a3d5c6abfde1b4c81cc1ddd1afa0 https://sourceforge.net/projects/aoo-extensions/files/17703/0/openoffice-spellcheck-lt-1.3.oxt/download "openoffice-spellcheck-lt-1.3.oxt"
76
--
Line 83 Link Here
83
    93921f14809a22770f1bd89af65015bc http://sourceforge.net/projects/aoo-extensions/files/3233/3/dict_ru_ru-0.3.7.oxt/download "dict-ru.oxt"
83
    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"
84
--
Line 87 Link Here
87
    5a7cec122a215c9f6a906ecb8ad46ee6 http://sourceforge.net/projects/aoo-extensions/files/1143/11/dict-sk.oxt/download "dict-sk.oxt"
87
    5a7cec122a215c9f6a906ecb8ad46ee6 https://sourceforge.net/projects/aoo-extensions/files/1143/11/dict-sk.oxt/download "dict-sk.oxt"
88
--
Line 95 Link Here
95
  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"
95
    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"
96
--
Line 99 Link Here
99
    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"
99
    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"
100
--
Line 103 Link Here
103
    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"
103
    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"
104
--
Line 111 Link Here
111
    f408bb4a333bea2aec86bffaa4ffa229 http://sourceforge.net/projects/aoo-extensions/files/1383/2/xuxen_4_OOo3.oxt/download "xuxen_4_OOo3.oxt"
111
    f408bb4a333bea2aec86bffaa4ffa229 https://sourceforge.net/projects/aoo-extensions/files/1383/2/xuxen_4_OOo3.oxt/download "xuxen_4_OOo3.oxt"
112
--
Lines 115-116 Link Here
115
    76345f925e34fef2d29bade4f29108e9 http://sourceforge.net/projects/aoo-extensions/files/3423/4/lightproof-hu_HU-1.3.oxt/download "lightproof-hu_HU-1.3.oxt"
115
    76345f925e34fef2d29bade4f29108e9 https://sourceforge.net/projects/aoo-extensions/files/3423/4/lightproof-hu_HU-1.3.oxt/download "lightproof-hu_HU-1.3.oxt"
116
    d320e43e815c2dfd599dbfb7cd0e41fb http://sourceforge.net/projects/aoo-extensions/files/1283/9/dict-hu.oxt/download "dict-hu.oxt"
116
    d320e43e815c2dfd599dbfb7cd0e41fb https://sourceforge.net/projects/aoo-extensions/files/1283/9/dict-hu.oxt/download "dict-hu.oxt"
117
--
Line 120 Link Here
120
    ed5702f25c8f5e36f97cafc606470c42 http://sourceforge.net/projects/aoo-extensions/files/3932/1/asturianu.oxt/download "asturianu.oxt"
120
    931373dea3bed9621dd55713b53b38ae https://sourceforge.net/projects/aoo-extensions/files/3932/2/ort_ast_20150417_2259.oxt/download "ort_ast_20150417_2259.oxt"
121
--
Line 128 Link Here
128
    32ab4edf1496a7cf5469ee1643eb0128 http://sourceforge.net/projects/aoo-extensions/files/5959/1/dict-sv.oxt/download "dict-sv.oxt"
128
    32ab4edf1496a7cf5469ee1643eb0128 https://sourceforge.net/projects/aoo-extensions/files/5959/1/dict-sv.oxt/download "dict-sv.oxt"
129
--
Line 132 Link Here
132
    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"
132
    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"
133
--
Line 136 Link Here
136
    a69f9221864b1360e38ff3f0b0cc9222 http://sourceforge.net/projects/aoo-extensions/files/806/4/pl-dict.oxt/download "pl-dict.oxt"
136
    a69f9221864b1360e38ff3f0b0cc9222 https://sourceforge.net/projects/aoo-extensions/files/806/4/pl-dict.oxt/download "pl-dict.oxt"
137
--
Line 140 Link Here
140
    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"
140
    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"
141
--
Line 144 Link Here
144
    ed1c612a462490b541297a8522f667d0 http://sourceforge.net/projects/aoo-extensions/files/1205/3/catalan.oxt/download "dict-ca.oxt"
144
    4cf4e4a9d85f14761d38943b7e1fd76d https://sourceforge.net/projects/aoo-extensions/files/1205/5/ca.3.0.0.oxt/download "ca.3.0.0.oxt"
145
--
Line 148 Link Here
148
    3b87a28bf1ff2a8beb76a5b501f40d1c http://sourceforge.net/projects/aoo-extensions/files/1475/0/avl.oxt/download "dict-ca-xv.oxt"
148
    d425579a9a2e26663abaecdd661be419 https://sourceforge.net/projects/aoo-extensions/files/1475/1/ca-valencia.3.0.0.oxt/download "ca-valencia.3.0.0.oxt"
149
--
Line 152 Link Here
152
    6112a73444a1ad3cf70736649e228f0f http://sourceforge.net/projects/aoo-extensions/files/1395/0/dict_valencian_llit.oxt/download "dict-ca-xr.oxt"
152
    6112a73444a1ad3cf70736649e228f0f https://sourceforge.net/projects/aoo-extensions/files/1395/0/dict_valencian_llit.oxt/download "dict_valencian_llit.oxt"
153
--
(-)aoo-4.1.3-fresh/main/external_deps.lst (-4 / +3 lines)
Lines 228-230 Link Here
228
    MD5 = dd7dab7a5fea97d2a6a43f511449b7cd
228
    MD5 = f053af63ef5f39bd9b78d01fbc203334
229
    name = expat-2.1.0.tar.gz
229
    name = expat-2.2.3.tar.bz2
230
    URL1 = http://sourceforge.net/projects/expat/files/expat/2.1.0/expat-2.1.0.tar.gz/download
230
    URL1 = https://sourceforge.net/projects/expat/files/expat/2.2.3/expat-2.2.3.tar.bz2
231
--
(-)aoo-4.1.3-fresh/main/filter/source/msfilter/svdfppt.cxx (+5 lines)
Line 4386 Link Here
4386
				if (nLevelAnz > 5)
4387
				{
4388
					throw std::range_error("Bad input file, Too many stylesheet levels");
4389
				}
4390
(-)aoo-4.1.3-fresh/main/instsetoo_native/util/openoffice.lst (-50 / +26 lines)
Lines 9-10 Link Here
9
            OOOPACKAGEVERSION 4.1.3
9
            OOOPACKAGEVERSION 4.1.4
10
            UREPACKAGEVERSION 4.1.3
10
            UREPACKAGEVERSION 4.1.4
11
--
Lines 62-63 Link Here
62
            PRODUCTVERSION 4.1.3
62
            PRODUCTVERSION 4.1.4
63
            PREVIOUS_VERSION 4.1.2
63
            PREVIOUS_VERSION 4.1.3
64
--
Line 71 Link Here
71
            ABOUTBOXPRODUCTVERSION 4.1.3
71
            ABOUTBOXPRODUCTVERSION 4.1.4
72
--
Line 74 Link Here
74
            UPDATEURL https://ooo-updates.apache.org/aoo413/check.Update
74
            UPDATEURL https://ooo-updates.apache.org/aoo414/check.Update
75
--
Line 79 Link Here
79
            PACKAGEVERSION 4.1.3
79
            PACKAGEVERSION 4.1.4
80
--
Line 123 Link Here
123
            PRODUCTVERSION 4.1.3
123
            PRODUCTVERSION 4.1.4
124
--
Line 131 Link Here
131
            ABOUTBOXPRODUCTVERSION 4.1.3
131
            ABOUTBOXPRODUCTVERSION 4.1.4
132
--
Line 133 Link Here
133
            UPDATEURL https://ooo-updates.apache.org/aoo413/check.Update
133
            UPDATEURL https://ooo-updates.apache.org/aoo414/check.Update
134
--
Line 138 Link Here
138
            PACKAGEVERSION 4.1.3
138
            PACKAGEVERSION 4.1.4
139
--
Line 183 Link Here
183
            PRODUCTVERSION 4.1.3
183
            PRODUCTVERSION 4.1.4
184
--
Line 193 Link Here
193
            ABOUTBOXPRODUCTVERSION 4.1.3
193
            ABOUTBOXPRODUCTVERSION 4.1.4
194
--
Line 200 Link Here
200
            UPDATEURL https://ooo-updates.apache.org/aoo413/check.Update
200
            UPDATEURL https://ooo-updates.apache.org/aoo414/check.Update
201
--
Line 203 Link Here
203
            PACKAGEVERSION 4.1.3
203
            PACKAGEVERSION 4.1.4
204
--
Line 254 Link Here
254
            PRODUCTVERSION 4.1.3
254
            PRODUCTVERSION 4.1.4
255
--
Line 261 Link Here
261
            PACKAGEVERSION 4.1.3
261
            PACKAGEVERSION 4.1.4
262
--
Line 302 Link Here
302
            PRODUCTVERSION 4.1.3
302
            PRODUCTVERSION 4.1.4
303
--
Line 308 Link Here
308
            PACKAGEVERSION 4.1.3
308
            PACKAGEVERSION 4.1.4
309
--
Line 313 Link Here
313
            DATABASENAME openofficeorg413betasdk
313
            DATABASENAME openofficeorg414betasdk
314
--
Line 348 Link Here
348
            PRODUCTVERSION 4.1.3
348
            PRODUCTVERSION 4.1.4
349
--
Line 357 Link Here
357
            PACKAGEVERSION 4.1.3
357
            PACKAGEVERSION 4.1.4
358
--
Line 401 Link Here
401
            PRODUCTVERSION 4.1.3
401
            PRODUCTVERSION 4.1.4
402
--
Line 411 Link Here
411
            ABOUTBOXPRODUCTVERSION 4.1.3
411
            ABOUTBOXPRODUCTVERSION 4.1.4
412
--
Line 413 Link Here
413
            UPDATEURL https://ooo-updates.apache.org/aoo413/check.Update
413
            UPDATEURL https://ooo-updates.apache.org/aoo414/check.Update
414
--
Line 418 Link Here
418
            PACKAGEVERSION 4.1.3
418
            PACKAGEVERSION 4.1.4
419
--
(-)aoo-4.1.3-fresh/main/odk/util/makefile.pmk (-2 / +1 lines)
Line 25 Link Here
25
PRODUCT_RELEASE=4.1.3
25
PRODUCT_RELEASE=4.1.4
26
--
(-)aoo-4.1.3-fresh/main/qadevOOo/runner/makefile.mk (-2 / +1 lines)
Line 39 Link Here
39
.IF "$(SOLAR_JAVA)"=="TRUE" && "$(L10N_framework)"==""
39
.IF "$(SOLAR_JAVA)"=="TRUE" && "$(L10N_framework)"=="" && "$(ANT_HOME)"!="NO_ANT_HOME"
40
--
(-)aoo-4.1.3-fresh/main/rat-excludes (+36 lines)
Line 1475 Link Here
1475
1476
##############################################################################
1477
#
1478
# exclude generated files during the build, e.g. config files, environment scripts
1479
#
1480
1481
main/config.log
1482
main/config.parms
1483
main/config.status
1484
main/configure
1485
main/warn
1486
main/autom4te.cache/*
1487
1488
main/SolarisX86Env.Set*
1489
main/SolarisSparcEnv.Set*
1490
main/LinuxX86Env.Set*
1491
main/LinuxX86-64Env.Set*
1492
main/LinuxIA64Env.Set*
1493
main/LinuxSparcEnv.Set*
1494
main/LinuxPPCEnv.Set*
1495
main/LinuxPPC64Env.Set*
1496
main/LinuxS390Env.Set*
1497
main/LinuxS390XEnv.Set*
1498
main/LinuxM68KEnv.Set*
1499
main/LinuxHPPAEnv.Set*
1500
main/LinuxAlphaEnv.Set*
1501
main/LinuxARMEnv.Set*
1502
main/LinuxMIPSEnv.Set*
1503
main/FreeBSDX86Env.Set*
1504
main/FreeBSDAMDEnv.Set*
1505
main/MacOSXX64Env.Set*
1506
main/MacOSXX86Env.Set*
1507
main/MacOSXPPCEnv.Set*
1508
main/winenv.set*
1509
main/winmingw.set*
1510
(-)aoo-4.1.3-fresh/main/sc/source/core/data/documen2.cxx (-2 / +5 lines)
Line 232 Link Here
232
			pLinkManager = new sfx2::LinkManager( pDocShell );
232
		{
233
--
233
			pLinkManager = new sfx2::LinkManager(pDocShell);
234
			pLinkManager->SetAutoAskUpdateAllLinks();
235
		}
Line 272 Link Here
275
		pLinkManager->SetAutoAskUpdateAllLinks();
(-)aoo-4.1.3-fresh/main/scp2/source/ooo/module_langpack.ulf (+12 lines)
Line 342 Link Here
342
[STR_NAME_MODULE_LANGPACK_CA_XR]
343
en-US = "Catalan (Valencia RACV)"
344
345
[STR_DESC_MODULE_LANGPACK_CA_XR]
346
en-US = "Installs Catalan (Valencia RACV) support in %PRODUCTNAME %PRODUCTVERSION"
347
348
[STR_NAME_MODULE_LANGPACK_CA_XV]
349
en-US = "Catalan (Valencia AVL)"
350
351
[STR_DESC_MODULE_LANGPACK_CA_XV]
352
en-US = "Installs Catalan (Valencia AVL) support in %PRODUCTNAME %PRODUCTVERSION"
353
(-)aoo-4.1.3-fresh/main/scripting/source/provider/ProviderCache.cxx (-2 / +1 lines)
Line 203 Link Here
203
    catch ( RuntimeException& e )
203
    catch ( Exception& e )
204
--
(-)aoo-4.1.3-fresh/main/sdext/prj/build.lst (-2 / +1 lines)
Line 1 Link Here
1
dx	sdext	:	L10N:l10n offuh comphelper unotools readlicense_oo cppu tools cppuhelper sal javaunohelper officecfg LIBXSLT:libxslt xmlhelp NULL
1
dx	sdext	:	L10N:l10n offuh comphelper unotools readlicense_oo cppu tools cppuhelper sal javaunohelper officecfg LIBXSLT:libxslt xmlhelp rsc NULL
2
--
(-)aoo-4.1.3-fresh/main/sfx2/inc/sfx2/linkmgr.hxx (+11 lines)
Line 58 Link Here
58
59
	sal_Bool mAutoAskUpdateAllLinks;
60
	sal_Bool mUpdateAsked;
61
	sal_Bool mAllowUpdate;
62
63
	sal_Bool GetUserAllowsLinkUpdate(Window *pParent);
64
	void SetUserAllowsLinkUpdate(SvBaseLink *pLink, sal_Bool allows);
Line 108 Link Here
115
	
116
	// Automatically ask user about update all links, on first insert
117
	void SetAutoAskUpdateAllLinks();
118
(-)aoo-4.1.3-fresh/main/sfx2/source/appl/linkmgr2.cxx (-25 / +49 lines)
Line 68 Link Here
68
	: pPersist( p )
68
	: pPersist(p),
69
--
69
	mUpdateAsked(sal_False),
70
	mAutoAskUpdateAllLinks(sal_False)
Line 72 Link Here
72
Line 160 Link Here
161
	Window *parent = GetPersist()->GetDialogParent();
162
	if (mAutoAskUpdateAllLinks)
163
	{
164
		SetUserAllowsLinkUpdate(pLink, GetUserAllowsLinkUpdate(parent));
165
	}
166
	
Line 271 Link Here
278
void LinkManager::SetAutoAskUpdateAllLinks()
279
{
280
	mAutoAskUpdateAllLinks = sal_True;
281
}
282
283
sal_Bool LinkManager::GetUserAllowsLinkUpdate(Window *pParentWin)
284
{
285
	if (!mUpdateAsked)
286
	{
287
		if (QueryBox(pParentWin, WB_YES_NO | WB_DEF_NO, SfxResId(STR_QUERY_UPDATE_LINKS)).Execute() == RET_YES)
288
			mAllowUpdate = sal_True;
289
		else
290
			mAllowUpdate = sal_False;
291
		mUpdateAsked = sal_True;
292
	}
293
	return mAllowUpdate;
294
}
295
296
void LinkManager::SetUserAllowsLinkUpdate(SvBaseLink *pLink, sal_Bool allows)
297
{
298
	SfxObjectShell* pShell = pLink->GetLinkManager()->GetPersist();
299
300
	if (pShell)
301
	{
302
		comphelper::EmbeddedObjectContainer& rEmbeddedObjectContainer = pShell->getEmbeddedObjectContainer();
303
		rEmbeddedObjectContainer.setUserAllowsLinkUpdate(allows);
304
	}
305
}
306
Line 312 Link Here
312
		// Graphic-Links noch nicht updaten
348
		// do not update graphic links yet
313
--
Lines 316-317 Link Here
316
352
		
317
		if( bAskUpdate )
353
		sal_Bool allows = sal_True;
318
--
354
			
355
		if (bAskUpdate)
Lines 319-322 Link Here
319
            int nRet = QueryBox( pParentWin, WB_YES_NO | WB_DEF_YES, SfxResId( STR_QUERY_UPDATE_LINKS ) ).Execute();
357
			allows = GetUserAllowsLinkUpdate(pParentWin);
320
			if( RET_YES != nRet )
358
		}
321
            {
322
                SfxObjectShell* pShell = pLink->GetLinkManager()->GetPersist();
323
--
Lines 324-328 Link Here
324
                if(pShell)
360
		SetUserAllowsLinkUpdate(pLink, allows);
325
                {
361
	    bAskUpdate = sal_False;		// one time is OK
326
                    comphelper::EmbeddedObjectContainer& rEmbeddedObjectContainer = pShell->getEmbeddedObjectContainer();
327
                    rEmbeddedObjectContainer.setUserAllowsLinkUpdate(false);
328
                }
329
--
Lines 330-333 Link Here
330
				return ;		// es soll nichts geupdatet werden
363
		if (allows)
331
            }
364
			pLink->Update();
332
			bAskUpdate = sal_False;		// einmal reicht
333
		}
334
--
Line 335 Link Here
335
		pLink->Update();
(-)aoo-4.1.3-fresh/main/solenv/bin/modules/installer/download.pm (-23 / +27 lines)
Line 1185 Link Here
1185
	elsif ( $language eq "af" ) { $nsislanguage = "Afrikaans"; }
Line 1187 Link Here
1188
	elsif ( $language eq "hy" ) { $nsislanguage = "Armenian"; }
1189
	elsif ( $language eq "ast" ) { $nsislanguage = "Asturian"; }
1190
	elsif ( $language eq "eu" ) { $nsislanguage = "Basque"; }
Lines 1193-1194 Link Here
1193
	elsif ( $language eq "de" ) { $nsislanguage = "German"; }
1197
	elsif ( $language eq "en-GB" ) { $nsislanguage = "English"; }
1194
	elsif ( $language eq "de-LU" ) { $nsislanguage = "Luxembourgish"; }
1195
--
Line 1197 Link Here
1197
	elsif ( $language eq "el" ) { $nsislanguage = "Greek"; }
Line 1200 Link Here
1200
	elsif ( $language eq "hu" ) { $nsislanguage = "Hungarian"; }
1202
	elsif ( $language eq "gl" ) { $nsislanguage = "Galician"; }
1201
--
1203
	elsif ( $language eq "de" ) { $nsislanguage = "German"; }
1204
	elsif ( $language eq "el" ) { $nsislanguage = "Greek"; }
Line 1202 Link Here
1206
	elsif ( $language eq "hu" ) { $nsislanguage = "Hungarian"; }
Line 1205 Link Here
1210
	elsif ( $language eq "ja" ) { $nsislanguage = "Japanese"; }
1211
	elsif ( $language eq "ko" ) { $nsislanguage = "Korean"; }
Line 1207 Link Here
1214
	elsif ( $language eq "de-LU" ) { $nsislanguage = "Luxembourgish"; }
Line 1209 Link Here
1217
	elsif ( $language eq "nb" ) { $nsislanguage = "Norwegian"; }
Lines 1211-1214 Link Here
1211
	elsif ( $language eq "es" ) { $nsislanguage = "Spanish"; }
1220
	elsif ( $language eq "nn" ) { $nsislanguage = "NorwegianNynorsk"; }
1212
	elsif ( $language eq "sl" ) { $nsislanguage = "Slovenian"; }
1213
	elsif ( $language eq "sv" ) { $nsislanguage = "Swedish"; }
1214
	elsif ( $language eq "sk" ) { $nsislanguage = "Slovak"; }
1215
--
Line 1216 Link Here
1216
	elsif ( $language eq "pt-BR" ) { $nsislanguage = "PortugueseBR"; }
Line 1218 Link Here
1223
	elsif ( $language eq "pt-BR" ) { $nsislanguage = "PortugueseBR"; }
Line 1220 Link Here
1220
	elsif ( $language eq "sh" ) { $nsislanguage = "SerbianLatin"; }
1226
	elsif ( $language eq "gd" ) { $nsislanguage = "ScotsGaelic"; }
1221
--
Lines 1223-1228 Link Here
1223
	elsif ( $language eq "uk" ) { $nsislanguage = "Ukrainian"; }
1229
	elsif ( $language eq "sh" ) { $nsislanguage = "SerbianLatin"; }
1224
	elsif ( $language eq "tr" ) { $nsislanguage = "Turkish"; }
1225
	elsif ( $language eq "ja" ) { $nsislanguage = "Japanese"; }
1226
	elsif ( $language eq "ko" ) { $nsislanguage = "Korean"; }
1227
	elsif ( $language eq "th" ) { $nsislanguage = "Thai"; }
1228
	elsif ( $language eq "vi" ) { $nsislanguage = "Vietnamese"; }
1229
--
Line 1230 Link Here
1231
	elsif ( $language eq "sl" ) { $nsislanguage = "Slovenian"; }
1232
	elsif ( $language eq "sk" ) { $nsislanguage = "Slovak"; }
1233
	elsif ( $language eq "es" ) { $nsislanguage = "Spanish"; }
1234
	elsif ( $language eq "sv" ) { $nsislanguage = "Swedish"; }
1235
	elsif ( $language eq "th" ) { $nsislanguage = "Thai"; }
Line 1231 Link Here
1237
	elsif ( $language eq "tr" ) { $nsislanguage = "Turkish"; }
1238
	elsif ( $language eq "uk" ) { $nsislanguage = "Ukrainian"; }
1239
	elsif ( $language eq "vi" ) { $nsislanguage = "Vietnamese"; }
1240
	elsif ( $language eq "cy" ) { $nsislanguage = "Welsh"; }
Line 1374 Link Here
1374
# !define MUI_TEXT_DIRECTORY_TITLE "Zielverzeichnis auswählen"
1384
# !define MUI_TEXT_DIRECTORY_TITLE "Zielverzeichnis auswählen"
1375
--
(-)aoo-4.1.3-fresh/main/solenv/bin/srcrelease.xml (-4 / +5 lines)
Line 30 Link Here
30
  <property name="aoo.ver" value="4.1.3"/>
30
  <property name="aoo.ver" value="4.1.4"/>
31
--
Line 32 Link Here
32
  <property name="excludes.list" value="configure, moz/zipped/*.zip, **/.svn **/.gitignore, **/.git, warn, set_soenv, solver/**, makefile.mk, config.log, config.parms, config.status, bootstrap, autom4te.cache/**, MacOSXX86Env.*, external/unowinreg/unowinreg.dll" />
32
  <property name="excludes.list" value="configure, moz/zipped/*.zip, **/.svn **/.gitignore, **/.git, warn, set_soenv, solver/**, makefile.mk, config.log, config.parms, config.status, bootstrap, autom4te.cache/**, LinuxX86Env.*, LinuxX86-64Env.*, MacOSXX86Env.*, MacOSXX64Env.*, winmingw.*, winenv.*, external/unowinreg/unowinreg.dll" />
33
--
Line 35 Link Here
35
  <property name="includes.references" value="references/**/*.pdf references/**/*.ps references/**/*.ini_" />
Line 78 Link Here
79
      <zipfileset dir="main/testgraphical" includes="${includes.references}" prefix="${release.dir.name}/main/testgraphical"/>
Line 94 Link Here
96
      <tarfileset dir="main/testgraphical" includes="${includes.references}" prefix="${release.dir.name}/main/testgraphical"/>
(-)aoo-4.1.3-fresh/main/solenv/inc/minor.mk (-6 / +5 lines)
Lines 21-25 Link Here
21
RSCVERSION=413
21
RSCVERSION=414
22
RSCREVISION=413m1(Build:9783)
22
RSCREVISION=414m5(Build:9788)
23
BUILD=9783
23
BUILD=9788
24
LAST_MINOR=m1
24
LAST_MINOR=m5
25
SOURCEVERSION=AOO413
25
SOURCEVERSION=AOO414
26
--
(-)aoo-4.1.3-fresh/main/stlport/systemstl/functional (+2 lines)
Line 35 Link Here
35
#elif defined(__cplusplus) && (__cplusplus >= 201103L)
36
    #include_next <functional>
(-)aoo-4.1.3-fresh/main/svl/Library_passwordcontainer.mk (+11 lines)
Line 40 Link Here
40
ifeq ($(GUI),UNX)
41
ifeq ($(COM),GCC)
42
ifeq ($(CPUNAME),INTEL)
43
$(eval $(call gb_Library_set_ldflags,passwordcontainer,\
44
    $(gb_LinkTarget_LDFLAGS) \
45
    -Wl$(COMMA)--start-group -lc -Wl$(COMMA)--end-group \
46
))
47
endif
48
endif
49
endif
50
(-)aoo-4.1.3-fresh/main/svtools/inc/svtools/treelist.hxx (-6 / +3 lines)
Line 407 Link Here
407
	return pData->IsExpanded();
407
	return pData && pData->IsExpanded();
408
--
Line 414 Link Here
414
	return pData->IsSelected();
414
	return pData && pData->IsSelected();
415
--
Line 421 Link Here
421
	return pData->HasFocus();
421
	return pData && pData->HasFocus();
422
--
(-)aoo-4.1.3-fresh/main/svtools/source/contnr/svtreebx.cxx (-27 / +26 lines)
Lines 2760-2785 Link Here
2760
	if ( pEntry->HasChildsOnDemand() || pEntry->HasChilds() )
2760
    if ( pEntry )
2761
	{
2761
    {
2762
		rStateSet.AddState( AccessibleStateType::EXPANDABLE );
2762
        if ( pEntry->HasChildsOnDemand() || pEntry->HasChilds() )
2763
		if ( IsExpanded( pEntry ) )
2763
        {
2764
		    rStateSet.AddState( (sal_Int16)AccessibleStateType::EXPANDED );
2764
            rStateSet.AddState( AccessibleStateType::EXPANDABLE );
2765
	}
2765
            if ( IsExpanded( pEntry ) )
2766
2766
                rStateSet.AddState( (sal_Int16)AccessibleStateType::EXPANDED );
2767
	if ( GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED )
2767
        }
2768
		rStateSet.AddState( AccessibleStateType::CHECKED );
2768
2769
	if ( IsEntryVisible( pEntry ) )
2769
        if ( GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED )
2770
		rStateSet.AddState( AccessibleStateType::VISIBLE );
2770
            rStateSet.AddState( AccessibleStateType::CHECKED );
2771
	if ( IsSelected( pEntry ) )
2771
        if ( IsEntryVisible( pEntry ) )
2772
		rStateSet.AddState( AccessibleStateType::SELECTED );
2772
            rStateSet.AddState( AccessibleStateType::VISIBLE );
2773
	if ( IsEnabled() )
2773
        if ( IsSelected( pEntry ) )
2774
	{
2774
            rStateSet.AddState( AccessibleStateType::SELECTED );
2775
		rStateSet.AddState( AccessibleStateType::ENABLED );
2775
        if ( IsEnabled() )
2776
		rStateSet.AddState( AccessibleStateType::FOCUSABLE );
2776
        {
2777
		rStateSet.AddState( AccessibleStateType::SELECTABLE );
2777
            rStateSet.AddState( AccessibleStateType::ENABLED );
2778
		SvViewDataEntry* pViewDataNewCur = 0;
2778
            rStateSet.AddState( AccessibleStateType::FOCUSABLE );
2779
		if( pEntry )
2779
            rStateSet.AddState( AccessibleStateType::SELECTABLE );
2780
		{
2780
            SvViewDataEntry* pViewDataNewCur = 0;
2781
			pViewDataNewCur= GetViewDataEntry(pEntry);
2781
            pViewDataNewCur = GetViewDataEntry(pEntry);
2782
			if(pViewDataNewCur->HasFocus())
2782
            if( pViewDataNewCur && pViewDataNewCur->HasFocus() )
2783
				rStateSet.AddState( AccessibleStateType::FOCUSED );
2783
                rStateSet.AddState( AccessibleStateType::FOCUSED );
2784
		}
2784
        }
2785
	}
2785
    }
2786
--
(-)aoo-4.1.3-fresh/main/sw/source/filter/ww8/ww8par2.cxx (-8 / +5 lines)
Line 4535 Link Here
4535
        aCHPXOffsets[stcp].mnSize = 0;
4535
        aCHPXOffsets.at(stcp).mnSize = 0;
4536
--
Lines 4541-4542 Link Here
4541
            aCHPXOffsets[stcp].mnOffset = rSt.Tell();
4541
            aCHPXOffsets.at(stcp).mnOffset = rSt.Tell();
4542
            aCHPXOffsets[stcp].mnSize = nRemainder;
4542
            aCHPXOffsets.at(stcp).mnSize = nRemainder;
4543
--
Lines 4544-4545 Link Here
4544
            Word2CHPX aChpx = ReadWord2Chpx(rSt, aCHPXOffsets[stcp].mnOffset,
4544
            Word2CHPX aChpx = ReadWord2Chpx(rSt, aCHPXOffsets.at(stcp).mnOffset,
4545
                aCHPXOffsets[stcp].mnSize);
4545
                aCHPXOffsets.at(stcp).mnSize);
4546
--
(-)aoo-4.1.3-fresh/main/sw/source/filter/ww8/ww8scan.cxx (+7 lines)
Line 6470 Link Here
6470
        // Check size consistency
6471
        if(nMax > nFFn)
6472
        {
6473
			throw std::out_of_range("WW8 beyond end of buffer");            
6474
        }
6475
Line 6588 Link Here
6594
(-)aoo-4.1.3-fresh/main/sysui/desktop/productversion.mk (-2 / +1 lines)
Line 50 Link Here
50
PRODUCTVERSION = 4.1.3
50
PRODUCTVERSION = 4.1.4
51
--

Return to issue 127568