[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - 8 commits - configure.ac download.lst external/python3 .gitignore instsetoo_native/util sc/source setup_native/source solenv/bin sw/source xmloff/source

Andras Timar andras.timar at collabora.com
Mon Jul 9 07:51:55 UTC 2018


 .gitignore                                             |    1 
 configure.ac                                           |    5 -
 download.lst                                           |    4 -
 external/python3/UnpackedTarball_python3.mk            |    1 
 external/python3/python-3.5.5-CVE-2017-1000158.patch.1 |   62 -----------------
 instsetoo_native/util/openoffice.lst.in                |    2 
 sc/source/core/tool/interpr1.cxx                       |   36 +++++++++
 sc/source/ui/undo/undotab.cxx                          |    2 
 sc/source/ui/view/viewfunc.cxx                         |   13 ++-
 setup_native/source/packinfo/finals_instsetoo.txt      |    1 
 solenv/bin/modules/installer/globals.pm                |    2 
 solenv/bin/modules/installer/windows/msp.pm            |    2 
 sw/source/uibase/utlui/content.cxx                     |    2 
 xmloff/source/forms/elementimport.cxx                  |    2 
 14 files changed, 54 insertions(+), 81 deletions(-)

New commits:
commit b3bae2851e808bd6dfb47ffe2ae58e9bba29f77e
Author: Andras Timar <andras.timar at collabora.com>
Date:   Mon Jul 9 09:50:37 2018 +0200

    Revert "Enable MSP patching"
    
    This reverts commit 7e948427b09f4eb13eea812379ddacc01c28ef17.

diff --git a/.gitignore b/.gitignore
index aad4142986f0..ab3a638307b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -64,7 +64,6 @@
 /README
 /AUTHORS
 /MAINTAINERS
-/setup_native/source/packinfo/finals_instsetoo.txt
 
 # make id
 /ID
diff --git a/configure.ac b/configure.ac
index 68d0accb1fa4..7e27553b12ae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3061,7 +3061,6 @@ if test "$_os" = "WINNT"; then
         BITNESS_OVERRIDE=64
     fi
 fi
-AC_SUBST(WINDOWS_SDK_ARCH)
 if test "$_os" = "iOS"; then
     cross_compiling="yes"
 fi
@@ -4370,7 +4369,6 @@ if test "$cross_compiling" = "yes"; then
         bin/odfvalidator.sh.in \
         bin/officeotron.sh.in \
         instsetoo_native/util/openoffice.lst.in \
-        setup_native/source/packinfo/finals_instsetoo.txt.in \
         config_host/*.in \
         sysui/desktop/macosx/Info.plist.in) \
     | (cd CONF-FOR-BUILD && tar xf -)
@@ -12588,7 +12586,6 @@ AC_CONFIG_FILES([config_host.mk
                  bin/odfvalidator.sh
                  bin/officeotron.sh
                  instsetoo_native/util/openoffice.lst
-                 setup_native/source/packinfo/finals_instsetoo.txt
                  sysui/desktop/macosx/Info.plist])
 AC_CONFIG_HEADERS([config_host/config_buildid.h])
 AC_CONFIG_HEADERS([config_host/config_clang.h])
diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in
index 721e6788fd0d..4d5a01bbf158 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -27,7 +27,7 @@ Globals
             REGISTRYLAYERNAME Layers
             SERVICEPACK 1
             UPDATE_DATABASE 1
-            CREATE_MSP_INSTALLSET 1
+            CREATE_MSP_INSTALLSET 0
             UPDATE_DATABASE_LISTNAME finals_instsetoo.txt
             PACKAGEMAP package_names.txt,package_names_ext.txt
             WINDOWSPATCHLEVEL @LIBO_VERSION_PATCH@
diff --git a/setup_native/source/packinfo/finals_instsetoo.txt.in b/setup_native/source/packinfo/finals_instsetoo.txt
similarity index 82%
rename from setup_native/source/packinfo/finals_instsetoo.txt.in
rename to setup_native/source/packinfo/finals_instsetoo.txt
index b871d6c64238..d5a68d369f7b 100644
--- a/setup_native/source/packinfo/finals_instsetoo.txt.in
+++ b/setup_native/source/packinfo/finals_instsetoo.txt
@@ -30,4 +30,3 @@
 # OpenOffice	pro		de			\\<server>\<path>\msi\OOO300_m6_native_packed-1_de.9352\openofficeorg30.msi
 # OpenOfficeLanguagePack	pro	es	\\<server>\<path>\msi\OOO300_m6_native_packed-1_es.9352\openofficeorg30.msi
 # URE			pro		en-US		\\<server>\<path>\msi\OOO300_m6_native_packed-1_en-US.9352\ure14.msi
-CollaboraOffice		pro		en-US,ar,as,ast,bg,bn-IN,br,ca,ca-valencia,cy,cs,da,de,el,en-GB,es,et,eu,fi,fr,ga,gd,gl,gu,he,hi,hr,hu,id,is,it,ja,km,kn,ko,lt,lv,ml,mr,nb,nl,nn,oc,or,pa-IN,pl,pt,pt-BR,ro,ru,sk,sl,sr,sr-Latn,sv,ta,te,tr,uk,vi,zh-CN,zh-TW		c:\lo\src\cp-6.0-5- at WINDOWS_SDK_ARCH@\Collabora_Office_6.0-5-Win_ at WINDOWS_SDK_ARCH@.msi
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index 324379896547..2cd0cc21062c 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -222,7 +222,7 @@ BEGIN
     $fix_number_of_cab_files = 1;
     $cabfilecompressionlevel = 21; # Using LZX compression, possible values are: 15 | 16 | ... | 21 (best compression)
     $number_of_cabfiles = 1;    # only for $fix_number_of_cab_files = 1
-    $include_cab_in_msi = 0;
+    $include_cab_in_msi = 1;
     $msidatabasename = "";
     $prepare_winpatch = 0;
     $previous_idt_dir = "";
diff --git a/solenv/bin/modules/installer/windows/msp.pm b/solenv/bin/modules/installer/windows/msp.pm
index e76d5da7ab7f..1e76947df7b0 100644
--- a/solenv/bin/modules/installer/windows/msp.pm
+++ b/solenv/bin/modules/installer/windows/msp.pm
@@ -288,7 +288,7 @@ sub set_mspfilename
 {
     my ($allvariables, $mspdir, $languagesarrayref) = @_;
 
-    my $databasename = $allvariables->{'ONEWORDPRODUCTNAME'} . "-" . $allvariables->{'PRODUCTVERSION'} . "-" . $allvariables->{'WINDOWSPATCHLEVEL'} . ".msp";
+    my $databasename = $allvariables->{'PRODUCTNAME'} . "-" . $allvariables->{'PRODUCTVERSION'} . "-" . $allvariables->{'WINDOWSPATCHLEVEL'} . ".msp";
 
     my $fullmspname = $mspdir . $installer::globals::separator . $databasename;
 
commit 09d544de65a25337b2c8c170577a4c2a113aaeb5
Author: Andras Timar <andras.timar at collabora.com>
Date:   Mon Jul 9 09:49:32 2018 +0200

    Revert "fixup of 'Enable MSP patching'"
    
    This reverts commit c093abcd85f01f7a9079882430e76b60685839e7.

diff --git a/setup_native/source/packinfo/finals_instsetoo.txt.in b/setup_native/source/packinfo/finals_instsetoo.txt.in
index d7395c464f2e..b871d6c64238 100644
--- a/setup_native/source/packinfo/finals_instsetoo.txt.in
+++ b/setup_native/source/packinfo/finals_instsetoo.txt.in
@@ -30,4 +30,4 @@
 # OpenOffice	pro		de			\\<server>\<path>\msi\OOO300_m6_native_packed-1_de.9352\openofficeorg30.msi
 # OpenOfficeLanguagePack	pro	es	\\<server>\<path>\msi\OOO300_m6_native_packed-1_es.9352\openofficeorg30.msi
 # URE			pro		en-US		\\<server>\<path>\msi\OOO300_m6_native_packed-1_en-US.9352\ure14.msi
-CollaboraOffice		pro		en-US,ar,as,ast,bg,bn-IN,br,ca,ca-valencia,cy,cs,da,de,el,en-GB,es,et,eu,fi,fr,ga,gd,gl,gu,he,hi,hr,hu,id,is,it,ja,km,kn,ko,lt,lv,ml,mr,nb,nl,nn,oc,or,pa-IN,pl,pt,pt-BR,ro,ru,sk,sl,sr,sr-Latn,sv,ta,te,tr,uk,vi,zh-CN,zh-TW		c:\lo\src\cp-6.0-5- at WINDOWS_SDK_ARCH@\Collabora_Office_6.0-5_Win_ at WINDOWS_SDK_ARCH@.msi
+CollaboraOffice		pro		en-US,ar,as,ast,bg,bn-IN,br,ca,ca-valencia,cy,cs,da,de,el,en-GB,es,et,eu,fi,fr,ga,gd,gl,gu,he,hi,hr,hu,id,is,it,ja,km,kn,ko,lt,lv,ml,mr,nb,nl,nn,oc,or,pa-IN,pl,pt,pt-BR,ro,ru,sk,sl,sr,sr-Latn,sv,ta,te,tr,uk,vi,zh-CN,zh-TW		c:\lo\src\cp-6.0-5- at WINDOWS_SDK_ARCH@\Collabora_Office_6.0-5-Win_ at WINDOWS_SDK_ARCH@.msi
commit a1d0e1dd7f1aa8ff291e1a21263a7a64192d00bb
Author: Andras Timar <andras.timar at collabora.com>
Date:   Mon Jul 9 09:48:57 2018 +0200

    Revert "Revert "python3: upgrade to release 3.5.5""
    
    This reverts commit 695489e29958ac66e6941afdedfdf9dd7e2cdde7.

diff --git a/configure.ac b/configure.ac
index 6e6f44db6562..68d0accb1fa4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8078,7 +8078,7 @@ internal)
     SYSTEM_PYTHON=
     PYTHON_VERSION_MAJOR=3
     PYTHON_VERSION_MINOR=5
-    PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.4
+    PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.5
     if ! grep -q -i python.*${PYTHON_VERSION} ${SRC_ROOT}/download.lst; then
         AC_MSG_ERROR([PYTHON_VERSION ${PYTHON_VERSION} but no matching file in download.lst])
     fi
diff --git a/download.lst b/download.lst
index 3db3fe1cdd97..8880f5e3ae84 100644
--- a/download.lst
+++ b/download.lst
@@ -226,8 +226,8 @@ export POPPLER_SHA256SUM := 2c096431adfb74bc2f53be466889b7646e1b599f28fa036094f3
 export POPPLER_TARBALL := poppler-0.66.0.tar.xz
 export POSTGRESQL_SHA256SUM := db61d498105a7d5fe46185e67ac830c878cdd7dc1f82a87f06b842217924c461
 export POSTGRESQL_TARBALL := c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2
-export PYTHON_SHA256SUM := 6ed87a8b6c758cc3299a8b433e8a9a9122054ad5bc8aad43299cff3a53d8ca44
-export PYTHON_TARBALL := Python-3.5.4.tgz
+export PYTHON_SHA256SUM := 063d2c3b0402d6191b90731e0f735c64830e7522348aeb7ed382a83165d45009
+export PYTHON_TARBALL := Python-3.5.5.tar.xz
 export QXP_SHA256SUM := 8c257f6184ff94aefa7c9fa1cfae82083d55a49247266905c71c53e013f95c73
 export QXP_TARBALL := libqxp-0.0.1.tar.xz
 export RAPTOR_SHA256SUM := ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed
commit 909f85a3c81095c40153dda5811eee9566441ecb
Author: Andras Timar <andras.timar at collabora.com>
Date:   Mon Jul 9 09:48:42 2018 +0200

    Revert "Fix Python CVE-2017-1000158"
    
    This reverts commit bb9c949c31d8a17a34baeaebb7bbac81f9056d61.

diff --git a/external/python3/UnpackedTarball_python3.mk b/external/python3/UnpackedTarball_python3.mk
index 9ed7a1ccce38..35d6e643a1b0 100644
--- a/external/python3/UnpackedTarball_python3.mk
+++ b/external/python3/UnpackedTarball_python3.mk
@@ -26,7 +26,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\
 	external/python3/python-3.3.5-pyexpat-symbols.patch.1 \
 	external/python3/ubsan.patch.0 \
 	external/python3/python-3.5.tweak.strip.soabi.patch \
-	external/python3/python-3.5.5-CVE-2017-1000158.patch.1 \
 ))
 
 ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD SOLARIS,$(OS)),)
diff --git a/external/python3/python-3.5.5-CVE-2017-1000158.patch.1 b/external/python3/python-3.5.5-CVE-2017-1000158.patch.1
deleted file mode 100644
index 9bd472fd713d..000000000000
--- a/external/python3/python-3.5.5-CVE-2017-1000158.patch.1
+++ /dev/null
@@ -1,62 +0,0 @@
-From fd8614c5c5466a14a945db5b059c10c0fb8f76d9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro at hroncok.cz>
-Date: Fri, 8 Dec 2017 22:34:12 +0100
-Subject: [PATCH] bpo-30657: Fix CVE-2017-1000158 (#4664)
-
-Fixes possible integer overflow in PyBytes_DecodeEscape.
-
-Co-Authored-By: Jay Bosamiya <jaybosamiya at gmail.com>
----
- Misc/ACKS                                                         | 2 ++
- .../NEWS.d/next/Security/2017-12-01-18-51-03.bpo-30657.Fd8kId.rst | 2 ++
- Objects/bytesobject.c                                             | 8 +++++++-
- 3 files changed, 11 insertions(+), 1 deletion(-)
- create mode 100644 Misc/NEWS.d/next/Security/2017-12-01-18-51-03.bpo-30657.Fd8kId.rst
-
-diff --git a/Misc/ACKS b/Misc/ACKS
-index fbf110d801b5..1a35aad66ce7 100644
---- a/Misc/ACKS
-+++ b/Misc/ACKS
-@@ -167,6 +167,7 @@ Médéric Boquien
- Matias Bordese
- Jonas Borgström
- Jurjen Bos
-+Jay Bosamiya
- Peter Bosch
- Dan Boswell
- Eric Bouck
-@@ -651,6 +652,7 @@ Ken Howard
- Brad Howes
- Mike Hoy
- Ben Hoyt
-+Miro Hrončok
- Chiu-Hsiang Hsu
- Chih-Hao Huang
- Christian Hudon
-diff --git a/Misc/NEWS.d/next/Security/2017-12-01-18-51-03.bpo-30657.Fd8kId.rst b/Misc/NEWS.d/next/Security/2017-12-01-18-51-03.bpo-30657.Fd8kId.rst
-new file mode 100644
-index 000000000000..75359b6d8833
---- /dev/null
-+++ b/Misc/NEWS.d/next/Security/2017-12-01-18-51-03.bpo-30657.Fd8kId.rst
-@@ -0,0 +1,2 @@
-+Fixed possible integer overflow in PyBytes_DecodeEscape, CVE-2017-1000158.
-+Original patch by Jay Bosamiya; rebased to Python 3 by Miro Hrončok.
-diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c
-index 77dd45e84af8..9b29dc38b44f 100644
---- a/Objects/bytesobject.c
-+++ b/Objects/bytesobject.c
-@@ -970,7 +970,13 @@ PyObject *PyBytes_DecodeEscape(const char *s,
-     char *p, *buf;
-     const char *end;
-     PyObject *v;
--    Py_ssize_t newlen = recode_encoding ? 4*len:len;
-+    Py_ssize_t newlen;
-+    /* Check for integer overflow */
-+    if (recode_encoding && (len > PY_SSIZE_T_MAX / 4)) {
-+        PyErr_SetString(PyExc_OverflowError, "string is too large");
-+        return NULL;
-+    }
-+    newlen = recode_encoding ? 4*len:len;
-     v = PyBytes_FromStringAndSize((char *)NULL, newlen);
-     if (v == NULL)
-         return NULL;
commit 87866d75fbfc72abfde680e3141926644eab7fda
Author: Michael Stahl <Michael.Stahl at cib.de>
Date:   Fri Jul 6 18:39:20 2018 +0200

    tdf#115890 sw: fix invalid cast in SwContentTree::GetEntryAltText()
    
    AccessibleListBoxEntry calls this for any entry.
    
    This was always broken but now we have asserts to tell us about it.
    
    Change-Id: I7094a1dfbffd359e0f536ca60cba2478e2a62464
    Reviewed-on: https://gerrit.libreoffice.org/57086
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>
    Tested-by: Jenkins
    (cherry picked from commit 2986f4baa8bdef1f9ab9108240ea890075321be1)
    Reviewed-on: https://gerrit.libreoffice.org/57152
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    (cherry picked from commit a900c91447897e725fc0cf674205eee633b326eb)

diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index 9b59a912c722..9012fd86fbcf 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -902,7 +902,7 @@ Size SwContentTree::GetOptimalSize() const
 
 OUString SwContentTree::GetEntryAltText( SvTreeListEntry* pEntry ) const
 {
-    if( pEntry == nullptr)
+    if (pEntry == nullptr || !lcl_IsContent(pEntry))
         return OUString();
 
     assert(pEntry->GetUserData() == nullptr || dynamic_cast<SwContent*>(static_cast<SwTypeNumber*>(pEntry->GetUserData())));
commit 4655a28e386f754ca6b355344d35a0ef759d21ca
Author: Eike Rathke <erack at redhat.com>
Date:   Sat Jul 7 23:00:50 2018 +0200

    Resolves: tdf#118561 handle external references as jump matrix result
    
    Change-Id: I0381179347960293f5d470ed231d626cb6707b5a
    Reviewed-on: https://gerrit.libreoffice.org/57144
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Jenkins
    (cherry picked from commit a5b9bb7be70c7aec2388199e68a0cf86dd220955)
    Reviewed-on: https://gerrit.libreoffice.org/57148
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    (cherry picked from commit 8f3515b5e54dabb08ddb01253d9503e9c16cfebe)

diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 49c7d009f05a..cb0ac61a3cc6 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -714,10 +714,44 @@ bool ScInterpreter::JumpMatrix( short nStackLevel )
                     }
                 }
                 break;
