diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-10-12 12:28:24 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-10-12 12:28:24 +0000 |
| commit | e23979a2a139c7b375c4016228130707671fd600 (patch) | |
| tree | 747409b0faf27b9ef73f9eb36e6db798a7f536e8 | |
| parent | a8efaf142c8ce802d810b051c80e9f063e083faf (diff) | |
INTEGRATION: CWS sb59 (1.56.62); FILE MERGED
2006/09/04 08:31:20 sb 1.56.62.4: #i67537# Made code warning-free (debug=x).
2006/09/01 08:01:28 sb 1.56.62.3: #i67535# Made code warning-free (GCC 4.0.3).
2006/08/28 12:58:11 sb 1.56.62.2: #i67487# Made code warning-free (wntmsci10).
2006/08/03 13:52:03 cl 1.56.62.1: removed compiler warnings
| -rw-r--r-- | svx/source/unoedit/unotext.cxx | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/svx/source/unoedit/unotext.cxx b/svx/source/unoedit/unotext.cxx index ff00b0f48a88..c99b45c219aa 100644 --- a/svx/source/unoedit/unotext.cxx +++ b/svx/source/unoedit/unotext.cxx @@ -4,9 +4,9 @@ * * $RCSfile: unotext.cxx,v $ * - * $Revision: 1.58 $ + * $Revision: 1.59 $ * - * last change: $Author: obo $ $Date: 2006-09-17 06:18:20 $ + * last change: $Author: obo $ $Date: 2006-10-12 13:28:24 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -227,9 +227,10 @@ check_me::~check_me() std::list< std::pair< sal_uInt32, SvxUnoTextRangeBase* > >::iterator aIter; for( aIter = maRanges.begin(); aIter != maRanges.end(); aIter++ ) { - sal_Int32 nAllocNum = (*aIter).first; - SvxUnoTextRangeBase* pRange = (*aIter).second; - int nop = 0; + sal_Int32 nAllocNum; + SvxUnoTextRangeBase* pRange; + nAllocNum = (*aIter).first; + pRange = (*aIter).second; } } } @@ -559,14 +560,13 @@ sal_Bool SvxUnoTextRangeBase::SetPropertyValueHelper( const SfxItemSet&, const S return sal_False; } - break; case WID_NUMLEVEL: { SvxTextForwarder* pForwarder = pEditSource? pEditSource->GetTextForwarder() : NULL; if(pForwarder && pSelection) { - sal_Int16 nLevel; + sal_Int16 nLevel = sal_Int16(); if( aValue >>= nLevel ) { // #101004# Call interface method instead of unsafe cast @@ -580,7 +580,7 @@ sal_Bool SvxUnoTextRangeBase::SetPropertyValueHelper( const SfxItemSet&, const S break; case EE_PARA_BULLETSTATE: { - sal_Bool bBullet; + sal_Bool bBullet = sal_Bool(); if( aValue >>= bBullet ) { SfxUInt16Item aItem( EE_PARA_BULLETSTATE, bBullet ); @@ -633,7 +633,6 @@ uno::Any SAL_CALL SvxUnoTextRangeBase::_getPropertyValue(const OUString& Propert } throw beans::UnknownPropertyException(); - return aAny; } void SvxUnoTextRangeBase::getPropertyValue( const SfxItemPropertyMap* pMap, uno::Any& rAny, const SfxItemSet& rSet ) throw( beans::UnknownPropertyException ) @@ -1373,7 +1372,7 @@ sal_Bool SvxUnoTextRangeBase::GoLeft(sal_Int16 nCount, sal_Bool Expand) throw() if ( bOk ) { - nNewPos -= nCount; + nNewPos = nNewPos - nCount; maSelection.nStartPara = nNewPar; maSelection.nStartPos = nNewPos; } @@ -1570,8 +1569,6 @@ uno::Any SAL_CALL SvxUnoTextRange::queryAggregation( const uno::Type & rType ) else QUERYINT( lang::XUnoTunnel ); else return OWeakAggObject::queryAggregation( rType ); - - return OWeakAggObject::queryAggregation( rType ); } uno::Any SAL_CALL SvxUnoTextRange::queryInterface( const uno::Type & rType ) |