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

[Julien Nabet]

 reportdesign/source/ui/report/ReportController.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit c8e19544cdc506dfc91dbd8045da208ded7d7d2c
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Tue Feb 13 22:44:41 2018 +0100

    Fix an assert in ReportController (reportdesign)
    
    2  0x00007ffff739afca in __assert_fail_base (fmt=0x7ffff74eb890 "%s%s%s:%u: %s%sAssertion `%s' failed.
    %n", assertion=assertion at entry=0x7ffff131fb10 "((*pImpl->mpStaticDefaults)[n]->Which() == n + pImpl->mnStart) && \"static defaults not sorted\"", file=file at entry=0x7ffff131f920 "/home/julien/lo/libreoffice/svl/source/items/itempool.cxx", line=line at entry=247, function=function at entry=0x7ffff1320bc0 <SfxItemPool::SetDefaults(std::__debug::vector<SfxPoolItem*, std::allocator<SfxPoolItem*> >*)::__PRETTY_FUNCTION__> "void SfxItemPool::SetDefaults(std::__debug::vector<SfxPoolItem*>*)") at assert.c:92
    3  0x00007ffff739b042 in __GI___assert_fail (assertion=0x7ffff131fb10 "((*pImpl->mpStaticDefaults)[n]->Which() == n + pImpl->mnStart) && \"static defaults not sorted\"", file=0x7ffff131f920 "/home/julien/lo/libreoffice/svl/source/items/itempool.cxx", line=247, function=0x7ffff1320bc0 <SfxItemPool::SetDefaults(std::__debug::vector<SfxPoolItem*, std::allocator<SfxPoolItem*> >*)::__PRETTY_FUNCTION__> "void SfxItemPool::SetDefaults(std::__debug::vector<SfxPoolItem*>*)") at assert.c:101
    4  0x00007ffff11495f5 in SfxItemPool::SetDefaults(std::__debug::vector<SfxPoolItem*, std::allocator<SfxPoolItem*> >*) (this=0x55555bfec850, pDefaults=0x7fffffff1c40)
        at /home/julien/lo/libreoffice/svl/source/items/itempool.cxx:246
    5  0x00007fff9b4df1d0 in rptui::OReportController::openPageDialog(com::sun::star::uno::Reference<com::sun::star::report::XSection> const&) (this=
        0x555558a94490, _xSection=empty uno::Reference) at /home/julien/lo/libreoffice/reportdesign/source/ui/report/ReportController.cxx:2392
    
    Should stick with the order defined in include/svx/xdef.hxx
    
    Change-Id: I1a6ca5b5cb9ccb87d0cf373f93e2d0bd401bd1ce
    Reviewed-on: https://gerrit.libreoffice.org/49689
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index 6797b341194a..eb01ee3810c4 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -2328,14 +2328,14 @@ void OReportController::openPageDialog(const uno::Reference<report::XSection>& _
         { XATTR_FILLBMP_POS,        true },
         { XATTR_FILLBMP_SIZEX,      true },
         { XATTR_FILLBMP_SIZEY,      true },
+        { XATTR_FILLFLOATTRANSPARENCE,  true },
+        { XATTR_SECONDARYFILLCOLOR,     true },
         { XATTR_FILLBMP_SIZELOG,        true },
         { XATTR_FILLBMP_TILEOFFSETX,    true },
         { XATTR_FILLBMP_TILEOFFSETY,    true },
         { XATTR_FILLBMP_STRETCH,        true },
         { XATTR_FILLBMP_POSOFFSETX,     true },
         { XATTR_FILLBMP_POSOFFSETY,     true },
-        { XATTR_FILLFLOATTRANSPARENCE,  true },
-        { XATTR_SECONDARYFILLCOLOR,     true },
         { XATTR_FILLBACKGROUND,     true },
         { SID_ATTR_METRIC,      true }
     };
@@ -2377,14 +2377,14 @@ void OReportController::openPageDialog(const uno::Reference<report::XSection>& _
         new XFillBmpPosItem,
         new XFillBmpSizeXItem,
         new XFillBmpSizeYItem,
+        new XFillFloatTransparenceItem(aNullGrad, false),
+        new XSecondaryFillColorItem("", aNullFillCol),
         new XFillBmpSizeLogItem,
         new XFillBmpTileOffsetXItem,
         new XFillBmpTileOffsetYItem,
         new XFillBmpStretchItem,
         new XFillBmpPosOffsetXItem,
         new XFillBmpPosOffsetYItem,
-        new XFillFloatTransparenceItem(aNullGrad, false),
-        new XSecondaryFillColorItem("", aNullFillCol),
         new XFillBackgroundItem,
         new SfxUInt16Item(RPTUI_ID_METRIC,static_cast<sal_uInt16>(eUserMetric))
     };