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

[Stephan Bergmann]

 reportdesign/source/ui/inspection/metadata.cxx |   10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

New commits:
commit 5cd036c0742f8be8d6fc34f7e3a983cae557d94b
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Feb 14 18:29:58 2013 +0100

    multiple unsequenced modifications to 'nPos' [-Werror,-Wunsequenced]
    
    ...where the nPos wasn't actually used, anyway.
    
    Change-Id: Id5e2e37acd2a7cc191030a1ec959894d3ec1943f

diff --git a/reportdesign/source/ui/inspection/metadata.cxx b/reportdesign/source/ui/inspection/metadata.cxx
index 40ba8a9..b80d19f 100644
--- a/reportdesign/source/ui/inspection/metadata.cxx
+++ b/reportdesign/source/ui/inspection/metadata.cxx
@@ -44,26 +44,23 @@ namespace rptui
         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&         _sHelpId,
                         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 rptui
     //========================================================================
 #define DEF_INFO( ident, uinameres, helpid, flags )   \
     OPropertyInfoImpl( PROPERTY_##ident, PROPERTY_ID_##ident, \
-            String( ModuleRes( RID_STR_##uinameres ) ), nPos++, HID_RPT_PROP_##helpid, flags )
+            String( ModuleRes( RID_STR_##uinameres ) ), HID_RPT_PROP_##helpid, flags )
 
 #define DEF_INFO_1( ident, uinameres, helpid, flag1 ) \
     DEF_INFO( ident, uinameres, helpid, PROP_FLAG_##flag1 )
@@ -111,7 +108,6 @@ namespace rptui
         OModuleClient aResourceAccess;
         // this ensures that we have our resource file loaded
 
-        sal_uInt16 nPos = 1;
         static OPropertyInfoImpl aPropertyInfos[] =
         {
         /*
@@ -202,7 +198,7 @@ namespace rptui
         // intialisierung
         if(!s_pPropertyInfos)
             getPropertyInfo();
-        OPropertyInfoImpl  aSearch(_rName, 0L, String(), 0, "", 0);
+        OPropertyInfoImpl  aSearch(_rName, 0L, String(), "", 0);
 
         const OPropertyInfoImpl* pPropInfo = ::std::lower_bound(
             s_pPropertyInfos, s_pPropertyInfos + s_nCount, aSearch, PropertyInfoLessByName() );