extensions/source/propctrlr/formmetadata.cxx | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
New commits:
commit ca0600f0c9022d631317423ab5a59493b41906ab
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Feb 14 17:53:05 2013 +0100
multiple unsequenced modifications to 'nPos' [-Werror,-Wunsequenced]
...solved by removing the nPos member and instead calculating the index on
the
fly. The difference is that old indices were before calling std::sort in
OPropertyInfoService::getPropertyInfo() while new ones are after, but that
should probably be OK per the documentation of
com.sun.star.inspection.XObjectInspectionModel.getPropertyOrderIndex (which
appears to be the only client of that functionality).
Change-Id: Id346bb219acbdad88ec43cf46feca8c37f2c7cf4
diff --git a/extensions/source/propctrlr/formmetadata.cxx
b/extensions/source/propctrlr/formmetadata.cxx
index e342e31..2757a27 100644
--- a/extensions/source/propctrlr/formmetadata.cxx
+++ b/extensions/source/propctrlr/formmetadata.cxx
@@ -44,26 +44,23 @@ namespace pcr
String sTranslation;
rtl::OString sHelpId;
sal_Int32 nId;
- sal_uInt16 nPos;
sal_uInt32 nUIFlags;
OPropertyInfoImpl(
const ::rtl::OUString& rName,
sal_Int32 _nId,
const String& aTranslation,
- sal_uInt16 nPosId,
const rtl::OString&,
sal_uInt32 _nUIFlags);
};
//------------------------------------------------------------------------
OPropertyInfoImpl::OPropertyInfoImpl(const ::rtl::OUString& _rName,
sal_Int32 _nId,
- const String& aString, sal_uInt16 nP, const
rtl::OString& sHid, sal_uInt32 _nUIFlags)
+ const String& aString, const rtl::OString&
sHid, sal_uInt32 _nUIFlags)
:sName(_rName)
,sTranslation(aString)
,sHelpId(sHid)
,nId(_nId)
- ,nPos(nP)
,nUIFlags(_nUIFlags)
{
}
@@ -83,7 +80,7 @@ namespace pcr
//========================================================================
#define DEF_INFO( ident, uinameres, helpid, flags ) \
OPropertyInfoImpl( PROPERTY_##ident, PROPERTY_ID_##ident, \
- String( PcrRes( RID_STR_##uinameres ) ), nPos++,
HID_PROP_##helpid, flags )
+ String( PcrRes( RID_STR_##uinameres ) ), HID_PROP_##helpid, flags )
#define DEF_INFO_1( ident, uinameres, helpid, flag1 ) \
DEF_INFO( ident, uinameres, helpid, PROP_FLAG_##flag1 )
@@ -111,8 +108,6 @@ namespace pcr
PcrClient aResourceAccess;
// this ensures that we have our resource file loaded
- sal_uInt16 nPos = 1;
-
static OPropertyInfoImpl aPropertyInfos[] =
{
/*
@@ -399,7 +394,7 @@ namespace pcr
sal_Int16 OPropertyInfoService::getPropertyPos(sal_Int32 _nId) const
{
const OPropertyInfoImpl* pInfo = getPropertyInfo(_nId);
- return (pInfo) ? pInfo->nPos : 0xFFFF;
+ return (pInfo) ? pInfo - s_pPropertyInfos : 0xFFFF;
}
//------------------------------------------------------------------------
@@ -550,7 +545,7 @@ namespace pcr
// Initialization
if(!s_pPropertyInfos)
getPropertyInfo();
- OPropertyInfoImpl aSearch(_rName, 0L, String(), 0, "", 0);
+ OPropertyInfoImpl aSearch(_rName, 0L, String(), "", 0);
const OPropertyInfoImpl* pInfo = ::std::lower_bound(
s_pPropertyInfos, s_pPropertyInfos + s_nCount, aSearch,
PropertyInfoLessByName() );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
