basic/source/classes/sbunoobj.cxx | 16 +++++------ basic/source/runtime/methods.cxx | 8 ++--- basic/source/runtime/methods1.cxx | 16 +++++------ basic/source/runtime/runtime.cxx | 8 ++--- wizards/com/sun/star/wizards/report/ReportLayouter.java | 8 ++--- wizards/com/sun/star/wizards/ui/ButtonList.java | 2 - wizards/com/sun/star/wizards/ui/ImageList.py | 2 - wizards/com/sun/star/wizards/ui/PeerConfig.java | 16 ++++------- wizards/com/sun/star/wizards/ui/PeerConfig.py | 11 +++---- wizards/com/sun/star/wizards/ui/UIConsts.java | 1 wizards/com/sun/star/wizards/ui/UnoDialog.java | 23 +--------------- wizards/com/sun/star/wizards/ui/UnoDialog.py | 13 +-------- wizards/com/sun/star/wizards/ui/UnoDialog2.java | 2 - 13 files changed, 47 insertions(+), 79 deletions(-)
New commits: commit d0293ed2421e2d7d0290c24d89959c84d1060623 Author: Caolán McNamara <[email protected]> Date: Thu Jan 19 13:30:00 2017 +0000 drop unused hicontrast arg to setImageUrl Change-Id: I6befc077a79a944275e436ffa601b6c14d59977a diff --git a/wizards/com/sun/star/wizards/report/ReportLayouter.java b/wizards/com/sun/star/wizards/report/ReportLayouter.java index 9ce18e9..08baeab 100644 --- a/wizards/com/sun/star/wizards/report/ReportLayouter.java +++ b/wizards/com/sun/star/wizards/report/ReportLayouter.java @@ -191,11 +191,11 @@ public class ReportLayouter }); if (m_nLandscapeState == 1) { - CurUnoDialog.getPeerConfiguration().setImageUrl(aOrientationImage, 1002, 1003); + CurUnoDialog.getPeerConfiguration().setImageUrl(aOrientationImage, 1002); } else { - CurUnoDialog.getPeerConfiguration().setImageUrl(aOrientationImage, 1000, 1001); + CurUnoDialog.getPeerConfiguration().setImageUrl(aOrientationImage, 1000); } } catch (Exception exception) diff --git a/wizards/com/sun/star/wizards/ui/ButtonList.java b/wizards/com/sun/star/wizards/ui/ButtonList.java index b0624c9..f2aa6ea 100644 --- a/wizards/com/sun/star/wizards/ui/ButtonList.java +++ b/wizards/com/sun/star/wizards/ui/ButtonList.java @@ -297,7 +297,7 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener } else if (oResources.length == 2) { - oUnoDialog.getPeerConfiguration().setImageUrl(m_aButtons[i].getModel(), oResources[0], oResources[1]); + oUnoDialog.getPeerConfiguration().setImageUrl(m_aButtons[i].getModel(), oResources[0]); } boolean bTabStop = Boolean.TRUE; // focusable ? Boolean.TRUE : Boolean.FALSE; Helper.setUnoPropertyValue(m_aButtons[i].getModel(), "Tabstop", bTabStop); diff --git a/wizards/com/sun/star/wizards/ui/ImageList.py b/wizards/com/sun/star/wizards/ui/ImageList.py index 7decec7..5d7dd79 100644 --- a/wizards/com/sun/star/wizards/ui/ImageList.py +++ b/wizards/com/sun/star/wizards/ui/ImageList.py @@ -230,7 +230,7 @@ class ImageList(ListDataListener): item.Model.ImageURL = oResources[0] elif len(oResources) == 2: self.oUnoDialog.getPeerConfiguration().setImageUrl( - item.Model, oResources[0], oResources[1]) + item.Model, oResources[0]) item.Model.Tabstop = bool(focusable) if self.refreshOverNull: diff --git a/wizards/com/sun/star/wizards/ui/PeerConfig.java b/wizards/com/sun/star/wizards/ui/PeerConfig.java index 3323977..07f6258 100644 --- a/wizards/com/sun/star/wizards/ui/PeerConfig.java +++ b/wizards/com/sun/star/wizards/ui/PeerConfig.java @@ -62,12 +62,10 @@ public class PeerConfig implements XWindowListener Object oModel; Object oResource; - Object oHCResource; - public ImageUrlTask(Object _oModel, Object _oResource, Object _oHCResource) + public ImageUrlTask(Object _oModel, Object _oResource) { oResource = _oResource; - oHCResource = _oHCResource; oModel = _oModel; } } @@ -154,9 +152,9 @@ public class PeerConfig implements XWindowListener * Assigns an image to the property 'ImageUrl' of a dialog control. The image ids that the Resource urls point to * may be assigned in a Resource file outside the wizards project */ - public void setImageUrl(Object _ocontrolmodel, String _sResourceUrl, String _sHCResourceUrl) + public void setImageUrl(Object _ocontrolmodel, String _sResourceUrl) { - ImageUrlTask oImageUrlTask = new ImageUrlTask(_ocontrolmodel, _sResourceUrl, _sHCResourceUrl); + ImageUrlTask oImageUrlTask = new ImageUrlTask(_ocontrolmodel, _sResourceUrl); this.aImageUrlTasks.add(oImageUrlTask); } @@ -165,9 +163,9 @@ public class PeerConfig implements XWindowListener * within the wizards project * wizards project */ - public void setImageUrl(Object _ocontrolmodel, Object _oResource, Object _oHCResource) + public void setImageUrl(Object _ocontrolmodel, Object _oResource) { - ImageUrlTask oImageUrlTask = new ImageUrlTask(_ocontrolmodel, _oResource, _oHCResource); + ImageUrlTask oImageUrlTask = new ImageUrlTask(_ocontrolmodel, _oResource); this.aImageUrlTasks.add(oImageUrlTask); } } diff --git a/wizards/com/sun/star/wizards/ui/PeerConfig.py b/wizards/com/sun/star/wizards/ui/PeerConfig.py index 0c6b60e..241d1fd 100644 --- a/wizards/com/sun/star/wizards/ui/PeerConfig.py +++ b/wizards/com/sun/star/wizards/ui/PeerConfig.py @@ -43,10 +43,9 @@ class PeerConfig(object): class ImageUrlTask(object): - def __init__(self, _oModel, _oResource, _oHCResource): + def __init__(self, _oModel, _oResource): self.oModel = _oModel self.oResource = _oResource - self.oHCResource = _oHCResource def windowShown(self): try: @@ -76,6 +75,6 @@ class PeerConfig(object): oPeerTask = self.PeerTask(_xControl, propnames, propvalues) self.m_aPeerTasks.append(oPeerTask) - def setImageUrl(self, _ocontrolmodel, _oResource, _oHCResource): - oImageUrlTask = self.ImageUrlTask(_ocontrolmodel, _oResource, _oHCResource) + def setImageUrl(self, _ocontrolmodel, _oResource): + oImageUrlTask = self.ImageUrlTask(_ocontrolmodel, _oResource) self.aImageUrlTasks.append(oImageUrlTask) diff --git a/wizards/com/sun/star/wizards/ui/UIConsts.java b/wizards/com/sun/star/wizards/ui/UIConsts.java index d62bc55..7fb26d79 100644 --- a/wizards/com/sun/star/wizards/ui/UIConsts.java +++ b/wizards/com/sun/star/wizards/ui/UIConsts.java @@ -30,7 +30,6 @@ public interface UIConsts int RID_IMG_FORM = 1100; Integer INVISIBLESTEP = 99; String INFOIMAGEURL = "private:resource/dbu/image/19205"; - String INFOIMAGEURL_HC = "private:resource/dbu/image/19230"; /** * The tabindex of the navigation buttons in a wizard must be assigned a very * high tabindex because on every step their taborder must appear at the end diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog2.java b/wizards/com/sun/star/wizards/ui/UnoDialog2.java index 0e70598..2406458 100644 --- a/wizards/com/sun/star/wizards/ui/UnoDialog2.java +++ b/wizards/com/sun/star/wizards/ui/UnoDialog2.java @@ -130,7 +130,7 @@ public class UnoDialog2 extends UnoDialog { Short.valueOf((short) 0), 10, UIConsts.INFOIMAGEURL, Integer.valueOf(_posx), Integer.valueOf(_posy), Boolean.FALSE, Integer.valueOf(_iStep), 10 }); - super.getPeerConfiguration().setImageUrl(getModel(xImgControl), UIConsts.INFOIMAGEURL, UIConsts.INFOIMAGEURL_HC); + super.getPeerConfiguration().setImageUrl(getModel(xImgControl), UIConsts.INFOIMAGEURL); return xImgControl; } commit eca0aee7a5f862e63b2bb4b56ef69fb5761e4b5f Author: Caolán McNamara <[email protected]> Date: Thu Jan 19 13:24:58 2017 +0000 getImageUrl now returns its arg, so remove it Change-Id: Iee39f7462c2f4f23dfbdc11aa7542af996001042 diff --git a/wizards/com/sun/star/wizards/ui/PeerConfig.java b/wizards/com/sun/star/wizards/ui/PeerConfig.java index 4791e63..3323977 100644 --- a/wizards/com/sun/star/wizards/ui/PeerConfig.java +++ b/wizards/com/sun/star/wizards/ui/PeerConfig.java @@ -103,7 +103,7 @@ public class PeerConfig implements XWindowListener } else if (AnyConverter.isString(aImageUrlTask.oResource)) { - sImageUrl = oUnoDialog.getImageUrl(((String) aImageUrlTask.oResource)); + sImageUrl = (String) aImageUrlTask.oResource; } if (!sImageUrl.equals(PropertyNames.EMPTY_STRING)) { diff --git a/wizards/com/sun/star/wizards/ui/PeerConfig.py b/wizards/com/sun/star/wizards/ui/PeerConfig.py index 812c244..0c6b60e 100644 --- a/wizards/com/sun/star/wizards/ui/PeerConfig.py +++ b/wizards/com/sun/star/wizards/ui/PeerConfig.py @@ -58,7 +58,7 @@ class PeerConfig(object): if isinstance(aImageUrlTask.oResource, int): sImageUrl = self.oUnoDialog.getWizardImageUrl(aImageUrlTask.oResource) elif isinstance(aImageUrlTask.oResource, str): - sImageUrl = self.oUnoDialog.getImageUrl(aImageUrlTask.oResource) + sImageUrl = aImageUrlTask.oResource if sImageUrl != "": aImageUrlTask.oModel.ImageURL = sImageUrl diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog.java b/wizards/com/sun/star/wizards/ui/UnoDialog.java index 577ba9f..f3b1c68 100644 --- a/wizards/com/sun/star/wizards/ui/UnoDialog.java +++ b/wizards/com/sun/star/wizards/ui/UnoDialog.java @@ -834,11 +834,6 @@ public class UnoDialog return "private:resource/wzi/image/" + _nResId; } - public String getImageUrl(String _surl) - { - return _surl; - } - public static short getListBoxLineCount() { return (short)20; diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog.py b/wizards/com/sun/star/wizards/ui/UnoDialog.py index 96777f2..fd69fc2 100644 --- a/wizards/com/sun/star/wizards/ui/UnoDialog.py +++ b/wizards/com/sun/star/wizards/ui/UnoDialog.py @@ -370,6 +370,3 @@ class UnoDialog(object): def getWizardImageUrl(self, _nResId): return "private:resource/wzi/image/" + str(_nResId) - - def getImageUrl(self, _surl): - return _surl commit e5460ca2774ce121dca3f6d06fbfb556c8fffcd9 Author: Caolán McNamara <[email protected]> Date: Thu Jan 19 13:22:47 2017 +0000 drop the long dead hicontrast res id uses from wizards Change-Id: Ia2fca72a1681d398bb85474981e224ef92d31d8a diff --git a/wizards/com/sun/star/wizards/report/ReportLayouter.java b/wizards/com/sun/star/wizards/report/ReportLayouter.java index 7c727dd..9ce18e9 100644 --- a/wizards/com/sun/star/wizards/report/ReportLayouter.java +++ b/wizards/com/sun/star/wizards/report/ReportLayouter.java @@ -267,7 +267,7 @@ public class ReportLayouter catch (com.sun.star.lang.IllegalArgumentException e) { } - Helper.setUnoPropertyValue(aOrientationImage, PropertyNames.PROPERTY_IMAGEURL, CurUnoDialog.getWizardImageUrl(1002, 1003)); + Helper.setUnoPropertyValue(aOrientationImage, PropertyNames.PROPERTY_IMAGEURL, CurUnoDialog.getWizardImageUrl(1002)); break; @@ -282,7 +282,7 @@ public class ReportLayouter } CurUnoDialog.setControlProperty("imgOrientation", PropertyNames.PROPERTY_IMAGEURL, Desktop.getBitmapPath(m_xMSF) + "/portrait.gif"); - Helper.setUnoPropertyValue(aOrientationImage, PropertyNames.PROPERTY_IMAGEURL, CurUnoDialog.getWizardImageUrl(1000, 1001)); + Helper.setUnoPropertyValue(aOrientationImage, PropertyNames.PROPERTY_IMAGEURL, CurUnoDialog.getWizardImageUrl(1000)); break; default: diff --git a/wizards/com/sun/star/wizards/ui/PeerConfig.java b/wizards/com/sun/star/wizards/ui/PeerConfig.java index 5b7b89d..4791e63 100644 --- a/wizards/com/sun/star/wizards/ui/PeerConfig.java +++ b/wizards/com/sun/star/wizards/ui/PeerConfig.java @@ -99,11 +99,11 @@ public class PeerConfig implements XWindowListener String sImageUrl = PropertyNames.EMPTY_STRING; if (AnyConverter.isInt(aImageUrlTask.oResource)) { - sImageUrl = oUnoDialog.getWizardImageUrl(((Integer) aImageUrlTask.oResource).intValue(), ((Integer) aImageUrlTask.oHCResource).intValue()); + sImageUrl = oUnoDialog.getWizardImageUrl(((Integer) aImageUrlTask.oResource).intValue()); } else if (AnyConverter.isString(aImageUrlTask.oResource)) { - sImageUrl = oUnoDialog.getImageUrl(((String) aImageUrlTask.oResource), ((String) aImageUrlTask.oHCResource)); + sImageUrl = oUnoDialog.getImageUrl(((String) aImageUrlTask.oResource)); } if (!sImageUrl.equals(PropertyNames.EMPTY_STRING)) { diff --git a/wizards/com/sun/star/wizards/ui/PeerConfig.py b/wizards/com/sun/star/wizards/ui/PeerConfig.py index 9b02dfc..812c244 100644 --- a/wizards/com/sun/star/wizards/ui/PeerConfig.py +++ b/wizards/com/sun/star/wizards/ui/PeerConfig.py @@ -56,9 +56,9 @@ class PeerConfig(object): for aImageUrlTask in self.aImageUrlTasks: if isinstance(aImageUrlTask.oResource, int): - sImageUrl = self.oUnoDialog.getWizardImageUrl(aImageUrlTask.oResource, aImageUrlTask.oHCResource) + sImageUrl = self.oUnoDialog.getWizardImageUrl(aImageUrlTask.oResource) elif isinstance(aImageUrlTask.oResource, str): - sImageUrl = self.oUnoDialog.getImageUrl(aImageUrlTask.oResource, aImageUrlTask.oHCResource) + sImageUrl = self.oUnoDialog.getImageUrl(aImageUrlTask.oResource) if sImageUrl != "": aImageUrlTask.oModel.ImageURL = sImageUrl diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog.java b/wizards/com/sun/star/wizards/ui/UnoDialog.java index 7801169..577ba9f 100644 --- a/wizards/com/sun/star/wizards/ui/UnoDialog.java +++ b/wizards/com/sun/star/wizards/ui/UnoDialog.java @@ -829,28 +829,14 @@ public class UnoDialog return nBlue; } - public String getWizardImageUrl(int _nResId, int _nHCResId) + public String getWizardImageUrl(int _nResId) { - if (isHighContrastModeActivated()) - { - return "private:resource/wzi/image/" + _nHCResId; - } - else - { - return "private:resource/wzi/image/" + _nResId; - } + return "private:resource/wzi/image/" + _nResId; } - public String getImageUrl(String _surl, String _shcurl) + public String getImageUrl(String _surl) { - if (isHighContrastModeActivated()) - { - return _shcurl; - } - else - { - return _surl; - } + return _surl; } public static short getListBoxLineCount() diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog.py b/wizards/com/sun/star/wizards/ui/UnoDialog.py index 81484fc..96777f2 100644 --- a/wizards/com/sun/star/wizards/ui/UnoDialog.py +++ b/wizards/com/sun/star/wizards/ui/UnoDialog.py @@ -368,14 +368,8 @@ class UnoDialog(object): nBlue = nGreenModulo return nBlue - def getWizardImageUrl(self, _nResId, _nHCResId): - if (self.isHighContrastModeActivated()): - return "private:resource/wzi/image/" + str(_nHCResId) - else: - return "private:resource/wzi/image/" + str(_nResId) + def getWizardImageUrl(self, _nResId): + return "private:resource/wzi/image/" + str(_nResId) - def getImageUrl(self, _surl, _shcurl): - if (self.isHighContrastModeActivated()): - return _shcurl - else: - return _surl + def getImageUrl(self, _surl): + return _surl commit 545c6e9d4fa3209eefd3867077c5fe820f0675d0 Author: Caolán McNamara <[email protected]> Date: Thu Jan 19 10:41:38 2017 +0000 clear ARRAY_VS_SINGLETON coverity warnings experiment to see if this clears them Change-Id: I91a74e06f621d3012b564cad87586ba74b0367ca diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx index 56d07c3..c1de49a 100644 --- a/basic/source/classes/sbunoobj.cxx +++ b/basic/source/classes/sbunoobj.cxx @@ -883,11 +883,11 @@ Type getUnoTypeForSbxValue( const SbxValue* pVal ) bool bNeedsInit = true; sal_Int32 nSize = nUpper - nLower + 1; - sal_Int32 nIdx = nLower; - for( sal_Int32 i = 0 ; i < nSize ; i++,nIdx++ ) + sal_Int32 aIdx[1]; + aIdx[0] = nLower; + for (sal_Int32 i = 0; i < nSize; ++i, ++aIdx[0]) { - // coverity[callee_ptr_arith] - SbxVariableRef xVar = pArray->Get32( &nIdx ); + SbxVariableRef xVar = pArray->Get32(aIdx); Type aType = getUnoTypeForSbxValue( xVar.get() ); if( bNeedsInit ) { @@ -1324,11 +1324,11 @@ Any sbxToUnoValue( const SbxValue* pVar, const Type& rType, Property* pUnoProper Type aElemType( reinterpret_cast<typelib_IndirectTypeDescription *>(pSeqTD)->pType ); // convert all array member and register them - sal_Int32 nIdx = nLower; - for( sal_Int32 i = 0 ; i < nSeqSize ; i++,nIdx++ ) + sal_Int32 aIdx[1]; + aIdx[0] = nLower; + for (sal_Int32 i = 0 ; i < nSeqSize; ++i, ++aIdx[0]) { - // coverity[callee_ptr_arith] - SbxVariableRef xVar = pArray->Get32( &nIdx ); + SbxVariableRef xVar = pArray->Get32(aIdx); // Convert the value of Sbx to Uno Any aAnyValue = sbxToUnoValue( xVar.get(), aElemType ); diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index a95cf5c..ac4351c 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -4359,13 +4359,13 @@ RTLFUNC(StrConv) pNew->PutByte(*pChar); pChar++; pNew->SetFlag( SbxFlagBits::Write ); - short index = i; + short aIdx[1]; + aIdx[0] = i; if( bIncIndex ) { - ++index; + ++aIdx[0]; } - // coverity[callee_ptr_arith] - pArray->Put( pNew, &index ); + pArray->Put(pNew, aIdx); } SbxVariableRef refVar = rPar.Get(0); diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx index eb0f245..bad68c5 100644 --- a/basic/source/runtime/methods1.cxx +++ b/basic/source/runtime/methods1.cxx @@ -832,13 +832,13 @@ RTLFUNC(Array) SbxVariable* pVar = rPar.Get(i+1); SbxVariable* pNew = new SbxEnsureParentVariable(*pVar); pNew->SetFlag( SbxFlagBits::Write ); - short index = static_cast< short >(i); + short aIdx[1]; + aIdx[0] = static_cast< short >(i); if ( bIncIndex ) { - ++index; + ++aIdx[0]; } - // coverity[callee_ptr_arith] - pArray->Put( pNew, &index ); + pArray->Put(pNew, aIdx); } // return array @@ -1724,12 +1724,12 @@ RTLFUNC(Join) OUString aRetStr; short nLower, nUpper; pArr->GetDim( 1, nLower, nUpper ); - for (short i = nLower; i <= nUpper; ++i) + short aIdx[1]; + for (aIdx[0] = nLower; aIdx[0] <= nUpper; ++aIdx[0]) { - // coverity[callee_ptr_arith] - OUString aStr = pArr->Get( &i )->GetOUString(); + OUString aStr = pArr->Get(aIdx)->GetOUString(); aRetStr += aStr; - if( i != nUpper ) + if (aIdx[0] != nUpper) { aRetStr += aDelim; } diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx index 38d9a1e..e4febca 100644 --- a/basic/source/runtime/runtime.cxx +++ b/basic/source/runtime/runtime.cxx @@ -639,12 +639,12 @@ void SbiRuntime::SetParameters( SbxArray* pParams ) SbxDimArray* pArray = new SbxDimArray( SbxVARIANT ); sal_uInt16 nParamArrayParamCount = nParamCount - i; pArray->unoAddDim( 0, nParamArrayParamCount - 1 ); - for( sal_uInt16 j = i ; j < nParamCount ; j++ ) + for (sal_uInt16 j = i; j < nParamCount ; ++j) { SbxVariable* v = pParams->Get( j ); - short nDimIndex = j - i; - // coverity[callee_ptr_arith] - pArray->Put( v, &nDimIndex ); + short aDimIndex[1]; + aDimIndex[0] = j - i; + pArray->Put(v, aDimIndex); } SbxVariable* pArrayVar = new SbxVariable( SbxVARIANT ); pArrayVar->SetFlag( SbxFlagBits::ReadWrite );
_______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
