core.git: sw/source

[Justin Luth (via logerrit)]

 sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx |   18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

New commits:
commit 69dd3061882971d18bb07e829c20241916f26fc5
Author:     Justin Luth <jl...@mail.com>
AuthorDate: Thu Jun 6 18:16:23 2024 -0400
Commit:     Justin Luth <jl...@mail.com>
CommitDate: Fri Jun 7 12:40:45 2024 +0200

    NFC related tdf#100037: unify duplicate PropertySets, etc
    
    This is supposed to be a No Functional Change commit,
    as cleanup prior to fixing the untracked zOrder of
    as-character VML shapes.
    
    There shouldn't be any reason why both xProps
    and xShapePropertySet need to be defined separately.
    Initial duplicate xShapePropertySet was introduced by vmiklos
    in 2013's commit 8738ded7bb1bb6262fe1038e310b5110407f4cfa.
    
    Plus, all clauses of the if statement will need
    the GraphicZOrderHelper, so lets just pull that out
    ahead of everything.
    
    make CppunitTest_sw_ooxmlexport18 \
        CPPUNIT_TEST_NAME=testTdf100037_inlineZOrder
    
    Change-Id: I6bbd9ab8b3062258f010ac9fb7eda7035722cfbb
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168510
    Reviewed-by: Justin Luth <jl...@mail.com>
    Tested-by: Jenkins

diff --git a/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx 
b/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx
index 3442fac33a59..8f20487d301a 100644
--- a/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx
+++ b/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx
@@ -4774,19 +4774,19 @@ void DomainMapper_Impl::PushShapeContext( const 
uno::Reference< drawing::XShape
             uno::Reference< text::XTextContent > xTxtContent( xShape, 
uno::UNO_QUERY_THROW );
             m_aAnchoredStack.push( AnchoredContext(xTxtContent) );
 
-            uno::Reference< beans::XPropertySet > xProps( xShape, 
uno::UNO_QUERY_THROW );
+            uno::Reference<beans::XPropertySet> xShapePropertySet(xShape, 
uno::UNO_QUERY_THROW);
 #ifdef DBG_UTIL
-            TagLogger::getInstance().unoPropertySet(xProps);
+            TagLogger::getInstance().unoPropertySet(xShapePropertySet);
 #endif
             text::TextContentAnchorType 
nAnchorType(text::TextContentAnchorType_AT_PARAGRAPH);
-            xProps->getPropertyValue(getPropertyName( PROP_ANCHOR_TYPE )) >>= 
nAnchorType;
+            
xShapePropertySet->getPropertyValue(getPropertyName(PROP_ANCHOR_TYPE)) >>= 
nAnchorType;
             bool checkZOrderStatus = false;
+            GraphicZOrderHelper& rZOrderHelper = 
m_rDMapper.graphicZOrderHelper();
             if (xSInfo->supportsService(u"com.sun.star.text.TextFrame"_ustr))
             {
                 SetIsTextFrameInserted(true);
                 // Extract the special "btLr text frame" mode, requested by 
oox, if needed.
                 // Extract vml ZOrder from FrameInteropGrabBag
-                uno::Reference<beans::XPropertySet> xShapePropertySet(xShape, 
uno::UNO_QUERY);
                 uno::Sequence<beans::PropertyValue> aGrabBag;
                 
xShapePropertySet->getPropertyValue(u"FrameInteropGrabBag"_ustr) >>= aGrabBag;
 
@@ -4794,7 +4794,6 @@ void DomainMapper_Impl::PushShapeContext( const 
uno::Reference< drawing::XShape
                 {
                     if (rProp.Name == "VML-Z-ORDER")
                     {
-                        GraphicZOrderHelper& rZOrderHelper = 
m_rDMapper.graphicZOrderHelper();
                         sal_Int64 zOrder(0);
                         rProp.Value >>= zOrder;
                         GraphicZOrderHelper::adjustRelativeHeight(zOrder, 
/*IsZIndex=*/true,
@@ -4830,18 +4829,17 @@ void DomainMapper_Impl::PushShapeContext( const 
uno::Reference< drawing::XShape
                 PropertyMapPtr paragraphContext = GetTopContextOfType( 
CONTEXT_PARAGRAPH );
                 std::optional<PropertyMap::Property> aPropMargin = 
paragraphContext->getProperty(PROP_PARA_BOTTOM_MARGIN);
                 if(aPropMargin)
-                    xProps->setPropertyValue( getPropertyName( 
PROP_BOTTOM_MARGIN ), aPropMargin->second );
+                    
xShapePropertySet->setPropertyValue(getPropertyName(PROP_BOTTOM_MARGIN),
+                                                        aPropMargin->second);
             }
             else
             {
-                uno::Reference<beans::XPropertySet> xShapePropertySet(xShape, 
uno::UNO_QUERY);
                 uno::Sequence<beans::PropertyValue> aGrabBag;
                 xShapePropertySet->getPropertyValue(u"InteropGrabBag"_ustr) 
>>= aGrabBag;
                 for (const auto& rProp : aGrabBag)
                 {
                     if (rProp.Name == "VML-Z-ORDER")
                     {
-                        GraphicZOrderHelper& rZOrderHelper = 
m_rDMapper.graphicZOrderHelper();
                         sal_Int64 zOrder(0);
                         rProp.Value >>= zOrder;
                         GraphicZOrderHelper::adjustRelativeHeight(zOrder, 
/*IsZIndex=*/true,
@@ -4879,9 +4877,7 @@ void DomainMapper_Impl::PushShapeContext( const 
uno::Reference< drawing::XShape
                 }
             }
             if (!IsInHeaderFooter() && !checkZOrderStatus)
-                xProps->setPropertyValue(
-                        getPropertyName( PROP_OPAQUE ),
-                        uno::Any( true ) );
+                
xShapePropertySet->setPropertyValue(getPropertyName(PROP_OPAQUE), 
uno::Any(true));
         }
         m_StreamStateStack.top().bParaChanged = true;
         getTableManager().setIsInShape(true);