+                case svExternalSingleRef:
+                {
+                    ScExternalRefCache::TokenRef pToken;
+                    PopExternalSingleRef(pToken);
+                    if (nGlobalError != FormulaError::NONE)
+                    {
+                        pJumpMatrix->PutResultDouble( CreateDoubleError( nGlobalError), nC, nR );
+                        nGlobalError = FormulaError::NONE;
+                    }
+                    else
+                    {
+                        switch (pToken->GetType())
+                        {
+                            case svDouble:
+                                pJumpMatrix->PutResultDouble( pToken->GetDouble(), nC, nR );
+                            break;
+                            case svString:
+                                pJumpMatrix->PutResultString( pToken->GetString(), nC, nR );
+                            break;
+                            case svEmptyCell:
+                                pJumpMatrix->PutResultEmpty( nC, nR );
+                            break;
+                            default:
+                                // svError was already handled (set by
+                                // PopExternalSingleRef()) with nGlobalError
+                                // above.
+                                assert(!"unhandled svExternalSingleRef case");
+                                pJumpMatrix->PutResultDouble( CreateDoubleError(
+                                            FormulaError::UnknownStackVariable), nC, nR );
+                        }
+                    }
+                }
+                break;
+                case svExternalDoubleRef:
                 case svMatrix:
                 {   // match matrix offsets
                     double fVal;
-                    ScMatrixRef pMat = PopMatrix();
+                    ScMatrixRef pMat = GetMatrix();
                     if ( nGlobalError != FormulaError::NONE )
                     {
                         fVal = CreateDoubleError( nGlobalError );
commit 5aa6450109805a317d3841bad722ed000e0d321d
Author: Eike Rathke <erack at redhat.com>
Date:   Fri Jul 6 20:09:55 2018 +0200

    tdf#118547: Remove lock mark only if password is correct, tdf#95880 follow-up
    
     This is a combination of 3 commits.
    
    tdf#118547: Remove lock mark only if password is correct
    
    Reviewed-on: https://gerrit.libreoffice.org/57044
    Tested-by: Jenkins
    Reviewed-by: Eike Rathke <erack at redhat.com>
    (cherry picked from commit c3a732a11c320b98e31dad79f421d4d73f33a15b)
    
    Related: tdf#118547 handle multi-sheet un-/protect, tdf#95880 follow-up
    
    Also don't attempt to remove a lock for TABLEID_DOC that is not a
    sheet.
    
    Reviewed-on: https://gerrit.libreoffice.org/57060
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Jenkins
    (cherry picked from commit 7eba8e98508d547f43fecbe3175a11a05956b30a)
    
    Handle protection lock mark in Undo/Redo, tdf#68290 follow-up
    
    Reviewed-on: https://gerrit.libreoffice.org/57063
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Jenkins
    (cherry picked from commit 6fb449d127d1da165f610c4c99c2c7d9c5afbb97)
    
    Change-Id: I9f5731dfaaf9b4cc67e600a8b1c01709e7c9ba99
    28775a068215a59063ed95fd141e125cf2155aa7
    c88cb375f9f6030c9268fca84de7a5434bb82dc1
    Reviewed-on: https://gerrit.libreoffice.org/57091
    Tested-by: Jenkins
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    
    (cherry picked from commit dc9c326c378f252df83aa90a61df51a60d574c8c)

diff --git a/sc/source/ui/undo/undotab.cxx b/sc/source/ui/undo/undotab.cxx
index db0c34d0568c..f8bd5dc6940b 100644
--- a/sc/source/ui/undo/undotab.cxx
+++ b/sc/source/ui/undo/undotab.cxx
@@ -1254,6 +1254,8 @@ void ScUndoTabProtect::DoProtect(bool bProtect)
     ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
     if (pViewShell)
     {
+        if (ScTabView* pTabView = pViewShell->GetViewData().GetView())
+            pTabView->SetTabProtectionSymbol( mnTab, bProtect);
         pViewShell->UpdateLayerLocks();
         pViewShell->UpdateInputHandler(true);   // so that input can be immediately entered again
     }
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index ccbe1671932b..6e04b4b9d2a3 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -2483,12 +2483,14 @@ void ScViewFunc::ProtectSheet( SCTAB nTab, const ScTableProtection& rProtect )
 
     ScMarkData::iterator itr = rMark.begin(), itrEnd = rMark.end();
     for (; itr != itrEnd; ++itr)
+    {
         rFunc.ProtectSheet(*itr, rProtect);
+        SetTabProtectionSymbol(*itr, true);
+    }
 
     if (bUndo)
         pDocSh->GetUndoManager()->LeaveListAction();
 
-    SetTabProtectionSymbol(nTab, true);
     UpdateLayerLocks();         //! broadcast to all views
 }
 
@@ -2546,15 +2548,18 @@ bool ScViewFunc::Unprotect( SCTAB nTab, const OUString& rPassword )
 
         ScMarkData::iterator itr = rMark.begin(), itrEnd = rMark.end();
         for (; itr != itrEnd; ++itr)
+        {
             if ( rFunc.Unprotect( *itr, rPassword, false ) )
-                    bChanged = true;
+            {
+                bChanged = true;
+                SetTabProtectionSymbol( *itr, false);
+            }
+        }
 
         if (bUndo)
             pDocSh->GetUndoManager()->LeaveListAction();
     }
 
