core.git: 2 commits - desktop/source oox/source

[Caolán McNamara (via logerrit)]

 desktop/source/lib/init.cxx    |    2 ++
 oox/source/drawingml/shape.cxx |    4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 4724386984b476a303e092a133905c20aaa34687
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sat Jul 13 19:44:12 2024 +0100
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Sat Jul 13 22:11:44 2024 +0200

    cid#1609652 COPY_INSTEAD_OF_MOVE
    
    Change-Id: I0d8901983a81b84d653b4279e90fd961b97ed0d0
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170436
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
    Tested-by: Jenkins

diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index ce94175a94aa..a082d36161e5 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -1651,11 +1651,11 @@ Reference< XShape > const & Shape::createAndInsert(
                     {
                         sal_Int32 nLength = aGrabBag.getLength();
                         aGrabBag.realloc(nLength + 1);
-                        aGrabBag.getArray()[nLength] = aPair;
+                        aGrabBag.getArray()[nLength] = std::move(aPair);
                     }
                     else
                     {
-                        aGrabBag = { aPair };
+                        aGrabBag = { std::move(aPair) };
                     }
                     xPropertySet->setPropertyValue(aGrabBagPropName, 
uno::Any(aGrabBag));
                 }
commit 22909e7e94c542698f8a1c13151f67fbf2d0073a
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sat Jul 13 19:43:19 2024 +0100
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Sat Jul 13 22:11:37 2024 +0200

    cid#1610240 Unchecked dynamic_cast
    
    Change-Id: Iee9088344bb3319b751bc3c611ad0ab5e42374b3
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170434
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
    Tested-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 5a85758039ff..2769c47bf9b0 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3177,6 +3177,8 @@ static char* 
lo_extractDocumentStructureRequest(LibreOfficeKit* /*pThis*/, const
             if (xComp.is())
             {
                 ITiledRenderable* pDoc = 
dynamic_cast<ITiledRenderable*>(xComp.get());
+                if (!pDoc)
+                    return nullptr;
 
                 auto pBaseModel = dynamic_cast<SfxBaseModel*>(xComp.get());
                 if (!pBaseModel)