diff options
Diffstat (limited to 'sw/source/filter/ww8/ww8scan.hxx')
| -rw-r--r-- | sw/source/filter/ww8/ww8scan.hxx | 940 |
1 files changed, 470 insertions, 470 deletions
diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx index 33d40bcf4c0d..369f1199a2bd 100644 --- a/sw/source/filter/ww8/ww8scan.hxx +++ b/sw/source/filter/ww8/ww8scan.hxx @@ -119,7 +119,7 @@ class wwSprmParser { private: ww::WordVersion meVersion; - BYTE mnDelta; + sal_uInt8 mnDelta; const wwSprmSearcher *mpKnownSprms; static const wwSprmSearcher* GetWW8SprmSearcher(); static const wwSprmSearcher* GetWW6SprmSearcher(); @@ -127,7 +127,7 @@ private: SprmInfo GetSprmInfo(sal_uInt16 nId) const; - BYTE SprmDataOfs(sal_uInt16 nId) const; + sal_uInt8 SprmDataOfs(sal_uInt16 nId) const; enum SprmType {L_FIX=0, L_VAR=1, L_VAR2=2}; public: @@ -136,15 +136,15 @@ public: /// Return the SPRM id at the beginning of this byte sequence sal_uInt16 GetSprmId(const sal_uInt8* pSp) const; - USHORT GetSprmSize(sal_uInt16 nId, const sal_uInt8* pSprm) const; + sal_uInt16 GetSprmSize(sal_uInt16 nId, const sal_uInt8* pSprm) const; /// Get known len of a sprms head, the bytes of the sprm id + any bytes /// reserved to hold a variable length - USHORT DistanceToData(sal_uInt16 nId) const; + sal_uInt16 DistanceToData(sal_uInt16 nId) const; /// Get len of a sprms data area, ignoring the bytes of the sprm id and /// ignoring any len bytes. Reports the remaining data after those bytes - USHORT GetSprmTailLen(sal_uInt16 nId, const sal_uInt8 * pSprm) const; + sal_uInt16 GetSprmTailLen(sal_uInt16 nId, const sal_uInt8 * pSprm) const; /// The minimum acceptable sprm len possible for this type of parser int MinSprmLen() const { return (IsSevenMinus(meVersion)) ? 2 : 3; } @@ -168,7 +168,7 @@ String WW8ReadPString( SvStream& rStrm, rtl_TextEncoding eEnc, exactly ONE byte is skipped If nChars is set then that number of characters (not bytes) is read, if its not set, the first character read is the length */ -String WW8Read_xstz(SvStream& rStrm, USHORT nChars, bool bAtEndSeekRel1); +String WW8Read_xstz(SvStream& rStrm, sal_uInt16 nChars, bool bAtEndSeekRel1); /** reads array of strings (see MS documentation: STring TaBle stored in File) @@ -176,8 +176,8 @@ String WW8Read_xstz(SvStream& rStrm, USHORT nChars, bool bAtEndSeekRel1); attention: the *extra data* of each string are SKIPPED and ignored */ -void WW8ReadSTTBF(bool bVer8, SvStream& rStrm, UINT32 nStart, INT32 nLen, - USHORT nExtraLen, rtl_TextEncoding eCS, ::std::vector<String> &rArray, +void WW8ReadSTTBF(bool bVer8, SvStream& rStrm, sal_uInt32 nStart, sal_Int32 nLen, + sal_uInt16 nExtraLen, rtl_TextEncoding eCS, ::std::vector<String> &rArray, ::std::vector<ww::bytes>* pExtraArray = 0, ::std::vector<String>* pValueArray = 0); struct WW8FieldDesc @@ -187,16 +187,16 @@ struct WW8FieldDesc WW8_CP nLCode; ///< Laenge WW8_CP nSRes; ///< Anfang Ergebnis WW8_CP nLRes; ///< Laenge ( == 0, falls kein Ergebnis ) - USHORT nId; ///< WW-Id fuer Felder - BYTE nOpt; ///< WW-Flags ( z.B.: vom User geaendert ) - BYTE bCodeNest:1; ///< Befehl rekursiv verwendet - BYTE bResNest:1; ///< Befehl in Resultat eingefuegt + sal_uInt16 nId; ///< WW-Id fuer Felder + sal_uInt8 nOpt; ///< WW-Flags ( z.B.: vom User geaendert ) + sal_uInt8 bCodeNest:1; ///< Befehl rekursiv verwendet + sal_uInt8 bResNest:1; ///< Befehl in Resultat eingefuegt }; struct WW8PLCFxSave1 { - ULONG nPLCFxPos; - ULONG nPLCFxPos2; ///< fuer PLCF_Cp_Fkp: PieceIter-Pos + sal_uLong nPLCFxPos; + sal_uLong nPLCFxPos2; ///< fuer PLCF_Cp_Fkp: PieceIter-Pos long nPLCFxMemOfs; WW8_CP nStartCp; ///< for cp based iterator like PAP and CHP long nCpOfs; @@ -213,8 +213,8 @@ struct WW8PLCFxSave1 class WW8PLCFspecial // Iterator fuer PLCFs { private: - INT32* pPLCF_PosArray; ///< Pointer auf Pos-Array und auf ganze Struktur - BYTE* pPLCF_Contents; ///< Pointer auf Inhalts-Array-Teil des Pos-Array + sal_Int32* pPLCF_PosArray; ///< Pointer auf Pos-Array und auf ganze Struktur + sal_uInt8* pPLCF_Contents; ///< Pointer auf Inhalts-Array-Teil des Pos-Array long nIMax; ///< Anzahl der Elemente long nIdx; ///< Merker, wo wir gerade sind long nStru; @@ -228,7 +228,7 @@ public: bool SeekPos(long nPos); // geht ueber FC- bzw. CP-Wert // bzw. naechste groesseren Wert bool SeekPosExact(long nPos); - INT32 Where() const + sal_Int32 Where() const { return ( nIdx >= nIMax ) ? SAL_MAX_INT32 : pPLCF_PosArray[nIdx]; } bool Get(WW8_CP& rStart, void*& rpValue) const; bool GetData(long nIdx, WW8_CP& rPos, void*& rpValue) const; @@ -238,7 +238,7 @@ public: return ( nInIdx >= nIMax ) ? 0 : (const void*)&pPLCF_Contents[nInIdx * nStru]; } - INT32 GetPos( long nInIdx ) const + sal_Int32 GetPos( long nInIdx ) const { return ( nInIdx >= nIMax ) ? SAL_MAX_INT32 : pPLCF_PosArray[nInIdx]; } WW8PLCFspecial& operator ++( int ) { nIdx++; return *this; } @@ -251,24 +251,24 @@ class WW8SprmIter private: const wwSprmParser &mrSprmParser; // these members will be updated - const BYTE* pSprms; // remaining part of the SPRMs ( == start of akt. SPRM) - const BYTE* pAktParams; // start of akt. SPRM's parameters - USHORT nAktId; - USHORT nAktSize; + const sal_uInt8* pSprms; // remaining part of the SPRMs ( == start of akt. SPRM) + const sal_uInt8* pAktParams; // start of akt. SPRM's parameters + sal_uInt16 nAktId; + sal_uInt16 nAktSize; long nRemLen; // length of remaining SPRMs (including akt. SPRM) void UpdateMyMembers(); public: - explicit WW8SprmIter( const BYTE* pSprms_, long nLen_, + explicit WW8SprmIter( const sal_uInt8* pSprms_, long nLen_, const wwSprmParser &rSprmParser); - void SetSprms( const BYTE* pSprms_, long nLen_ ); - const BYTE* FindSprm(USHORT nId); - const BYTE* operator ++( int ); - const BYTE* GetSprms() const + void SetSprms( const sal_uInt8* pSprms_, long nLen_ ); + const sal_uInt8* FindSprm(sal_uInt16 nId); + const sal_uInt8* operator ++( int ); + const sal_uInt8* GetSprms() const { return ( pSprms && (0 < nRemLen) ) ? pSprms : 0; } - const BYTE* GetAktParams() const { return pAktParams; } - USHORT GetAktId() const { return nAktId; } + const sal_uInt8* GetAktParams() const { return pAktParams; } + sal_uInt16 GetAktId() const { return nAktId; } private: //No copying WW8SprmIter(const WW8SprmIter&); @@ -280,40 +280,40 @@ class WW8PLCF // Iterator fuer PLCFs { private: WW8_CP* pPLCF_PosArray; // Pointer auf Pos-Array und auf ganze Struktur - BYTE* pPLCF_Contents; // Pointer auf Inhalts-Array-Teil des Pos-Array - INT32 nIMax; // Anzahl der Elemente - INT32 nIdx; + sal_uInt8* pPLCF_Contents; // Pointer auf Inhalts-Array-Teil des Pos-Array + sal_Int32 nIMax; // Anzahl der Elemente + sal_Int32 nIdx; int nStru; - void ReadPLCF( SvStream* pSt, WW8_FC nFilePos, INT32 nPLCF ); + void ReadPLCF( SvStream* pSt, WW8_FC nFilePos, sal_Int32 nPLCF ); /* Falls im Dok ein PLC fehlt und die FKPs solo dastehen, machen wir uns hiermit einen PLC: */ - void GeneratePLCF( SvStream* pSt, INT32 nPN, INT32 ncpN ); + void GeneratePLCF( SvStream* pSt, sal_Int32 nPN, sal_Int32 ncpN ); void MakeFailedPLCF(); public: - WW8PLCF( SvStream* pSt, WW8_FC nFilePos, INT32 nPLCF, int nStruct, + WW8PLCF( SvStream* pSt, WW8_FC nFilePos, sal_Int32 nPLCF, int nStruct, WW8_CP nStartPos = -1 ); /* folgender Ctor generiert ggfs. einen PLC aus nPN und ncpN */ - WW8PLCF( SvStream* pSt, WW8_FC nFilePos, INT32 nPLCF, int nStruct, - WW8_CP nStartPos, INT32 nPN, INT32 ncpN ); + WW8PLCF( SvStream* pSt, WW8_FC nFilePos, sal_Int32 nPLCF, int nStruct, + WW8_CP nStartPos, sal_Int32 nPN, sal_Int32 ncpN ); ~WW8PLCF(){ delete[] pPLCF_PosArray; } - INT32 GetIdx() const { return nIdx; } - void SetIdx( INT32 nI ) { nIdx = nI; } - INT32 GetIMax() const { return nIMax; } + sal_Int32 GetIdx() const { return nIdx; } + void SetIdx( sal_Int32 nI ) { nIdx = nI; } + sal_Int32 GetIMax() const { return nIMax; } bool SeekPos(WW8_CP nPos); WW8_CP Where() const; bool Get(WW8_CP& rStart, WW8_CP& rEnd, void*& rpValue) const; WW8PLCF& operator ++( int ) { if( nIdx < nIMax ) nIdx++; return *this; } - const void* GetData( INT32 nInIdx ) const + const void* GetData( sal_Int32 nInIdx ) const { return ( nInIdx >= nIMax ) ? 0 : (const void*)&pPLCF_Contents[nInIdx * nStru]; @@ -324,8 +324,8 @@ public: class WW8PLCFpcd { friend class WW8PLCFpcd_Iter; - INT32* pPLCF_PosArray; // Pointer auf Pos-Array und auf ganze Struktur - BYTE* pPLCF_Contents; // Pointer auf Inhalts-Array-Teil des Pos-Array + sal_Int32* pPLCF_PosArray; // Pointer auf Pos-Array und auf ganze Struktur + sal_uInt8* pPLCF_Contents; // Pointer auf Inhalts-Array-Teil des Pos-Array long nIMax; long nStru; public: @@ -349,7 +349,7 @@ public: void SetIdx( long nI ) { nIdx = nI; } long GetIMax() const { return rPLCF.nIMax; } bool SeekPos(long nPos); - INT32 Where() const; + sal_Int32 Where() const; bool Get(WW8_CP& rStart, WW8_CP& rEnd, void*& rpValue) const; WW8PLCFpcd_Iter& operator ++( int ) { @@ -384,16 +384,16 @@ public: : meVer(eVersion), bIsSprm(bSprm), bDirty(false) {} virtual ~WW8PLCFx() {} bool IsSprm() const { return bIsSprm; } - virtual ULONG GetIdx() const = 0; - virtual void SetIdx( ULONG nIdx ) = 0; - virtual ULONG GetIdx2() const; - virtual void SetIdx2( ULONG nIdx ); + virtual sal_uLong GetIdx() const = 0; + virtual void SetIdx( sal_uLong nIdx ) = 0; + virtual sal_uLong GetIdx2() const; + virtual void SetIdx2( sal_uLong nIdx ); virtual bool SeekPos(WW8_CP nCpPos) = 0; virtual WW8_FC Where() = 0; virtual void GetSprms( WW8PLCFxDesc* p ); virtual long GetNoSprms( WW8_CP& rStart, WW8_CP&, sal_Int32& rLen ); virtual WW8PLCFx& operator ++( int ) = 0; - virtual USHORT GetIstd() const { return 0xffff; } + virtual sal_uInt16 GetIstd() const { return 0xffff; } virtual void Save( WW8PLCFxSave1& rSave ) const; virtual void Restore( const WW8PLCFxSave1& rSave ); ww::WordVersion GetFIBVersion() const { return meVer; } @@ -408,10 +408,10 @@ class WW8PLCFx_PCDAttrs : public WW8PLCFx private: WW8PLCFpcd_Iter* pPcdI; WW8PLCFx_PCD* pPcd; - BYTE** const pGrpprls; // Attribute an Piece-Table + sal_uInt8** const pGrpprls; // Attribute an Piece-Table SVBT32 aShortSprm; // mini storage: can contain ONE sprm with // 1 byte param - UINT16 nGrpprls; // Attribut Anzahl davon + sal_uInt16 nGrpprls; // Attribut Anzahl davon //No copying WW8PLCFx_PCDAttrs(const WW8PLCFx_PCDAttrs&); @@ -419,8 +419,8 @@ private: public: WW8PLCFx_PCDAttrs(ww::WordVersion eVersion, WW8PLCFx_PCD* pPLCFx_PCD, const WW8ScannerBase* pBase ); - virtual ULONG GetIdx() const; - virtual void SetIdx( ULONG nI ); + virtual sal_uLong GetIdx() const; + virtual void SetIdx( sal_uLong nI ); virtual bool SeekPos(WW8_CP nCpPos); virtual WW8_FC Where(); virtual void GetSprms( WW8PLCFxDesc* p ); @@ -443,9 +443,9 @@ public: WW8PLCFx_PCD(ww::WordVersion eVersion, WW8PLCFpcd* pPLCFpcd, WW8_CP nStartCp, bool bVer67P); virtual ~WW8PLCFx_PCD(); - virtual ULONG GetIMax() const; - virtual ULONG GetIdx() const; - virtual void SetIdx( ULONG nI ); + virtual sal_uLong GetIMax() const; + virtual sal_uLong GetIdx() const; + virtual void SetIdx( sal_uLong nI ); virtual bool SeekPos(WW8_CP nCpPos); virtual WW8_FC Where(); virtual long GetNoSprms( WW8_CP& rStart, WW8_CP&, sal_Int32& rLen ); @@ -458,7 +458,7 @@ public: void SetClipStart(WW8_CP nIn) { nClipStart = nIn; } WW8_CP GetClipStart() { return nClipStart; } - static INT32 TransformPieceAddress(long nfc, bool& bIsUnicodeAddress) + static sal_Int32 TransformPieceAddress(long nfc, bool& bIsUnicodeAddress) { bIsUnicodeAddress = 0 == (0x40000000 & nfc); return bIsUnicodeAddress ? nfc : (nfc & 0x3fffFFFF) / 2; @@ -524,20 +524,20 @@ public: mnIdx++; return *this; } - BYTE* Get( WW8_FC& rStart, WW8_FC& rEnd, sal_Int32& rLen ) const; + sal_uInt8* Get( WW8_FC& rStart, WW8_FC& rEnd, sal_Int32& rLen ) const; sal_uInt16 GetIstd() const { return maEntries[mnIdx].mnIStd; } /* liefert einen echten Pointer auf das Sprm vom Typ nId, falls ein solches im Fkp drin ist. */ - BYTE* GetLenAndIStdAndSprms(sal_Int32& rLen) const; + sal_uInt8* GetLenAndIStdAndSprms(sal_Int32& rLen) const; /* ruft GetLenAndIStdAndSprms() auf... */ - const BYTE* HasSprm( USHORT nId ); - bool HasSprm(USHORT nId, std::vector<const BYTE *> &rResult); + const sal_uInt8* HasSprm( sal_uInt16 nId ); + bool HasSprm(sal_uInt16 nId, std::vector<const sal_uInt8 *> &rResult); const wwSprmParser &GetSprmParser() const { return maSprmParser; } }; @@ -576,16 +576,16 @@ public: WW8PLCFx_Fc_FKP( SvStream* pSt, SvStream* pTblSt, SvStream* pDataSt, const WW8Fib& rFib, ePLCFT ePl, WW8_FC nStartFcL ); virtual ~WW8PLCFx_Fc_FKP(); - virtual ULONG GetIdx() const; - virtual void SetIdx( ULONG nIdx ); + virtual sal_uLong GetIdx() const; + virtual void SetIdx( sal_uLong nIdx ); virtual bool SeekPos(WW8_FC nFcPos); virtual WW8_FC Where(); - BYTE* GetSprmsAndPos( WW8_FC& rStart, WW8_FC& rEnd, sal_Int32& rLen ); + sal_uInt8* GetSprmsAndPos( WW8_FC& rStart, WW8_FC& rEnd, sal_Int32& rLen ); virtual WW8PLCFx& operator ++( int ); - virtual USHORT GetIstd() const; + virtual sal_uInt16 GetIstd() const; void GetPCDSprms( WW8PLCFxDesc& rDesc ); - const BYTE* HasSprm( USHORT nId ); - bool HasSprm(USHORT nId, std::vector<const BYTE *> &rResult); + const sal_uInt8* HasSprm( sal_uInt16 nId ); + bool HasSprm(sal_uInt16 nId, std::vector<const sal_uInt8 *> &rResult); bool HasFkp() const { return (0 != pFkp); } }; @@ -597,8 +597,8 @@ private: WW8PLCFx_PCD* pPcd; WW8PLCFpcd_Iter *pPieceIter; WW8_CP nAttrStart, nAttrEnd; - BYTE bLineEnd : 1; - BYTE bComplex : 1; + sal_uInt8 bLineEnd : 1; + sal_uInt8 bComplex : 1; //No copying WW8PLCFx_Cp_FKP(const WW8PLCFx_Cp_FKP&); @@ -608,11 +608,11 @@ public: const WW8ScannerBase& rBase, ePLCFT ePl ); virtual ~WW8PLCFx_Cp_FKP(); void ResetAttrStartEnd(); - ULONG GetPCDIMax() const; - ULONG GetPCDIdx() const; - void SetPCDIdx( ULONG nIdx ); - virtual ULONG GetIdx2() const; - virtual void SetIdx2( ULONG nIdx ); + sal_uLong GetPCDIMax() const; + sal_uLong GetPCDIdx() const; + void SetPCDIdx( sal_uLong nIdx ); + virtual sal_uLong GetIdx2() const; + virtual void SetIdx2( sal_uLong nIdx ); virtual bool SeekPos(WW8_CP nCpPos); virtual WW8_CP Where(); virtual void GetSprms( WW8PLCFxDesc* p ); @@ -628,9 +628,9 @@ private: wwSprmParser maSprmParser; SvStream* pStrm; WW8PLCF* pPLCF; - BYTE* pSprms; - USHORT nArrMax; - UINT16 nSprmSiz; + sal_uInt8* pSprms; + sal_uInt16 nArrMax; + sal_uInt16 nSprmSiz; //no copying WW8PLCFx_SEPX(const WW8PLCFx_SEPX&); @@ -639,19 +639,19 @@ public: WW8PLCFx_SEPX( SvStream* pSt, SvStream* pTblxySt, const WW8Fib& rFib, WW8_CP nStartCp ); virtual ~WW8PLCFx_SEPX(); - virtual ULONG GetIdx() const; - virtual void SetIdx( ULONG nIdx ); + virtual sal_uLong GetIdx() const; + virtual void SetIdx( sal_uLong nIdx ); long GetIMax() const { return ( pPLCF ) ? pPLCF->GetIMax() : 0; } virtual bool SeekPos(WW8_CP nCpPos); virtual WW8_FC Where(); virtual void GetSprms( WW8PLCFxDesc* p ); virtual WW8PLCFx& operator ++( int ); - const BYTE* HasSprm( USHORT nId ) const; - const BYTE* HasSprm( USHORT nId, BYTE n2nd ) const; - const BYTE* HasSprm( USHORT nId, const BYTE* pOtherSprms, + const sal_uInt8* HasSprm( sal_uInt16 nId ) const; + const sal_uInt8* HasSprm( sal_uInt16 nId, sal_uInt8 n2nd ) const; + const sal_uInt8* HasSprm( sal_uInt16 nId, const sal_uInt8* pOtherSprms, long nOtherSprmSiz ) const; - bool Find4Sprms(USHORT nId1, USHORT nId2, USHORT nId3, USHORT nId4, - BYTE*& p1, BYTE*& p2, BYTE*& p3, BYTE*& p4 ) const; + bool Find4Sprms(sal_uInt16 nId1, sal_uInt16 nId2, sal_uInt16 nId3, sal_uInt16 nId4, + sal_uInt8*& p1, sal_uInt8*& p2, sal_uInt8*& p3, sal_uInt8*& p4 ) const; }; /// Iterator fuer Fuss-/Endnoten und Anmerkungen @@ -668,8 +668,8 @@ public: WW8PLCFx_SubDoc(SvStream* pSt, ww::WordVersion eVersion, WW8_CP nStartCp, long nFcRef, long nLenRef, long nFcTxt, long nLenTxt, long nStruc = 0); virtual ~WW8PLCFx_SubDoc(); - virtual ULONG GetIdx() const; - virtual void SetIdx( ULONG nIdx ); + virtual sal_uLong GetIdx() const; + virtual void SetIdx( sal_uLong nIdx ); virtual bool SeekPos(WW8_CP nCpPos); virtual WW8_FC Where(); @@ -698,8 +698,8 @@ private: public: WW8PLCFx_FLD(SvStream* pSt, const WW8Fib& rMyFib, short nType); virtual ~WW8PLCFx_FLD(); - virtual ULONG GetIdx() const; - virtual void SetIdx( ULONG nIdx ); + virtual sal_uLong GetIdx() const; + virtual void SetIdx( sal_uLong nIdx ); virtual bool SeekPos(WW8_CP nCpPos); virtual WW8_FC Where(); virtual void GetSprms(WW8PLCFxDesc* p); @@ -719,7 +719,7 @@ private: ::std::vector<String> aBookNames; // Name eBookStatus* pStatus; long nIMax; // Number of Booknotes - USHORT nIsEnd; + sal_uInt16 nIsEnd; int nBookmarkId; // counter incremented by GetUniqueBookmarkName. //No copying @@ -729,10 +729,10 @@ public: WW8PLCFx_Book(SvStream* pTblSt,const WW8Fib& rFib); virtual ~WW8PLCFx_Book(); long GetIMax() const { return nIMax; } - virtual ULONG GetIdx() const; - virtual void SetIdx( ULONG nI ); - virtual ULONG GetIdx2() const; - virtual void SetIdx2( ULONG nIdx ); + virtual sal_uLong GetIdx() const; + virtual void SetIdx( sal_uLong nI ); + virtual sal_uLong GetIdx2() const; + virtual void SetIdx2( sal_uLong nIdx ); virtual bool SeekPos(WW8_CP nCpPos); virtual WW8_FC Where(); virtual long GetNoSprms( WW8_CP& rStart, WW8_CP& rEnd, sal_Int32& rLen ); @@ -743,9 +743,9 @@ public: long GetLen() const; bool GetIsEnd() const { return nIsEnd ? true : false; } long GetHandle() const; - void SetStatus( USHORT nIndex, eBookStatus eStat ); + void SetStatus( sal_uInt16 nIndex, eBookStatus eStat ); bool MapName(String& rName); - String GetBookmark(long nStart,long nEnd, USHORT &nIndex); + String GetBookmark(long nStart,long nEnd, sal_uInt16 &nIndex); eBookStatus GetStatus() const; String GetUniqueBookmarkName(String &suggestedName); }; @@ -759,11 +759,11 @@ struct WW8PLCFManResult long nMemLen; // Laenge dazu long nCp2OrIdx; // footnote-textpos oder Index in PLCF WW8_CP nAktCp; // wird nur vom Aufrufer benutzt - const BYTE* pMemPos;// Mem-Pos fuer Sprms - USHORT nSprmId; // Sprm-Id ( 0 = ungueltige Id -> ueberspringen! ) + const sal_uInt8* pMemPos;// Mem-Pos fuer Sprms + sal_uInt16 nSprmId; // Sprm-Id ( 0 = ungueltige Id -> ueberspringen! ) // (2..255) oder Pseudo-Sprm-Id (256..260) // bzw. ab Winword-Ver8 die Sprm-Id (800..) - BYTE nFlags; // Absatz- oder Section-Anfang + sal_uInt8 nFlags; // Absatz- oder Section-Anfang }; enum ManMaskTypes @@ -784,8 +784,8 @@ enum ManTypes // enums for PLCFMan-ctor struct WW8PLCFxDesc { WW8PLCFx* pPLCFx; - ::std::stack<USHORT>* pIdStk; // Speicher fuer Attr-Id fuer Attr-Ende(n) - const BYTE* pMemPos;// wo liegen die Sprm(s) + ::std::stack<sal_uInt16>* pIdStk; // Speicher fuer Attr-Id fuer Attr-Ende(n) + const sal_uInt8* pMemPos;// wo liegen die Sprm(s) long nOrigSprmsLen; WW8_CP nStartPos; @@ -830,7 +830,7 @@ private: WW8_CP nLineEnd; // zeigt *hinter* das <CR> long nLastWhereIdxCp; // last result of WhereIdx() - USHORT nPLCF; // so viele PLCFe werden verwaltet + sal_uInt16 nPLCF; // so viele PLCFe werden verwaltet ManTypes nManType; bool mbDoingDrawTextBox; //Normally we adjust the end of attributes //so that the end of a paragraph occurs @@ -841,11 +841,11 @@ private: WW8PLCFxDesc *pChp, *pPap, *pSep, *pFld, *pFtn, *pEdn, *pBkm, *pPcd, *pPcdA, *pAnd; WW8PLCFspecial *pFdoa, *pTxbx, *pTxbxBkd,*pMagicTables, *pSubdocs; - BYTE* pExtendedAtrds; + sal_uInt8* pExtendedAtrds; const WW8Fib* pWwFib; - USHORT WhereIdx(bool* pbStart=0, long* pPos=0) const; + sal_uInt16 WhereIdx(bool* pbStart=0, long* pPos=0) const; void AdjustEnds(WW8PLCFxDesc& rDesc); void GetNewSprms(WW8PLCFxDesc& rDesc); void GetNewNoSprms(WW8PLCFxDesc& rDesc); @@ -855,7 +855,7 @@ private: void GetNoSprmEnd(short nIdx, WW8PLCFManResult* pRes) const; void AdvSprm(short nIdx, bool bStart); void AdvNoSprm(short nIdx, bool bStart); - USHORT GetId(const WW8PLCFxDesc* p ) const; + sal_uInt16 GetId(const WW8PLCFxDesc* p ) const; public: WW8PLCFMan(WW8ScannerBase* pBase, ManTypes nType, long nStartCp, bool bDoingDrawTextBox = false); @@ -869,7 +869,7 @@ public: bool Get(WW8PLCFManResult* pResult) const; WW8PLCFMan& operator ++( int ); - USHORT GetColl() const; // index of actual Style + sal_uInt16 GetColl() const; // index of actual Style WW8PLCFx_FLD* GetFld() const; WW8PLCFx_SubDoc* GetEdn() const { return (WW8PLCFx_SubDoc*)pEdn->pPLCFx; } WW8PLCFx_SubDoc* GetFtn() const { return (WW8PLCFx_SubDoc*)pFtn->pPLCFx; } @@ -878,11 +878,11 @@ public: long GetCpOfs() const { return pChp->nCpOfs; } // for Header/Footer... /* fragt, ob *aktueller Absatz* einen Sprm diesen Typs hat */ - const BYTE* HasParaSprm( USHORT nId ) const; + const sal_uInt8* HasParaSprm( sal_uInt16 nId ) const; /* fragt, ob *aktueller Textrun* einen Sprm diesen Typs hat */ - const BYTE* HasCharSprm( USHORT nId ) const; - bool HasCharSprm(USHORT nId, std::vector<const BYTE *> &rResult) const; + const sal_uInt8* HasCharSprm( sal_uInt16 nId ) const; + bool HasCharSprm(sal_uInt16 nId, std::vector<const sal_uInt8 *> &rResult) const; WW8PLCFx_Cp_FKP* GetChpPLCF() const { return (WW8PLCFx_Cp_FKP*)pChp->pPLCFx; } @@ -891,7 +891,7 @@ public: WW8PLCFx_SEPX* GetSepPLCF() const { return (WW8PLCFx_SEPX*)pSep->pPLCFx; } WW8PLCFxDesc* GetPap() const { return pPap; } - bool TransferOpenSprms(std::stack<USHORT> &rStack); + bool TransferOpenSprms(std::stack<sal_uInt16> &rStack); void SeekPos( long nNewCp ); void SaveAllPLCFx( WW8PLCFxSaveAll& rSave ) const; void RestoreAllPLCFx( const WW8PLCFxSaveAll& rSave ); @@ -900,7 +900,7 @@ public: WW8PLCFspecial* GetTxbxBkd() const { return pTxbxBkd; } WW8PLCFspecial* GetMagicTables() const { return pMagicTables; } WW8PLCFspecial* GetWkbPLCF() const { return pSubdocs; } - BYTE* GetExtendedAtrds() const { return pExtendedAtrds; } + sal_uInt8* GetExtendedAtrds() const { return pExtendedAtrds; } ManTypes GetManType() const { return nManType; } bool GetDoingDrawTextBox() const { return mbDoingDrawTextBox; } }; @@ -948,15 +948,15 @@ private: WW8PLCFspecial* pHdFtTxbxBkd; // Break-Deskriptoren fuer diese WW8PLCFspecial* pMagicTables; // Break-Deskriptoren fuer diese WW8PLCFspecial* pSubdocs; // subdoc references in master document - BYTE* pExtendedAtrds; // Extended ATRDs + sal_uInt8* pExtendedAtrds; // Extended ATRDs WW8PLCFx_Book* pBook; // Bookmarks WW8PLCFpcd* pPiecePLCF; // fuer FastSave ( Basis-PLCF ohne Iterator ) WW8PLCFpcd_Iter* pPieceIter; // fuer FastSave ( Iterator dazu ) WW8PLCFx_PCD* pPLCFx_PCD; // dito WW8PLCFx_PCDAttrs* pPLCFx_PCDAttrs; - BYTE** pPieceGrpprls; // Attribute an Piece-Table - UINT16 nPieceGrpprls; // Anzahl davon + sal_uInt8** pPieceGrpprls; // Attribute an Piece-Table + sal_uInt16 nPieceGrpprls; // Anzahl davon WW8PLCFpcd* OpenPieceTable( SvStream* pStr, const WW8Fib* pWwF ); void DeletePieceTable(); @@ -997,17 +997,17 @@ public: 7 == "only WinWord 95" 8 == "WinWord 97 or newer" */ - BYTE nVersion; + sal_uInt8 nVersion; /* error status */ - ULONG nFibError; + sal_uLong nFibError; /* vom Ctor aus dem FIB gelesene Daten (entspricht nur ungefaehr der tatsaechlichen Struktur des Winword-FIB) */ - UINT16 wIdent; // 0x0 int magic number + sal_uInt16 wIdent; // 0x0 int magic number /* File Information Block (FIB) values: WinWord 1.0 = 33 @@ -1021,20 +1021,20 @@ public: Word 2003 = 268 Word 2007 = 274 */ - UINT16 nFib; // 0x2 FIB version written - UINT16 nProduct; // 0x4 product version written by - INT16 lid; // 0x6 language stamp---localized version; + sal_uInt16 nFib; // 0x2 FIB version written + sal_uInt16 nProduct; // 0x4 product version written by + sal_Int16 lid; // 0x6 language stamp---localized version; WW8_PN pnNext; // 0x8 - UINT16 fDot :1; // 0xa 0001 - UINT16 fGlsy :1; - UINT16 fComplex :1; // 0004 when 1, file is in complex, fast-saved format. - UINT16 fHasPic :1; // 0008 file contains 1 or more pictures - UINT16 cQuickSaves :4; // 00F0 count of times file was quicksaved - UINT16 fEncrypted :1; //0100 1 if file is encrypted, 0 if not - UINT16 fWhichTblStm :1; //0200 When 0, this fib refers to the table stream - UINT16 fReadOnlyRecommended :1; - UINT16 fWriteReservation :1; + sal_uInt16 fDot :1; // 0xa 0001 + sal_uInt16 fGlsy :1; + sal_uInt16 fComplex :1; // 0004 when 1, file is in complex, fast-saved format. + sal_uInt16 fHasPic :1; // 0008 file contains 1 or more pictures + sal_uInt16 cQuickSaves :4; // 00F0 count of times file was quicksaved + sal_uInt16 fEncrypted :1; //0100 1 if file is encrypted, 0 if not + sal_uInt16 fWhichTblStm :1; //0200 When 0, this fib refers to the table stream + sal_uInt16 fReadOnlyRecommended :1; + sal_uInt16 fWriteReservation :1; // named "0Table", when 1, this fib refers to the // table stream named "1Table". Normally, a file // will have only one table stream, but under unusual @@ -1042,55 +1042,55 @@ public: // both names. In that case, this flag must be used // to decide which table stream is valid. - UINT16 fExtChar :1; // 1000 =1, when using extended character set in file - UINT16 fFarEast :1; // 4000 =1, probably, when far-East language vaiants of Word is used to create a file #i90932# + sal_uInt16 fExtChar :1; // 1000 =1, when using extended character set in file + sal_uInt16 fFarEast :1; // 4000 =1, probably, when far-East language vaiants of Word is used to create a file #i90932# - UINT16 fObfuscated :1; // 8000=1. specifies whether the document is obfuscated using XOR obfuscation. otherwise this bit MUST be ignored. + sal_uInt16 fObfuscated :1; // 8000=1. specifies whether the document is obfuscated using XOR obfuscation. otherwise this bit MUST be ignored. - UINT16 nFibBack; // 0xc - UINT16 nHash; // 0xe file encrypted hash - UINT16 nKey; // 0x10 file encrypted key - UINT8 envr; // 0x12 environment in which file was created + sal_uInt16 nFibBack; // 0xc + sal_uInt16 nHash; // 0xe file encrypted hash + sal_uInt16 nKey; // 0x10 file encrypted key + sal_uInt8 envr; // 0x12 environment in which file was created // 0 created by Win Word / 1 created by Mac Word - BYTE fMac :1; // 0x13 when 1, this file was last saved in the Mac environment - BYTE fEmptySpecial :1; - BYTE fLoadOverridePage :1; - BYTE fFuturesavedUndo :1; - BYTE fWord97Saved :1; - BYTE fWord2000Saved :1; - BYTE :2; - - UINT16 chse; // 0x14 default extended character set id for text in document stream. (overidden by chp.chse) + sal_uInt8 fMac :1; // 0x13 when 1, this file was last saved in the Mac environment + sal_uInt8 fEmptySpecial :1; + sal_uInt8 fLoadOverridePage :1; + sal_uInt8 fFuturesavedUndo :1; + sal_uInt8 fWord97Saved :1; + sal_uInt8 fWord2000Saved :1; + sal_uInt8 :2; + + sal_uInt16 chse; // 0x14 default extended character set id for text in document stream. (overidden by chp.chse) // 0 = ANSI / 256 Macintosh character set. - UINT16 chseTables; // 0x16 default extended character set id for text in + sal_uInt16 chseTables; // 0x16 default extended character set id for text in // internal data structures: 0 = ANSI, 256 = Macintosh WW8_FC fcMin; // 0x18 file offset of first character of text WW8_FC fcMac; // 0x1c file offset of last character of text + 1 // Einschub fuer WW8 ***************************************************** - UINT16 csw; // Count of fields in the array of "shorts" + sal_uInt16 csw; // Count of fields in the array of "shorts" // Marke: "rgsw" Beginning of the array of shorts - UINT16 wMagicCreated; // unique number Identifying the File's creator + sal_uInt16 wMagicCreated; // unique number Identifying the File's creator // 0x6A62 is the creator ID for Word and is reserved. // Other creators should choose a different value. - UINT16 wMagicRevised; // identifies the File's last modifier - UINT16 wMagicCreatedPrivate; // private data - UINT16 wMagicRevisedPrivate; // private data + sal_uInt16 wMagicRevised; // identifies the File's last modifier + sal_uInt16 wMagicCreatedPrivate; // private data + sal_uInt16 wMagicRevisedPrivate; // private data /* - INT16 pnFbpChpFirst_W6; // not used - INT16 pnChpFirst_W6; // not used - INT16 cpnBteChp_W6; // not used - INT16 pnFbpPapFirst_W6; // not used - INT16 pnPapFirst_W6; // not used - INT16 cpnBtePap_W6; // not used - INT16 pnFbpLvcFirst_W6; // not used - INT16 pnLvcFirst_W6; // not used - INT16 cpnBteLvc_W6; // not used + sal_Int16 pnFbpChpFirst_W6; // not used + sal_Int16 pnChpFirst_W6; // not used + sal_Int16 cpnBteChp_W6; // not used + sal_Int16 pnFbpPapFirst_W6; // not used + sal_Int16 pnPapFirst_W6; // not used + sal_Int16 cpnBtePap_W6; // not used + sal_Int16 pnFbpLvcFirst_W6; // not used + sal_Int16 pnLvcFirst_W6; // not used + sal_Int16 cpnBteLvc_W6; // not used */ - INT16 lidFE; // Language id if document was written by Far East version + sal_Int16 lidFE; // Language id if document was written by Far East version // of Word (i.e. FIB.fFarEast is on) - UINT16 clw; // Number of fields in the array of longs + sal_uInt16 clw; // Number of fields in the array of longs // Ende des Einschubs fuer WW8 ******************************************* @@ -1108,7 +1108,7 @@ public: WW8_CP ccpHdrTxbx; // 0x50 length of header textbox subdocument text stream // Einschub fuer WW8 ***************************************************** - INT32 pnFbpChpFirst; // when there was insufficient memory for Word to expand + sal_Int32 pnFbpChpFirst; // when there was insufficient memory for Word to expand // the PLCFbte at save time, the PLCFbte is written // to the file in a linked list of 512-byte pieces // starting with this pn. @@ -1116,13 +1116,13 @@ public: // folgende Felder existieren zwar so in der Datei, // wir benutzen jedoch unten deklarierte General-Variablen // fuer Ver67 und Ver8 gemeinsam. - INT32 pnChpFirst; // the page number of the lowest numbered page in the + sal_Int32 pnChpFirst; // the page number of the lowest numbered page in the // document that records CHPX FKP information - INT32 cpnBteChp; // count of CHPX FKPs recorded in file. In non-complex + sal_Int32 cpnBteChp; // count of CHPX FKPs recorded in file. In non-complex // files if the number of entries in the PLCFbteChpx // is less than this, the PLCFbteChpx is incomplete. */ - INT32 pnFbpPapFirst; // when there was insufficient memory for Word to expand + sal_Int32 pnFbpPapFirst; // when there was insufficient memory for Word to expand // the PLCFbte at save time, the PLCFbte is written to // the file in a linked list of 512-byte pieces // starting with this pn @@ -1130,24 +1130,24 @@ public: // folgende Felder existieren zwar so in der Datei, // wir benutzen jedoch unten deklarierte General-Variablen // fuer Ver67 und Ver8 gemeinsam. - INT32 pnPapFirst; // the page number of the lowest numbered page in the + sal_Int32 pnPapFirst; // the page number of the lowest numbered page in the // document that records PAPX FKP information - INT32 cpnBtePap; // count of PAPX FKPs recorded in file. In non-complex + sal_Int32 cpnBtePap; // count of PAPX FKPs recorded in file. In non-complex // files if the number of entries in the PLCFbtePapx is // less than this, the PLCFbtePapx is incomplete. */ - INT32 pnFbpLvcFirst; // when there was insufficient memory for Word to expand + sal_Int32 pnFbpLvcFirst; // when there was insufficient memory for Word to expand // the PLCFbte at save time, the PLCFbte is written to // the file in a linked list of 512-byte pieces // starting with this pn - INT32 pnLvcFirst; // the page number of the lowest numbered page in the + sal_Int32 pnLvcFirst; // the page number of the lowest numbered page in the // document that records LVC FKP information - INT32 cpnBteLvc; // count of LVC FKPs recorded in file. In non-complex + sal_Int32 cpnBteLvc; // count of LVC FKPs recorded in file. In non-complex // files if the number of entries in the PLCFbtePapx is // less than this, the PLCFbtePapx is incomplete. - INT32 fcIslandFirst; // ? - INT32 fcIslandLim; // ? - UINT16 cfclcb; // Number of fields in the array of FC/LCB pairs. + sal_Int32 fcIslandFirst; // ? + sal_Int32 fcIslandLim; // ? + sal_uInt16 cfclcb; // Number of fields in the array of FC/LCB pairs. // Ende des Einschubs fuer WW8 ******************************************* @@ -1155,105 +1155,105 @@ public: WW8_FC fcStshfOrig; // file offset of original allocation for STSH in table // stream. During fast save Word will attempt to reuse // this allocation if STSH is small enough to fit. - INT32 lcbStshfOrig; // 0x5c count of bytes of original STSH allocation + sal_Int32 lcbStshfOrig; // 0x5c count of bytes of original STSH allocation WW8_FC fcStshf; // 0x60 file offset of STSH in file. - INT32 lcbStshf; // 0x64 count of bytes of current STSH allocation + sal_Int32 lcbStshf; // 0x64 count of bytes of current STSH allocation WW8_FC fcPlcffndRef; // 0x68 file offset of footnote reference PLCF. - INT32 lcbPlcffndRef; // 0x6c count of bytes of footnote reference PLCF + sal_Int32 lcbPlcffndRef; // 0x6c count of bytes of footnote reference PLCF // == 0 if no footnotes defined in document. WW8_FC fcPlcffndTxt; // 0x70 file offset of footnote text PLCF. - INT32 lcbPlcffndTxt; // 0x74 count of bytes of footnote text PLCF. + sal_Int32 lcbPlcffndTxt; // 0x74 count of bytes of footnote text PLCF. // == 0 if no footnotes defined in document WW8_FC fcPlcfandRef; // 0x78 file offset of annotation reference PLCF. - INT32 lcbPlcfandRef; // 0x7c count of bytes of annotation reference PLCF. + sal_Int32 lcbPlcfandRef; // 0x7c count of bytes of annotation reference PLCF. WW8_FC fcPlcfandTxt; // 0x80 file offset of annotation text PLCF. - INT32 lcbPlcfandTxt; // 0x84 count of bytes of the annotation text PLCF + sal_Int32 lcbPlcfandTxt; // 0x84 count of bytes of the annotation text PLCF WW8_FC fcPlcfsed; // 8x88 file offset of section descriptor PLCF. - INT32 lcbPlcfsed; // 0x8c count of bytes of section descriptor PLCF. + sal_Int32 lcbPlcfsed; // 0x8c count of bytes of section descriptor PLCF. WW8_FC fcPlcfpad; // 0x90 file offset of paragraph descriptor PLCF - INT32 lcbPlcfpad; // 0x94 count of bytes of paragraph descriptor PLCF. + sal_Int32 lcbPlcfpad; // 0x94 count of bytes of paragraph descriptor PLCF. // ==0 if file was never viewed in Outline view. // Should not be written by third party creators WW8_FC fcPlcfphe; // 0x98 file offset of PLCF of paragraph heights. - INT32 lcbPlcfphe; // 0x9c count of bytes of paragraph height PLCF. + sal_Int32 lcbPlcfphe; // 0x9c count of bytes of paragraph height PLCF. // ==0 when file is non-complex. WW8_FC fcSttbfglsy; // 0xa0 file offset of glossary string table. - INT32 lcbSttbfglsy; // 0xa4 count of bytes of glossary string table. + sal_Int32 lcbSttbfglsy; // 0xa4 count of bytes of glossary string table. // == 0 for non-glossary documents. // !=0 for glossary documents. WW8_FC fcPlcfglsy; // 0xa8 file offset of glossary PLCF. - INT32 lcbPlcfglsy; // 0xac count of bytes of glossary PLCF. + sal_Int32 lcbPlcfglsy; // 0xac count of bytes of glossary PLCF. // == 0 for non-glossary documents. // !=0 for glossary documents. WW8_FC fcPlcfhdd; // 0xb0 byte offset of header PLCF. - INT32 lcbPlcfhdd; // 0xb4 count of bytes of header PLCF. + sal_Int32 lcbPlcfhdd; // 0xb4 count of bytes of header PLCF. // == 0 if document contains no headers WW8_FC fcPlcfbteChpx; // 0xb8 file offset of character property bin table.PLCF. - INT32 lcbPlcfbteChpx;// 0xbc count of bytes of character property bin table PLCF. + sal_Int32 lcbPlcfbteChpx;// 0xbc count of bytes of character property bin table PLCF. WW8_FC fcPlcfbtePapx; // 0xc0 file offset of paragraph property bin table.PLCF. - INT32 lcbPlcfbtePapx;// 0xc4 count of bytes of paragraph property bin table PLCF. + sal_Int32 lcbPlcfbtePapx;// 0xc4 count of bytes of paragraph property bin table PLCF. WW8_FC fcPlcfsea; // 0xc8 file offset of PLCF reserved for private use. The SEA is 6 bytes long. - INT32 lcbPlcfsea; // 0xcc count of bytes of private use PLCF. + sal_Int32 lcbPlcfsea; // 0xcc count of bytes of private use PLCF. WW8_FC fcSttbfffn; // 0xd0 file offset of font information STTBF. See the FFN file structure definition. - INT32 lcbSttbfffn; // 0xd4 count of bytes in sttbfffn. + sal_Int32 lcbSttbfffn; // 0xd4 count of bytes in sttbfffn. WW8_FC fcPlcffldMom; // 0xd8 offset in doc stream to the PLCF of field positions in the main document. - INT32 lcbPlcffldMom; // 0xdc + sal_Int32 lcbPlcffldMom; // 0xdc WW8_FC fcPlcffldHdr; // 0xe0 offset in doc stream to the PLCF of field positions in the header subdocument. - INT32 lcbPlcffldHdr; // 0xe4 + sal_Int32 lcbPlcffldHdr; // 0xe4 WW8_FC fcPlcffldFtn; // 0xe8 offset in doc stream to the PLCF of field positions in the footnote subdocument. - INT32 lcbPlcffldFtn; // 0xec + sal_Int32 lcbPlcffldFtn; // 0xec WW8_FC fcPlcffldAtn; // 0xf0 offset in doc stream to the PLCF of field positions in the annotation subdocument. - INT32 lcbPlcffldAtn; // 0xf4 + sal_Int32 lcbPlcffldAtn; // 0xf4 WW8_FC fcPlcffldMcr; // 0xf8 offset in doc stream to the PLCF of field positions in the macro subdocument. - INT32 lcbPlcffldMcr; // 9xfc + sal_Int32 lcbPlcffldMcr; // 9xfc WW8_FC fcSttbfbkmk; // 0x100 offset in document stream of the STTBF that records bookmark names in the main document - INT32 lcbSttbfbkmk; // 0x104 + sal_Int32 lcbSttbfbkmk; // 0x104 WW8_FC fcPlcfbkf; // 0x108 offset in document stream of the PLCF that records the beginning CP offsets of bookmarks in the main document. See BKF - INT32 lcbPlcfbkf; // 0x10c + sal_Int32 lcbPlcfbkf; // 0x10c WW8_FC fcPlcfbkl; // 0x110 offset in document stream of the PLCF that records the ending CP offsets of bookmarks recorded in the main document. See the BKL structure definition. - INT32 lcbPlcfbkl; // 0x114 INT32 + sal_Int32 lcbPlcfbkl; // 0x114 sal_Int32 WW8_FC fcCmds; // 0x118 FC - INT32 lcbCmds; // 0x11c + sal_Int32 lcbCmds; // 0x11c WW8_FC fcPlcfmcr; // 0x120 FC - INT32 lcbPlcfmcr; // 0x124 + sal_Int32 lcbPlcfmcr; // 0x124 WW8_FC fcSttbfmcr; // 0x128 FC - INT32 lcbSttbfmcr; // 0x12c + sal_Int32 lcbSttbfmcr; // 0x12c WW8_FC fcPrDrvr; // 0x130 file offset of the printer driver information (names of drivers, port etc...) - INT32 lcbPrDrvr; // 0x134 count of bytes of the printer driver information (names of drivers, port etc...) + sal_Int32 lcbPrDrvr; // 0x134 count of bytes of the printer driver information (names of drivers, port etc...) WW8_FC fcPrEnvPort; // 0x138 file offset of the print environment in portrait mode. - INT32 lcbPrEnvPort; // 0x13c count of bytes of the print environment in portrait mode. + sal_Int32 lcbPrEnvPort; // 0x13c count of bytes of the print environment in portrait mode. WW8_FC fcPrEnvLand; // 0x140 file offset of the print environment in landscape mode. - INT32 lcbPrEnvLand; // 0x144 count of bytes of the print environment in landscape mode. + sal_Int32 lcbPrEnvLand; // 0x144 count of bytes of the print environment in landscape mode. WW8_FC fcWss; // 0x148 file offset of Window Save State data structure. See WSS. - INT32 lcbWss; // 0x14c count of bytes of WSS. ==0 if unable to store the window state. + sal_Int32 lcbWss; // 0x14c count of bytes of WSS. ==0 if unable to store the window state. WW8_FC fcDop; // 0x150 file offset of document property data structure. sal_uInt32 lcbDop; // 0x154 count of bytes of document properties. @@ -1261,27 +1261,27 @@ public: WW8_FC fcSttbfAssoc; // 0x158 offset to STTBF of associated strings. See STTBFASSOC. - INT32 lcbSttbfAssoc; // 0x15C + sal_Int32 lcbSttbfAssoc; // 0x15C WW8_FC fcClx; // 0x160 file offset of beginning of information for complex files. - INT32 lcbClx; // 0x164 count of bytes of complex file information. 0 if file is non-complex. + sal_Int32 lcbClx; // 0x164 count of bytes of complex file information. 0 if file is non-complex. WW8_FC fcPlcfpgdFtn; // 0x168 file offset of page descriptor PLCF for footnote subdocument. - INT32 lcbPlcfpgdFtn; // 0x16C count of bytes of page descriptor PLCF for footnote subdocument. + sal_Int32 lcbPlcfpgdFtn; // 0x16C count of bytes of page descriptor PLCF for footnote subdocument. // ==0 if document has not been paginated. The length of the PGD is 8 bytes. WW8_FC fcAutosaveSource; // 0x170 file offset of the name of the original file. - INT32 lcbAutosaveSource; // 0x174 count of bytes of the name of the original file. + sal_Int32 lcbAutosaveSource; // 0x174 count of bytes of the name of the original file. WW8_FC fcGrpStAtnOwners; // 0x178 group of strings recording the names of the owners of annotations - INT32 lcbGrpStAtnOwners; // 0x17C count of bytes of the group of strings + sal_Int32 lcbGrpStAtnOwners; // 0x17C count of bytes of the group of strings WW8_FC fcSttbfAtnbkmk; // 0x180 file offset of the sttbf that records names of bookmarks in the annotation subdocument - INT32 lcbSttbfAtnbkmk; // 0x184 length in bytes of the sttbf that records names of bookmarks in the annotation subdocument + sal_Int32 lcbSttbfAtnbkmk; // 0x184 length in bytes of the sttbf that records names of bookmarks in the annotation subdocument // Einschubs fuer WW67 *************************************************** - // INT16 wSpare4Fib; // Reserve, muss hier nicht deklariert werden + // sal_Int16 wSpare4Fib; // Reserve, muss hier nicht deklariert werden /* // folgende Felder existieren zwar so in der Datei, @@ -1305,144 +1305,144 @@ public: WW8_FC fcPlcfdoaMom; // 0x192 file offset of the FDOA (drawn object) PLCF for main document. // ==0 if document has no drawn objects. The length of the FDOA is 6 bytes. // ab Ver8 unused - INT32 lcbPlcfdoaMom; // 0x196 length in bytes of the FDOA PLCF of the main document + sal_Int32 lcbPlcfdoaMom; // 0x196 length in bytes of the FDOA PLCF of the main document // ab Ver8 unused WW8_FC fcPlcfdoaHdr; // 0x19A file offset of the FDOA (drawn object) PLCF for the header document. // ==0 if document has no drawn objects. The length of the FDOA is 6 bytes. // ab Ver8 unused - INT32 lcbPlcfdoaHdr; // 0x19E length in bytes of the FDOA PLCF of the header document + sal_Int32 lcbPlcfdoaHdr; // 0x19E length in bytes of the FDOA PLCF of the header document // ab Ver8 unused WW8_FC fcPlcfspaMom; // offset in table stream of the FSPA PLCF for main document. // == 0 if document has no office art objects // war in Ver67 nur leere Reserve - INT32 lcbPlcfspaMom; // length in bytes of the FSPA PLCF of the main document + sal_Int32 lcbPlcfspaMom; // length in bytes of the FSPA PLCF of the main document // war in Ver67 nur leere Reserve WW8_FC fcPlcfspaHdr; // offset in table stream of the FSPA PLCF for header document. // == 0 if document has no office art objects // war in Ver67 nur leere Reserve - INT32 lcbPlcfspaHdr; // length in bytes of the FSPA PLCF of the header document + sal_Int32 lcbPlcfspaHdr; // length in bytes of the FSPA PLCF of the header document // war in Ver67 nur leere Reserve WW8_FC fcPlcfAtnbkf; // 0x1B2 file offset of BKF (bookmark first) PLCF of the annotation subdocument - INT32 lcbPlcfAtnbkf; // 0x1B6 length in bytes of BKF (bookmark first) PLCF of the annotation subdocument + sal_Int32 lcbPlcfAtnbkf; // 0x1B6 length in bytes of BKF (bookmark first) PLCF of the annotation subdocument WW8_FC fcPlcfAtnbkl; // 0x1BA file offset of BKL (bookmark last) PLCF of the annotation subdocument - INT32 lcbPlcfAtnbkl; // 0x1BE length in bytes of BKL (bookmark first) PLCF of the annotation subdocument + sal_Int32 lcbPlcfAtnbkl; // 0x1BE length in bytes of BKL (bookmark first) PLCF of the annotation subdocument WW8_FC fcPms; // 0x1C2 file offset of PMS (Print Merge State) information block - INT32 lcbPMS; // 0x1C6 length in bytes of PMS + sal_Int32 lcbPMS; // 0x1C6 length in bytes of PMS WW8_FC fcFormFldSttbf; // 0x1CA file offset of form field Sttbf which contains strings used in form field dropdown controls - INT32 lcbFormFldSttbf; // 0x1CE length in bytes of form field Sttbf + sal_Int32 lcbFormFldSttbf; // 0x1CE length in bytes of form field Sttbf WW8_FC fcPlcfendRef; // 0x1D2 file offset of PLCFendRef which points to endnote references in the main document stream - INT32 lcbPlcfendRef; // 0x1D6 + sal_Int32 lcbPlcfendRef; // 0x1D6 WW8_FC fcPlcfendTxt; // 0x1DA file offset of PLCFendRef which points to endnote text in the endnote document // stream which corresponds with the PLCFendRef - INT32 lcbPlcfendTxt; // 0x1DE + sal_Int32 lcbPlcfendTxt; // 0x1DE WW8_FC fcPlcffldEdn; // 0x1E2 offset to PLCF of field positions in the endnote subdoc - INT32 lcbPlcffldEdn; // 0x1E6 + sal_Int32 lcbPlcffldEdn; // 0x1E6 WW8_FC fcPlcfpgdEdn; // 0x1EA offset to PLCF of page boundaries in the endnote subdoc. - INT32 lcbPlcfpgdEdn; // 0x1EE + sal_Int32 lcbPlcfpgdEdn; // 0x1EE WW8_FC fcDggInfo; // offset in table stream of the office art object table data. // The format of office art object table data is found in a separate document. // war in Ver67 nur leere Reserve - INT32 lcbDggInfo; // length in bytes of the office art object table data + sal_Int32 lcbDggInfo; // length in bytes of the office art object table data // war in Ver67 nur leere Reserve WW8_FC fcSttbfRMark; // 0x1fa offset to STTBF that records the author abbreviations... - INT32 lcbSttbfRMark; // 0x1fe + sal_Int32 lcbSttbfRMark; // 0x1fe WW8_FC fcSttbfCaption; // 0x202 offset to STTBF that records caption titles... - INT32 lcbSttbfCaption; // 0x206 + sal_Int32 lcbSttbfCaption; // 0x206 WW8_FC fcSttbAutoCaption; // offset in table stream to the STTBF that records the object names and // indices into the caption STTBF for objects which get auto captions. - INT32 lcbSttbAutoCaption; // 0x20e + sal_Int32 lcbSttbAutoCaption; // 0x20e WW8_FC fcPlcfwkb; // 0x212 offset to PLCF that describes the boundaries of contributing documents... - INT32 lcbPlcfwkb; // 0x216 + sal_Int32 lcbPlcfwkb; // 0x216 WW8_FC fcPlcfspl; // offset in table stream of PLCF (of SPLS structures) that records spell check state // war in Ver67 nur leere Reserve - INT32 lcbPlcfspl; // war in Ver67 nur leere Reserve + sal_Int32 lcbPlcfspl; // war in Ver67 nur leere Reserve WW8_FC fcPlcftxbxTxt; // 0x222 ...PLCF of beginning CP in the text box subdoc - INT32 lcbPlcftxbxTxt; // 0x226 + sal_Int32 lcbPlcftxbxTxt; // 0x226 WW8_FC fcPlcffldTxbx; // 0x22a ...PLCF of field boundaries recorded in the textbox subdoc. - INT32 lcbPlcffldTxbx; // 0x22e + sal_Int32 lcbPlcffldTxbx; // 0x22e WW8_FC fcPlcfHdrtxbxTxt;// 0x232 ...PLCF of beginning CP in the header text box subdoc - INT32 lcbPlcfHdrtxbxTxt;// 0x236 + sal_Int32 lcbPlcfHdrtxbxTxt;// 0x236 WW8_FC fcPlcffldHdrTxbx;// 0x23a ...PLCF of field boundaries recorded in the header textbox subdoc. - INT32 lcbPlcffldHdrTxbx;// 0x23e + sal_Int32 lcbPlcffldHdrTxbx;// 0x23e WW8_FC fcStwUser; sal_uInt32 lcbStwUser; WW8_FC fcSttbttmbd; sal_uInt32 lcbSttbttmbd; WW8_FC fcSttbFnm; // 0x02da offset in the table stream of masters subdocument names - INT32 lcbSttbFnm; // 0x02de length + sal_Int32 lcbSttbFnm; // 0x02de length /* spezielle Listenverwaltung fuer WW8 */ WW8_FC fcPlcfLst; // 0x02e2 offset in the table stream of list format information. - INT32 lcbPlcfLst; // 0x02e6 length + sal_Int32 lcbPlcfLst; // 0x02e6 length WW8_FC fcPlfLfo; // 0x02ea offset in the table stream of list format override information. - INT32 lcbPlfLfo; // 0x02ee length + sal_Int32 lcbPlfLfo; // 0x02ee length /* spezielle Break-Verwaltung fuer Text-Box-Stories in WW8 */ WW8_FC fcPlcftxbxBkd; // 0x02f2 PLCF fuer TextBox-Break-Deskriptoren im Maintext - INT32 lcbPlcftxbxBkd; // 0x02f6 + sal_Int32 lcbPlcftxbxBkd; // 0x02f6 WW8_FC fcPlcfHdrtxbxBkd;// 0x02fa PLCF fuer TextBox-Break-Deskriptoren im Header-/Footer-Bereich - INT32 lcbPlcfHdrtxbxBkd;// 0x02fe + sal_Int32 lcbPlcfHdrtxbxBkd;// 0x02fe // 0x302 - 372 == ignore /* ListNames (skip to here!) */ WW8_FC fcSttbListNames;// 0x0372 PLCF for Listname Table - INT32 lcbSttbListNames;// 0x0376 + sal_Int32 lcbSttbListNames;// 0x0376 WW8_FC fcPlcfTch; - INT32 lcbPlcfTch; + sal_Int32 lcbPlcfTch; // 0x38A - 41A == ignore WW8_FC fcAtrdExtra; - UINT32 lcbAtrdExtra; + sal_uInt32 lcbAtrdExtra; // 0x422 - 0x4D4 == ignore WW8_FC fcHplxsdr; //bizarrely, word xp seems to require this set to shows dates from AtrdExtra - UINT32 lcbHplxsdr; + sal_uInt32 lcbHplxsdr; /* General-Varaiblen, die fuer Ver67 und Ver8 verwendet werden, obwohl sie in der jeweiligen DATEI verschiedene Groesse haben: */ - INT32 pnChpFirst; - INT32 pnPapFirst; - INT32 cpnBteChp; - INT32 cpnBtePap; + sal_Int32 pnChpFirst; + sal_Int32 pnPapFirst; + sal_Int32 cpnBteChp; + sal_Int32 cpnBtePap; /* The actual nFib, moved here because some readers assumed they couldn't read any format with nFib > some constant */ - UINT16 nFib_actual; // 0x05bc #i56856# + sal_uInt16 nFib_actual; // 0x05bc #i56856# /* nun wird lediglich noch ein Ctor benoetigt */ - WW8Fib( SvStream& rStrm, BYTE nWantedVersion,UINT32 nOffset=0 ); + WW8Fib( SvStream& rStrm, sal_uInt8 nWantedVersion,sal_uInt32 nOffset=0 ); /* leider falsch, man braucht auch noch einen fuer den Export */ - WW8Fib( BYTE nVersion = 6 ); + WW8Fib( sal_uInt8 nVersion = 6 ); bool WriteHeader(SvStream& rStrm); bool Write(SvStream& rStrm); - static rtl_TextEncoding GetFIBCharset(UINT16 chs); + static rtl_TextEncoding GetFIBCharset(sal_uInt16 chs); ww::WordVersion GetFIBVersion() const; WW8_CP GetBaseCp(ManTypes nType) const; }; @@ -1455,19 +1455,19 @@ protected: long nStyleStart; long nStyleLen; - UINT16 cstd; // Count of styles in stylesheet - UINT16 cbSTDBaseInFile; // Length of STD Base as stored in a file - UINT16 fStdStylenamesWritten : 1; // Are built-in stylenames stored? - UINT16 : 15; // Spare flags - UINT16 stiMaxWhenSaved; // Max sti known when file was written - UINT16 istdMaxFixedWhenSaved; // How many fixed-index istds are there? - UINT16 nVerBuiltInNamesWhenSaved; // Current version of built-in stylenames + sal_uInt16 cstd; // Count of styles in stylesheet + sal_uInt16 cbSTDBaseInFile; // Length of STD Base as stored in a file + sal_uInt16 fStdStylenamesWritten : 1; // Are built-in stylenames stored? + sal_uInt16 : 15; // Spare flags + sal_uInt16 stiMaxWhenSaved; // Max sti known when file was written + sal_uInt16 istdMaxFixedWhenSaved; // How many fixed-index istds are there? + sal_uInt16 nVerBuiltInNamesWhenSaved; // Current version of built-in stylenames // ftc used by StandardChpStsh for this document - UINT16 ftcStandardChpStsh; + sal_uInt16 ftcStandardChpStsh; // CJK ftc used by StandardChpStsh for this document - UINT16 ftcStandardChpCJKStsh; + sal_uInt16 ftcStandardChpCJKStsh; // CTL ftc used by StandardChpStsh for this document - UINT16 ftcStandardChpCTLStsh; + sal_uInt16 ftcStandardChpCTLStsh; //No copying WW8Style(const WW8Style&); @@ -1476,22 +1476,22 @@ public: WW8Style( SvStream& rSt, WW8Fib& rFibPara ); WW8_STD* Read1STDFixed( short& rSkip, short* pcbStd ); WW8_STD* Read1Style( short& rSkip, String* pString, short* pcbStd ); - UINT16 GetCount() const { return cstd; } + sal_uInt16 GetCount() const { return cstd; } }; class WW8Fonts { protected: WW8_FFN* pFontA; // Array of Pointers to Font Description - USHORT nMax; // Array-Size + sal_uInt16 nMax; // Array-Size public: WW8Fonts( SvStream& rSt, WW8Fib& rFib ); ~WW8Fonts() { delete[] pFontA; } - const WW8_FFN* GetFont( USHORT nNum ) const; - USHORT GetMax() const { return nMax; } + const WW8_FFN* GetFont( sal_uInt16 nNum ) const; + sal_uInt16 GetMax() const { return nMax; } }; -typedef BYTE HdFtFlags; +typedef sal_uInt8 HdFtFlags; namespace nsHdFtFlags { const HdFtFlags WW8_HEADER_EVEN = 0x01; @@ -1507,251 +1507,251 @@ class WW8Dop { public: /* Error Status */ - ULONG nDopError; + sal_uLong nDopError; /* Corresponds only roughly to the actual structure of the Winword DOP, the winword FIB version matters to what exists. */ // Initialisier-Dummy: - BYTE nDataStart; + sal_uInt8 nDataStart; //------------------------- - UINT16 fFacingPages : 1; // 1 when facing pages should be printed - UINT16 fWidowControl : 1; // 1 when widow control is in effect. 0 when widow control disabled. - UINT16 fPMHMainDoc : 1; // 1 when doc is a main doc for Print Merge Helper, 0 when not; default=0 - UINT16 grfSuppression : 2; // 0 Default line suppression storage; 0= form letter line suppression; 1= no line suppression; default=0 - UINT16 fpc : 2; // 1 footnote position code: 0 as endnotes, 1 at bottom of page, 2 immediately beneath text - UINT16 : 1; // 0 unused + sal_uInt16 fFacingPages : 1; // 1 when facing pages should be printed + sal_uInt16 fWidowControl : 1; // 1 when widow control is in effect. 0 when widow control disabled. + sal_uInt16 fPMHMainDoc : 1; // 1 when doc is a main doc for Print Merge Helper, 0 when not; default=0 + sal_uInt16 grfSuppression : 2; // 0 Default line suppression storage; 0= form letter line suppression; 1= no line suppression; default=0 + sal_uInt16 fpc : 2; // 1 footnote position code: 0 as endnotes, 1 at bottom of page, 2 immediately beneath text + sal_uInt16 : 1; // 0 unused //------------------------- - UINT16 grpfIhdt : 8; // 0 specification of document headers and footers. See explanation under Headers and Footers topic. + sal_uInt16 grpfIhdt : 8; // 0 specification of document headers and footers. See explanation under Headers and Footers topic. //------------------------- - UINT16 rncFtn : 2; // 0 restart index for footnotes, 0 don't restart note numbering, 1 section, 2 page - UINT16 nFtn : 14; // 1 initial footnote number for document - UINT16 fOutlineDirtySave : 1; // when 1, indicates that information in the hPLCFpad should be refreshed since outline has been dirtied - UINT16 : 7; // reserved - UINT16 fOnlyMacPics : 1; // when 1, Word believes all pictures recorded in the document were created on a Macintosh - UINT16 fOnlyWinPics : 1; // when 1, Word believes all pictures recorded in the document were created in Windows - UINT16 fLabelDoc : 1; // when 1, document was created as a print merge labels document - UINT16 fHyphCapitals : 1; // when 1, Word is allowed to hyphenate words that are capitalized. When 0, capitalized may not be hyphenated - UINT16 fAutoHyphen : 1; // when 1, Word will hyphenate newly typed text as a background task - UINT16 fFormNoFields : 1; - UINT16 fLinkStyles : 1; // when 1, Word will merge styles from its template - UINT16 fRevMarking : 1; // when 1, Word will mark revisions as the document is edited - UINT16 fBackup : 1; // always make backup when document saved when 1. - UINT16 fExactCWords : 1; - UINT16 fPagHidden : 1; // - UINT16 fPagResults : 1; - UINT16 fLockAtn : 1; // when 1, annotations are locked for editing - UINT16 fMirrorMargins : 1; // swap margins on left/right pages when 1. - UINT16 fReadOnlyRecommended : 1;// user has recommended that this doc be opened read-only when 1 - UINT16 fDfltTrueType : 1; // when 1, use TrueType fonts by default (flag obeyed only when doc was created by WinWord 2.x) - UINT16 fPagSuppressTopSpacing : 1;//when 1, file created with SUPPRESSTOPSPACING=YES in win.ini. (flag obeyed only when doc was created by WinWord 2.x). - UINT16 fProtEnabled : 1; // when 1, document is protected from edit operations - UINT16 fDispFormFldSel : 1;// when 1, restrict selections to occur only within form fields - UINT16 fRMView : 1; // when 1, show revision markings on screen - UINT16 fRMPrint : 1; // when 1, print revision marks when document is printed - UINT16 fWriteReservation : 1; - UINT16 fLockRev : 1; // when 1, the current revision marking state is locked - UINT16 fEmbedFonts : 1; // when 1, document contains embedded True Type fonts + sal_uInt16 rncFtn : 2; // 0 restart index for footnotes, 0 don't restart note numbering, 1 section, 2 page + sal_uInt16 nFtn : 14; // 1 initial footnote number for document + sal_uInt16 fOutlineDirtySave : 1; // when 1, indicates that information in the hPLCFpad should be refreshed since outline has been dirtied + sal_uInt16 : 7; // reserved + sal_uInt16 fOnlyMacPics : 1; // when 1, Word believes all pictures recorded in the document were created on a Macintosh + sal_uInt16 fOnlyWinPics : 1; // when 1, Word believes all pictures recorded in the document were created in Windows + sal_uInt16 fLabelDoc : 1; // when 1, document was created as a print merge labels document + sal_uInt16 fHyphCapitals : 1; // when 1, Word is allowed to hyphenate words that are capitalized. When 0, capitalized may not be hyphenated + sal_uInt16 fAutoHyphen : 1; // when 1, Word will hyphenate newly typed text as a background task + sal_uInt16 fFormNoFields : 1; + sal_uInt16 fLinkStyles : 1; // when 1, Word will merge styles from its template + sal_uInt16 fRevMarking : 1; // when 1, Word will mark revisions as the document is edited + sal_uInt16 fBackup : 1; // always make backup when document saved when 1. + sal_uInt16 fExactCWords : 1; + sal_uInt16 fPagHidden : 1; // + sal_uInt16 fPagResults : 1; + sal_uInt16 fLockAtn : 1; // when 1, annotations are locked for editing + sal_uInt16 fMirrorMargins : 1; // swap margins on left/right pages when 1. + sal_uInt16 fReadOnlyRecommended : 1;// user has recommended that this doc be opened read-only when 1 + sal_uInt16 fDfltTrueType : 1; // when 1, use TrueType fonts by default (flag obeyed only when doc was created by WinWord 2.x) + sal_uInt16 fPagSuppressTopSpacing : 1;//when 1, file created with SUPPRESSTOPSPACING=YES in win.ini. (flag obeyed only when doc was created by WinWord 2.x). + sal_uInt16 fProtEnabled : 1; // when 1, document is protected from edit operations + sal_uInt16 fDispFormFldSel : 1;// when 1, restrict selections to occur only within form fields + sal_uInt16 fRMView : 1; // when 1, show revision markings on screen + sal_uInt16 fRMPrint : 1; // when 1, print revision marks when document is printed + sal_uInt16 fWriteReservation : 1; + sal_uInt16 fLockRev : 1; // when 1, the current revision marking state is locked + sal_uInt16 fEmbedFonts : 1; // when 1, document contains embedded True Type fonts // compatability options - UINT16 copts_fNoTabForInd : 1; // when 1, don�t add automatic tab stops for hanging indent - UINT16 copts_fNoSpaceRaiseLower : 1; // when 1, don�t add extra space for raised or lowered characters - UINT16 copts_fSupressSpbfAfterPgBrk : 1; // when 1, supress the paragraph Space Before and Space After options after a page break - UINT16 copts_fWrapTrailSpaces : 1; // when 1, wrap trailing spaces at the end of a line to the next line - UINT16 copts_fMapPrintTextColor : 1; // when 1, print colors as black on non-color printers - UINT16 copts_fNoColumnBalance : 1; // when 1, don�t balance columns for Continuous Section starts - UINT16 copts_fConvMailMergeEsc : 1; - UINT16 copts_fSupressTopSpacing : 1; // when 1, supress extra line spacing at top of page - UINT16 copts_fOrigWordTableRules : 1; // when 1, combine table borders like Word 5.x for the Macintosh - UINT16 copts_fTransparentMetafiles : 1; // when 1, don�t blank area between metafile pictures - UINT16 copts_fShowBreaksInFrames : 1; // when 1, show hard page or column breaks in frames - UINT16 copts_fSwapBordersFacingPgs : 1; // when 1, swap left and right pages on odd facing pages - UINT16 copts_fExpShRtn : 1; // when 1, expand character spaces on the line ending SHIFT+RETURN // #i56856# - - INT16 dxaTab; // 720 twips default tab width - UINT16 wSpare; // - UINT16 dxaHotZ; // width of hyphenation hot zone measured in twips - UINT16 cConsecHypLim; // number of lines allowed to have consecutive hyphens - UINT16 wSpare2; // reserved - INT32 dttmCreated; // DTTM date and time document was created - INT32 dttmRevised; // DTTM date and time document was last revised - INT32 dttmLastPrint; // DTTM date and time document was last printed - INT16 nRevision; // number of times document has been revised since its creation - INT32 tmEdited; // time document was last edited - INT32 cWords; // count of words tallied by last Word Count execution - INT32 cCh; // count of characters tallied by last Word Count execution - INT16 cPg; // count of pages tallied by last Word Count execution - INT32 cParas; // count of paragraphs tallied by last Word Count execution - UINT16 rncEdn : 2; // restart endnote number code: 0 don�t restart endnote numbering, 1 section, 2 page - UINT16 nEdn : 14; // beginning endnote number - UINT16 epc : 2; // endnote position code: 0 at end of section, 3 at end of document - // UINT16 nfcFtnRef : 4; // number format code for auto footnotes: 0 Arabic, 1 Upper case Roman, 2 Lower case Roman + sal_uInt16 copts_fNoTabForInd : 1; // when 1, don�t add automatic tab stops for hanging indent + sal_uInt16 copts_fNoSpaceRaiseLower : 1; // when 1, don�t add extra space for raised or lowered characters + sal_uInt16 copts_fSupressSpbfAfterPgBrk : 1; // when 1, supress the paragraph Space Before and Space After options after a page break + sal_uInt16 copts_fWrapTrailSpaces : 1; // when 1, wrap trailing spaces at the end of a line to the next line + sal_uInt16 copts_fMapPrintTextColor : 1; // when 1, print colors as black on non-color printers + sal_uInt16 copts_fNoColumnBalance : 1; // when 1, don�t balance columns for Continuous Section starts + sal_uInt16 copts_fConvMailMergeEsc : 1; + sal_uInt16 copts_fSupressTopSpacing : 1; // when 1, supress extra line spacing at top of page + sal_uInt16 copts_fOrigWordTableRules : 1; // when 1, combine table borders like Word 5.x for the Macintosh + sal_uInt16 copts_fTransparentMetafiles : 1; // when 1, don�t blank area between metafile pictures + sal_uInt16 copts_fShowBreaksInFrames : 1; // when 1, show hard page or column breaks in frames + sal_uInt16 copts_fSwapBordersFacingPgs : 1; // when 1, swap left and right pages on odd facing pages + sal_uInt16 copts_fExpShRtn : 1; // when 1, expand character spaces on the line ending SHIFT+RETURN // #i56856# + + sal_Int16 dxaTab; // 720 twips default tab width + sal_uInt16 wSpare; // + sal_uInt16 dxaHotZ; // width of hyphenation hot zone measured in twips + sal_uInt16 cConsecHypLim; // number of lines allowed to have consecutive hyphens + sal_uInt16 wSpare2; // reserved + sal_Int32 dttmCreated; // DTTM date and time document was created + sal_Int32 dttmRevised; // DTTM date and time document was last revised + sal_Int32 dttmLastPrint; // DTTM date and time document was last printed + sal_Int16 nRevision; // number of times document has been revised since its creation + sal_Int32 tmEdited; // time document was last edited + sal_Int32 cWords; // count of words tallied by last Word Count execution + sal_Int32 cCh; // count of characters tallied by last Word Count execution + sal_Int16 cPg; // count of pages tallied by last Word Count execution + sal_Int32 cParas; // count of paragraphs tallied by last Word Count execution + sal_uInt16 rncEdn : 2; // restart endnote number code: 0 don�t restart endnote numbering, 1 section, 2 page + sal_uInt16 nEdn : 14; // beginning endnote number + sal_uInt16 epc : 2; // endnote position code: 0 at end of section, 3 at end of document + // sal_uInt16 nfcFtnRef : 4; // number format code for auto footnotes: 0 Arabic, 1 Upper case Roman, 2 Lower case Roman // 3 Upper case Letter, 4 Lower case Letter // ersetzt durch gleichlautendes Feld unten - // UINT16 nfcEdnRef : 4; // number format code for auto endnotes: 0 Arabic, 1 Upper case Roman, 2 Lower case Roman + // sal_uInt16 nfcEdnRef : 4; // number format code for auto endnotes: 0 Arabic, 1 Upper case Roman, 2 Lower case Roman // 3 Upper case Letter, 4 Lower case Letter // ersetzt durch gleichlautendes Feld unten - UINT16 fPrintFormData : 1; // only print data inside of form fields - UINT16 fSaveFormData : 1; // only save document data that is inside of a form field. - UINT16 fShadeFormData : 1; // shade form fields - UINT16 : 2; // reserved - UINT16 fWCFtnEdn : 1; // when 1, include footnotes and endnotes in word count - INT32 cLines; // count of lines tallied by last Word Count operation - INT32 cWordsFtnEnd; // count of words in footnotes and endnotes tallied by last Word Count operation - INT32 cChFtnEdn; // count of characters in footnotes and endnotes tallied by last Word Count operation - INT16 cPgFtnEdn; // count of pages in footnotes and endnotes tallied by last Word Count operation - INT32 cParasFtnEdn; // count of paragraphs in footnotes and endnotes tallied by last Word Count operation - INT32 cLinesFtnEdn; // count of paragraphs in footnotes and endnotes tallied by last Word Count operation - INT32 lKeyProtDoc; // document protection password key, only valid if dop.fProtEnabled, dop.fLockAtn or dop.fLockRev are 1. - UINT16 wvkSaved : 3; // document view kind: 0 Normal view, 1 Outline view, 2 Page View - UINT16 wScaleSaved : 9; // - UINT16 zkSaved : 2; - UINT16 fRotateFontW6 : 1; - UINT16 iGutterPos : 1 ; + sal_uInt16 fPrintFormData : 1; // only print data inside of form fields + sal_uInt16 fSaveFormData : 1; // only save document data that is inside of a form field. + sal_uInt16 fShadeFormData : 1; // shade form fields + sal_uInt16 : 2; // reserved + sal_uInt16 fWCFtnEdn : 1; // when 1, include footnotes and endnotes in word count + sal_Int32 cLines; // count of lines tallied by last Word Count operation + sal_Int32 cWordsFtnEnd; // count of words in footnotes and endnotes tallied by last Word Count operation + sal_Int32 cChFtnEdn; // count of characters in footnotes and endnotes tallied by last Word Count operation + sal_Int16 cPgFtnEdn; // count of pages in footnotes and endnotes tallied by last Word Count operation + sal_Int32 cParasFtnEdn; // count of paragraphs in footnotes and endnotes tallied by last Word Count operation + sal_Int32 cLinesFtnEdn; // count of paragraphs in footnotes and endnotes tallied by last Word Count operation + sal_Int32 lKeyProtDoc; // document protection password key, only valid if dop.fProtEnabled, dop.fLockAtn or dop.fLockRev are 1. + sal_uInt16 wvkSaved : 3; // document view kind: 0 Normal view, 1 Outline view, 2 Page View + sal_uInt16 wScaleSaved : 9; // + sal_uInt16 zkSaved : 2; + sal_uInt16 fRotateFontW6 : 1; + sal_uInt16 iGutterPos : 1 ; // hier sollte bei nFib < 103 Schluss sein, sonst ist Datei fehlerhaft! /* bei nFib >= 103 gehts weiter: */ - UINT32 fNoTabForInd :1; // see above in compatability options - UINT32 fNoSpaceRaiseLower :1; // see above - UINT32 fSupressSpbfAfterPageBreak :1; // see above - UINT32 fWrapTrailSpaces :1; // see above - UINT32 fMapPrintTextColor :1; // see above - UINT32 fNoColumnBalance :1; // see above - UINT32 fConvMailMergeEsc :1; // see above - UINT32 fSupressTopSpacing :1; // see above - UINT32 fOrigWordTableRules :1; // see above - UINT32 fTransparentMetafiles :1; // see above - UINT32 fShowBreaksInFrames :1; // see above - UINT32 fSwapBordersFacingPgs :1; // see above - UINT32 fCompatabilityOptions_Unknown1_13 :1; // #i78591# - UINT32 fExpShRtn :1; // #i78591# and #i56856# - UINT32 fCompatabilityOptions_Unknown1_15 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown1_16 :1; // #i78591# - UINT32 fSuppressTopSpacingMac5 :1; // Suppress extra line spacing at top + sal_uInt32 fNoTabForInd :1; // see above in compatability options + sal_uInt32 fNoSpaceRaiseLower :1; // see above + sal_uInt32 fSupressSpbfAfterPageBreak :1; // see above + sal_uInt32 fWrapTrailSpaces :1; // see above + sal_uInt32 fMapPrintTextColor :1; // see above + sal_uInt32 fNoColumnBalance :1; // see above + sal_uInt32 fConvMailMergeEsc :1; // see above + sal_uInt32 fSupressTopSpacing :1; // see above + sal_uInt32 fOrigWordTableRules :1; // see above + sal_uInt32 fTransparentMetafiles :1; // see above + sal_uInt32 fShowBreaksInFrames :1; // see above + sal_uInt32 fSwapBordersFacingPgs :1; // see above + sal_uInt32 fCompatabilityOptions_Unknown1_13 :1; // #i78591# + sal_uInt32 fExpShRtn :1; // #i78591# and #i56856# + sal_uInt32 fCompatabilityOptions_Unknown1_15 :1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown1_16 :1; // #i78591# + sal_uInt32 fSuppressTopSpacingMac5 :1; // Suppress extra line spacing at top // of page like MacWord 5.x - UINT32 fTruncDxaExpand :1; // Expand/Condense by whole number of points - UINT32 fPrintBodyBeforeHdr :1; // Print body text before header/footer - UINT32 fNoLeading :1; // Don't add extra spacebetween rows of text - UINT32 fCompatabilityOptions_Unknown1_21 :1; // #i78591# - UINT32 fMWSmallCaps : 1; // Use larger small caps like MacWord 5.x - UINT32 fCompatabilityOptions_Unknown1_23 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown1_24 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown1_25 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown1_26 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown1_27 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown1_28 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown1_29 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown1_30 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown1_31 :1; // #i78591# - UINT32 fUsePrinterMetrics : 1; //The magic option + sal_uInt32 fTruncDxaExpand :1; // Expand/Condense by whole number of points + sal_uInt32 fPrintBodyBeforeHdr :1; // Print body text before header/footer + sal_uInt32 fNoLeading :1; // Don't add extra spacebetween rows of text + sal_uInt32 fCompatabilityOptions_Unknown1_21 :1; // #i78591# + sal_uInt32 fMWSmallCaps : 1; // Use larger small caps like MacWord 5.x + sal_uInt32 fCompatabilityOptions_Unknown1_23 :1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown1_24 :1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown1_25 :1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown1_26 :1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown1_27 :1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown1_28 :1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown1_29 :1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown1_30 :1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown1_31 :1; // #i78591# + sal_uInt32 fUsePrinterMetrics : 1; //The magic option // hier sollte bei nFib <= 105 Schluss sein, sonst ist Datei fehlerhaft! /* bei nFib > 105 gehts weiter: */ - INT16 adt; // Autoformat Document Type: + sal_Int16 adt; // Autoformat Document Type: // 0 for normal. // 1 for letter, and // 2 for email. WW8DopTypography doptypography; // see WW8STRUC.HXX WW8_DOGRID dogrid; // see WW8STRUC.HXX - UINT16 :1; // reserved - UINT16 lvl :4; // Which outline levels are showing in outline view - UINT16 :4; // reserved - UINT16 fHtmlDoc :1; // This file is based upon an HTML file - UINT16 :1; // reserved - UINT16 fSnapBorder :1; // Snap table and page borders to page border - UINT16 fIncludeHeader :1; // Place header inside page border - UINT16 fIncludeFooter :1; // Place footer inside page border - UINT16 fForcePageSizePag :1; // Are we in online view - UINT16 fMinFontSizePag :1; // Are we auto-promoting fonts to >= hpsZoonFontPag? - UINT16 fHaveVersions :1; // versioning is turned on - UINT16 fAutoVersion :1; // autoversioning is enabled - UINT16 : 14; // reserved + sal_uInt16 :1; // reserved + sal_uInt16 lvl :4; // Which outline levels are showing in outline view + sal_uInt16 :4; // reserved + sal_uInt16 fHtmlDoc :1; // This file is based upon an HTML file + sal_uInt16 :1; // reserved + sal_uInt16 fSnapBorder :1; // Snap table and page borders to page border + sal_uInt16 fIncludeHeader :1; // Place header inside page border + sal_uInt16 fIncludeFooter :1; // Place footer inside page border + sal_uInt16 fForcePageSizePag :1; // Are we in online view + sal_uInt16 fMinFontSizePag :1; // Are we auto-promoting fonts to >= hpsZoonFontPag? + sal_uInt16 fHaveVersions :1; // versioning is turned on + sal_uInt16 fAutoVersion :1; // autoversioning is enabled + sal_uInt16 : 14; // reserved // Skip 12 Bytes here: ASUMI - INT32 cChWS; - INT32 cChWSFtnEdn; - INT32 grfDocEvents; + sal_Int32 cChWS; + sal_Int32 cChWSFtnEdn; + sal_Int32 grfDocEvents; // Skip 4+30+8 Bytes here - INT32 cDBC; - INT32 cDBCFtnEdn; + sal_Int32 cDBC; + sal_Int32 cDBCFtnEdn; // Skip 4 Bytes here - INT16 nfcFtnRef; - INT16 nfcEdnRef; - INT16 hpsZoonFontPag; - INT16 dywDispPag; - - UINT32 fCompatabilityOptions_Unknown2_1 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown2_2 :1; // #i78591# - UINT32 fDontUseHTMLAutoSpacing:1; - UINT32 fCompatabilityOptions_Unknown2_4 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown2_5 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown2_6 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown2_7 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown2_8 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown2_9 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown2_10 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown2_11 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown2_12 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown2_13 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown2_14 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown2_15 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown2_16 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown2_17 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown2_18 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown2_19 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown2_20 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown2_21 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown2_22 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown2_23 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown2_24 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown2_25 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown2_26 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown2_27 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown2_28 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown2_29 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown2_30 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown2_31 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown2_32 :1; // #i78591# - - UINT16 fUnknown3:15; - UINT16 fUseBackGroundInAllmodes:1; - - UINT16 fDoNotEmbedSystemFont:1; - UINT16 fWordCompat:1; - UINT16 fLiveRecover:1; - UINT16 fEmbedFactoids:1; - UINT16 fFactoidXML:1; - UINT16 fFactoidAllDone:1; - UINT16 fFolioPrint:1; - UINT16 fReverseFolio:1; - UINT16 iTextLineEnding:3; - UINT16 fHideFcc:1; - UINT16 fAcetateShowMarkup:1; - UINT16 fAcetateShowAtn:1; - UINT16 fAcetateShowInsDel:1; - UINT16 fAcetateShowProps:1; + sal_Int16 nfcFtnRef; + sal_Int16 nfcEdnRef; + sal_Int16 hpsZoonFontPag; + sal_Int16 dywDispPag; + + sal_uInt32 fCompatabilityOptions_Unknown2_1 :1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown2_2 :1; // #i78591# + sal_uInt32 fDontUseHTMLAutoSpacing:1; + sal_uInt32 fCompatabilityOptions_Unknown2_4 :1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown2_5 :1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown2_6 :1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown2_7 :1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown2_8 :1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown2_9 :1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown2_10 :1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown2_11 :1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown2_12 :1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown2_13 :1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown2_14 :1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown2_15 :1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown2_16 :1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown2_17 :1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown2_18 :1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown2_19 :1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown2_20 :1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown2_21 :1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown2_22 :1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown2_23 :1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown2_24 :1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown2_25 :1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown2_26 :1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown2_27 :1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown2_28 :1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown2_29 :1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown2_30 :1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown2_31 :1; // #i78591# + sal_uInt32 fCompatabilityOptions_Unknown2_32 :1; // #i78591# + + sal_uInt16 fUnknown3:15; + sal_uInt16 fUseBackGroundInAllmodes:1; + + sal_uInt16 fDoNotEmbedSystemFont:1; + sal_uInt16 fWordCompat:1; + sal_uInt16 fLiveRecover:1; + sal_uInt16 fEmbedFactoids:1; + sal_uInt16 fFactoidXML:1; + sal_uInt16 fFactoidAllDone:1; + sal_uInt16 fFolioPrint:1; + sal_uInt16 fReverseFolio:1; + sal_uInt16 iTextLineEnding:3; + sal_uInt16 fHideFcc:1; + sal_uInt16 fAcetateShowMarkup:1; + sal_uInt16 fAcetateShowAtn:1; + sal_uInt16 fAcetateShowInsDel:1; + sal_uInt16 fAcetateShowProps:1; // 2. Initialisier-Dummy: - BYTE nDataEnd; + sal_uInt8 nDataEnd; bool bUseThaiLineBreakingRules; /* Constructor for importing, needs to know the version of word used */ - WW8Dop(SvStream& rSt, INT16 nFib, INT32 nPos, sal_uInt32 nSize); + WW8Dop(SvStream& rSt, sal_Int16 nFib, sal_Int32 nPos, sal_uInt32 nSize); /* Constructs default DOP suitable for exporting */ WW8Dop(); bool Write(SvStream& rStrm, WW8Fib& rFib) const; public: - UINT32 GetCompatabilityOptions() const; - void SetCompatabilityOptions(UINT32 a32Bit); + sal_uInt32 GetCompatabilityOptions() const; + void SetCompatabilityOptions(sal_uInt32 a32Bit); // i#78591# - UINT32 GetCompatabilityOptions2() const; - void SetCompatabilityOptions2(UINT32 a32Bit); + sal_uInt32 GetCompatabilityOptions2() const; + void SetCompatabilityOptions2(sal_uInt32 a32Bit); }; class WW8PLCF_HdFt @@ -1762,22 +1762,22 @@ private: short nIdxOffset; public: WW8PLCF_HdFt( SvStream* pSt, WW8Fib& rFib, WW8Dop& rDop ); - bool GetTextPos(BYTE grpfIhdt, BYTE nWhich, WW8_CP& rStart, long& rLen); + bool GetTextPos(sal_uInt8 grpfIhdt, sal_uInt8 nWhich, WW8_CP& rStart, long& rLen); bool GetTextPosExact(short nIdx, WW8_CP& rStart, long& rLen); - void UpdateIndex( BYTE grpfIhdt ); + void UpdateIndex( sal_uInt8 grpfIhdt ); }; void SwapQuotesInField(String &rFmt); Word2CHPX ReadWord2Chpx(SvStream &rSt, sal_Size nOffset, sal_uInt8 nSize); -std::vector<BYTE> ChpxToSprms(const Word2CHPX &rChpx); +std::vector<sal_uInt8> ChpxToSprms(const Word2CHPX &rChpx); -ULONG SafeReadString(ByteString &rStr,USHORT nLen,SvStream &rStrm); +sal_uLong SafeReadString(ByteString &rStr,sal_uInt16 nLen,SvStream &rStrm); //MS has a (slightly) inaccurate view of how many twips //are in the default letter size of a page -const USHORT lLetterWidth = 12242; -const USHORT lLetterHeight = 15842; +const sal_uInt16 lLetterWidth = 12242; +const sal_uInt16 lLetterHeight = 15842; #endif |