-    SetTabProtectionSymbol(nTab, false);
-
     if (bChanged)
         UpdateLayerLocks();     //! broadcast to all views
 
commit 622cf9c353d0d9eee3b35f03b6694d2a5f5d067d
Author: Michael Stahl <Michael.Stahl at cib.de>
Date:   Fri Jul 6 17:33:28 2018 +0200

    tdf#117261 xmloff: ODF import: convert form:connection-resource URL
    
    ... to absolute on import.
    
    (regression from fbb3b60cdb7a22595eec80232bb3ccd83781cf00)
    
    Change-Id: I2cd046e44489da86d3d67ff5df6cbad13e8265d0
    Reviewed-on: https://gerrit.libreoffice.org/57076
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>
    Tested-by: Jenkins
    (cherry picked from commit 510209df4bcf457cac819e75889d564d620f119d)
    Reviewed-on: https://gerrit.libreoffice.org/57093
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    (cherry picked from commit 2bd85bfd98203cc11e2391e01e9f8d70a9037214)

diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx
index 74775302105e..f54e18dc1e84 100644
--- a/xmloff/source/forms/elementimport.cxx
+++ b/xmloff/source/forms/elementimport.cxx
@@ -2041,7 +2041,7 @@ namespace xmloff
                 )
             {
                 OUString sValue = _xAttrList->getValueByIndex( i );
-
+                sValue = _rImport.GetAbsoluteReference(sValue);
                 INetURLObject aURL(sValue);
                 if ( aURL.GetProtocol() == INetProtocol::File )
                     _xElement->setPropertyValue(PROPERTY_DATASOURCENAME,makeAny(sValue));


More information about the Libreoffice-commits mailing list