diff options
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/ole/unoconversionutilities.hxx | 5 | ||||
| -rw-r--r-- | extensions/source/propctrlr/stringrepresentation.cxx | 10 |
2 files changed, 4 insertions, 11 deletions
diff --git a/extensions/source/ole/unoconversionutilities.hxx b/extensions/source/ole/unoconversionutilities.hxx index f04466efe73c..ec8c46d80016 100644 --- a/extensions/source/ole/unoconversionutilities.hxx +++ b/extensions/source/ole/unoconversionutilities.hxx @@ -1927,7 +1927,6 @@ void UnoConversionUtilities<T>::dispatchExObject2Sequence( const VARIANTARG* pva { try { - bool bFail = false; if( pvar->vt != VT_DISPATCH) throw BridgeRuntimeError("[automation bridge] UnoConversionUtilities<T>::dispatchExObject2Sequence \n" "Conversion of dispatch object to Sequence failed!"); @@ -2038,10 +2037,6 @@ void UnoConversionUtilities<T>::dispatchExObject2Sequence( const VARIANTARG* pva anySeq.setValue( &p_uno_Seq, pDesc); uno_destructData( &p_uno_Seq, pDesc, cpp_release); typelib_typedescription_release( pDesc); - - if (bFail) - throw BridgeRuntimeError( - "[automation bridge] Conversion of ValueObject failed "); } catch (const BridgeRuntimeError &) { diff --git a/extensions/source/propctrlr/stringrepresentation.cxx b/extensions/source/propctrlr/stringrepresentation.cxx index bdca73fe13fc..b28df28c0e0e 100644 --- a/extensions/source/propctrlr/stringrepresentation.cxx +++ b/extensions/source/propctrlr/stringrepresentation.cxx @@ -338,14 +338,12 @@ namespace // loop through the elements and concatenate the string representations of the integers // (separated by a line break) - const ElementType* pElements = _rElements.getConstArray(); - const ElementType* pElementsEnd = pElements + _rElements.getLength(); - for ( ; pElements != pElementsEnd; ++pElements ) + for (const auto& rElement : _rElements) { - sCompose.append( OUString( _rTransformer( *pElements ) ) ); - if ( pElements != pElementsEnd ) - sCompose.append("\n"); + sCompose.append(OUString(_rTransformer(rElement))); + sCompose.append("\n"); } + sCompose.stripEnd('\n'); return sCompose.makeStringAndClear(); } |