[Libreoffice-commits] core.git: chart2/source

[Michael Stahl (via logerrit)]

 chart2/source/controller/main/DrawCommandDispatch.cxx |    1 -
 1 file changed, 1 deletion(-)

New commits:
commit c8406011eef27571529b2f497fdca449b9ab37bf
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Tue May 19 16:32:11 2020 +0200
Commit:     Michael Stahl <michael.stahl at cib.de>
CommitDate: Wed May 20 11:14:56 2020 +0200

    chart2: avoid assert on SvxAdjustItem with WhichId 0
    
    Insert a chart, then insert a rhombus shape into the chart:
    
    svl/source/items/itemset.cxx:150: SfxItemSet::SfxItemSet(SfxItemPool&, std::initializer_list<SfxItemSet::Pair>): Assertion `svl::detail::validRange(p.wid1, p.wid2)' failed.
    
    Presumably this item doesn't actually do anything since it was added in
    2009 in commit 4d3c143900d87f23cb4e66f1ebf9e0dae0541e0f
    
    Alternatively it could be EE_PARA_JUST perhaps? but not sure if that can
    always be used.
    
    Change-Id: Ia1addb1095714acafe7db596ece4b9a706354d34
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94537
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>

diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx b/chart2/source/controller/main/DrawCommandDispatch.cxx
index 1f4e5505023b..24ed7095707f 100644
--- a/chart2/source/controller/main/DrawCommandDispatch.cxx
+++ b/chart2/source/controller/main/DrawCommandDispatch.cxx
@@ -159,7 +159,6 @@ void DrawCommandDispatch::setAttributes( SdrObject* pObj )
     }
     if ( !bAttributesAppliedFromGallery )
     {
-        pObj->SetMergedItem( SvxAdjustItem( SvxAdjust::Center, 0 ) );
         pObj->SetMergedItem( SdrTextVertAdjustItem( SDRTEXTVERTADJUST_CENTER ) );
         pObj->SetMergedItem( SdrTextHorzAdjustItem( SDRTEXTHORZADJUST_BLOCK ) );
         pObj->SetMergedItem( makeSdrTextAutoGrowHeightItem( false ) );