diff options
Diffstat (limited to 'sc/source/filter/xcl97')
-rw-r--r-- | sc/source/filter/xcl97/XclExpChangeTrack.cxx | 98 | ||||
-rw-r--r-- | sc/source/filter/xcl97/XclImpChangeTrack.cxx | 28 | ||||
-rw-r--r-- | sc/source/filter/xcl97/xcl97dum.cxx | 34 | ||||
-rw-r--r-- | sc/source/filter/xcl97/xcl97esc.cxx | 6 | ||||
-rw-r--r-- | sc/source/filter/xcl97/xcl97rec.cxx | 96 |
5 files changed, 131 insertions, 131 deletions
diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx b/sc/source/filter/xcl97/XclExpChangeTrack.cxx index daab6245d730..60f792a8a3fa 100644 --- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx +++ b/sc/source/filter/xcl97/XclExpChangeTrack.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -73,12 +73,12 @@ static OString lcl_DateTimeToOString( const DateTime& rDateTime ) void lcl_WriteDateTime( XclExpStream& rStrm, const DateTime& rDateTime ) { rStrm.SetSliceSize( 7 ); - rStrm << (sal_uInt16) rDateTime.GetYear() - << (sal_uInt8) rDateTime.GetMonth() - << (sal_uInt8) rDateTime.GetDay() - << (sal_uInt8) rDateTime.GetHour() - << (sal_uInt8) rDateTime.GetMin() - << (sal_uInt8) rDateTime.GetSec(); + rStrm << (sal_uInt16) rDateTime.GetYear() + << (sal_uInt8) rDateTime.GetMonth() + << (sal_uInt8) rDateTime.GetDay() + << (sal_uInt8) rDateTime.GetHour() + << (sal_uInt8) rDateTime.GetMin() + << (sal_uInt8) rDateTime.GetSec(); rStrm.SetSliceSize( 0 ); } @@ -118,17 +118,17 @@ XclExpUserBView::XclExpUserBView( const String& rUsername, const sal_uInt8* pGUI void XclExpUserBView::SaveCont( XclExpStream& rStrm ) { - rStrm << (sal_uInt32) 0xFF078014 - << (sal_uInt32) 0x00000001; + rStrm << (sal_uInt32) 0xFF078014 + << (sal_uInt32) 0x00000001; lcl_WriteGUID( rStrm, aGUID ); rStrm.WriteZeroBytes( 8 ); rStrm << (sal_uInt32) 1200 - << (sal_uInt32) 1000 - << (sal_uInt16) 1000 - << (sal_uInt16) 0x0CF7 - << (sal_uInt16) 0x0000 - << (sal_uInt16) 0x0001 - << (sal_uInt16) 0x0000; + << (sal_uInt32) 1000 + << (sal_uInt16) 1000 + << (sal_uInt16) 0x0CF7 + << (sal_uInt16) 0x0000 + << (sal_uInt16) 0x0001 + << (sal_uInt16) 0x0000; if( sUsername.Len() > 0 ) rStrm << sUsername; } @@ -182,19 +182,19 @@ XclExpUsersViewBegin::XclExpUsersViewBegin( const sal_uInt8* pGUID, sal_uInt32 n void XclExpUsersViewBegin::SaveCont( XclExpStream& rStrm ) { lcl_WriteGUID( rStrm, aGUID ); - rStrm << nCurrTab - << (sal_uInt32) 100 - << (sal_uInt32) 64 - << (sal_uInt32) 3 - << (sal_uInt32) 0x0000003C - << (sal_uInt16) 0 - << (sal_uInt16) 3 - << (sal_uInt16) 0 - << (sal_uInt16) 3 - << (double) 0 - << (double) 0 - << (sal_Int16) -1 - << (sal_Int16) -1; + rStrm << nCurrTab + << (sal_uInt32) 100 + << (sal_uInt32) 64 + << (sal_uInt32) 3 + << (sal_uInt32) 0x0000003C + << (sal_uInt16) 0 + << (sal_uInt16) 3 + << (sal_uInt16) 0 + << (sal_uInt16) 3 + << (double) 0 + << (double) 0 + << (sal_Int16) -1 + << (sal_Int16) -1; } UINT16 XclExpUsersViewBegin::GetNum() const @@ -245,7 +245,7 @@ sal_Size XclExpChTr0x0191::GetLen() const void XclExpChTr0x0198::SaveCont( XclExpStream& rStrm ) { - rStrm << (sal_uInt16) 0x0006 + rStrm << (sal_uInt16) 0x0006 << (sal_uInt16) 0x0000; } @@ -363,12 +363,12 @@ XclExpChTrHeader::~XclExpChTrHeader() void XclExpChTrHeader::SaveCont( XclExpStream& rStrm ) { - rStrm << (sal_uInt16) 0x0006 + rStrm << (sal_uInt16) 0x0006 << (sal_uInt16) 0x0000 << (sal_uInt16) 0x000D; lcl_WriteGUID( rStrm, aGUID ); lcl_WriteGUID( rStrm, aGUID ); - rStrm << nCount + rStrm << nCount << (sal_uInt16) 0x0001 << (sal_uInt32) 0x00000000 << (sal_uInt16) 0x001E; @@ -412,16 +412,16 @@ XclExpChTrInfo::~XclExpChTrInfo() void XclExpChTrInfo::SaveCont( XclExpStream& rStrm ) { - rStrm << (sal_uInt32) 0xFFFFFFFF - << (sal_uInt32) 0x00000000 - << (sal_uInt32) 0x00000020 - << (sal_uInt16) 0xFFFF; + rStrm << (sal_uInt32) 0xFFFFFFFF + << (sal_uInt32) 0x00000000 + << (sal_uInt32) 0x00000020 + << (sal_uInt16) 0xFFFF; lcl_WriteGUID( rStrm, aGUID ); - rStrm << (sal_uInt16) 0x04B0; + rStrm << (sal_uInt16) 0x04B0; lcl_WriteFixedString( rStrm, sUsername, 113 ); lcl_WriteDateTime( rStrm, aDateTime ); - rStrm << (sal_uInt8) 0x0000 - << (sal_uInt16) 0x0002; + rStrm << (sal_uInt8) 0x0000 + << (sal_uInt16) 0x0002; } UINT16 XclExpChTrInfo::GetNum() const @@ -681,7 +681,7 @@ void XclExpChTrAction::SetIndex( sal_uInt32& rIndex ) void XclExpChTrAction::SaveCont( XclExpStream& rStrm ) { DBG_ASSERT( nOpCode != EXC_CHTR_OP_UNKNOWN, "XclExpChTrAction::SaveCont - unknown action" ); - rStrm << nLength + rStrm << nLength << nIndex << nOpCode << (sal_uInt16)(bAccepted ? EXC_CHTR_ACCEPT : EXC_CHTR_NOTHING); @@ -919,10 +919,10 @@ void XclExpChTrCellContent::GetCellData( void XclExpChTrCellContent::SaveActionData( XclExpStream& rStrm ) const { WriteTabId( rStrm, aPosition.Tab() ); - rStrm << (sal_uInt16)((pOldData ? (pOldData->nType << 3) : 0x0000) | (pNewData ? pNewData->nType : 0x0000)) + rStrm << (sal_uInt16)((pOldData ? (pOldData->nType << 3) : 0x0000) | (pNewData ? pNewData->nType : 0x0000)) << (sal_uInt16) 0x0000; Write2DAddress( rStrm, aPosition ); - rStrm << nOldLength + rStrm << nOldLength << (sal_uInt32) 0x00000000; if( pOldData ) pOldData->Write( rStrm, rIdBuffer ); @@ -1057,10 +1057,10 @@ XclExpChTrInsert::XclExpChTrInsert( nLength = 0x00000030; switch( rAction.GetType() ) { - case SC_CAT_INSERT_COLS: nOpCode = EXC_CHTR_OP_INSCOL; break; - case SC_CAT_INSERT_ROWS: nOpCode = EXC_CHTR_OP_INSROW; break; - case SC_CAT_DELETE_COLS: nOpCode = EXC_CHTR_OP_DELCOL; break; - case SC_CAT_DELETE_ROWS: nOpCode = EXC_CHTR_OP_DELROW; break; + case SC_CAT_INSERT_COLS: nOpCode = EXC_CHTR_OP_INSCOL; break; + case SC_CAT_INSERT_ROWS: nOpCode = EXC_CHTR_OP_INSROW; break; + case SC_CAT_DELETE_COLS: nOpCode = EXC_CHTR_OP_DELCOL; break; + case SC_CAT_DELETE_ROWS: nOpCode = EXC_CHTR_OP_DELROW; break; default: DBG_ERROR( "XclExpChTrInsert::XclExpChTrInsert - unknown action" ); } @@ -1090,9 +1090,9 @@ XclExpChTrInsert::~XclExpChTrInsert() void XclExpChTrInsert::SaveActionData( XclExpStream& rStrm ) const { WriteTabId( rStrm, aRange.aStart.Tab() ); - rStrm << (sal_uInt16) 0x0000; + rStrm << (sal_uInt16) 0x0000; Write2DRange( rStrm, aRange ); - rStrm << (sal_uInt32) 0x00000000; + rStrm << (sal_uInt32) 0x00000000; } void XclExpChTrInsert::PrepareSaveAction( XclExpStream& rStrm ) const @@ -1297,7 +1297,7 @@ XclExpChTr0x014A::~XclExpChTr0x014A() void XclExpChTr0x014A::SaveActionData( XclExpStream& rStrm ) const { WriteTabId( rStrm, aRange.aStart.Tab() ); - rStrm << (sal_uInt16) 0x0003 + rStrm << (sal_uInt16) 0x0003 << (sal_uInt16) 0x0001; Write2DRange( rStrm, aRange ); } @@ -1516,7 +1516,7 @@ XclExpChangeTrack::XclExpChangeTrack( const XclExpRoot& rRoot ) : sal_Int32 nLogNumber = 1; while( XclExpChTrAction* pAction = aActionStack.Pop() ) { - if( (nIndex == 1) || pAction->ForceInfoRecord() || + if( (nIndex == 1) || pAction->ForceInfoRecord() || (pAction->GetUsername() != sLastUsername) || (pAction->GetDateTime() != aLastDateTime) ) { diff --git a/sc/source/filter/xcl97/XclImpChangeTrack.cxx b/sc/source/filter/xcl97/XclImpChangeTrack.cxx index c20fba217513..c47b8ebcda33 100644 --- a/sc/source/filter/xcl97/XclImpChangeTrack.cxx +++ b/sc/source/filter/xcl97/XclImpChangeTrack.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -208,7 +208,7 @@ void XclImpChangeTrack::ReadFormula( ScTokenArray*& rpTokenArray, const ScAddres // read the formula, 3D tab refs from extended data const ScTokenArray* pArray = NULL; aFmlConv.Reset( rPosition ); - BOOL bOK = (aFmlConv.Convert( pArray, aFmlaStrm, nFmlSize, false, FT_CellFormula) == ConvOK); // JEG : Check This + BOOL bOK = (aFmlConv.Convert( pArray, aFmlaStrm, nFmlSize, false, FT_CellFormula) == ConvOK); // JEG : Check This rpTokenArray = (bOK && pArray) ? new ScTokenArray( *pArray ) : NULL; pStrm->Ignore( 1 ); } @@ -348,10 +348,10 @@ void XclImpChangeTrack::ReadChTrCellContent() pStrm->Ignore( 4 ); switch( nValueType & EXC_CHTR_TYPE_FORMATMASK ) { - case 0x0000: break; + case 0x0000: break; case 0x1100: pStrm->Ignore( 16 ); break; case 0x1300: pStrm->Ignore( 8 ); break; - default: DBG_ERROR( "XclImpChangeTrack::ReadChTrCellContent - unknown format info" ); + default: DBG_ERROR( "XclImpChangeTrack::ReadChTrCellContent - unknown format info" ); } ScBaseCell* pOldCell; @@ -456,17 +456,17 @@ void XclImpChangeTrack::ReadRecords() { switch( pStrm->GetRecId() ) { - case 0x000A: bGlobExit = sal_True; break; - case 0x0137: ReadChTrInsert(); break; - case 0x0138: ReadChTrInfo(); break; - case 0x013B: ReadChTrCellContent(); break; - case 0x013D: ReadChTrTabId(); break; - case 0x0140: ReadChTrMoveRange(); break; - case 0x014D: ReadChTrInsertTab(); break; + case 0x000A: bGlobExit = sal_True; break; + case 0x0137: ReadChTrInsert(); break; + case 0x0138: ReadChTrInfo(); break; + case 0x013B: ReadChTrCellContent(); break; + case 0x013D: ReadChTrTabId(); break; + case 0x0140: ReadChTrMoveRange(); break; + case 0x014D: ReadChTrInsertTab(); break; case 0x014E: - case 0x0150: InitNestedMode(); break; + case 0x0150: InitNestedMode(); break; case 0x014F: - case 0x0151: bExitLoop = EndNestedMode(); break; + case 0x0151: bExitLoop = EndNestedMode(); break; } } } @@ -495,7 +495,7 @@ XclImpChTrFmlConverter::~XclImpChTrFmlConverter() } // virtual, called from ExcToSc8::Convert() -bool XclImpChTrFmlConverter::Read3DTabReference( UINT16 /*nIxti*/, SCTAB& rFirstTab, SCTAB& rLastTab, +bool XclImpChTrFmlConverter::Read3DTabReference( UINT16 /*nIxti*/, SCTAB& rFirstTab, SCTAB& rLastTab, ExternalTabInfo& rExtInfo ) { return rChangeTrack.Read3DTabRefInfo( rFirstTab, rLastTab, rExtInfo ); diff --git a/sc/source/filter/xcl97/xcl97dum.cxx b/sc/source/filter/xcl97/xcl97dum.cxx index 8340ce397ffa..7d188ecb2472 100644 --- a/sc/source/filter/xcl97/xcl97dum.cxx +++ b/sc/source/filter/xcl97/xcl97dum.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,10 +40,10 @@ // ... (8+) := neu in Biff8, ... (8*) := anders in Biff8 const BYTE ExcDummy8_00a::pMyData[] = { - 0xe1, 0x00, 0x02, 0x00, 0xb0, 0x04, // INTERFACEHDR - 0xc1, 0x00, 0x02, 0x00, 0x00, 0x00, // MMS - 0xe2, 0x00, 0x00, 0x00, // INTERFACEEND - 0x5c, 0x00, 0x70, 0x00, // WRITEACCESS (8*) + 0xe1, 0x00, 0x02, 0x00, 0xb0, 0x04, // INTERFACEHDR + 0xc1, 0x00, 0x02, 0x00, 0x00, 0x00, // MMS + 0xe2, 0x00, 0x00, 0x00, // INTERFACEEND + 0x5c, 0x00, 0x70, 0x00, // WRITEACCESS (8*) 0x04, 0x00, 0x00, 'C', 'a', 'l', 'c', 0x20, // "Calc" 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, @@ -58,34 +58,34 @@ const BYTE ExcDummy8_00a::pMyData[] = { 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x42, 0x00, 0x02, 0x00, 0xb0, 0x04, // CODEPAGE - 0x61, 0x01, 0x02, 0x00, 0x00, 0x00 // DSF (8+) + 0x42, 0x00, 0x02, 0x00, 0xb0, 0x04, // CODEPAGE + 0x61, 0x01, 0x02, 0x00, 0x00, 0x00 // DSF (8+) }; const sal_Size ExcDummy8_00a::nMyLen = sizeof(ExcDummy8_00a::pMyData); // TABID (8+): ExcTabid const BYTE ExcDummy8_00b::pMyData[] = { - 0x9c, 0x00, 0x02, 0x00, 0x0e, 0x00 // FNGROUPCOUNT + 0x9c, 0x00, 0x02, 0x00, 0x0e, 0x00 // FNGROUPCOUNT }; const sal_Size ExcDummy8_00b::nMyLen = sizeof(ExcDummy8_00b::pMyData); const BYTE ExcDummy8_040::pMyData[] = { - 0xaf, 0x01, 0x02, 0x00, 0x00, 0x00, // PROT4REV (8+) - 0xbc, 0x01, 0x02, 0x00, 0x00, 0x00, // PROT4REVPASS (8+) -// 0x3d, 0x00, 0x12, 0x00, 0xe0, 0x01, 0x5a, 0x00, 0xcf, // WINDOW1 -// 0x3f, 0x4e, 0x2a, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, -// 0x01, 0x00, 0x58, 0x02, - 0x40, 0x00, 0x02, 0x00, 0x00, 0x00, // BACKUP - 0x8d, 0x00, 0x02, 0x00, 0x00, 0x00 // HIDEOBJ + 0xaf, 0x01, 0x02, 0x00, 0x00, 0x00, // PROT4REV (8+) + 0xbc, 0x01, 0x02, 0x00, 0x00, 0x00, // PROT4REVPASS (8+) +// 0x3d, 0x00, 0x12, 0x00, 0xe0, 0x01, 0x5a, 0x00, 0xcf, // WINDOW1 +// 0x3f, 0x4e, 0x2a, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, +// 0x01, 0x00, 0x58, 0x02, + 0x40, 0x00, 0x02, 0x00, 0x00, 0x00, // BACKUP + 0x8d, 0x00, 0x02, 0x00, 0x00, 0x00 // HIDEOBJ }; const sal_Size ExcDummy8_040::nMyLen = sizeof(ExcDummy8_040::pMyData); const BYTE ExcDummy8_041::pMyData[] = { - 0xb7, 0x01, 0x02, 0x00, 0x00, 0x00, // REFRESHALL (8+) - 0xda, 0x00, 0x02, 0x00, 0x00, 0x00 // BOOKBOOL + 0xb7, 0x01, 0x02, 0x00, 0x00, 0x00, // REFRESHALL (8+) + 0xda, 0x00, 0x02, 0x00, 0x00, 0x00 // BOOKBOOL }; const sal_Size ExcDummy8_041::nMyLen = sizeof(ExcDummy8_041::pMyData); diff --git a/sc/source/filter/xcl97/xcl97esc.cxx b/sc/source/filter/xcl97/xcl97esc.cxx index 8f4674cb7e44..f7a6273c10c4 100644 --- a/sc/source/filter/xcl97/xcl97esc.cxx +++ b/sc/source/filter/xcl97/xcl97esc.cxx @@ -202,7 +202,7 @@ EscherExHostAppData* XclEscherEx::StartShape( const Reference< XShape >& rxShape nAdditionalText++; BOOL bInGroup = ( pCurrXclObj != NULL ); if ( bInGroup ) - { // stacked recursive group object + { // stacked recursive group object if ( !pCurrAppData->IsStackedGroup() ) { //! UpdateDffFragmentEnd only once pCurrAppData->SetStackedGroup( TRUE ); @@ -267,7 +267,7 @@ EscherExHostAppData* XclEscherEx::StartShape( const Reference< XShape >& rxShape if ( pCurrXclObj ) { if ( !mrObjMgr.AddObj( pCurrXclObj ) ) - { // maximum count reached, object got deleted + { // maximum count reached, object got deleted pCurrXclObj = NULL; } else @@ -492,7 +492,7 @@ void XclEscherEx::DeleteCurrAppData() // --- class XclEscherClientData ------------------------------------- void XclEscherClientData::WriteData( EscherEx& rEx ) const -{ // actual data is in the following OBJ record +{ // actual data is in the following OBJ record rEx.AddAtom( 0, ESCHER_ClientData ); } diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx index 14858d41362c..921e58a83e1a 100644 --- a/sc/source/filter/xcl97/xcl97rec.cxx +++ b/sc/source/filter/xcl97/xcl97rec.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -447,12 +447,12 @@ static void lcl_FillProps( EscherPropertyContainer& rPropOpt, SdrObject* pCaptio { rPropOpt.CreateFillProperties( aXPropSet, sal_True); - rPropOpt.AddOpt( ESCHER_Prop_lTxid, 0 ); // undocumented - rPropOpt.AddOpt( 0x0158, 0x00000000 ); // undocumented + rPropOpt.AddOpt( ESCHER_Prop_lTxid, 0 ); // undocumented + rPropOpt.AddOpt( 0x0158, 0x00000000 ); // undocumented sal_uInt32 nValue = 0; if( !rPropOpt.GetOpt( ESCHER_Prop_FitTextToShape, nValue ) ) - rPropOpt.AddOpt( ESCHER_Prop_FitTextToShape, 0x00080008 ); // bool field + rPropOpt.AddOpt( ESCHER_Prop_FitTextToShape, 0x00080008 ); // bool field if( rPropOpt.GetOpt( ESCHER_Prop_fillColor, nValue ) ) { @@ -473,11 +473,11 @@ static void lcl_FillProps( EscherPropertyContainer& rPropOpt, SdrObject* pCaptio if( !rPropOpt.GetOpt( ESCHER_Prop_fillBackColor, nValue ) ) rPropOpt.AddOpt( ESCHER_Prop_fillBackColor, 0x08000050 ); if( !rPropOpt.GetOpt( ESCHER_Prop_fNoFillHitTest, nValue ) ) - rPropOpt.AddOpt( ESCHER_Prop_fNoFillHitTest, 0x00110010 ); // bool field + rPropOpt.AddOpt( ESCHER_Prop_fNoFillHitTest, 0x00110010 ); // bool field if( !rPropOpt.GetOpt( ESCHER_Prop_shadowColor, nValue ) ) rPropOpt.AddOpt( ESCHER_Prop_shadowColor, 0x00000000 ); - if( !rPropOpt.GetOpt( ESCHER_Prop_fshadowObscured, nValue ) ) // bool field - rPropOpt.AddOpt( ESCHER_Prop_fshadowObscured, 0x00030003 ); // bool field + if( !rPropOpt.GetOpt( ESCHER_Prop_fshadowObscured, nValue ) ) // bool field + rPropOpt.AddOpt( ESCHER_Prop_fshadowObscured, 0x00030003 ); // bool field } } @@ -493,7 +493,7 @@ void XclObjComment::ProcessEscherObj( const XclExpRoot& rRoot, const Rectangle& lcl_FillProps( aPropOpt, pCaption, bVisible ); - nGrbit = 0; // all off: AutoLine, AutoFill, Printable, Locked + nGrbit = 0; // all off: AutoLine, AutoFill, Printable, Locked mrEscherEx.OpenContainer( ESCHER_SpContainer ); mrEscherEx.AddShape( ESCHER_ShpInst_TextBox, SHAPEFLAG_HAVEANCHOR | SHAPEFLAG_HAVESPT ); aPropOpt.Commit( mrEscherEx.GetStream() ); @@ -607,15 +607,15 @@ XclObjDropDown::XclObjDropDown( XclExpObjectManager& rObjMgr, const ScAddress& r SetPrintable( FALSE ); SetAutoFill( TRUE ); SetAutoLine( FALSE ); - nGrbit |= 0x0100; // undocumented + nGrbit |= 0x0100; // undocumented mrEscherEx.OpenContainer( ESCHER_SpContainer ); mrEscherEx.AddShape( ESCHER_ShpInst_HostControl, SHAPEFLAG_HAVEANCHOR | SHAPEFLAG_HAVESPT ); EscherPropertyContainer aPropOpt; - aPropOpt.AddOpt( ESCHER_Prop_LockAgainstGrouping, 0x01040104 ); // bool field - aPropOpt.AddOpt( ESCHER_Prop_FitTextToShape, 0x00080008 ); // bool field - aPropOpt.AddOpt( ESCHER_Prop_fNoFillHitTest, 0x00010000 ); // bool field - aPropOpt.AddOpt( ESCHER_Prop_fNoLineDrawDash, 0x00080000 ); // bool field - aPropOpt.AddOpt( ESCHER_Prop_fPrint, 0x000A0000 ); // bool field + aPropOpt.AddOpt( ESCHER_Prop_LockAgainstGrouping, 0x01040104 ); // bool field + aPropOpt.AddOpt( ESCHER_Prop_FitTextToShape, 0x00080008 ); // bool field + aPropOpt.AddOpt( ESCHER_Prop_fNoFillHitTest, 0x00010000 ); // bool field + aPropOpt.AddOpt( ESCHER_Prop_fNoLineDrawDash, 0x00080000 ); // bool field + aPropOpt.AddOpt( ESCHER_Prop_fPrint, 0x000A0000 ); // bool field aPropOpt.Commit( mrEscherEx.GetStream() ); XclExpDffDropDownAnchor( rObjMgr.GetRoot(), rPos ).WriteDffData( mrEscherEx ); @@ -821,10 +821,10 @@ XclObjOle::~XclObjOle() void XclObjOle::WriteSubRecs( XclExpStream& rStrm ) { // write only as embedded, not linked - String aStorageName( RTL_CONSTASCII_USTRINGPARAM( "MBD" ) ); - sal_Char aBuf[ sizeof(UINT32) * 2 + 1 ]; + String aStorageName( RTL_CONSTASCII_USTRINGPARAM( "MBD" ) ); + sal_Char aBuf[ sizeof(UINT32) * 2 + 1 ]; // FIXME Eeek! Is this just a way to get a unique id? - UINT32 nPictureId = UINT32(sal_uIntPtr(this) >> 2); + UINT32 nPictureId = UINT32(sal_uIntPtr(this) >> 2); sprintf( aBuf, "%08X", static_cast< unsigned int >( nPictureId ) ); // #100211# - checked aStorageName.AppendAscii( aBuf ); SotStorageRef xOleStg = pRootStorage->OpenSotStorage( aStorageName, @@ -836,8 +836,8 @@ void XclObjOle::WriteSubRecs( XclExpStream& rStrm ) { // set version to "old" version, because it must be // saved in MS notation. - UINT32 nFl = 0; - SvtFilterOptions* pFltOpts = SvtFilterOptions::Get(); + UINT32 nFl = 0; + SvtFilterOptions* pFltOpts = SvtFilterOptions::Get(); if( pFltOpts ) { if( pFltOpts->IsMath2MathType() ) @@ -853,7 +853,7 @@ void XclObjOle::WriteSubRecs( XclExpStream& rStrm ) nFl |= OLE_STARIMPRESS_2_POWERPOINT; } - SvxMSExportOLEObjects aOLEExpFilt( nFl ); + SvxMSExportOLEObjects aOLEExpFilt( nFl ); aOLEExpFilt.ExportOLEObject( xObj, *xOleStg ); // OBJCF subrecord, undocumented as usual @@ -926,12 +926,12 @@ void XclObjAny::Save( XclExpStream& rStrm ) ExcBof8_Base::ExcBof8_Base() { - nVers = 0x0600; - nRupBuild = 0x0dbb; - nRupYear = 0x07cc; -// nFileHistory = 0x00000001; // last edited by Microsoft Excel for Windows - nFileHistory = 0x00000000; - nLowestBiffVer = 0x00000006; // Biff8 + nVers = 0x0600; + nRupBuild = 0x0dbb; + nRupYear = 0x07cc; +// nFileHistory = 0x00000001; // last edited by Microsoft Excel for Windows + nFileHistory = 0x00000000; + nLowestBiffVer = 0x00000006; // Biff8 } void XclObjAny::WriteFromTo( XclExpXmlStream& rStrm, const Reference< XShape >& rShape, SCTAB nTab ) { @@ -1055,7 +1055,7 @@ void XclObjAny::SaveXml( XclExpXmlStream& rStrm ) void ExcBof8_Base::SaveCont( XclExpStream& rStrm ) { rStrm.DisableEncryption(); - rStrm << nVers << nDocType << nRupBuild << nRupYear + rStrm << nVers << nDocType << nRupBuild << nRupYear << nFileHistory << nLowestBiffVer; } @@ -1122,7 +1122,7 @@ void ExcBundlesheet8::SaveCont( XclExpStream& rStrm ) sal_Size ExcBundlesheet8::GetLen() const -{ // Text max 255 chars +{ // Text max 255 chars return 8 + GetName().GetBufferSize(); } @@ -1223,10 +1223,10 @@ void ExcEScenarioCell::SaveXml( XclExpXmlStream& rStrm ) ExcEScenario::ExcEScenario( const XclExpRoot& rRoot, SCTAB nTab ) { - String sTmpName; - String sTmpComm; - Color aDummyCol; - USHORT nFlags; + String sTmpName; + String sTmpComm; + Color aDummyCol; + USHORT nFlags; ScDocument& rDoc = rRoot.GetDoc(); rDoc.GetName( nTab, sTmpName ); @@ -1246,11 +1246,11 @@ ExcEScenario::ExcEScenario( const XclExpRoot& rRoot, SCTAB nTab ) if( !pRList ) return; - BOOL bContLoop = TRUE; - SCROW nRow; - SCCOL nCol; - String sText; - double fVal; + BOOL bContLoop = TRUE; + SCROW nRow; + SCCOL nCol; + String sText; + double fVal; for( UINT32 nRange = 0; (nRange < pRList->Count()) && bContLoop; nRange++ ) { @@ -1294,9 +1294,9 @@ BOOL ExcEScenario::Append( UINT16 nCol, UINT16 nRow, const String& rTxt ) void ExcEScenario::SaveCont( XclExpStream& rStrm ) { - rStrm << (UINT16) List::Count() // number of cells - << nProtected // fProtection - << (UINT8) 0 // fHidden + rStrm << (UINT16) List::Count() // number of cells + << nProtected // fProtection + << (UINT8) 0 // fHidden << (UINT8) sName.Len() // length of scen name << (UINT8) sComment.Len() // length of comment << (UINT8) sUserName.Len(); // length of user name @@ -1310,9 +1310,9 @@ void ExcEScenario::SaveCont( XclExpStream& rStrm ) ExcEScenarioCell* pCell; for( pCell = _First(); pCell; pCell = _Next() ) - pCell->WriteAddress( rStrm ); // pos of cell + pCell->WriteAddress( rStrm ); // pos of cell for( pCell = _First(); pCell; pCell = _Next() ) - pCell->WriteText( rStrm ); // string content + pCell->WriteText( rStrm ); // string content rStrm.SetSliceSize( 2 ); rStrm.WriteZeroBytes( 2 * List::Count() ); // date format } @@ -1355,8 +1355,8 @@ ExcEScenarioManager::ExcEScenarioManager( const XclExpRoot& rRoot, SCTAB nTab ) if( rDoc.IsScenario( nTab ) ) return; - SCTAB nFirstTab = nTab + 1; - SCTAB nNewTab = nFirstTab; + SCTAB nFirstTab = nTab + 1; + SCTAB nNewTab = nFirstTab; while( rDoc.IsScenario( nNewTab ) ) { @@ -1376,10 +1376,10 @@ ExcEScenarioManager::~ExcEScenarioManager() void ExcEScenarioManager::SaveCont( XclExpStream& rStrm ) { - rStrm << (UINT16) List::Count() // number of scenarios - << nActive // active scen - << nActive // last displayed - << (UINT16) 0; // reference areas + rStrm << (UINT16) List::Count() // number of scenarios + << nActive // active scen + << nActive // last displayed + << (UINT16) 0; // reference areas } void ExcEScenarioManager::Save( XclExpStream& rStrm ) |