Date: prev next · Thread: first prev next last
2011 Archives by date, by thread · List index


On Wed, 12 Jan 2011 03:18:01 -0800, Noel Power <nopower@novell.com> wrote:

Hi there

fix for fdo#32742#, its a simple fix ( but was a bugger to find ) imo is riskless etc.

http://cgit.freedesktop.org/libreoffice/base/commit/?id=0afe2266016b03f6e11008463042c7daacead0e1
is ripe for signoff and cherrypicking, be grateful if someone could help with that

Is suggest to make ::std::sort on the next line use s_nCount also and
prevent a useless division operation.

For that, consider the patch 72cc77c8bb that introduced the regression.
The correct patch 72cc77 should have just changed the first s_nCount line.

diff --git a/reportdesign/source/ui/inspection/metadata.cxx
b/reportdesign/source/ui/inspection/metadata.cxx
index db219c8..e3610c4 100644
--- a/reportdesign/source/ui/inspection/metadata.cxx
+++ b/reportdesign/source/ui/inspection/metadata.cxx
@@ -173,9 +173,8 @@ namespace rptui
           };

           s_pPropertyInfos = aPropertyInfos;
-        s_nCount = sizeof(aPropertyInfos) / sizeof(OPropertyInfoImpl);

-        ::std::sort( aPropertyInfos, aPropertyInfos + s_nCount,
PropertyInfoLessByName() );
+        ::std::sort( aPropertyInfos, aPropertyInfos +
SAL_N_ELEMENTS(aPropertyInfos), PropertyInfoLessByName() );

           return s_pPropertyInfos;
       }

Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.