commit 367f26ebf0f2be0c0c0ebeab1e14ee26960675e3
author Noel Grandin <noel.grandin@collabora.co.uk> Sun Jun 04 18:53:36 2023 +0200
committer Noel Grandin <noel.grandin@collabora.co.uk> Mon Jun 05 17:54:40 2023 +0200
tree aadb7a1f596034a4652786b010bab94ed6fd032f
parent 6c49886ab46c53398d74610b264e5edb0332a059

avoid some UNO querying

Change-Id: I5fa793ab979221252f66bdd38e6950c06a66b00a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152601
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

sc/source/filter/oox/commentsbuffer.cxx

diff --git a/sc/source/filter/oox/commentsbuffer.cxx b/sc/source/filter/oox/commentsbuffer.cxx
index 31c067e..309d96e 100644
--- a/sc/source/filter/oox/commentsbuffer.cxx
+++ b/sc/source/filter/oox/commentsbuffer.cxx
@@ -30,6 +30,7 @@
#include <drawingfragment.hxx>
#include <svx/sdtaitm.hxx>
#include <svx/svdocapt.hxx>
#include <svx/unoshape.hxx>
#include <comphelper/diagnose_ex.hxx>
#include <document.hxx>
#include <drwlayer.hxx>
@@ -162,12 +163,11 @@ void Comment::finalizeImport()
        ScPostIt* pPostIt = pDocShell->GetDocFunc().ImportNote( maModel.maRange.aStart, OUString( ' ' ) );
        SdrCaptionObj* pCaption = pPostIt->GetOrCreateCaption( maModel.maRange.aStart );

        Reference< XShape > xAnnoShape( pCaption->getUnoShape() ); // SvxShapeText
        rtl::Reference< SvxShapeText > xAnnoShape( dynamic_cast<SvxShapeText*>(pCaption->getUnoShape().get() ) ); // SvxShapeText
        // setting a property triggers expensive process, so set them all at once
        Reference< css::beans::XMultiPropertySet > xAnnoShapeMultiPropSet(xAnnoShape, UNO_QUERY_THROW);

        // Add shape formatting properties (autoFill, colHidden and rowHidden are dropped)
        xAnnoShapeMultiPropSet->setPropertyValues(
        static_cast<SvxShape*>(xAnnoShape.get())->setPropertyValues(
            Sequence<OUString> { "TextFitToSize", "MoveProtect", "TextHorizontalAdjust", "TextVerticalAdjust" },
            Sequence<Any> { Any(maModel.mbAutoScale), Any(maModel.mbLocked),
                Any(lcl_ToHorizAlign( maModel.mnTHA )), Any(lcl_ToVertAlign( maModel.mnTVA )) });
@@ -188,7 +188,7 @@ void Comment::finalizeImport()

            // Setting comment text alignment
            const ::oox::vml::ClientData* xClientData = pVmlNoteShape->getClientData();
            xAnnoShapeMultiPropSet->setPropertyValues(
            static_cast<SvxShape*>(xAnnoShape.get())->setPropertyValues(
                Sequence<OUString> { "TextVerticalAdjust", "ParaAdjust" },
                Sequence<Any> { Any(lcl_ToVertAlign( xClientData->mnTextVAlign )), Any(lcl_ToParaAlign( xClientData->mnTextHAlign )) });
        }
@@ -197,11 +197,10 @@ void Comment::finalizeImport()

        // insert text and convert text formatting
        maModel.mxText->finalizeImport(*this);
        Reference< XText > xAnnoText( xAnnoShape, UNO_QUERY_THROW );
        Reference< css::document::XActionLockable > xAnnoLock( xAnnoShape, UNO_QUERY_THROW );
        xAnnoLock->addActionLock();
        Reference< XText > xAnnoText( xAnnoShape );
        xAnnoShape->addActionLock();
        maModel.mxText->convert( xAnnoText );
        xAnnoLock->removeActionLock();
        xAnnoShape->removeActionLock();
    }
    catch( Exception& )
    {