diff options
Diffstat (limited to 'sc/source/filter/inc')
96 files changed, 1768 insertions, 1768 deletions
diff --git a/sc/source/filter/inc/XclExpChangeTrack.hxx b/sc/source/filter/inc/XclExpChangeTrack.hxx index f908fb1d9668..24a0546f1681 100644 --- a/sc/source/filter/inc/XclExpChangeTrack.hxx +++ b/sc/source/filter/inc/XclExpChangeTrack.hxx @@ -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 @@ -49,16 +49,16 @@ class XclExpUserBView : public ExcRecord { private: XclExpString sUsername; - sal_uInt8 aGUID[ 16 ]; + sal_uInt8 aGUID[ 16 ]; - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ); public: XclExpUserBView( const String& rUsername, const sal_uInt8* pGUID ); - inline const sal_uInt8* GetGUID() const { return aGUID; } + inline const sal_uInt8* GetGUID() const { return aGUID; } - virtual UINT16 GetNum() const; + virtual UINT16 GetNum() const; virtual sal_Size GetLen() const; }; @@ -68,17 +68,17 @@ public: class XclExpUserBViewList : public ExcEmptyRec, private List { private: - inline XclExpUserBView* _First() { return (XclExpUserBView*) List::First(); } - inline XclExpUserBView* _Next() { return (XclExpUserBView*) List::Next(); } + inline XclExpUserBView* _First() { return (XclExpUserBView*) List::First(); } + inline XclExpUserBView* _Next() { return (XclExpUserBView*) List::Next(); } public: XclExpUserBViewList( const ScChangeTrack& rChangeTrack ); - virtual ~XclExpUserBViewList(); + virtual ~XclExpUserBViewList(); - inline const XclExpUserBView* First() { return (const XclExpUserBView*) List::First(); } - inline const XclExpUserBView* Next() { return (const XclExpUserBView*) List::Next(); } + inline const XclExpUserBView* First() { return (const XclExpUserBView*) List::First(); } + inline const XclExpUserBView* Next() { return (const XclExpUserBView*) List::Next(); } - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ); }; //___________________________________________________________________ @@ -87,14 +87,14 @@ public: class XclExpUsersViewBegin : public ExcRecord { private: - sal_uInt8 aGUID[ 16 ]; - sal_uInt32 nCurrTab; + sal_uInt8 aGUID[ 16 ]; + sal_uInt32 nCurrTab; - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ); public: XclExpUsersViewBegin( const sal_uInt8* pGUID, sal_uInt32 nTab ); - virtual UINT16 GetNum() const; + virtual UINT16 GetNum() const; virtual sal_Size GetLen() const; }; @@ -104,10 +104,10 @@ public: class XclExpUsersViewEnd : public ExcRecord { private: - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ); public: - virtual UINT16 GetNum() const; + virtual UINT16 GetNum() const; virtual sal_Size GetLen() const; }; @@ -117,10 +117,10 @@ public: class XclExpChTr0x0191 : public ExcRecord { private: - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ); public: - virtual UINT16 GetNum() const; + virtual UINT16 GetNum() const; virtual sal_Size GetLen() const; }; @@ -130,10 +130,10 @@ public: class XclExpChTr0x0198 : public ExcRecord { private: - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ); public: - virtual UINT16 GetNum() const; + virtual UINT16 GetNum() const; virtual sal_Size GetLen() const; }; @@ -143,10 +143,10 @@ public: class XclExpChTr0x0192 : public ExcRecord { private: - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ); public: - virtual UINT16 GetNum() const; + virtual UINT16 GetNum() const; virtual sal_Size GetLen() const; }; @@ -156,10 +156,10 @@ public: class XclExpChTr0x0197 : public ExcRecord { private: - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ); public: - virtual UINT16 GetNum() const; + virtual UINT16 GetNum() const; virtual sal_Size GetLen() const; }; @@ -169,13 +169,13 @@ public: class XclExpChTrEmpty : public ExcRecord { private: - UINT16 nRecNum; + UINT16 nRecNum; public: - inline XclExpChTrEmpty( UINT16 nNum ) : nRecNum( nNum ) {} - virtual ~XclExpChTrEmpty(); + inline XclExpChTrEmpty( UINT16 nNum ) : nRecNum( nNum ) {} + virtual ~XclExpChTrEmpty(); - virtual UINT16 GetNum() const; + virtual UINT16 GetNum() const; virtual sal_Size GetLen() const; }; @@ -185,12 +185,12 @@ public: class XclExpChTr0x0195 : public ExcRecord { private: - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ); public: - virtual ~XclExpChTr0x0195(); + virtual ~XclExpChTr0x0195(); - virtual UINT16 GetNum() const; + virtual UINT16 GetNum() const; virtual sal_Size GetLen() const; }; @@ -201,15 +201,15 @@ class XclExpChTr0x0194 : public ExcRecord { private: XclExpString sUsername; - DateTime aDateTime; + DateTime aDateTime; - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ); public: - inline XclExpChTr0x0194( const ScChangeTrack& rChangeTrack ); - virtual ~XclExpChTr0x0194(); + inline XclExpChTr0x0194( const ScChangeTrack& rChangeTrack ); + virtual ~XclExpChTr0x0194(); - virtual UINT16 GetNum() const; + virtual UINT16 GetNum() const; virtual sal_Size GetLen() const; }; @@ -225,19 +225,19 @@ inline XclExpChTr0x0194::XclExpChTr0x0194( const ScChangeTrack& rChangeTrack ) : class XclExpChTrHeader : public ExcRecord { private: - sal_uInt8 aGUID[ 16 ]; - sal_uInt32 nCount; + sal_uInt8 aGUID[ 16 ]; + sal_uInt32 nCount; - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ); public: - inline XclExpChTrHeader() : nCount( 0 ) {} - virtual ~XclExpChTrHeader(); + inline XclExpChTrHeader() : nCount( 0 ) {} + virtual ~XclExpChTrHeader(); - inline void SetGUID( const sal_uInt8* pGUID ) { memcpy( aGUID, pGUID, 16 ); } - inline void SetCount( sal_uInt32 nNew ) { nCount = nNew; } + inline void SetGUID( const sal_uInt8* pGUID ) { memcpy( aGUID, pGUID, 16 ); } + inline void SetCount( sal_uInt32 nNew ) { nCount = nNew; } - virtual UINT16 GetNum() const; + virtual UINT16 GetNum() const; virtual sal_Size GetLen() const; virtual void SaveXml( XclExpXmlStream& rStrm ); @@ -251,20 +251,20 @@ class XclExpChTrInfo : public ExcRecord private: XclExpString sUsername; sal_Int32 mnLogNumber; - DateTime aDateTime; - sal_uInt8 aGUID[ 16 ]; + DateTime aDateTime; + sal_uInt8 aGUID[ 16 ]; - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ); public: - inline XclExpChTrInfo( + inline XclExpChTrInfo( const String& rUsername, const DateTime& rDateTime, const sal_uInt8* pGUID, sal_Int32 nLogNumber ); - virtual ~XclExpChTrInfo(); + virtual ~XclExpChTrInfo(); - virtual UINT16 GetNum() const; + virtual UINT16 GetNum() const; virtual sal_Size GetLen() const; virtual void SaveXml( XclExpXmlStream& rStrm ); @@ -284,25 +284,25 @@ inline XclExpChTrInfo::XclExpChTrInfo( const String& rUsername, const DateTime& class XclExpChTrTabIdBuffer { private: - sal_uInt16* pBuffer; - sal_uInt16* pLast; - sal_uInt16 nBufSize; - sal_uInt16 nLastId; + sal_uInt16* pBuffer; + sal_uInt16* pLast; + sal_uInt16 nBufSize; + sal_uInt16 nLastId; public: XclExpChTrTabIdBuffer( sal_uInt16 nCount ); XclExpChTrTabIdBuffer( const XclExpChTrTabIdBuffer& rCopy ); ~XclExpChTrTabIdBuffer(); - void InitFill( sal_uInt16 nIndex ); - void InitFillup(); + void InitFill( sal_uInt16 nIndex ); + void InitFillup(); - sal_uInt16 GetId( sal_uInt16 nIndex ) const; - void Remove(); + sal_uInt16 GetId( sal_uInt16 nIndex ) const; + void Remove(); - inline sal_uInt16 GetBufferCount() const + inline sal_uInt16 GetBufferCount() const { return static_cast< sal_uInt16 >( (pLast - pBuffer) + 1 ); } - inline void GetBufferCopy( sal_uInt16* pDest ) const + inline void GetBufferCopy( sal_uInt16* pDest ) const { memcpy( pDest, pBuffer, sizeof(sal_uInt16) * GetBufferCount() ); } }; @@ -312,13 +312,13 @@ public: class XclExpChTrTabIdBufferList : private List { private: - inline XclExpChTrTabIdBuffer* First() { return (XclExpChTrTabIdBuffer*) List::First(); } - inline XclExpChTrTabIdBuffer* Next() { return (XclExpChTrTabIdBuffer*) List::Next(); } + inline XclExpChTrTabIdBuffer* First() { return (XclExpChTrTabIdBuffer*) List::First(); } + inline XclExpChTrTabIdBuffer* Next() { return (XclExpChTrTabIdBuffer*) List::Next(); } public: - virtual ~XclExpChTrTabIdBufferList(); + virtual ~XclExpChTrTabIdBufferList(); - inline void Append( XclExpChTrTabIdBuffer* pNew ) + inline void Append( XclExpChTrTabIdBuffer* pNew ) { List::Insert( pNew, LIST_APPEND ); } }; @@ -328,23 +328,23 @@ public: class XclExpChTrTabId : public ExcRecord { private: - sal_uInt16* pBuffer; - sal_uInt16 nTabCount; + sal_uInt16* pBuffer; + sal_uInt16 nTabCount; bool mbInRevisionHeaders; - inline void Clear() { if( pBuffer ) delete[] pBuffer; pBuffer = NULL; } + inline void Clear() { if( pBuffer ) delete[] pBuffer; pBuffer = NULL; } - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ); public: - inline XclExpChTrTabId( sal_uInt16 nCount ) : + inline XclExpChTrTabId( sal_uInt16 nCount ) : pBuffer( NULL ), nTabCount( nCount ), mbInRevisionHeaders( false ) {} XclExpChTrTabId( const XclExpChTrTabIdBuffer& rBuffer, bool bInRevisionHeaders = false ); - virtual ~XclExpChTrTabId(); + virtual ~XclExpChTrTabId(); - void Copy( const XclExpChTrTabIdBuffer& rBuffer ); + void Copy( const XclExpChTrTabIdBuffer& rBuffer ); - virtual UINT16 GetNum() const; + virtual UINT16 GetNum() const; virtual sal_Size GetLen() const; virtual void SaveXml( XclExpXmlStream& rStrm ); @@ -356,45 +356,45 @@ public: class XclExpChTrAction : public ExcRecord { private: - String sUsername; - DateTime aDateTime; - sal_uInt32 nIndex; // action number - XclExpChTrAction* pAddAction; // additional record for this action - sal_Bool bAccepted; + String sUsername; + DateTime aDateTime; + sal_uInt32 nIndex; // action number + XclExpChTrAction* pAddAction; // additional record for this action + sal_Bool bAccepted; protected: const XclExpTabInfo& rTabInfo; // for table num export (sc num -> xcl num) - const XclExpChTrTabIdBuffer& rIdBuffer; // for table num export (xcl num -> tab id) - sal_uInt32 nLength; // this is not the record size - sal_uInt16 nOpCode; // EXC_CHTR_OP_*** - sal_Bool bForceInfo; + const XclExpChTrTabIdBuffer& rIdBuffer; // for table num export (xcl num -> tab id) + sal_uInt32 nLength; // this is not the record size + sal_uInt16 nOpCode; // EXC_CHTR_OP_*** + sal_Bool bForceInfo; XclExpChTrAction( const XclExpChTrAction& rCopy ); - void SetAddAction( XclExpChTrAction* pAction ); - void AddDependentContents( + void SetAddAction( XclExpChTrAction* pAction ); + void AddDependentContents( const ScChangeAction& rAction, const XclExpRoot& rRoot, ScChangeTrack& rChangeTrack ); - inline void Write2DAddress( XclExpStream& rStrm, const ScAddress& rAddress ) const; - inline void Write2DRange( XclExpStream& rStrm, const ScRange& rRange ) const; + inline void Write2DAddress( XclExpStream& rStrm, const ScAddress& rAddress ) const; + inline void Write2DRange( XclExpStream& rStrm, const ScRange& rRange ) const; inline sal_uInt16 GetTabId( SCTAB nTabId ) const; - inline void WriteTabId( XclExpStream& rStrm, SCTAB nTabId ) const; + inline void WriteTabId( XclExpStream& rStrm, SCTAB nTabId ) const; // save header data, call SaveActionData() - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ); inline sal_Size GetHeaderByteCount() const { return 12; } // overload to save action data without header, called by SaveCont() - virtual void SaveActionData( XclExpStream& rStrm ) const = 0; + virtual void SaveActionData( XclExpStream& rStrm ) const = 0; // overload to get action size without header, called by GetLen() virtual sal_Size GetActionByteCount() const = 0; // do something before writing the record - virtual void PrepareSaveAction( XclExpStream& rStrm ) const; + virtual void PrepareSaveAction( XclExpStream& rStrm ) const; // do something after writing the record - virtual void CompleteSaveAction( XclExpStream& rStrm ) const; + virtual void CompleteSaveAction( XclExpStream& rStrm ) const; inline sal_uInt32 GetActionNumber() const { return nIndex; } inline sal_Bool GetAccepted() const { return bAccepted; } @@ -405,18 +405,18 @@ public: const XclExpRoot& rRoot, const XclExpChTrTabIdBuffer& rTabIdBuffer, sal_uInt16 nNewOpCode = EXC_CHTR_OP_UNKNOWN ); - virtual ~XclExpChTrAction(); + virtual ~XclExpChTrAction(); - inline const String& GetUsername() const { return sUsername; } - inline const DateTime& GetDateTime() const { return aDateTime; } - inline const XclExpChTrTabIdBuffer& GetTabIdBuffer() const { return rIdBuffer; } - inline sal_Bool ForceInfoRecord() const { return bForceInfo; } + inline const String& GetUsername() const { return sUsername; } + inline const DateTime& GetDateTime() const { return aDateTime; } + inline const XclExpChTrTabIdBuffer& GetTabIdBuffer() const { return rIdBuffer; } + inline sal_Bool ForceInfoRecord() const { return bForceInfo; } // set own index & return new index // could be overloaded to use more indexes per action - virtual void SetIndex( sal_uInt32& rIndex ); + virtual void SetIndex( sal_uInt32& rIndex ); - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ); virtual sal_Size GetLen() const; inline XclExpChTrAction* GetAddAction() { return pAddAction; } @@ -424,16 +424,16 @@ public: inline void XclExpChTrAction::Write2DAddress( XclExpStream& rStrm, const ScAddress& rAddress ) const { - rStrm << (sal_uInt16) rAddress.Row() - << (sal_uInt16) rAddress.Col(); + rStrm << (sal_uInt16) rAddress.Row() + << (sal_uInt16) rAddress.Col(); } inline void XclExpChTrAction::Write2DRange( XclExpStream& rStrm, const ScRange& rRange ) const { - rStrm << (sal_uInt16) rRange.aStart.Row() - << (sal_uInt16) rRange.aEnd.Row() - << (sal_uInt16) rRange.aStart.Col() - << (sal_uInt16) rRange.aEnd.Col(); + rStrm << (sal_uInt16) rRange.aStart.Row() + << (sal_uInt16) rRange.aEnd.Row() + << (sal_uInt16) rRange.aStart.Col() + << (sal_uInt16) rRange.aEnd.Col(); } inline sal_uInt16 XclExpChTrAction::GetTabId( SCTAB nTab ) const @@ -456,19 +456,19 @@ struct XclExpChTrData const ScFormulaCell* mpFormulaCell; XclTokenArrayRef mxTokArr; XclExpRefLog maRefLog; - double fValue; - sal_Int32 nRKValue; - sal_uInt16 nType; + double fValue; + sal_Int32 nRKValue; + sal_uInt16 nType; sal_Size nSize; XclExpChTrData(); ~XclExpChTrData(); - void Clear(); + void Clear(); - void WriteFormula( + void WriteFormula( XclExpStream& rStrm, const XclExpChTrTabIdBuffer& rTabIdBuffer ); - void Write( + void Write( XclExpStream& rStrm, const XclExpChTrTabIdBuffer& rTabIdBuffer ); }; @@ -479,32 +479,32 @@ struct XclExpChTrData class XclExpChTrCellContent : public XclExpChTrAction, protected XclExpRoot { private: - XclExpChTrData* pOldData; - XclExpChTrData* pNewData; - sal_uInt16 nOldLength; // this is not the record size + XclExpChTrData* pOldData; + XclExpChTrData* pNewData; + sal_uInt16 nOldLength; // this is not the record size - void MakeEmptyChTrData( XclExpChTrData*& rpData ); + void MakeEmptyChTrData( XclExpChTrData*& rpData ); protected: - ScAddress aPosition; + ScAddress aPosition; - void GetCellData( + void GetCellData( const XclExpRoot& rRoot, const ScBaseCell* pScCell, XclExpChTrData*& rpData, sal_uInt32& rXclLength1, sal_uInt16& rXclLength2 ); - virtual void SaveActionData( XclExpStream& rStrm ) const; + virtual void SaveActionData( XclExpStream& rStrm ) const; public: XclExpChTrCellContent( const ScChangeActionContent& rAction, const XclExpRoot& rRoot, const XclExpChTrTabIdBuffer& rTabIdBuffer ); - virtual ~XclExpChTrCellContent(); + virtual ~XclExpChTrCellContent(); - virtual UINT16 GetNum() const; + virtual UINT16 GetNum() const; virtual sal_Size GetActionByteCount() const; virtual void SaveXml( XclExpXmlStream& rStrm ); @@ -516,14 +516,14 @@ public: class XclExpChTrInsert : public XclExpChTrAction { protected: - ScRange aRange; + ScRange aRange; XclExpChTrInsert( const XclExpChTrInsert& rCopy ) : XclExpChTrAction( rCopy ), aRange( rCopy.aRange ) {} - virtual void SaveActionData( XclExpStream& rStrm ) const; - virtual void PrepareSaveAction( XclExpStream& rStrm ) const; - virtual void CompleteSaveAction( XclExpStream& rStrm ) const; + virtual void SaveActionData( XclExpStream& rStrm ) const; + virtual void PrepareSaveAction( XclExpStream& rStrm ) const; + virtual void CompleteSaveAction( XclExpStream& rStrm ) const; public: XclExpChTrInsert( @@ -531,9 +531,9 @@ public: const XclExpRoot& rRoot, const XclExpChTrTabIdBuffer& rTabIdBuffer, ScChangeTrack& rChangeTrack ); - virtual ~XclExpChTrInsert(); + virtual ~XclExpChTrInsert(); - virtual UINT16 GetNum() const; + virtual UINT16 GetNum() const; virtual sal_Size GetActionByteCount() const; virtual void SaveXml( XclExpXmlStream& rStrm ); @@ -545,19 +545,19 @@ public: class XclExpChTrInsertTab : public XclExpChTrAction, protected XclExpRoot { private: - SCTAB nTab; + SCTAB nTab; protected: - virtual void SaveActionData( XclExpStream& rStrm ) const; + virtual void SaveActionData( XclExpStream& rStrm ) const; public: XclExpChTrInsertTab( const ScChangeAction& rAction, const XclExpRoot& rRoot, const XclExpChTrTabIdBuffer& rTabIdBuffer ); - virtual ~XclExpChTrInsertTab(); + virtual ~XclExpChTrInsertTab(); - virtual UINT16 GetNum() const; + virtual UINT16 GetNum() const; virtual sal_Size GetActionByteCount() const; virtual void SaveXml( XclExpXmlStream& rStrm ); @@ -569,12 +569,12 @@ public: class XclExpChTrMoveRange : public XclExpChTrAction { protected: - ScRange aSourceRange; - ScRange aDestRange; + ScRange aSourceRange; + ScRange aDestRange; - virtual void SaveActionData( XclExpStream& rStrm ) const; - virtual void PrepareSaveAction( XclExpStream& rStrm ) const; - virtual void CompleteSaveAction( XclExpStream& rStrm ) const; + virtual void SaveActionData( XclExpStream& rStrm ) const; + virtual void PrepareSaveAction( XclExpStream& rStrm ) const; + virtual void CompleteSaveAction( XclExpStream& rStrm ) const; public: XclExpChTrMoveRange( @@ -582,9 +582,9 @@ public: const XclExpRoot& rRoot, const XclExpChTrTabIdBuffer& rTabIdBuffer, ScChangeTrack& rChangeTrack ); - virtual ~XclExpChTrMoveRange(); + virtual ~XclExpChTrMoveRange(); - virtual UINT16 GetNum() const; + virtual UINT16 GetNum() const; virtual sal_Size GetActionByteCount() const; virtual void SaveXml( XclExpXmlStream& rStrm ); @@ -596,13 +596,13 @@ public: class XclExpChTr0x014A : public XclExpChTrInsert { protected: - virtual void SaveActionData( XclExpStream& rStrm ) const; + virtual void SaveActionData( XclExpStream& rStrm ) const; public: XclExpChTr0x014A( const XclExpChTrInsert& rAction ); - virtual ~XclExpChTr0x014A(); + virtual ~XclExpChTr0x014A(); - virtual UINT16 GetNum() const; + virtual UINT16 GetNum() const; virtual sal_Size GetActionByteCount() const; virtual void SaveXml( XclExpXmlStream& rStrm ); @@ -614,10 +614,10 @@ public: class XclExpChTrActionStack : private Stack { public: - virtual ~XclExpChTrActionStack(); + virtual ~XclExpChTrActionStack(); - void Push( XclExpChTrAction* pNewRec ); - inline XclExpChTrAction* Pop() { return (XclExpChTrAction*) Stack::Pop(); } + void Push( XclExpChTrAction* pNewRec ); + inline XclExpChTrAction* Pop() { return (XclExpChTrAction*) Stack::Pop(); } private: using Stack::Push; @@ -629,16 +629,16 @@ private: class XclExpChTrRecordList : private List { private: - inline ExcRecord* First() { return (ExcRecord*) List::First(); } - inline ExcRecord* Next() { return (ExcRecord*) List::Next(); } + inline ExcRecord* First() { return (ExcRecord*) List::First(); } + inline ExcRecord* Next() { return (ExcRecord*) List::Next(); } public: - virtual ~XclExpChTrRecordList(); + virtual ~XclExpChTrRecordList(); using List::Count; - void Append( ExcRecord* pNewRec ); - void Save( XclExpStream& rStrm ); - void SaveXml( XclExpXmlStream& rStrm ); + void Append( ExcRecord* pNewRec ); + void Save( XclExpStream& rStrm ); + void SaveXml( XclExpXmlStream& rStrm ); }; //___________________________________________________________________ @@ -647,29 +647,29 @@ public: class XclExpChangeTrack : protected XclExpRoot { private: - XclExpChTrRecordList aRecList; - XclExpChTrActionStack aActionStack; - XclExpChTrTabIdBufferList aTabIdBufferList; - XclExpChTrTabIdBuffer* pTabIdBuffer; + XclExpChTrRecordList aRecList; + XclExpChTrActionStack aActionStack; + XclExpChTrTabIdBufferList aTabIdBufferList; + XclExpChTrTabIdBuffer* pTabIdBuffer; - ScDocument* pTempDoc; // empty document + ScDocument* pTempDoc; // empty document - sal_uInt32 nNewAction; // action number, 1-based - XclExpChTrHeader* pHeader; // header record for last GUID - sal_uInt8 aGUID[ 16 ]; // GUID for action info records - sal_Bool bValidGUID; + sal_uInt32 nNewAction; // action number, 1-based + XclExpChTrHeader* pHeader; // header record for last GUID + sal_uInt8 aGUID[ 16 ]; // GUID for action info records + sal_Bool bValidGUID; - ScChangeTrack* CreateTempChangeTrack(); - void PushActionRecord( const ScChangeAction& rAction ); + ScChangeTrack* CreateTempChangeTrack(); + void PushActionRecord( const ScChangeAction& rAction ); - sal_Bool WriteUserNamesStream(); + sal_Bool WriteUserNamesStream(); public: XclExpChangeTrack( const XclExpRoot& rRoot ); ~XclExpChangeTrack(); - void Write(); - void WriteXml( XclExpXmlStream& rStrm ); + void Write(); + void WriteXml( XclExpXmlStream& rStrm ); }; //___________________________________________________________________ diff --git a/sc/source/filter/inc/XclImpChangeTrack.hxx b/sc/source/filter/inc/XclImpChangeTrack.hxx index 0bed2ca49c2f..11f253bcb8fd 100644 --- a/sc/source/filter/inc/XclImpChangeTrack.hxx +++ b/sc/source/filter/inc/XclImpChangeTrack.hxx @@ -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 @@ -47,10 +47,10 @@ class XclImpChTrFmlConverter; struct XclImpChTrRecHeader { - sal_uInt32 nSize; - sal_uInt32 nIndex; - sal_uInt16 nOpCode; - sal_uInt16 nAccept; + sal_uInt32 nSize; + sal_uInt32 nIndex; + sal_uInt16 nOpCode; + sal_uInt16 nAccept; }; inline XclImpStream& operator>>( XclImpStream& rStrm, XclImpChTrRecHeader& rRecHeader ) @@ -64,59 +64,59 @@ inline XclImpStream& operator>>( XclImpStream& rStrm, XclImpChTrRecHeader& rRecH class XclImpChangeTrack : protected XclImpRoot { private: - XclImpChTrRecHeader aRecHeader; - String sOldUsername; + XclImpChTrRecHeader aRecHeader; + String sOldUsername; - ScChangeTrack* pChangeTrack; + ScChangeTrack* pChangeTrack; SotStorageStreamRef xInStrm; // input stream - XclImpStream* pStrm; // stream import class - sal_uInt16 nTabIdCount; - sal_Bool bGlobExit; // global exit loop + XclImpStream* pStrm; // stream import class + sal_uInt16 nTabIdCount; + sal_Bool bGlobExit; // global exit loop enum { nmBase, nmFound, nmNested } - eNestedMode; // action with nested content actions + eNestedMode; // action with nested content actions - inline sal_Bool FoundNestedMode() { return eNestedMode == nmFound; } + inline sal_Bool FoundNestedMode() { return eNestedMode == nmFound; } - void DoAcceptRejectAction( ScChangeAction* pAction ); - void DoAcceptRejectAction( sal_uInt32 nFirst, sal_uInt32 nLast ); + void DoAcceptRejectAction( ScChangeAction* pAction ); + void DoAcceptRejectAction( sal_uInt32 nFirst, sal_uInt32 nLast ); - void DoInsertRange( const ScRange& rRange ); - void DoDeleteRange( const ScRange& rRange ); + void DoInsertRange( const ScRange& rRange ); + void DoDeleteRange( const ScRange& rRange ); - inline sal_uInt8 LookAtuInt8(); - inline double ReadRK(); - inline sal_Bool ReadBool(); - inline void Read2DAddress( ScAddress& rAddress ); - inline void Read2DRange( ScRange& rRange ); + inline sal_uInt8 LookAtuInt8(); + inline double ReadRK(); + inline sal_Bool ReadBool(); + inline void Read2DAddress( ScAddress& rAddress ); + inline void Read2DRange( ScRange& rRange ); SCTAB ReadTabNum(); - void ReadDateTime( DateTime& rDateTime ); + void ReadDateTime( DateTime& rDateTime ); - inline void ReadString( String& rString ); - inline void IgnoreString(); + inline void ReadString( String& rString ); + inline void IgnoreString(); - sal_Bool CheckRecord( sal_uInt16 nOpCode ); + sal_Bool CheckRecord( sal_uInt16 nOpCode ); - void ReadFormula( + void ReadFormula( ScTokenArray*& rpTokenArray, const ScAddress& rPosition ); - void ReadCell( + void ReadCell( ScBaseCell*& rpCell, sal_uInt32& rFormat, sal_uInt16 nFlags, const ScAddress& rPosition ); - void ReadChTrInsert(); // 0x0137 - void ReadChTrInfo(); // 0x0138 - void ReadChTrCellContent(); // 0x013B - void ReadChTrTabId(); // 0x013D - void ReadChTrMoveRange(); // 0x0140 - void ReadChTrInsertTab(); // 0x014D - void InitNestedMode(); // 0x014E, 0x0150 - void ReadNestedRecords(); - sal_Bool EndNestedMode(); // 0x014F, 0x0151 + void ReadChTrInsert(); // 0x0137 + void ReadChTrInfo(); // 0x0138 + void ReadChTrCellContent(); // 0x013B + void ReadChTrTabId(); // 0x013D + void ReadChTrMoveRange(); // 0x0140 + void ReadChTrInsertTab(); // 0x014D + void InitNestedMode(); // 0x014E, 0x0150 + void ReadNestedRecords(); + sal_Bool EndNestedMode(); // 0x014F, 0x0151 - void ReadRecords(); + void ReadRecords(); public: XclImpChangeTrack( const XclImpRoot& rRoot, const XclImpStream& rBookStrm ); @@ -124,9 +124,9 @@ public: // reads extended 3D ref info following the formulas, returns sc tab nums // ( called by XclImpChTrFmlConverter::Read3DTabReference() ) - sal_Bool Read3DTabRefInfo( SCTAB& rFirstTab, SCTAB& rLastTab, ExcelToSc8::ExternalTabInfo& rExtInfo ); + sal_Bool Read3DTabRefInfo( SCTAB& rFirstTab, SCTAB& rLastTab, ExcelToSc8::ExternalTabInfo& rExtInfo ); - void Apply(); + void Apply(); }; inline sal_uInt8 XclImpChangeTrack::LookAtuInt8() @@ -178,15 +178,15 @@ inline void XclImpChangeTrack::IgnoreString() class XclImpChTrFmlConverter : public ExcelToSc8 { private: - XclImpChangeTrack& rChangeTrack; + XclImpChangeTrack& rChangeTrack; virtual bool Read3DTabReference( UINT16 nIxti, SCTAB& rFirstTab, SCTAB& rLastTab, ExternalTabInfo& rExtInfo ); public: - inline XclImpChTrFmlConverter( + inline XclImpChTrFmlConverter( const XclImpRoot& rRoot, XclImpChangeTrack& rXclChTr ); - virtual ~XclImpChTrFmlConverter(); + virtual ~XclImpChTrFmlConverter(); }; inline XclImpChTrFmlConverter::XclImpChTrFmlConverter( diff --git a/sc/source/filter/inc/biff.hxx b/sc/source/filter/inc/biff.hxx index d2cba2e8d06a..2c66a5e2c21e 100644 --- a/sc/source/filter/inc/biff.hxx +++ b/sc/source/filter/inc/biff.hxx @@ -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 @@ -35,11 +35,11 @@ #include "document.hxx" #include "cell.hxx" #include <tools/string.hxx> - + #include <tools/color.hxx> #include "flttypes.hxx" #include "ftools.hxx" - + // Stream wrapper class class ScBiffReader { @@ -49,17 +49,17 @@ class ScBiffReader sal_uInt32 mnOffset; SvStream *mpStream; bool mbEndOfFile; - + public: ScBiffReader( SfxMedium& rMedium ); ~ScBiffReader(); bool recordsLeft() { return mpStream && !mpStream->IsEof(); } bool IsEndOfFile() { return mbEndOfFile; } - void SetEof( bool bValue ){ mbEndOfFile = bValue; } + void SetEof( bool bValue ){ mbEndOfFile = bValue; } bool nextRecord(); sal_uInt16 getId() { return mnId; } sal_uInt16 getLength() { return mnLength; } - SvStream& getStream() { return *mpStream; } + SvStream& getStream() { return *mpStream; } }; #endif diff --git a/sc/source/filter/inc/colrowst.hxx b/sc/source/filter/inc/colrowst.hxx index 525db195bac1..6b824ae53151 100644 --- a/sc/source/filter/inc/colrowst.hxx +++ b/sc/source/filter/inc/colrowst.hxx @@ -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 diff --git a/sc/source/filter/inc/decl.h b/sc/source/filter/inc/decl.h index c57446c8299d..f5b5123c2f2d 100644 --- a/sc/source/filter/inc/decl.h +++ b/sc/source/filter/inc/decl.h @@ -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 diff --git a/sc/source/filter/inc/dif.hxx b/sc/source/filter/inc/dif.hxx index 20d7d8e79926..ad9b52a7a3f6 100644 --- a/sc/source/filter/inc/dif.hxx +++ b/sc/source/filter/inc/dif.hxx @@ -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 @@ -70,74 +70,74 @@ enum DATASET { D_BOT, D_EOD, D_NUMERIC, D_STRING, D_UNKNOWN, D_SYNT_ERROR }; class DifParser { public: - String aData; - double fVal; - UINT32 nVector; - UINT32 nVal; - UINT32 nNumFormat; - CharSet eCharSet; + String aData; + double fVal; + UINT32 nVector; + UINT32 nVal; + UINT32 nNumFormat; + CharSet eCharSet; private: - SvNumberFormatter* pNumFormatter; - SvStream& rIn; - BOOL bPlain; + SvNumberFormatter* pNumFormatter; + SvStream& rIn; + BOOL bPlain; String aLookAheadLine; bool ReadNextLine( String& rStr ); bool LookAhead(); DATASET GetNumberDataset( const sal_Unicode* pPossibleNumericData ); - static inline BOOL IsBOT( const sal_Unicode* pRef ); - static inline BOOL IsEOD( const sal_Unicode* pRef ); - static inline BOOL Is1_0( const sal_Unicode* pRef ); + static inline BOOL IsBOT( const sal_Unicode* pRef ); + static inline BOOL IsEOD( const sal_Unicode* pRef ); + static inline BOOL Is1_0( const sal_Unicode* pRef ); public: DifParser( SvStream&, const UINT32 nOption, ScDocument&, CharSet ); - TOPIC GetNextTopic( void ); + TOPIC GetNextTopic( void ); - DATASET GetNextDataset( void ); + DATASET GetNextDataset( void ); const sal_Unicode* ScanIntVal( const sal_Unicode* pStart, UINT32& rRet ); - BOOL ScanFloatVal( const sal_Unicode* pStart ); + BOOL ScanFloatVal( const sal_Unicode* pStart ); - inline BOOL IsNumber( const sal_Unicode cChar ); - inline BOOL IsNumberEnding( const sal_Unicode cChar ); + inline BOOL IsNumber( const sal_Unicode cChar ); + inline BOOL IsNumberEnding( const sal_Unicode cChar ); - static inline BOOL IsV( const sal_Unicode* pRef ); + static inline BOOL IsV( const sal_Unicode* pRef ); - inline BOOL IsPlain( void ) const; + inline BOOL IsPlain( void ) const; }; -inline BOOL DifParser::IsBOT( const sal_Unicode* pRef ) +inline BOOL DifParser::IsBOT( const sal_Unicode* pRef ) { - return ( pRef[ 0 ] == pKeyBOT[0] && + return ( pRef[ 0 ] == pKeyBOT[0] && pRef[ 1 ] == pKeyBOT[1] && pRef[ 2 ] == pKeyBOT[2] && - pRef[ 3 ] == pKeyBOT[3] ); + pRef[ 3 ] == pKeyBOT[3] ); } -inline BOOL DifParser::IsEOD( const sal_Unicode* pRef ) +inline BOOL DifParser::IsEOD( const sal_Unicode* pRef ) { - return ( pRef[ 0 ] == pKeyEOD[0] && + return ( pRef[ 0 ] == pKeyEOD[0] && pRef[ 1 ] == pKeyEOD[1] && pRef[ 2 ] == pKeyEOD[2] && - pRef[ 3 ] == pKeyEOD[3] ); + pRef[ 3 ] == pKeyEOD[3] ); } -inline BOOL DifParser::Is1_0( const sal_Unicode* pRef ) +inline BOOL DifParser::Is1_0( const sal_Unicode* pRef ) { - return ( pRef[ 0 ] == pKey1_0[0] && + return ( pRef[ 0 ] == pKey1_0[0] && pRef[ 1 ] == pKey1_0[1] && pRef[ 2 ] == pKey1_0[2] && - pRef[ 3 ] == pKey1_0[3] ); + pRef[ 3 ] == pKey1_0[3] ); } -inline BOOL DifParser::IsV( const sal_Unicode* pRef ) +inline BOOL DifParser::IsV( const sal_Unicode* pRef ) { - return ( pRef[ 0 ] == pKeyV[0] && - pRef[ 1 ] == pKeyV[1] ); + return ( pRef[ 0 ] == pKeyV[0] && + pRef[ 1 ] == pKeyV[1] ); } @@ -171,22 +171,22 @@ private: friend class DifAttrCache; struct ENTRY { - UINT32 nNumFormat; + UINT32 nNumFormat; - SCROW nStart; - SCROW nEnd; + SCROW nStart; + SCROW nEnd; }; - ENTRY* pAkt; + ENTRY* pAkt; - inline DifColumn( void ); + inline DifColumn( void ); ~DifColumn(); - void SetLogical( SCROW nRow ); - void SetNumFormat( SCROW nRow, const UINT32 nNumFormat ); - void NewEntry( const SCROW nPos, const UINT32 nNumFormat ); - void Apply( ScDocument&, const SCCOL nCol, const SCTAB nTab, const ScPatternAttr& ); - void Apply( ScDocument &rDoc, const SCCOL nCol, const SCTAB nTab ); -public: // geht niemanden etwas an... + void SetLogical( SCROW nRow ); + void SetNumFormat( SCROW nRow, const UINT32 nNumFormat ); + void NewEntry( const SCROW nPos, const UINT32 nNumFormat ); + void Apply( ScDocument&, const SCCOL nCol, const SCTAB nTab, const ScPatternAttr& ); + void Apply( ScDocument &rDoc, const SCCOL nCol, const SCTAB nTab ); +public: // geht niemanden etwas an... }; @@ -201,14 +201,14 @@ inline DifColumn::DifColumn( void ) class DifAttrCache { private: - DifColumn** ppCols; - BOOL bPlain; + DifColumn** ppCols; + BOOL bPlain; public: DifAttrCache( const BOOL bPlain ); ~DifAttrCache(); - inline void SetLogical( const SCCOL nCol, const SCROW nRow ); - void SetNumFormat( const SCCOL nCol, const SCROW nRow, const UINT32 nNumFormat ); - void Apply( ScDocument&, SCTAB nTab ); + inline void SetLogical( const SCCOL nCol, const SCROW nRow ); + void SetNumFormat( const SCCOL nCol, const SCROW nRow, const UINT32 nNumFormat ); + void Apply( ScDocument&, SCTAB nTab ); }; diff --git a/sc/source/filter/inc/eeimport.hxx b/sc/source/filter/inc/eeimport.hxx index 2d1081c3debc..ea3f822de887 100644 --- a/sc/source/filter/inc/eeimport.hxx +++ b/sc/source/filter/inc/eeimport.hxx @@ -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 diff --git a/sc/source/filter/inc/eeparser.hxx b/sc/source/filter/inc/eeparser.hxx index b0d7a20e7743..11937d0ff742 100644 --- a/sc/source/filter/inc/eeparser.hxx +++ b/sc/source/filter/inc/eeparser.hxx @@ -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 @@ -43,12 +43,12 @@ const sal_Char nHoriVerti = nHorizontal | nVertical; struct ScHTMLImage { - String aURL; - Size aSize; - Point aSpace; - String aFilterName; - Graphic* pGraphic; // wird von WriteToDocument uebernommen - sal_Char nDir; // 1==hori, 2==verti, 3==beides + String aURL; + Size aSize; + Point aSpace; + String aFilterName; + Graphic* pGraphic; // wird von WriteToDocument uebernommen + sal_Char nDir; // 1==hori, 2==verti, 3==beides ScHTMLImage() : aSize( 0, 0 ), aSpace( 0, 0 ), pGraphic( NULL ), @@ -61,22 +61,22 @@ DECLARE_LIST( ScHTMLImageList, ScHTMLImage* ) struct ScEEParseEntry { - SfxItemSet aItemSet; - ESelection aSel; // Selection in EditEngine - String* pValStr; // HTML evtl. SDVAL String - String* pNumStr; // HTML evtl. SDNUM String - String* pName; // HTML evtl. Anchor/RangeName - String aAltText; // HTML IMG ALT Text - ScHTMLImageList* pImageList; // Grafiken in dieser Zelle - SCCOL nCol; // relativ zum Beginn des Parse - SCROW nRow; - USHORT nTab; // HTML TableInTable - USHORT nTwips; // RTF ColAdjust etc. - SCCOL nColOverlap; // merged cells wenn >1 - SCROW nRowOverlap; // merged cells wenn >1 - USHORT nOffset; // HTML PixelOffset - USHORT nWidth; // HTML PixelWidth - BOOL bHasGraphic; // HTML any image loaded + SfxItemSet aItemSet; + ESelection aSel; // Selection in EditEngine + String* pValStr; // HTML evtl. SDVAL String + String* pNumStr; // HTML evtl. SDNUM String + String* pName; // HTML evtl. Anchor/RangeName + String aAltText; // HTML IMG ALT Text + ScHTMLImageList* pImageList; // Grafiken in dieser Zelle + SCCOL nCol; // relativ zum Beginn des Parse + SCROW nRow; + USHORT nTab; // HTML TableInTable + USHORT nTwips; // RTF ColAdjust etc. + SCCOL nColOverlap; // merged cells wenn >1 + SCROW nRowOverlap; // merged cells wenn >1 + USHORT nOffset; // HTML PixelOffset + USHORT nWidth; // HTML PixelWidth + BOOL bHasGraphic; // HTML any image loaded bool bEntirePara; // TRUE = use entire paragraph, false = use selection ScEEParseEntry( SfxItemPool* pPool ) : @@ -120,32 +120,32 @@ class EditEngine; class ScEEParser { protected: - EditEngine* pEdit; - SfxItemPool* pPool; - SfxItemPool* pDocPool; - ScEEParseList* pList; - ScEEParseEntry* pActEntry; - Table* pColWidths; - int nLastToken; - SCCOL nColCnt; - SCROW nRowCnt; - SCCOL nColMax; - SCROW nRowMax; - - void NewActEntry( ScEEParseEntry* ); + EditEngine* pEdit; + SfxItemPool* pPool; + SfxItemPool* pDocPool; + ScEEParseList* pList; + ScEEParseEntry* pActEntry; + Table* pColWidths; + int nLastToken; + SCCOL nColCnt; + SCROW nRowCnt; + SCCOL nColMax; + SCROW nRowMax; + + void NewActEntry( ScEEParseEntry* ); public: ScEEParser( EditEngine* ); - virtual ~ScEEParser(); + virtual ~ScEEParser(); virtual ULONG Read( SvStream&, const String& rBaseURL ) = 0; - void GetDimensions( SCCOL& nCols, SCROW& nRows ) const + void GetDimensions( SCCOL& nCols, SCROW& nRows ) const { nCols = nColMax; nRows = nRowMax; } - ULONG Count() const { return pList->Count(); } - ScEEParseEntry* First() const { return pList->First(); } - ScEEParseEntry* Next() const { return pList->Next(); } - Table* GetColWidths() const { return pColWidths; } + ULONG Count() const { return pList->Count(); } + ScEEParseEntry* First() const { return pList->First(); } + ScEEParseEntry* Next() const { return pList->Next(); } + Table* GetColWidths() const { return pColWidths; } }; diff --git a/sc/source/filter/inc/excdefs.hxx b/sc/source/filter/inc/excdefs.hxx index ae8a1cd4c861..0a1d39c0457a 100644 --- a/sc/source/filter/inc/excdefs.hxx +++ b/sc/source/filter/inc/excdefs.hxx @@ -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 @@ -64,7 +64,7 @@ const sal_uInt8 EXC_AFOPER_GREATEREQUAL = 0x06; // (0x00AE, 0x00AF) SCENARIO, SCENMAN ========================================= -#define EXC_SCEN_MAXCELL 32 +#define EXC_SCEN_MAXCELL 32 // defines for change tracking ================================================ @@ -72,34 +72,34 @@ const sal_uInt8 EXC_AFOPER_GREATEREQUAL = 0x06; #define EXC_STREAM_REVLOG CREATE_STRING( "Revision Log" ) // opcodes -#define EXC_CHTR_OP_COLFLAG 0x0001 -#define EXC_CHTR_OP_DELFLAG 0x0002 -#define EXC_CHTR_OP_INSROW 0x0000 -#define EXC_CHTR_OP_INSCOL EXC_CHTR_OP_COLFLAG -#define EXC_CHTR_OP_DELROW EXC_CHTR_OP_DELFLAG -#define EXC_CHTR_OP_DELCOL (EXC_CHTR_OP_COLFLAG|EXC_CHTR_OP_DELFLAG) -#define EXC_CHTR_OP_MOVE 0x0004 -#define EXC_CHTR_OP_INSTAB 0x0005 -#define EXC_CHTR_OP_CELL 0x0008 -#define EXC_CHTR_OP_RENAME 0x0009 -#define EXC_CHTR_OP_NAME 0x000A -#define EXC_CHTR_OP_FORMAT 0x000B -#define EXC_CHTR_OP_UNKNOWN 0xFFFF +#define EXC_CHTR_OP_COLFLAG 0x0001 +#define EXC_CHTR_OP_DELFLAG 0x0002 +#define EXC_CHTR_OP_INSROW 0x0000 +#define EXC_CHTR_OP_INSCOL EXC_CHTR_OP_COLFLAG +#define EXC_CHTR_OP_DELROW EXC_CHTR_OP_DELFLAG +#define EXC_CHTR_OP_DELCOL (EXC_CHTR_OP_COLFLAG|EXC_CHTR_OP_DELFLAG) +#define EXC_CHTR_OP_MOVE 0x0004 +#define EXC_CHTR_OP_INSTAB 0x0005 +#define EXC_CHTR_OP_CELL 0x0008 +#define EXC_CHTR_OP_RENAME 0x0009 +#define EXC_CHTR_OP_NAME 0x000A +#define EXC_CHTR_OP_FORMAT 0x000B +#define EXC_CHTR_OP_UNKNOWN 0xFFFF // data types -#define EXC_CHTR_TYPE_MASK 0x0007 -#define EXC_CHTR_TYPE_FORMATMASK 0xFF00 -#define EXC_CHTR_TYPE_EMPTY 0x0000 -#define EXC_CHTR_TYPE_RK 0x0001 -#define EXC_CHTR_TYPE_DOUBLE 0x0002 -#define EXC_CHTR_TYPE_STRING 0x0003 -#define EXC_CHTR_TYPE_BOOL 0x0004 -#define EXC_CHTR_TYPE_FORMULA 0x0005 +#define EXC_CHTR_TYPE_MASK 0x0007 +#define EXC_CHTR_TYPE_FORMATMASK 0xFF00 +#define EXC_CHTR_TYPE_EMPTY 0x0000 +#define EXC_CHTR_TYPE_RK 0x0001 +#define EXC_CHTR_TYPE_DOUBLE 0x0002 +#define EXC_CHTR_TYPE_STRING 0x0003 +#define EXC_CHTR_TYPE_BOOL 0x0004 +#define EXC_CHTR_TYPE_FORMULA 0x0005 // accept flags -#define EXC_CHTR_NOTHING 0x0000 -#define EXC_CHTR_ACCEPT 0x0001 -#define EXC_CHTR_REJECT 0x0003 +#define EXC_CHTR_NOTHING 0x0000 +#define EXC_CHTR_ACCEPT 0x0001 +#define EXC_CHTR_REJECT 0x0003 // ============================================================================ diff --git a/sc/source/filter/inc/excdoc.hxx b/sc/source/filter/inc/excdoc.hxx index 26b9a64ef89a..7c4aee214eaa 100644 --- a/sc/source/filter/inc/excdoc.hxx +++ b/sc/source/filter/inc/excdoc.hxx @@ -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 @@ -61,9 +61,9 @@ private: XclExpCellTableRef mxCellTable; SCTAB mnScTab; // table number SC document - UINT16 nExcTab; // table number Excel document - UINT16 nAktRow; // fuer'n Iterator - UINT16 nAktCol; + UINT16 nExcTab; // table number Excel document + UINT16 nAktRow; // fuer'n Iterator + UINT16 nAktCol; NameBuffer* pTabNames; @@ -81,8 +81,8 @@ public: void FillAsTable( SCTAB nCodeNameIdx ); void FillAsEmptyTable( SCTAB nCodeNameIdx ); - void Write( XclExpStream& ); - void WriteXml( XclExpXmlStream& ); + void Write( XclExpStream& ); + void WriteXml( XclExpXmlStream& ); }; @@ -98,20 +98,20 @@ private: typedef XclExpRecordList< ExcBundlesheetBase > ExcBoundsheetList; typedef ExcBoundsheetList::RecordRefType ExcBoundsheetRef; - ExcTable aHeader; + ExcTable aHeader; ExcTableList maTableList; ExcBoundsheetList maBoundsheetList; - XclExpChangeTrack* pExpChangeTrack; + XclExpChangeTrack* pExpChangeTrack; public: explicit ExcDocument( const XclExpRoot& rRoot ); virtual ~ExcDocument(); - void ReadDoc( void ); - void Write( SvStream& rSvStrm ); - void WriteXml( XclExpXmlStream& ); + void ReadDoc( void ); + void Write( SvStream& rSvStrm ); + void WriteXml( XclExpXmlStream& ); }; diff --git a/sc/source/filter/inc/excform.hxx b/sc/source/filter/inc/excform.hxx index 9332f1ad502d..54378aef150d 100644 --- a/sc/source/filter/inc/excform.hxx +++ b/sc/source/filter/inc/excform.hxx @@ -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 @@ -44,21 +44,21 @@ protected: enum ExtensionType { EXTENSION_ARRAY, EXTENSION_NLR, EXTENSION_MEMAREA }; typedef ::std::vector< ExtensionType > ExtensionTypeVec; - BOOL bExternName; // wenn External Name gefunden wurde - static const UINT16 nRowMask; - static const UINT16 nLastInd; // letzter Index fuer Excel->SC- + BOOL bExternName; // wenn External Name gefunden wurde + static const UINT16 nRowMask; + static const UINT16 nLastInd; // letzter Index fuer Excel->SC- // Token Umsetzung XclFunctionProvider maFuncProv; const XclBiff meBiff; // --------------------------------------------------------------- - void DoMulArgs( DefTokenId eId, sal_uInt8 nNumArgs, sal_uInt8 mnMinParamCount = 0 ); + void DoMulArgs( DefTokenId eId, sal_uInt8 nNumArgs, sal_uInt8 mnMinParamCount = 0 ); - void ExcRelToScRel( UINT16 nRow, UINT8 nCol, ScSingleRefData&, const BOOL bName ); + void ExcRelToScRel( UINT16 nRow, UINT8 nCol, ScSingleRefData&, const BOOL bName ); public: ExcelToSc( const XclImpRoot& rRoot ); - virtual ~ExcelToSc(); + virtual ~ExcelToSc(); virtual ConvErr Convert( const ScTokenArray*&, XclImpStream& rStrm, sal_Size nFormulaLen, bool bAllowArrays, const FORMULA_TYPE eFT = FT_CellFormula ); @@ -69,17 +69,17 @@ public: virtual BOOL GetAbsRefs( ScRangeList& rRangeList, XclImpStream& rStrm, sal_Size nLen ); - void GetDummy( const ScTokenArray*& ); + void GetDummy( const ScTokenArray*& ); const ScTokenArray* GetBoolErr( XclBoolError ); BOOL GetShrFmla( const ScTokenArray*&, XclImpStream& rStrm, sal_Size nFormulaLen ); - static void SetError( ScFormulaCell& rCell, const ConvErr eErr ); + static void SetError( ScFormulaCell& rCell, const ConvErr eErr ); - static inline BOOL IsComplColRange( const UINT16 nCol1, const UINT16 nCol2 ); - static inline BOOL IsComplRowRange( const UINT16 nRow1, const UINT16 nRow2 ); + static inline BOOL IsComplColRange( const UINT16 nCol1, const UINT16 nCol2 ); + static inline BOOL IsComplRowRange( const UINT16 nRow1, const UINT16 nRow2 ); - void SetComplCol( ScComplexRefData& ); - void SetComplRow( ScComplexRefData& ); + void SetComplCol( ScComplexRefData& ); + void SetComplRow( ScComplexRefData& ); void ReadExtensions( const ExtensionTypeVec& rExtensions, XclImpStream& aIn ); @@ -130,7 +130,7 @@ private: public: ExcelToSc8( const XclImpRoot& rRoot ); - virtual ~ExcelToSc8(); + virtual ~ExcelToSc8(); virtual ConvErr Convert( const ScTokenArray*& rpTokArray, XclImpStream& rStrm, sal_Size nFormulaLen, bool bAllowArrays, const FORMULA_TYPE eFT = FT_CellFormula ); @@ -139,7 +139,7 @@ public: virtual ConvErr ConvertExternName( const ScTokenArray*& rpArray, XclImpStream& rStrm, sal_Size nFormulaLen, const String& rUrl, const ::std::vector<String>& rTabNames ); - static inline BOOL IsComplRowRange( const UINT16 nRow1, const UINT16 nRow2 ); + static inline BOOL IsComplRowRange( const UINT16 nRow1, const UINT16 nRow2 ); virtual BOOL GetAbsRefs( ScRangeList& rRangeList, XclImpStream& rStrm, sal_Size nLen ); }; diff --git a/sc/source/filter/inc/excimp8.hxx b/sc/source/filter/inc/excimp8.hxx index 5d3679a73256..ea0f1899b6eb 100644 --- a/sc/source/filter/inc/excimp8.hxx +++ b/sc/source/filter/inc/excimp8.hxx @@ -53,9 +53,9 @@ class ImportExcel8 : public ImportExcel { public: ImportExcel8( XclImpRootData& rImpData, SvStream& rStrm ); - virtual ~ImportExcel8( void ); + virtual ~ImportExcel8( void ); - virtual FltError Read( void ); + virtual FltError Read( void ); protected: // represents codename ( and associated modules ) @@ -63,25 +63,25 @@ protected: std::vector< String > AutoGeneratedCodeNames; ExcScenarioList aScenList; - void Calccount( void ); // 0x0C + void Calccount( void ); // 0x0C void Precision( void ); // 0x0E - void Delta( void ); // 0x10 - void Iteration( void ); // 0x11 - void Boundsheet( void ); // 0x85 - void FilterMode( void ); // 0x9B - void AutoFilterInfo( void ); // 0x9D - void AutoFilter( void ); // 0x9E - void Scenman( void ); // 0xAE - void Scenario( void ); // 0xAF - void ReadBasic( void ); // 0xD3 - void Labelsst( void ); // 0xFD - - void Hlink( void ); // 0x01B8 - void Codename( BOOL bWBGlobals ); // 0x01BA + void Delta( void ); // 0x10 + void Iteration( void ); // 0x11 + void Boundsheet( void ); // 0x85 + void FilterMode( void ); // 0x9B + void AutoFilterInfo( void ); // 0x9D + void AutoFilter( void ); // 0x9E + void Scenman( void ); // 0xAE + void Scenario( void ); // 0xAF + void ReadBasic( void ); // 0xD3 + void Labelsst( void ); // 0xFD + + void Hlink( void ); // 0x01B8 + void Codename( BOOL bWBGlobals ); // 0x01BA void SheetProtection( void ); // 0x0867 virtual void EndSheet( void ); - virtual void PostDocLoad( void ); + virtual void PostDocLoad( void ); private: void LoadDocumentProperties(); @@ -95,20 +95,20 @@ private: class XclImpAutoFilterData : private ExcRoot { private: - ScDBData* pCurrDBData; - ScQueryParam aParam; - SCSIZE nFirstEmpty; - BOOL bActive; - BOOL bHasConflict; + ScDBData* pCurrDBData; + ScQueryParam aParam; + SCSIZE nFirstEmpty; + BOOL bActive; + BOOL bHasConflict; BOOL bCriteria; BOOL bAutoOrAdvanced; ScRange aCriteriaRange; String aFilterName; - void CreateFromDouble( String& rStr, double fVal ); - void SetCellAttribs(); - void InsertQueryParam(); - void AmendAFName(const BOOL bUseUnNamed); + void CreateFromDouble( String& rStr, double fVal ); + void SetCellAttribs(); + void InsertQueryParam(); + void AmendAFName(const BOOL bUseUnNamed); protected: public: @@ -119,19 +119,19 @@ public: inline bool IsActive() const { return bActive; } inline bool IsFiltered() const { return bAutoOrAdvanced; } - inline SCTAB Tab() const { return aParam.nTab; } - inline SCCOL StartCol() const { return aParam.nCol1; } - inline SCROW StartRow() const { return aParam.nRow1; } - inline SCCOL EndCol() const { return aParam.nCol2; } - inline SCROW EndRow() const { return aParam.nRow2; } + inline SCTAB Tab() const { return aParam.nTab; } + inline SCCOL StartCol() const { return aParam.nCol1; } + inline SCROW StartRow() const { return aParam.nRow1; } + inline SCCOL EndCol() const { return aParam.nCol2; } + inline SCROW EndRow() const { return aParam.nRow2; } - void ReadAutoFilter( XclImpStream& rStrm ); + void ReadAutoFilter( XclImpStream& rStrm ); - inline void Activate() { bActive = TRUE; } + inline void Activate() { bActive = TRUE; } void SetAdvancedRange( const ScRange* pRange ); - void SetExtractPos( const ScAddress& rAddr ); + void SetExtractPos( const ScAddress& rAddr ); inline void SetAutoOrAdvanced() { bAutoOrAdvanced = TRUE; } - void Apply( const BOOL bUseUnNamed = FALSE ); + void Apply( const BOOL bUseUnNamed = FALSE ); void CreateScDBData( const BOOL bUseUnNamed ); void EnableRemoveFilter(); }; @@ -144,23 +144,23 @@ private: UINT16 nAFActiveCount; - inline XclImpAutoFilterData* _First() { return (XclImpAutoFilterData*) List::First(); } - inline XclImpAutoFilterData* _Next() { return (XclImpAutoFilterData*) List::Next(); } + inline XclImpAutoFilterData* _First() { return (XclImpAutoFilterData*) List::First(); } + inline XclImpAutoFilterData* _Next() { return (XclImpAutoFilterData*) List::Next(); } - inline void Append( XclImpAutoFilterData* pData ) + inline void Append( XclImpAutoFilterData* pData ) { List::Insert( pData, LIST_APPEND ); } protected: public: XclImpAutoFilterBuffer(); - virtual ~XclImpAutoFilterBuffer(); + virtual ~XclImpAutoFilterBuffer(); - void Insert( RootData* pRoot, const ScRange& rRange, + void Insert( RootData* pRoot, const ScRange& rRange, const String& rName ); - void AddAdvancedRange( const ScRange& rRange ); - void AddExtractPos( const ScRange& rRange ); - void Apply(); + void AddAdvancedRange( const ScRange& rRange ); + void AddExtractPos( const ScRange& rRange ); + void Apply(); - XclImpAutoFilterData* GetByTab( SCTAB nTab ); + XclImpAutoFilterData* GetByTab( SCTAB nTab ); inline void IncrementActiveAF() { nAFActiveCount++; } inline BOOL UseUnNamed() { return nAFActiveCount == 1; } }; diff --git a/sc/source/filter/inc/excrecds.hxx b/sc/source/filter/inc/excrecds.hxx index a450fb00f368..dfd2e5683198 100644 --- a/sc/source/filter/inc/excrecds.hxx +++ b/sc/source/filter/inc/excrecds.hxx @@ -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 @@ -72,14 +72,14 @@ class ExcTable; class ExcRecord : public XclExpRecord { public: - virtual void Save( XclExpStream& rStrm ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void Save( XclExpStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ); - virtual UINT16 GetNum() const = 0; + virtual UINT16 GetNum() const = 0; virtual sal_Size GetLen() const = 0; protected: - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ); private: /** Writes the body of the record. */ @@ -94,8 +94,8 @@ class ExcEmptyRec : public ExcRecord private: protected: public: - virtual void Save( XclExpStream& rStrm ); - virtual UINT16 GetNum() const; + virtual void Save( XclExpStream& rStrm ); + virtual UINT16 GetNum() const; virtual sal_Size GetLen() const; }; @@ -107,17 +107,17 @@ class ExcRecordList : protected List, public ExcEmptyRec private: protected: public: - virtual ~ExcRecordList(); + virtual ~ExcRecordList(); using List::Count; - inline ExcRecord* First( void ) { return ( ExcRecord* ) List::First(); } - inline ExcRecord* Next( void ) { return ( ExcRecord* ) List::Next(); } + inline ExcRecord* First( void ) { return ( ExcRecord* ) List::First(); } + inline ExcRecord* Next( void ) { return ( ExcRecord* ) List::Next(); } - inline void Append( ExcRecord* pNew ) { if( pNew ) List::Insert( pNew, LIST_APPEND ); } - inline const ExcRecord* Get( UINT32 nNum ) const { return ( ExcRecord* ) List::GetObject( nNum ); } + inline void Append( ExcRecord* pNew ) { if( pNew ) List::Insert( pNew, LIST_APPEND ); } + inline const ExcRecord* Get( UINT32 nNum ) const { return ( ExcRecord* ) List::GetObject( nNum ); } - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ); }; @@ -127,9 +127,9 @@ class ExcDummyRec : public ExcRecord { protected: public: - virtual void Save( XclExpStream& rStrm ); - virtual UINT16 GetNum() const; - virtual const BYTE* GetData() const = 0; // byte data must contain header and body + virtual void Save( XclExpStream& rStrm ); + virtual UINT16 GetNum() const; + virtual const BYTE* GetData() const = 0; // byte data must contain header and body }; @@ -139,15 +139,15 @@ public: class ExcBoolRecord : public ExcRecord { private: - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ); protected: - BOOL bVal; + BOOL bVal; - inline ExcBoolRecord() : bVal( FALSE ) {} + inline ExcBoolRecord() : bVal( FALSE ) {} public: - inline ExcBoolRecord( const BOOL bDefault ) : bVal( bDefault ) {} + inline ExcBoolRecord( const BOOL bDefault ) : bVal( bDefault ) {} virtual sal_Size GetLen( void ) const; }; @@ -159,10 +159,10 @@ class ExcBof_Base : public ExcRecord { private: protected: - UINT16 nDocType; - UINT16 nVers; - UINT16 nRupBuild; - UINT16 nRupYear; + UINT16 nDocType; + UINT16 nVers; + UINT16 nRupBuild; + UINT16 nRupYear; public: ExcBof_Base( void ); }; @@ -174,11 +174,11 @@ public: class ExcBof : public ExcBof_Base { private: - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ); public: ExcBof( void ); - virtual UINT16 GetNum( void ) const; + virtual UINT16 GetNum( void ) const; virtual sal_Size GetLen( void ) const; }; @@ -189,11 +189,11 @@ public: class ExcBofW : public ExcBof_Base { private: - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ); public: ExcBofW( void ); - virtual UINT16 GetNum( void ) const; + virtual UINT16 GetNum( void ) const; virtual sal_Size GetLen( void ) const; }; @@ -204,7 +204,7 @@ class ExcEof : public ExcRecord { private: public: - virtual UINT16 GetNum( void ) const; + virtual UINT16 GetNum( void ) const; virtual sal_Size GetLen( void ) const; }; @@ -215,15 +215,15 @@ public: class ExcDummy_00 : public ExcDummyRec { private: - static const BYTE pMyData[]; + static const BYTE pMyData[]; static const sal_Size nMyLen; public: virtual sal_Size GetLen( void ) const; - virtual const BYTE* GetData( void ) const; + virtual const BYTE* GetData( void ) const; }; // EXC_ID_WINDOWPROTECTION -class XclExpWindowProtection : public XclExpBoolRecord +class XclExpWindowProtection : public XclExpBoolRecord { public: XclExpWindowProtection(bool bValue); @@ -232,7 +232,7 @@ class XclExpWindowProtection : public XclExpBoolRecord }; // EXC_ID_PROTECT Document Protection -class XclExpProtection : public XclExpBoolRecord +class XclExpProtection : public XclExpBoolRecord { public: XclExpProtection(bool bValue); @@ -258,11 +258,11 @@ private: class ExcDummy_040 : public ExcDummyRec { private: - static const BYTE pMyData[]; + static const BYTE pMyData[]; static const sal_Size nMyLen; public: virtual sal_Size GetLen( void ) const; - virtual const BYTE* GetData( void ) const; + virtual const BYTE* GetData( void ) const; }; @@ -270,11 +270,11 @@ public: class ExcDummy_041 : public ExcDummyRec { private: - static const BYTE pMyData[]; + static const BYTE pMyData[]; static const sal_Size nMyLen; public: virtual sal_Size GetLen( void ) const; - virtual const BYTE* GetData( void ) const; + virtual const BYTE* GetData( void ) const; }; @@ -284,7 +284,7 @@ class Exc1904 : public ExcBoolRecord { public: Exc1904( ScDocument& rDoc ); - virtual UINT16 GetNum( void ) const; + virtual UINT16 GetNum( void ) const; virtual void SaveXml( XclExpXmlStream& rStrm ); private: @@ -299,7 +299,7 @@ class ExcBundlesheetBase : public ExcRecord protected: sal_Size nStrPos; sal_Size nOwnPos; // Position NACH # und Len - UINT16 nGrbit; + UINT16 nGrbit; SCTAB nTab; ExcBundlesheetBase(); @@ -308,9 +308,9 @@ public: ExcBundlesheetBase( RootData& rRootData, SCTAB nTab ); inline void SetStreamPos( sal_Size nNewStrPos ) { nStrPos = nNewStrPos; } - void UpdateStreamPos( XclExpStream& rStrm ); + void UpdateStreamPos( XclExpStream& rStrm ); - virtual UINT16 GetNum() const; + virtual UINT16 GetNum() const; }; @@ -318,9 +318,9 @@ public: class ExcBundlesheet : public ExcBundlesheetBase { private: - ByteString aName; + ByteString aName; - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ); public: ExcBundlesheet( RootData& rRootData, SCTAB nTab ); @@ -333,11 +333,11 @@ public: class ExcDummy_02a : public ExcDummyRec { private: - static const BYTE pMyData[]; + static const BYTE pMyData[]; static const sal_Size nMyLen; public: virtual sal_Size GetLen( void ) const; - virtual const BYTE* GetData( void ) const; + virtual const BYTE* GetData( void ) const; }; @@ -399,9 +399,9 @@ private: class ExcFilterCondition { private: - UINT8 nType; - UINT8 nOper; - double fVal; + UINT8 nType; + UINT8 nOper; + double fVal; XclExpString* pText; protected: @@ -409,15 +409,15 @@ public: ExcFilterCondition(); ~ExcFilterCondition(); - inline BOOL IsEmpty() const { return (nType == EXC_AFTYPE_NOTUSED); } - inline BOOL HasEqual() const { return (nOper == EXC_AFOPER_EQUAL); } - ULONG GetTextBytes() const; + inline BOOL IsEmpty() const { return (nType == EXC_AFTYPE_NOTUSED); } + inline BOOL HasEqual() const { return (nOper == EXC_AFOPER_EQUAL); } + ULONG GetTextBytes() const; - void SetCondition( UINT8 nTp, UINT8 nOp, double fV, String* pT ); + void SetCondition( UINT8 nTp, UINT8 nOp, double fV, String* pT ); - void Save( XclExpStream& rStrm ); - void SaveXml( XclExpXmlStream& rStrm ); - void SaveText( XclExpStream& rStrm ); + void Save( XclExpStream& rStrm ); + void SaveXml( XclExpXmlStream& rStrm ); + void SaveText( XclExpStream& rStrm ); }; // ---------------------------------------------------------------------------- @@ -425,11 +425,11 @@ public: class XclExpAutofilter : public XclExpRecord, protected XclExpRoot { private: - UINT16 nCol; - UINT16 nFlags; - ExcFilterCondition aCond[ 2 ]; + UINT16 nCol; + UINT16 nFlags; + ExcFilterCondition aCond[ 2 ]; - BOOL AddCondition( ScQueryConnect eConn, UINT8 nType, + BOOL AddCondition( ScQueryConnect eConn, UINT8 nType, UINT8 nOp, double fVal, String* pText, BOOL bSimple = FALSE ); @@ -439,8 +439,8 @@ protected: public: XclExpAutofilter( const XclExpRoot& rRoot, UINT16 nC ); - inline UINT16 GetCol() const { return nCol; } - inline BOOL HasCondition() const { return !aCond[ 0 ].IsEmpty(); } + inline UINT16 GetCol() const { return nCol; } + inline BOOL HasCondition() const { return !aCond[ 0 ].IsEmpty(); } inline BOOL HasTop10() const { return ::get_flag( nFlags, EXC_AFFLAG_TOP10 ); } BOOL AddEntry( const ScQueryEntry& rEntry ); diff --git a/sc/source/filter/inc/excscen.hxx b/sc/source/filter/inc/excscen.hxx index 2d0d0c8246d3..849a9dce587f 100644 --- a/sc/source/filter/inc/excscen.hxx +++ b/sc/source/filter/inc/excscen.hxx @@ -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 @@ -44,14 +44,14 @@ class ScDocument; class ExcScenarioCell { private: - String aValue; + String aValue; public: - const UINT16 nCol; - const UINT16 nRow; + const UINT16 nCol; + const UINT16 nRow; ExcScenarioCell( const UINT16 nC, const UINT16 nR ); - void SetValue( const String& rVal ); - inline const String& GetValue( void ) const; + void SetValue( const String& rVal ); + inline const String& GetValue( void ) const; }; @@ -62,17 +62,17 @@ class ExcScenario : protected List private: friend class ExcScenarioList; protected: - String* pName; - String* pComment; - String* pUserName; - UINT8 nProtected; + String* pName; + String* pComment; + String* pUserName; + UINT8 nProtected; - const UINT16 nTab; + const UINT16 nTab; void Apply( const XclImpRoot& rRoot, const BOOL bLast = FALSE ); public: ExcScenario( XclImpStream& rIn, const RootData& rRoot ); - virtual ~ExcScenario(); + virtual ~ExcScenario(); }; @@ -81,22 +81,22 @@ public: class ExcScenarioList : protected List { private: - UINT16 nLastScenario; - inline ExcScenario* _First( void ) { return ( ExcScenario* ) List::First(); } - inline ExcScenario* _Next( void ) { return ( ExcScenario* ) List::Next(); } - inline ExcScenario* _Last( void ) { return ( ExcScenario* ) List::Last(); } - inline ExcScenario* _Prev( void ) { return ( ExcScenario* ) List::Prev(); } + UINT16 nLastScenario; + inline ExcScenario* _First( void ) { return ( ExcScenario* ) List::First(); } + inline ExcScenario* _Next( void ) { return ( ExcScenario* ) List::Next(); } + inline ExcScenario* _Last( void ) { return ( ExcScenario* ) List::Last(); } + inline ExcScenario* _Prev( void ) { return ( ExcScenario* ) List::Prev(); } protected: public: ExcScenarioList( void ); - virtual ~ExcScenarioList(); + virtual ~ExcScenarioList(); - inline void Append( ExcScenario* pNew ); + inline void Append( ExcScenario* pNew ); - inline void SetLast( const UINT16 nIndex4Last ); + inline void SetLast( const UINT16 nIndex4Last ); - inline const ExcScenario* First( void ); - inline const ExcScenario* Next( void ); + inline const ExcScenario* First( void ); + inline const ExcScenario* Next( void ); using List::Count; diff --git a/sc/source/filter/inc/exp_op.hxx b/sc/source/filter/inc/exp_op.hxx index ff1f1f11bcb5..e1fb6282a292 100644 --- a/sc/source/filter/inc/exp_op.hxx +++ b/sc/source/filter/inc/exp_op.hxx @@ -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 @@ -44,9 +44,9 @@ class SotStorage; class ExportTyp { protected: - SvStream& aOut; // Ausgabe-Stream - ScDocument* pD; // Dokument - CharSet eZielChar; // Ziel-Zeichensatz + SvStream& aOut; // Ausgabe-Stream + ScDocument* pD; // Dokument + CharSet eZielChar; // Ziel-Zeichensatz public: ExportTyp( SvStream& aStream, ScDocument* pDoc, CharSet eDest ): aOut( aStream ) @@ -55,7 +55,7 @@ public: pD = pDoc; } - virtual FltError Write() = 0; + virtual FltError Write() = 0; }; @@ -64,40 +64,40 @@ public: class ExportWK1 : public ExportTyp { private: - BYTE GenFormByte( const ScPatternAttr& ); - void Bof(); - void Eof(); - void Calcmode(); - void Calcorder(); - void Split(); - void Sync(); - void Dimensions(); - void Window1(); - void Colw(); - void Blank( const UINT16 nC, const UINT16 nR, const ScPatternAttr& ); - void Number( const UINT16 nC, const UINT16 nR, const double f, const ScPatternAttr& ); - void Label( const UINT16 nC, const UINT16 nR, const String&, const ScPatternAttr& ); - void Formula( const UINT16 nC, const UINT16 nR, const ScFormulaCell*, const ScPatternAttr& ); - void Protect(); - void Footer(); - void Header(); - void Margins(); - void Labelfmt(); - void Calccount(); - void Cursorw12(); - void WKString( const UINT16 nC, const UINT16 nR, const ScFormulaCell*, const ScPatternAttr& ); - void Snrange(); - void Hidcol(); - void Cpi(); + BYTE GenFormByte( const ScPatternAttr& ); + void Bof(); + void Eof(); + void Calcmode(); + void Calcorder(); + void Split(); + void Sync(); + void Dimensions(); + void Window1(); + void Colw(); + void Blank( const UINT16 nC, const UINT16 nR, const ScPatternAttr& ); + void Number( const UINT16 nC, const UINT16 nR, const double f, const ScPatternAttr& ); + void Label( const UINT16 nC, const UINT16 nR, const String&, const ScPatternAttr& ); + void Formula( const UINT16 nC, const UINT16 nR, const ScFormulaCell*, const ScPatternAttr& ); + void Protect(); + void Footer(); + void Header(); + void Margins(); + void Labelfmt(); + void Calccount(); + void Cursorw12(); + void WKString( const UINT16 nC, const UINT16 nR, const ScFormulaCell*, const ScPatternAttr& ); + void Snrange(); + void Hidcol(); + void Cpi(); public: static const USHORT WK1MAXCOL; static const USHORT WK1MAXROW; - inline ExportWK1( SvStream& r, ScDocument* p, CharSet e ) : + inline ExportWK1( SvStream& r, ScDocument* p, CharSet e ) : ExportTyp( r, p, e ) {}; - FltError Write(); + FltError Write(); }; #endif @@ -106,15 +106,15 @@ public: class ExportBiff5 : public ExportTyp, protected XclExpRoot { private: - ExcDocument* pExcDoc; + ExcDocument* pExcDoc; protected: RootData* pExcRoot; public: ExportBiff5( XclExpRootData& rExpData, SvStream& rStrm ); - virtual ~ExportBiff5(); - FltError Write(); + virtual ~ExportBiff5(); + FltError Write(); }; @@ -124,7 +124,7 @@ class ExportBiff8 : public ExportBiff5 { public: ExportBiff8( XclExpRootData& rExpData, SvStream& rStrm ); - virtual ~ExportBiff8(); + virtual ~ExportBiff8(); }; diff --git a/sc/source/filter/inc/expbase.hxx b/sc/source/filter/inc/expbase.hxx index 1500e7d634f5..e734a818a0ed 100644 --- a/sc/source/filter/inc/expbase.hxx +++ b/sc/source/filter/inc/expbase.hxx @@ -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 @@ -48,37 +48,37 @@ public: protected: - SvStream& rStrm; - ScRange aRange; - ScDocument* pDoc; - SvNumberFormatter* pFormatter; - ScFieldEditEngine* pEditEngine; + SvStream& rStrm; + ScRange aRange; + ScDocument* pDoc; + SvNumberFormatter* pFormatter; + ScFieldEditEngine* pEditEngine; public: ScExportBase( SvStream&, ScDocument*, const ScRange& ); - virtual ~ScExportBase(); + virtual ~ScExportBase(); // Hidden Cols/Rows an den Raendern trimmen, // return: TRUE wenn Bereich vorhanden // Start/End/Col/Row muessen gueltige Ausgangswerte sein - BOOL TrimDataArea( SCTAB nTab, SCCOL& nStartCol, + BOOL TrimDataArea( SCTAB nTab, SCCOL& nStartCol, SCROW& nStartRow, SCCOL& nEndCol, SCROW& nEndRow ) const; // Ausgabebereich einer Tabelle ermitteln, // Hidden Cols/Rows an den Raendern beruecksichtigt, // return: TRUE wenn Bereich vorhanden - BOOL GetDataArea( SCTAB nTab, SCCOL& nStartCol, + BOOL GetDataArea( SCTAB nTab, SCCOL& nStartCol, SCROW& nStartRow, SCCOL& nEndCol, SCROW& nEndRow ) const; // Tabelle nicht vorhanden oder leer - BOOL IsEmptyTable( SCTAB nTab ) const; + BOOL IsEmptyTable( SCTAB nTab ) const; - ScFieldEditEngine& GetEditEngine() const; + ScFieldEditEngine& GetEditEngine() const; }; -#endif // SC_EXPBASE_HXX +#endif // SC_EXPBASE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/fapihelper.hxx b/sc/source/filter/inc/fapihelper.hxx index babf2cc575d7..e1ddd8508721 100644 --- a/sc/source/filter/inc/fapihelper.hxx +++ b/sc/source/filter/inc/fapihelper.hxx @@ -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 diff --git a/sc/source/filter/inc/filt_pch.hxx b/sc/source/filter/inc/filt_pch.hxx index 3b9ebde307e8..139168aa8900 100644 --- a/sc/source/filter/inc/filt_pch.hxx +++ b/sc/source/filter/inc/filt_pch.hxx @@ -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 @@ -26,7 +26,7 @@ * ************************************************************************/ -// ItemID-Defines etc. muessen immer ganz vorne stehen +// ItemID-Defines etc. muessen immer ganz vorne stehen #include "scitems.hxx" diff --git a/sc/source/filter/inc/fkttab.h b/sc/source/filter/inc/fkttab.h index 5604fff3ac7d..aa7647e69e4e 100644 --- a/sc/source/filter/inc/fkttab.h +++ b/sc/source/filter/inc/fkttab.h @@ -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 diff --git a/sc/source/filter/inc/flttypes.hxx b/sc/source/filter/inc/flttypes.hxx index c34fff6c2299..7ff32aa59a6b 100644 --- a/sc/source/filter/inc/flttypes.hxx +++ b/sc/source/filter/inc/flttypes.hxx @@ -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 diff --git a/sc/source/filter/inc/formel.hxx b/sc/source/filter/inc/formel.hxx index 7abed0dade97..309f61ff09a6 100644 --- a/sc/source/filter/inc/formel.hxx +++ b/sc/source/filter/inc/formel.hxx @@ -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 @@ -54,10 +54,10 @@ struct ScComplexRefData; enum ConvErr { ConvOK = 0, - ConvErrNi, // nicht implemntierter/unbekannter Opcode aufgetreten - ConvErrNoMem, // Fehler beim Speicheranfordern + ConvErrNi, // nicht implemntierter/unbekannter Opcode aufgetreten + ConvErrNoMem, // Fehler beim Speicheranfordern ConvErrExternal,// Add-Ins aus Excel werden nicht umgesetzt - ConvErrCount // Nicht alle Bytes der Formel 'erwischt' + ConvErrCount // Nicht alle Bytes der Formel 'erwischt' }; @@ -78,17 +78,17 @@ class _ScRangeList : protected List private: protected: public: - virtual ~_ScRangeList(); - inline void Append( const ScRange& rRange ); - inline void Append( ScRange* pRange ); - inline void Append( const ScSingleRefData& rSRD ); - inline void Append( const ScComplexRefData& rCRD ); + virtual ~_ScRangeList(); + inline void Append( const ScRange& rRange ); + inline void Append( ScRange* pRange ); + inline void Append( const ScSingleRefData& rSRD ); + inline void Append( const ScComplexRefData& rCRD ); using List::Count; - inline BOOL HasRanges( void ) const; + inline BOOL HasRanges( void ) const; - inline const ScRange* First( void ); - inline const ScRange* Next( void ); + inline const ScRange* First( void ); + inline const ScRange* Next( void ); }; @@ -130,7 +130,7 @@ inline void _ScRangeList::Append( const ScSingleRefData& r ) inline void _ScRangeList::Append( const ScComplexRefData& r ) { - List::Insert( new ScRange( r.Ref1.nCol, r.Ref1.nRow, r.Ref1.nTab, + List::Insert( new ScRange( r.Ref1.nCol, r.Ref1.nRow, r.Ref1.nTab, r.Ref2.nCol, r.Ref2.nRow, r.Ref2.nTab ), LIST_APPEND ); } @@ -144,23 +144,23 @@ class _ScRangeListTabs { private: protected: - BOOL bHasRanges; - _ScRangeList** ppTabLists; - _ScRangeList* pAct; - UINT16 nAct; + BOOL bHasRanges; + _ScRangeList** ppTabLists; + _ScRangeList* pAct; + UINT16 nAct; public: _ScRangeListTabs( void ); - virtual ~_ScRangeListTabs(); + virtual ~_ScRangeListTabs(); - void Append( ScSingleRefData aSRD, SCsTAB nTab, const BOOL bLimit = TRUE ); - void Append( ScComplexRefData aCRD, SCsTAB nTab, const BOOL bLimit = TRUE ); + void Append( ScSingleRefData aSRD, SCsTAB nTab, const BOOL bLimit = TRUE ); + void Append( ScComplexRefData aCRD, SCsTAB nTab, const BOOL bLimit = TRUE ); - inline BOOL HasRanges( void ) const; + inline BOOL HasRanges( void ) const; - const ScRange* First( const UINT16 nTab = 0 ); - const ScRange* Next( void ); -// const ScRange* NextContinue( void ); - inline const _ScRangeList* GetActList( void ) const; + const ScRange* First( const UINT16 nTab = 0 ); + const ScRange* Next( void ); +// const ScRange* NextContinue( void ); + inline const _ScRangeList* GetActList( void ) const; }; @@ -181,23 +181,23 @@ inline const _ScRangeList* _ScRangeListTabs::GetActList( void ) const class ConverterBase { protected: - TokenPool aPool; // User Token + Predefined Token - TokenStack aStack; + TokenPool aPool; // User Token + Predefined Token + TokenStack aStack; ScAddress aEingPos; ConvErr eStatus; - sal_Char* pBuffer; // Universal-Puffer - UINT16 nBufferSize; // ...und seine Groesse + sal_Char* pBuffer; // Universal-Puffer + UINT16 nBufferSize; // ...und seine Groesse ConverterBase( UINT16 nNewBuffer ); - virtual ~ConverterBase(); + virtual ~ConverterBase(); - void Reset(); + void Reset(); public: - inline SCCOL GetEingabeCol( void ) const { return aEingPos.Col(); } - inline SCROW GetEingabeRow( void ) const { return aEingPos.Row(); } - inline SCTAB GetEingabeTab( void ) const { return aEingPos.Tab(); } - inline ScAddress GetEingPos( void ) const { return aEingPos; } + inline SCCOL GetEingabeCol( void ) const { return aEingPos.Col(); } + inline SCROW GetEingabeRow( void ) const { return aEingPos.Row(); } + inline SCTAB GetEingabeTab( void ) const { return aEingPos.Tab(); } + inline ScAddress GetEingPos( void ) const { return aEingPos; } }; @@ -206,10 +206,10 @@ class ExcelConverterBase : public ConverterBase { protected: ExcelConverterBase( UINT16 nNewBuffer ); - virtual ~ExcelConverterBase(); + virtual ~ExcelConverterBase(); public: - void Reset(); + void Reset(); void Reset( const ScAddress& rEingPos ); virtual ConvErr Convert( const ScTokenArray*& rpErg, XclImpStream& rStrm, sal_Size nFormulaLen, @@ -223,24 +223,24 @@ public: class LotusConverterBase : public ConverterBase { protected: - SvStream& aIn; - INT32 nBytesLeft; - - inline void Ignore( const long nSeekRel ); - inline void Read( sal_Char& nByte ); - inline void Read( BYTE& nByte ); - inline void Read( UINT16& nUINT16 ); - inline void Read( INT16& nINT16 ); - inline void Read( double& fDouble ); + SvStream& aIn; + INT32 nBytesLeft; + + inline void Ignore( const long nSeekRel ); + inline void Read( sal_Char& nByte ); + inline void Read( BYTE& nByte ); + inline void Read( UINT16& nUINT16 ); + inline void Read( INT16& nINT16 ); + inline void Read( double& fDouble ); inline void Read( UINT32& nUINT32 ); LotusConverterBase( SvStream& rStr, UINT16 nNewBuffer ); - virtual ~LotusConverterBase(); + virtual ~LotusConverterBase(); public: void Reset( const ScAddress& rEingPos ); - virtual ConvErr Convert( const ScTokenArray*& rpErg, INT32& nRest, + virtual ConvErr Convert( const ScTokenArray*& rpErg, INT32& nRest, const FORMULA_TYPE eFT = FT_CellFormula ) = 0; protected: diff --git a/sc/source/filter/inc/fprogressbar.hxx b/sc/source/filter/inc/fprogressbar.hxx index b65b12d981f0..751c9c63fa98 100644 --- a/sc/source/filter/inc/fprogressbar.hxx +++ b/sc/source/filter/inc/fprogressbar.hxx @@ -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 diff --git a/sc/source/filter/inc/ftools.hxx b/sc/source/filter/inc/ftools.hxx index d02cba498fcf..394c213d2318 100644 --- a/sc/source/filter/inc/ftools.hxx +++ b/sc/source/filter/inc/ftools.hxx @@ -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 @@ -510,16 +510,16 @@ class ScFormatFilterPluginImpl : public ScFormatFilterPlugin { virtual FltError ScImportLotus123( SfxMedium&, ScDocument*, CharSet eSrc = RTL_TEXTENCODING_DONTKNOW ); virtual FltError ScImportQuattroPro( SfxMedium &rMedium, ScDocument *pDoc ); virtual FltError ScImportExcel( SfxMedium&, ScDocument*, const EXCIMPFORMAT ); - // eFormat == EIF_AUTO -> passender Filter wird automatisch verwendet - // eFormat == EIF_BIFF5 -> nur Biff5-Stream fuehrt zum Erfolg (auch wenn in einem Excel97-Doc) - // eFormat == EIF_BIFF8 -> nur Biff8-Stream fuehrt zum Erfolg (nur in Excel97-Docs) + // eFormat == EIF_AUTO -> passender Filter wird automatisch verwendet + // eFormat == EIF_BIFF5 -> nur Biff5-Stream fuehrt zum Erfolg (auch wenn in einem Excel97-Doc) + // eFormat == EIF_BIFF8 -> nur Biff8-Stream fuehrt zum Erfolg (nur in Excel97-Docs) // eFormat == EIF_BIFF_LE4 -> nur Nicht-Storage-Dateien _koennen_ zum Erfolg fuehren virtual FltError ScImportStarCalc10( SvStream&, ScDocument* ); virtual FltError ScImportDif( SvStream&, ScDocument*, const ScAddress& rInsPos, const CharSet eSrc = RTL_TEXTENCODING_DONTKNOW, UINT32 nDifOption = SC_DIFOPT_EXCEL ); virtual FltError ScImportRTF( SvStream&, const String& rBaseURL, ScDocument*, ScRange& rRange ); - virtual FltError ScImportHTML( SvStream&, const String& rBaseURL, ScDocument*, ScRange& rRange, - double nOutputFactor = 1.0, BOOL bCalcWidthHeight = TRUE, + virtual FltError ScImportHTML( SvStream&, const String& rBaseURL, ScDocument*, ScRange& rRange, + double nOutputFactor = 1.0, BOOL bCalcWidthHeight = TRUE, SvNumberFormatter* pFormatter = NULL, bool bConvertDate = true ); virtual ScEEAbsImport *CreateRTFImport( ScDocument* pDoc, const ScRange& rRange ); diff --git a/sc/source/filter/inc/funktion.h b/sc/source/filter/inc/funktion.h index 2377fbe16bf1..1a9e127d0a09 100644 --- a/sc/source/filter/inc/funktion.h +++ b/sc/source/filter/inc/funktion.h @@ -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 @@ -30,21 +30,21 @@ #define SC_FUNKTION_H // Bearbeitungsfunktionen -void P0( void ); // 0 Parameter -void P1( void ); // 1 Parameter -void P2( void ); // 2 Parameter -void P3( void ); // 3 Parameter -void P4( void ); // 4 Parameter -void P5( void ); // 5 Parameter -void Pn( void ); // n Parameter -void NI( void ); // nicht implementiert -void ConstFloat( void ); // 0 -void Variable( void ); // 1 -void LotusRange( void ); // 2 -void FormulaReturn( void ); // 3 -void Klammer( void ); // 4 -void ConstInt( void ); // 5 -void ConstString( void ); // 6 +void P0( void ); // 0 Parameter +void P1( void ); // 1 Parameter +void P2( void ); // 2 Parameter +void P3( void ); // 3 Parameter +void P4( void ); // 4 Parameter +void P5( void ); // 5 Parameter +void Pn( void ); // n Parameter +void NI( void ); // nicht implementiert +void ConstFloat( void ); // 0 +void Variable( void ); // 1 +void LotusRange( void ); // 2 +void FormulaReturn( void ); // 3 +void Klammer( void ); // 4 +void ConstInt( void ); // 5 +void ConstString( void ); // 6 // ACHTUNG: unbekannte Funktionen -> P0() #endif diff --git a/sc/source/filter/inc/htmlexp.hxx b/sc/source/filter/inc/htmlexp.hxx index 4a7e8f3f32b9..3cc00e39e4de 100644 --- a/sc/source/filter/inc/htmlexp.hxx +++ b/sc/source/filter/inc/htmlexp.hxx @@ -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 @@ -49,10 +49,10 @@ class ScEditCell; class SvxBorderLine; struct ScHTMLStyle -{ // Defaults aus StyleSheet - Color aBackgroundColor; - String aFontFamilyName; - UINT32 nFontHeight; // Item-Value +{ // Defaults aus StyleSheet + Color aBackgroundColor; + String aFontFamilyName; + UINT32 nFontHeight; // Item-Value USHORT nFontSizeNumber; // HTML value 1-7 BYTE nDefaultScriptType; // Font values are valid for the default script type BOOL bInitialized; @@ -62,9 +62,9 @@ struct ScHTMLStyle const ScHTMLStyle& operator=( const ScHTMLStyle& r ) { - aBackgroundColor = r.aBackgroundColor; - aFontFamilyName = r.aFontFamilyName; - nFontHeight = r.nFontHeight; + aBackgroundColor = r.aBackgroundColor; + aFontFamilyName = r.aFontFamilyName; + nFontHeight = r.nFontHeight; nFontSizeNumber = r.nFontSizeNumber; nDefaultScriptType = r.nDefaultScriptType; bInitialized = r.bInitialized; @@ -74,15 +74,15 @@ struct ScHTMLStyle struct ScHTMLGraphEntry { - ScRange aRange; // ueberlagerter Zellbereich - Size aSize; // Groesse in Pixeln - Size aSpace; // Spacing in Pixeln - SdrObject* pObject; - BOOL bInCell; // ob in Zelle ausgegeben wird - BOOL bWritten; + ScRange aRange; // ueberlagerter Zellbereich + Size aSize; // Groesse in Pixeln + Size aSpace; // Spacing in Pixeln + SdrObject* pObject; + BOOL bInCell; // ob in Zelle ausgegeben wird + BOOL bWritten; ScHTMLGraphEntry( SdrObject* pObj, const ScRange& rRange, - const Size& rSize, BOOL bIn, const Size& rSpace ) : + const Size& rSize, BOOL bIn, const Size& rSpace ) : aRange( rRange ), aSize( rSize ), aSpace( rSpace ), pObject( pObj ), bInCell( bIn ), bWritten( FALSE ) {} }; @@ -95,77 +95,77 @@ const short nIndentMax = 23; class ScHTMLExport : public ScExportBase { // default HtmlFontSz[1-7] - static const USHORT nDefaultFontSize[SC_HTML_FONTSIZES]; + static const USHORT nDefaultFontSize[SC_HTML_FONTSIZES]; // HtmlFontSz[1-7] in s*3.ini [user] - static USHORT nFontSize[SC_HTML_FONTSIZES]; - static const char* pFontSizeCss[SC_HTML_FONTSIZES]; - static const USHORT nCellSpacing; + static USHORT nFontSize[SC_HTML_FONTSIZES]; + static const char* pFontSizeCss[SC_HTML_FONTSIZES]; + static const USHORT nCellSpacing; static const sal_Char __FAR_DATA sIndentSource[]; - ScHTMLGraphList aGraphList; - ScHTMLStyle aHTMLStyle; + ScHTMLGraphList aGraphList; + ScHTMLStyle aHTMLStyle; String aBaseURL; - String aStreamPath; - String aCId; // Content-Id fuer Mail-Export - OutputDevice* pAppWin; // fuer Pixelei - SvStringsSortDtor* pSrcArr; // fuer CopyLocalFileToINet - SvStringsSortDtor* pDestArr; + String aStreamPath; + String aCId; // Content-Id fuer Mail-Export + OutputDevice* pAppWin; // fuer Pixelei + SvStringsSortDtor* pSrcArr; // fuer CopyLocalFileToINet + SvStringsSortDtor* pDestArr; String aNonConvertibleChars; // collect nonconvertible characters - rtl_TextEncoding eDestEnc; - SCTAB nUsedTables; - short nIndent; - sal_Char sIndent[nIndentMax+1]; - BOOL bAll; // ganzes Dokument - BOOL bTabHasGraphics; - BOOL bTabAlignedLeft; - BOOL bCalcAsShown; - BOOL bCopyLocalFileToINet; + rtl_TextEncoding eDestEnc; + SCTAB nUsedTables; + short nIndent; + sal_Char sIndent[nIndentMax+1]; + BOOL bAll; // ganzes Dokument + BOOL bTabHasGraphics; + BOOL bTabAlignedLeft; + BOOL bCalcAsShown; + BOOL bCopyLocalFileToINet; BOOL bTableDataWidth; BOOL bTableDataHeight; - const SfxItemSet& PageDefaults( SCTAB nTab ); + const SfxItemSet& PageDefaults( SCTAB nTab ); void WriteBody(); - void WriteHeader(); - void WriteOverview(); - void WriteTables(); - void WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab ); - void WriteGraphEntry( ScHTMLGraphEntry* ); + void WriteHeader(); + void WriteOverview(); + void WriteTables(); + void WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab ); + void WriteGraphEntry( ScHTMLGraphEntry* ); void WriteImage( String& rLinkName, const Graphic&, const ByteString& rImgOptions, ULONG nXOutFlags = 0 ); // nXOutFlags fuer XOutBitmap::WriteGraphic // write to stream if and only if URL fields in edit cell - BOOL WriteFieldText( const ScEditCell* pCell ); + BOOL WriteFieldText( const ScEditCell* pCell ); // kopiere ggfs. eine lokale Datei ins Internet - BOOL CopyLocalFileToINet( String& rFileNm, + BOOL CopyLocalFileToINet( String& rFileNm, const String& rTargetNm, BOOL bFileToFile = FALSE ); - BOOL HasCId() { return aCId.Len() > 0; } - void MakeCIdURL( String& rURL ); + BOOL HasCId() { return aCId.Len() > 0; } + void MakeCIdURL( String& rURL ); - void PrepareGraphics( ScDrawLayer*, SCTAB nTab, + void PrepareGraphics( ScDrawLayer*, SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ); - void FillGraphList( const SdrPage*, SCTAB nTab, + void FillGraphList( const SdrPage*, SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ); - void BorderToStyle( ByteString& rOut, const char* pBorderName, + void BorderToStyle( ByteString& rOut, const char* pBorderName, const SvxBorderLine* pLine, bool& bInsertSemicolon ); - USHORT GetFontSizeNumber( USHORT nHeight ); - const char* GetFontSizeCss( USHORT nHeight ); - USHORT ToPixel( USHORT nTwips ); - Size MMToPixel( const Size& r100thMMSize ); - void IncIndent( short nVal ); - const sal_Char* GetIndentStr() { return sIndent; } + USHORT GetFontSizeNumber( USHORT nHeight ); + const char* GetFontSizeCss( USHORT nHeight ); + USHORT ToPixel( USHORT nTwips ); + Size MMToPixel( const Size& r100thMMSize ); + void IncIndent( short nVal ); + const sal_Char* GetIndentStr() { return sIndent; } public: ScHTMLExport( SvStream&, const String&, ScDocument*, const ScRange&, BOOL bAll, const String& aStreamPath ); - virtual ~ScHTMLExport(); + virtual ~ScHTMLExport(); ULONG Write(); const String& GetNonConvertibleChars() const { return aNonConvertibleChars; } diff --git a/sc/source/filter/inc/htmlimp.hxx b/sc/source/filter/inc/htmlimp.hxx index 31c2dd0dbd2b..551ea2530797 100644 --- a/sc/source/filter/inc/htmlimp.hxx +++ b/sc/source/filter/inc/htmlimp.hxx @@ -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 @@ -36,17 +36,17 @@ class ScHTMLParser; class ScHTMLImport : public ScEEImport { private: - static void InsertRangeName( ScDocument* pDoc, const String& rName, const ScRange& rRange ); + static void InsertRangeName( ScDocument* pDoc, const String& rName, const ScRange& rRange ); public: ScHTMLImport( ScDocument* pDoc, const String& rBaseURL, const ScRange& rRange, BOOL bCalcWidthHeight = TRUE ); virtual ~ScHTMLImport(); const ScHTMLParser* GetParser() const { return (ScHTMLParser*)mpParser; } - virtual void WriteToDocument( BOOL bSizeColsRows = FALSE, double nOutputFactor = 1.0, + virtual void WriteToDocument( BOOL bSizeColsRows = FALSE, double nOutputFactor = 1.0, SvNumberFormatter* pFormatter = NULL, bool bConvertDate = true ); - static String GetHTMLRangeNameList( ScDocument* pDoc, const String& rOrigName ); + static String GetHTMLRangeNameList( ScDocument* pDoc, const String& rOrigName ); }; diff --git a/sc/source/filter/inc/htmlpars.hxx b/sc/source/filter/inc/htmlpars.hxx index ffad22b23828..0c4e3233ccae 100644 --- a/sc/source/filter/inc/htmlpars.hxx +++ b/sc/source/filter/inc/htmlpars.hxx @@ -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 @@ -62,7 +62,7 @@ public: explicit ScHTMLParser( EditEngine* pEditEngine, ScDocument* pDoc ); virtual ~ScHTMLParser(); - virtual ULONG Read( SvStream& rStrm, const String& rBaseURL ) = 0; + virtual ULONG Read( SvStream& rStrm, const String& rBaseURL ) = 0; /** Returns the "global table" which contains the entire HTML document. */ virtual const ScHTMLTable* GetGlobalTable() const = 0; @@ -75,19 +75,19 @@ SV_DECL_VARARR_SORT( ScHTMLColOffset, ULONG, 16, 4) struct ScHTMLTableStackEntry { - ScRangeListRef xLockedList; - ScEEParseEntry* pCellEntry; - ScHTMLColOffset* pLocalColOffset; - ULONG nFirstTableCell; - SCCOL nColCnt; - SCROW nRowCnt; - SCCOL nColCntStart; - SCCOL nMaxCol; - USHORT nTable; - USHORT nTableWidth; - USHORT nColOffset; - USHORT nColOffsetStart; - BOOL bFirstRow; + ScRangeListRef xLockedList; + ScEEParseEntry* pCellEntry; + ScHTMLColOffset* pLocalColOffset; + ULONG nFirstTableCell; + SCCOL nColCnt; + SCROW nRowCnt; + SCCOL nColCntStart; + SCCOL nMaxCol; + USHORT nTable; + USHORT nTableWidth; + USHORT nColOffset; + USHORT nColOffsetStart; + BOOL bFirstRow; ScHTMLTableStackEntry( ScEEParseEntry* pE, const ScRangeListRef& rL, ScHTMLColOffset* pTO, ULONG nFTC, @@ -110,9 +110,9 @@ DECLARE_STACK( ScHTMLTableStack, ScHTMLTableStackEntry* ) struct ScHTMLAdjustStackEntry { - SCCOL nLastCol; - SCROW nNextRow; - SCROW nCurRow; + SCCOL nLastCol; + SCROW nNextRow; + SCROW nCurRow; ScHTMLAdjustStackEntry( SCCOL nLCol, SCROW nNRow, SCROW nCRow ) : nLastCol( nLCol ), nNextRow( nNRow ), @@ -133,65 +133,65 @@ class ScHTMLLayoutParser : public ScHTMLParser private: Size aPageSize; String aBaseURL; - ScHTMLTableStack aTableStack; - String aString; - ScRangeListRef xLockedList; // je Table - Table* pTables; - ScHTMLColOffset* pColOffset; - ScHTMLColOffset* pLocalColOffset; // je Table - ULONG nFirstTableCell; // je Table - short nTableLevel; - USHORT nTable; - USHORT nMaxTable; - SCCOL nColCntStart; // erste Col je Table - SCCOL nMaxCol; // je Table - USHORT nTableWidth; // je Table - USHORT nColOffset; // aktuell, Pixel - USHORT nColOffsetStart; // Startwert je Table, in Pixel - USHORT nMetaCnt; // fuer ParseMetaOptions + ScHTMLTableStack aTableStack; + String aString; + ScRangeListRef xLockedList; // je Table + Table* pTables; + ScHTMLColOffset* pColOffset; + ScHTMLColOffset* pLocalColOffset; // je Table + ULONG nFirstTableCell; // je Table + short nTableLevel; + USHORT nTable; + USHORT nMaxTable; + SCCOL nColCntStart; // erste Col je Table + SCCOL nMaxCol; // je Table + USHORT nTableWidth; // je Table + USHORT nColOffset; // aktuell, Pixel + USHORT nColOffsetStart; // Startwert je Table, in Pixel + USHORT nMetaCnt; // fuer ParseMetaOptions USHORT nOffsetTolerance; // for use with SeekOffset and related - BOOL bCalcWidthHeight; // TRUE: calculate real column width + BOOL bCalcWidthHeight; // TRUE: calculate real column width // FALSE: 1 html-col = 1 sc-col - BOOL bTabInTabCell; - BOOL bFirstRow; // je Table, ob in erster Zeile - BOOL bInCell; - BOOL bInTitle; + BOOL bTabInTabCell; + BOOL bFirstRow; // je Table, ob in erster Zeile + BOOL bInCell; + BOOL bInTitle; DECL_LINK( HTMLImportHdl, ImportInfo* ); - void NewActEntry( ScEEParseEntry* ); - void EntryEnd( ScEEParseEntry*, const ESelection& ); - void ProcToken( ImportInfo* ); - void CloseEntry( ImportInfo* ); - void NextRow( ImportInfo* ); - void SkipLocked( ScEEParseEntry*, BOOL bJoin = TRUE ); - static BOOL SeekOffset( ScHTMLColOffset*, USHORT nOffset, + void NewActEntry( ScEEParseEntry* ); + void EntryEnd( ScEEParseEntry*, const ESelection& ); + void ProcToken( ImportInfo* ); + void CloseEntry( ImportInfo* ); + void NextRow( ImportInfo* ); + void SkipLocked( ScEEParseEntry*, BOOL bJoin = TRUE ); + static BOOL SeekOffset( ScHTMLColOffset*, USHORT nOffset, SCCOL* pCol, USHORT nOffsetTol ); - static void MakeCol( ScHTMLColOffset*, USHORT& nOffset, + static void MakeCol( ScHTMLColOffset*, USHORT& nOffset, USHORT& nWidth, USHORT nOffsetTol, USHORT nWidthTol ); - static void MakeColNoRef( ScHTMLColOffset*, USHORT nOffset, + static void MakeColNoRef( ScHTMLColOffset*, USHORT nOffset, USHORT nWidth, USHORT nOffsetTol, USHORT nWidthTol ); - static void ModifyOffset( ScHTMLColOffset*, USHORT& nOldOffset, + static void ModifyOffset( ScHTMLColOffset*, USHORT& nOldOffset, USHORT& nNewOffset, USHORT nOffsetTol ); - void Colonize( ScEEParseEntry* ); - USHORT GetWidth( ScEEParseEntry* ); - void SetWidths(); - void Adjust(); + void Colonize( ScEEParseEntry* ); + USHORT GetWidth( ScEEParseEntry* ); + void SetWidths(); + void Adjust(); - USHORT GetWidthPixel( const HTMLOption* ); - BOOL IsAtBeginningOfText( ImportInfo* ); + USHORT GetWidthPixel( const HTMLOption* ); + BOOL IsAtBeginningOfText( ImportInfo* ); - void TableOn( ImportInfo* ); + void TableOn( ImportInfo* ); void ColOn( ImportInfo* ); void TableRowOn( ImportInfo* ); void TableRowOff( ImportInfo* ); - void TableDataOn( ImportInfo* ); + void TableDataOn( ImportInfo* ); void TableDataOff( ImportInfo* ); - void TableOff( ImportInfo* ); + void TableOff( ImportInfo* ); void Image( ImportInfo* ); - void AnchorOn( ImportInfo* ); - void FontOn( ImportInfo* ); + void AnchorOn( ImportInfo* ); + void FontOn( ImportInfo* ); public: ScHTMLLayoutParser( EditEngine*, const String& rBaseURL, const Size& aPageSize, ScDocument* ); diff --git a/sc/source/filter/inc/imp_op.hxx b/sc/source/filter/inc/imp_op.hxx index f5d85328afdf..b403ea56ce82 100644 --- a/sc/source/filter/inc/imp_op.hxx +++ b/sc/source/filter/inc/imp_op.hxx @@ -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 @@ -56,14 +56,14 @@ class ExcelToSc; class ImportTyp { protected: - CharSet eQuellChar; // Quell-Zeichensatz - ScDocument* pD; // Dokument + CharSet eQuellChar; // Quell-Zeichensatz + ScDocument* pD; // Dokument public: ImportTyp( ScDocument*, CharSet eSrc ); - virtual ~ImportTyp(); + virtual ~ImportTyp(); - virtual FltError Read( void ); + virtual FltError Read( void ); }; class XclImpOutlineDataBuffer : protected XclImpRoot @@ -90,7 +90,7 @@ private: class ImportExcel : public ImportTyp, protected XclImpRoot { protected: - static const double fExcToTwips; // Umrechnung 1/256 Zeichen -> Twips + static const double fExcToTwips; // Umrechnung 1/256 Zeichen -> Twips RootData* pExcRoot; @@ -101,7 +101,7 @@ protected: ScRange maScOleSize; /// Visible range if embedded. NameBuffer* pExtNameBuff; // ... externe Namen (Ind.-Basis=1) - ExcelToSc* pFormConv; // Formel-Konverter + ExcelToSc* pFormConv; // Formel-Konverter XclImpOutlineBuffer* pColOutlineBuff; XclImpOutlineBuffer* pRowOutlineBuff; @@ -111,13 +111,13 @@ protected: XclImpOutlineListBuffer* pOutlineListBuffer; sal_Int16 mnLastRefIdx; - UINT16 nIxfeIndex; // merkt sich Angabe im IXFE-Record - UINT16 nLastXF; // letzter XF in Formula-Record - SCTAB nBdshtTab; // Counter fuer Boundsheet - ScFormulaCell* pLastFormCell; // fuer String-Records + UINT16 nIxfeIndex; // merkt sich Angabe im IXFE-Record + UINT16 nLastXF; // letzter XF in Formula-Record + SCTAB nBdshtTab; // Counter fuer Boundsheet + ScFormulaCell* pLastFormCell; // fuer String-Records - BOOL bTabTruncated; // wenn Bereichsueberschreitung zum - // Abschneiden von Zellen fuehrt + BOOL bTabTruncated; // wenn Bereichsueberschreitung zum + // Abschneiden von Zellen fuehrt // Record-Funktionen void ReadFileSharing(); @@ -133,62 +133,62 @@ protected: void ReadRk(); void Window1(); - void Formula25( void ); // 0x06 -> excform.cxx - void Row25( void ); // 0x08 - void Bof2( void ); // 0x09 - void Eof( void ); // 0x0A - void DocProtect( void ); // 0x12 + void Formula25( void ); // 0x06 -> excform.cxx + void Row25( void ); // 0x08 + void Bof2( void ); // 0x09 + void Eof( void ); // 0x0A + void DocProtect( void ); // 0x12 void SheetProtect( void ); // 0x12 Sheet Protection void DocPasssword( void ); // 0x13 document password void SheetPassword( void ); // 0x13 sheet password - void Externsheet( void ); // 0x17 + void Externsheet( void ); // 0x17 void WinProtection( void ); // 0x19 - void Columndefault( void ); // 0x20 - void Array25( void ); // 0x21 - void Rec1904( void ); // 0x22 - void Externname25( void ); // 0x23 - void Colwidth( void ); // 0x24 - void Defrowheight2( void ); // 0x25 -// void Window1( void ); // 0x3D - void Codepage( void ); // 0x42 - void Ixfe( void ); // 0x44 - void DefColWidth( void ); // 0x55 - void Builtinfmtcnt( void ); // 0x56 - void Colinfo( void ); // 0x7D - void Wsbool( void ); // 0x81 - void Boundsheet( void ); // 0x85 - void Country( void ); // 0x8C - void Hideobj( void ); // 0x8D - void Bundleheader( void ); // 0x8F - void Standardwidth( void ); // 0x99 - void Shrfmla( void ); // 0xBC - void Mulrk( void ); // 0xBD - void Mulblank( void ); // 0xBE - void Rstring( void ); // 0xD6 + void Columndefault( void ); // 0x20 + void Array25( void ); // 0x21 + void Rec1904( void ); // 0x22 + void Externname25( void ); // 0x23 + void Colwidth( void ); // 0x24 + void Defrowheight2( void ); // 0x25 +// void Window1( void ); // 0x3D + void Codepage( void ); // 0x42 + void Ixfe( void ); // 0x44 + void DefColWidth( void ); // 0x55 + void Builtinfmtcnt( void ); // 0x56 + void Colinfo( void ); // 0x7D + void Wsbool( void ); // 0x81 + void Boundsheet( void ); // 0x85 + void Country( void ); // 0x8C + void Hideobj( void ); // 0x8D + void Bundleheader( void ); // 0x8F + void Standardwidth( void ); // 0x99 + void Shrfmla( void ); // 0xBC + void Mulrk( void ); // 0xBD + void Mulblank( void ); // 0xBE + void Rstring( void ); // 0xD6 void Cellmerging( void ); // 0xE5 void Olesize( void ); // 0xDE void ReadUsesElfs(); // 0x0160 - void Formula3( void ); // 0x0206 -> excform.cxx + void Formula3( void ); // 0x0206 -> excform.cxx // 0x0207 -> 0x07 - void Row34( void ); // 0x0208 - void Bof3( void ); // 0x0209 - void Array34( void ); // 0x0221 - void Externname34( void ); // 0x0223 - void Defrowheight345( void ); // 0x0225 - void TableOp( void ); // 0x0236 - //void Rk( void ); // 0x027E -> 0x7E - void Formula4( void ); // 0x0406 -> excform.cxx - void Bof4( void ); // 0x0409 - void Bof5( void ); // 0x0809 + void Row34( void ); // 0x0208 + void Bof3( void ); // 0x0209 + void Array34( void ); // 0x0221 + void Externname34( void ); // 0x0223 + void Defrowheight345( void ); // 0x0225 + void TableOp( void ); // 0x0236 + //void Rk( void ); // 0x027E -> 0x7E + void Formula4( void ); // 0x0406 -> excform.cxx + void Bof4( void ); // 0x0409 + void Bof5( void ); // 0x0809 // --------------------------------------------------------------- void Formula( const XclAddress& rXclPos, UINT16 nXF, UINT16 nFormLen, double &rCurVal, BOOL bShrFmla ); - // -> excform.cxx + // -> excform.cxx virtual void EndSheet( void ); - void NeueTabelle( void ); - const ScTokenArray* ErrorToFormula( BYTE bErrOrVal, BYTE nError, + void NeueTabelle( void ); + const ScTokenArray* ErrorToFormula( BYTE bErrOrVal, BYTE nError, double& rVal ); virtual void AdjustRowHeight(); @@ -197,9 +197,9 @@ protected: public: ImportExcel( XclImpRootData& rImpData, SvStream& rStrm ); - virtual ~ImportExcel( void ); + virtual ~ImportExcel( void ); - virtual FltError Read( void ); + virtual FltError Read( void ); }; #endif diff --git a/sc/source/filter/inc/lotattr.hxx b/sc/source/filter/inc/lotattr.hxx index f9c8c88fb222..3f4f1b926132 100644 --- a/sc/source/filter/inc/lotattr.hxx +++ b/sc/source/filter/inc/lotattr.hxx @@ -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 @@ -47,13 +47,13 @@ class LotAttrTable; struct LotAttrWK3 { - UINT8 nFont; - UINT8 nLineStyle; - UINT8 nFontCol; - UINT8 nBack; + UINT8 nFont; + UINT8 nLineStyle; + UINT8 nFontCol; + UINT8 nBack; - inline BOOL HasStyles( void ); - inline BOOL IsCentered( void ); + inline BOOL HasStyles( void ); + inline BOOL IsCentered( void ); }; @@ -77,41 +77,41 @@ private: struct ENTRY { - ScPatternAttr* pPattAttr; - UINT32 nHash0; + ScPatternAttr* pPattAttr; + UINT32 nHash0; - inline ENTRY( const ScPatternAttr& r ) { pPattAttr = new ScPatternAttr( r ); } + inline ENTRY( const ScPatternAttr& r ) { pPattAttr = new ScPatternAttr( r ); } - inline ENTRY( ScPatternAttr* p ) { pPattAttr = p; } + inline ENTRY( ScPatternAttr* p ) { pPattAttr = p; } - inline ~ENTRY() { delete pPattAttr; } + inline ~ENTRY() { delete pPattAttr; } - inline BOOL operator ==( const ENTRY& r ) const { return nHash0 == r.nHash0; } + inline BOOL operator ==( const ENTRY& r ) const { return nHash0 == r.nHash0; } - inline BOOL operator ==( const UINT32& r ) const { return nHash0 == r; } + inline BOOL operator ==( const UINT32& r ) const { return nHash0 == r; } }; - ScDocumentPool* pDocPool; - SvxColorItem* ppColorItems[ 6 ]; // 0 und 7 fehlen! - SvxColorItem* pBlack; - SvxColorItem* pWhite; - Color* pColTab; + ScDocumentPool* pDocPool; + SvxColorItem* ppColorItems[ 6 ]; // 0 und 7 fehlen! + SvxColorItem* pBlack; + SvxColorItem* pWhite; + Color* pColTab; - inline static void MakeHash( const LotAttrWK3& rAttr, UINT32& rOut ) + inline static void MakeHash( const LotAttrWK3& rAttr, UINT32& rOut ) { ( ( UINT8* ) &rOut )[ 0 ] = rAttr.nFont & 0x7F; ( ( UINT8* ) &rOut )[ 1 ] = rAttr.nLineStyle; ( ( UINT8* ) &rOut )[ 2 ] = rAttr.nFontCol; ( ( UINT8* ) &rOut )[ 3 ] = rAttr.nBack; } - static void LotusToScBorderLine( UINT8 nLine, SvxBorderLine& ); - const SvxColorItem& GetColorItem( const UINT8 nLotIndex ) const; - const Color& GetColor( const UINT8 nLotIndex ) const; + static void LotusToScBorderLine( UINT8 nLine, SvxBorderLine& ); + const SvxColorItem& GetColorItem( const UINT8 nLotIndex ) const; + const Color& GetColor( const UINT8 nLotIndex ) const; public: LotAttrCache( void ); ~LotAttrCache(); - const ScPatternAttr& GetPattAttr( const LotAttrWK3& ); + const ScPatternAttr& GetPattAttr( const LotAttrWK3& ); }; @@ -120,30 +120,30 @@ class LotAttrCol : private List private: struct ENTRY { - const ScPatternAttr* pPattAttr; - SCROW nFirstRow; - SCROW nLastRow; + const ScPatternAttr* pPattAttr; + SCROW nFirstRow; + SCROW nLastRow; }; public: ~LotAttrCol( void ); - void SetAttr( const SCROW nRow, const ScPatternAttr& ); - void Apply( const SCCOL nCol, const SCTAB nTab, const BOOL bClear = TRUE ); - void Clear( void ); + void SetAttr( const SCROW nRow, const ScPatternAttr& ); + void Apply( const SCCOL nCol, const SCTAB nTab, const BOOL bClear = TRUE ); + void Clear( void ); }; class LotAttrTable { private: - LotAttrCol pCols[ MAXCOLCOUNT ]; - LotAttrCache aAttrCache; + LotAttrCol pCols[ MAXCOLCOUNT ]; + LotAttrCache aAttrCache; public: LotAttrTable( void ); ~LotAttrTable(); - void SetAttr( const SCCOL nColFirst, const SCCOL nColLast, const SCROW nRow, const LotAttrWK3& ); - void Apply( const SCTAB nTabNum ); + void SetAttr( const SCCOL nColFirst, const SCCOL nColLast, const SCROW nRow, const LotAttrWK3& ); + void Apply( const SCTAB nTabNum ); }; diff --git a/sc/source/filter/inc/lotfntbf.hxx b/sc/source/filter/inc/lotfntbf.hxx index 0cbdda762bc4..26fdbaa297fb 100644 --- a/sc/source/filter/inc/lotfntbf.hxx +++ b/sc/source/filter/inc/lotfntbf.hxx @@ -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 @@ -45,12 +45,12 @@ class LotusFontBuffer private: struct ENTRY { - String* pTmpName; - SvxFontItem* pFont; - SvxFontHeightItem* pHeight; - SvxColorItem* pColor; - INT32 nType; // < 0 -> undefiniert - inline ENTRY( void ) + String* pTmpName; + SvxFontItem* pFont; + SvxFontHeightItem* pHeight; + SvxColorItem* pColor; + INT32 nType; // < 0 -> undefiniert + inline ENTRY( void ) { pTmpName = NULL; pFont = NULL; @@ -58,7 +58,7 @@ private: pColor = NULL; nType = -1; } - inline ~ENTRY() + inline ~ENTRY() { if( pTmpName ) delete pTmpName; @@ -69,42 +69,42 @@ private: if( pColor ) delete pColor; } - inline void TmpName( const String &rNew ) + inline void TmpName( const String &rNew ) { if( pTmpName ) *pTmpName = rNew; else pTmpName = new String( rNew ); } - inline void Font( SvxFontItem& rNew ) + inline void Font( SvxFontItem& rNew ) { if( pFont ) delete pFont; pFont = &rNew; } - inline void Height( SvxFontHeightItem& rNew ) + inline void Height( SvxFontHeightItem& rNew ) { if( pHeight ) delete pHeight; pHeight = &rNew; } - inline void Color( SvxColorItem& rNew ) + inline void Color( SvxColorItem& rNew ) { if( pColor ) delete pColor; pColor = &rNew; } - inline void Type( const UINT16 nNew ) { nType = nNew; } + inline void Type( const UINT16 nNew ) { nType = nNew; } }; - ENTRY pData[ 8 ]; - const static UINT16 nSize; - void MakeFont( ENTRY* pEntry ); + ENTRY pData[ 8 ]; + const static UINT16 nSize; + void MakeFont( ENTRY* pEntry ); public: - void Fill( const UINT8 nIndex, SfxItemSet& rItemSet ); - void SetName( const UINT16 nIndex, const String& rName ); - void SetHeight( const UINT16 nIndex, const UINT16 nHeight ); - void SetType( const UINT16 nIndex, const UINT16 nType ); + void Fill( const UINT8 nIndex, SfxItemSet& rItemSet ); + void SetName( const UINT16 nIndex, const String& rName ); + void SetHeight( const UINT16 nIndex, const UINT16 nHeight ); + void SetType( const UINT16 nIndex, const UINT16 nType ); }; diff --git a/sc/source/filter/inc/lotform.hxx b/sc/source/filter/inc/lotform.hxx index b9fac939192e..4a9e2735700e 100644 --- a/sc/source/filter/inc/lotform.hxx +++ b/sc/source/filter/inc/lotform.hxx @@ -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 @@ -37,34 +37,34 @@ enum FUNC_TYPE { - FT_Return = 0, // End Formula - FT_FuncFix0, // Funktion, 0 Parameter - FT_FuncFix1, // Funktion, 0 Parameter - FT_FuncFix2, // Funktion, 0 Parameter - FT_FuncFix3, // Funktion, 0 Parameter - FT_FuncFix4, // Funktion, 0 Parameter - FT_FuncVar, // ~, var. P. - FT_Neg, // Negierung - FT_Op, // Operator - FT_NotImpl, // nicht implementiert - FT_ConstFloat, // Double (8-Byte) - FT_Variable, // Single Ref - FT_Range, // Double Ref - FT_Braces, // Klammmern - FT_ConstInt, // Integer - FT_ConstString, // String - FT_NOP, // nichts + FT_Return = 0, // End Formula + FT_FuncFix0, // Funktion, 0 Parameter + FT_FuncFix1, // Funktion, 0 Parameter + FT_FuncFix2, // Funktion, 0 Parameter + FT_FuncFix3, // Funktion, 0 Parameter + FT_FuncFix4, // Funktion, 0 Parameter + FT_FuncVar, // ~, var. P. + FT_Neg, // Negierung + FT_Op, // Operator + FT_NotImpl, // nicht implementiert + FT_ConstFloat, // Double (8-Byte) + FT_Variable, // Single Ref + FT_Range, // Double Ref + FT_Braces, // Klammmern + FT_ConstInt, // Integer + FT_ConstString, // String + FT_NOP, // nichts // zusaetzlich ab WK3 - FT_Cref, // Cell Reference - FT_Rref, // Range Reference - FT_Nrref, // Named range reference - FT_Absnref, // Absolut named range - FT_Erref, // Err range reference - FT_Ecref, // Err cell reference - FT_Econstant, // Err constant - FT_Splfunc, // SPLfunction + FT_Cref, // Cell Reference + FT_Rref, // Range Reference + FT_Nrref, // Named range reference + FT_Absnref, // Absolut named range + FT_Erref, // Err range reference + FT_Ecref, // Err cell reference + FT_Econstant, // Err constant + FT_Splfunc, // SPLfunction FT_Const10Float,// Float (10-Byte) - FT_Snum // Const Short Num + FT_Snum // Const Short Num // fuer 'Problemfaelle' beim Import }; @@ -74,38 +74,38 @@ enum FUNC_TYPE class LotusToSc : public LotusConverterBase { private: - CharSet eSrcChar; - TokenId nAddToken; // ')+1.0' - TokenId nSubToken; // ~ - TokenId n0Token; // '0.0'; + CharSet eSrcChar; + TokenId nAddToken; // ')+1.0' + TokenId nSubToken; // ~ + TokenId n0Token; // '0.0'; // --------------------------------------------------------------- - static FUNC_TYPE IndexToType( BYTE ); - static DefTokenId IndexToToken( BYTE ); - static FUNC_TYPE IndexToTypeWK123( BYTE ); - static DefTokenId IndexToTokenWK123( BYTE ); - void DoFunc( DefTokenId eOc, BYTE nAnz, const sal_Char* pExtName ); - void LotusRelToScRel( UINT16 nCol, UINT16 nRow, + static FUNC_TYPE IndexToType( BYTE ); + static DefTokenId IndexToToken( BYTE ); + static FUNC_TYPE IndexToTypeWK123( BYTE ); + static DefTokenId IndexToTokenWK123( BYTE ); + void DoFunc( DefTokenId eOc, BYTE nAnz, const sal_Char* pExtName ); + void LotusRelToScRel( UINT16 nCol, UINT16 nRow, ScSingleRefData& rSRD ); - BOOL bWK3; // alternative Codeumsetzung statt fuer < WK1 + BOOL bWK3; // alternative Codeumsetzung statt fuer < WK1 BOOL bWK123; // alternative for 123 // ------------------------------------------------------------------- - void ReadSRD( ScSingleRefData& rSRD, BYTE nFlags ); - inline void ReadCRD( ScComplexRefData& rCRD, BYTE nFlags ); - void IncToken( TokenId &rParam ); + void ReadSRD( ScSingleRefData& rSRD, BYTE nFlags ); + inline void ReadCRD( ScComplexRefData& rCRD, BYTE nFlags ); + void IncToken( TokenId &rParam ); // ACHTUNG: hier wird die aktuelle Token-Kette im Pool // mit '(<rParam>)+1' fortgeschrieben und mit // Store() abgeschlossen! - void DecToken( TokenId& rParam ); + void DecToken( TokenId& rParam ); // ACHTUNG: ~ - void NegToken( TokenId& rParam ); + void NegToken( TokenId& rParam ); // ACHTUNG: wie ~, nur wird '-(<rParam>)' gebildet public: LotusToSc( SvStream& aStr, CharSet eSrc, BOOL b ); - virtual ConvErr Convert( const ScTokenArray*& rpErg, INT32& nRest, + virtual ConvErr Convert( const ScTokenArray*& rpErg, INT32& nRest, const FORMULA_TYPE eFT = FT_CellFormula ); void Reset( const ScAddress& rEingPos ); - inline void SetWK3( void ); + inline void SetWK3( void ); private: using LotusConverterBase::Reset; diff --git a/sc/source/filter/inc/lotimpop.hxx b/sc/source/filter/inc/lotimpop.hxx index 09efab80320a..99b0b9dcccc1 100644 --- a/sc/source/filter/inc/lotimpop.hxx +++ b/sc/source/filter/inc/lotimpop.hxx @@ -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 @@ -45,56 +45,56 @@ class SvxBorderLine; class ImportLotus : public ImportTyp { private: - SvStream* pIn; // benoetigt wegen multiplem Read()! - LotusFontBuffer* pFontBuff; - LotusToSc aConv; + SvStream* pIn; // benoetigt wegen multiplem Read()! + LotusFontBuffer* pFontBuff; + LotusToSc aConv; UINT16 nTab; // z.Zt. bearbeitete Tabelle - INT32 nExtTab; + INT32 nExtTab; // ------------------------------------------------------------------- // in WK?-Datei - void Bof( void ); // 0x0000 00 - BOOL BofFm3( void ); // 0x0000 00 - void Columnwidth( UINT16 nRecLen ); // 0x0007 07 - void Hiddencolumn( UINT16 nRecLen ); // 0x0008 08 - void Userrange( void ); // 0x0009 09 - void Errcell( void ); // 0x0014 20 - void Nacell( void ); // 0x0015 21 - void Labelcell( void ); // 0x0016 22 - void Numbercell( void ); // 0x0017 23 - void Smallnumcell( void ); // 0x0018 24 - ScFormulaCell* Formulacell( UINT16 nRecLen ); // 0x0019 25 - void Formulastring( ScFormulaCell& ); // 0x001a 26 - // 0x001b 27 special - void NamedSheet( void ); // 14000 - void RowPresentation( UINT16 nRecLen ); // 2007 + void Bof( void ); // 0x0000 00 + BOOL BofFm3( void ); // 0x0000 00 + void Columnwidth( UINT16 nRecLen ); // 0x0007 07 + void Hiddencolumn( UINT16 nRecLen ); // 0x0008 08 + void Userrange( void ); // 0x0009 09 + void Errcell( void ); // 0x0014 20 + void Nacell( void ); // 0x0015 21 + void Labelcell( void ); // 0x0016 22 + void Numbercell( void ); // 0x0017 23 + void Smallnumcell( void ); // 0x0018 24 + ScFormulaCell* Formulacell( UINT16 nRecLen ); // 0x0019 25 + void Formulastring( ScFormulaCell& ); // 0x001a 26 + // 0x001b 27 special + void NamedSheet( void ); // 14000 + void RowPresentation( UINT16 nRecLen ); // 2007 // ------------------------------------------------------------------- // in FM?-Datei - void Font_Face( void ); // 174 - void Font_Type( void ); // 176 - void Font_Ysize( void ); // 177 - void _Row( const UINT16 nRecLen ); // 197 ? + void Font_Face( void ); // 174 + void Font_Type( void ); // 176 + void Font_Ysize( void ); // 177 + void _Row( const UINT16 nRecLen ); // 197 ? // ------------------------------------------------------------------- - inline void Read( ScAddress& ); - inline void Read( ScRange& ); + inline void Read( ScAddress& ); + inline void Read( ScRange& ); // fuer Addresses/Ranges im Format Row(16)/Tab(8)/Col(8) - inline void Read( sal_Char& ); - inline void Read( BYTE& ); - inline void Read( UINT16& ); - inline void Read( INT16& ); - inline void Read( UINT32& ); - inline void Read( double& ); // 10-Byte-IEEE lesen - inline void Read( LotAttrWK3& ); - void Read( String& ); // 0-terminierten String einlesen - inline void Skip( const UINT16 nNumBytes ); + inline void Read( sal_Char& ); + inline void Read( BYTE& ); + inline void Read( UINT16& ); + inline void Read( INT16& ); + inline void Read( UINT32& ); + inline void Read( double& ); // 10-Byte-IEEE lesen + inline void Read( LotAttrWK3& ); + void Read( String& ); // 0-terminierten String einlesen + inline void Skip( const UINT16 nNumBytes ); // ------------------------------------------------------------------- public: ImportLotus( SvStream&, ScDocument*, CharSet eSrc ); - virtual ~ImportLotus(); + virtual ~ImportLotus(); - FltError Read(); - FltError Read( SvStream& ); // special for *.fm3-Dateien + FltError Read(); + FltError Read( SvStream& ); // special for *.fm3-Dateien }; diff --git a/sc/source/filter/inc/lotrange.hxx b/sc/source/filter/inc/lotrange.hxx index 2f520deff2c9..d97b4cfec2b6 100644 --- a/sc/source/filter/inc/lotrange.hxx +++ b/sc/source/filter/inc/lotrange.hxx @@ -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 @@ -36,30 +36,30 @@ class LotusRangeList; -typedef UINT16 LR_ID; -#define ID_FAIL 0xFFFF +typedef UINT16 LR_ID; +#define ID_FAIL 0xFFFF class LotusRange { friend class LotusRangeList; private: - UINT32 nHash; - SCCOL nColStart; - SCROW nRowStart; - SCCOL nColEnd; - SCROW nRowEnd; - LR_ID nId; - void MakeHash( void ); - inline void Copy( const LotusRange& ); - inline void SetId( LR_ID nId ); + UINT32 nHash; + SCCOL nColStart; + SCROW nRowStart; + SCCOL nColEnd; + SCROW nRowEnd; + LR_ID nId; + void MakeHash( void ); + inline void Copy( const LotusRange& ); + inline void SetId( LR_ID nId ); public: LotusRange( SCCOL nCol, SCROW nRow ); LotusRange( SCCOL nColS, SCROW nRowS, SCCOL nColE, SCROW nRowE ); LotusRange( const LotusRange& ); - inline LotusRange &operator =( const LotusRange& ); - inline BOOL operator ==( const LotusRange& ) const; - inline BOOL operator !=( const LotusRange& ) const; - inline BOOL IsSingle( void ) const; + inline LotusRange &operator =( const LotusRange& ); + inline BOOL operator ==( const LotusRange& ) const; + inline BOOL operator !=( const LotusRange& ) const; + inline BOOL IsSingle( void ) const; }; @@ -113,20 +113,20 @@ inline BOOL LotusRange::IsSingle( void ) const class LotusRangeList : private List { private: - LR_ID nIdCnt; - ScComplexRefData aComplRef; - static SCCOL nEingCol; - static SCROW nEingRow; + LR_ID nIdCnt; + ScComplexRefData aComplRef; + static SCCOL nEingCol; + static SCROW nEingRow; public: LotusRangeList( void ); ~LotusRangeList( void ); - inline UINT16 GetIndex( SCCOL nCol, SCROW nRow ); - inline UINT16 GetIndex( SCCOL nColS, SCROW nRowS, SCCOL nColE, SCROW nRowE ); - UINT16 GetIndex( const LotusRange& ); - inline void Append( SCCOL nCol, SCROW nRow, const String& ); - inline void Append( SCCOL nColS, SCROW nRowS, SCCOL nColE, SCROW nRowE, const String& ); - void Append( LotusRange* pLR, const String& rName ); - inline static void SetEing( const SCCOL nCol, const SCROW nRow ); + inline UINT16 GetIndex( SCCOL nCol, SCROW nRow ); + inline UINT16 GetIndex( SCCOL nColS, SCROW nRowS, SCCOL nColE, SCROW nRowE ); + UINT16 GetIndex( const LotusRange& ); + inline void Append( SCCOL nCol, SCROW nRow, const String& ); + inline void Append( SCCOL nColS, SCROW nRowS, SCCOL nColE, SCROW nRowE, const String& ); + void Append( LotusRange* pLR, const String& rName ); + inline static void SetEing( const SCCOL nCol, const SCROW nRow ); }; diff --git a/sc/source/filter/inc/namebuff.hxx b/sc/source/filter/inc/namebuff.hxx index d0eac381722c..ecac34b2157f 100644 --- a/sc/source/filter/inc/namebuff.hxx +++ b/sc/source/filter/inc/namebuff.hxx @@ -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 @@ -50,17 +50,17 @@ class StringHashEntry { private: friend class NameBuffer; - String aString; - UINT32 nHash; + String aString; + UINT32 nHash; - static UINT32 MakeHashCode( const String& ); + static UINT32 MakeHashCode( const String& ); public: - inline StringHashEntry( const String& ); - inline StringHashEntry( void ); - inline void operator =( const sal_Char* ); - inline void operator =( const String& ); - inline void operator =( const StringHashEntry& ); - inline BOOL operator ==( const StringHashEntry& ) const; + inline StringHashEntry( const String& ); + inline StringHashEntry( void ); + inline void operator =( const sal_Char* ); + inline void operator =( const String& ); + inline void operator =( const StringHashEntry& ); + inline BOOL operator ==( const StringHashEntry& ) const; }; @@ -106,17 +106,17 @@ inline BOOL StringHashEntry::operator ==( const StringHashEntry& r ) const class NameBuffer : private List, public ExcRoot { private: - UINT16 nBase; // Index-Basis + UINT16 nBase; // Index-Basis public: // inline NameBuffer( void ); //#94039# prevent empty rootdata - inline NameBuffer( RootData* ); - inline NameBuffer( RootData*, UINT16 nNewBase ); - - virtual ~NameBuffer(); - inline const String* Get( UINT16 nIndex ); - inline UINT16 GetLastIndex( void ); - inline void SetBase( UINT16 nNewBase = 0 ); - void operator <<( const String& rNewString ); + inline NameBuffer( RootData* ); + inline NameBuffer( RootData*, UINT16 nNewBase ); + + virtual ~NameBuffer(); + inline const String* Get( UINT16 nIndex ); + inline UINT16 GetLastIndex( void ); + inline void SetBase( UINT16 nNewBase = 0 ); + void operator <<( const String& rNewString ); }; //#94039# prevent empty rootdata @@ -177,20 +177,20 @@ class ShrfmlaBuffer : public ExcRoot size_t operator() (const ScAddress &addr) const; }; typedef std::hash_map <ScAddress, USHORT, ScAddressHashFunc> ShrfmlaHash; - typedef std::list <ScRange> ShrfmlaList; + typedef std::list <ScRange> ShrfmlaList; - ShrfmlaHash index_hash; - ShrfmlaList index_list; + ShrfmlaHash index_hash; + ShrfmlaList index_list; size_t mnCurrIdx; public: ShrfmlaBuffer( RootData* pRD ); - virtual ~ShrfmlaBuffer(); + virtual ~ShrfmlaBuffer(); void Clear(); - void Store( const ScRange& rRange, const ScTokenArray& ); + void Store( const ScRange& rRange, const ScTokenArray& ); USHORT Find (const ScAddress & rAddress ) const; - static String CreateName( const ScRange& ); + static String CreateName( const ScRange& ); }; @@ -201,12 +201,12 @@ class RangeNameBufferWK3 : private List private: struct ENTRY { - StringHashEntry aStrHashEntry; - ScComplexRefData aScComplexRefDataRel; - String aScAbsName; - UINT16 nAbsInd; // == 0 -> noch keine Abs-Name! - UINT16 nRelInd; - BOOL bSingleRef; + StringHashEntry aStrHashEntry; + ScComplexRefData aScComplexRefDataRel; + String aScAbsName; + UINT16 nAbsInd; // == 0 -> noch keine Abs-Name! + UINT16 nRelInd; + BOOL bSingleRef; ENTRY( const String& rName, const String& rScName, const ScComplexRefData& rCRD ) : aStrHashEntry( rName ), aScComplexRefDataRel( rCRD ), @@ -217,23 +217,23 @@ private: } }; - ScTokenArray* pScTokenArray; - UINT16 nIntCount; + ScTokenArray* pScTokenArray; + UINT16 nIntCount; public: RangeNameBufferWK3( void ); - virtual ~RangeNameBufferWK3(); - void Add( const String& rName, const ScComplexRefData& rCRD ); - inline void Add( const String& rName, const ScRange& aScRange ); - BOOL FindRel( const String& rRef, UINT16& rIndex ); - BOOL FindAbs( const String& rRef, UINT16& rIndex ); + virtual ~RangeNameBufferWK3(); + void Add( const String& rName, const ScComplexRefData& rCRD ); + inline void Add( const String& rName, const ScRange& aScRange ); + BOOL FindRel( const String& rRef, UINT16& rIndex ); + BOOL FindAbs( const String& rRef, UINT16& rIndex ); }; inline void RangeNameBufferWK3::Add( const String& rName, const ScRange& aScRange ) { - ScComplexRefData aCRD; - ScSingleRefData* pSRD; - const ScAddress* pScAddr; + ScComplexRefData aCRD; + ScSingleRefData* pSRD; + const ScAddress* pScAddr; pSRD = &aCRD.Ref1; pScAddr = &aScRange.aStart; @@ -270,18 +270,18 @@ class ExtSheetBuffer : private List, public ExcRoot private: struct Cont { - String aFile; - String aTab; - UINT16 nTabNum; // 0xFFFF -> noch nicht angelegt + String aFile; + String aTab; + UINT16 nTabNum; // 0xFFFF -> noch nicht angelegt // 0xFFFE -> versucht anzulegen, ging aber schief // 0xFFFD -> soll im selben Workbook sein, findet's aber nicht - BOOL bSWB; - BOOL bLink; + BOOL bSWB; + BOOL bLink; Cont( const String& rFilePathAndName, const String& rTabName ) : aFile( rFilePathAndName ), aTab( rTabName ) { - nTabNum = 0xFFFF; // -> Tabelle noch nicht erzeugt + nTabNum = 0xFFFF; // -> Tabelle noch nicht erzeugt bSWB = bLink = FALSE; } Cont( const String& rFilePathAndName, const String& rTabName, @@ -289,23 +289,23 @@ private: aFile( rFilePathAndName ), aTab( rTabName ) { - nTabNum = 0xFFFF; // -> Tabelle noch nicht erzeugt + nTabNum = 0xFFFF; // -> Tabelle noch nicht erzeugt bSWB = bSameWB; bLink = FALSE; } }; public: - inline ExtSheetBuffer( RootData* ); - virtual ~ExtSheetBuffer(); + inline ExtSheetBuffer( RootData* ); + virtual ~ExtSheetBuffer(); sal_Int16 Add( const String& rFilePathAndName, const String& rTabName, const BOOL bSameWorkbook = FALSE ); - BOOL GetScTabIndex( UINT16 nExcSheetIndex, UINT16& rIn_LastTab_Out_ScIndex ); - BOOL IsLink( const UINT16 nExcSheetIndex ) const; - BOOL GetLink( const UINT16 nExcSheetIndex, String &rAppl, String &rDoc ) const; + BOOL GetScTabIndex( UINT16 nExcSheetIndex, UINT16& rIn_LastTab_Out_ScIndex ); + BOOL IsLink( const UINT16 nExcSheetIndex ) const; + BOOL GetLink( const UINT16 nExcSheetIndex, String &rAppl, String &rDoc ) const; - void Reset( void ); + void Reset( void ); }; @@ -318,13 +318,13 @@ inline ExtSheetBuffer::ExtSheetBuffer( RootData* p ) : ExcRoot( p ) struct ExtName { - String aName; - UINT32 nStorageId; - UINT16 nFlags; + String aName; + UINT32 nStorageId; + UINT16 nFlags; inline ExtName( const String& r, sal_uInt16 n ) : aName( r ), nStorageId( 0 ), nFlags( n ) {} - BOOL IsDDE( void ) const; + BOOL IsDDE( void ) const; BOOL IsOLE( void ) const; }; diff --git a/sc/source/filter/inc/op.h b/sc/source/filter/inc/op.h index d44053de2a44..14f89a328791 100644 --- a/sc/source/filter/inc/op.h +++ b/sc/source/filter/inc/op.h @@ -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 @@ void OP_EOF( SvStream &aStream, USHORT nLaenge ); void OP_Integer( SvStream &aStream, USHORT nLaenge ); void OP_Number( SvStream &aStream, USHORT nLaenge ); void OP_Label( SvStream &aStream, USHORT nLaenge ); -void OP_Integer3( SvStream &aStream, USHORT nLaenge ); // WK3 -void OP_Number3( SvStream &aStream, USHORT nLaenge ); // WK3 +void OP_Integer3( SvStream &aStream, USHORT nLaenge ); // WK3 +void OP_Number3( SvStream &aStream, USHORT nLaenge ); // WK3 void OP_Formula( SvStream &aStream, USHORT nLaenge ); -void OP_Formula3( SvStream &aStream, USHORT nLaenge ); // WK3 +void OP_Formula3( SvStream &aStream, USHORT nLaenge ); // WK3 void OP_ColumnWidth( SvStream &aStream, USHORT nLaenge ); void OP_NamedRange( SvStream &aStream, USHORT nLaenge ); void OP_SymphNamedRange( SvStream &aStream, USHORT nLaenge ); diff --git a/sc/source/filter/inc/optab.h b/sc/source/filter/inc/optab.h index f4fb22af08c1..1587f89571bf 100644 --- a/sc/source/filter/inc/optab.h +++ b/sc/source/filter/inc/optab.h @@ -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 @@ -31,15 +31,15 @@ typedef void ( *OPCODE_FKT )( SvStream &aStream, USHORT nLaenge ); -#define FKT_LIMIT 101 +#define FKT_LIMIT 101 -#define FKT_LIMIT123 101 +#define FKT_LIMIT123 101 -#define LOTUS_EOF 0x01 +#define LOTUS_EOF 0x01 #define LOTUS_FILEPASSWD 0x4b -#define LOTUS_PATTERN 0x284 +#define LOTUS_PATTERN 0x284 #define LOTUS_FORMAT_INDEX 0x800 diff --git a/sc/source/filter/inc/otlnbuff.hxx b/sc/source/filter/inc/otlnbuff.hxx index 9ed84056f182..236e01318583 100644 --- a/sc/source/filter/inc/otlnbuff.hxx +++ b/sc/source/filter/inc/otlnbuff.hxx @@ -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 diff --git a/sc/source/filter/inc/qpro.hxx b/sc/source/filter/inc/qpro.hxx index 460e0a83ba8c..a94c995e9321 100644 --- a/sc/source/filter/inc/qpro.hxx +++ b/sc/source/filter/inc/qpro.hxx @@ -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 diff --git a/sc/source/filter/inc/qproform.hxx b/sc/source/filter/inc/qproform.hxx index 6e06827ad958..f1c777ce8730 100644 --- a/sc/source/filter/inc/qproform.hxx +++ b/sc/source/filter/inc/qproform.hxx @@ -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 @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - + #ifndef SC_QPROFORM_HXX #define SC_QPROFORM_HXX @@ -40,35 +40,35 @@ typedef OpCode DefTokenId; enum FUNC_TYPE { - FT_Return, + FT_Return, FT_FuncFix0, - FT_FuncFix1, - FT_FuncFix2, - FT_FuncFix3, - FT_FuncFix4, + FT_FuncFix1, + FT_FuncFix2, + FT_FuncFix3, + FT_FuncFix4, FT_FuncFix5, FT_FuncFix6, - FT_FuncVar, + FT_FuncVar, FT_DLL, - FT_Neg, - FT_Op, - FT_NotImpl, - FT_ConstFloat, - FT_Range, + FT_Neg, + FT_Op, + FT_NotImpl, + FT_ConstFloat, + FT_Range, FT_Braces, - FT_ConstInt, + FT_ConstInt, FT_ConstString, - FT_NOP, - FT_Cref + FT_NOP, + FT_Cref }; - + class QProToSc : public ConverterBase { private: - TokenId mnAddToken; - TokenId mnSubToken; - TokenId mn0Token; - SvStream& maIn; + TokenId mnAddToken; + TokenId mnSubToken; + TokenId mn0Token; + SvStream& maIn; public: static const size_t nBufSize = 256; @@ -77,7 +77,7 @@ class QProToSc : public ConverterBase ConvErr Convert( const ScTokenArray*& pArray, sal_uInt16 nLen, const FORMULA_TYPE eFT = FT_CellFormula ); void DoFunc( DefTokenId eOc, sal_uInt16 nArgs, const sal_Char* pExtString ); - void ReadSRD( ScSingleRefData& rR, sal_Int8 nPage, sal_Int8 nCol, sal_uInt16 rRel ); + void ReadSRD( ScSingleRefData& rR, sal_Int8 nPage, sal_Int8 nCol, sal_uInt16 rRel ); void IncToken( TokenId &aParam ); DefTokenId IndexToToken( sal_uInt16 nToken ); FUNC_TYPE IndexToType( sal_uInt8 nToken ); diff --git a/sc/source/filter/inc/qprostyle.hxx b/sc/source/filter/inc/qprostyle.hxx index f52ce655d4bf..1fc3f196885b 100644 --- a/sc/source/filter/inc/qprostyle.hxx +++ b/sc/source/filter/inc/qprostyle.hxx @@ -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 diff --git a/sc/source/filter/inc/root.hxx b/sc/source/filter/inc/root.hxx index 4c9800216a0f..6ecb77bc35a5 100644 --- a/sc/source/filter/inc/root.hxx +++ b/sc/source/filter/inc/root.hxx @@ -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 @@ -58,12 +58,12 @@ class XclExpRoot; // ---------------------------------------------------------- Excel Imp~/Exp~ - -struct RootData // -> Inkarnation jeweils im ImportExcel-Objekt! +struct RootData // -> Inkarnation jeweils im ImportExcel-Objekt! { - BiffTyp eDateiTyp; // feine Differenzierung - ExtSheetBuffer* pExtSheetBuff; - ShrfmlaBuffer* pShrfmlaBuff; - ExtNameBuff* pExtNameBuff; + BiffTyp eDateiTyp; // feine Differenzierung + ExtSheetBuffer* pExtSheetBuff; + ShrfmlaBuffer* pShrfmlaBuff; + ExtNameBuff* pExtNameBuff; ExcelToSc* pFmlaConverter; XclImpColRowSettings* pColRowBuff; // Col/Row-Einstellungen 1 Tabelle @@ -79,14 +79,14 @@ struct RootData // -> Inkarnation jeweils im ImportExcel-Objekt! XclImpRoot* pIR; XclExpRoot* pER; - RootData( void ); // -> exctools.cxx - ~RootData(); // -> exctools.cxx + RootData( void ); // -> exctools.cxx + ~RootData(); // -> exctools.cxx }; class ExcRoot { protected: - RootData* pExcRoot; + RootData* pExcRoot; inline ExcRoot( RootData* pNexExcRoot ) : pExcRoot( pNexExcRoot ) {} inline ExcRoot( const ExcRoot& rCopy ) : pExcRoot( rCopy.pExcRoot ) {} }; @@ -100,19 +100,19 @@ class LotAttrTable; struct LOTUS_ROOT { - ScDocument* pDoc; - LotusRangeList* pRangeNames; - ScRangeName* pScRangeName; - CharSet eCharsetQ; - Lotus123Typ eFirstType; - Lotus123Typ eActType; - ScRange aActRange; - RangeNameBufferWK3* pRngNmBffWK3; - LotusFontBuffer* pFontBuff; - LotAttrTable* pAttrTable; + ScDocument* pDoc; + LotusRangeList* pRangeNames; + ScRangeName* pScRangeName; + CharSet eCharsetQ; + Lotus123Typ eFirstType; + Lotus123Typ eActType; + ScRange aActRange; + RangeNameBufferWK3* pRngNmBffWK3; + LotusFontBuffer* pFontBuff; + LotAttrTable* pAttrTable; }; -extern LOTUS_ROOT* pLotusRoot; // -> Inkarn. in filter.cxx +extern LOTUS_ROOT* pLotusRoot; // -> Inkarn. in filter.cxx // ---------------------------------------------------------------------------- diff --git a/sc/source/filter/inc/rtfexp.hxx b/sc/source/filter/inc/rtfexp.hxx index c37e647f5ec5..af52a4d8b1fe 100644 --- a/sc/source/filter/inc/rtfexp.hxx +++ b/sc/source/filter/inc/rtfexp.hxx @@ -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 @@ -34,21 +34,21 @@ class ScRTFExport : public ScExportBase { - ULONG* pCellX; // kumulierte Zellbreiten einer Tabelle + ULONG* pCellX; // kumulierte Zellbreiten einer Tabelle - void WriteTab( SCTAB nTab ); - void WriteRow( SCTAB nTab, SCROW nRow ); - void WriteCell( SCTAB nTab, SCROW nRow, SCCOL nCol ); + void WriteTab( SCTAB nTab ); + void WriteRow( SCTAB nTab, SCROW nRow ); + void WriteCell( SCTAB nTab, SCROW nRow, SCCOL nCol ); public: ScRTFExport( SvStream&, ScDocument*, const ScRange& ); - virtual ~ScRTFExport(); + virtual ~ScRTFExport(); - ULONG Write(); + ULONG Write(); }; -#endif // SC_RTFEXP_HXX +#endif // SC_RTFEXP_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/rtfimp.hxx b/sc/source/filter/inc/rtfimp.hxx index 8278c497f6af..f3306a22120d 100644 --- a/sc/source/filter/inc/rtfimp.hxx +++ b/sc/source/filter/inc/rtfimp.hxx @@ -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 diff --git a/sc/source/filter/inc/rtfparse.hxx b/sc/source/filter/inc/rtfparse.hxx index e2011e8206de..d4580c6768f6 100644 --- a/sc/source/filter/inc/rtfparse.hxx +++ b/sc/source/filter/inc/rtfparse.hxx @@ -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 @@ -35,10 +35,10 @@ struct ScRTFCellDefault { - SfxItemSet aItemSet; - SCCOL nCol; - USHORT nTwips; // rechter Rand der Zelle - SCCOL nColOverlap; // MergeCell wenn >1, merged cells wenn 0 + SfxItemSet aItemSet; + SCCOL nCol; + USHORT nTwips; // rechter Rand der Zelle + SCCOL nColOverlap; // MergeCell wenn >1, merged cells wenn 0 ScRTFCellDefault( SfxItemPool* pPool ) : aItemSet( *pPool ), nColOverlap(1) {} @@ -49,13 +49,13 @@ DECLARE_LIST( ScRTFDefaultList, ScRTFCellDefault* ) // deswegen ULONG, typedef bringt's auch nicht :-( SV_DECL_VARARR_SORT( ScRTFColTwips, ULONG, 16, 4) -#else // SC_RTFPARSE_CXX +#else // SC_RTFPARSE_CXX struct ScRTFCellDefault; class ScRTFDefaultList; class ScRTFColTwips; -#endif // SC_RTFPARSE_CXX +#endif // SC_RTFPARSE_CXX class EditEngine; @@ -63,26 +63,26 @@ class EditEngine; class ScRTFParser : public ScEEParser { private: - ScRTFDefaultList* pDefaultList; - ScRTFColTwips* pColTwips; - ScRTFCellDefault* pInsDefault; - ScRTFCellDefault* pActDefault; - ScRTFCellDefault* pDefMerge; - ULONG nStartAdjust; - USHORT nLastWidth; - BOOL bNewDef; + ScRTFDefaultList* pDefaultList; + ScRTFColTwips* pColTwips; + ScRTFCellDefault* pInsDefault; + ScRTFCellDefault* pActDefault; + ScRTFCellDefault* pDefMerge; + ULONG nStartAdjust; + USHORT nLastWidth; + BOOL bNewDef; DECL_LINK( RTFImportHdl, ImportInfo* ); - inline void NextRow(); - void EntryEnd( ScEEParseEntry*, const ESelection& ); - void ProcToken( ImportInfo* ); - void ColAdjust(); - BOOL SeekTwips( USHORT nTwips, SCCOL* pCol ); - void NewCellRow( ImportInfo* ); + inline void NextRow(); + void EntryEnd( ScEEParseEntry*, const ESelection& ); + void ProcToken( ImportInfo* ); + void ColAdjust(); + BOOL SeekTwips( USHORT nTwips, SCCOL* pCol ); + void NewCellRow( ImportInfo* ); public: ScRTFParser( EditEngine* ); - virtual ~ScRTFParser(); + virtual ~ScRTFParser(); virtual ULONG Read( SvStream&, const String& rBaseURL ); }; diff --git a/sc/source/filter/inc/scflt.hxx b/sc/source/filter/inc/scflt.hxx index de8e342ac28d..08a26af192b9 100644 --- a/sc/source/filter/inc/scflt.hxx +++ b/sc/source/filter/inc/scflt.hxx @@ -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 @@ -34,192 +34,192 @@ #include <tools/solar.h> // FehlerNummern -#define errUnknownFormat 1 -#define errUnknownID 2 -#define errOutOfMemory 3 +#define errUnknownFormat 1 +#define errUnknownID 2 +#define errOutOfMemory 3 // Identifiers im FileFormat -#define ColWidthID 1 -#define ColAttrID 2 -#define RowHeightID 3 -#define RowAttrID 4 -#define FontID 5 -#define NameID 6 -#define TableID 7 -#define ObjectID 8 -#define PatternID 9 -#define DataBaseID 10 +#define ColWidthID 1 +#define ColAttrID 2 +#define RowHeightID 3 +#define RowAttrID 4 +#define FontID 5 +#define NameID 6 +#define TableID 7 +#define ObjectID 8 +#define PatternID 9 +#define DataBaseID 10 // Zeilen/Spalten Flags -#define crfSoftBreak 1 -#define crfHardBreak 2 -#define crfHidden 4 +#define crfSoftBreak 1 +#define crfHardBreak 2 +#define crfHidden 4 // Zelltypen -#define ctValue 1 -#define ctString 2 -#define ctFormula 3 -#define ctNote 4 +#define ctValue 1 +#define ctString 2 +#define ctFormula 3 +#define ctNote 4 // FontStyles -#define ffDontCare 0x00 -#define ffRoman 0x10 -#define ffSwiss 0x20 -#define ffModern 0x30 -#define ffScript 0x40 -#define ffDecorative 0x50 +#define ffDontCare 0x00 +#define ffRoman 0x10 +#define ffSwiss 0x20 +#define ffModern 0x30 +#define ffScript 0x40 +#define ffDecorative 0x50 // FontWeight -#define fwNormal 400 +#define fwNormal 400 // FontAttribute -#define atNone 0 -#define atBold 1 -#define atItalic 2 -#define atUnderline 4 -#define atStrikeOut 8 +#define atNone 0 +#define atBold 1 +#define atItalic 2 +#define atUnderline 4 +#define atStrikeOut 8 // Horizontale Ausrichtung -#define hjNone 0 -#define hjLeft 1 -#define hjCenter 2 -#define hjRight 3 +#define hjNone 0 +#define hjLeft 1 +#define hjCenter 2 +#define hjRight 3 // Vertikale Ausrichtung -#define vjNone 0 -#define vjTop 1 -#define vjCenter 2 -#define vjBottom 3 +#define vjNone 0 +#define vjTop 1 +#define vjCenter 2 +#define vjBottom 3 // AusrichtungsFlags -#define ojWordBreak 0x01 -#define ojBottomTop 0x02 -#define ojTopBottom 0x04 +#define ojWordBreak 0x01 +#define ojBottomTop 0x02 +#define ojTopBottom 0x04 // ZellRaster -#define raNone 0 -#define raGray12 1 -#define raGray25 2 -#define raGray50 3 -#define raGray75 4 -#define raGray100 5 +#define raNone 0 +#define raGray12 1 +#define raGray25 2 +#define raGray50 3 +#define raGray75 4 +#define raGray100 5 // Zellschutz -#define paProtect 1 -#define paHideFormula 2 -#define paHideAll 4 -#define paHidePrint 8 +#define paProtect 1 +#define paHideFormula 2 +#define paHideAll 4 +#define paHidePrint 8 // ZahlenFormatFlags -#define vfStandard 0 -#define vfMoney 1 -#define vfThousend 2 -#define vfPercent 3 -#define vfExponent 4 -#define vfZerro 5 -#define vfDate 6 -#define vfTime 7 -#define vfBoolean 8 -#define vfStandardRed 9 -#define vfMoneyRed 10 -#define vfThousendRed 11 -#define vfPercentRed 12 -#define vfExponentRed 13 -#define vfFormula 14 -#define vfString 15 -#define vfNone 16 +#define vfStandard 0 +#define vfMoney 1 +#define vfThousend 2 +#define vfPercent 3 +#define vfExponent 4 +#define vfZerro 5 +#define vfDate 6 +#define vfTime 7 +#define vfBoolean 8 +#define vfStandardRed 9 +#define vfMoneyRed 10 +#define vfThousendRed 11 +#define vfPercentRed 12 +#define vfExponentRed 13 +#define vfFormula 14 +#define vfString 15 +#define vfNone 16 // DatumsFormatFlags -#define df_NDMY_Long 0 -#define df_DMY_Long 1 -#define df_MY_Long 2 -#define df_NDM_Long 3 -#define df_DM_Long 4 -#define df_M_Long 5 -#define df_NDMY_Short 6 -#define df_DMY_Short 7 -#define df_MY_Short 8 -#define df_NDM_Short 9 -#define df_DM_Short 10 -#define df_M_Short 11 -#define df_Q_Long 12 -#define df_Q_Short 13 +#define df_NDMY_Long 0 +#define df_DMY_Long 1 +#define df_MY_Long 2 +#define df_NDM_Long 3 +#define df_DM_Long 4 +#define df_M_Long 5 +#define df_NDMY_Short 6 +#define df_DMY_Short 7 +#define df_MY_Short 8 +#define df_NDM_Short 9 +#define df_DM_Short 10 +#define df_M_Short 11 +#define df_Q_Long 12 +#define df_Q_Short 13 // ZeitFormatFlags -#define tf_HMS_Long 0 -#define tf_HM_Long 1 -#define tf_HMS_Short 2 -#define tf_HM_Short 3 +#define tf_HMS_Long 0 +#define tf_HM_Long 1 +#define tf_HMS_Short 2 +#define tf_HM_Short 3 // Attribute fuer FormatVorlage -#define pfValue 0x01 -#define pfFont 0x02 -#define pfJustify 0x04 -#define pfFrame 0x08 -#define pfRaster 0x10 -#define pfProtection 0x20 +#define pfValue 0x01 +#define pfFont 0x02 +#define pfJustify 0x04 +#define pfFrame 0x08 +#define pfRaster 0x10 +#define pfProtection 0x20 // Displayflags fuer die Tabelle -#define dfFormula 0x0001 // Formeln -#define dfZerro 0x0002 // Nullwerte -#define dfGrid 0x0004 // Gitternetz -#define dfPageBreak 0x0008 // Seitenumbruch +#define dfFormula 0x0001 // Formeln +#define dfZerro 0x0002 // Nullwerte +#define dfGrid 0x0004 // Gitternetz +#define dfPageBreak 0x0008 // Seitenumbruch #define dfColRowBar 0x0010 // Zeilen/Spalten Koepfe (Dummy) -#define dfSyntax 0x0020 // Syntax Highlighting -#define dfPrintPage 0x0040 // Druckbildansicht (Dummy) -#define dfObjectAll 0x0080 // Objekte anzeigen -#define dfObjectFrame 0x0100 // Objekte als Platzhalter -#define dfObjectNone 0x0200 // Objekte nicht anzeigen -#define dfNoteMark 0x0400 // Notizanzeiger -#define dfProtectMark 0x0800 // Schutzanzeiger +#define dfSyntax 0x0020 // Syntax Highlighting +#define dfPrintPage 0x0040 // Druckbildansicht (Dummy) +#define dfObjectAll 0x0080 // Objekte anzeigen +#define dfObjectFrame 0x0100 // Objekte als Platzhalter +#define dfObjectNone 0x0200 // Objekte nicht anzeigen +#define dfNoteMark 0x0400 // Notizanzeiger +#define dfProtectMark 0x0800 // Schutzanzeiger // Objekt Typen -#define otNone 0 // s.u. -#define otOle 1 -#define otImage 2 -#define otChart 3 +#define otNone 0 // s.u. +#define otOle 1 +#define otImage 2 +#define otChart 3 // Grafik Typen -#define gtNone 0 // Kann nicht vorkommen -#define gtOle 1 // Ole 1.0 Objekt -#define gtImage 2 // Image (Bitmap oder Metafile) -#define gtChart 3 // Chart +#define gtNone 0 // Kann nicht vorkommen +#define gtOle 1 // Ole 1.0 Objekt +#define gtImage 2 // Image (Bitmap oder Metafile) +#define gtChart 3 // Chart // Datum/Uhrzeit struct Sc10DateTime { - USHORT Year; - USHORT Month; - USHORT Day; - USHORT Hour; - USHORT Min; - USHORT Sec; + USHORT Year; + USHORT Month; + USHORT Day; + USHORT Hour; + USHORT Min; + USHORT Sec; }; // ZahlenFormate struct Sc10ValueFormat { - BYTE Format; // Zahl, Waehrung, Prozent etc. - BYTE Info; // Anzahl Nachkommastellen, Anzahl Stellen, bzw. Datums/Zeitformat + BYTE Format; // Zahl, Waehrung, Prozent etc. + BYTE Info; // Anzahl Nachkommastellen, Anzahl Stellen, bzw. Datums/Zeitformat }; // Fontbeschreibung struct Sc10LogFont { - INT16 lfHeight; - INT16 lfWidth; - INT16 lfEscapement; - INT16 lfOrientation; - INT16 lfWeight; - BYTE lfItalic; - BYTE lfUnderline; - BYTE lfStrikeOut; - BYTE lfCharSet; - BYTE lfOutPrecision; - BYTE lfClipPrecision; - BYTE lfQuality; - BYTE lfPitchAndFamily; - sal_Char lfFaceName[32]; + INT16 lfHeight; + INT16 lfWidth; + INT16 lfEscapement; + INT16 lfOrientation; + INT16 lfWeight; + BYTE lfItalic; + BYTE lfUnderline; + BYTE lfStrikeOut; + BYTE lfCharSet; + BYTE lfOutPrecision; + BYTE lfClipPrecision; + BYTE lfQuality; + BYTE lfPitchAndFamily; + sal_Char lfFaceName[32]; int operator==( const Sc10LogFont& rData ) const; }; @@ -227,69 +227,69 @@ struct Sc10LogFont // RGB-Frabwerte struct Sc10Color { - BYTE Dummy; - BYTE Blue; - BYTE Green; - BYTE Red; + BYTE Dummy; + BYTE Blue; + BYTE Green; + BYTE Red; int operator==( const Sc10Color& rColor ) const; }; // Blockbeschreibung struct Sc10BlockRect { - INT16 x1; - INT16 y1; - INT16 x2; - INT16 y2; + INT16 x1; + INT16 y1; + INT16 x2; + INT16 y2; }; // Datenbank-Bereich struct Sc10DataBaseRec { - sal_Char Name[32]; - INT16 Tab; - Sc10BlockRect Block; - BYTE RowHeader; - INT16 SortField0; - BYTE SortUpOrder0; - INT16 SortField1; - BYTE SortUpOrder1; - INT16 SortField2; - BYTE SortUpOrder2; - BYTE IncludeFormat; - INT16 QueryField0; - INT16 QueryOp0; - BYTE QueryByString0; - sal_Char QueryString0[64]; - double QueryValue0; - INT16 QueryConnect1; - INT16 QueryField1; - INT16 QueryOp1; - BYTE QueryByString1; - sal_Char QueryString1[64]; - double QueryValue1; - INT16 QueryConnect2; - INT16 QueryField2; - INT16 QueryOp2; - BYTE QueryByString2; - sal_Char QueryString2[64]; - double QueryValue2; + sal_Char Name[32]; + INT16 Tab; + Sc10BlockRect Block; + BYTE RowHeader; + INT16 SortField0; + BYTE SortUpOrder0; + INT16 SortField1; + BYTE SortUpOrder1; + INT16 SortField2; + BYTE SortUpOrder2; + BYTE IncludeFormat; + INT16 QueryField0; + INT16 QueryOp0; + BYTE QueryByString0; + sal_Char QueryString0[64]; + double QueryValue0; + INT16 QueryConnect1; + INT16 QueryField1; + INT16 QueryOp1; + BYTE QueryByString1; + sal_Char QueryString1[64]; + double QueryValue1; + INT16 QueryConnect2; + INT16 QueryField2; + INT16 QueryOp2; + BYTE QueryByString2; + sal_Char QueryString2[64]; + double QueryValue2; }; // Kopf/Fusszeilen-Beschreibung struct Sc10HeadFootLine { - sal_Char Title[128]; - Sc10LogFont LogFont; - BYTE HorJustify; - BYTE VerJustify; - USHORT Raster; - USHORT Frame; - Sc10Color TextColor; - Sc10Color BackColor; - Sc10Color RasterColor; - USHORT FrameColor; // Nibble Codierte Farben link oben rechts unten - USHORT Reserved; + sal_Char Title[128]; + Sc10LogFont LogFont; + BYTE HorJustify; + BYTE VerJustify; + USHORT Raster; + USHORT Frame; + Sc10Color TextColor; + Sc10Color BackColor; + Sc10Color RasterColor; + USHORT FrameColor; // Nibble Codierte Farben link oben rechts unten + USHORT Reserved; int operator==( const Sc10HeadFootLine& rData ) const; }; @@ -297,34 +297,34 @@ struct Sc10HeadFootLine // Seitenformat struct Sc10PageFormat { - Sc10HeadFootLine HeadLine; - Sc10HeadFootLine FootLine; - INT16 Orientation; - INT16 Width; - INT16 Height; - INT16 NonPrintableX; - INT16 NonPrintableY; - INT16 Left; - INT16 Top; - INT16 Right; - INT16 Bottom; - INT16 Head; - INT16 Foot; - BYTE HorCenter; - BYTE VerCenter; - BYTE PrintGrid; - BYTE PrintColRow; - BYTE PrintNote; - BYTE TopBottomDir; - sal_Char PrintAreaName[32]; - Sc10BlockRect PrintArea; - sal_Char PrnZoom[6]; // Pascal 6 Byte Realzahl - USHORT FirstPageNo; - INT16 RowRepeatStart; - INT16 RowRepeatEnd; - INT16 ColRepeatStart; - INT16 ColRepeatEnd; - sal_Char Reserved[26]; + Sc10HeadFootLine HeadLine; + Sc10HeadFootLine FootLine; + INT16 Orientation; + INT16 Width; + INT16 Height; + INT16 NonPrintableX; + INT16 NonPrintableY; + INT16 Left; + INT16 Top; + INT16 Right; + INT16 Bottom; + INT16 Head; + INT16 Foot; + BYTE HorCenter; + BYTE VerCenter; + BYTE PrintGrid; + BYTE PrintColRow; + BYTE PrintNote; + BYTE TopBottomDir; + sal_Char PrintAreaName[32]; + Sc10BlockRect PrintArea; + sal_Char PrnZoom[6]; // Pascal 6 Byte Realzahl + USHORT FirstPageNo; + INT16 RowRepeatStart; + INT16 RowRepeatEnd; + INT16 ColRepeatStart; + INT16 ColRepeatEnd; + sal_Char Reserved[26]; int operator==( const Sc10PageFormat& rData ) const; }; @@ -332,89 +332,89 @@ struct Sc10PageFormat // Tabellenschutz struct Sc10TableProtect { - sal_Char PassWord[16]; - USHORT Flags; - BYTE Protect; + sal_Char PassWord[16]; + USHORT Flags; + BYTE Protect; }; // Documentschutz struct Sc10SheetProtect { - sal_Char PassWord[16]; - USHORT Flags; - BYTE Protect; + sal_Char PassWord[16]; + USHORT Flags; + BYTE Protect; }; // Dateikopf StarCalc 1.0 Datei struct Sc10FileHeader { - sal_Char CopyRight[30]; - USHORT Version; - sal_Char Reserved[32]; + sal_Char CopyRight[30]; + USHORT Version; + sal_Char Reserved[32]; }; // Benutzer-Definierte Datei-Beschreibung struct Sc10FileInfo { - sal_Char Title[64]; - sal_Char Thema[64]; - sal_Char Keys[64]; - sal_Char Note[256]; - sal_Char InfoLabel0[16]; - sal_Char InfoLabel1[16]; - sal_Char InfoLabel2[16]; - sal_Char InfoLabel3[16]; - sal_Char Info0[32]; - sal_Char Info1[32]; - sal_Char Info2[32]; - sal_Char Info3[32]; - sal_Char CreateAuthor[64]; - sal_Char ChangeAuthor[64]; - sal_Char PrintAuthor[64]; - Sc10DateTime CreateDate; - Sc10DateTime ChangeDate; - Sc10DateTime PrintDate; - sal_uInt32 PageCount; - sal_uInt32 ChartCount; - sal_uInt32 PictureCount; - sal_uInt32 GraphCount; - sal_uInt32 OleCount; - sal_uInt32 NoteCount; - sal_uInt32 TextCellCount; - sal_uInt32 ValueCellCount; - sal_uInt32 FormulaCellCount; - sal_uInt32 CellCount; - sal_Char Reserved[52]; + sal_Char Title[64]; + sal_Char Thema[64]; + sal_Char Keys[64]; + sal_Char Note[256]; + sal_Char InfoLabel0[16]; + sal_Char InfoLabel1[16]; + sal_Char InfoLabel2[16]; + sal_Char InfoLabel3[16]; + sal_Char Info0[32]; + sal_Char Info1[32]; + sal_Char Info2[32]; + sal_Char Info3[32]; + sal_Char CreateAuthor[64]; + sal_Char ChangeAuthor[64]; + sal_Char PrintAuthor[64]; + Sc10DateTime CreateDate; + Sc10DateTime ChangeDate; + Sc10DateTime PrintDate; + sal_uInt32 PageCount; + sal_uInt32 ChartCount; + sal_uInt32 PictureCount; + sal_uInt32 GraphCount; + sal_uInt32 OleCount; + sal_uInt32 NoteCount; + sal_uInt32 TextCellCount; + sal_uInt32 ValueCellCount; + sal_uInt32 FormulaCellCount; + sal_uInt32 CellCount; + sal_Char Reserved[52]; }; // Letze Cursorposition struct Sc10EditStateInfo { // Cursor Position - USHORT CarretX; - USHORT CarretY; - USHORT CarretZ; + USHORT CarretX; + USHORT CarretY; + USHORT CarretZ; // Linke obere Ecke der Tabelle im Fenster - USHORT DeltaX; - USHORT DeltaY; - USHORT DeltaZ; + USHORT DeltaX; + USHORT DeltaY; + USHORT DeltaZ; // Ueberfluessig in StarCalc 3.0 - BYTE DataBaseMode; - sal_Char Reserved[51]; + BYTE DataBaseMode; + sal_Char Reserved[51]; }; // Attribut-Eintrag struct Sc10ColData { - USHORT Row; - USHORT Value; + USHORT Row; + USHORT Value; }; // ZellAttribut-Beschreibung struct Sc10ColAttr { - USHORT Count; - Sc10ColData* pData; + USHORT Count; + Sc10ColData* pData; Sc10ColAttr() : pData(NULL) {} }; @@ -422,115 +422,115 @@ struct Sc10ColAttr // GraphHeader struct Sc10GraphHeader { - BYTE Typ; // Typ der Grafik (Ole-Objekt, Image (Bitmap oder MetaFile), Chart-Object) - INT16 CarretX; // ZellPosition der Grafik - INT16 CarretY; - INT16 CarretZ; - INT32 x; // x,y Abstand zum Zellrand in Pixel (Pixel weil ich Grafiken in Fenstern ablege) - INT32 y; - INT32 w; // w,h Breite und Hoehe in Pixel - INT32 h; - BYTE IsRelPos; // Ist die Position relativ zur Zelle oder absolute in der Tabelle - BYTE DoPrint; // Soll die Grafik ausgedruckt werden - USHORT FrameType; // Art der Umrandung um die Grafik (Keine, Einfach, Doppelt, Einfach Dick, Doppelt Dick) - BYTE IsTransparent; // Soll der Hintergrund gezeichnet werden - Sc10Color FrameColor; // Umrandungsfarbe als RGB-Wert - Sc10Color BackColor; // Hintergrundfarbe als RGB-Wert - sal_Char Reserved[32]; // Na was wohl + BYTE Typ; // Typ der Grafik (Ole-Objekt, Image (Bitmap oder MetaFile), Chart-Object) + INT16 CarretX; // ZellPosition der Grafik + INT16 CarretY; + INT16 CarretZ; + INT32 x; // x,y Abstand zum Zellrand in Pixel (Pixel weil ich Grafiken in Fenstern ablege) + INT32 y; + INT32 w; // w,h Breite und Hoehe in Pixel + INT32 h; + BYTE IsRelPos; // Ist die Position relativ zur Zelle oder absolute in der Tabelle + BYTE DoPrint; // Soll die Grafik ausgedruckt werden + USHORT FrameType; // Art der Umrandung um die Grafik (Keine, Einfach, Doppelt, Einfach Dick, Doppelt Dick) + BYTE IsTransparent; // Soll der Hintergrund gezeichnet werden + Sc10Color FrameColor; // Umrandungsfarbe als RGB-Wert + Sc10Color BackColor; // Hintergrundfarbe als RGB-Wert + sal_Char Reserved[32]; // Na was wohl }; // ImageHeader struct Sc10ImageHeader { sal_Char FileName[128]; // Dateiname des urspruenglich eingefuegten Bildes - INT16 Typ; // Typ der Grafik (Bitmap oder Metafile) - BYTE Linked; // Kann nicht vorkommen - INT16 x1; // Urspruengliche Groesse der Grafik (nur fuer Metafiles) - INT16 y1; - INT16 x2; - INT16 y2; - sal_uInt32 Size; // Groesse der Grafik in BYTES + INT16 Typ; // Typ der Grafik (Bitmap oder Metafile) + BYTE Linked; // Kann nicht vorkommen + INT16 x1; // Urspruengliche Groesse der Grafik (nur fuer Metafiles) + INT16 y1; + INT16 x2; + INT16 y2; + sal_uInt32 Size; // Groesse der Grafik in BYTES }; // ChartHeader struct Sc10ChartHeader { - INT16 MM; // Meatfile Struktur MapMode, Breite, Hoehe - INT16 xExt; - INT16 yExt; - sal_uInt32 Size; // Groesse der Grafik in BYTES + INT16 MM; // Meatfile Struktur MapMode, Breite, Hoehe + INT16 xExt; + INT16 yExt; + sal_uInt32 Size; // Groesse der Grafik in BYTES }; // ChartSheetData struct Sc10ChartSheetData { - BYTE HasTitle; // Hat das Chart Daten aus der Tabell fuer einen Titel - INT16 TitleX; // Zellposition des Titels - INT16 TitleY; - BYTE HasSubTitle; // Hat das Chart Daten aus der Tabell fuer einen Untertitel - INT16 SubTitleX; // Zellposition des Untertitels - INT16 SubTitleY; - BYTE HasLeftTitle; // Hat das Chart Daten aus der Tabelle fuer einen Linken-Titel - INT16 LeftTitleX; // Zellposition des Linken-Titels - INT16 LeftTitleY; - BYTE HasLegend; // Hat das Chart Daten aus der Tabelle fuer eine Legende - INT16 LegendX1; // Zellen der Legende - INT16 LegendY1; - INT16 LegendX2; - INT16 LegendY2; - BYTE HasLabel; // Hat das Chart Daten aus der Tabelle fuer die Achsbeschriftung - INT16 LabelX1; // Zellen der Achsbeschriftung - INT16 LabelY1; - INT16 LabelX2; - INT16 LabelY2; - INT16 DataX1; // Zellen der Daten - INT16 DataY1; - INT16 DataX2; - INT16 DataY2; - sal_Char Reserved[64]; + BYTE HasTitle; // Hat das Chart Daten aus der Tabell fuer einen Titel + INT16 TitleX; // Zellposition des Titels + INT16 TitleY; + BYTE HasSubTitle; // Hat das Chart Daten aus der Tabell fuer einen Untertitel + INT16 SubTitleX; // Zellposition des Untertitels + INT16 SubTitleY; + BYTE HasLeftTitle; // Hat das Chart Daten aus der Tabelle fuer einen Linken-Titel + INT16 LeftTitleX; // Zellposition des Linken-Titels + INT16 LeftTitleY; + BYTE HasLegend; // Hat das Chart Daten aus der Tabelle fuer eine Legende + INT16 LegendX1; // Zellen der Legende + INT16 LegendY1; + INT16 LegendX2; + INT16 LegendY2; + BYTE HasLabel; // Hat das Chart Daten aus der Tabelle fuer die Achsbeschriftung + INT16 LabelX1; // Zellen der Achsbeschriftung + INT16 LabelY1; + INT16 LabelX2; + INT16 LabelY2; + INT16 DataX1; // Zellen der Daten + INT16 DataY1; + INT16 DataX2; + INT16 DataY2; + sal_Char Reserved[64]; }; -#define AGPie2D 1 // Pie Chart 2D -#define AGPie3D 2 // Pie Chart 3D -#define AGBar2D 3 // Bar Chart 2D -#define AGBar3D 4 // Bar Chart 3D -#define AGGantt 5 // Gantt Diagramm -#define AGLine 6 // Line Chart -#define AGLogLine 7 // Logarythmic-Coordinate Chart -#define AGArea 8 // Area Chart -#define AGHLC 11 // High-Low-Close Chart -#define AGPolar 10 // Polar-Coordinate Chart +#define AGPie2D 1 // Pie Chart 2D +#define AGPie3D 2 // Pie Chart 3D +#define AGBar2D 3 // Bar Chart 2D +#define AGBar3D 4 // Bar Chart 3D +#define AGGantt 5 // Gantt Diagramm +#define AGLine 6 // Line Chart +#define AGLogLine 7 // Logarythmic-Coordinate Chart +#define AGArea 8 // Area Chart +#define AGHLC 11 // High-Low-Close Chart +#define AGPolar 10 // Polar-Coordinate Chart typedef sal_Char Sc10ChartText[30]; struct Sc10ChartTypeData { - INT16 NumSets; - INT16 NumPoints; - INT16 DrawMode; - INT16 GraphType; - INT16 GraphStyle; - sal_Char GraphTitle[80]; - sal_Char BottomTitle[80]; - INT16 SymbolData[256]; - INT16 ColorData[256]; - INT16 ThickLines[256]; - INT16 PatternData[256]; - INT16 LinePatternData[256]; - INT16 NumGraphStyles[11]; - INT16 ShowLegend; - Sc10ChartText LegendText[256]; - INT16 ExplodePie; - INT16 FontUse; - INT16 FontFamily[5]; - INT16 FontStyle[5]; - INT16 FontSize[5]; - INT16 GridStyle; - INT16 Labels; - INT16 LabelEvery; - Sc10ChartText LabelText[50]; - sal_Char LeftTitle[80]; - sal_Char Reserved[4646]; + INT16 NumSets; + INT16 NumPoints; + INT16 DrawMode; + INT16 GraphType; + INT16 GraphStyle; + sal_Char GraphTitle[80]; + sal_Char BottomTitle[80]; + INT16 SymbolData[256]; + INT16 ColorData[256]; + INT16 ThickLines[256]; + INT16 PatternData[256]; + INT16 LinePatternData[256]; + INT16 NumGraphStyles[11]; + INT16 ShowLegend; + Sc10ChartText LegendText[256]; + INT16 ExplodePie; + INT16 FontUse; + INT16 FontFamily[5]; + INT16 FontStyle[5]; + INT16 FontSize[5]; + INT16 GridStyle; + INT16 Labels; + INT16 LabelEvery; + Sc10ChartText LabelText[50]; + sal_Char LeftTitle[80]; + sal_Char Reserved[4646]; }; @@ -538,10 +538,10 @@ struct Sc10ChartTypeData class Sc10FontData : public ScDataObject { public: - INT16 Height; - BYTE CharSet; - BYTE PitchAndFamily; - sal_Char FaceName[32]; + INT16 Height; + BYTE CharSet; + BYTE PitchAndFamily; + sal_Char FaceName[32]; Sc10FontData( const Sc10FontData& rData ) : ScDataObject( rData ), @@ -553,7 +553,7 @@ public: FaceName[sizeof(FaceName)-1] = 0; } Sc10FontData( SvStream& rStream ); - virtual ScDataObject* Clone() const { return new Sc10FontData(*this); } + virtual ScDataObject* Clone() const { return new Sc10FontData(*this); } }; @@ -564,8 +564,8 @@ protected: ULONG nError; public: Sc10FontCollection( SvStream& rStream ); - ULONG GetError() { return nError; } - Sc10FontData* At(USHORT nIndex) { return (Sc10FontData*)ScCollection::At(nIndex); } + ULONG GetError() { return nError; } + Sc10FontData* At(USHORT nIndex) { return (Sc10FontData*)ScCollection::At(nIndex); } private: using ScCollection::At; }; @@ -575,9 +575,9 @@ private: class Sc10NameData : public ScDataObject { public : - sal_Char Name[32]; - sal_Char Reference[64]; - sal_Char Reserved[12]; + sal_Char Name[32]; + sal_Char Reference[64]; + sal_Char Reserved[12]; Sc10NameData(const Sc10NameData& rData) : ScDataObject( rData ) @@ -589,7 +589,7 @@ public : memcpy(Reserved, rData.Reserved, sizeof(Reserved)); } Sc10NameData(SvStream& rStream); - virtual ScDataObject* Clone() const { return new Sc10NameData(*this); } + virtual ScDataObject* Clone() const { return new Sc10NameData(*this); } }; @@ -597,11 +597,11 @@ public : class Sc10NameCollection : public ScCollection { protected: - ULONG nError; + ULONG nError; public: Sc10NameCollection(SvStream& rStream); -ULONG GetError() { return nError; } -Sc10NameData* At(USHORT nIndex) { return (Sc10NameData*)ScCollection::At(nIndex); } +ULONG GetError() { return nError; } +Sc10NameData* At(USHORT nIndex) { return (Sc10NameData*)ScCollection::At(nIndex); } private: using ScCollection::At; }; @@ -611,18 +611,18 @@ private: class Sc10PatternData : public ScDataObject { public: - sal_Char Name[32]; - Sc10ValueFormat ValueFormat; - Sc10LogFont LogFont; - USHORT Attr; - USHORT Justify; - USHORT Frame; - USHORT Raster; - USHORT nColor; - USHORT FrameColor; - USHORT Flags; - USHORT FormatFlags; - sal_Char Reserved[8]; + sal_Char Name[32]; + Sc10ValueFormat ValueFormat; + Sc10LogFont LogFont; + USHORT Attr; + USHORT Justify; + USHORT Frame; + USHORT Raster; + USHORT nColor; + USHORT FrameColor; + USHORT Flags; + USHORT FormatFlags; + sal_Char Reserved[8]; Sc10PatternData(const Sc10PatternData& rData) : ScDataObject( rData ) @@ -642,7 +642,7 @@ public: memcpy(Reserved, rData.Reserved, sizeof(Reserved)); } Sc10PatternData(SvStream& rStream); -virtual ScDataObject* Clone() const { return new Sc10PatternData(*this); } +virtual ScDataObject* Clone() const { return new Sc10PatternData(*this); } }; @@ -650,11 +650,11 @@ virtual ScDataObject* Clone() const { return new Sc10PatternData(*this); } class Sc10PatternCollection : public ScCollection { protected: - ULONG nError; + ULONG nError; public: Sc10PatternCollection(SvStream& rStream); - ULONG GetError() { return nError; } - Sc10PatternData* At(USHORT nIndex) { return (Sc10PatternData*)ScCollection::At(nIndex); } + ULONG GetError() { return nError; } + Sc10PatternData* At(USHORT nIndex) { return (Sc10PatternData*)ScCollection::At(nIndex); } private: using ScCollection::At; }; @@ -664,7 +664,7 @@ private: class Sc10DataBaseData : public ScDataObject { public: - Sc10DataBaseRec DataBaseRec; + Sc10DataBaseRec DataBaseRec; Sc10DataBaseData(const Sc10DataBaseData& rData) : ScDataObject( rData ) @@ -672,7 +672,7 @@ public: memcpy(&DataBaseRec, &rData.DataBaseRec, sizeof(DataBaseRec)); } Sc10DataBaseData(SvStream& rStream); -virtual ScDataObject* Clone() const { return new Sc10DataBaseData(*this); } +virtual ScDataObject* Clone() const { return new Sc10DataBaseData(*this); } }; @@ -680,12 +680,12 @@ virtual ScDataObject* Clone() const { return new Sc10DataBaseData(*this); class Sc10DataBaseCollection : public ScCollection { protected: - ULONG nError; - sal_Char ActName[32]; + ULONG nError; + sal_Char ActName[32]; public: Sc10DataBaseCollection(SvStream& rStream); - ULONG GetError() { return nError; } - Sc10DataBaseData* At(USHORT nIndex) { return (Sc10DataBaseData*)ScCollection::At(nIndex); } + ULONG GetError() { return nError; } + Sc10DataBaseData* At(USHORT nIndex) { return (Sc10DataBaseData*)ScCollection::At(nIndex); } private: using ScCollection::At; }; @@ -694,11 +694,11 @@ private: class Sc10PageData : public ScDataObject { public: - Sc10PageFormat aPageFormat; + Sc10PageFormat aPageFormat; Sc10PageData( const Sc10PageFormat& rFormat ) : aPageFormat(rFormat) {} - int operator==( const Sc10PageData& rData ) const + int operator==( const Sc10PageData& rData ) const { return aPageFormat == rData.aPageFormat; } - virtual ScDataObject* Clone() const; + virtual ScDataObject* Clone() const; }; // Seitenformat-Collection @@ -706,9 +706,9 @@ class Sc10PageCollection : public ScCollection { public: Sc10PageCollection() : ScCollection(1,1) {}; - Sc10PageData* At(USHORT nIndex) { return (Sc10PageData*)ScCollection::At(nIndex); } + Sc10PageData* At(USHORT nIndex) { return (Sc10PageData*)ScCollection::At(nIndex); } USHORT InsertFormat( const Sc10PageFormat& rData ); - void PutToDoc( ScDocument* pDoc ); + void PutToDoc( ScDocument* pDoc ); private: using ScCollection::At; }; @@ -719,46 +719,46 @@ class ScfStreamProgressBar; // Import-Klasse class Sc10Import { - SvStream& rStream; - ScDocument* pDoc; - Sc10Color TextPalette[16]; - Sc10Color BackPalette[16]; - Sc10Color RasterPalette[16]; - Sc10Color FramePalette[16]; - Sc10SheetProtect SheetProtect; - Sc10FontCollection* pFontCollection; - Sc10NameCollection* pNameCollection; - Sc10PatternCollection* pPatternCollection; - Sc10DataBaseCollection* pDataBaseCollection; + SvStream& rStream; + ScDocument* pDoc; + Sc10Color TextPalette[16]; + Sc10Color BackPalette[16]; + Sc10Color RasterPalette[16]; + Sc10Color FramePalette[16]; + Sc10SheetProtect SheetProtect; + Sc10FontCollection* pFontCollection; + Sc10NameCollection* pNameCollection; + Sc10PatternCollection* pPatternCollection; + Sc10DataBaseCollection* pDataBaseCollection; ULONG nError; - INT16 TabCount; - SCTAB nShowTab; - ScViewOptions aSc30ViewOpt; + INT16 TabCount; + SCTAB nShowTab; + ScViewOptions aSc30ViewOpt; ScfStreamProgressBar* pPrgrsBar; public: Sc10Import( SvStream& rStr, ScDocument* pDocument ); ~Sc10Import(); - ULONG Import(); - void LoadFileHeader(); - void LoadFileInfo(); - void LoadEditStateInfo(); - void LoadProtect(); - void LoadViewColRowBar(); - void LoadScrZoom(); - void LoadPalette(); - void LoadFontCollection(); - void LoadNameCollection(); - void ImportNameCollection(); - void LoadPatternCollection(); - void LoadDataBaseCollection(); - void LoadTables(); - void LoadCol(SCCOL Col, SCTAB Tab); - void LoadColAttr(SCCOL Col, SCTAB Tab); - void LoadAttr(Sc10ColAttr& rAttr); - void ChangeFormat(USHORT nFormat, USHORT nInfo, ULONG& nKey); - void LoadObjects(); + ULONG Import(); + void LoadFileHeader(); + void LoadFileInfo(); + void LoadEditStateInfo(); + void LoadProtect(); + void LoadViewColRowBar(); + void LoadScrZoom(); + void LoadPalette(); + void LoadFontCollection(); + void LoadNameCollection(); + void ImportNameCollection(); + void LoadPatternCollection(); + void LoadDataBaseCollection(); + void LoadTables(); + void LoadCol(SCCOL Col, SCTAB Tab); + void LoadColAttr(SCCOL Col, SCTAB Tab); + void LoadAttr(Sc10ColAttr& rAttr); + void ChangeFormat(USHORT nFormat, USHORT nInfo, ULONG& nKey); + void LoadObjects(); }; #endif diff --git a/sc/source/filter/inc/scfobj.hxx b/sc/source/filter/inc/scfobj.hxx index a83c2ea0a1d5..84b7f8be830d 100644 --- a/sc/source/filter/inc/scfobj.hxx +++ b/sc/source/filter/inc/scfobj.hxx @@ -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 diff --git a/sc/source/filter/inc/scmem.h b/sc/source/filter/inc/scmem.h index 029351639f72..96c57585e6f6 100644 --- a/sc/source/filter/inc/scmem.h +++ b/sc/source/filter/inc/scmem.h @@ -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 diff --git a/sc/source/filter/inc/tokstack.hxx b/sc/source/filter/inc/tokstack.hxx index 0fc780bab344..eb4ac68a970b 100644 --- a/sc/source/filter/inc/tokstack.hxx +++ b/sc/source/filter/inc/tokstack.hxx @@ -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 @@ -42,21 +42,21 @@ typedef OpCode DefTokenId; //typedef UINT16 TokenId; struct TokenId { - UINT16 nId; + UINT16 nId; TokenId() : nId( 0 ) {} TokenId( UINT16 n ) : nId( n ) {} TokenId( const TokenId& r ) : nId( r.nId ) {} - inline TokenId& operator =( const TokenId& r ) { nId = r.nId; return *this; } - inline TokenId& operator =( UINT16 n ) { nId = n; return *this; } - inline operator UINT16&() { return nId; } - inline operator const UINT16&() const { return nId; } - inline BOOL operator <( UINT16 n ) const { return nId < n; } - inline BOOL operator >( UINT16 n ) const { return nId > n; } - inline BOOL operator <=( UINT16 n ) const { return nId <= n; } - inline BOOL operator >=( UINT16 n ) const { return nId >= n; } - inline BOOL operator ==( UINT16 n ) const { return nId == n; } - inline BOOL operator !=( UINT16 n ) const { return nId != n; } + inline TokenId& operator =( const TokenId& r ) { nId = r.nId; return *this; } + inline TokenId& operator =( UINT16 n ) { nId = n; return *this; } + inline operator UINT16&() { return nId; } + inline operator const UINT16&() const { return nId; } + inline BOOL operator <( UINT16 n ) const { return nId < n; } + inline BOOL operator >( UINT16 n ) const { return nId > n; } + inline BOOL operator <=( UINT16 n ) const { return nId <= n; } + inline BOOL operator >=( UINT16 n ) const { return nId >= n; } + inline BOOL operator ==( UINT16 n ) const { return nId == n; } + inline BOOL operator !=( UINT16 n ) const { return nId != n; } }; @@ -68,20 +68,20 @@ class ScToken; enum E_TYPE { - T_Id, // Id-Folge - T_Str, // String - T_D, // Double + T_Id, // Id-Folge + T_Str, // String + T_D, // Double T_Err, // Error code - T_RefC, // Cell Reference - T_RefA, // Area Reference - T_RN, // Range Name - T_Ext, // irgendwas Unbekanntes mit Funktionsnamen - T_Nlf, // token for natural language formula - T_Matrix, // token for inline arrays + T_RefC, // Cell Reference + T_RefA, // Area Reference + T_RN, // Range Name + T_Ext, // irgendwas Unbekanntes mit Funktionsnamen + T_Nlf, // token for natural language formula + T_Matrix, // token for inline arrays T_ExtName, // token for external names T_ExtRefC, T_ExtRefA, - T_Error // fuer Abfrage im Fehlerfall + T_Error // fuer Abfrage im Fehlerfall }; @@ -92,50 +92,50 @@ class TokenPool // !ACHTUNG!: externe Id-Basis ist 1, interne 0! // Ausgabe Id = 0 -> Fehlerfall private: - String** ppP_Str; // Pool fuer Strings - UINT16 nP_Str; // ...mit Groesse - UINT16 nP_StrAkt; // ...und Schreibmarke + String** ppP_Str; // Pool fuer Strings + UINT16 nP_Str; // ...mit Groesse + UINT16 nP_StrAkt; // ...und Schreibmarke - double* pP_Dbl; // Pool fuer Doubles - UINT16 nP_Dbl; - UINT16 nP_DblAkt; + double* pP_Dbl; // Pool fuer Doubles + UINT16 nP_Dbl; + UINT16 nP_DblAkt; USHORT* pP_Err; // Pool for error codes UINT16 nP_Err; UINT16 nP_ErrAkt; - ScSingleRefData** ppP_RefTr; // Pool fuer Referenzen - UINT16 nP_RefTr; - UINT16 nP_RefTrAkt; + ScSingleRefData** ppP_RefTr; // Pool fuer Referenzen + UINT16 nP_RefTr; + UINT16 nP_RefTrAkt; - UINT16* pP_Id; // Pool fuer Id-Folgen - UINT16 nP_Id; - UINT16 nP_IdAkt; - UINT16 nP_IdLast; // letzter Folgen-Beginn + UINT16* pP_Id; // Pool fuer Id-Folgen + UINT16 nP_Id; + UINT16 nP_IdAkt; + UINT16 nP_IdLast; // letzter Folgen-Beginn - struct EXTCONT + struct EXTCONT { - DefTokenId eId; - String aText; + DefTokenId eId; + String aText; EXTCONT( const DefTokenId e, const String& r ) : eId( e ), aText( r ){} }; - EXTCONT** ppP_Ext; - UINT16 nP_Ext; - UINT16 nP_ExtAkt; + EXTCONT** ppP_Ext; + UINT16 nP_Ext; + UINT16 nP_ExtAkt; - struct NLFCONT + struct NLFCONT { - ScSingleRefData aRef; - NLFCONT( const ScSingleRefData& r ) : aRef( r ) {} + ScSingleRefData aRef; + NLFCONT( const ScSingleRefData& r ) : aRef( r ) {} }; - NLFCONT** ppP_Nlf; - UINT16 nP_Nlf; - UINT16 nP_NlfAkt; + NLFCONT** ppP_Nlf; + UINT16 nP_Nlf; + UINT16 nP_NlfAkt; - ScMatrix** ppP_Matrix; // Pool fuer Matricies - UINT16 nP_Matrix; - UINT16 nP_MatrixAkt; + ScMatrix** ppP_Matrix; // Pool fuer Matricies + UINT16 nP_Matrix; + UINT16 nP_MatrixAkt; /** for storage of external names */ struct ExtName @@ -149,7 +149,7 @@ class TokenPool struct ExtCellRef { sal_uInt16 mnFileId; - String maTabName; + String maTabName; ScSingleRefData maRef; }; ::std::vector<ExtCellRef> maExtCellRefs; @@ -158,66 +158,66 @@ class TokenPool struct ExtAreaRef { sal_uInt16 mnFileId; - String maTabName; + String maTabName; ScComplexRefData maRef; }; ::std::vector<ExtAreaRef> maExtAreaRefs; - UINT16* pElement; // Array mit Indizes fuer Elemente - E_TYPE* pType; // ...mit Typ-Info - UINT16* pSize; // ...mit Laengenangabe (Anz. UINT16) - UINT16 nElement; - UINT16 nElementAkt; + UINT16* pElement; // Array mit Indizes fuer Elemente + E_TYPE* pType; // ...mit Typ-Info + UINT16* pSize; // ...mit Laengenangabe (Anz. UINT16) + UINT16 nElement; + UINT16 nElementAkt; - static const UINT16 nScTokenOff;// Offset fuer SC-Token + static const UINT16 nScTokenOff;// Offset fuer SC-Token #ifdef DBG_UTIL - UINT16 nRek; // Rekursionszaehler + UINT16 nRek; // Rekursionszaehler #endif - ScTokenArray* pScToken; // Tokenbastler - - void GrowString( void ); - void GrowDouble( void ); - void GrowTripel( void ); - void GrowId( void ); - void GrowElement( void ); - void GrowExt( void ); - void GrowNlf( void ); - void GrowMatrix( void ); - void GetElement( const UINT16 nId ); - void GetElementRek( const UINT16 nId ); + ScTokenArray* pScToken; // Tokenbastler + + void GrowString( void ); + void GrowDouble( void ); + void GrowTripel( void ); + void GrowId( void ); + void GrowElement( void ); + void GrowExt( void ); + void GrowNlf( void ); + void GrowMatrix( void ); + void GetElement( const UINT16 nId ); + void GetElementRek( const UINT16 nId ); public: TokenPool( void ); ~TokenPool(); - inline TokenPool& operator <<( const TokenId nId ); - inline TokenPool& operator <<( const DefTokenId eId ); - inline TokenPool& operator <<( TokenStack& rStack ); - void operator >>( TokenId& rId ); - inline void operator >>( TokenStack& rStack ); - inline const TokenId Store( void ); - const TokenId Store( const double& rDouble ); + inline TokenPool& operator <<( const TokenId nId ); + inline TokenPool& operator <<( const DefTokenId eId ); + inline TokenPool& operator <<( TokenStack& rStack ); + void operator >>( TokenId& rId ); + inline void operator >>( TokenStack& rStack ); + inline const TokenId Store( void ); + const TokenId Store( const double& rDouble ); // nur fuer Range-Names - const TokenId Store( const UINT16 nIndex ); - inline const TokenId Store( const INT16 nWert ); - const TokenId Store( const String& rString ); - const TokenId Store( const ScSingleRefData& rTr ); - const TokenId Store( const ScComplexRefData& rTr ); + const TokenId Store( const UINT16 nIndex ); + inline const TokenId Store( const INT16 nWert ); + const TokenId Store( const String& rString ); + const TokenId Store( const ScSingleRefData& rTr ); + const TokenId Store( const ScComplexRefData& rTr ); - const TokenId Store( const DefTokenId eId, const String& rName ); + const TokenId Store( const DefTokenId eId, const String& rName ); // 4 externals (e.g. AddIns, Makros...) - const TokenId StoreNlf( const ScSingleRefData& rTr ); + const TokenId StoreNlf( const ScSingleRefData& rTr ); const TokenId StoreMatrix(); const TokenId StoreExtName( sal_uInt16 nFileId, const String& rName ); const TokenId StoreExtRef( sal_uInt16 nFileId, const String& rTabName, const ScSingleRefData& rRef ); const TokenId StoreExtRef( sal_uInt16 nFileId, const String& rTabName, const ScComplexRefData& rRef ); - inline const TokenId LastId( void ) const; - inline const ScTokenArray* operator []( const TokenId nId ); - void Reset( void ); - inline E_TYPE GetType( const TokenId& nId ) const; - BOOL IsSingleOp( const TokenId& nId, const DefTokenId eId ) const; + inline const TokenId LastId( void ) const; + inline const ScTokenArray* operator []( const TokenId nId ); + void Reset( void ); + inline E_TYPE GetType( const TokenId& nId ) const; + BOOL IsSingleOp( const TokenId& nId, const DefTokenId eId ) const; const String* GetExternal( const TokenId& nId ) const; - ScMatrix* GetMatrix( unsigned int n ) const; + ScMatrix* GetMatrix( unsigned int n ) const; }; @@ -225,22 +225,22 @@ class TokenPool class TokenStack // Stack fuer Token-Ids: Id 0 sollte reserviert bleiben als - // fehlerhafte Id, da z.B. Get() im Fehlerfall 0 liefert + // fehlerhafte Id, da z.B. Get() im Fehlerfall 0 liefert { private: - TokenId* pStack; // Stack als Array - UINT16 nPos; // Schreibmarke - UINT16 nSize; // Erster Index ausserhalb des Stacks + TokenId* pStack; // Stack als Array + UINT16 nPos; // Schreibmarke + UINT16 nSize; // Erster Index ausserhalb des Stacks public: TokenStack( UINT16 nNewSize = 1024 ); ~TokenStack(); - inline TokenStack& operator <<( const TokenId nNewId ); - inline void operator >>( TokenId &rId ); + inline TokenStack& operator <<( const TokenId nNewId ); + inline void operator >>( TokenId &rId ); - inline void Reset( void ); + inline void Reset( void ); inline bool HasMoreTokens() const { return nPos > 0; } - inline const TokenId Get( void ); + inline const TokenId Get( void ); }; @@ -301,7 +301,7 @@ inline void TokenStack::Reset( void ) inline TokenPool& TokenPool::operator <<( const TokenId nId ) { // POST: nId's werden hintereinander im Pool unter einer neuen Id - // abgelegt. Vorgang wird mit >> oder Store() abgeschlossen + // abgelegt. Vorgang wird mit >> oder Store() abgeschlossen // nId -> ( UINT16 ) nId - 1; DBG_ASSERT( ( UINT16 ) nId < nScTokenOff, "-TokenPool::operator <<: TokenId im DefToken-Bereich!" ); diff --git a/sc/source/filter/inc/tool.h b/sc/source/filter/inc/tool.h index c0c936798fa3..a5638c0cb91a 100644 --- a/sc/source/filter/inc/tool.h +++ b/sc/source/filter/inc/tool.h @@ -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 @@ -33,18 +33,18 @@ #include <document.hxx> // Defaultwerte -const BYTE nDezStd = 0; // Dezimalstellen fuer Standard-Zellen -const BYTE nDezFloat = 2; // " " Float-Zellen +const BYTE nDezStd = 0; // Dezimalstellen fuer Standard-Zellen +const BYTE nDezFloat = 2; // " " Float-Zellen -void PutFormString( SCCOL nCol, SCROW nRow, SCTAB nTab, sal_Char *pString ); +void PutFormString( SCCOL nCol, SCROW nRow, SCTAB nTab, sal_Char *pString ); -void SetFormat( SCCOL nCol, SCROW nRow, SCTAB nTab, BYTE nFormat, BYTE nSt ); +void SetFormat( SCCOL nCol, SCROW nRow, SCTAB nTab, BYTE nFormat, BYTE nSt ); -void InitPage( void ); +void InitPage( void ); -String DosToSystem( sal_Char *pSource ); +String DosToSystem( sal_Char *pSource ); -double SnumToDouble( INT16 nVal ); +double SnumToDouble( INT16 nVal ); double Snum32ToDouble( UINT32 nValue ); @@ -57,8 +57,8 @@ typedef UINT16 StampTyp; class FormIdent { private: - StampTyp nStamp; // Identifikations-Schluessel - SfxUInt32Item* pAttr; // zugehoeriges Attribut + StampTyp nStamp; // Identifikations-Schluessel + SfxUInt32Item* pAttr; // zugehoeriges Attribut public: FormIdent( void ) { @@ -78,27 +78,27 @@ public: pAttr = NULL; } - BOOL operator ==( const FormIdent& rComp ) const + BOOL operator ==( const FormIdent& rComp ) const { return ( nStamp == rComp.nStamp ); } - BOOL operator ==( const StampTyp& rStamp ) const + BOOL operator ==( const StampTyp& rStamp ) const { return ( nStamp == rStamp ); } - StampTyp GetStamp( void ) const + StampTyp GetStamp( void ) const { return nStamp; } - SfxUInt32Item* GetAttr( void ) + SfxUInt32Item* GetAttr( void ) { return pAttr; } - void SetStamp( BYTE nFormat, BYTE nSt ) + void SetStamp( BYTE nFormat, BYTE nSt ) { nStamp = MAKE_STAMP( nFormat, nSt ); } @@ -113,21 +113,21 @@ public: class FormCache { private: - FormIdent aIdents[ __nSize ]; //gepufferte Formate - BOOL bValid[ __nSize ]; - FormIdent aCompareIdent; // zum Vergleichen - BYTE nDefaultFormat; // Defaultformat der Datei - SvNumberFormatter* pFormTable; // Value-Format-Table-Anker - StampTyp nIndex; - LanguageType eLanguage; // Systemsprache - - SfxUInt32Item* NewAttr( BYTE nFormat, BYTE nSt ); + FormIdent aIdents[ __nSize ]; //gepufferte Formate + BOOL bValid[ __nSize ]; + FormIdent aCompareIdent; // zum Vergleichen + BYTE nDefaultFormat; // Defaultformat der Datei + SvNumberFormatter* pFormTable; // Value-Format-Table-Anker + StampTyp nIndex; + LanguageType eLanguage; // Systemsprache + + SfxUInt32Item* NewAttr( BYTE nFormat, BYTE nSt ); public: FormCache( ScDocument*, BYTE nNewDefaultFormat = 0xFF ); ~FormCache(); - inline const SfxUInt32Item* GetAttr( BYTE nFormat, BYTE nSt ); - void SetDefaultFormat( BYTE nD = 0xFF ) + inline const SfxUInt32Item* GetAttr( BYTE nFormat, BYTE nSt ); + void SetDefaultFormat( BYTE nD = 0xFF ) { nDefaultFormat = nD; } @@ -136,11 +136,11 @@ public: inline const SfxUInt32Item* FormCache::GetAttr( BYTE nFormat, BYTE nSt ) { - // PREC: nFormat = Lotus-Format-Byte - // nSt = Stellenzahl - // POST: return = zu nFormat und nSt passendes SC-Format - SfxUInt32Item* pAttr; - SfxUInt32Item* pRet; + // PREC: nFormat = Lotus-Format-Byte + // nSt = Stellenzahl + // POST: return = zu nFormat und nSt passendes SC-Format + SfxUInt32Item* pAttr; + SfxUInt32Item* pRet; aCompareIdent.SetStamp( nFormat, nSt ); nIndex = aCompareIdent.GetStamp(); diff --git a/sc/source/filter/inc/xcl97dum.hxx b/sc/source/filter/inc/xcl97dum.hxx index 771a3edadfed..f5ccbeb2be53 100644 --- a/sc/source/filter/inc/xcl97dum.hxx +++ b/sc/source/filter/inc/xcl97dum.hxx @@ -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 diff --git a/sc/source/filter/inc/xcl97esc.hxx b/sc/source/filter/inc/xcl97esc.hxx index d48933bdbb62..e82bf96596c5 100644 --- a/sc/source/filter/inc/xcl97esc.hxx +++ b/sc/source/filter/inc/xcl97esc.hxx @@ -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 @@ -114,11 +114,11 @@ public: virtual EscherExHostAppData* StartShape( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape>& rxShape, const Rectangle* pChildAnchor ); - virtual void EndShape( UINT16 nShapeType, UINT32 nShapeID ); - virtual EscherExHostAppData* EnterAdditionalTextGroup(); + virtual void EndShape( UINT16 nShapeType, UINT32 nShapeID ); + virtual EscherExHostAppData* EnterAdditionalTextGroup(); /// Flush and merge PicStream into EscherStream - void EndDocument(); + void EndDocument(); #if EXC_EXP_OCX_CTRL /** Creates an OCX form control OBJ record from the passed form control. @@ -162,13 +162,13 @@ private: class XclEscherHostAppData : public EscherExHostAppData { private: - BOOL bStackedGroup; + BOOL bStackedGroup; public: XclEscherHostAppData() : bStackedGroup( FALSE ) {} - inline void SetStackedGroup( BOOL b ) { bStackedGroup = b; } - inline BOOL IsStackedGroup() const { return bStackedGroup; } + inline void SetStackedGroup( BOOL b ) { bStackedGroup = b; } + inline BOOL IsStackedGroup() const { return bStackedGroup; } }; diff --git a/sc/source/filter/inc/xcl97rec.hxx b/sc/source/filter/inc/xcl97rec.hxx index f15ed6b635bb..eef1eb799ca2 100644 --- a/sc/source/filter/inc/xcl97rec.hxx +++ b/sc/source/filter/inc/xcl97rec.hxx @@ -83,12 +83,12 @@ protected: XclEscherEx& mrEscherEx; XclExpMsoDrawing* pMsodrawing; XclExpMsoDrawing* pClientTextbox; - XclTxo* pTxo; + XclTxo* pTxo; sal_uInt16 mnObjType; - UINT16 nObjId; - UINT16 nGrbit; + UINT16 nObjId; + UINT16 nGrbit; SCTAB mnScTab; - BOOL bFirstOnSheet; + BOOL bFirstOnSheet; bool mbOwnEscher; /// true = Escher part created on the fly. @@ -101,30 +101,30 @@ protected: // overwritten for writing MSODRAWING record virtual void WriteBody( XclExpStream& rStrm ); virtual void WriteSubRecs( XclExpStream& rStrm ); - void SaveTextRecs( XclExpStream& rStrm ); + void SaveTextRecs( XclExpStream& rStrm ); public: - virtual ~XclObj(); + virtual ~XclObj(); inline sal_uInt16 GetObjType() const { return mnObjType; } - inline void SetId( UINT16 nId ) { nObjId = nId; } + inline void SetId( UINT16 nId ) { nObjId = nId; } inline sal_uInt16 GetId() const { return nObjId; } inline void SetTab( SCTAB nScTab ) { mnScTab = nScTab; } inline SCTAB GetTab() const { return mnScTab; } - inline void SetLocked( BOOL b ) + inline void SetLocked( BOOL b ) { b ? nGrbit |= 0x0001 : nGrbit &= ~0x0001; } - inline void SetPrintable( BOOL b ) + inline void SetPrintable( BOOL b ) { b ? nGrbit |= 0x0010 : nGrbit &= ~0x0010; } - inline void SetAutoFill( BOOL b ) + inline void SetAutoFill( BOOL b ) { b ? nGrbit |= 0x2000 : nGrbit &= ~0x2000; } - inline void SetAutoLine( BOOL b ) + inline void SetAutoLine( BOOL b ) { b ? nGrbit |= 0x4000 : nGrbit &= ~0x4000; } // set corresponding Excel object type in OBJ/ftCmo - void SetEscherShapeType( UINT16 nType ); + void SetEscherShapeType( UINT16 nType ); inline void SetEscherShapeTypeGroup() { mnObjType = EXC_OBJTYPE_GROUP; } /** If set to true, this object has created its own escher data. @@ -142,7 +142,7 @@ public: //! actually writes ESCHER_ClientTextbox void SetText( const XclExpRoot& rRoot, const SdrTextObj& rObj ); - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ); }; // --- class XclObjComment ------------------------------------------- @@ -159,7 +159,7 @@ class XclObjComment : public XclObj public: XclObjComment( XclExpObjectManager& rObjMgr, const Rectangle& rRect, const EditTextObject& rEditObj, SdrCaptionObj* pCaption, bool bVisible, const ScAddress& rAddress, Rectangle &rFrom, Rectangle &To ); - virtual ~XclObjComment(); + virtual ~XclObjComment(); /** c'tor process for formatted text objects above . @descr used to construct the MSODRAWING Escher object properties. */ @@ -167,7 +167,7 @@ public: const Rectangle& rRect, SdrObject* pCaption, bool bVisible ); - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ); virtual void SaveXml( XclExpXmlStream& rStrm ); }; @@ -177,14 +177,14 @@ public: class XclObjDropDown : public XclObj { private: - BOOL bIsFiltered; + BOOL bIsFiltered; virtual void WriteSubRecs( XclExpStream& rStrm ); protected: public: XclObjDropDown( XclExpObjectManager& rObjMgr, const ScAddress& rPos, BOOL bFilt ); - virtual ~XclObjDropDown(); + virtual ~XclObjDropDown(); }; @@ -202,9 +202,9 @@ public: inline void SetHorAlign( sal_uInt8 nHorAlign ) { mnHorAlign = nHorAlign; } inline void SetVerAlign( sal_uInt8 nVerAlign ) { mnVerAlign = nVerAlign; } - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ); - virtual UINT16 GetNum() const; + virtual UINT16 GetNum() const; virtual sal_Size GetLen() const; private: @@ -224,16 +224,16 @@ class XclObjOle : public XclObj { private: - const SdrObject& rOleObj; + const SdrObject& rOleObj; SotStorage* pRootStorage; virtual void WriteSubRecs( XclExpStream& rStrm ); public: XclObjOle( XclExpObjectManager& rObjMgr, const SdrObject& rObj ); - virtual ~XclObjOle(); + virtual ~XclObjOle(); - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ); }; @@ -247,14 +247,14 @@ protected: public: XclObjAny( XclExpObjectManager& rObjMgr, const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rShape ); - virtual ~XclObjAny(); + virtual ~XclObjAny(); com::sun::star::uno::Reference< com::sun::star::drawing::XShape > GetShape() const { return mxShape; } - virtual void Save( XclExpStream& rStrm ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void Save( XclExpStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ); static void WriteFromTo( XclExpXmlStream& rStrm, const XclObjAny& rObj ); static void WriteFromTo( XclExpXmlStream& rStrm, const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rShape, SCTAB nTab ); @@ -269,15 +269,15 @@ private: class ExcBof8_Base : public ExcBof_Base { protected: - UINT32 nFileHistory; // bfh - UINT32 nLowestBiffVer; // sfo + UINT32 nFileHistory; // bfh + UINT32 nLowestBiffVer; // sfo - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ); public: ExcBof8_Base(); - virtual UINT16 GetNum() const; + virtual UINT16 GetNum() const; virtual sal_Size GetLen() const; }; @@ -310,7 +310,7 @@ private: String sUnicodeName; XclExpString GetName() const; - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ); public: ExcBundlesheet8( RootData& rRootData, SCTAB nTab ); @@ -327,7 +327,7 @@ public: class XclObproj : public ExcRecord { public: - virtual UINT16 GetNum() const; + virtual UINT16 GetNum() const; virtual sal_Size GetLen() const; }; @@ -338,25 +338,25 @@ class XclCodename : public ExcRecord { private: XclExpString aName; - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ); public: XclCodename( const String& ); - virtual UINT16 GetNum() const; + virtual UINT16 GetNum() const; virtual sal_Size GetLen() const; }; // ---- Scenarios ---------------------------------------------------- -// - ExcEScenarioCell a cell of a scenario range -// - ExcEScenario all ranges of a scenario table -// - ExcEScenarioManager list of scenario tables +// - ExcEScenarioCell a cell of a scenario range +// - ExcEScenario all ranges of a scenario table +// - ExcEScenarioManager list of scenario tables class ExcEScenarioCell { private: - UINT16 nCol; - UINT16 nRow; + UINT16 nCol; + UINT16 nRow; XclExpString sText; protected: @@ -366,8 +366,8 @@ public: inline sal_Size GetStringBytes() { return sText.GetSize(); } - void WriteAddress( XclExpStream& rStrm ); - void WriteText( XclExpStream& rStrm ); + void WriteAddress( XclExpStream& rStrm ); + void WriteText( XclExpStream& rStrm ); void SaveXml( XclExpXmlStream& rStrm ); }; @@ -383,19 +383,19 @@ private: XclExpString sUserName; UINT8 nProtected; - inline ExcEScenarioCell* _First() { return (ExcEScenarioCell*) List::First(); } - inline ExcEScenarioCell* _Next() { return (ExcEScenarioCell*) List::Next(); } + inline ExcEScenarioCell* _First() { return (ExcEScenarioCell*) List::First(); } + inline ExcEScenarioCell* _Next() { return (ExcEScenarioCell*) List::Next(); } - BOOL Append( UINT16 nCol, UINT16 nRow, const String& rTxt ); + BOOL Append( UINT16 nCol, UINT16 nRow, const String& rTxt ); - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ); protected: public: ExcEScenario( const XclExpRoot& rRoot, SCTAB nTab ); - virtual ~ExcEScenario(); + virtual ~ExcEScenario(); - virtual UINT16 GetNum() const; + virtual UINT16 GetNum() const; virtual sal_Size GetLen() const; virtual void SaveXml( XclExpXmlStream& rStrm ); @@ -406,25 +406,25 @@ public: class ExcEScenarioManager : public ExcRecord, private List { private: - UINT16 nActive; + UINT16 nActive; - inline ExcEScenario* _First() { return (ExcEScenario*) List::First(); } - inline ExcEScenario* _Next() { return (ExcEScenario*) List::Next(); } + inline ExcEScenario* _First() { return (ExcEScenario*) List::First(); } + inline ExcEScenario* _Next() { return (ExcEScenario*) List::Next(); } - inline void Append( ExcEScenario* pScen ) + inline void Append( ExcEScenario* pScen ) { List::Insert( pScen, LIST_APPEND ); } - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ); protected: public: ExcEScenarioManager( const XclExpRoot& rRoot, SCTAB nTab ); - virtual ~ExcEScenarioManager(); + virtual ~ExcEScenarioManager(); - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ); virtual void SaveXml( XclExpXmlStream& rStrm ); - virtual UINT16 GetNum() const; + virtual UINT16 GetNum() const; virtual sal_Size GetLen() const; }; @@ -450,13 +450,13 @@ private: class XclCalccount : public ExcRecord { private: - UINT16 nCount; + UINT16 nCount; protected: - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ); public: XclCalccount( const ScDocument& ); - virtual UINT16 GetNum() const; + virtual UINT16 GetNum() const; virtual sal_Size GetLen() const; virtual void SaveXml( XclExpXmlStream& rStrm ); @@ -468,13 +468,13 @@ public: class XclIteration : public ExcRecord { private: - UINT16 nIter; + UINT16 nIter; protected: - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ); public: XclIteration( const ScDocument& ); - virtual UINT16 GetNum() const; + virtual UINT16 GetNum() const; virtual sal_Size GetLen() const; virtual void SaveXml( XclExpXmlStream& rStrm ); @@ -486,13 +486,13 @@ public: class XclDelta : public ExcRecord { private: - double fDelta; + double fDelta; protected: - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ); public: XclDelta( const ScDocument& ); - virtual UINT16 GetNum() const; + virtual UINT16 GetNum() const; virtual sal_Size GetLen() const; virtual void SaveXml( XclExpXmlStream& rStrm ); diff --git a/sc/source/filter/inc/xechart.hxx b/sc/source/filter/inc/xechart.hxx index bbf9c764539e..71fdbd20cb0d 100644 --- a/sc/source/filter/inc/xechart.hxx +++ b/sc/source/filter/inc/xechart.hxx @@ -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 diff --git a/sc/source/filter/inc/xecontent.hxx b/sc/source/filter/inc/xecontent.hxx index 41ceb8410b02..b6e97aa5510b 100644 --- a/sc/source/filter/inc/xecontent.hxx +++ b/sc/source/filter/inc/xecontent.hxx @@ -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 diff --git a/sc/source/filter/inc/xeformula.hxx b/sc/source/filter/inc/xeformula.hxx index 5cc3107bd25d..9a6492f2155f 100644 --- a/sc/source/filter/inc/xeformula.hxx +++ b/sc/source/filter/inc/xeformula.hxx @@ -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 diff --git a/sc/source/filter/inc/xehelper.hxx b/sc/source/filter/inc/xehelper.hxx index 00d758dd1991..e82eacabc04d 100644 --- a/sc/source/filter/inc/xehelper.hxx +++ b/sc/source/filter/inc/xehelper.hxx @@ -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 diff --git a/sc/source/filter/inc/xename.hxx b/sc/source/filter/inc/xename.hxx index 66e903553da8..7fd7dd93bdec 100644 --- a/sc/source/filter/inc/xename.hxx +++ b/sc/source/filter/inc/xename.hxx @@ -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 diff --git a/sc/source/filter/inc/xepage.hxx b/sc/source/filter/inc/xepage.hxx index be8d1a1ac08c..a463eef211c0 100644 --- a/sc/source/filter/inc/xepage.hxx +++ b/sc/source/filter/inc/xepage.hxx @@ -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 diff --git a/sc/source/filter/inc/xepivot.hxx b/sc/source/filter/inc/xepivot.hxx index c2e226a75b39..97df866797dc 100644 --- a/sc/source/filter/inc/xepivot.hxx +++ b/sc/source/filter/inc/xepivot.hxx @@ -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 diff --git a/sc/source/filter/inc/xerecord.hxx b/sc/source/filter/inc/xerecord.hxx index 712da2b89d6e..dc536e4bcdc7 100644 --- a/sc/source/filter/inc/xerecord.hxx +++ b/sc/source/filter/inc/xerecord.hxx @@ -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 diff --git a/sc/source/filter/inc/xestream.hxx b/sc/source/filter/inc/xestream.hxx index d0e56961e812..8c636ef1a360 100644 --- a/sc/source/filter/inc/xestream.hxx +++ b/sc/source/filter/inc/xestream.hxx @@ -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 diff --git a/sc/source/filter/inc/xestring.hxx b/sc/source/filter/inc/xestring.hxx index 6b1c12474dd0..6117b99db3be 100644 --- a/sc/source/filter/inc/xestring.hxx +++ b/sc/source/filter/inc/xestring.hxx @@ -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 diff --git a/sc/source/filter/inc/xestyle.hxx b/sc/source/filter/inc/xestyle.hxx index fa2d3e8eb782..d0733f4eaa48 100644 --- a/sc/source/filter/inc/xestyle.hxx +++ b/sc/source/filter/inc/xestyle.hxx @@ -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 diff --git a/sc/source/filter/inc/xetable.hxx b/sc/source/filter/inc/xetable.hxx index 2c18f14d91f0..564182374fdf 100644 --- a/sc/source/filter/inc/xetable.hxx +++ b/sc/source/filter/inc/xetable.hxx @@ -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 diff --git a/sc/source/filter/inc/xeview.hxx b/sc/source/filter/inc/xeview.hxx index eb1bf5c403f8..709b43362032 100644 --- a/sc/source/filter/inc/xeview.hxx +++ b/sc/source/filter/inc/xeview.hxx @@ -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 diff --git a/sc/source/filter/inc/xichart.hxx b/sc/source/filter/inc/xichart.hxx index 12b2e2d473b2..72b3e89046f8 100644 --- a/sc/source/filter/inc/xichart.hxx +++ b/sc/source/filter/inc/xichart.hxx @@ -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 diff --git a/sc/source/filter/inc/xicontent.hxx b/sc/source/filter/inc/xicontent.hxx index 6bd2e38355f6..982cfae44cdd 100644 --- a/sc/source/filter/inc/xicontent.hxx +++ b/sc/source/filter/inc/xicontent.hxx @@ -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 diff --git a/sc/source/filter/inc/xiescher.hxx b/sc/source/filter/inc/xiescher.hxx index bf623b4a2da5..2ae222d4514b 100644 --- a/sc/source/filter/inc/xiescher.hxx +++ b/sc/source/filter/inc/xiescher.hxx @@ -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 diff --git a/sc/source/filter/inc/xiformula.hxx b/sc/source/filter/inc/xiformula.hxx index 5ed9d04b0ea9..7dc5e4852945 100644 --- a/sc/source/filter/inc/xiformula.hxx +++ b/sc/source/filter/inc/xiformula.hxx @@ -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 @@ -50,11 +50,11 @@ public: ScRangeList& rScRanges, XclFormulaType eType, const XclTokenArray& rXclTokArr, XclImpStream& rStrm ); - /** - * Creates a formula token array from the Excel token array. Note that - * the caller must create a copy of the token array instance returend by - * this function if the caller needs to persistently store the array, - * because the pointer points to an array instance on the stack. + /** + * Creates a formula token array from the Excel token array. Note that + * the caller must create a copy of the token array instance returend by + * this function if the caller needs to persistently store the array, + * because the pointer points to an array instance on the stack. */ const ScTokenArray* CreateFormula( XclFormulaType eType, const XclTokenArray& rXclTokArr ); diff --git a/sc/source/filter/inc/xilink.hxx b/sc/source/filter/inc/xilink.hxx index 2f06ddb2f7b0..bd2b9c1267b9 100644 --- a/sc/source/filter/inc/xilink.hxx +++ b/sc/source/filter/inc/xilink.hxx @@ -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 diff --git a/sc/source/filter/inc/xiname.hxx b/sc/source/filter/inc/xiname.hxx index bf260a76548e..c31e654eebc2 100644 --- a/sc/source/filter/inc/xiname.hxx +++ b/sc/source/filter/inc/xiname.hxx @@ -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 diff --git a/sc/source/filter/inc/xipage.hxx b/sc/source/filter/inc/xipage.hxx index 5f8e7c6b3f70..d5ef49193916 100644 --- a/sc/source/filter/inc/xipage.hxx +++ b/sc/source/filter/inc/xipage.hxx @@ -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 diff --git a/sc/source/filter/inc/xipivot.hxx b/sc/source/filter/inc/xipivot.hxx index 72bb174b8d62..be29646956ea 100644 --- a/sc/source/filter/inc/xipivot.hxx +++ b/sc/source/filter/inc/xipivot.hxx @@ -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 diff --git a/sc/source/filter/inc/xiroot.hxx b/sc/source/filter/inc/xiroot.hxx index c53c09029bdc..68e39a1f534e 100644 --- a/sc/source/filter/inc/xiroot.hxx +++ b/sc/source/filter/inc/xiroot.hxx @@ -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 diff --git a/sc/source/filter/inc/xistream.hxx b/sc/source/filter/inc/xistream.hxx index 6dff1a867f2e..ee7319b6f72f 100644 --- a/sc/source/filter/inc/xistream.hxx +++ b/sc/source/filter/inc/xistream.hxx @@ -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 diff --git a/sc/source/filter/inc/xistring.hxx b/sc/source/filter/inc/xistring.hxx index f76e3af4321c..1dd1c501858e 100644 --- a/sc/source/filter/inc/xistring.hxx +++ b/sc/source/filter/inc/xistring.hxx @@ -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 diff --git a/sc/source/filter/inc/xistyle.hxx b/sc/source/filter/inc/xistyle.hxx index b4aa9e96d384..d8e7f370d02d 100644 --- a/sc/source/filter/inc/xistyle.hxx +++ b/sc/source/filter/inc/xistyle.hxx @@ -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 diff --git a/sc/source/filter/inc/xiview.hxx b/sc/source/filter/inc/xiview.hxx index 29c3f98bbb04..f5d37814b262 100644 --- a/sc/source/filter/inc/xiview.hxx +++ b/sc/source/filter/inc/xiview.hxx @@ -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 diff --git a/sc/source/filter/inc/xladdress.hxx b/sc/source/filter/inc/xladdress.hxx index 2152c19913c2..9b12fe51355f 100644 --- a/sc/source/filter/inc/xladdress.hxx +++ b/sc/source/filter/inc/xladdress.hxx @@ -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 diff --git a/sc/source/filter/inc/xlchart.hxx b/sc/source/filter/inc/xlchart.hxx index c6ebe7382c7b..6f63d71c13d4 100644 --- a/sc/source/filter/inc/xlchart.hxx +++ b/sc/source/filter/inc/xlchart.hxx @@ -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 @@ -1475,7 +1475,7 @@ struct XclChRootData const Rectangle& rChartRect ); /** Finishes the API chart document conversion. Must be called once before any API access. */ void FinishConversion(); - + /** Returns the drawing shape interface of the specified title object. */ ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > GetTitleShape( const XclChTextKey& rTitleKey ) const; diff --git a/sc/source/filter/inc/xlconst.hxx b/sc/source/filter/inc/xlconst.hxx index 0ce2025d3d0c..117d173dc4b9 100644 --- a/sc/source/filter/inc/xlconst.hxx +++ b/sc/source/filter/inc/xlconst.hxx @@ -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 diff --git a/sc/source/filter/inc/xlcontent.hxx b/sc/source/filter/inc/xlcontent.hxx index ae8f5c7dc7fd..68ce65ce0211 100644 --- a/sc/source/filter/inc/xlcontent.hxx +++ b/sc/source/filter/inc/xlcontent.hxx @@ -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 diff --git a/sc/source/filter/inc/xlescher.hxx b/sc/source/filter/inc/xlescher.hxx index c81df26fa0c1..e6cdc50f0aff 100644 --- a/sc/source/filter/inc/xlescher.hxx +++ b/sc/source/filter/inc/xlescher.hxx @@ -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 diff --git a/sc/source/filter/inc/xlformula.hxx b/sc/source/filter/inc/xlformula.hxx index 5dfdb3ca1c12..d89e01d6555d 100644 --- a/sc/source/filter/inc/xlformula.hxx +++ b/sc/source/filter/inc/xlformula.hxx @@ -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 diff --git a/sc/source/filter/inc/xllink.hxx b/sc/source/filter/inc/xllink.hxx index 760df8173055..1cba13d3a62d 100644 --- a/sc/source/filter/inc/xllink.hxx +++ b/sc/source/filter/inc/xllink.hxx @@ -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 diff --git a/sc/source/filter/inc/xlname.hxx b/sc/source/filter/inc/xlname.hxx index 4fbafb280f03..6e7e34fe8a4c 100644 --- a/sc/source/filter/inc/xlname.hxx +++ b/sc/source/filter/inc/xlname.hxx @@ -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 diff --git a/sc/source/filter/inc/xlpage.hxx b/sc/source/filter/inc/xlpage.hxx index dfed44b91afd..2accb869c604 100644 --- a/sc/source/filter/inc/xlpage.hxx +++ b/sc/source/filter/inc/xlpage.hxx @@ -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 diff --git a/sc/source/filter/inc/xlpivot.hxx b/sc/source/filter/inc/xlpivot.hxx index e46bf30dd398..2468b9314093 100644 --- a/sc/source/filter/inc/xlpivot.hxx +++ b/sc/source/filter/inc/xlpivot.hxx @@ -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 diff --git a/sc/source/filter/inc/xlroot.hxx b/sc/source/filter/inc/xlroot.hxx index e1261be05be0..d1772768737a 100644 --- a/sc/source/filter/inc/xlroot.hxx +++ b/sc/source/filter/inc/xlroot.hxx @@ -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 diff --git a/sc/source/filter/inc/xlstream.hxx b/sc/source/filter/inc/xlstream.hxx index e83b1068fc09..d006117a73c4 100644 --- a/sc/source/filter/inc/xlstream.hxx +++ b/sc/source/filter/inc/xlstream.hxx @@ -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 diff --git a/sc/source/filter/inc/xlstring.hxx b/sc/source/filter/inc/xlstring.hxx index 15adf3f919d9..2d1ac25d9d2d 100644 --- a/sc/source/filter/inc/xlstring.hxx +++ b/sc/source/filter/inc/xlstring.hxx @@ -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 diff --git a/sc/source/filter/inc/xlstyle.hxx b/sc/source/filter/inc/xlstyle.hxx index b9b1f1902b9e..d3bdd1901aed 100644 --- a/sc/source/filter/inc/xlstyle.hxx +++ b/sc/source/filter/inc/xlstyle.hxx @@ -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 diff --git a/sc/source/filter/inc/xltable.hxx b/sc/source/filter/inc/xltable.hxx index 7c276ea477e2..76aaa858288b 100644 --- a/sc/source/filter/inc/xltable.hxx +++ b/sc/source/filter/inc/xltable.hxx @@ -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 diff --git a/sc/source/filter/inc/xltools.hxx b/sc/source/filter/inc/xltools.hxx index 7ae02d758151..1663ad67e8c1 100644 --- a/sc/source/filter/inc/xltools.hxx +++ b/sc/source/filter/inc/xltools.hxx @@ -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 @@ -233,7 +233,7 @@ public: static void SkipSubStream( XclImpStream& rStrm ); // Basic macro names ------------------------------------------------------ - + /** Returns the full StarBasic macro URL from an Excel macro name. */ static ::rtl::OUString GetSbMacroUrl( const String& rMacroName, SfxObjectShell* pDocShell = 0 ); /** Returns the full StarBasic macro URL from an Excel module and macro name. */ diff --git a/sc/source/filter/inc/xltracer.hxx b/sc/source/filter/inc/xltracer.hxx index 3e4c6e87c9d4..27151cf812e2 100644 --- a/sc/source/filter/inc/xltracer.hxx +++ b/sc/source/filter/inc/xltracer.hxx @@ -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 diff --git a/sc/source/filter/inc/xlview.hxx b/sc/source/filter/inc/xlview.hxx index 0b2f91ad6e21..0aeb34a943eb 100644 --- a/sc/source/filter/inc/xlview.hxx +++ b/sc/source/filter/inc/xlview.hxx @@ -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 @@ -89,8 +89,8 @@ const sal_uInt16 EXC_ID_SCL = 0x00A0; // (0x0862) SHEETEXT ---------------------------------------------------------- -const sal_uInt16 EXC_ID_SHEETEXT = 0x0862; /// header id for sheetext -const sal_uInt8 EXC_SHEETEXT_TABCOLOR = 0x7F; /// mask for tab color +const sal_uInt16 EXC_ID_SHEETEXT = 0x0862; /// header id for sheetext +const sal_uInt8 EXC_SHEETEXT_TABCOLOR = 0x7F; /// mask for tab color const sal_uInt16 EXC_COLOR_NOTABBG = 0x7F; /// Excel ignores Tab color when set to this value... // Structs ==================================================================== |