Author: jim
Date: Wed Oct 11 11:28:26 2017
New Revision: 1811811
URL: http://svn.apache.org/viewvc?rev=1811811&view=rev
Log:
Backport required changes for 4.1.4-RC5.
o Language regression
o Labels regression
(https://lists.apache.org/thread.html/73190a90b39e83e6d6594d3ce1680a4d4f1d6db04a8f55e648c4d6c7@%3Cdev.openoffice.apache.org%3E)
o Bump versioning
Modified:
openoffice/branches/AOO414/main/extensions.lst
openoffice/branches/AOO414/main/sfx2/source/appl/linkmgr2.cxx
openoffice/branches/AOO414/main/solenv/inc/minor.mk
Modified: openoffice/branches/AOO414/main/extensions.lst
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO414/main/extensions.lst?rev=1811811&r1=1811810&r2=1811811&view=diff
==============================================================================
--- openoffice/branches/AOO414/main/extensions.lst (original)
+++ openoffice/branches/AOO414/main/extensions.lst Wed Oct 11 11:28:26 2017
@@ -133,7 +133,7 @@
# Polish.
[ language=pl ]
- 6218d6999038aaab574e05b1b891078e
https://sourceforge.net/projects/aoo-extensions/files/806/7/pl-dict.oxt/download
"pl-dict.oxt"
+ a69f9221864b1360e38ff3f0b0cc9222
https://sourceforge.net/projects/aoo-extensions/files/806/4/pl-dict.oxt/download
"pl-dict.oxt"
# Portuguese (European).
[ language=pt || language=pt_PT ]
Modified: openoffice/branches/AOO414/main/sfx2/source/appl/linkmgr2.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO414/main/sfx2/source/appl/linkmgr2.cxx?rev=1811811&r1=1811810&r2=1811811&view=diff
==============================================================================
--- openoffice/branches/AOO414/main/sfx2/source/appl/linkmgr2.cxx (original)
+++ openoffice/branches/AOO414/main/sfx2/source/appl/linkmgr2.cxx Wed Oct 11
11:28:26 2017
@@ -350,7 +350,7 @@ void LinkManager::UpdateAllLinks(
( !bUpdateGrfLinks && OBJECT_CLIENT_GRF ==
pLink->GetObjType() ))
continue;
- sal_Bool allows = sal_False;
+ sal_Bool allows = sal_True;
if (bAskUpdate)
{
Modified: openoffice/branches/AOO414/main/solenv/inc/minor.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO414/main/solenv/inc/minor.mk?rev=1811811&r1=1811810&r2=1811811&view=diff
==============================================================================
--- openoffice/branches/AOO414/main/solenv/inc/minor.mk (original)
+++ openoffice/branches/AOO414/main/solenv/inc/minor.mk Wed Oct 11 11:28:26 2017
@@ -19,7 +19,7 @@
#
# *************************************************************
RSCVERSION=414
-RSCREVISION=414m4(Build:9787)
-BUILD=9787
+RSCREVISION=414m5(Build:9788)
+BUILD=9788
LAST_MINOR=m4
SOURCEVERSION=AOO414
