[Libreoffice-commits] core.git: 2 commits - helpcontent2 vcl/source

[Seth Chaiklin (via logerrit)]

 helpcontent2                  |    2 +-
 vcl/source/window/builder.cxx |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 97e91f6bbc2e81fdb8e6fbf55c551cf4b23fa8dd
Author:     Seth Chaiklin <sdc.blanco at youmail.dk>
AuthorDate: Mon Nov 30 20:40:18 2020 +0100
Commit:     Gerrit Code Review <gerrit at gerrit.libreoffice.org>
CommitDate: Mon Nov 30 20:40:18 2020 +0100

    Update git submodules
    
    * Update helpcontent2 from branch 'master'
      to f6a5ead66ece37829ee11dd6f29bc1450f235462
      - tdf#134602 repair menu sequence for Freezing Rows or Columns
    
          * change View - Freeze Cells - Freeze Rows and Columns -->
            View - Freeze Rows and Columns
          * update to <h1>
    
        Change-Id: I3d4b29cbabe5195c10d95fe7da56f1129befe6e9
        Reviewed-on: https://gerrit.libreoffice.org/c/help/+/106934
        Reviewed-by: Seth Chaiklin <sdc.blanco at youmail.dk>
        Tested-by: Jenkins

diff --git a/helpcontent2 b/helpcontent2
index d44398d92a58..f6a5ead66ece 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit d44398d92a5880d401205ff463f7923d18865d6d
+Subproject commit f6a5ead66ece37829ee11dd6f29bc1450f235462
commit c128416277b8db55cfdab15d1681bfbd9f086da0
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Nov 30 11:14:23 2020 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Nov 30 20:40:03 2020 +0100

    remove consumed stock images to avoid later warnings
    
    about missing images that we have removed
    
    Change-Id: I2a73e152b58d9c8c083562c03205023653b9a0e2
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106856
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 79d4a633bd54..6110f3460a9b 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -729,6 +729,7 @@ VclBuilder::VclBuilder(vcl::Window* pParent, const OUString& sUIDir, const OUStr
                     SAL_WARN("vcl.builder", "unsupported image size " << rImageInfo.m_nSize);
                     break;
             }
+            m_pParserState->m_aStockMap.erase(aFind);
         }
     }