Index: binfilter/bf_forms/source/component/forms_Columns.cxx =================================================================== RCS file: /cvs/framework/binfilter/bf_forms/source/component/forms_Columns.cxx,v retrieving revision 1.9 diff -u -r1.9 forms_Columns.cxx --- binfilter/bf_forms/source/component/forms_Columns.cxx 10 Apr 2008 07:41:31 -0000 1.9 +++ binfilter/bf_forms/source/component/forms_Columns.cxx 6 May 2008 11:45:39 -0000 @@ -141,7 +141,6 @@ else { sal_Int32 nPrefixPos = aModelName.indexOf(aModelPrefix); - sal_Int32 nCampatiblePrefixPos = aModelName.indexOf(aCompatibleModelPrefix); DBG_ASSERT( (nPrefixPos != -1) || (nCampatiblePrefixPos != -1), "::getColumnTypeByModelName() : wrong servivce !"); @@ -242,8 +241,8 @@ OGridColumn::OGridColumn(const Reference& _rxFactory, const ::rtl::OUString& _sModelName) :OGridColumn_BASE(m_aMutex) ,OPropertySetAggregationHelper(OGridColumn_BASE::rBHelper) - ,m_aModelName(_sModelName) ,m_aHidden( makeAny( sal_False ) ) + ,m_aModelName(_sModelName) { DBG_CTOR(OGridColumn,NULL); @@ -613,7 +612,6 @@ } // 2. Lesen des Versionsnummer - sal_uInt16 nVersion = _rxInStream->readShort(); sal_uInt16 nAnyMask = _rxInStream->readShort(); if (nAnyMask & WIDTH) Index: binfilter/bf_forms/source/component/forms_DatabaseForm.cxx =================================================================== RCS file: /cvs/framework/binfilter/bf_forms/source/component/forms_DatabaseForm.cxx,v retrieving revision 1.18 diff -u -r1.18 forms_DatabaseForm.cxx --- binfilter/bf_forms/source/component/forms_DatabaseForm.cxx 10 Apr 2008 07:42:30 -0000 1.18 +++ binfilter/bf_forms/source/component/forms_DatabaseForm.cxx 6 May 2008 11:45:40 -0000 @@ -488,21 +488,21 @@ ,m_aResetListeners(m_aMutex) ,m_aSubmitListeners(m_aMutex) ,m_aErrorListeners(m_aMutex) - ,m_bLoaded(sal_False) - ,m_bSubForm(sal_False) - ,m_eNavigation(NavigationBarMode_CURRENT) - ,m_nPrivileges(0) + ,m_pAggregatePropertyMultiplexer(NULL) ,m_pParameterInfo(NULL) + ,m_pLoadTimer(NULL) ,m_pThread(NULL) + ,m_nResetsPending(0) + ,m_nPrivileges(0) ,m_eSubmitMethod(FormSubmitMethod_GET) ,m_eSubmitEncoding(FormSubmitEncoding_URL) - ,m_bAllowDelete(sal_True) - ,m_bAllowUpdate(sal_True) + ,m_eNavigation(NavigationBarMode_CURRENT) ,m_bAllowInsert(sal_True) - ,m_pLoadTimer(NULL) - ,m_nResetsPending(0) + ,m_bAllowUpdate(sal_True) + ,m_bAllowDelete(sal_True) + ,m_bLoaded(sal_False) + ,m_bSubForm(sal_False) ,m_bForwardingConnection(sal_False) - ,m_pAggregatePropertyMultiplexer(NULL) ,m_bSharingConnection( sal_False ) { DBG_CTOR(ODatabaseForm,NULL); @@ -722,7 +722,7 @@ if (!hasProperty(PROPERTY_NAME, xComponentSet)) return; - sal_Int16 nClassId; + sal_Int16 nClassId = 0; xComponentSet->getPropertyValue(PROPERTY_CLASSID) >>= nClassId; ::rtl::OUString aName; xComponentSet->getPropertyValue( PROPERTY_NAME ) >>= aName; @@ -785,7 +785,7 @@ // = if( !hasProperty(PROPERTY_STATE, xComponentSet) ) break; - sal_Int16 nChecked; + sal_Int16 nChecked = 0; xComponentSet->getPropertyValue( PROPERTY_STATE ) >>= nChecked; if( nChecked != 1 ) break; @@ -867,10 +867,10 @@ ::rtl::OUString aText; Any aVal = xComponentSet->getPropertyValue( PROPERTY_VALUE ); - double aDoubleVal; + double aDoubleVal = 0; if (aVal >>= aDoubleVal) { - sal_Int16 nScale; + sal_Int16 nScale = 0; xComponentSet->getPropertyValue( PROPERTY_DECIMAL_ACCURACY ) >>= nScale; aText = ::rtl::math::doubleToUString(aDoubleVal, rtl_math_StringFormat_F, nScale, '.', sal_True); } @@ -885,7 +885,7 @@ { ::rtl::OUString aText; Any aVal = xComponentSet->getPropertyValue( PROPERTY_DATE ); - sal_Int32 nInt32Val; + sal_Int32 nInt32Val = 0; if (aVal >>= nInt32Val) { ::Date aDate(nInt32Val); @@ -908,7 +908,7 @@ { ::rtl::OUString aText; Any aVal = xComponentSet->getPropertyValue( PROPERTY_TIME ); - sal_Int32 nInt32Val; + sal_Int32 nInt32Val = 0; if (aVal >>= nInt32Val) { ::Time aTime(nInt32Val); @@ -1501,7 +1501,7 @@ } catch(RowSetVetoException& eVeto) { - eVeto; + (void)eVeto; } catch(SQLException& eDb) { @@ -2083,8 +2083,7 @@ const ::rtl::OUString* pMasterFields = m_aMasterFields.getConstArray(); const ::rtl::OUString* pDetailFields = m_aDetailFields.getConstArray(); - const ::rtl::OUString* pDetailFieldsEnd = pDetailFields + m_aDetailFields.getLength(); - for (pDetailFields; pDetailFields < pDetailFieldsEnd; ++pDetailFields, ++pMasterFields) + for (sal_Int32 i = 0; i < m_aDetailFields.getLength(); ++i, ++pDetailFields, ++pMasterFields) { Reference xMasterField, xField; MapUString2INT32::const_iterator aFind; @@ -2506,7 +2505,7 @@ // Sollen Controls in einer TabOrder gruppe zusammengefasst werden? if (m_aCycle.hasValue()) { - sal_Int32 nCycle; + sal_Int32 nCycle = 0; ::cppu::enum2int(nCycle, m_aCycle); return nCycle != TabulatorCycle_PAGE; } @@ -2859,8 +2858,8 @@ } catch(SQLException& eDB) { - eDB; - } + (void)eDB; // makes compiler happy + } aGuard.reset(); } @@ -2914,7 +2913,7 @@ catch(SQLException& e) { DBG_ERROR("ODatabaseForm::reload_impl : shouldn't executeRowSet catch this exception ?"); - e; + (void)e; // makes compiler happy } if (bSuccess) @@ -3310,7 +3309,7 @@ } catch(RowSetVetoException& eVeto) { - eVeto; + (void)eVeto; // makes compiler happy throw; } catch(SQLException& eDb) @@ -3331,7 +3330,7 @@ } catch(RowSetVetoException& eVeto) { - eVeto; + (void)eVeto; // makes compiler happy throw; } catch(SQLException& eDb) @@ -3352,7 +3351,7 @@ } catch(RowSetVetoException& eVeto) { - eVeto; + (void)eVeto; // makes compiler happy throw; } catch(SQLException& eDb) @@ -3373,7 +3372,7 @@ } catch(RowSetVetoException& eVeto) { - eVeto; + (void)eVeto; // makes compiler happy throw; } catch(SQLException& eDb) @@ -3440,7 +3439,7 @@ } catch(RowSetVetoException& eVeto) { - eVeto; // make compiler happy + (void)eVeto; // make compiler happy throw; } catch(SQLException& eDb) @@ -3744,7 +3743,7 @@ DataSelectionType eTranslated = DataSelectionType_TABLE; if (m_xAggregateSet.is()) { - sal_Int32 nCommandType; + sal_Int32 nCommandType = 0; m_xAggregateSet->getPropertyValue(PROPERTY_COMMANDTYPE) >>= nCommandType; switch (nCommandType) { @@ -3819,7 +3818,7 @@ if (nAnyMask & CYCLE) { - sal_Int32 nCycle; + sal_Int32 nCycle = 0; ::cppu::enum2int(nCycle, m_aCycle); _rxOutStream->writeShort((sal_Int16)nCycle); } @@ -3867,9 +3866,6 @@ if (m_xAggregateSet.is()) m_xAggregateSet->setPropertyValue(PROPERTY_COMMANDTYPE, makeAny(nCommandType)); - // obsolete - sal_Int16 nDummy = _rxInStream->readShort(); - // navigation mode was a boolean in version 1 // war in der version 1 ein sal_Bool sal_Bool bNavigation = _rxInStream->readBoolean(); Index: binfilter/bf_forms/source/component/forms_Edit.cxx =================================================================== RCS file: /cvs/framework/binfilter/bf_forms/source/component/forms_Edit.cxx,v retrieving revision 1.10 diff -u -r1.10 forms_Edit.cxx --- binfilter/bf_forms/source/component/forms_Edit.cxx 10 Apr 2008 07:43:04 -0000 1.10 +++ binfilter/bf_forms/source/component/forms_Edit.cxx 6 May 2008 11:45:40 -0000 @@ -173,7 +173,6 @@ } } // Refcount wieder bei 2 fuer beide Listener - sal_Int32 n = decrement(m_refCount); } //------------------------------------------------------------------------------ @@ -356,11 +355,11 @@ OEditModel::OEditModel(const Reference& _rxFactory) :OEditBaseModel( _rxFactory, VCL_CONTROLMODEL_EDIT, FRM_CONTROL_EDIT ) // use the old control name for compytibility reasons - ,m_bMaxTextLenModified(sal_False) - ,m_nKeyType(NumberFormat::UNDEFINED) - ,m_aNullDate(DBTypeConversion::getStandardDate()) ,m_nFormatKey(0) + ,m_aNullDate(DBTypeConversion::getStandardDate()) ,m_nFieldType(DataType::OTHER) + ,m_nKeyType(NumberFormat::UNDEFINED) + ,m_bMaxTextLenModified(sal_False) ,m_bWritingFormattedFake(sal_False) ,m_bNumericField(sal_False) { @@ -375,11 +374,11 @@ //------------------------------------------------------------------ OEditModel::OEditModel( const OEditModel* _pOriginal, const Reference& _rxFactory ) :OEditBaseModel( _pOriginal, _rxFactory ) - ,m_bMaxTextLenModified(sal_False) - ,m_nKeyType(NumberFormat::UNDEFINED) - ,m_aNullDate(DBTypeConversion::getStandardDate()) ,m_nFormatKey(0) + ,m_aNullDate(DBTypeConversion::getStandardDate()) ,m_nFieldType(DataType::OTHER) + ,m_nKeyType(NumberFormat::UNDEFINED) + ,m_bMaxTextLenModified(sal_False) ,m_bWritingFormattedFake(sal_False) ,m_bNumericField(sal_False) { @@ -605,7 +604,7 @@ m_bMaxTextLenModified = getINT16(m_xAggregateSet->getPropertyValue(PROPERTY_MAXTEXTLEN)) != 0; if ( !m_bMaxTextLenModified ) { - sal_Int32 nFieldLen; + sal_Int32 nFieldLen = 0; xField->getPropertyValue(::rtl::OUString::createFromAscii("Precision")) >>= nFieldLen; if (nFieldLen && nFieldLen <= USHRT_MAX) Index: binfilter/bf_forms/source/component/forms_Grid.cxx =================================================================== RCS file: /cvs/framework/binfilter/bf_forms/source/component/forms_Grid.cxx,v retrieving revision 1.8 diff -u -r1.8 forms_Grid.cxx --- binfilter/bf_forms/source/component/forms_Grid.cxx 10 Apr 2008 07:45:51 -0000 1.8 +++ binfilter/bf_forms/source/component/forms_Grid.cxx 6 May 2008 11:45:41 -0000 @@ -156,16 +156,16 @@ ,m_aSelectListeners(m_aMutex) ,m_aResetListeners(m_aMutex) ,m_aDefaultControl(FRM_CONTROL_GRID) // use the old control name for compytibility reasons + ,m_nFontRelief(awt::FontRelief::NONE) + ,m_nFontEmphasis(awt::FontEmphasisMark::NONE) ,m_nFontEvent(0) + ,m_nBorder(1) ,m_bEnable(sal_True) ,m_bNavigation(sal_True) - ,m_nBorder(1) ,m_bRecordMarker(sal_True) ,m_bPrintable(sal_True) ,m_bAlwaysShowCursor(sal_False) ,m_bDisplaySynchron(sal_True) - ,m_nFontRelief(awt::FontRelief::NONE) - ,m_nFontEmphasis(awt::FontEmphasisMark::NONE) { DBG_CTOR(OGridControlModel,NULL); Index: binfilter/bf_forms/source/component/forms_GroupManager.cxx =================================================================== RCS file: /cvs/framework/binfilter/bf_forms/source/component/forms_GroupManager.cxx,v retrieving revision 1.8 diff -u -r1.8 forms_GroupManager.cxx --- binfilter/bf_forms/source/component/forms_GroupManager.cxx 10 Apr 2008 07:46:20 -0000 1.8 +++ binfilter/bf_forms/source/component/forms_GroupManager.cxx 6 May 2008 11:45:41 -0000 @@ -100,8 +100,8 @@ //------------------------------------------------------------------ OGroupComp::OGroupComp() - :m_nTabIndex( 0 ) - ,m_nPos( -1 ) + :m_nPos( -1 ) + ,m_nTabIndex( 0 ) { } @@ -109,18 +109,18 @@ OGroupComp::OGroupComp(const OGroupComp& _rSource) :m_aName( _rSource.m_aName ) ,m_xComponent( _rSource.m_xComponent ) - ,m_nTabIndex( _rSource.m_nTabIndex ) - ,m_nPos( _rSource.m_nPos ) ,m_xControlModel(_rSource.m_xControlModel) + ,m_nPos( _rSource.m_nPos ) + ,m_nTabIndex( _rSource.m_nTabIndex ) { } //------------------------------------------------------------------ OGroupComp::OGroupComp(const Reference& rxSet, sal_Int32 nInsertPos ) :m_xComponent( rxSet ) - ,m_nTabIndex(0) - ,m_nPos( nInsertPos ) ,m_xControlModel(rxSet,UNO_QUERY) + ,m_nPos( nInsertPos ) + ,m_nTabIndex(0) { if (m_xComponent.is()) { Index: binfilter/bf_sc/source/core/tool/sc_chgtrack.cxx =================================================================== RCS file: /cvs/framework/binfilter/bf_sc/source/core/tool/sc_chgtrack.cxx,v retrieving revision 1.11 diff -u -r1.11 sc_chgtrack.cxx --- binfilter/bf_sc/source/core/tool/sc_chgtrack.cxx 10 Apr 2008 08:26:55 -0000 1.11 +++ binfilter/bf_sc/source/core/tool/sc_chgtrack.cxx 6 May 2008 11:45:42 -0000 @@ -111,6 +111,9 @@ /*N*/ const String& aTempUser, const String& aTempComment) /*N*/ : /*N*/ aBigRange( rRange ), +/*N*/ aDateTime( aTempDateTime ), +/*N*/ aUser( aTempUser ), +/*N*/ aComment( aTempComment ), /*N*/ pNext( NULL ), /*N*/ pPrev( NULL ), /*N*/ pLinkAny( NULL ), @@ -120,10 +123,7 @@ /*N*/ nAction( nTempAction ), /*N*/ nRejectAction( nTempRejectAction ), /*N*/ eType( eTypeP ), -/*N*/ eState( eTempState ), -/*N*/ aDateTime( aTempDateTime ), -/*N*/ aUser( aTempUser ), -/*N*/ aComment( aTempComment ) +/*N*/ eState( eTempState ) /*N*/ { /*N*/ } @@ -606,7 +606,7 @@ /*N*/ } /*N*/ rStrm << nCount; /*N*/ ScChangeActionLinkEntry* pHere; -/*N*/ while ( pHere = (ScChangeActionLinkEntry*) pStack->Pop() ) +/*N*/ while ( (pHere = (ScChangeActionLinkEntry*) pStack->Pop()) ) /*N*/ { /*N*/ ScChangeAction* p = pHere->GetAction(); /*N*/ rStrm << (UINT32) ( p ? p->GetActionNumber() : 0 ); @@ -756,7 +756,6 @@ /*N*/ DBG_ERROR( "ScChangeActionIns: Block not supported!" ); /*N*/ } - /*N*/ ScChangeActionIns::ScChangeActionIns( SvStream& rStrm, /*N*/ ScMultipleReadHeader& rHdr, ScChangeTrack* pTrack ) /*N*/ : @@ -831,6 +830,8 @@ /*N*/ case SC_CAT_INSERT_TABS : /*N*/ pDoc->DeleteTab( aRange.aStart.Tab() ); /*N*/ break; +/*N*/ default: +/*N*/ break; /*N*/ } /*N*/ SetState( SC_CAS_REJECTED ); /*N*/ RemoveAllLinks(); @@ -846,9 +847,9 @@ /*N*/ ScChangeAction( SC_CAT_NONE, rRange ), /*N*/ pTrack( pTrackP ), /*N*/ pFirstCell( NULL ), -/*N*/ pLinkMove( NULL ), /*N*/ pCutOff( NULL ), /*N*/ nCutOff( 0 ), +/*N*/ pLinkMove( NULL ), /*N*/ nDx( nDxP ), /*N*/ nDy( nDyP ) /*N*/ { @@ -900,9 +901,9 @@ /*N*/ ScChangeAction(eType, aBigRange, nActionNumber, nRejectingNumber, eState, aDateTime, aUser, sComment), /*N*/ pTrack( pTrackP ), /*N*/ pFirstCell( NULL ), -/*N*/ pLinkMove( NULL ), /*N*/ pCutOff( NULL ), /*N*/ nCutOff( 0 ), +/*N*/ pLinkMove( NULL ), /*N*/ nDx( 0 ), /*N*/ nDy( 0 ) /*N*/ { @@ -946,7 +947,7 @@ /*N*/ } /*N*/ rStrm << nCount; /*N*/ ScChangeActionDelMoveEntry* pHere; -/*N*/ while ( pHere = (ScChangeActionDelMoveEntry*) pStack->Pop() ) +/*N*/ while ( (pHere = (ScChangeActionDelMoveEntry*) pStack->Pop()) ) /*N*/ { /*N*/ ScChangeAction* p = pHere->GetAction(); /*N*/ rStrm << (UINT32) ( p ? p->GetActionNumber() : 0 ); @@ -1069,6 +1070,8 @@ /*N*/ p->GetBigRange().aStart.SetTab( GetBigRange().aStart.Tab() ); /*N*/ p->GetBigRange().aEnd.SetTab( GetBigRange().aStart.Tab() ); /*N*/ break; +/*N*/ default: +/*N*/ break; /*N*/ } /*N*/ } /*N*/ } @@ -1155,12 +1158,12 @@ /*N*/ case SC_CAT_DELETE_COLS : /*N*/ if ( !(aRange.aStart.Col() == 0 && aRange.aEnd.Col() == MAXCOL) ) /*N*/ { // nur wenn nicht TabDelete -/*N*/ if ( bOk = pDoc->CanInsertCol( aRange ) ) +/*N*/ if ( (bOk = pDoc->CanInsertCol( aRange )) ) /*N*/ bOk = pDoc->InsertCol( aRange ); /*N*/ } /*N*/ break; /*N*/ case SC_CAT_DELETE_ROWS : -/*N*/ if ( bOk = pDoc->CanInsertRow( aRange ) ) +/*N*/ if ( (bOk = pDoc->CanInsertRow( aRange )) ) /*N*/ bOk = pDoc->InsertRow( aRange ); /*N*/ break; /*N*/ case SC_CAT_DELETE_TABS : @@ -1168,10 +1171,12 @@ /*N*/ //2do: Tabellennamen merken? /*N*/ String aName; /*N*/ pDoc->CreateValidTabName( aName ); -/*N*/ if ( bOk = pDoc->ValidNewTabName( aName ) ) +/*N*/ if ( (bOk = pDoc->ValidNewTabName( aName )) ) /*N*/ bOk = pDoc->InsertTab( aRange.aStart.Tab(), aName ); /*N*/ } /*N*/ break; +/*N*/ default: +/*N*/ break; /*N*/ } /*N*/ pTrack->SetInDelete( FALSE ); /*N*/ pTrack->SetInDeleteUndo( FALSE ); @@ -1232,6 +1237,8 @@ /*N*/ else if ( nTo < 0 ) /*N*/ pMove->GetBigRange().aEnd.IncTab( -nTo ); /*N*/ break; +/*N*/ default: +/*N*/ break; /*N*/ } /*N*/ delete pLinkMove; // rueckt sich selbst hoch /*N*/ } @@ -1261,6 +1268,8 @@ /*N*/ else /*N*/ pCutOff->GetBigRange().aStart.IncTab( -nCutOff ); /*N*/ break; +/*N*/ default: +/*N*/ break; /*N*/ } /*N*/ SetCutOffInsert( NULL, 0 ); /*N*/ } @@ -1489,13 +1498,13 @@ /*N*/ ScBaseCell* pTempOldCell, ScDocument* pDoc, const String& sResult ) /*N*/ : /*N*/ ScChangeAction(SC_CAT_CONTENT, aBigRange, nActionNumber, nRejectingNumber, eState, aDateTime, aUser, sComment), +/*N*/ aOldValue(sResult), /*N*/ pOldCell(pTempOldCell), /*N*/ pNewCell(NULL), /*N*/ pNextContent(NULL), /*N*/ pPrevContent(NULL), /*N*/ pNextInSlot(NULL), -/*N*/ ppPrevInSlot(NULL), -/*N*/ aOldValue(sResult) +/*N*/ ppPrevInSlot(NULL) /*N*/ /*N*/ { /*N*/ if (pOldCell) @@ -1507,8 +1516,8 @@ /*N*/ ScDocument* pDoc ) /*N*/ : /*N*/ ScChangeAction(SC_CAT_CONTENT, aBigRange, nActionNumber), -/*N*/ pNewCell(pTempNewCell), /*N*/ pOldCell(NULL), +/*N*/ pNewCell(pTempNewCell), /*N*/ pNextContent(NULL), /*N*/ pPrevContent(NULL), /*N*/ pNextInSlot(NULL), @@ -1805,6 +1814,8 @@ /*N*/ case CELLTYPE_FORMULA : /*N*/ ((ScFormulaCell*)pCell)->SetInChangeTrack( TRUE ); /*N*/ break; +/*N*/ default: +/*N*/ break; /*N*/ } /*N*/ } /*N*/ else @@ -1831,6 +1842,8 @@ /*N*/ case CELLTYPE_FORMULA : /*N*/ ((ScFormulaCell*)pCell)->SetInChangeTrack( TRUE ); /*N*/ break; +/*N*/ default: +/*N*/ break; /*N*/ } /*N*/ } /*N*/ } @@ -1857,6 +1870,8 @@ /*N*/ case CELLTYPE_FORMULA : /*N*/ GetFormulaString( rStr, (ScFormulaCell*) pCell ); /*N*/ break; +/*N*/ default: +/*N*/ break; /*N*/ } /*N*/ } /*N*/ else @@ -2073,6 +2088,8 @@ /*N*/ aTmpRange.aEnd.IncTab( nDz ); /*N*/ } /*N*/ break; +/*N*/ default: +/*N*/ break; /*N*/ } /*N*/ ScRange aRange( aTmpRange.MakeRange() ); /*N*/ if ( bOldFormula ) @@ -2092,10 +2109,10 @@ /*N*/ ScToken* t; /*N*/ ScTokenArray* pArr = ((ScFormulaCell*)pOldCell)->GetCode(); /*N*/ pArr->Reset(); -/*N*/ while ( t = pArr->GetNextReference() ) +/*N*/ while ( (t = pArr->GetNextReference()) ) /*N*/ lcl_InvalidateReference( *t, rPos ); /*N*/ pArr->Reset(); -/*N*/ while ( t = pArr->GetNextReferenceRPN() ) +/*N*/ while ( (t = pArr->GetNextReferenceRPN()) ) /*N*/ lcl_InvalidateReference( *t, rPos ); /*N*/ } /*N*/ if ( bNewFormula ) @@ -2103,10 +2120,10 @@ /*N*/ ScToken* t; /*N*/ ScTokenArray* pArr = ((ScFormulaCell*)pNewCell)->GetCode(); /*N*/ pArr->Reset(); -/*N*/ while ( t = pArr->GetNextReference() ) +/*N*/ while ( (t = pArr->GetNextReference()) ) /*N*/ lcl_InvalidateReference( *t, rPos ); /*N*/ pArr->Reset(); -/*N*/ while ( t = pArr->GetNextReferenceRPN() ) +/*N*/ while ( (t = pArr->GetNextReferenceRPN()) ) /*N*/ lcl_InvalidateReference( *t, rPos ); /*N*/ } /*N*/ } @@ -2132,7 +2149,6 @@ /*N*/ BOOL ScChangeActionReject::Store( SvStream& rStrm, ScMultipleWriteHeader& rHdr ) const /*N*/ { -/*N*/ BOOL bOk = ScChangeAction::Store( rStrm, rHdr ); /*N*/ return TRUE; /*N*/ } @@ -2166,8 +2182,8 @@ /*N*/ } /*N*/ ScChangeTrack::ScChangeTrack( ScDocument* pDocP, const StrCollection& aTempUserCollection) : -/*N*/ pDoc( pDocP ), -/*N*/ aUserCollection(aTempUserCollection) +/*N*/ aUserCollection(aTempUserCollection), +/*N*/ pDoc( pDocP ) /*N*/ { /*N*/ Init(); /*N*/ StartListening( *SfxGetpApp() ); @@ -2248,11 +2264,11 @@ /*N*/ pBlockModifyMsg = NULL; /*N*/ } /*N*/ ScChangeTrackMsgInfo* pMsgInfo; -/*N*/ while ( pMsgInfo = aMsgStackTmp.Pop() ) +/*N*/ while ( (pMsgInfo = aMsgStackTmp.Pop()) ) /*N*/ delete pMsgInfo; -/*N*/ while ( pMsgInfo = aMsgStackFinal.Pop() ) +/*N*/ while ( (pMsgInfo = aMsgStackFinal.Pop()) ) /*N*/ delete pMsgInfo; -/*N*/ while ( pMsgInfo = aMsgQueue.Get() ) +/*N*/ while ( (pMsgInfo = aMsgQueue.Get()) ) /*N*/ delete pMsgInfo; /*N*/ } @@ -2352,7 +2368,7 @@ /*N*/ { /*N*/ BOOL bNew = FALSE; /*N*/ ScChangeTrackMsgInfo* pMsg; -/*N*/ while ( pMsg = aMsgStackFinal.Pop() ) +/*N*/ while ( (pMsg = aMsgStackFinal.Pop()) ) /*N*/ { /*N*/ aMsgQueue.Put( pMsg ); /*N*/ bNew = TRUE; @@ -2708,6 +2724,8 @@ /*N*/ pAppend->AddLink( NULL, pLink ); /*N*/ } /*N*/ break; +/*N*/ default: +/*N*/ break; /*N*/ } /*N*/ } @@ -2765,7 +2783,7 @@ /*N*/ if ( pAppend->GetType() == SC_CAT_CONTENT ) /*N*/ { /*N*/ ScChangeActionContent* pContent = (ScChangeActionContent*) pAppend; -/*N*/ if ( pContent = pContent->GetPrevContent() ) +/*N*/ if ( (pContent = pContent->GetPrevContent()) ) /*N*/ { /*N*/ ULONG nMod = pContent->GetActionNumber(); /*N*/ NotifyModified( SC_CTM_CHANGE, nMod, nMod ); @@ -3184,7 +3202,7 @@ /*N*/ if ( pRemove->GetType() == SC_CAT_CONTENT ) /*N*/ { /*N*/ ScChangeActionContent* pContent = (ScChangeActionContent*) pRemove; -/*N*/ if ( pContent = pContent->GetPrevContent() ) +/*N*/ if ( (pContent = pContent->GetPrevContent()) ) /*N*/ { /*N*/ ULONG nMod = pContent->GetActionNumber(); /*N*/ NotifyModified( SC_CTM_CHANGE, nMod, nMod ); @@ -3314,7 +3332,7 @@ /*N*/ ScChangeActionDel* pActDel = (ScChangeActionDel*) pAct; /*N*/ if ( !bUndo ) /*N*/ { // Delete -/*N*/ ScChangeActionType eInsType; // fuer Insert-Undo-"Deletes" +/*N*/ ScChangeActionType eInsType = SC_CAT_NONE; // fuer Insert-Undo-"Deletes" /*N*/ switch ( eActType ) /*N*/ { /*N*/ case SC_CAT_DELETE_COLS : @@ -3326,6 +3344,8 @@ /*N*/ case SC_CAT_DELETE_TABS : /*N*/ eInsType = SC_CAT_INSERT_TABS; /*N*/ break; +/*N*/ default: +/*N*/ break; /*N*/ } /*N*/ for ( ScChangeAction* p = *ppFirstAction; p; p = p->GetNext() ) /*N*/ { @@ -3480,6 +3500,8 @@ /*N*/ else /*N*/ pMove->GetFromRange().aEnd.IncTab( nFrom ); /*N*/ break; +/*N*/ default: +/*N*/ break; /*N*/ } /*N*/ } /*N*/ if ( nTo ) @@ -3504,6 +3526,8 @@ /*N*/ else /*N*/ pMove->GetBigRange().aEnd.IncTab( nTo ); /*N*/ break; +/*N*/ default: +/*N*/ break; /*N*/ } /*N*/ } /*N*/ if ( nFrom || nTo ) @@ -3514,7 +3538,9 @@ /*N*/ } /*N*/ } /*N*/ break; -/*N*/ } +/*N*/ default: +/*N*/ break; +/*N*/ } /*N*/ } /*N*/ if ( bUpdate ) /*N*/ { @@ -3528,7 +3554,6 @@ /*N*/ } /*N*/ else /*N*/ { // Undo Delete -/*N*/ ScChangeAction* pNextAction = NULL; /*N*/ for ( ScChangeAction* p = *ppFirstAction; p; p = p->GetNext() ) /*N*/ { /*N*/ if ( p == pAct ) @@ -3616,7 +3641,7 @@ /*N*/ do /*N*/ { // Abhaengigkeit vom FromRange herstellen /*N*/ AddDependentWithNotify( pActMove, pHere ); -/*N*/ } while ( pHere = pHere->GetNextContent() ); +/*N*/ } while ( (pHere = pHere->GetNextContent()) ); /*N*/ } /*N*/ else /*N*/ p->UpdateReference( this, eMode, rFrom, nDx, nDy, nDz ); @@ -3729,7 +3754,6 @@ /*N*/ { /*N*/ if ( pAct->HasDependent() && !bRecursion ) /*N*/ { -/*N*/ const ScBigRange& rRange = pAct->GetBigRange(); /*N*/ DBG_ASSERT( pTable, "ScChangeTrack::Reject: Insert ohne Table" ); /*N*/ for ( ScChangeAction* p = pTable->Last(); p && bOk; p = pTable->Prev() ) /*N*/ { @@ -3789,6 +3813,8 @@ /*N*/ case SC_CAT_DELETE_TABS : /*N*/ aDelRange.aStart.SetTab( aDelRange.aEnd.Tab() ); /*N*/ break; +/*N*/ default: +/*N*/ break; /*N*/ } /*N*/ ScChangeAction* p = pAct; /*N*/ BOOL bLoop = TRUE; @@ -3811,6 +3837,8 @@ /*N*/ case SC_CAT_DELETE_TABS : /*N*/ aDelRange.aStart.IncTab( -1 ); /*N*/ break; +/*N*/ default: +/*N*/ break; /*N*/ } /*N*/ } /*N*/ else @@ -3838,7 +3866,6 @@ /*N*/ { /*N*/ if ( pAct->HasDependent() && !bRecursion ) /*N*/ { -/*N*/ const ScBigRange& rRange = pAct->GetBigRange(); /*N*/ DBG_ASSERT( pTable, "ScChangeTrack::Reject: Move ohne Table" ); /*N*/ for ( ScChangeAction* p = pTable->Last(); p && bOk; p = pTable->Prev() ) /*N*/ { Index: binfilter/bf_starmath/source/mathtype.hxx =================================================================== RCS file: /cvs/framework/binfilter/bf_starmath/source/mathtype.hxx,v retrieving revision 1.7 diff -u -r1.7 mathtype.hxx --- binfilter/bf_starmath/source/mathtype.hxx 10 Apr 2008 11:58:37 -0000 1.7 +++ binfilter/bf_starmath/source/mathtype.hxx 6 May 2008 11:45:43 -0000 @@ -83,14 +83,32 @@ class MathType { public: - MathType(String &rIn) : bSilent(sal_False),nDefaultSize(12),nLSize(0), - nDSize(0),nCurSize(0),nLastSize(0),nVAlign(0),nHAlign(0),rRet(rIn) + MathType(String &rIn) : + rRet(rIn), + nHAlign(0), + nVAlign(0), + nDefaultSize(12), + nLSize(0), + nDSize(0), + nCurSize(0), + nLastSize(0), + bSilent(sal_False) { DBG_BF_ASSERT(0, "STRIP"); //STRIP001 Init(); } - MathType(String &rIn,SmNode *pIn) : bSilent(sal_False),nDefaultSize(12), - nLSize(0),nDSize(0),nCurSize(0),nLastSize(0),nVAlign(0),nHAlign(2), - pTree(pIn),rRet(rIn),nInsertion(0),nSpec(0) + MathType(String &rIn,SmNode *pIn) : + rRet(rIn), + pTree(pIn), + nHAlign(2), + nVAlign(0), + nInsertion(0), + nDefaultSize(12), + nLSize(0), + nDSize(0), + nCurSize(0), + nLastSize(0), + nSpec(0), + bSilent(sal_False) { DBG_BF_ASSERT(0, "STRIP"); //STRIP001Init(); } Index: binfilter/bf_starmath/source/starmath_mathml.cxx =================================================================== RCS file: /cvs/framework/binfilter/bf_starmath/source/starmath_mathml.cxx,v retrieving revision 1.9 diff -u -r1.9 starmath_mathml.cxx --- binfilter/bf_starmath/source/starmath_mathml.cxx 10 Apr 2008 12:02:53 -0000 1.9 +++ binfilter/bf_starmath/source/starmath_mathml.cxx 6 May 2008 11:45:44 -0000 @@ -1939,13 +1939,13 @@ } - +/* static __FAR_DATA SvXMLTokenMapEntry aMathElemTokenMap[] = { { XML_NAMESPACE_MATH, XML_MATH, XML_TOK_MATH }, XML_TOKEN_MAP_END }; - +*/ class SmXMLSpaceContext_Impl : public SmXMLImportContext { public: @@ -2499,8 +2499,6 @@ const SvXMLTokenMap& rTokenMap = GetSmImport().GetPresLayoutElemTokenMap(); - UINT32 nTest = rTokenMap.Get(nPrefix, rLocalName); - switch(rTokenMap.Get(nPrefix, rLocalName)) { //Consider semantics a dummy except for any starmath annotations @@ -3361,8 +3359,7 @@ sal_Int32 nCount = aViewProps.getLength(); const PropertyValue *pValue = aViewProps.getConstArray(); - long nTmp; - sal_Bool bShowDeletes = sal_False, bShowInserts = sal_False, bShowFooter = sal_False, bShowHeader = sal_False; + long nTmp = 0; for (sal_Int32 i = 0; i < nCount ; i++) { @@ -3708,12 +3705,12 @@ pThing2 = new SvXMLElementExport(*this,XML_NAMESPACE_MATH, sXML_munderover, sal_True,sal_True); } - else if (pCSub = pNode->GetSubNode(CSUB+1)) + else if ((pCSub = pNode->GetSubNode(CSUB+1))) { pThing2 = new SvXMLElementExport(*this,XML_NAMESPACE_MATH, sXML_munder, sal_True,sal_True); } - else if (pCSup = pNode->GetSubNode(CSUP+1)) + else if ((pCSup = pNode->GetSubNode(CSUP+1))) { pThing2 = new SvXMLElementExport(*this,XML_NAMESPACE_MATH, sXML_mover, sal_True,sal_True); @@ -3778,12 +3775,12 @@ pThing = new SvXMLElementExport(*this,XML_NAMESPACE_MATH, sXML_msubsup, sal_True,sal_True); } - else if (pSub = pNode->GetSubNode(RSUB+1)) + else if ((pSub = pNode->GetSubNode(RSUB+1))) { pThing = new SvXMLElementExport(*this,XML_NAMESPACE_MATH,sXML_msub, sal_True,sal_True); } - else if (pSup = pNode->GetSubNode(RSUP+1)) + else if ((pSup = pNode->GetSubNode(RSUP+1))) { pThing = new SvXMLElementExport(*this,XML_NAMESPACE_MATH,sXML_msup, sal_True,sal_True); @@ -3795,12 +3792,12 @@ pThing2 = new SvXMLElementExport(*this,XML_NAMESPACE_MATH, sXML_munderover, sal_True,sal_True); } - else if (pCSub = pNode->GetSubNode(CSUB+1)) + else if ((pCSub = pNode->GetSubNode(CSUB+1))) { pThing2 = new SvXMLElementExport(*this,XML_NAMESPACE_MATH, sXML_munder, sal_True,sal_True); } - else if (pCSup = pNode->GetSubNode(CSUP+1)) + else if ((pCSup = pNode->GetSubNode(CSUP+1))) { pThing2 = new SvXMLElementExport(*this,XML_NAMESPACE_MATH, sXML_mover, sal_True,sal_True); @@ -3860,7 +3857,7 @@ pRow = new SvXMLElementExport(*this,XML_NAMESPACE_MATH,sXML_mrow, sal_True, sal_True); - if (pTemp = pNode->GetSubNode(1)) + if ((pTemp = pNode->GetSubNode(1))) ExportNodes(pTemp,nLevel+1); if (pFences) delete pFences; @@ -4090,7 +4087,8 @@ AddAttribute(XML_NAMESPACE_MATH,sXML_fontfamily, OUString(pNode->GetToken().aText.GetBuffer())); break; - + default: + break; } #if 0 if (pNode->GetNumSubNodes() > 1) //or in the future is a node that @@ -4250,16 +4248,8 @@ case NMATRIX: ExportMatrix(pNode,nLevel); break; -#if 0 default: - { - ULONG nSize = pNode->GetNumSubNodes(); - for (ULONG i = 0; i < nSize; i++) - if (SmNode *pTemp = pNode->GetSubNode(i)) - ExportNodes(pTemp,nLevel+1); - } - break; -#endif + break; } } } Index: binfilter/bf_starmath/source/starmath_node.cxx =================================================================== RCS file: /cvs/framework/binfilter/bf_starmath/source/starmath_node.cxx,v retrieving revision 1.13 diff -u -r1.13 starmath_node.cxx --- binfilter/bf_starmath/source/starmath_node.cxx 10 Apr 2008 12:03:10 -0000 1.13 +++ binfilter/bf_starmath/source/starmath_node.cxx 6 May 2008 11:45:45 -0000 @@ -190,7 +190,7 @@ SmNode *pNode; USHORT nSize = GetNumSubNodes(); for (USHORT i = 0; i < nSize; i++) - if (pNode = GetSubNode(i)) + if ((pNode = GetSubNode(i))) pNode->SetPhantom(bIsPhantom); } @@ -203,7 +203,7 @@ SmNode *pNode; USHORT nSize = GetNumSubNodes(); for (USHORT i = 0; i < nSize; i++) - if (pNode = GetSubNode(i)) + if ((pNode = GetSubNode(i))) pNode->SetColor(rColor); } @@ -217,7 +217,7 @@ /*N*/ SmNode *pNode; /*N*/ USHORT nSize = GetNumSubNodes(); /*N*/ for (USHORT i = 0; i < nSize; i++) -/*N*/ if (pNode = GetSubNode(i)) +/*N*/ if ((pNode = GetSubNode(i))) /*N*/ pNode->SetAttribut(nAttrib); /*N*/ } @@ -231,7 +231,7 @@ /*N*/ SmNode *pNode; /*N*/ USHORT nSize = GetNumSubNodes(); /*N*/ for (USHORT i = 0; i < nSize; i++) -/*N*/ if (pNode = GetSubNode(i)) +/*N*/ if ((pNode = GetSubNode(i))) /*N*/ pNode->ClearAttribut(nAttrib); /*N*/ } @@ -244,7 +244,7 @@ /*N*/ SmNode *pNode; /*N*/ USHORT nSize = GetNumSubNodes(); /*N*/ for (USHORT i = 0; i < nSize; i++) -/*N*/ if (pNode = GetSubNode(i)) +/*N*/ if ((pNode = GetSubNode(i))) /*N*/ pNode->SetFont(rFace); /*N*/ } @@ -298,7 +298,7 @@ /*N*/ SmNode *pNode; /*N*/ USHORT nSize = GetNumSubNodes(); /*N*/ for (USHORT i = 0; i < nSize; i++) -/*N*/ if (pNode = GetSubNode(i)) +/*N*/ if ((pNode = GetSubNode(i))) /*N*/ pNode->SetFontSize(rSize, nType); /*N*/ } @@ -310,7 +310,7 @@ /*N*/ SmNode *pNode; /*N*/ USHORT nSize = GetNumSubNodes(); /*N*/ for (USHORT i = 0; i < nSize; i++) -/*N*/ if (pNode = GetSubNode(i)) +/*N*/ if ((pNode = GetSubNode(i))) /*N*/ pNode->SetSize(rSize); /*N*/ } @@ -325,7 +325,7 @@ /*N*/ SmNode *pNode; /*N*/ USHORT nSize = GetNumSubNodes(); /*N*/ for (USHORT i = 0; i < nSize; i++) -/*?*/ if (pNode = GetSubNode(i)) +/*?*/ if ((pNode = GetSubNode(i))) /*?*/ pNode->SetRectHorAlign(eHorAlign); /*N*/ } /*N*/ } @@ -365,7 +365,7 @@ /*N*/ SmNode *pNode; /*N*/ USHORT nSize = GetNumSubNodes(); /*N*/ for (USHORT i = 0; i < nSize; i++) -/*N*/ if (pNode = GetSubNode(i)) +/*N*/ if ((pNode = GetSubNode(i))) /*N*/ pNode->Prepare(rFormat, rDocShell); /*N*/ } @@ -390,7 +390,7 @@ /*N*/ SmNode *pNode; /*N*/ USHORT nSize = GetNumSubNodes(); /*N*/ for (USHORT i = 0; i < nSize; i++) -/*N*/ if (pNode = GetSubNode(i)) +/*N*/ if ((pNode = GetSubNode(i))) /*N*/ pNode->Move(rPosition); /*N*/ } @@ -400,7 +400,7 @@ /*N*/ SmNode *pNode; /*N*/ USHORT nSize = GetNumSubNodes(); /*N*/ for (USHORT i = 0; i < nSize; i++) -/*N*/ if (pNode = GetSubNode(i)) +/*N*/ if ((pNode = GetSubNode(i))) /*N*/ pNode->Arrange(rDev, rFormat); /*N*/ } @@ -427,7 +427,7 @@ /*N*/ const SmNode *pNode; /*N*/ USHORT nSize = GetNumSubNodes(); /*N*/ for (USHORT i = 0; i < nSize; i++) -/*N*/ if (pNode = GetSubNode(i)) +/*N*/ if ((pNode = GetSubNode(i))) /*N*/ { Point aOffset (pNode->GetTopLeft() - GetTopLeft()); /*N*/ pNode->Draw(rDev, rPosition + aOffset); /*N*/ } @@ -497,7 +497,7 @@ /*N*/ SmNode *pNode; /*N*/ /*N*/ for (USHORT i = 0; i < GetNumSubNodes(); i++) -/*N*/ if (pNode = GetSubNode(i)) +/*N*/ if ((pNode = GetSubNode(i))) /*N*/ delete pNode; /*N*/ } @@ -594,9 +594,6 @@ /*N*/ // arranges all subnodes in one column /*N*/ { /*N*/ Point rPosition; -/*N*/ -/*N*/ USHORT nWidth = 0; -/*N*/ USHORT nHeight = 0; /*N*/ SmNode *pNode; /*N*/ USHORT nSize = GetNumSubNodes(); /*N*/ @@ -612,7 +609,7 @@ /*N*/ nTmp; /*N*/ USHORT i; /*N*/ for (i = 0; i < nSize; i++) -/*N*/ if (pNode = GetSubNode(i)) +/*N*/ if ((pNode = GetSubNode(i))) /*N*/ { pNode->Arrange(rDev, rFormat); /*N*/ if ((nTmp = pNode->GetItalicWidth()) > nMaxWidth) /*N*/ nMaxWidth = nTmp; @@ -621,10 +618,9 @@ /*N*/ Point aPos; /*N*/ SmRect::operator = (SmRect(nMaxWidth, 0)); /*N*/ for (i = 0; i < nSize; i++) -/*N*/ { if (pNode = GetSubNode(i)) +/*N*/ { if ((pNode = GetSubNode(i))) /*N*/ { const SmRect &rNodeRect = pNode->GetRect(); /*N*/ const SmNode *pCoNode = pNode->GetLeftMost(); -/*N*/ SmTokenType eType = pCoNode->GetToken().eType; /*N*/ RectHorAlign eHorAlign = pCoNode->GetRectHorAlign(); /*N*/ /*N*/ aPos = rNodeRect.AlignTo(*this, RP_BOTTOM, @@ -668,7 +664,7 @@ /*N*/ USHORT nSize = GetNumSubNodes(); /*N*/ USHORT i; /*N*/ for (i = 0; i < nSize; i++) -/*N*/ if (pNode = GetSubNode(i)) +/*N*/ if ((pNode = GetSubNode(i))) /*N*/ pNode->Arrange(rDev, rFormat); /*N*/ /*N*/ SmTmpDevice aTmpDev ((OutputDevice &) rDev, TRUE); @@ -695,7 +691,7 @@ /*N*/ /*N*/ Point aPos; /*N*/ for (i = 0; i < nSize; i++) -/*N*/ if (pNode = GetSubNode(i)) +/*N*/ if ((pNode = GetSubNode(i))) /*N*/ { /*N*/ aPos = pNode->AlignTo(*this, RP_RIGHT, RHA_CENTER, RVA_BASELINE); /*N*/ @@ -1266,6 +1262,7 @@ /*N*/ switch (eSubSup) /*?*/ { case CSUB: eSubSup = RSUB; break; /*?*/ case CSUP: eSubSup = RSUP; break; +/*?*/ default: break; /*N*/ } /*N*/ /*N*/ // prevent sub-/supscripts from diminishing in size @@ -1652,6 +1649,7 @@ case TALIGNL: eHorAlign = RHA_LEFT; break; case TALIGNC: eHorAlign = RHA_CENTER; break; case TALIGNR: eHorAlign = RHA_RIGHT; break; + default: break; } SetRectHorAlign(eHorAlign); @@ -1720,6 +1718,7 @@ /*?*/ case TFIXED: nFnt = FNT_FIXED; break; /*N*/ case TSANS: nFnt = FNT_SANS; break; /*?*/ case TSERIF: nFnt = FNT_SERIF; break; +/*?*/ default: break; /*N*/ } /*N*/ if (nFnt != -1) /*N*/ { GetFont() = rFormat.GetFont(nFnt); @@ -2099,7 +2098,7 @@ /*N*/ /*N*/ // arrange subnodes and calculate the aboves arrays contents /*N*/ for (i = GetNumSubNodes() - 1; i >= 0; i--) -/*N*/ if (pNode = GetSubNode(i)) +/*N*/ if ((pNode = GetSubNode(i))) /*N*/ { pNode->Arrange(rDev, rFormat); /*N*/ /*N*/ int nCol = i % nNumCols; @@ -2140,7 +2139,6 @@ /*N*/ /*N*/ // get horizontal alignment /*N*/ const SmNode *pCoNode = pNode->GetLeftMost(); -/*N*/ SmTokenType eType = pCoNode->GetToken().eType; /*N*/ RectHorAlign eHorAlign = pCoNode->GetRectHorAlign(); /*N*/ /*N*/ // caculate horizontal position of element depending on column @@ -2172,7 +2170,7 @@ /*N*/ aDelta.Y() = aPos.Y() - aLineRect.GetTop(); /*N*/ aLineRect.Move(aDelta); /*N*/ for (j = 0; j < nNumCols; j++) -/*N*/ if (pNode = GetSubNode(i * nNumCols + j)) +/*N*/ if ((pNode = GetSubNode(i * nNumCols + j))) /*N*/ pNode->Move(aDelta); /*N*/ /*N*/ ExtendBy(aLineRect, RCP_NONE); @@ -2309,10 +2307,9 @@ /*N*/ SmNode::Prepare(rFormat, rDocShell); /*N*/ /*N*/ const SmSym *pSym; -/*N*/ SmModule *pp = SM_MOD1(); /*N*/ /*N*/ Size aOldSize = GetFont().GetSize(); -/*N*/ if (pSym = rDocShell.GetSymSetManager().GetSymbolByName(GetToken().aText)) +/*N*/ if ((pSym = rDocShell.GetSymSetManager().GetSymbolByName(GetToken().aText))) /*N*/ { /*N*/ SetText( pSym->GetCharacter() ); /*N*/ GetFont() = pSym->GetFace(); @@ -2435,6 +2432,7 @@ /*N*/ { /*N*/ case TBLANK: nNum += 4; break; /*?*/ case TSBLANK: nNum += 1; break; +/*?*/ default: break; /*N*/ } /*N*/ } Index: binfilter/bf_svx/source/items/svx_algitem.cxx =================================================================== RCS file: /cvs/framework/binfilter/bf_svx/source/items/svx_algitem.cxx,v retrieving revision 1.8 diff -u -r1.8 svx_algitem.cxx --- binfilter/bf_svx/source/items/svx_algitem.cxx 10 Apr 2008 14:09:36 -0000 1.8 +++ binfilter/bf_svx/source/items/svx_algitem.cxx 6 May 2008 11:45:45 -0000 @@ -89,7 +89,6 @@ /*N*/ sal_Bool SvxHorJustifyItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const /*N*/ { -/*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); /*N*/ nMemberId &= ~CONVERT_TWIPS; /*N*/ switch ( nMemberId ) /*N*/ { @@ -133,7 +132,6 @@ /*N*/ sal_Bool SvxHorJustifyItem::PutValue( const uno::Any& rVal, BYTE nMemberId ) /*N*/ { -/*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); /*N*/ nMemberId &= ~CONVERT_TWIPS; /*N*/ switch ( nMemberId ) /*N*/ { @@ -142,7 +140,7 @@ /*N*/ table::CellHoriJustify eUno; /*N*/ if(!(rVal >>= eUno)) /*N*/ { -/*N*/ sal_Int32 nValue; +/*N*/ sal_Int32 nValue = 0; /*?*/ if(!(rVal >>= nValue)) /*?*/ return sal_False; /*?*/ eUno = (table::CellHoriJustify)nValue; @@ -156,6 +154,7 @@ /*N*/ case table::CellHoriJustify_RIGHT: eSvx = SVX_HOR_JUSTIFY_RIGHT; break; /*N*/ case table::CellHoriJustify_BLOCK: eSvx = SVX_HOR_JUSTIFY_BLOCK; break; /*?*/ case table::CellHoriJustify_REPEAT: eSvx = SVX_HOR_JUSTIFY_REPEAT; break; +/*N*/ default: break; /*N*/ } /*N*/ SetValue( eSvx ); /*N*/ } @@ -163,7 +162,7 @@ /*N*/ case MID_HORJUST_ADJUST: /*N*/ { /*N*/ // property contains ParagraphAdjust values as sal_Int16 -/*N*/ sal_Int16 nVal; +/*N*/ sal_Int16 nVal = 0; /*?*/ if(!(rVal >>= nVal)) /*?*/ return sal_False; /*?*/ @@ -240,7 +239,7 @@ /*N*/ table::CellVertJustify eUno; /*N*/ if(!(rVal >>= eUno)) /*N*/ { -/*?*/ sal_Int32 nValue; +/*?*/ sal_Int32 nValue = 0; /*?*/ if(!(rVal >>= nValue)) /*?*/ return sal_False; /*?*/ eUno = (table::CellVertJustify)nValue; @@ -253,6 +252,7 @@ /*N*/ case table::CellVertJustify_TOP: eSvx = SVX_VER_JUSTIFY_TOP; break; /*N*/ case table::CellVertJustify_CENTER: eSvx = SVX_VER_JUSTIFY_CENTER; break; /*N*/ case table::CellVertJustify_BOTTOM: eSvx = SVX_VER_JUSTIFY_BOTTOM; break; +/*N*/ default: break; /*N*/ } /*N*/ SetValue( eSvx ); /*N*/ @@ -317,7 +317,7 @@ /*N*/ table::CellOrientation eOrient; /*N*/ if(!(rVal >>= eOrient)) /*N*/ { -/*?*/ sal_Int32 nValue; +/*?*/ sal_Int32 nValue = 0; /*?*/ if(!(rVal >>= nValue)) /*?*/ return sal_False; /*?*/ eOrient = (table::CellOrientation)nValue; @@ -329,6 +329,7 @@ /*?*/ case table::CellOrientation_TOPBOTTOM: eSvx = SVX_ORIENTATION_TOPBOTTOM; break; /*?*/ case table::CellOrientation_BOTTOMTOP: eSvx = SVX_ORIENTATION_BOTTOMTOP; break; /*N*/ case table::CellOrientation_STACKED: eSvx = SVX_ORIENTATION_STACKED; break; +/*N*/ default: break; /*N*/ } /*N*/ SetValue( eSvx ); /*N*/ return sal_True; @@ -485,7 +486,7 @@ /*N*/ { /*N*/ sal_Bool bConvert = ( ( nMemberId & CONVERT_TWIPS ) != 0 ); /*N*/ long nMaxVal = bConvert ? TWIP_TO_MM100(SHRT_MAX) : SHRT_MAX; // Members sind sal_Int16 -/*N*/ sal_Int32 nVal; +/*N*/ sal_Int32 nVal = 0; /*N*/ if(!(rVal >>= nVal) || (nVal > nMaxVal)) /*N*/ return sal_False; /*N*/ Index: binfilter/bf_svx/source/items/svx_flditem.cxx =================================================================== RCS file: /cvs/framework/binfilter/bf_svx/source/items/svx_flditem.cxx,v retrieving revision 1.16 diff -u -r1.16 svx_flditem.cxx --- binfilter/bf_svx/source/items/svx_flditem.cxx 10 Apr 2008 14:11:18 -0000 1.16 +++ binfilter/bf_svx/source/items/svx_flditem.cxx 6 May 2008 11:45:46 -0000 @@ -654,7 +654,7 @@ /*N*/ if ( eType == SVXTIMETYPE_FIX ) /*N*/ aTime.SetTime( nFixTime ); /*N*/ -/*N*/ SvxTimeFormat eTmpFormat = eFormat; +/*N*/ SvxTimeFormat eTmpFormat = eFormat; // role ? /*N*/ /*N*/ switch( eTmpFormat ) /*N*/ { @@ -666,9 +666,10 @@ /*N*/ DBG_ERROR( "SVXTIMEFORMAT_APPDEFAULT: not implemented" ); /*N*/ eTmpFormat = SVXTIMEFORMAT_STANDARD; /*N*/ break; +/*N*/ default: break; /*N*/ } /*N*/ -/*N*/ sal_uInt32 nFormatKey; +/*N*/ sal_uInt32 nFormatKey = 0; /*N*/ /*N*/ switch( eTmpFormat ) /*N*/ { @@ -678,10 +679,10 @@ /*N*/ case SVXTIMEFORMAT_12_HMSH: /*N*/ { // no builtin format available, try to insert or reuse /*N*/ String aFormatCode( RTL_CONSTASCII_USTRINGPARAM( "HH:MM:SS.00 AM/PM" ) ); -/*N*/ xub_StrLen nCheckPos; -/*N*/ short nType; -/*N*/ BOOL bInserted = rFormatter.PutandConvertEntry( aFormatCode, -/*N*/ nCheckPos, nType, nFormatKey, LANGUAGE_ENGLISH_US, eLang ); +/*N*/ xub_StrLen nCheckPos = NULL; +/*N*/ //short nType = 0; +/*N*/ //BOOL bInserted = rFormatter.PutandConvertEntry( aFormatCode, +/*N*/ // nCheckPos, nType, nFormatKey, LANGUAGE_ENGLISH_US, eLang ); /*N*/ DBG_ASSERT( nCheckPos == 0, "SVXTIMEFORMAT_12_HMSH: could not insert format code" ); /*N*/ if ( nCheckPos ) /*N*/ nFormatKey = rFormatter.GetFormatIndex( NF_TIME_HH_MMSS00, eLang ); Index: binfilter/bf_svx/source/items/svx_frmitems.cxx =================================================================== RCS file: /cvs/framework/binfilter/bf_svx/source/items/svx_frmitems.cxx,v retrieving revision 1.20 diff -u -r1.20 svx_frmitems.cxx --- binfilter/bf_svx/source/items/svx_frmitems.cxx 10 Apr 2008 14:11:44 -0000 1.20 +++ binfilter/bf_svx/source/items/svx_frmitems.cxx 6 May 2008 11:45:47 -0000 @@ -323,7 +323,7 @@ /*N*/ break; /*N*/ case MID_SIZE_WIDTH: /*N*/ { -/*N*/ sal_Int32 nVal; +/*N*/ sal_Int32 nVal = 0; /*N*/ if(!(rVal >>= nVal )) /*N*/ return sal_False; /*N*/ @@ -332,7 +332,7 @@ /*N*/ break; /*N*/ case MID_SIZE_HEIGHT: /*N*/ { -/*N*/ sal_Int32 nVal; +/*N*/ sal_Int32 nVal = 0; /*N*/ if(!(rVal >>= nVal)) /*N*/ return sal_True; /*N*/ @@ -398,12 +398,15 @@ /*N*/ /*N*/ SfxPoolItem( nId ), /*N*/ -/*N*/ nFirstLineOfst ( 0 ), nPropFirstLineOfst( 100 ), +/*N*/ nFirstLineOfst ( 0 ), /*N*/ nTxtLeft ( 0 ), -/*N*/ nLeftMargin ( 0 ), nPropLeftMargin( 100 ), -/*N*/ nRightMargin ( 0 ), nPropRightMargin( 100 ), -/*N*/ bBulletFI ( 0 ), -/*N*/ bAutoFirst ( 0 ) +/*N*/ nLeftMargin ( 0 ), +/*N*/ nRightMargin ( 0 ), +/*N*/ nPropFirstLineOfst( 100 ), +/*N*/ nPropLeftMargin( 100 ), +/*N*/ nPropRightMargin( 100 ), +/*N*/ bAutoFirst ( 0 ), +/*N*/ bBulletFI ( 0 ) /*N*/ { /*N*/ } @@ -415,12 +418,15 @@ /*N*/ /*N*/ SfxPoolItem( nId ), /*N*/ -/*N*/ nFirstLineOfst ( nOfset ), nPropFirstLineOfst( 100 ), +/*N*/ nFirstLineOfst ( nOfset ), /*N*/ nTxtLeft ( nTLeft ), -/*N*/ nLeftMargin ( nLeft ), nPropLeftMargin( 100 ), -/*N*/ nRightMargin ( nRight ), nPropRightMargin( 100 ), -/*N*/ bBulletFI ( 0 ), -/*N*/ bAutoFirst ( 0 ) +/*N*/ nLeftMargin ( nLeft ), +/*N*/ nRightMargin ( nRight ), +/*N*/ nPropFirstLineOfst( 100 ), +/*N*/ nPropLeftMargin( 100 ), +/*N*/ nPropRightMargin( 100 ), +/*N*/ bAutoFirst ( 0 ), +/*N*/ bBulletFI ( 0 ) /*N*/ { /*N*/ } @@ -474,8 +480,7 @@ /*N*/ { /*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); /*N*/ nMemberId &= ~CONVERT_TWIPS; -/*N*/ sal_Int32 nMaxVal = bConvert ? TWIP_TO_MM100(USHRT_MAX) : USHRT_MAX; -/*N*/ sal_Int32 nVal; +/*N*/ sal_Int32 nVal = 0; /*N*/ if( nMemberId != MID_FIRST_AUTO && /*N*/ nMemberId != MID_L_REL_MARGIN && nMemberId != MID_R_REL_MARGIN) /*N*/ if(!(rVal >>= nVal)) @@ -497,7 +502,7 @@ /*N*/ case MID_L_REL_MARGIN: /*N*/ case MID_R_REL_MARGIN: /*N*/ { -/*N*/ sal_Int32 nRel; +/*N*/ sal_Int32 nRel = 0; /*N*/ if((rVal >>= nRel) && nRel >= 0 && nRel < USHRT_MAX) /*N*/ { /*N*/ if(MID_L_REL_MARGIN== nMemberId) @@ -708,8 +713,10 @@ /*N*/ /*N*/ SfxPoolItem( nId ), /*N*/ -/*N*/ nUpper( 0 ), nPropUpper( 100 ), -/*N*/ nLower( 0 ), nPropLower( 100 ) +/*N*/ nUpper( 0 ), +/*N*/ nLower( 0 ), +/*N*/ nPropUpper( 100 ), +/*N*/ nPropLower( 100 ) /*N*/ { /*N*/ } @@ -720,8 +727,10 @@ /*N*/ /*N*/ SfxPoolItem( nId ), /*N*/ -/*N*/ nUpper( nUp ), nPropUpper( 100 ), -/*N*/ nLower( nLow ), nPropLower( 100 ) +/*N*/ nUpper( nUp ), +/*N*/ nLower( nLow ), +/*N*/ nPropUpper( 100 ), +/*N*/ nPropLower( 100 ) /*N*/ { /*N*/ } @@ -733,8 +742,8 @@ /*N*/ switch( nMemberId ) /*N*/ { /*N*/ // jetzt alles signed -/*N*/ case MID_UP_MARGIN: rVal <<= (sal_Int32)(bConvert ? TWIP_TO_MM100(nUpper) : nUpper); break; -/*N*/ case MID_LO_MARGIN: rVal <<= (sal_Int32)(bConvert ? TWIP_TO_MM100(nLower) : nLower); break; +/*N*/ case MID_UP_MARGIN: rVal <<= (sal_Int32)(bConvert ? TWIP_TO_MM100((sal_Int16)nUpper) : nUpper); break; +/*N*/ case MID_LO_MARGIN: rVal <<= (sal_Int32)(bConvert ? TWIP_TO_MM100((sal_Int16)nLower) : nLower); break; /*N*/ case MID_UP_REL_MARGIN: rVal <<= (sal_Int16) nPropUpper; break; /*N*/ case MID_LO_REL_MARGIN: rVal <<= (sal_Int16) nPropLower; break; /*N*/ } @@ -746,7 +755,7 @@ /*N*/ { /*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); /*N*/ nMemberId &= ~CONVERT_TWIPS; -/*N*/ sal_Int32 nVal; +/*N*/ sal_Int32 nVal = 0; /*N*/ switch( nMemberId ) /*N*/ { /*N*/ case MID_UP_MARGIN : @@ -762,7 +771,7 @@ /*N*/ case MID_UP_REL_MARGIN: /*N*/ case MID_LO_REL_MARGIN: /*N*/ { -/*N*/ sal_Int32 nRel; +/*N*/ sal_Int32 nRel = 0; /*?*/ if((rVal >>= nRel) && nRel > 1 ) /*?*/ { /*?*/ if(MID_UP_REL_MARGIN == nMemberId) @@ -915,7 +924,6 @@ --------------------------------------------------*/ /*N*/ sal_Bool SvxProtectItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const /*N*/ { -/*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); /*N*/ nMemberId &= ~CONVERT_TWIPS; /*N*/ sal_Bool bValue; /*N*/ switch(nMemberId) @@ -936,7 +944,7 @@ --------------------------------------------------*/ /*N*/ sal_Bool SvxProtectItem::PutValue( const uno::Any& rVal, BYTE nMemberId ) /*N*/ { -/*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); +/*N*/ sal_Bool toReturn = sal_True; /*N*/ nMemberId &= ~CONVERT_TWIPS; /*N*/ sal_Bool bVal( Any2Bool(rVal) ); /*N*/ switch(nMemberId) @@ -946,9 +954,9 @@ /*N*/ case MID_PROTECT_POSITION: bPos = bVal; break; /*N*/ default: /*N*/ DBG_ERROR("falsche MemberId"); -/*N*/ return sal_False; +/*N*/ toReturn = sal_False; /*N*/ } -/*N*/ return sal_True; +/*N*/ return toReturn; /*N*/ } // ----------------------------------------------------------------------- @@ -1011,9 +1019,10 @@ /*N*/ case SVX_SHADOW_TOPRIGHT : eSet = table::ShadowLocation_TOP_RIGHT ; break; /*N*/ case SVX_SHADOW_BOTTOMLEFT : eSet = table::ShadowLocation_BOTTOM_LEFT ; break; /*N*/ case SVX_SHADOW_BOTTOMRIGHT: eSet = table::ShadowLocation_BOTTOM_RIGHT; break; +/*N*/ default: break; /*N*/ } /*N*/ aShadow.Location = eSet; -/*N*/ aShadow.ShadowWidth = bConvert ? TWIP_TO_MM100(nWidth) : nWidth; +/*N*/ aShadow.ShadowWidth = bConvert ? TWIP_TO_MM100((sal_Int16)nWidth) : nWidth; /*N*/ aShadow.IsTransparent = aShadowColor.GetTransparency() > 0; /*N*/ aShadow.Color = aShadowColor.GetRGBColor(); /*N*/ @@ -1045,7 +1054,7 @@ /*?*/ bRet = (rVal >>= aShadow.Location); /*?*/ if ( !bRet ) /*?*/ { -/*?*/ sal_Int16 nVal; +/*?*/ sal_Int16 nVal = 0; /*?*/ bRet = (rVal >>= nVal); /*?*/ aShadow.Location = (table::ShadowLocation) nVal; /*?*/ } @@ -1062,13 +1071,13 @@ /*N*/ /*N*/ if ( bRet ) /*N*/ { -/*N*/ SvxShadowLocation eSet = SVX_SHADOW_NONE; /*N*/ switch( aShadow.Location ) /*N*/ { /*N*/ case table::ShadowLocation_TOP_LEFT : eLocation = SVX_SHADOW_TOPLEFT; break; /*N*/ case table::ShadowLocation_TOP_RIGHT : eLocation = SVX_SHADOW_TOPRIGHT; break; /*N*/ case table::ShadowLocation_BOTTOM_LEFT : eLocation = SVX_SHADOW_BOTTOMLEFT ; break; /*N*/ case table::ShadowLocation_BOTTOM_RIGHT: eLocation = SVX_SHADOW_BOTTOMRIGHT; break; +/*N*/ default: eLocation = SVX_SHADOW_NONE; break; /*N*/ } /*N*/ /*N*/ nWidth = bConvert ? MM100_TO_TWIP(aShadow.ShadowWidth) : aShadow.ShadowWidth; @@ -1301,9 +1310,9 @@ /*N*/ if(pLine) /*N*/ { /*N*/ aLine.Color = pLine->GetColor().GetColor() ; -/*N*/ aLine.InnerLineWidth = bConvert ? TWIP_TO_MM100(pLine->GetInWidth() ): pLine->GetInWidth() ; -/*N*/ aLine.OuterLineWidth = bConvert ? TWIP_TO_MM100(pLine->GetOutWidth()): pLine->GetOutWidth() ; -/*N*/ aLine.LineDistance = bConvert ? TWIP_TO_MM100(pLine->GetDistance()): pLine->GetDistance() ; +/*N*/ aLine.InnerLineWidth = bConvert ? TWIP_TO_MM100((sal_Int16)pLine->GetInWidth() ): pLine->GetInWidth() ; +/*N*/ aLine.OuterLineWidth = bConvert ? TWIP_TO_MM100((sal_Int16)pLine->GetOutWidth()): pLine->GetOutWidth() ; +/*N*/ aLine.LineDistance = bConvert ? TWIP_TO_MM100((sal_Int16)pLine->GetDistance()): pLine->GetDistance() ; /*N*/ } /*N*/ else /*N*/ aLine.Color = aLine.InnerLineWidth = aLine.OuterLineWidth = aLine.LineDistance = 0; @@ -1363,7 +1372,7 @@ /*N*/ } /*N*/ /*N*/ if( bDistMember ) -/*N*/ rVal <<= (sal_Int32)(bConvert ? TWIP_TO_MM100(nDist) : nDist); +/*N*/ rVal <<= (bConvert ? TWIP_TO_MM100((sal_Int16) nDist) : nDist); /*N*/ else /*N*/ { /* @@ -1433,7 +1442,7 @@ /*N*/ /*N*/ if( bDistMember || nMemberId == BORDER_DISTANCE ) /*N*/ { -/*N*/ sal_Int32 nDist; +/*N*/ sal_Int32 nDist = 0; /*N*/ if(!(rVal >>= nDist)) /*N*/ return sal_False; /*N*/ @@ -1472,7 +1481,7 @@ /*?*/ aNew >>= aSeq; /*?*/ if ( aSeq.getLength() == 4 ) /*?*/ { -/*?*/ sal_Int32 nVal; +/*?*/ sal_Int32 nVal = 0; /*?*/ if ( aSeq[0] >>= nVal ) /*?*/ aBorderLine.Color = nVal; /*?*/ if ( aSeq[1] >>= nVal ) @@ -1931,6 +1940,7 @@ /*N*/ case SVX_BREAK_PAGE_BEFORE: eBreak = style::BreakType_PAGE_BEFORE ; break; /*N*/ case SVX_BREAK_PAGE_AFTER: eBreak = style::BreakType_PAGE_AFTER ; break; /*N*/ case SVX_BREAK_PAGE_BOTH: eBreak = style::BreakType_PAGE_BOTH ; break; +/*N*/ default: break; /*N*/ } /*N*/ rVal <<= eBreak; /*N*/ return sal_True; @@ -1942,7 +1952,7 @@ /*N*/ /*N*/ if(!(rVal >>= nBreak)) /*N*/ { -/*N*/ sal_Int32 nValue; +/*N*/ sal_Int32 nValue = 0; /*?*/ if(!(rVal >>= nValue)) /*?*/ return sal_False; /*?*/ @@ -1958,6 +1968,7 @@ /*N*/ case style::BreakType_PAGE_BEFORE: eBreak = SVX_BREAK_PAGE_BEFORE; break; /*?*/ case style::BreakType_PAGE_AFTER: eBreak = SVX_BREAK_PAGE_AFTER; break; /*?*/ case style::BreakType_PAGE_BOTH: eBreak = SVX_BREAK_PAGE_BOTH; break; +/*N*/ default: break; /*N*/ } /*N*/ SetValue((sal_uInt16) eBreak); /*N*/ @@ -2380,7 +2391,6 @@ /*N*/ sal_Bool SvxBrushItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const /*N*/ { -/*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); /*N*/ nMemberId &= ~CONVERT_TWIPS; /*N*/ switch( nMemberId) /*N*/ { @@ -2442,14 +2452,13 @@ /*N*/ sal_Bool SvxBrushItem::PutValue( const uno::Any& rVal, BYTE nMemberId ) /*N*/ { -/*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); /*N*/ nMemberId &= ~CONVERT_TWIPS; /*N*/ switch( nMemberId) /*N*/ { /*N*/ case MID_BACK_COLOR: /*N*/ case MID_BACK_COLOR_R_G_B: /*N*/ { -/*N*/ sal_Int32 nCol; +/*N*/ sal_Int32 nCol = 0; /*N*/ if ( !( rVal >>= nCol ) ) /*N*/ return sal_False; /*N*/ if(MID_BACK_COLOR_R_G_B == nMemberId) @@ -2462,7 +2471,7 @@ /*N*/ break; /*N*/ case MID_BACK_COLOR_TRANSPARENCY: /*N*/ { -/*N*/ sal_Int32 nTrans; +/*N*/ sal_Int32 nTrans = 0; /*N*/ if ( !( rVal >>= nTrans ) || nTrans < 0 || nTrans > 100 ) /*N*/ return sal_False; /*N*/ aColor.SetTransparency(lcl_PercentToTransparency(nTrans)); @@ -2474,7 +2483,7 @@ /*N*/ style::GraphicLocation eLocation; /*N*/ if ( !( rVal>>=eLocation ) ) /*N*/ { -/*N*/ sal_Int32 nValue; +/*N*/ sal_Int32 nValue = 0; /*?*/ if ( !( rVal >>= nValue ) ) /*?*/ return sal_False; /*?*/ eLocation = (style::GraphicLocation)nValue; @@ -2539,7 +2548,7 @@ /*N*/ break; /*N*/ case MID_GRAPHIC_TRANSPARENCY : /*N*/ { -/*N*/ sal_Int32 nTmp; +/*N*/ sal_Int32 nTmp = 0; /*N*/ rVal >>= nTmp; /*N*/ if(nTmp >= 0 && nTmp <= 100) /*N*/ { @@ -2873,7 +2882,7 @@ /*N*/ sal_Bool SvxFrameDirectionItem::PutValue( const ::com::sun::star::uno::Any& rVal, /*N*/ BYTE ) /*N*/ { -/*N*/ sal_Int16 nVal; +/*N*/ sal_Int16 nVal = 0; /*N*/ sal_Bool bRet = ( rVal >>= nVal ); /*N*/ if( bRet ) /*N*/ { Index: binfilter/bf_svx/source/items/svx_numitem.cxx =================================================================== RCS file: /cvs/framework/binfilter/bf_svx/source/items/svx_numitem.cxx,v retrieving revision 1.7 diff -u -r1.7 svx_numitem.cxx --- binfilter/bf_svx/source/items/svx_numitem.cxx 10 Apr 2008 14:12:32 -0000 1.7 +++ binfilter/bf_svx/source/items/svx_numitem.cxx 6 May 2008 11:45:47 -0000 @@ -198,14 +198,14 @@ /*N*/ nInclUpperLevels(0), /*N*/ nStart(1), /*N*/ cBullet(SVX_DEF_BULLET), +/*N*/ nBulletRelSize(100), +/*N*/ nBulletColor(COL_BLACK), /*N*/ nFirstLineOffset(0), /*N*/ nAbsLSpace(0), /*N*/ nLSpace(0), /*N*/ nCharTextDistance(0), /*N*/ pGraphicBrush(0), /*N*/ eVertOrient(SVX_VERT_NONE), -/*N*/ nBulletRelSize(100), -/*N*/ nBulletColor(COL_BLACK), /*N*/ pBulletFont(0) /*N*/ { /*N*/ } @@ -600,8 +600,8 @@ /*N*/ SvxNumRule::SvxNumRule(ULONG nFeatures, USHORT nLevels, BOOL bCont, SvxNumRuleType eType) : /*N*/ nLevelCount(nLevels), /*N*/ nFeatureFlags(nFeatures), -/*N*/ bContinuousNumbering(bCont), -/*N*/ eNumberingType(eType) +/*N*/ eNumberingType(eType), +/*N*/ bContinuousNumbering(bCont) /*N*/ { /*N*/ ++nRefCount; /*N*/ LanguageType eLang = Application::GetSettings().GetLanguage(); Index: binfilter/bf_svx/source/items/svx_pageitem.cxx =================================================================== RCS file: /cvs/framework/binfilter/bf_svx/source/items/svx_pageitem.cxx,v retrieving revision 1.8 diff -u -r1.8 svx_pageitem.cxx --- binfilter/bf_svx/source/items/svx_pageitem.cxx 10 Apr 2008 14:12:47 -0000 1.8 +++ binfilter/bf_svx/source/items/svx_pageitem.cxx 6 May 2008 11:45:47 -0000 @@ -130,7 +130,6 @@ //------------------------------------------------------------------------ /*N*/ sal_Bool SvxPageItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const /*N*/ { -/*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); /*N*/ nMemberId &= ~CONVERT_TWIPS; /*N*/ switch( nMemberId ) /*N*/ { @@ -171,7 +170,7 @@ /*N*/ { /*N*/ case MID_PAGE_NUMTYPE: /*N*/ { -/*N*/ sal_Int32 nValue; +/*N*/ sal_Int32 nValue = 0; /*N*/ if(!(rVal >>= nValue)) /*N*/ return sal_False; /*N*/ @@ -186,7 +185,7 @@ /*N*/ style::PageStyleLayout eLayout; /*N*/ if(!(rVal >>= eLayout)) /*N*/ { -/*N*/ sal_Int32 nValue; +/*N*/ sal_Int32 nValue = 0; /*?*/ if(!(rVal >>= nValue)) /*?*/ return sal_False; /*?*/ eLayout = (style::PageStyleLayout)nValue; @@ -198,6 +197,7 @@ /*N*/ case style::PageStyleLayout_RIGHT : eUse |= SVX_PAGE_RIGHT; break; /*?*/ case style::PageStyleLayout_ALL : eUse |= SVX_PAGE_ALL ; break; /*N*/ case style::PageStyleLayout_MIRRORED: eUse |= SVX_PAGE_MIRROR;break; +/*N*/ default: break; /*N*/ } /*N*/ } /*N*/ break; Index: binfilter/bf_svx/source/items/svx_paraitem.cxx =================================================================== RCS file: /cvs/framework/binfilter/bf_svx/source/items/svx_paraitem.cxx,v retrieving revision 1.10 diff -u -r1.10 svx_paraitem.cxx --- binfilter/bf_svx/source/items/svx_paraitem.cxx 10 Apr 2008 14:13:24 -0000 1.10 +++ binfilter/bf_svx/source/items/svx_paraitem.cxx 6 May 2008 11:45:47 -0000 @@ -214,8 +214,10 @@ /*N*/ case SVX_LINE_SPACE_FIX : /*N*/ case SVX_LINE_SPACE_MIN : /*N*/ aLSp.Mode = eLineSpace == SVX_LINE_SPACE_FIX ? style::LineSpacingMode::FIX : style::LineSpacingMode::MINIMUM; -/*N*/ aLSp.Height = ( bConvert ? (short)TWIP_TO_MM100(nLineHeight) : nLineHeight ); +/*N*/ aLSp.Height = ( bConvert ? (short)TWIP_TO_MM100((sal_Int16)nLineHeight) : nLineHeight ); /*N*/ break; +/*N*/ default: +/*N*/ break; /*N*/ } /*N*/ /*N*/ switch ( nMemberId ) @@ -279,7 +281,7 @@ /*N*/ eLineSpace = aLSp.Mode == style::LineSpacingMode::FIX ? SVX_LINE_SPACE_FIX : SVX_LINE_SPACE_MIN; /*N*/ nLineHeight = aLSp.Height; /*N*/ if(bConvert) -/*N*/ nLineHeight = (USHORT)MM100_TO_TWIP(nLineHeight); +/*N*/ nLineHeight = (USHORT)MM100_TO_TWIP((sal_Int16)nLineHeight); /*N*/ } /*N*/ break; /*N*/ } @@ -389,7 +391,6 @@ --------------------------------------------------*/ /*N*/ sal_Bool SvxAdjustItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const /*N*/ { -/*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); /*N*/ nMemberId &= ~CONVERT_TWIPS; /*N*/ switch( nMemberId ) /*N*/ { @@ -410,7 +411,6 @@ /*N*/ sal_Bool SvxAdjustItem::PutValue( const uno::Any& rVal, BYTE nMemberId ) /*N*/ { -/*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); /*N*/ nMemberId &= ~CONVERT_TWIPS; /*N*/ switch( nMemberId ) /*N*/ { @@ -594,7 +594,6 @@ // ----------------------------------------------------------------------- /*N*/ sal_Bool SvxHyphenZoneItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const /*N*/ { -/*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); /*N*/ nMemberId &= ~CONVERT_TWIPS; /*N*/ switch(nMemberId) /*N*/ { @@ -616,7 +615,6 @@ // ----------------------------------------------------------------------- /*N*/ sal_Bool SvxHyphenZoneItem::PutValue( const uno::Any& rVal, BYTE nMemberId ) /*N*/ { -/*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); /*N*/ nMemberId &= ~CONVERT_TWIPS; /*N*/ sal_Int16 nNewVal = 0; /*N*/ @@ -864,7 +862,7 @@ /*?*/ if (!(rAnySeq[0] >>= aSeq[n].Position)) return sal_False; /*?*/ if (!(rAnySeq[1] >>= aSeq[n].Alignment)) /*?*/ { -/*?*/ sal_Int32 nVal; +/*?*/ sal_Int32 nVal = 0; /*?*/ if (rAnySeq[1] >>= nVal) /*?*/ aSeq[n].Alignment = (::com::sun::star::style::TabAlign) nVal; /*?*/ else @@ -904,6 +902,7 @@ /*N*/ case style::TabAlign_CENTER : eAdjust = SVX_TAB_ADJUST_CENTER; break; /*N*/ case style::TabAlign_RIGHT : eAdjust = SVX_TAB_ADJUST_RIGHT; break; /*N*/ case style::TabAlign_DECIMAL: eAdjust = SVX_TAB_ADJUST_DECIMAL; break; +/*N*/ default: break; /*N*/ } /*N*/ sal_Unicode cFill = pArr[i].FillChar; /*N*/ sal_Unicode cDecimal = pArr[i].DecimalChar; @@ -917,7 +916,7 @@ /*N*/ } /*N*/ case MID_STD_TAB: /*N*/ { -/*N*/ sal_Int32 nNewPos; +/*N*/ sal_Int32 nNewPos = 0; /*N*/ if (!(rVal >>= nNewPos) ) /*N*/ return sal_False; /*N*/ const SvxTabStop& rTab = *(GetStart()); @@ -995,8 +994,9 @@ /*N*/ && binfilter::IsDefaultItem( this ); /*N*/ /*N*/ const short nTabs = Count(); -/*N*/ sal_uInt16 nCount = 0, nDefDist; -/*N*/ long nNew; +/*N*/ sal_uInt16 nCount = 0; +/*N*/ sal_uInt16 nDefDist = 0; +/*N*/ long nNew = 0; /*N*/ /*N*/ if( bStoreDefTabs ) /*N*/ { @@ -1252,6 +1252,7 @@ /*?*/ return ePres; /*?*/ } /*?*/ break; +/*?*/ default: break; /*?*/ } /*?*/ return SFX_ITEM_PRESENTATION_NONE; /*N*/ } Index: binfilter/bf_svx/source/items/svx_rotmodit.cxx =================================================================== RCS file: /cvs/framework/binfilter/bf_svx/source/items/svx_rotmodit.cxx,v retrieving revision 1.7 diff -u -r1.7 svx_rotmodit.cxx --- binfilter/bf_svx/source/items/svx_rotmodit.cxx 10 Apr 2008 14:13:54 -0000 1.7 +++ binfilter/bf_svx/source/items/svx_rotmodit.cxx 6 May 2008 11:45:47 -0000 @@ -113,7 +113,7 @@ /*N*/ table::CellVertJustify eUno; /*N*/ if(!(rVal >>= eUno)) /*N*/ { -/*N*/ sal_Int32 nValue; +/*N*/ sal_Int32 nValue = 0; /*?*/ if(!(rVal >>= nValue)) /*?*/ return sal_False; /*?*/ eUno = (table::CellVertJustify)nValue; @@ -126,6 +126,7 @@ /*?*/ case table::CellVertJustify_TOP: eSvx = SVX_ROTATE_MODE_TOP; break; /*?*/ case table::CellVertJustify_CENTER: eSvx = SVX_ROTATE_MODE_CENTER; break; /*N*/ case table::CellVertJustify_BOTTOM: eSvx = SVX_ROTATE_MODE_BOTTOM; break; +/*N*/ default: break; /*N*/ } /*N*/ SetValue( eSvx ); /*N*/ return sal_True; Index: binfilter/bf_svx/source/items/svx_textitem.cxx =================================================================== RCS file: /cvs/framework/binfilter/bf_svx/source/items/svx_textitem.cxx,v retrieving revision 1.14 diff -u -r1.14 svx_textitem.cxx --- binfilter/bf_svx/source/items/svx_textitem.cxx 10 Apr 2008 14:15:38 -0000 1.14 +++ binfilter/bf_svx/source/items/svx_textitem.cxx 6 May 2008 11:45:48 -0000 @@ -260,7 +260,6 @@ /*N*/ sal_Bool SvxFontItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const /*N*/ { -/*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); /*N*/ nMemberId &= ~CONVERT_TWIPS; /*N*/ switch(nMemberId) /*N*/ { @@ -279,7 +278,6 @@ // ----------------------------------------------------------------------- /*N*/ sal_Bool SvxFontItem::PutValue( const uno::Any& rVal, BYTE nMemberId) /*N*/ { -/*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); /*N*/ nMemberId &= ~CONVERT_TWIPS; /*N*/ switch(nMemberId) /*N*/ { @@ -301,7 +299,7 @@ /*N*/ break; /*N*/ case MID_FONT_FAMILY : /*N*/ { -/*N*/ sal_Int16 nFamily; +/*N*/ sal_Int16 nFamily = 0; /*N*/ if(!(rVal >>= nFamily)) /*N*/ return sal_False; /*N*/ eFamily = (FontFamily)nFamily; @@ -309,7 +307,7 @@ /*N*/ break; /*N*/ case MID_FONT_CHAR_SET : /*N*/ { -/*N*/ sal_Int16 nSet; +/*N*/ sal_Int16 nSet = 0; /*N*/ if(!(rVal >>= nSet)) /*N*/ return sal_False; /*N*/ eTextEncoding = (rtl_TextEncoding)nSet; @@ -317,7 +315,7 @@ /*N*/ break; /*N*/ case MID_FONT_PITCH : /*N*/ { -/*N*/ sal_Int16 nPitch; +/*N*/ sal_Int16 nPitch = 0; /*N*/ if(!(rVal >>= nPitch)) /*N*/ return sal_False; /*N*/ ePitch = (FontPitch)nPitch; @@ -485,7 +483,6 @@ --------------------------------------------------*/ /*N*/ sal_Bool SvxPostureItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const /*N*/ { -/*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); /*N*/ nMemberId &= ~CONVERT_TWIPS; /*N*/ switch( nMemberId ) /*N*/ { @@ -503,7 +500,6 @@ --------------------------------------------------*/ /*N*/ sal_Bool SvxPostureItem::PutValue( const uno::Any& rVal, BYTE nMemberId ) /*N*/ { -/*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); /*N*/ nMemberId &= ~CONVERT_TWIPS; /*N*/ switch( nMemberId ) /*N*/ { @@ -515,7 +511,7 @@ /*?*/ awt::FontSlant eSlant; /*?*/ if(!(rVal >>= eSlant)) /*?*/ { -/*?*/ sal_Int32 nValue; +/*?*/ sal_Int32 nValue = 0; /*?*/ if(!(rVal >>= nValue)) /*?*/ return sal_False; /*?*/ @@ -611,7 +607,6 @@ --------------------------------------------------*/ /*N*/ sal_Bool SvxWeightItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const /*N*/ { -/*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); /*N*/ nMemberId &= ~CONVERT_TWIPS; /*N*/ switch( nMemberId ) /*N*/ { @@ -631,7 +626,6 @@ --------------------------------------------------*/ /*N*/ sal_Bool SvxWeightItem::PutValue( const uno::Any& rVal, BYTE nMemberId ) /*N*/ { -/*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); /*N*/ nMemberId &= ~CONVERT_TWIPS; /*N*/ switch( nMemberId ) /*N*/ { @@ -640,10 +634,10 @@ /*N*/ break; /*N*/ case MID_WEIGHT: /*N*/ { -/*N*/ double fValue; +/*N*/ double fValue = 0; /*N*/ if(!(rVal >>= fValue)) /*N*/ { -/*?*/ sal_Int32 nValue; +/*?*/ sal_Int32 nValue = 0; /*?*/ if(!(rVal >>= nValue)) /*?*/ return sal_False; /*?*/ fValue = (float)nValue; @@ -779,6 +773,8 @@ /*?*/ case SFX_MAPUNIT_TWIP: /*?*/ fRet /= 20.; /*N*/ break; +/*N*/ default: +/*N*/ break; /*N*/ } /*N*/ rVal <<= fRet; /*N*/ } @@ -815,6 +811,8 @@ /*?*/ // hier doch sicher TWIP /*?*/ nDiff = ((short)nProp); /*N*/ break; +/*N*/ default: +/*N*/ break; /*N*/ } /*N*/ nRet -= nDiff; /*N*/ @@ -834,10 +832,10 @@ /*N*/ { /*N*/ ePropUnit = SFX_MAPUNIT_RELATIVE; /*N*/ nProp = 100; -/*N*/ double fPoint; +/*N*/ double fPoint = 0; /*N*/ if(!(rVal >>= fPoint)) /*N*/ { -/*N*/ sal_Int32 nValue; +/*N*/ sal_Int32 nValue = 0; /*?*/ if(!(rVal >>= nValue)) /*?*/ return sal_False; /*?*/ fPoint = (float)nValue; @@ -852,7 +850,7 @@ /*N*/ break; /*N*/ case MID_FONTHEIGHT_PROP: /*N*/ { -/*N*/ sal_Int16 nNew; +/*N*/ sal_Int16 nNew = 0; /*N*/ if(!(rVal >>= nNew)) /*N*/ return sal_True; /*N*/ @@ -867,10 +865,10 @@ /*N*/ case MID_FONTHEIGHT_DIFF: /*N*/ { /*?*/ nHeight = lcl_GetRealHeight_Impl(nHeight, nProp, ePropUnit, bConvert); -/*?*/ float fValue; +/*?*/ float fValue = 0; /*?*/ if(!(rVal >>= fValue)) /*?*/ { -/*?*/ sal_Int32 nValue; +/*?*/ sal_Int32 nValue = 0; /*?*/ if(!(rVal >>= nValue)) /*?*/ return sal_False; /*?*/ fValue = (float)nValue; @@ -1029,7 +1027,6 @@ --------------------------------------------------*/ /*N*/ sal_Bool SvxUnderlineItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const /*N*/ { -/*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); /*N*/ nMemberId &= ~CONVERT_TWIPS; /*N*/ switch(nMemberId) /*N*/ { @@ -1054,7 +1051,6 @@ --------------------------------------------------*/ /*N*/ sal_Bool SvxUnderlineItem::PutValue( const uno::Any& rVal, BYTE nMemberId ) /*N*/ { -/*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); /*N*/ nMemberId &= ~CONVERT_TWIPS; /*N*/ sal_Bool bRet = sal_True; /*N*/ switch(nMemberId) @@ -1064,7 +1060,7 @@ /*N*/ break; /*N*/ case MID_UNDERLINE: /*N*/ { -/*N*/ sal_Int32 nValue; +/*N*/ sal_Int32 nValue = 0; /*N*/ if(!(rVal >>= nValue)) /*N*/ bRet = sal_False; /*N*/ else @@ -1073,7 +1069,7 @@ /*N*/ break; /*N*/ case MID_UL_COLOR: /*N*/ { -/*?*/ sal_Int32 nCol; +/*?*/ sal_Int32 nCol = 0; /*?*/ if( !( rVal >>= nCol ) ) /*?*/ bRet = sal_False; /*?*/ else @@ -1158,7 +1154,6 @@ --------------------------------------------------*/ /*N*/ sal_Bool SvxCrossedOutItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const /*N*/ { -/*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); /*N*/ nMemberId &= ~CONVERT_TWIPS; /*N*/ switch(nMemberId) /*N*/ { @@ -1176,7 +1171,6 @@ --------------------------------------------------*/ /*N*/ sal_Bool SvxCrossedOutItem::PutValue( const uno::Any& rVal, BYTE nMemberId ) /*N*/ { -/*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); /*N*/ nMemberId &= ~CONVERT_TWIPS; /*N*/ switch(nMemberId) /*N*/ { @@ -1185,7 +1179,7 @@ /*N*/ break; /*N*/ case MID_CROSS_OUT: /*N*/ { -/*N*/ sal_Int32 nValue; +/*N*/ sal_Int32 nValue = 0; /*N*/ if(!(rVal >>= nValue)) /*N*/ return sal_False; /*N*/ SetValue((sal_Int16)nValue); @@ -1431,7 +1425,7 @@ /*N*/ sal_Bool SvxColorItem::PutValue( const uno::Any& rVal, BYTE nMemberId ) /*N*/ { -/*N*/ sal_Int32 nColor; +/*N*/ sal_Int32 nColor = 0; /*N*/ if(!(rVal >>= nColor)) /*N*/ return sal_False; /*N*/ @@ -1580,7 +1574,7 @@ // ----------------------------------------------------------------------- /*N*/ sal_Bool SvxKerningItem::PutValue( const uno::Any& rVal, BYTE nMemberId) /*N*/ { -/*N*/ sal_Int16 nVal; +/*N*/ sal_Int16 nVal = 0; /*N*/ if(!(rVal >>= nVal)) /*N*/ return sal_False; /*N*/ if(nMemberId & CONVERT_TWIPS) @@ -1655,7 +1649,7 @@ --------------------------------------------------*/ /*N*/ sal_Bool SvxCaseMapItem::PutValue( const uno::Any& rVal, BYTE nMemberId ) /*N*/ { -/*N*/ sal_uInt16 nVal; +/*N*/ sal_uInt16 nVal = 0; /*N*/ if(!(rVal >>= nVal)) /*N*/ return sal_False; /*N*/ @@ -1771,7 +1765,6 @@ --------------------------------------------------*/ /*N*/ sal_Bool SvxEscapementItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const /*N*/ { -/*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); /*N*/ nMemberId &= ~CONVERT_TWIPS; /*N*/ switch(nMemberId) /*N*/ { @@ -1792,13 +1785,12 @@ --------------------------------------------------*/ /*N*/ sal_Bool SvxEscapementItem::PutValue( const uno::Any& rVal, BYTE nMemberId ) /*N*/ { -/*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); /*N*/ nMemberId &= ~CONVERT_TWIPS; /*N*/ switch(nMemberId) /*N*/ { /*N*/ case MID_ESC: /*N*/ { -/*N*/ sal_Int16 nVal; +/*N*/ sal_Int16 nVal = 0; /*N*/ if( (rVal >>= nVal) && (Abs(nVal) <= 101)) /*N*/ nEsc = nVal; /*N*/ else @@ -1807,7 +1799,7 @@ /*N*/ break; /*N*/ case MID_ESC_HEIGHT: /*N*/ { -/*N*/ sal_Int8 nVal; +/*N*/ sal_Int8 nVal = 0; /*N*/ if( (rVal >>= nVal) && (nVal <= 100)) /*N*/ nProp = nVal; /*N*/ else @@ -1881,7 +1873,6 @@ --------------------------------------------------*/ /*N*/ sal_Bool SvxLanguageItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const /*N*/ { -/*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); /*N*/ nMemberId &= ~CONVERT_TWIPS; /*N*/ switch(nMemberId) /*N*/ { @@ -1900,13 +1891,12 @@ --------------------------------------------------*/ /*N*/ sal_Bool SvxLanguageItem::PutValue( const uno::Any& rVal, BYTE nMemberId ) /*N*/ { -/*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); /*N*/ nMemberId &= ~CONVERT_TWIPS; /*N*/ switch(nMemberId) /*N*/ { /*N*/ case MID_LANG_INT: // for basic conversions! /*N*/ { -/*?*/ sal_Int32 nValue; +/*?*/ sal_Int32 nValue = 0; /*?*/ if(!(rVal >>= nValue)) /*?*/ return sal_False; /*?*/ @@ -2066,7 +2056,6 @@ /*N*/ sal_Bool SvxEmphasisMarkItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const /*N*/ { -/*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); /*N*/ nMemberId &= ~CONVERT_TWIPS; /*N*/ switch( nMemberId ) /*N*/ { @@ -2093,7 +2082,6 @@ /*N*/ sal_Bool SvxEmphasisMarkItem::PutValue( const uno::Any& rVal, BYTE nMemberId ) /*N*/ { -/*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); /*N*/ nMemberId &= ~CONVERT_TWIPS; /*N*/ sal_Bool bRet = sal_True; /*N*/ switch( nMemberId ) @@ -2140,14 +2128,15 @@ /*N*/ SvxTwoLinesItem::SvxTwoLinesItem( sal_Bool bFlag, sal_Unicode nStartBracket, /*N*/ sal_Unicode nEndBracket, sal_uInt16 nW ) /*N*/ : SfxPoolItem( nW ), -/*N*/ bOn( bFlag ), cStartBracket( nStartBracket ), cEndBracket( nEndBracket ) +/*N*/ cStartBracket( nStartBracket ), cEndBracket( nEndBracket ), bOn( bFlag ) /*N*/ { /*N*/ } /*NBFF*/ SvxTwoLinesItem::SvxTwoLinesItem( const SvxTwoLinesItem& rAttr ) /*NBFF*/ : SfxPoolItem( rAttr.Which() ), -/*NBFF*/ bOn( rAttr.bOn ), cStartBracket( rAttr.cStartBracket ), -/*NBFF*/ cEndBracket( rAttr.cEndBracket ) +/*NBFF*/ cStartBracket( rAttr.cStartBracket ), +/*NBFF*/ cEndBracket( rAttr.cEndBracket ), +/*NBFF*/ bOn( rAttr.bOn ) /*NBFF*/ { /*NBFF*/ } @@ -2171,7 +2160,6 @@ /*NBFF*/ sal_Bool SvxTwoLinesItem::QueryValue( ::com::sun::star::uno::Any& rVal, /*NBFF*/ BYTE nMemberId ) const /*NBFF*/ { -/*NBFF*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); /*NBFF*/ nMemberId &= ~CONVERT_TWIPS; /*NBFF*/ sal_Bool bRet = sal_True; /*NBFF*/ switch( nMemberId ) @@ -2205,7 +2193,6 @@ /*NBFF*/ sal_Bool SvxTwoLinesItem::PutValue( const ::com::sun::star::uno::Any& rVal, /*NBFF*/ BYTE nMemberId ) /*NBFF*/ { -/*NBFF*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); /*NBFF*/ nMemberId &= ~CONVERT_TWIPS; /*NBFF*/ sal_Bool bRet = sal_False; /*NBFF*/ OUString s; @@ -2258,6 +2245,8 @@ /*NBFF*/ return ePres; /*NBFF*/ } /*NBFF*/ break; +/*NBFF*/ default: +/*NBFF*/ break; /*NBFF*/ } /*NBFF*/ return SFX_ITEM_PRESENTATION_NONE; /*NBFF*/ } @@ -2350,6 +2339,7 @@ /*NBFF*/ return ePres; /*NBFF*/ } /*NBFF*/ break; +/*NBFF*/ default: break; /*NBFF*/ } /*NBFF*/ return SFX_ITEM_PRESENTATION_NONE; /*NBFF*/ } @@ -2357,7 +2347,6 @@ /*NBFF*/ sal_Bool SvxCharRotateItem::QueryValue( ::com::sun::star::uno::Any& rVal, /*NBFF*/ BYTE nMemberId ) const /*NBFF*/ { -/*NBFF*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); /*NBFF*/ nMemberId &= ~CONVERT_TWIPS; /*NBFF*/ sal_Bool bRet = sal_True; /*NBFF*/ switch( nMemberId ) @@ -2378,10 +2367,9 @@ /*NBFF*/ sal_Bool SvxCharRotateItem::PutValue( const ::com::sun::star::uno::Any& rVal, /*NBFF*/ BYTE nMemberId ) /*NBFF*/ { -/*NBFF*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); /*NBFF*/ nMemberId &= ~CONVERT_TWIPS; /*NBFF*/ sal_Bool bRet = sal_True; -/*NBFF*/ sal_Int16 nVal; +/*NBFF*/ sal_Int16 nVal = 0; /*NBFF*/ switch( nMemberId ) /*NBFF*/ { /*NBFF*/ case MID_ROTATE: @@ -2426,7 +2414,7 @@ /*N*/ SfxPoolItem* SvxCharScaleWidthItem::Create( SvStream& rStrm, USHORT ) const /*N*/ { -/*N*/ sal_uInt16 nVal; +/*N*/ sal_uInt16 nVal = 0; /*N*/ rStrm >> nVal; /*N*/ SvxCharScaleWidthItem* pItem = new SvxCharScaleWidthItem( nVal, Which() ); /*N*/ @@ -2473,7 +2461,7 @@ /*N*/ { /*N*/ // SfxUInt16Item::QueryValue returns sal_Int32 in Any now... (srx642w) /*N*/ // where we still want this to be a sal_Int16 -/*N*/ sal_Int16 nValue; +/*N*/ sal_Int16 nValue = 0; /*N*/ if (rVal >>= nValue) /*N*/ { /*N*/ SetValue( (UINT16) nValue ); @@ -2567,7 +2555,6 @@ /*N*/ sal_Bool SvxCharReliefItem::PutValue( const ::com::sun::star::uno::Any& rVal, /*N*/ BYTE nMemberId ) /*N*/ { -/*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); /*N*/ nMemberId &= ~CONVERT_TWIPS; /*N*/ sal_Bool bRet = sal_True; /*N*/ switch( nMemberId ) @@ -2592,7 +2579,6 @@ /*N*/ sal_Bool SvxCharReliefItem::QueryValue( ::com::sun::star::uno::Any& rVal, /*N*/ BYTE nMemberId ) const /*N*/ { -/*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); /*N*/ nMemberId &= ~CONVERT_TWIPS; /*N*/ sal_Bool bRet = sal_True; /*N*/ switch( nMemberId ) Index: binfilter/bf_svx/source/items/svx_xmlcnitm.cxx =================================================================== RCS file: /cvs/framework/binfilter/bf_svx/source/items/svx_xmlcnitm.cxx,v retrieving revision 1.8 diff -u -r1.8 svx_xmlcnitm.cxx --- binfilter/bf_svx/source/items/svx_xmlcnitm.cxx 10 Apr 2008 14:16:09 -0000 1.8 +++ binfilter/bf_svx/source/items/svx_xmlcnitm.cxx 6 May 2008 11:45:48 -0000 @@ -138,8 +138,8 @@ /*NBFF*/ return FALSE; /*NBFF*/ /*NBFF*/ pData = (AttributeData*)aAny.getValue(); -/*NBFF*/ USHORT pos = aName.indexOf( sal_Unicode(':') ); -/*NBFF*/ if( pos != -1 ) +/*NBFF*/ sal_Int32 pos = aName.indexOf( sal_Unicode(':') ); +/*NBFF*/ if( ( pos > -1 ) ) /*NBFF*/ { /*NBFF*/ const OUString aPrefix( aName.copy( 0, pos )); /*NBFF*/ const OUString aLName( aName.copy( pos+1 )); @@ -227,16 +227,18 @@ /*N*/ } /*N*/ USHORT SvXMLAttrContainerItem::GetNextNamespaceIndex( USHORT nIdx ) const -/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 +/*N*/ { +/*N*/ DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 /*N*/ } /*N*/ const OUString& SvXMLAttrContainerItem::GetNamespace( USHORT i ) const -/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return OUString::createFromAscii (""); //STRIP001 +/*N*/ { +/*N*/ DBG_BF_ASSERT(0, "STRIP"); return OUString::createFromAscii (""); //STRIP001 /*N*/ } /*N*/ const OUString& SvXMLAttrContainerItem::GetPrefix( USHORT i ) const /*N*/ { -/*N*/ DBG_BF_ASSERT(0, "STRIP"); return ::rtl::OUString::createFromAscii ("");//STRIP001 /*N*/ return pImpl->GetPrefix( i ); +/*N*/ DBG_BF_ASSERT(0, "STRIP"); return ::rtl::OUString::createFromAscii ("");//STRIP001 /*N*/ return pImpl->GetPrefix( i ); /*N*/ } Index: binfilter/bf_sw/source/core/attr/sw_format.cxx =================================================================== RCS file: /cvs/framework/binfilter/bf_sw/source/core/attr/sw_format.cxx,v retrieving revision 1.9 diff -u -r1.9 sw_format.cxx --- binfilter/bf_sw/source/core/attr/sw_format.cxx 10 Apr 2008 15:10:16 -0000 1.9 +++ binfilter/bf_sw/source/core/attr/sw_format.cxx 6 May 2008 11:45:48 -0000 @@ -60,11 +60,11 @@ /*N*/ const USHORT* pWhichRanges, SwFmt *pDrvdFrm, USHORT nFmtWhich ) /*N*/ : SwModify( pDrvdFrm ), /*N*/ aSet( rPool, pWhichRanges ), +/*N*/ nWhichId( nFmtWhich ), +/*N*/ nFmtId( 0 ), /*N*/ nPoolFmtId( USHRT_MAX ), /*N*/ nPoolHelpId( USHRT_MAX ), -/*N*/ nPoolHlpFileId( UCHAR_MAX ), -/*N*/ nFmtId( 0 ), -/*N*/ nWhichId( nFmtWhich ) +/*N*/ nPoolHlpFileId( UCHAR_MAX ) /*N*/ { /*N*/ aFmtName.AssignAscii( pFmtNm ); /*N*/ bWritten = bFmtInDTOR = bAutoUpdateFmt = bLayerFmt = FALSE; // LAYER_IMPL @@ -80,11 +80,11 @@ /*N*/ : SwModify( pDrvdFrm ), /*N*/ aFmtName( rFmtNm ), /*N*/ aSet( rPool, pWhichRanges ), +/*N*/ nWhichId( nFmtWhich ), +/*N*/ nFmtId( 0 ), /*N*/ nPoolFmtId( USHRT_MAX ), /*N*/ nPoolHelpId( USHRT_MAX ), -/*N*/ nPoolHlpFileId( UCHAR_MAX ), -/*N*/ nFmtId( 0 ), -/*N*/ nWhichId( nFmtWhich ) +/*N*/ nPoolHlpFileId( UCHAR_MAX ) /*N*/ { /*N*/ bWritten = bFmtInDTOR = bAutoUpdateFmt = bLayerFmt = FALSE; // LAYER_IMPL /*N*/ bAutoFmt = TRUE; @@ -99,11 +99,11 @@ /*?*/ : SwModify( pDrvdFrm ), /*?*/ aFmtName( rFmtNm ), /*?*/ aSet( rPool, nWhich1, nWhich2 ), +/*?*/ nWhichId( nFmtWhich ), +/*?*/ nFmtId( 0 ), /*?*/ nPoolFmtId( USHRT_MAX ), /*?*/ nPoolHelpId( USHRT_MAX ), -/*?*/ nPoolHlpFileId( UCHAR_MAX ), -/*?*/ nFmtId( 0 ), -/*?*/ nWhichId( nFmtWhich ) +/*?*/ nPoolHlpFileId( UCHAR_MAX ) /*?*/ { /*?*/ bWritten = bFmtInDTOR = bAutoUpdateFmt = bLayerFmt = FALSE; // LAYER_IMPL /*?*/ bAutoFmt = TRUE; @@ -116,11 +116,11 @@ /*N*/ : SwModify( rFmt.DerivedFrom() ), /*N*/ aFmtName( rFmt.aFmtName ), /*N*/ aSet( rFmt.aSet ), +/*N*/ nWhichId( rFmt.nWhichId ), +/*N*/ nFmtId( 0 ), /*N*/ nPoolFmtId( rFmt.GetPoolFmtId() ), /*N*/ nPoolHelpId( rFmt.GetPoolHelpId() ), -/*N*/ nPoolHlpFileId( rFmt.GetPoolHlpFileId() ), -/*N*/ nFmtId( 0 ), -/*N*/ nWhichId( rFmt.nWhichId ) +/*N*/ nPoolHlpFileId( rFmt.GetPoolHlpFileId() ) /*N*/ { /*N*/ bWritten = bFmtInDTOR = bLayerFmt = FALSE; // LAYER_IMPL /*N*/ bAutoFmt = rFmt.bAutoFmt; @@ -222,8 +222,6 @@ /*N*/ void SwFmt::CopyAttrs( const SwFmt& rFmt, BOOL bReplace ) /*N*/ { -/*N*/ // kopiere nur das Attribut-Delta Array -/*N*/ register SwCharFmt* pDropCharFmt = 0; /*N*/ /*N*/ if ( IsInCache() ) /*N*/ { Index: binfilter/bf_sw/source/core/bastyp/sw_calc.cxx =================================================================== RCS file: /cvs/framework/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx,v retrieving revision 1.10 diff -u -r1.10 sw_calc.cxx --- binfilter/bf_sw/source/core/bastyp/sw_calc.cxx 10 Apr 2008 15:13:22 -0000 1.10 +++ binfilter/bf_sw/source/core/bastyp/sw_calc.cxx 6 May 2008 11:45:49 -0000 @@ -150,34 +150,34 @@ }; _CalcOp __READONLY_DATA aOpTable[] = { -/* ACOS */ {sCalc_Acos, CALC_ACOS}, // Arcuscosinus -/* ADD */ {sCalc_Add, CALC_PLUS}, // Addition -/* AND */ {sCalc_And, CALC_AND}, // log. und -/* ASIN */ {sCalc_Asin, CALC_ASIN}, // Arcussinus -/* ATAN */ {sCalc_Atan, CALC_ATAN}, // Arcustangens -/* COS */ {sCalc_Cos, CALC_COS}, // Cosinus -/* DIV */ {sCalc_Div, CALC_DIV}, // Dividieren -/* EQ */ {sCalc_Eq, CALC_EQ}, // gleich -/* G */ {sCalc_G, CALC_GRE}, // groesser -/* GEQ */ {sCalc_Geq, CALC_GEQ}, // groesser gleich -/* L */ {sCalc_L, CALC_LES}, // kleiner -/* LEQ */ {sCalc_Leq, CALC_LEQ}, // kleiner gleich -/* MAX */ {sCalc_Max, CALC_MAX}, // Maximalwert -/* MEAN */ {sCalc_Mean, CALC_MEAN}, // Mittelwert -/* MIN */ {sCalc_Min, CALC_MIN}, // Minimalwert -/* MUL */ {sCalc_Mul, CALC_MUL}, // Multiplizieren -/* NEQ */ {sCalc_Neq, CALC_NEQ}, // nicht gleich -/* NOT */ {sCalc_Not, CALC_NOT}, // log. nicht -/* OR */ {sCalc_Or, CALC_OR}, // log. oder -/* PHD */ {sCalc_Phd, CALC_PHD}, // Prozent -/* POW */ {sCalc_Pow, CALC_POW}, // Potenzieren -/* ROUND */ {sCalc_Round, CALC_ROUND}, // Runden -/* SIN */ {sCalc_Sin, CALC_SIN}, // Sinus -/* SQRT */ {sCalc_Sqrt, CALC_SQRT}, // Wurzel -/* SUB */ {sCalc_Sub, CALC_MINUS}, // Subtraktion -/* SUM */ {sCalc_Sum, CALC_SUM}, // Summe -/* TAN */ {sCalc_Tan, CALC_TAN}, // Tangens -/* XOR */ {sCalc_Xor, CALC_XOR} // log. xoder +/* ACOS */ {{sCalc_Acos}, CALC_ACOS}, // Arcuscosinus +/* ADD */ {{sCalc_Add}, CALC_PLUS}, // Addition +/* AND */ {{sCalc_And}, CALC_AND}, // log. und +/* ASIN */ {{sCalc_Asin}, CALC_ASIN}, // Arcussinus +/* ATAN */ {{sCalc_Atan}, CALC_ATAN}, // Arcustangens +/* COS */ {{sCalc_Cos}, CALC_COS}, // Cosinus +/* DIV */ {{sCalc_Div}, CALC_DIV}, // Dividieren +/* EQ */ {{sCalc_Eq}, CALC_EQ}, // gleich +/* G */ {{sCalc_G}, CALC_GRE}, // groesser +/* GEQ */ {{sCalc_Geq}, CALC_GEQ}, // groesser gleich +/* L */ {{sCalc_L}, CALC_LES}, // kleiner +/* LEQ */ {{sCalc_Leq}, CALC_LEQ}, // kleiner gleich +/* MAX */ {{sCalc_Max}, CALC_MAX}, // Maximalwert +/* MEAN */ {{sCalc_Mean}, CALC_MEAN}, // Mittelwert +/* MIN */ {{sCalc_Min}, CALC_MIN}, // Minimalwert +/* MUL */ {{sCalc_Mul}, CALC_MUL}, // Multiplizieren +/* NEQ */ {{sCalc_Neq}, CALC_NEQ}, // nicht gleich +/* NOT */ {{sCalc_Not}, CALC_NOT}, // log. nicht +/* OR */ {{sCalc_Or}, CALC_OR}, // log. oder +/* PHD */ {{sCalc_Phd}, CALC_PHD}, // Prozent +/* POW */ {{sCalc_Pow}, CALC_POW}, // Potenzieren +/* ROUND */ {{sCalc_Round}, CALC_ROUND}, // Runden +/* SIN */ {{sCalc_Sin}, CALC_SIN}, // Sinus +/* SQRT */ {{sCalc_Sqrt}, CALC_SQRT}, // Wurzel +/* SUB */ {{sCalc_Sub}, CALC_MINUS}, // Subtraktion +/* SUM */ {{sCalc_Sum}, CALC_SUM}, // Summe +/* TAN */ {{sCalc_Tan}, CALC_TAN}, // Tangens +/* XOR */ {{sCalc_Xor}, CALC_XOR} // log. xoder }; double __READONLY_DATA nRoundVal[] = { @@ -290,12 +290,12 @@ |******************************************************************************/ /*N*/ /*N*/ SwCalc::SwCalc( SwDoc& rD ) -/*N*/ : rDoc( rD ), -/*N*/ eError( CALC_NOERR ), -/*N*/ nListPor( 0 ), -/*N*/ aErrExpr( aEmptyStr, SwSbxValue(), 0 ), +/*N*/ : aErrExpr( aEmptyStr, SwSbxValue(), 0 ), +/*N*/ rDoc( rD ), /*N*/ pLclData( &GetAppLocaleData() ), -/*N*/ pCharClass( &GetAppCharClass() ) +/*N*/ pCharClass( &GetAppCharClass() ), +/*N*/ nListPor( 0 ), +/*N*/ eError( CALC_NOERR ) /*N*/ { /*N*/ aErrExpr.aStr.AssignAscii( "~C_ERR~" ); /*N*/ memset( VarTable, 0, sizeof(VarTable) ); @@ -781,6 +781,7 @@ /*M*/ case CALC_MEAN : eCurrListOper = CALC_PLUS; break; /*M*/ case CALC_MIN : eCurrListOper = CALC_MIN_IN; break; /*M*/ case CALC_MAX : eCurrListOper = CALC_MAX_IN; break; +/*M*/ default: break; /*M*/ } /*M*/ nCommandPos = (xub_StrLen)aRes.EndPos; /*M*/ return eCurrOper; Index: binfilter/bf_sw/source/core/inc/swcache.hxx =================================================================== RCS file: /cvs/framework/binfilter/bf_sw/source/core/inc/swcache.hxx,v retrieving revision 1.6 diff -u -r1.6 swcache.hxx --- binfilter/bf_sw/source/core/inc/swcache.hxx 10 Apr 2008 16:11:36 -0000 1.6 +++ binfilter/bf_sw/source/core/inc/swcache.hxx 6 May 2008 11:45:49 -0000 @@ -277,8 +277,8 @@ inline SwCacheAccess::SwCacheAccess( SwCache &rC, const void *pOwn, BOOL bSeek ) : rCache( rC ), - pOwner( pOwn ), - pObj( 0 ) + pObj( 0 ), + pOwner( pOwn ) { if ( bSeek && pOwner && 0 != (pObj = rCache.Get( pOwner )) ) pObj->Lock(); @@ -287,8 +287,8 @@ inline SwCacheAccess::SwCacheAccess( SwCache &rC, const void *pOwn, const USHORT nIndex ) : rCache( rC ), - pOwner( pOwn ), - pObj( 0 ) + pObj( 0 ), + pOwner( pOwn ) { if ( pOwner && 0 != (pObj = rCache.Get( pOwner, nIndex )) ) pObj->Lock(); Index: binfilter/bf_sw/source/core/layout/sw_layact.cxx =================================================================== RCS file: /cvs/framework/binfilter/bf_sw/source/core/layout/sw_layact.cxx,v retrieving revision 1.12 diff -u -r1.12 sw_layact.cxx --- binfilter/bf_sw/source/core/layout/sw_layact.cxx 10 Apr 2008 16:21:03 -0000 1.12 +++ binfilter/bf_sw/source/core/layout/sw_layact.cxx 6 May 2008 11:45:50 -0000 @@ -1836,7 +1836,7 @@ /*N*/ //Wachstum innerhalb der Tabelle - und damit der Tabelle selbst - /*N*/ //stattgefunden haben kann, muss die untere Kante durch die /*N*/ //Unterkante der letzten Zeile bestimmt werden. -/*N*/ SwLayoutFrm *pRow; +/*N*/ SwLayoutFrm *pRow = NULL; /*N*/ SwRect aScrollRect( pTab->PaintArea() ); /*N*/ if ( IsPaint() || bAddRect ) /*N*/ { @@ -2646,7 +2646,6 @@ /*N*/ } /*N*/ /*N*/ FASTBOOL bInValid; -/*N*/ const SwViewOption& rVOpt = *pImp->GetShell()->GetViewOptions(); /*N*/ SwPageFrm *pPg = (SwPageFrm*)pRoot->Lower(); /*N*/ do /*N*/ { bInValid = pPg->IsInvalidCntnt() || pPg->IsInvalidLayout() || Index: binfilter/bf_sw/source/core/layout/sw_laycache.cxx =================================================================== RCS file: /cvs/framework/binfilter/bf_sw/source/core/layout/sw_laycache.cxx,v retrieving revision 1.9 diff -u -r1.9 sw_laycache.cxx --- binfilter/bf_sw/source/core/layout/sw_laycache.cxx 10 Apr 2008 16:21:19 -0000 1.9 +++ binfilter/bf_sw/source/core/layout/sw_laycache.cxx 6 May 2008 11:45:51 -0000 @@ -617,9 +617,9 @@ /*N*/ { /*N*/ BOOL bRet = FALSE; /*N*/ BOOL bLongTab = FALSE; -/*N*/ ULONG nMaxRowPerPage; +/*N*/ ULONG nMaxRowPerPage = 0; /*N*/ nNodeIndex -= nStartOfContent; -/*N*/ USHORT nRows; +/*N*/ USHORT nRows = 0; /*N*/ if( rpFrm->IsTabFrm() ) /*N*/ { /*N*/ //Inside a table counts every row as a paragraph @@ -709,7 +709,7 @@ /*N*/ if( nOfst < STRING_LEN ) /*N*/ { /*N*/ sal_Bool bSplit = sal_False; -/*N*/ sal_Bool bRepeat; +/*N*/ sal_Bool bRepeat = sal_False; /*N*/ if( !bLongTab && rpFrm->IsTxtFrm() && /*N*/ SW_LAYCACHE_IO_REC_PARA == nType && /*N*/ nOfst<((SwTxtFrm*)rpFrm)->GetTxtNode()->GetTxt().Len() ) Index: binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx =================================================================== RCS file: /cvs/framework/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx,v retrieving revision 1.15 diff -u -r1.15 sw_sw3field.cxx --- binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx 10 Apr 2008 16:29:13 -0000 1.15 +++ binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx 6 May 2008 11:45:51 -0000 @@ -114,23 +114,23 @@ static OldFormats aOldDateFmt40[] = { // Datumsfelder: - NF_DATE_SYSTEM_SHORT, DFF_SSYS, // Kurzes Systemdatum - NF_DATE_SYSTEM_LONG, DFF_LSYS, // Langes Systemdatum - NF_DATE_SYS_DDMMYY, DFF_DMY, // 06.10.64 - NF_DATE_SYS_DDMMYYYY, DFF_DMYY, // 06.10.1964 - NF_DATE_SYS_DMMMYY, DFF_DMMY, // 06. Okt 64 - NF_DATE_SYS_DMMMYYYY, DFF_DMMYY, // 06. Okt 1964 - NF_DATE_DIN_DMMMMYYYY, DFF_DMMMYY, // 06. Oktober 1964 - NF_DATE_DIN_DMMMMYYYY, DFF_DMMMY, // 06. Oktober 64 - NF_DATE_SYS_NNDMMMYY, DFF_DDMMY, // Di, 06. Okt 64 - NF_DATE_SYS_NNDMMMMYYYY, DFF_DDMMMY, // Di, 06. Oktober 64 - NF_DATE_SYS_NNDMMMMYYYY, DFF_DDMMMYY, // Di, 06. Oktober 1964 - NF_DATE_SYS_NNNNDMMMMYYYY, DFF_DDDMMMYY, // Dienstag, 06. Oktober 1964 - NF_DATE_SYS_NNNNDMMMMYYYY, DFF_DDDMMMY, // Dienstag, 06. Oktober 64 - NF_DATE_SYS_MMYY, DFF_MY, // 10.64 - NF_DATE_DIN_MMDD, DFF_MD, // 10-06 - NF_DATE_DIN_YYMMDD, DFF_YMD, // 64-10-06 - NF_DATE_DIN_YYYYMMDD, DFF_YYMD, // 1964-10-06 + {NF_DATE_SYSTEM_SHORT, DFF_SSYS}, // Kurzes Systemdatum + {NF_DATE_SYSTEM_LONG, DFF_LSYS}, // Langes Systemdatum + {NF_DATE_SYS_DDMMYY, DFF_DMY}, // 06.10.64 + {NF_DATE_SYS_DDMMYYYY, DFF_DMYY}, // 06.10.1964 + {NF_DATE_SYS_DMMMYY, DFF_DMMY}, // 06. Okt 64 + {NF_DATE_SYS_DMMMYYYY, DFF_DMMYY}, // 06. Okt 1964 + {NF_DATE_DIN_DMMMMYYYY, DFF_DMMMYY}, // 06. Oktober 1964 + {NF_DATE_DIN_DMMMMYYYY, DFF_DMMMY}, // 06. Oktober 64 + {NF_DATE_SYS_NNDMMMYY, DFF_DDMMY}, // Di, 06. Okt 64 + {NF_DATE_SYS_NNDMMMMYYYY, DFF_DDMMMY}, // Di, 06. Oktober 64 + {NF_DATE_SYS_NNDMMMMYYYY, DFF_DDMMMYY}, // Di, 06. Oktober 1964 + {NF_DATE_SYS_NNNNDMMMMYYYY, DFF_DDDMMMYY}, // Dienstag, 06. Oktober 1964 + {NF_DATE_SYS_NNNNDMMMMYYYY, DFF_DDDMMMY}, // Dienstag, 06. Oktober 64 + {NF_DATE_SYS_MMYY, DFF_MY}, // 10.64 + {NF_DATE_DIN_MMDD, DFF_MD}, // 10-06 + {NF_DATE_DIN_YYMMDD, DFF_YMD}, // 64-10-06 + {NF_DATE_DIN_YYYYMMDD, DFF_YYMD}, // 1964-10-06 NF_NUMERIC_START, 0 // Tabellenende }; @@ -138,93 +138,93 @@ static OldFormats aOldDateFmt30[] = { // Datumsfelder: - NF_DATE_SYSTEM_SHORT, DFF_SSYS, // Kurzes Systemdatum - NF_DATE_SYSTEM_LONG, DFF_LSYS, // Langes Systemdatum - NF_DATE_SYS_DDMMYY, DFF_DMY, // 06.10.64 - NF_DATE_SYS_DDMMYYYY, DFF_DMYY, // 06.10.1964 - NF_DATE_SYS_DMMMYY, DFF_DMMY, // 06. Okt 64 - NF_DATE_SYS_DMMMYYYY, 4 /*DFF_DMMYY*/, // 06. Okt 1964 - NF_DATE_DIN_DMMMMYYYY, 5 /*DFF_DMMMYY*/, // 06. Oktober 1964 - NF_DATE_DIN_DMMMMYYYY, 5 /*DFF_DMMMY*/, // 06. Oktober 64 - NF_DATE_SYS_NNDMMMMYYYY, 6 /*DFF_DDMMMYY*/, // Di, 06. Oktober 1964 - NF_DATE_SYS_NNDMMMYY, 6 /*DFF_DDMMY*/, // Di, 06. Okt 64 - NF_DATE_SYS_NNDMMMMYYYY, 6 /*DFF_DDMMMY*/, // Di, 06. Oktober 64 - NF_DATE_SYS_NNNNDMMMMYYYY, 7 /*DFF_DDDMMMYY*/, // Dienstag, 06. Oktober 1964 - NF_DATE_SYS_NNNNDMMMMYYYY, 7 /*DFF_DDDMMMY*/, // Dienstag, 06. Oktober 64 - NF_DATE_SYS_MMYY, 2 /*DFF_MY*/, // 10.64 - NF_DATE_DIN_MMDD, DFF_MD, // 10-06 - NF_DATE_DIN_YYMMDD, DFF_YMD, // 64-10-06 - NF_DATE_DIN_YYYYMMDD, DFF_YYMD, // 1964-10-06 + {NF_DATE_SYSTEM_SHORT, DFF_SSYS}, // Kurzes Systemdatum + {NF_DATE_SYSTEM_LONG, DFF_LSYS}, // Langes Systemdatum + {NF_DATE_SYS_DDMMYY, DFF_DMY}, // 06.10.64 + {NF_DATE_SYS_DDMMYYYY, DFF_DMYY}, // 06.10.1964 + {NF_DATE_SYS_DMMMYY, DFF_DMMY}, // 06. Okt 64 + {NF_DATE_SYS_DMMMYYYY, 4 /*DFF_DMMYY*/}, // 06. Okt 1964 + {NF_DATE_DIN_DMMMMYYYY, 5 /*DFF_DMMMYY*/}, // 06. Oktober 1964 + {NF_DATE_DIN_DMMMMYYYY, 5 /*DFF_DMMMY*/}, // 06. Oktober 64 + {NF_DATE_SYS_NNDMMMMYYYY, 6 /*DFF_DDMMMYY*/}, // Di, 06. Oktober 1964 + {NF_DATE_SYS_NNDMMMYY, 6 /*DFF_DDMMY*/}, // Di, 06. Okt 64 + {NF_DATE_SYS_NNDMMMMYYYY, 6 /*DFF_DDMMMY*/}, // Di, 06. Oktober 64 + {NF_DATE_SYS_NNNNDMMMMYYYY, 7 /*DFF_DDDMMMYY*/}, // Dienstag, 06. Oktober 1964 + {NF_DATE_SYS_NNNNDMMMMYYYY, 7 /*DFF_DDDMMMY*/}, // Dienstag, 06. Oktober 64 + {NF_DATE_SYS_MMYY, 2 /*DFF_MY*/}, // 10.64 + {NF_DATE_DIN_MMDD, DFF_MD}, // 10-06 + {NF_DATE_DIN_YYMMDD, DFF_YMD}, // 64-10-06 + {NF_DATE_DIN_YYYYMMDD, DFF_YYMD}, // 1964-10-06 - NF_NUMERIC_START, 0 // Tabellenende + {NF_NUMERIC_START, 0} // Tabellenende }; static OldFormats aOldTimeFmt[] = { // Zeitfelder: - NF_TIME_HHMMSS, TF_SYSTEM, // Systemzeit - NF_TIME_HHMM, TF_SSMM_24, // 23:25 - NF_TIME_HHMMAMPM, TF_SSMM_12, // 11:25 PM + {NF_TIME_HHMMSS, TF_SYSTEM}, // Systemzeit + {NF_TIME_HHMM, TF_SSMM_24}, // 23:25 + {NF_TIME_HHMMAMPM, TF_SSMM_12}, // 11:25 PM - NF_NUMERIC_START, 0 // Tabellenende + {NF_NUMERIC_START, 0} // Tabellenende }; static OldFormats aOldGetSetExpFmt40[] = { - NF_TEXT, VVF_CMD, // Kommando anzeigen - NF_TEXT, VVF_INVISIBLE, // unsichtbar - NF_PERCENT_INT, VVF_XXP, // 1234% - NF_PERCENT_DEC2, VVF_XX_XXP, // 1.234,56% - NF_TEXT, VVF_CLEAR, // ??? + {NF_TEXT, VVF_CMD}, // Kommando anzeigen + {NF_TEXT, VVF_INVISIBLE}, // unsichtbar + {NF_PERCENT_INT, VVF_XXP}, // 1234% + {NF_PERCENT_DEC2, VVF_XX_XXP}, // 1.234,56% + {NF_TEXT, VVF_CLEAR}, // ??? - NF_NUMBER_SYSTEM, VVF_SYS, // Zahlenformat aus der + {NF_NUMBER_SYSTEM, VVF_SYS}, // Zahlenformat aus der // Systemeinstellung - NF_NUMBER_INT, VVF_X, // 1234 - NF_NUMBER_DEC2, VVF_X_X, // 1234,5 - NF_NUMBER_DEC2, VVF_X_XX, // 1245,56 - NF_NUMBER_1000DEC2, VVF_XX_XX, // 1.234,56 - NF_NUMBER_1000DEC2, VVF_XX_X, // 1.234,5 - NF_NUMBER_1000DEC2, VVF_XX_XXX, // 1.234,567 - NF_CURRENCY_1000DEC2, VVF_SYS_CUR, // W„hrungsformat aus der + {NF_NUMBER_INT, VVF_X}, // 1234 + {NF_NUMBER_DEC2, VVF_X_X}, // 1234,5 + {NF_NUMBER_DEC2, VVF_X_XX}, // 1245,56 + {NF_NUMBER_1000DEC2, VVF_XX_XX}, // 1.234,56 + {NF_NUMBER_1000DEC2, VVF_XX_X}, // 1.234,5 + {NF_NUMBER_1000DEC2, VVF_XX_XXX}, // 1.234,567 + {NF_CURRENCY_1000DEC2, VVF_SYS_CUR}, // W„hrungsformat aus der // Systemeinstellung // (1.234,00 DM) - NF_CURRENCY_1000INT, VVF_X_CUR, // 1234 DM - NF_CURRENCY_1000DEC2, VVF_XX_XX_CUR, // 1234,56 DM 1234,00 DM - NF_CURRENCY_1000DEC2_DASHED, VVF_XX_X0_CUR, // 1234,56 DM 1234,-- DM - NF_CURRENCY_1000INT, VVF_CUR_X, // DM 1234 - NF_CURRENCY_1000DEC2, VVF_CUR_XX_XX, // DM 1234,56 DM 1234,00 - NF_CURRENCY_1000DEC2_DASHED, VVF_CUR_XX_X0, // DM 1234,56 DM 1234,-- + {NF_CURRENCY_1000INT, VVF_X_CUR}, // 1234 DM + {NF_CURRENCY_1000DEC2, VVF_XX_XX_CUR}, // 1234,56 DM 1234,00 DM + {NF_CURRENCY_1000DEC2_DASHED, VVF_XX_X0_CUR}, // 1234,56 DM 1234,-- DM + {NF_CURRENCY_1000INT, VVF_CUR_X}, // DM 1234 + {NF_CURRENCY_1000DEC2, VVF_CUR_XX_XX}, // DM 1234,56 DM 1234,00 + {NF_CURRENCY_1000DEC2_DASHED, VVF_CUR_XX_X0}, // DM 1234,56 DM 1234,-- - NF_NUMERIC_START, 0 // Tabellenende + {NF_NUMERIC_START, 0} // Tabellenende }; static OldFormats aOldGetSetExpFmt30[] = { - NF_TEXT, VVF_CMD, // Kommando anzeigen - NF_TEXT, VVF_INVISIBLE, // unsichtbar - NF_PERCENT_INT, VVF_XXP, // 1234% - NF_PERCENT_DEC2, VVF_XX_XXP, // 1.234,56% - NF_TEXT, VVF_CLEAR, // ??? + {NF_TEXT, VVF_CMD}, // Kommando anzeigen + {NF_TEXT, VVF_INVISIBLE}, // unsichtbar + {NF_PERCENT_INT, VVF_XXP}, // 1234% + {NF_PERCENT_DEC2, VVF_XX_XXP}, // 1.234,56% + {NF_TEXT, VVF_CLEAR}, // ??? - NF_NUMBER_SYSTEM, 0x0020, // Zahlenformat aus der + {NF_NUMBER_SYSTEM, 0x0020}, // Zahlenformat aus der // Systemeinstellung - NF_NUMBER_INT, 0x0080, // 1234 - NF_NUMBER_1000DEC2, 0x0100, // 1.234,56 - NF_NUMBER_DEC2, 0x0100, // 1234,5 - NF_NUMBER_DEC2, 0x0100, // 1245,56 - NF_NUMBER_1000DEC2, 0x0100, // 1.234,5 - NF_NUMBER_1000DEC2, 0x0100, // 1.234,567 - NF_CURRENCY_1000DEC2, 0x0200, // W„hrungsformat aus der + {NF_NUMBER_INT, 0x0080}, // 1234 + {NF_NUMBER_1000DEC2, 0x0100}, // 1.234,56 + {NF_NUMBER_DEC2, 0x0100}, // 1234,5 + {NF_NUMBER_DEC2, 0x0100}, // 1245,56 + {NF_NUMBER_1000DEC2, 0x0100}, // 1.234,5 + {NF_NUMBER_1000DEC2, 0x0100}, // 1.234,567 + {NF_CURRENCY_1000DEC2, 0x0200}, // W„hrungsformat aus der // Systemeinstellung // (1.234,00 DM) - NF_CURRENCY_1000INT, 0x1000, // 1234 DM - NF_CURRENCY_1000DEC2, 0x1000, // 1234,56 DM 1234,00 DM - NF_CURRENCY_1000DEC2_DASHED, 0x1000, // 1234,56 DM 1234,-- DM - NF_CURRENCY_1000INT, 0x1000, // DM 1234 - NF_CURRENCY_1000DEC2, 0x1000, // DM 1234,56 DM 1234,00 - NF_CURRENCY_1000DEC2_DASHED, 0x1000, // DM 1234,56 DM 1234,-- + {NF_CURRENCY_1000INT, 0x1000}, // 1234 DM + {NF_CURRENCY_1000DEC2, 0x1000}, // 1234,56 DM 1234,00 DM + {NF_CURRENCY_1000DEC2_DASHED, 0x1000}, // 1234,56 DM 1234,-- DM + {NF_CURRENCY_1000INT, 0x1000}, // DM 1234 + {NF_CURRENCY_1000DEC2, 0x1000}, // DM 1234,56 DM 1234,00 + {NF_CURRENCY_1000DEC2_DASHED, 0x1000}, // DM 1234,56 DM 1234,-- - NF_NUMERIC_START, 0 // Tabellenende + {NF_NUMERIC_START, 0} // Tabellenende }; /*N*/ void sw3io_ConvertFromOldField( SwDoc& rDoc, USHORT& rWhich, Index: binfilter/bf_sw/source/core/undo/sw_undel.cxx =================================================================== RCS file: /cvs/framework/binfilter/bf_sw/source/core/undo/sw_undel.cxx,v retrieving revision 1.8 diff -u -r1.8 sw_undel.cxx --- binfilter/bf_sw/source/core/undo/sw_undel.cxx 10 Apr 2008 17:06:59 -0000 1.8 +++ binfilter/bf_sw/source/core/undo/sw_undel.cxx 6 May 2008 11:45:52 -0000 @@ -75,8 +75,8 @@ /*N*/ SwUndoDelete::SwUndoDelete( SwPaM& rPam, BOOL bFullPara ) /*N*/ : SwUndo(UNDO_DELETE), SwUndRng( rPam ), -/*N*/ pMvStt( 0 ), pSttStr(0), pEndStr(0), nNode( 0 ), nSectDiff( 0 ), -/*N*/ pRedlData( 0 ), pRedlSaveData( 0 ) +/*N*/ pMvStt( 0 ), pSttStr(0), pEndStr(0), pRedlData( 0 ), pRedlSaveData( 0 ), nNode( 0 ), nSectDiff( 0 ) +/*N*/ /*N*/ { /*N*/ bMvAroundSectNd = bSectNdFnd = bGroup = bBackSp = bTblDelLastNd = /*N*/ bResetPgDesc = bResetPgBrk = FALSE; @@ -199,7 +199,7 @@ /*N*/ /*N*/ // habe wir SectionNodes (Start/Ende) als 1. oder letzten /*N*/ // Nodes in der Selection ? -/*N*/ SwNode* pTmpNd; +/*N*/ SwNode* pTmpNd = NULL; /*N*/ if( bJoinNext ) // Selektion von oben -> unten /*N*/ { /*N*/ // Bedingung: - SectionNode und dessen Ende ist der naechste Node Index: binfilter/bf_sw/source/core/undo/sw_undobj.cxx =================================================================== RCS file: /cvs/framework/binfilter/bf_sw/source/core/undo/sw_undobj.cxx,v retrieving revision 1.9 diff -u -r1.9 sw_undobj.cxx --- binfilter/bf_sw/source/core/undo/sw_undobj.cxx 10 Apr 2008 17:07:16 -0000 1.9 +++ binfilter/bf_sw/source/core/undo/sw_undobj.cxx 6 May 2008 11:45:52 -0000 @@ -369,6 +369,8 @@ /*?*/ n = n >= rSpzArr.Count() ? rSpzArr.Count() : n+1; /*?*/ } /*?*/ break; +/*?*/ default: +/*?*/ break; /*?*/ } /*N*/ } /*N*/ } Index: binfilter/bf_sw/source/ui/fldui/sw_fldmgr.cxx =================================================================== RCS file: /cvs/framework/binfilter/bf_sw/source/ui/fldui/sw_fldmgr.cxx,v retrieving revision 1.8 diff -u -r1.8 sw_fldmgr.cxx --- binfilter/bf_sw/source/ui/fldui/sw_fldmgr.cxx 10 Apr 2008 18:09:55 -0000 1.8 +++ binfilter/bf_sw/source/ui/fldui/sw_fldmgr.cxx 6 May 2008 11:45:52 -0000 @@ -171,54 +171,54 @@ static const SwFldPack __FAR_DATA aSwFlds[] = { // Dokument - TYP_EXTUSERFLD, FLD_EU_BEGIN, FLD_EU_END, 0, 0, - TYP_AUTHORFLD, 0, 0, FMT_AUTHOR_BEGIN, FMT_AUTHOR_END, - TYP_DATEFLD, FLD_DATE_BEGIN, FLD_DATE_END, 0, 0, - TYP_TIMEFLD, FLD_TIME_BEGIN, FLD_TIME_END, 0, 0, - TYP_PAGENUMBERFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END-1, - TYP_NEXTPAGEFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END, - TYP_PREVPAGEFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END, - TYP_FILENAMEFLD, 0, 0, FMT_FF_BEGIN, FMT_FF_END, - TYP_DOCSTATFLD, FLD_STAT_BEGIN, FLD_STAT_END, FMT_NUM_BEGIN, FMT_NUM_END-1, + {TYP_EXTUSERFLD, FLD_EU_BEGIN, FLD_EU_END, 0, 0}, + {TYP_AUTHORFLD, 0, 0, FMT_AUTHOR_BEGIN, FMT_AUTHOR_END}, + {TYP_DATEFLD, FLD_DATE_BEGIN, FLD_DATE_END, 0, 0}, + {TYP_TIMEFLD, FLD_TIME_BEGIN, FLD_TIME_END, 0, 0}, + {TYP_PAGENUMBERFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END-1}, + {TYP_NEXTPAGEFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END}, + {TYP_PREVPAGEFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END}, + {TYP_FILENAMEFLD, 0, 0, FMT_FF_BEGIN, FMT_FF_END}, + {TYP_DOCSTATFLD, FLD_STAT_BEGIN, FLD_STAT_END, FMT_NUM_BEGIN, FMT_NUM_END-1}, - TYP_CHAPTERFLD, 0, 0, FMT_CHAPTER_BEGIN, FMT_CHAPTER_END, - TYP_TEMPLNAMEFLD, 0, 0, FMT_FF_BEGIN, FMT_FF_END, + {TYP_CHAPTERFLD, 0, 0, FMT_CHAPTER_BEGIN, FMT_CHAPTER_END}, + {TYP_TEMPLNAMEFLD, 0, 0, FMT_FF_BEGIN, FMT_FF_END}, // Funktion - TYP_CONDTXTFLD, 0, 0, 0, 0, - TYP_DROPDOWN, 0, 0, 0, 0, - TYP_INPUTFLD, FLD_INPUT_BEGIN, FLD_INPUT_END, 0, 0, - TYP_MACROFLD, 0, 0, 0, 0, - TYP_JUMPEDITFLD, 0, 0, FMT_MARK_BEGIN, FMT_MARK_END, - TYP_COMBINED_CHARS, 0, 0, 0, 0, - TYP_HIDDENTXTFLD, 0, 0, 0, 0, - TYP_HIDDENPARAFLD, 0, 0, 0, 0, + {TYP_CONDTXTFLD, 0, 0, 0, 0}, + {TYP_DROPDOWN, 0, 0, 0, 0}, + {TYP_INPUTFLD, FLD_INPUT_BEGIN, FLD_INPUT_END, 0, 0}, + {TYP_MACROFLD, 0, 0, 0, 0}, + {TYP_JUMPEDITFLD, 0, 0, FMT_MARK_BEGIN, FMT_MARK_END}, + {TYP_COMBINED_CHARS, 0, 0, 0, 0}, + {TYP_HIDDENTXTFLD, 0, 0, 0, 0}, + {TYP_HIDDENPARAFLD, 0, 0, 0, 0}, // Referenzen - TYP_SETREFFLD, 0, 0, 0, 0, - TYP_GETREFFLD, 0, 0, FMT_REF_BEGIN, FMT_REF_END, + {TYP_SETREFFLD, 0, 0, 0, 0}, + {TYP_GETREFFLD, 0, 0, FMT_REF_BEGIN, FMT_REF_END}, // Ablage - TYP_DOCINFOFLD, 0, 0, FMT_REG_BEGIN, FMT_REG_END, + {TYP_DOCINFOFLD, 0, 0, FMT_REG_BEGIN, FMT_REG_END}, // Datenbank - TYP_DBFLD, 0, 0, FMT_DBFLD_BEGIN, FMT_DBFLD_END, - TYP_DBNEXTSETFLD, 0, 0, 0, 0, - TYP_DBNUMSETFLD, 0, 0, 0, 0, - TYP_DBSETNUMBERFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END-2, - TYP_DBNAMEFLD, 0, 0, 0, 0, + {TYP_DBFLD, 0, 0, FMT_DBFLD_BEGIN, FMT_DBFLD_END}, + {TYP_DBNEXTSETFLD, 0, 0, 0, 0}, + {TYP_DBNUMSETFLD, 0, 0, 0, 0}, + {TYP_DBSETNUMBERFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END-2}, + {TYP_DBNAMEFLD, 0, 0, 0, 0}, // Variablen - TYP_SETFLD, 0, 0, FMT_SETVAR_BEGIN, FMT_SETVAR_END, + {TYP_SETFLD, 0, 0, FMT_SETVAR_BEGIN, FMT_SETVAR_END}, - TYP_GETFLD, 0, 0, FMT_GETVAR_BEGIN, FMT_GETVAR_END, - TYP_DDEFLD, 0, 0, FMT_DDE_BEGIN, FMT_DDE_END, - TYP_FORMELFLD, 0, 0, FMT_GETVAR_BEGIN, FMT_GETVAR_END, - TYP_INPUTFLD, FLD_INPUT_BEGIN, FLD_INPUT_END, 0, 0, - TYP_SEQFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END-2, - TYP_SETREFPAGEFLD, FLD_PAGEREF_BEGIN, FLD_PAGEREF_END,0, 0, - TYP_GETREFPAGEFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END-1, - TYP_USERFLD, 0, 0, FMT_USERVAR_BEGIN, FMT_USERVAR_END + {TYP_GETFLD, 0, 0, FMT_GETVAR_BEGIN, FMT_GETVAR_END}, + {TYP_DDEFLD, 0, 0, FMT_DDE_BEGIN, FMT_DDE_END}, + {TYP_FORMELFLD, 0, 0, FMT_GETVAR_BEGIN, FMT_GETVAR_END}, + {TYP_INPUTFLD, FLD_INPUT_BEGIN, FLD_INPUT_END, 0, 0}, + {TYP_SEQFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END-2}, + {TYP_SETREFPAGEFLD, FLD_PAGEREF_BEGIN, FLD_PAGEREF_END,0, 0}, + {TYP_GETREFPAGEFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END-1}, + {TYP_USERFLD, 0, 0, FMT_USERVAR_BEGIN, FMT_USERVAR_END} }; String* SwFldMgr::pDate = 0; Index: binfilter/bf_xmloff/source/core/xmloff_XMLEmbeddedObjectImportContext.cxx =================================================================== RCS file: /cvs/framework/binfilter/bf_xmloff/source/core/xmloff_XMLEmbeddedObjectImportContext.cxx,v retrieving revision 1.6 diff -u -r1.6 xmloff_XMLEmbeddedObjectImportContext.cxx --- binfilter/bf_xmloff/source/core/xmloff_XMLEmbeddedObjectImportContext.cxx 10 Apr 2008 19:09:59 -0000 1.6 +++ binfilter/bf_xmloff/source/core/xmloff_XMLEmbeddedObjectImportContext.cxx 6 May 2008 11:45:52 -0000 @@ -251,6 +251,7 @@ case XML_DRAWING: aName = SvGlobalName(SO3_SDRAW_CLASSID); break; case XML_PRESENTATION: aName = SvGlobalName(SO3_SIMPRESS_CLASSID); break; case XML_CHART: aName = SvGlobalName(SO3_SCH_CLASSID); break; + default: break; } break; Index: binfilter/bf_xmloff/source/draw/xmloff_XMLImageMapExport.cxx =================================================================== RCS file: /cvs/framework/binfilter/bf_xmloff/source/draw/xmloff_XMLImageMapExport.cxx,v retrieving revision 1.5 diff -u -r1.5 xmloff_XMLImageMapExport.cxx --- binfilter/bf_xmloff/source/draw/xmloff_XMLImageMapExport.cxx 10 Apr 2008 19:21:50 -0000 1.5 +++ binfilter/bf_xmloff/source/draw/xmloff_XMLImageMapExport.cxx 6 May 2008 11:45:52 -0000 @@ -272,6 +272,8 @@ case XML_AREA_POLYGON: ExportPolygon(rPropertySet); break; + default: + break; } // write element Index: binfilter/bf_xmloff/source/draw/xmloff_animimp.cxx =================================================================== RCS file: /cvs/framework/binfilter/bf_xmloff/source/draw/xmloff_animimp.cxx,v retrieving revision 1.5 diff -u -r1.5 xmloff_animimp.cxx --- binfilter/bf_xmloff/source/draw/xmloff_animimp.cxx 10 Apr 2008 19:23:17 -0000 1.5 +++ binfilter/bf_xmloff/source/draw/xmloff_animimp.cxx 6 May 2008 11:45:53 -0000 @@ -168,6 +168,7 @@ case ED_spiral_inward_right:return AnimationEffect_SPIRALIN_RIGHT; case ED_spiral_outward_left:return AnimationEffect_SPIRALOUT_LEFT; case ED_spiral_outward_right:return AnimationEffect_SPIRALOUT_RIGHT; + default: break; } return AnimationEffect_FADE_FROM_LEFT; case EK_move: @@ -201,6 +202,7 @@ case ED_to_upperright: return AnimationEffect_MOVE_TO_UPPERRIGHT; case ED_to_lowerright: return AnimationEffect_MOVE_TO_LOWERRIGHT; case ED_to_lowerleft: return AnimationEffect_MOVE_TO_LOWERLEFT; + default: break; } return AnimationEffect_ZOOM_IN; } @@ -218,6 +220,7 @@ case ED_from_lowerright: return AnimationEffect_ZOOM_OUT_FROM_LOWERRIGHT; case ED_from_center: return AnimationEffect_ZOOM_OUT_FROM_CENTER; case ED_spiral_inward_left: return AnimationEffect_ZOOM_OUT_SPIRAL; + default: break; } return AnimationEffect_ZOOM_OUT; } @@ -241,6 +244,7 @@ case ED_to_upperright: return AnimationEffect_MOVE_TO_UPPERRIGHT; case ED_to_lowerright: return AnimationEffect_MOVE_TO_LOWERRIGHT; case ED_to_lowerleft: return AnimationEffect_MOVE_TO_LOWERLEFT; + default: break; } } return AnimationEffect_MOVE_FROM_LEFT; @@ -268,6 +272,7 @@ case ED_from_top: return AnimationEffect_WAVYLINE_FROM_TOP; case ED_from_right: return AnimationEffect_WAVYLINE_FROM_RIGHT; case ED_from_bottom: return AnimationEffect_WAVYLINE_FROM_BOTTOM; + default: break; } return AnimationEffect_WAVYLINE_FROM_LEFT; case EK_random: @@ -288,7 +293,8 @@ case ED_from_upperright: return AnimationEffect_LASER_FROM_UPPERRIGHT; case ED_from_lowerleft: return AnimationEffect_LASER_FROM_LOWERLEFT; case ED_from_lowerright: return AnimationEffect_LASER_FROM_LOWERRIGHT; - } + default: break; + } return AnimationEffect_LASER_FROM_LEFT; case EK_appear: return AnimationEffect_APPEAR; @@ -313,6 +319,7 @@ case ED_to_lowerright: return AnimationEffect_MOVE_SHORT_TO_LOWERRIGHT; case ED_to_bottom: return AnimationEffect_MOVE_SHORT_TO_BOTTOM; case ED_to_lowerleft: return AnimationEffect_MOVE_SHORT_TO_LOWERLEFT; + default: break; } return AnimationEffect_MOVE_SHORT_FROM_LEFT; case EK_checkerboard: @@ -338,8 +345,11 @@ case ED_from_lowerright: return AnimationEffect_STRETCH_FROM_LOWERRIGHT; case ED_vertical: return AnimationEffect_VERTICAL_STRETCH; case ED_horizontal: return AnimationEffect_HORIZONTAL_STRETCH; + default: break; } return AnimationEffect_STRETCH_FROM_LEFT; + default: + break; } return AnimationEffect_NONE; @@ -486,9 +496,9 @@ XMLAnimationsEffectContext::XMLAnimationsEffectContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList, AnimImpImpl* pImpl ) : SvXMLImportContext(rImport, nPrfx, rLocalName), mpImpl( pImpl ), - meKind( XMLE_SHOW ), mbTextEffect( sal_False ), mnShapeId( -1 ), mnPathShapeId( -1 ), + meKind( XMLE_SHOW ), mbTextEffect( sal_False ), mnShapeId( -1 ), meEffect( EK_none ), meDirection( ED_none ), mnStartScale( 100 ), - meSpeed( AnimationSpeed_MEDIUM ), maDimColor(0), mbPlayFull( sal_False ) + meSpeed( AnimationSpeed_MEDIUM ), maDimColor(0), mbPlayFull( sal_False ),mnPathShapeId( -1 ) { if( IsXMLToken( rLocalName, XML_SHOW_SHAPE ) ) { Index: binfilter/bf_xmloff/source/style/xmloff_XMLBackgroundImageContext.cxx =================================================================== RCS file: /cvs/framework/binfilter/bf_xmloff/source/style/xmloff_XMLBackgroundImageContext.cxx,v retrieving revision 1.6 diff -u -r1.6 xmloff_XMLBackgroundImageContext.cxx --- binfilter/bf_xmloff/source/style/xmloff_XMLBackgroundImageContext.cxx 10 Apr 2008 20:07:12 -0000 1.6 +++ binfilter/bf_xmloff/source/style/xmloff_XMLBackgroundImageContext.cxx 6 May 2008 11:45:53 -0000 @@ -144,6 +144,8 @@ ? GraphicLocation_MIDDLE_BOTTOM : GraphicLocation_RIGHT_BOTTOM); break; + default: + break; } } @@ -183,6 +185,8 @@ ? GraphicLocation_RIGHT_MIDDLE : GraphicLocation_RIGHT_BOTTOM); break; + default: + break; } } Index: binfilter/bf_xmloff/source/style/xmloff_XMLBackgroundImageExport.cxx =================================================================== RCS file: /cvs/framework/binfilter/bf_xmloff/source/style/xmloff_XMLBackgroundImageExport.cxx,v retrieving revision 1.5 diff -u -r1.5 xmloff_XMLBackgroundImageExport.cxx --- binfilter/bf_xmloff/source/style/xmloff_XMLBackgroundImageExport.cxx 10 Apr 2008 20:07:33 -0000 1.5 +++ binfilter/bf_xmloff/source/style/xmloff_XMLBackgroundImageExport.cxx 6 May 2008 11:45:53 -0000 @@ -104,6 +104,8 @@ case GraphicLocation_RIGHT_BOTTOM: aOut.append( GetXMLToken(XML_BOTTOM) ); break; + default: + break; } if( aOut.getLength() ) @@ -127,6 +129,8 @@ case GraphicLocation_RIGHT_BOTTOM: aOut.append( GetXMLToken(XML_RIGHT) ); break; + default: + break; } } if( aOut.getLength() ) @@ -156,7 +160,7 @@ if( pTransparency ) { - sal_Int8 nTransparency; + sal_Int8 nTransparency = 0; if( (*pTransparency) >>= nTransparency ) { OUStringBuffer aOut; Index: binfilter/bf_xmloff/source/text/xmloff_txtexppr.cxx =================================================================== RCS file: /cvs/framework/binfilter/bf_xmloff/source/text/xmloff_txtexppr.cxx,v retrieving revision 1.5 diff -u -r1.5 xmloff_txtexppr.cxx --- binfilter/bf_xmloff/source/text/xmloff_txtexppr.cxx 10 Apr 2008 21:04:14 -0000 1.5 +++ binfilter/bf_xmloff/source/text/xmloff_txtexppr.cxx 6 May 2008 11:45:55 -0000 @@ -213,8 +213,8 @@ SvXMLExportPropertyMapper( rMapper ), rExport( rExp ), bDropWholeWord( sal_False ), - maTabStopExport( rExp ), maDropCapExport( rExp ), + maTabStopExport( rExp ), maTextColumnsExport( rExp ), maBackgroundImageExport( rExp ) { @@ -244,7 +244,7 @@ if( pFontStyleNameState && (pFontStyleNameState->maValue >>= sTmp ) ) sStyleName = sTmp; - sal_Int16 nTmp; + sal_Int16 nTmp = 0; if( pFontFamilyState && (pFontFamilyState->maValue >>= nTmp ) ) nFamily = nTmp; if( pFontPitchState && (pFontPitchState->maValue >>= nTmp ) ) @@ -291,7 +291,7 @@ { if( pCharPropHeightState ) { - sal_Int32 nTemp; + sal_Int32 nTemp = 0; pCharPropHeightState->maValue >>= nTemp; if( nTemp == 100 ) { @@ -306,7 +306,7 @@ } if( pCharDiffHeightState ) { - float nTemp; + float nTemp = 0; pCharDiffHeightState->maValue >>= nTemp; if( nTemp == 0. ) { @@ -556,7 +556,7 @@ sal_Bool bClear = !pUnderlineState; if( !bClear ) { - sal_Int16 nUnderline; + sal_Int16 nUnderline = 0; pUnderlineState->maValue >>= nUnderline; bClear = FontUnderline::NONE == nUnderline; } @@ -571,7 +571,7 @@ if( pParaLeftMarginState && pParaLeftMarginRelState ) { - sal_Int32 nTemp; + sal_Int32 nTemp = 0; pParaLeftMarginRelState->maValue >>= nTemp; if( nTemp == 100 ) { @@ -588,7 +588,7 @@ if( pParaRightMarginState && pParaRightMarginRelState ) { - sal_Int32 nTemp; + sal_Int32 nTemp = 0; pParaRightMarginRelState->maValue >>= nTemp; if( nTemp == 100 ) { @@ -604,7 +604,7 @@ if( pParaFirstLineState && pParaFirstLineRelState ) { - sal_Int32 nTemp; + sal_Int32 nTemp = 0; pParaFirstLineRelState->maValue >>= nTemp; if( nTemp == 100 ) { @@ -620,7 +620,7 @@ if( pParaTopMarginState && pParaTopMarginRelState ) { - sal_Int32 nTemp; + sal_Int32 nTemp = 0; pParaTopMarginRelState->maValue >>= nTemp; if( nTemp == 100 ) { @@ -637,7 +637,7 @@ if( pParaBottomMarginState && pParaBottomMarginRelState ) { - sal_Int32 nTemp; + sal_Int32 nTemp = 0; pParaBottomMarginRelState->maValue >>= nTemp; if( nTemp == 100 ) { @@ -695,7 +695,10 @@ { if( pLeftBorderDistanceState && pRightBorderDistanceState && pTopBorderDistanceState && pBottomBorderDistanceState ) { - sal_Int32 aLeft, aRight, aTop, aBottom; + sal_Int32 aLeft = 0; + sal_Int32 aRight = 0; + sal_Int32 aTop = 0; + sal_Int32 aBottom = 0; pLeftBorderDistanceState->maValue >>= aLeft; pRightBorderDistanceState->maValue >>= aRight; @@ -773,7 +776,7 @@ if( pHeightMinAbsState ) { - sal_Int16 nRel; + sal_Int16 nRel = 0; if( (SizeType::MIN != nSizeType) || ( pHeightMinRelState && ( !(pHeightMinRelState->maValue >>= nRel) || nRel > 0 ) ) ) @@ -808,6 +811,8 @@ pWrapContourState->mnIndex = -1; break; // <-- + default: + break; } if( pWrapContourModeState && (!pWrapContourState || Index: binfilter/bf_xmloff/source/text/xmloff_txtparae.cxx =================================================================== RCS file: /cvs/framework/binfilter/bf_xmloff/source/text/xmloff_txtparae.cxx,v retrieving revision 1.11 diff -u -r1.11 xmloff_txtparae.cxx --- binfilter/bf_xmloff/source/text/xmloff_txtparae.cxx 10 Apr 2008 21:07:32 -0000 1.11 +++ binfilter/bf_xmloff/source/text/xmloff_txtparae.cxx 6 May 2008 11:45:55 -0000 @@ -730,10 +730,6 @@ XMLStyleExport( rExp, OUString(), &rASP ), // rExport( rExp ), rAutoStylePool( rASP ), - pListElements( 0 ), - pExportedLists( 0 ), - pListAutoPool( new XMLTextListAutoStylePool( this->GetExport() ) ), - pFieldExport( 0 ), pPageTextFrameIdxs( 0 ), pPageGraphicIdxs( 0 ), pPageEmbeddedIdxs( 0 ), @@ -741,18 +737,23 @@ pFrameTextFrameIdxs( 0 ), pFrameGraphicIdxs( 0 ), pFrameEmbeddedIdxs( 0 ), + pFrameShapeIdxs( 0 ), + pFieldExport( 0 ), + pListElements( 0 ), + pExportedLists( 0 ), + pListAutoPool( new XMLTextListAutoStylePool( this->GetExport() ) ), pSectionExport( NULL ), pIndexMarkExport( NULL ), pRedlineExport( NULL ), - pFrameShapeIdxs( 0 ), + bProgress( sal_False ), bBlock( sal_False ), bOpenRuby( sal_False ), sParagraphService(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.Paragraph")), sTableService(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextTable")), sTextFieldService(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextField")), sTextFrameService(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextFrame")), - sTextGraphicService(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextGraphicObject")), sTextEmbeddedService(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextEmbeddedObject")), + sTextGraphicService(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextGraphicObject")), sTextEndnoteService(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.Endnote")), sTextContentService(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextContent")), sShapeService(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.Shape")), @@ -762,8 +763,8 @@ sCharStyleName(RTL_CONSTASCII_USTRINGPARAM("CharStyleName")), sCharStyleNames(RTL_CONSTASCII_USTRINGPARAM("CharStyleNames")), sFrameStyleName(RTL_CONSTASCII_USTRINGPARAM("FrameStyleName")), - sTextField(RTL_CONSTASCII_USTRINGPARAM("TextField")), sText(RTL_CONSTASCII_USTRINGPARAM("Text")), + sTextField(RTL_CONSTASCII_USTRINGPARAM("TextField")), sFrame(RTL_CONSTASCII_USTRINGPARAM("Frame")), sCategory(RTL_CONSTASCII_USTRINGPARAM("Category")), sNumberingRules(RTL_CONSTASCII_USTRINGPARAM("NumberingRules")), @@ -811,8 +812,8 @@ sHyperLinkTarget(RTL_CONSTASCII_USTRINGPARAM("HyperLinkTarget")), sUnvisitedCharStyleName(RTL_CONSTASCII_USTRINGPARAM("UnvisitedCharStyleName")), sVisitedCharStyleName(RTL_CONSTASCII_USTRINGPARAM("VisitedCharStyleName")), - sTextSection(RTL_CONSTASCII_USTRINGPARAM("TextSection")), sDocumentIndex(RTL_CONSTASCII_USTRINGPARAM("DocumentIndex")), + sTextSection(RTL_CONSTASCII_USTRINGPARAM("TextSection")), sDocumentIndexMark(RTL_CONSTASCII_USTRINGPARAM("DocumentIndexMark")), sActualSize(RTL_CONSTASCII_USTRINGPARAM("ActualSize")), sContourPolyPolygon(RTL_CONSTASCII_USTRINGPARAM("ContourPolyPolygon")), @@ -825,7 +826,6 @@ sRubyText(RTL_CONSTASCII_USTRINGPARAM("RubyText")), sRubyAdjust(RTL_CONSTASCII_USTRINGPARAM("RubyAdjust")), sRubyCharStyleName(RTL_CONSTASCII_USTRINGPARAM("RubyCharStyleName")), - bProgress( sal_False ), aCharStyleNamesPropInfoCache( sCharStyleNames ) { UniReference < XMLPropertySetMapper > xPropMapper = @@ -970,6 +970,8 @@ pFrameTextFrameIdxs = new SvLongs; pFrameTextFrameIdxs->Insert( i, pFrameTextFrameIdxs->Count() ); break; + default: + break; } } } @@ -1007,6 +1009,8 @@ pFrameGraphicIdxs = new SvLongs; pFrameGraphicIdxs->Insert( i, pFrameGraphicIdxs->Count() ); break; + default: + break; } } } @@ -1044,6 +1048,8 @@ pFrameEmbeddedIdxs = new SvLongs; pFrameEmbeddedIdxs->Insert( i, pFrameEmbeddedIdxs->Count() ); break; + default: + break; } } } @@ -2133,6 +2139,8 @@ GetExport().GetShapeExport()->collectShapeAutoStyles( xShape ); } break; + default: + break; } } else @@ -2412,7 +2420,7 @@ // svg:transform aAny = rPropSet->getPropertyValue( sGraphicRotation ); - sal_Int16 nVal; + sal_Int16 nVal = 0; aAny >>= nVal; if( nVal != 0 ) { Index: binfilter/bf_xmloff/source/text/xmloff_txtparai.cxx =================================================================== RCS file: /cvs/framework/binfilter/bf_xmloff/source/text/xmloff_txtparai.cxx,v retrieving revision 1.7 diff -u -r1.7 xmloff_txtparai.cxx --- binfilter/bf_xmloff/source/text/xmloff_txtparai.cxx 10 Apr 2008 21:08:02 -0000 1.7 +++ binfilter/bf_xmloff/source/text/xmloff_txtparai.cxx 6 May 2008 11:45:56 -0000 @@ -111,16 +111,16 @@ XMLHint_Impl( sal_uInt8 nTyp, const Reference < XTextRange > & rS, const Reference < XTextRange > & rE ) : - nType( nTyp ), xStart( rS ), - xEnd( rE ) + xEnd( rE ), + nType( nTyp ) { } XMLHint_Impl( sal_uInt8 nTyp, const Reference < XTextRange > & rS ) : - nType( nTyp ), - xStart( rS ) + xStart( rS ), + nType( nTyp ) { } @@ -590,9 +590,9 @@ sal_Bool& rIgnLeadSpace ) : SvXMLImportContext( rImport, nPrfx, rLName ), rHints( rHnts ), - rIgnoreLeadingSpace( rIgnLeadSpace ), pHint( new XMLHyperlinkHint_Impl( - GetImport().GetTextImport()->GetCursorAsRange()->getStart() ) ) + GetImport().GetTextImport()->GetCursorAsRange()->getStart() ) ), + rIgnoreLeadingSpace( rIgnLeadSpace ) { OUString sShow; const SvXMLTokenMap& rTokenMap = @@ -845,9 +845,9 @@ sal_Bool& rIgnLeadSpace ) : SvXMLImportContext( rImport, nPrfx, rLName ), rHints( rHnts ), - rIgnoreLeadingSpace( rIgnLeadSpace ), pHint( new XMLRubyHint_Impl( - GetImport().GetTextImport()->GetCursorAsRange()->getStart() ) ) + GetImport().GetTextImport()->GetCursorAsRange()->getStart() ) ), + rIgnoreLeadingSpace( rIgnLeadSpace ) { sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; i++ ) @@ -971,9 +971,9 @@ enum XMLTextPElemTokens eTok, XMLHints_Impl& rHnts) : SvXMLImportContext(rImport, nPrefix, rLocalName), + sAlternativeText(RTL_CONSTASCII_USTRINGPARAM("AlternativeText")), rHints(rHnts), eToken(eTok), - sAlternativeText(RTL_CONSTASCII_USTRINGPARAM("AlternativeText")), sID() { } @@ -1469,10 +1469,10 @@ #endif ) : SvXMLImportContext( rImport, nPrfx, rLName ), + sTextFrame(RTL_CONSTASCII_USTRINGPARAM("TextFrame")), rHints( rHnts ), - rIgnoreLeadingSpace( rIgnLeadSpace ), pHint( 0 ), - sTextFrame(RTL_CONSTASCII_USTRINGPARAM("TextFrame")) + rIgnoreLeadingSpace( rIgnLeadSpace ) #ifdef CONV_STAR_FONTS ,nStarFontsConvFlags( nSFConvFlags & (CONV_FROM_STAR_BATS|CONV_FROM_STAR_MATH) ) #endif @@ -1524,7 +1524,6 @@ sal_Bool bInsertTextFrame = sal_False; sal_uInt16 nTextFrameType = 0; - sal_Bool bObjectOLE = sal_False; switch( nToken ) { case XML_TOK_TEXT_SPAN: @@ -2002,7 +2001,6 @@ sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList > & xAttrList ) { - SvXMLImportContext *pContext = 0; const SvXMLTokenMap& rTokenMap = GetImport().GetTextImport()->GetTextPElemTokenMap(); Index: binfilter/bf_xmloff/source/text/xmloff_txtprhdl.cxx =================================================================== RCS file: /cvs/framework/binfilter/bf_xmloff/source/text/xmloff_txtprhdl.cxx,v retrieving revision 1.6 diff -u -r1.6 xmloff_txtprhdl.cxx --- binfilter/bf_xmloff/source/text/xmloff_txtprhdl.cxx 10 Apr 2008 21:09:04 -0000 1.6 +++ binfilter/bf_xmloff/source/text/xmloff_txtprhdl.cxx 6 May 2008 11:45:56 -0000 @@ -982,7 +982,7 @@ { OUStringBuffer aOut( 15 ); sal_Bool bRet = sal_True; - sal_Int16 nType; + sal_Int16 nType = 0; if( rValue >>= nType ) { sal_Bool bBelow = sal_False; @@ -1082,8 +1082,8 @@ Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const { - sal_Bool bRet; - sal_Int32 nValue; + sal_Bool bRet = sal_False; + sal_Int32 nValue = 0; bRet = rUnitConverter.convertPercent( nValue, rStrImpValue ); if( bRet ) rValue <<= (sal_Int16)nValue; @@ -1097,7 +1097,7 @@ const SvXMLUnitConverter& rUnitConverter ) const { sal_Bool bRet = sal_False; - sal_Int16 nValue; + sal_Int16 nValue = 0; if( (rValue >>= nValue) && nValue > 0 ) { OUStringBuffer aOut; @@ -1214,7 +1214,7 @@ const Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const { - sal_Int16 nAngle; + sal_Int16 nAngle = 0; sal_Bool bRet = ( rValue >>= nAngle ); if( bRet ) { Index: binfilter/binfilterdetect/source/bindetect.cxx =================================================================== RCS file: /cvs/framework/binfilter/binfilterdetect/source/bindetect.cxx,v retrieving revision 1.14 diff -u -r1.14 bindetect.cxx --- binfilter/binfilterdetect/source/bindetect.cxx 10 Apr 2008 21:13:40 -0000 1.14 +++ binfilter/binfilterdetect/source/bindetect.cxx 6 May 2008 11:45:57 -0000 @@ -98,149 +98,149 @@ static const sal_uInt8 nW4WStartOffset = 5; static const TypesInfo aFileTypeList[ nFileTypeCount ] = { - RTL_CONSTASCII_STRINGPARAM("writer_StarWriter_10"), - RTL_CONSTASCII_STRINGPARAM("writer_StarWriter_20"), - RTL_CONSTASCII_STRINGPARAM("writer_StarWriter_DOS"), - RTL_CONSTASCII_STRINGPARAM("writer_Lotus_1_2_3_10_DOS_StarWriter"), - RTL_CONSTASCII_STRINGPARAM("writer_Lotus_1_2_3_10_WIN_StarWriter"), - RTL_CONSTASCII_STRINGPARAM("writer_Ami_Pro_1x_31_W4W"), // 5 , 33 - RTL_CONSTASCII_STRINGPARAM("writer_CTOS_DEF_W4W"), // 6 , 36 - RTL_CONSTASCII_STRINGPARAM("writer_Claris_Works_W4W"), // 7 , 57 - RTL_CONSTASCII_STRINGPARAM("writer_DCA_Revisable_Form_Text_W4W"), // 8 , 15 - RTL_CONSTASCII_STRINGPARAM("writer_DCA_with_Display_Write_5_W4W"), // 9 , 15 - RTL_CONSTASCII_STRINGPARAM("writer_DCAFFT_Final_Form_Text_W4W"), //10, 32 - RTL_CONSTASCII_STRINGPARAM("writer_DEC_DX_W4W"), //11, 30 - RTL_CONSTASCII_STRINGPARAM("writer_DEC_WPS_PLUS_W4W"), //12, 45 - RTL_CONSTASCII_STRINGPARAM("writer_DataGeneral_CEO_Write_W4W"), //13, 104 - RTL_CONSTASCII_STRINGPARAM("writer_DisplayWrite_20_4x_W4W"), //14, 15 - RTL_CONSTASCII_STRINGPARAM("writer_DisplayWrite_5x_W4W"), //15, 15 - RTL_CONSTASCII_STRINGPARAM("writer_EBCDIC_W4W"), //16, 02 - RTL_CONSTASCII_STRINGPARAM("writer_Enable_W4W"), //17, 28 - RTL_CONSTASCII_STRINGPARAM("writer_Frame_Maker_MIF_30_W4W"), //18, 42 - RTL_CONSTASCII_STRINGPARAM("writer_Frame_Maker_MIF_40_W4W"), //19, 42 - RTL_CONSTASCII_STRINGPARAM("writer_Frame_Maker_MIF_50_W4W"), //20, 42 - RTL_CONSTASCII_STRINGPARAM("writer_Frame_Work_III_W4W"), //21, 29 - RTL_CONSTASCII_STRINGPARAM("writer_Frame_Work_IV_W4W"), //22, 29 - RTL_CONSTASCII_STRINGPARAM("writer_HP_AdvanceWrite_Plus_W4W"), //23, 22 - RTL_CONSTASCII_STRINGPARAM("writer_ICL_Office_Power_6_W4W"), //24, 102 - RTL_CONSTASCII_STRINGPARAM("writer_ICL_Office_Power_7_W4W"), //25, 102 - RTL_CONSTASCII_STRINGPARAM("writer_Interleaf_W4W"), //26, 35 - RTL_CONSTASCII_STRINGPARAM("writer_Interleaf_5_6_W4W"), //27, 46 - RTL_CONSTASCII_STRINGPARAM("writer_Legacy_Winstar_onGO_W4W"), //28, 37 - RTL_CONSTASCII_STRINGPARAM("writer_Lotus_Manuscript_W4W"), //29, 24 - RTL_CONSTASCII_STRINGPARAM("writer_MASS_11_Rel_80_83_W4W"), //30, 31 - RTL_CONSTASCII_STRINGPARAM("writer_MASS_11_Rel_85_90_W4W"), //31, 31 - RTL_CONSTASCII_STRINGPARAM("writer_MS_MacWord_30_W4W"), //32, 54 - RTL_CONSTASCII_STRINGPARAM("writer_MS_MacWord_40_W4W"), //33, 54 - RTL_CONSTASCII_STRINGPARAM("writer_MS_MacWord_5x_W4W"), //34, 54 - RTL_CONSTASCII_STRINGPARAM("writer_MS_WinWord_1x_W4W"), //35, 44 - RTL_CONSTASCII_STRINGPARAM("writer_MS_WinWord_2x_W4W"), //36, 44 - RTL_CONSTASCII_STRINGPARAM("writer_MS_Word_3x_W4W"), //37, 05 - RTL_CONSTASCII_STRINGPARAM("writer_MS_Word_4x_W4W"), //38, 05 - RTL_CONSTASCII_STRINGPARAM("writer_MS_Word_5x_W4W"), //39, 05 - RTL_CONSTASCII_STRINGPARAM("writer_MS_Word_6x_W4W"), //40, 49 - RTL_CONSTASCII_STRINGPARAM("writer_MS_Works_20_DOS_W4W"), //41, 39 - RTL_CONSTASCII_STRINGPARAM("writer_MS_Works_30_Win_W4W"), //42, 39 - RTL_CONSTASCII_STRINGPARAM("writer_MS_Works_40_Mac_W4W"), //43, 58 - RTL_CONSTASCII_STRINGPARAM("writer_Mac_Write_4x_50_W4W"), //44, 51 - RTL_CONSTASCII_STRINGPARAM("writer_Mac_Write_II_W4W"), //45, 52 - RTL_CONSTASCII_STRINGPARAM("writer_Mac_Write_Pro_W4W"), //46, 56 - RTL_CONSTASCII_STRINGPARAM("writer_MultiMate_33_W4W"), //47, 10 - RTL_CONSTASCII_STRINGPARAM("writer_MultiMate_4_W4W"), //48, 10 - RTL_CONSTASCII_STRINGPARAM("writer_MultiMate_Adv_36_W4W"), //49, 10 - RTL_CONSTASCII_STRINGPARAM("writer_MultiMate_Adv_II_37_W4W"), //50, 10 - RTL_CONSTASCII_STRINGPARAM("writer_NAVY_DIF_W4W"), //51, 18 - RTL_CONSTASCII_STRINGPARAM("writer_OfficeWriter_40_W4W"), //52, 16 - RTL_CONSTASCII_STRINGPARAM("writer_OfficeWriter_50_W4W"), //53, 16 - RTL_CONSTASCII_STRINGPARAM("writer_OfficeWriter_6x_W4W"), //54, 16 - RTL_CONSTASCII_STRINGPARAM("writer_PFS_First_Choice_10_W4W"), //55, 08 - RTL_CONSTASCII_STRINGPARAM("writer_PFS_First_Choice_20_W4W"), //56, 08 - RTL_CONSTASCII_STRINGPARAM("writer_PFS_First_Choice_30_W4W"), //57, 08 - RTL_CONSTASCII_STRINGPARAM("writer_PFS_Write_W4W"), //58, 08 - RTL_CONSTASCII_STRINGPARAM("writer_Peach_Text_W4W"), //59, 27 - RTL_CONSTASCII_STRINGPARAM("writer_Professional_Write_10_W4W"), //60, 33 - RTL_CONSTASCII_STRINGPARAM("writer_Professional_Write_2x_W4W"), //61, 33 - RTL_CONSTASCII_STRINGPARAM("writer_Professional_Write_Plus_W4W"), //62, 33 - RTL_CONSTASCII_STRINGPARAM("writer_QA_Write_10_30_W4W"), //63, 23 - RTL_CONSTASCII_STRINGPARAM("writer_QA_Write_40_W4W"), //64, 23 - RTL_CONSTASCII_STRINGPARAM("writer_Rapid_File_10_W4W"), //65, 25 - RTL_CONSTASCII_STRINGPARAM("writer_Rapid_File_12_W4W"), //66, 25 - RTL_CONSTASCII_STRINGPARAM("writer_Samna_Word_IV_IV_Plus_W4W"), //67, 22 - RTL_CONSTASCII_STRINGPARAM("writer_Total_Word_W4W"), //68, 14 - RTL_CONSTASCII_STRINGPARAM("writer_Uniplex_V7_V8_W4W"), //69, 101 - RTL_CONSTASCII_STRINGPARAM("writer_Uniplex_onGO_W4W"), //70, 101 - RTL_CONSTASCII_STRINGPARAM("writer_VolksWriter_3_and_4_W4W"), //71, 14 - RTL_CONSTASCII_STRINGPARAM("writer_VolksWriter_Deluxe_W4W"), //72, 11 - RTL_CONSTASCII_STRINGPARAM("writer_WITA_W4W"), //73, 34 - RTL_CONSTASCII_STRINGPARAM("writer_Wang_II_SWP_W4W"), //74, 88 - RTL_CONSTASCII_STRINGPARAM("writer_Wang_PC_W4W"), //75, 26 - RTL_CONSTASCII_STRINGPARAM("writer_Wang_WP_Plus_W4W"), //76, 89 - RTL_CONSTASCII_STRINGPARAM("writer_Win_Write_3x_W4W"), //77, 43 - RTL_CONSTASCII_STRINGPARAM("writer_WiziWord_30_W4W"), //78, 47 - RTL_CONSTASCII_STRINGPARAM("writer_WordPerfect_Win_51_52_W4W"), //79, 07 - RTL_CONSTASCII_STRINGPARAM("writer_WordPerfect_Win_60_W4W"), //80, 48 - RTL_CONSTASCII_STRINGPARAM("writer_WordPerfect_Win_61_W4W"), //81, 48 - RTL_CONSTASCII_STRINGPARAM("writer_WordPerfect_Win_70_W4W"), //82, 07 - RTL_CONSTASCII_STRINGPARAM("writer_WordPerfect_41_W4W"), //83, 06 - RTL_CONSTASCII_STRINGPARAM("writer_WordPerfect_42_W4W"), //84, 06 - RTL_CONSTASCII_STRINGPARAM("writer_WordPerfect_50_W4W"), //85, 07 - RTL_CONSTASCII_STRINGPARAM("writer_WordPerfect_51_W4W"), //86, 07 - RTL_CONSTASCII_STRINGPARAM("writer_WordPerfect_60_W4W"), //87, 07 - RTL_CONSTASCII_STRINGPARAM("writer_WordPerfect_61_W4W"), //88, 07 - RTL_CONSTASCII_STRINGPARAM("writer_WordPerfect_Mac_1_W4W"), //89, 59 - RTL_CONSTASCII_STRINGPARAM("writer_WordPerfect_Mac_2_W4W"), //90, 60 - RTL_CONSTASCII_STRINGPARAM("writer_WordPerfect_Mac_3_W4W"), //91, 60 - RTL_CONSTASCII_STRINGPARAM("writer_WordStar_Win_1x_20_W4W"), //92, 04 - RTL_CONSTASCII_STRINGPARAM("writer_WordStar_2000_Rel_30_W4W"), //93, 09 - RTL_CONSTASCII_STRINGPARAM("writer_WordStar_2000_Rel_35_W4W"), //94, 09 - RTL_CONSTASCII_STRINGPARAM("writer_WordStar_33x_W4W"), //95, 04 - RTL_CONSTASCII_STRINGPARAM("writer_WordStar_345_W4W"), //96, 04 - RTL_CONSTASCII_STRINGPARAM("writer_WordStar_40_W4W"), //97, 04 - RTL_CONSTASCII_STRINGPARAM("writer_WordStar_50_W4W"), //98, 04 - RTL_CONSTASCII_STRINGPARAM("writer_WordStar_55_W4W"), //99, 04 - RTL_CONSTASCII_STRINGPARAM("writer_WordStar_60_W4W"), //100, 04 - RTL_CONSTASCII_STRINGPARAM("writer_WordStar_70_W4W"), //101, 04 - RTL_CONSTASCII_STRINGPARAM("writer_WriteNow_30_Macintosh_W4W"), //102, 62 - RTL_CONSTASCII_STRINGPARAM("writer_Writing_Assistant_W4W"), //103, 13 - RTL_CONSTASCII_STRINGPARAM("writer_XEROX_XIF_50_Illustrator_W4W"), //104, 103 - RTL_CONSTASCII_STRINGPARAM("writer_XEROX_XIF_50_W4W"), //105, 103 - RTL_CONSTASCII_STRINGPARAM("writer_XEROX_XIF_60_Color_Bitmap_W4W"), //106, 103 - RTL_CONSTASCII_STRINGPARAM("writer_XEROX_XIF_60_Res_Graphic_W4W"), //107, 103 - RTL_CONSTASCII_STRINGPARAM("writer_XyWrite_Win_10_W4W"), //108, 17 - RTL_CONSTASCII_STRINGPARAM("writer_XyWrite_III_W4W"), //109, 17 - RTL_CONSTASCII_STRINGPARAM("writer_XyWrite_IIIP_W4W"), //110, 17 - RTL_CONSTASCII_STRINGPARAM("writer_XyWrite_IV_W4W"), //111, 17 - RTL_CONSTASCII_STRINGPARAM("writer_XyWrite_Sig_Win_W4W"), //112, 17 - RTL_CONSTASCII_STRINGPARAM("writer_XyWrite_Signature_W4W"), //113, 17 - RTL_CONSTASCII_STRINGPARAM("calc_StarCalc_30"), - RTL_CONSTASCII_STRINGPARAM("calc_StarCalc_30_VorlageTemplate"), - RTL_CONSTASCII_STRINGPARAM("calc_StarCalc_40"), - RTL_CONSTASCII_STRINGPARAM("calc_StarCalc_40_VorlageTemplate"), - RTL_CONSTASCII_STRINGPARAM("calc_StarCalc_50"), - RTL_CONSTASCII_STRINGPARAM("calc_StarCalc_50_VorlageTemplate"), - RTL_CONSTASCII_STRINGPARAM("chart_StarChart_30"), - RTL_CONSTASCII_STRINGPARAM("chart_StarChart_40"), - RTL_CONSTASCII_STRINGPARAM("chart_StarChart_50"), - RTL_CONSTASCII_STRINGPARAM("draw_StarDraw_30"), - RTL_CONSTASCII_STRINGPARAM("draw_StarDraw_30_Vorlage"), - RTL_CONSTASCII_STRINGPARAM("draw_StarDraw_50"), - RTL_CONSTASCII_STRINGPARAM("draw_StarDraw_50_Vorlage"), - RTL_CONSTASCII_STRINGPARAM("impress_StarImpress_40"), - RTL_CONSTASCII_STRINGPARAM("impress_StarImpress_40_Vorlage"), - RTL_CONSTASCII_STRINGPARAM("impress_StarImpress_50"), - RTL_CONSTASCII_STRINGPARAM("impress_StarImpress_50_Vorlage"), - RTL_CONSTASCII_STRINGPARAM("impress_StarImpress_50_packed"), - RTL_CONSTASCII_STRINGPARAM("math_StarMath_30"), - RTL_CONSTASCII_STRINGPARAM("math_StarMath_40"), - RTL_CONSTASCII_STRINGPARAM("math_StarMath_50"), - RTL_CONSTASCII_STRINGPARAM("writer_StarWriter_30"), - RTL_CONSTASCII_STRINGPARAM("writer_StarWriter_30_VorlageTemplate"), - RTL_CONSTASCII_STRINGPARAM("writer_StarWriter_40"), - RTL_CONSTASCII_STRINGPARAM("writer_StarWriter_40_VorlageTemplate"), - RTL_CONSTASCII_STRINGPARAM("writer_globaldocument_StarWriter_40GlobalDocument"), - RTL_CONSTASCII_STRINGPARAM("writer_StarWriter_50"), - RTL_CONSTASCII_STRINGPARAM("writer_StarWriter_50_VorlageTemplate"), - RTL_CONSTASCII_STRINGPARAM("writer_globaldocument_StarWriter_50GlobalDocument") + { RTL_CONSTASCII_STRINGPARAM("writer_StarWriter_10")}, + { RTL_CONSTASCII_STRINGPARAM("writer_StarWriter_20")}, + { RTL_CONSTASCII_STRINGPARAM("writer_StarWriter_DOS")}, + { RTL_CONSTASCII_STRINGPARAM("writer_Lotus_1_2_3_10_DOS_StarWriter")}, + { RTL_CONSTASCII_STRINGPARAM("writer_Lotus_1_2_3_10_WIN_StarWriter")}, + { RTL_CONSTASCII_STRINGPARAM("writer_Ami_Pro_1x_31_W4W")}, // 5 , 33 + { RTL_CONSTASCII_STRINGPARAM("writer_CTOS_DEF_W4W")}, // 6 , 36 + { RTL_CONSTASCII_STRINGPARAM("writer_Claris_Works_W4W")}, // 7 , 57 + { RTL_CONSTASCII_STRINGPARAM("writer_DCA_Revisable_Form_Text_W4W")}, // 8 , 15 + { RTL_CONSTASCII_STRINGPARAM("writer_DCA_with_Display_Write_5_W4W")}, // 9 , 15 + { RTL_CONSTASCII_STRINGPARAM("writer_DCAFFT_Final_Form_Text_W4W")}, //10, 32 + { RTL_CONSTASCII_STRINGPARAM("writer_DEC_DX_W4W")}, //11, 30 + { RTL_CONSTASCII_STRINGPARAM("writer_DEC_WPS_PLUS_W4W")}, //12, 45 + { RTL_CONSTASCII_STRINGPARAM("writer_DataGeneral_CEO_Write_W4W")}, //13, 104 + { RTL_CONSTASCII_STRINGPARAM("writer_DisplayWrite_20_4x_W4W")}, //14, 15 + { RTL_CONSTASCII_STRINGPARAM("writer_DisplayWrite_5x_W4W")}, //15, 15 + { RTL_CONSTASCII_STRINGPARAM("writer_EBCDIC_W4W")}, //16, 02 + { RTL_CONSTASCII_STRINGPARAM("writer_Enable_W4W")}, //17, 28 + { RTL_CONSTASCII_STRINGPARAM("writer_Frame_Maker_MIF_30_W4W")}, //18, 42 + { RTL_CONSTASCII_STRINGPARAM("writer_Frame_Maker_MIF_40_W4W")}, //19, 42 + { RTL_CONSTASCII_STRINGPARAM("writer_Frame_Maker_MIF_50_W4W")}, //20, 42 + { RTL_CONSTASCII_STRINGPARAM("writer_Frame_Work_III_W4W")}, //21, 29 + { RTL_CONSTASCII_STRINGPARAM("writer_Frame_Work_IV_W4W")}, //22, 29 + { RTL_CONSTASCII_STRINGPARAM("writer_HP_AdvanceWrite_Plus_W4W")}, //23, 22 + { RTL_CONSTASCII_STRINGPARAM("writer_ICL_Office_Power_6_W4W")}, //24, 102 + { RTL_CONSTASCII_STRINGPARAM("writer_ICL_Office_Power_7_W4W")}, //25, 102 + { RTL_CONSTASCII_STRINGPARAM("writer_Interleaf_W4W")}, //26, 35 + { RTL_CONSTASCII_STRINGPARAM("writer_Interleaf_5_6_W4W")}, //27, 46 + { RTL_CONSTASCII_STRINGPARAM("writer_Legacy_Winstar_onGO_W4W")}, //28, 37 + { RTL_CONSTASCII_STRINGPARAM("writer_Lotus_Manuscript_W4W")}, //29, 24 + { RTL_CONSTASCII_STRINGPARAM("writer_MASS_11_Rel_80_83_W4W")}, //30, 31 + { RTL_CONSTASCII_STRINGPARAM("writer_MASS_11_Rel_85_90_W4W")}, //31, 31 + { RTL_CONSTASCII_STRINGPARAM("writer_MS_MacWord_30_W4W")}, //32, 54 + { RTL_CONSTASCII_STRINGPARAM("writer_MS_MacWord_40_W4W")}, //33, 54 + { RTL_CONSTASCII_STRINGPARAM("writer_MS_MacWord_5x_W4W")}, //34, 54 + { RTL_CONSTASCII_STRINGPARAM("writer_MS_WinWord_1x_W4W")}, //35, 44 + { RTL_CONSTASCII_STRINGPARAM("writer_MS_WinWord_2x_W4W")}, //36, 44 + { RTL_CONSTASCII_STRINGPARAM("writer_MS_Word_3x_W4W")}, //37, 05 + { RTL_CONSTASCII_STRINGPARAM("writer_MS_Word_4x_W4W")}, //38, 05 + { RTL_CONSTASCII_STRINGPARAM("writer_MS_Word_5x_W4W")}, //39, 05 + { RTL_CONSTASCII_STRINGPARAM("writer_MS_Word_6x_W4W")}, //40, 49 + { RTL_CONSTASCII_STRINGPARAM("writer_MS_Works_20_DOS_W4W")}, //41, 39 + { RTL_CONSTASCII_STRINGPARAM("writer_MS_Works_30_Win_W4W")}, //42, 39 + { RTL_CONSTASCII_STRINGPARAM("writer_MS_Works_40_Mac_W4W")}, //43, 58 + { RTL_CONSTASCII_STRINGPARAM("writer_Mac_Write_4x_50_W4W")}, //44, 51 + { RTL_CONSTASCII_STRINGPARAM("writer_Mac_Write_II_W4W")}, //45, 52 + { RTL_CONSTASCII_STRINGPARAM("writer_Mac_Write_Pro_W4W")}, //46, 56 + { RTL_CONSTASCII_STRINGPARAM("writer_MultiMate_33_W4W")}, //47, 10 + { RTL_CONSTASCII_STRINGPARAM("writer_MultiMate_4_W4W")}, //48, 10 + { RTL_CONSTASCII_STRINGPARAM("writer_MultiMate_Adv_36_W4W")}, //49, 10 + { RTL_CONSTASCII_STRINGPARAM("writer_MultiMate_Adv_II_37_W4W")}, //50, 10 + { RTL_CONSTASCII_STRINGPARAM("writer_NAVY_DIF_W4W")}, //51, 18 + { RTL_CONSTASCII_STRINGPARAM("writer_OfficeWriter_40_W4W")}, //52, 16 + { RTL_CONSTASCII_STRINGPARAM("writer_OfficeWriter_50_W4W")}, //53, 16 + { RTL_CONSTASCII_STRINGPARAM("writer_OfficeWriter_6x_W4W")}, //54, 16 + { RTL_CONSTASCII_STRINGPARAM("writer_PFS_First_Choice_10_W4W")}, //55, 08 + { RTL_CONSTASCII_STRINGPARAM("writer_PFS_First_Choice_20_W4W")}, //56, 08 + { RTL_CONSTASCII_STRINGPARAM("writer_PFS_First_Choice_30_W4W")}, //57, 08 + { RTL_CONSTASCII_STRINGPARAM("writer_PFS_Write_W4W")}, //58, 08 + { RTL_CONSTASCII_STRINGPARAM("writer_Peach_Text_W4W")}, //59, 27 + { RTL_CONSTASCII_STRINGPARAM("writer_Professional_Write_10_W4W")}, //60, 33 + { RTL_CONSTASCII_STRINGPARAM("writer_Professional_Write_2x_W4W")}, //61, 33 + { RTL_CONSTASCII_STRINGPARAM("writer_Professional_Write_Plus_W4W")}, //62, 33 + { RTL_CONSTASCII_STRINGPARAM("writer_QA_Write_10_30_W4W")}, //63, 23 + { RTL_CONSTASCII_STRINGPARAM("writer_QA_Write_40_W4W")}, //64, 23 + { RTL_CONSTASCII_STRINGPARAM("writer_Rapid_File_10_W4W")}, //65, 25 + { RTL_CONSTASCII_STRINGPARAM("writer_Rapid_File_12_W4W")}, //66, 25 + { RTL_CONSTASCII_STRINGPARAM("writer_Samna_Word_IV_IV_Plus_W4W")}, //67, 22 + { RTL_CONSTASCII_STRINGPARAM("writer_Total_Word_W4W")}, //68, 14 + { RTL_CONSTASCII_STRINGPARAM("writer_Uniplex_V7_V8_W4W")}, //69, 101 + { RTL_CONSTASCII_STRINGPARAM("writer_Uniplex_onGO_W4W")}, //70, 101 + { RTL_CONSTASCII_STRINGPARAM("writer_VolksWriter_3_and_4_W4W")}, //71, 14 + { RTL_CONSTASCII_STRINGPARAM("writer_VolksWriter_Deluxe_W4W")}, //72, 11 + { RTL_CONSTASCII_STRINGPARAM("writer_WITA_W4W")}, //73, 34 + { RTL_CONSTASCII_STRINGPARAM("writer_Wang_II_SWP_W4W")}, //74, 88 + { RTL_CONSTASCII_STRINGPARAM("writer_Wang_PC_W4W")}, //75, 26 + { RTL_CONSTASCII_STRINGPARAM("writer_Wang_WP_Plus_W4W")}, //76, 89 + { RTL_CONSTASCII_STRINGPARAM("writer_Win_Write_3x_W4W")}, //77, 43 + { RTL_CONSTASCII_STRINGPARAM("writer_WiziWord_30_W4W")}, //78, 47 + { RTL_CONSTASCII_STRINGPARAM("writer_WordPerfect_Win_51_52_W4W")}, //79, 07 + { RTL_CONSTASCII_STRINGPARAM("writer_WordPerfect_Win_60_W4W")}, //80, 48 + { RTL_CONSTASCII_STRINGPARAM("writer_WordPerfect_Win_61_W4W")}, //81, 48 + { RTL_CONSTASCII_STRINGPARAM("writer_WordPerfect_Win_70_W4W")}, //82, 07 + { RTL_CONSTASCII_STRINGPARAM("writer_WordPerfect_41_W4W")}, //83, 06 + { RTL_CONSTASCII_STRINGPARAM("writer_WordPerfect_42_W4W")}, //84, 06 + { RTL_CONSTASCII_STRINGPARAM("writer_WordPerfect_50_W4W")}, //85, 07 + { RTL_CONSTASCII_STRINGPARAM("writer_WordPerfect_51_W4W")}, //86, 07 + { RTL_CONSTASCII_STRINGPARAM("writer_WordPerfect_60_W4W")}, //87, 07 + { RTL_CONSTASCII_STRINGPARAM("writer_WordPerfect_61_W4W")}, //88, 07 + { RTL_CONSTASCII_STRINGPARAM("writer_WordPerfect_Mac_1_W4W")}, //89, 59 + { RTL_CONSTASCII_STRINGPARAM("writer_WordPerfect_Mac_2_W4W")}, //90, 60 + { RTL_CONSTASCII_STRINGPARAM("writer_WordPerfect_Mac_3_W4W")}, //91, 60 + { RTL_CONSTASCII_STRINGPARAM("writer_WordStar_Win_1x_20_W4W")}, //92, 04 + { RTL_CONSTASCII_STRINGPARAM("writer_WordStar_2000_Rel_30_W4W")}, //93, 09 + { RTL_CONSTASCII_STRINGPARAM("writer_WordStar_2000_Rel_35_W4W")}, //94, 09 + { RTL_CONSTASCII_STRINGPARAM("writer_WordStar_33x_W4W")}, //95, 04 + { RTL_CONSTASCII_STRINGPARAM("writer_WordStar_345_W4W")}, //96, 04 + { RTL_CONSTASCII_STRINGPARAM("writer_WordStar_40_W4W")}, //97, 04 + { RTL_CONSTASCII_STRINGPARAM("writer_WordStar_50_W4W")}, //98, 04 + { RTL_CONSTASCII_STRINGPARAM("writer_WordStar_55_W4W")}, //99, 04 + { RTL_CONSTASCII_STRINGPARAM("writer_WordStar_60_W4W")}, //100, 04 + { RTL_CONSTASCII_STRINGPARAM("writer_WordStar_70_W4W")}, //101, 04 + { RTL_CONSTASCII_STRINGPARAM("writer_WriteNow_30_Macintosh_W4W")}, //102, 62 + { RTL_CONSTASCII_STRINGPARAM("writer_Writing_Assistant_W4W")}, //103, 13 + { RTL_CONSTASCII_STRINGPARAM("writer_XEROX_XIF_50_Illustrator_W4W")}, //104, 103 + { RTL_CONSTASCII_STRINGPARAM("writer_XEROX_XIF_50_W4W")}, //105, 103 + { RTL_CONSTASCII_STRINGPARAM("writer_XEROX_XIF_60_Color_Bitmap_W4W")}, //106, 103 + { RTL_CONSTASCII_STRINGPARAM("writer_XEROX_XIF_60_Res_Graphic_W4W")}, //107, 103 + { RTL_CONSTASCII_STRINGPARAM("writer_XyWrite_Win_10_W4W")}, //108, 17 + { RTL_CONSTASCII_STRINGPARAM("writer_XyWrite_III_W4W")}, //109, 17 + { RTL_CONSTASCII_STRINGPARAM("writer_XyWrite_IIIP_W4W")}, //110, 17 + { RTL_CONSTASCII_STRINGPARAM("writer_XyWrite_IV_W4W")}, //111, 17 + { RTL_CONSTASCII_STRINGPARAM("writer_XyWrite_Sig_Win_W4W")}, //112, 17 + { RTL_CONSTASCII_STRINGPARAM("writer_XyWrite_Signature_W4W")}, //113, 17 + { RTL_CONSTASCII_STRINGPARAM("calc_StarCalc_30")}, + { RTL_CONSTASCII_STRINGPARAM("calc_StarCalc_30_VorlageTemplate")}, + { RTL_CONSTASCII_STRINGPARAM("calc_StarCalc_40")}, + { RTL_CONSTASCII_STRINGPARAM("calc_StarCalc_40_VorlageTemplate")}, + { RTL_CONSTASCII_STRINGPARAM("calc_StarCalc_50")}, + { RTL_CONSTASCII_STRINGPARAM("calc_StarCalc_50_VorlageTemplate")}, + { RTL_CONSTASCII_STRINGPARAM("chart_StarChart_30")}, + { RTL_CONSTASCII_STRINGPARAM("chart_StarChart_40")}, + { RTL_CONSTASCII_STRINGPARAM("chart_StarChart_50")}, + { RTL_CONSTASCII_STRINGPARAM("draw_StarDraw_30")}, + { RTL_CONSTASCII_STRINGPARAM("draw_StarDraw_30_Vorlage")}, + { RTL_CONSTASCII_STRINGPARAM("draw_StarDraw_50")}, + { RTL_CONSTASCII_STRINGPARAM("draw_StarDraw_50_Vorlage")}, + { RTL_CONSTASCII_STRINGPARAM("impress_StarImpress_40")}, + { RTL_CONSTASCII_STRINGPARAM("impress_StarImpress_40_Vorlage")}, + { RTL_CONSTASCII_STRINGPARAM("impress_StarImpress_50")}, + { RTL_CONSTASCII_STRINGPARAM("impress_StarImpress_50_Vorlage")}, + { RTL_CONSTASCII_STRINGPARAM("impress_StarImpress_50_packed")}, + { RTL_CONSTASCII_STRINGPARAM("math_StarMath_30")}, + { RTL_CONSTASCII_STRINGPARAM("math_StarMath_40")}, + { RTL_CONSTASCII_STRINGPARAM("math_StarMath_50")}, + { RTL_CONSTASCII_STRINGPARAM("writer_StarWriter_30")}, + { RTL_CONSTASCII_STRINGPARAM("writer_StarWriter_30_VorlageTemplate")}, + { RTL_CONSTASCII_STRINGPARAM("writer_StarWriter_40")}, + { RTL_CONSTASCII_STRINGPARAM("writer_StarWriter_40_VorlageTemplate")}, + { RTL_CONSTASCII_STRINGPARAM("writer_globaldocument_StarWriter_40GlobalDocument")}, + { RTL_CONSTASCII_STRINGPARAM("writer_StarWriter_50")}, + { RTL_CONSTASCII_STRINGPARAM("writer_StarWriter_50_VorlageTemplate")}, + { RTL_CONSTASCII_STRINGPARAM("writer_globaldocument_StarWriter_50GlobalDocument")} }; //list of Word4Word filters the identifiers are returned by AutoDetec static const sal_uInt8 nW4WFilterCount = 109; Index: binfilter/inc/bf_sc/chgtrack.hxx =================================================================== RCS file: /cvs/framework/binfilter/inc/bf_sc/chgtrack.hxx,v retrieving revision 1.11 diff -u -r1.11 chgtrack.hxx --- binfilter/inc/bf_sc/chgtrack.hxx 10 Apr 2008 21:34:31 -0000 1.11 +++ binfilter/inc/bf_sc/chgtrack.hxx 6 May 2008 11:45:57 -0000 @@ -136,8 +136,8 @@ ScChangeActionLinkEntry( ScChangeActionLinkEntry** ppPrevP, ScChangeAction* pActionP ) - : ppPrev( ppPrevP ), - pNext( *ppPrevP ), + : pNext( *ppPrevP ), + ppPrev( ppPrevP ), pAction( pActionP ), pLink( NULL ) { @@ -178,7 +178,7 @@ { if ( ppPrev ) { - if ( *ppPrev = pNext ) + if ( (*ppPrev = pNext) ) pNext->ppPrev = ppPrev; ppPrev = NULL; // not inserted } @@ -189,7 +189,7 @@ if ( !ppPrev ) { ppPrev = ppPrevP; - if ( pNext = *ppPrevP ) + if ( (pNext = *ppPrevP) ) pNext->ppPrev = &pNext; *ppPrevP = this; } @@ -220,13 +220,13 @@ ScChangeActionCellListEntry( ScChangeActionContent* pContentP, ScChangeActionCellListEntry* pNextP ) - : pContent( pContentP ), - pNext( pNextP ) + : pNext( pNextP ), + pContent( pContentP ) {} public: - const ScChangeActionCellListEntry* GetNext() const { return pNext; } // this is only for the XML Export public const ScChangeActionContent* GetContent() const { return pContent; } // this is only for the XML Export public + const ScChangeActionCellListEntry* GetNext() const { return pNext; } // this is only for the XML Export public DECL_FIXEDMEMPOOL_NEWDEL( ScChangeActionCellListEntry ) }; @@ -749,7 +749,7 @@ /*N*/ if ( !ppPrevInSlot ) /*N*/ { /*N*/ ppPrevInSlot = pp; -/*N*/ if ( pNextInSlot = *pp ) +/*N*/ if ( (pNextInSlot = *pp) ) /*N*/ pNextInSlot->ppPrevInSlot = &pNextInSlot; /*N*/ *pp = this; /*N*/ } @@ -758,7 +758,7 @@ /*N*/ { /*N*/ if ( ppPrevInSlot ) /*N*/ { -/*N*/ if ( *ppPrevInSlot = pNextInSlot ) +/*N*/ if ( (*ppPrevInSlot = pNextInSlot) ) /*N*/ pNextInSlot->ppPrevInSlot = ppPrevInSlot; /*N*/ ppPrevInSlot = NULL; // not inserted /*N*/ } Index: binfilter/inc/bf_sc/token.hxx =================================================================== RCS file: /cvs/framework/binfilter/inc/bf_sc/token.hxx,v retrieving revision 1.7 diff -u -r1.7 token.hxx --- binfilter/inc/bf_sc/token.hxx 10 Apr 2008 22:03:05 -0000 1.7 +++ binfilter/inc/bf_sc/token.hxx 6 May 2008 11:45:57 -0000 @@ -356,14 +356,14 @@ BYTE nByte; public: ScExternalToken( OpCode e, BYTE n, const String& r ) : - ScToken( e, svExternal ), nByte( n ), - aExternal( r ) {} + ScToken( e, svExternal ), aExternal( r ), + nByte( n ) {} ScExternalToken( OpCode e, const String& r ) : - ScToken( e, svExternal ), nByte( 0 ), - aExternal( r ) {} + ScToken( e, svExternal ), aExternal( r ), + nByte( 0 ) {} ScExternalToken( const ScExternalToken& r ) : - ScToken( r ), nByte( r.nByte ), - aExternal( r.aExternal ) {} + ScToken( r ), aExternal( r.aExternal ), + nByte( r.nByte ) {} virtual const String& GetExternal() const; virtual BYTE GetByte() const; virtual void SetByte( BYTE n ); Index: binfilter/inc/bf_starmath/smmod.hxx =================================================================== RCS file: /cvs/framework/binfilter/inc/bf_starmath/smmod.hxx,v retrieving revision 1.8 diff -u -r1.8 smmod.hxx --- binfilter/inc/bf_starmath/smmod.hxx 10 Apr 2008 22:54:28 -0000 1.8 +++ binfilter/inc/bf_starmath/smmod.hxx 6 May 2008 11:45:58 -0000 @@ -84,8 +84,8 @@ /*N*/ public: /*N*/ SmNamesArray( LanguageType nLang, int nRID ) : /*N*/ Resource( SmResId(RID_LOCALIZED_NAMES) ), -/*N*/ nLanguage (nLang), -/*N*/ aNamesAry (SmResId(nRID)) +/*N*/ aNamesAry (SmResId(nRID)), +/*N*/ nLanguage (nLang) /*N*/ { /*N*/ FreeResource(); /*N*/ } Index: binfilter/inc/bf_sw/dbmgr.hxx =================================================================== RCS file: /cvs/framework/binfilter/inc/bf_sw/dbmgr.hxx,v retrieving revision 1.8 diff -u -r1.8 dbmgr.hxx --- binfilter/inc/bf_sw/dbmgr.hxx 11 Apr 2008 02:03:25 -0000 1.8 +++ binfilter/inc/bf_sw/dbmgr.hxx 6 May 2008 11:45:58 -0000 @@ -144,12 +144,12 @@ const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& xResSet, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rSelection) : SwDBData(rData), + xResultSet(xResSet), + aSelection(rSelection), bScrollable(TRUE), bEndOfDB(FALSE), bAfterSelection(FALSE), - nSelectionIndex(0), - xResultSet(xResSet), - aSelection(rSelection) + nSelectionIndex(0) {} void CheckEndOfDB() Index: binfilter/inc/bf_sw/unocoll.hxx =================================================================== RCS file: /cvs/framework/binfilter/inc/bf_sw/unocoll.hxx,v retrieving revision 1.7 diff -u -r1.7 unocoll.hxx --- binfilter/inc/bf_sw/unocoll.hxx 11 Apr 2008 02:45:33 -0000 1.7 +++ binfilter/inc/bf_sw/unocoll.hxx 6 May 2008 11:45:58 -0000 @@ -91,8 +91,8 @@ public: SwUnoCollection(SwDoc* p) : - pDoc(p), - bObjectValid(sal_True){} + bObjectValid(sal_True), + pDoc(p){} virtual void Invalidate(); sal_Bool IsValid() const {return bObjectValid;} Index: binfilter/inc/bf_sw/unoobj.hxx =================================================================== RCS file: /cvs/framework/binfilter/inc/bf_sw/unoobj.hxx,v retrieving revision 1.7 diff -u -r1.7 unoobj.hxx --- binfilter/inc/bf_sw/unoobj.hxx 11 Apr 2008 02:48:42 -0000 1.7 +++ binfilter/inc/bf_sw/unoobj.hxx 6 May 2008 11:45:59 -0000 @@ -584,7 +584,7 @@ virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); }; -/*-----------------20.03.98 08:26------------------- +//-----------------20.03.98 08:26------------------- --------------------------------------------------*/ /* das wird zunaechst nicht gebraucht - bisher fuer den XPropertySetCloner @@ -604,7 +604,7 @@ virtual BOOL hasPropertyByName(const ::rtl::OUString& Name) throw( ::com::sun::star::uno::RuntimeException ); }; -/*-----------------20.02.98 08:45------------------- +//-----------------20.02.98 08:45------------------- --------------------------------------------------*/ typedef Index: binfilter/inc/bf_xmloff/shapeexport.hxx =================================================================== RCS file: /cvs/framework/binfilter/inc/bf_xmloff/shapeexport.hxx,v retrieving revision 1.5 diff -u -r1.5 shapeexport.hxx --- binfilter/inc/bf_xmloff/shapeexport.hxx 11 Apr 2008 03:15:38 -0000 1.5 +++ binfilter/inc/bf_xmloff/shapeexport.hxx 6 May 2008 11:45:59 -0000 @@ -171,7 +171,7 @@ sal_Int32 mnFamily; XmlShapeType meShapeType; - ImplXMLShapeExportInfo() : meShapeType( XmlShapeTypeNotYetSet ), mnFamily( XML_STYLE_FAMILY_SD_GRAPHICS_ID ) {} + ImplXMLShapeExportInfo() : mnFamily( XML_STYLE_FAMILY_SD_GRAPHICS_ID ), meShapeType( XmlShapeTypeNotYetSet ) {} }; /** a vector for shape style and type cache information */