diff options
Diffstat (limited to 'sw/source/filter/ww8')
64 files changed, 2342 insertions, 2338 deletions
diff --git a/sw/source/filter/ww8/WW8FFData.cxx b/sw/source/filter/ww8/WW8FFData.cxx index 6d2f1e8d793b..545a33843ab8 100644 --- a/sw/source/filter/ww8/WW8FFData.cxx +++ b/sw/source/filter/ww8/WW8FFData.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,13 +35,13 @@ #include "writerwordglue.hxx" #include "wrtww8.hxx" -namespace sw +namespace sw { using sw::types::msword_cast; WW8FFData::WW8FFData() - : + : mnType(0), mnResult(0), mbOwnHelp(false), @@ -66,7 +66,7 @@ void WW8FFData::setHelp(const ::rtl::OUString & rHelp) msHelp = rHelp; mbOwnHelp = true; } - + void WW8FFData::setStatus(const ::rtl::OUString & rStatus) { msStatus = rStatus; @@ -84,13 +84,13 @@ void WW8FFData::WriteOUString(SvStream * pDataStrm, const ::rtl::OUString & rStr { sal_uInt16 nStrLen = msword_cast<sal_uInt16>(rStr.getLength()); *pDataStrm << nStrLen; - SwWW8Writer::WriteString16(*pDataStrm, rStr, bAddZero); + SwWW8Writer::WriteString16(*pDataStrm, rStr, bAddZero); } void WW8FFData::Write(SvStream * pDataStrm) { ULONG nDataStt = pDataStrm->Tell(); - + static const sal_uInt8 aHeader[] = { 0,0,0,0, // len of struct @@ -107,72 +107,72 @@ void WW8FFData::Write(SvStream * pDataStrm) 0xff, 0xff, 0xff, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }; - + aData[4] = mnType | (mnResult << 2); - + if (mbOwnHelp) aData[4] |= (1 << 7); - + aData[5] = (mnTextType << 3); if (mbOwnStat) aData[5] |= 1; - + if (mbProtected) aData[5] |= (1 << 1); - + if (mbSize) aData[5] |= (1 << 2); - + if (mbRecalc) aData[5] |= (1 << 6); - + if (mbListBox) aData[5] |= (1 << 7); - + aData[6] = ::sal::static_int_cast<sal_uInt8>(mnMaxLen & 0xffff); aData[7] = ::sal::static_int_cast<sal_uInt8>(mnMaxLen >> 8); aData[8] = ::sal::static_int_cast<sal_uInt8>(mnCheckboxHeight & 0xffff); aData[9] = ::sal::static_int_cast<sal_uInt8>(mnCheckboxHeight >> 8); - + pDataStrm->Write(aData, sizeof(aData)); - + WriteOUString(pDataStrm, msName, true); - + if (mnType == 0) WriteOUString(pDataStrm, msDefault, true); else *pDataStrm << mnDefault; - + WriteOUString(pDataStrm, msFormat, true); WriteOUString(pDataStrm, msHelp, true); WriteOUString(pDataStrm, msStatus, true); WriteOUString(pDataStrm, msMacroEnter, true); WriteOUString(pDataStrm, msMacroExit, true); - + if (mnType == 2) { sal_uInt8 aData1[2] = { 0xff, 0xff }; pDataStrm->Write(aData1, sizeof(aData1)); - + sal_uInt32 nListboxEntries = msListEntries.size(); *pDataStrm << nListboxEntries; - + ::std::vector< ::rtl::OUString >::const_iterator aIt = msListEntries.begin(); - + while (aIt != msListEntries.end()) { const ::rtl::OUString & rEntry = *aIt; WriteOUString(pDataStrm, rEntry, false); - + aIt++; } } - + SwWW8Writer::WriteLong( *pDataStrm, nDataStt, pDataStrm->Tell() - nDataStt ); } - + } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/ww8/WW8FFData.hxx b/sw/source/filter/ww8/WW8FFData.hxx index fcb46d5ff987..8ad7967b55f3 100644 --- a/sw/source/filter/ww8/WW8FFData.hxx +++ b/sw/source/filter/ww8/WW8FFData.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 @@ -41,7 +41,7 @@ private: sal_uInt8 mnType; // :2 0x3 sal_uInt8 mnResult; // :5 0x7c bool mbOwnHelp; // :1 0x80 - + // offset 5 bool mbOwnStat; // :1 0x01 bool mbProtected; // :1 0x02 @@ -49,13 +49,13 @@ private: sal_uInt8 mnTextType; // :3 0x38 bool mbRecalc; // :1 0x4 bool mbListBox; // :1 0x80 - + // offset 6 sal_uInt16 mnMaxLen; // :15 0x7fff maximum length of text field, 0 <=> no limit - + // offset 8 sal_uInt16 mnCheckboxHeight; - + // offset 10 and beyond ::rtl::OUString msName; ::rtl::OUString msDefault; // only for type == 0 @@ -65,16 +65,16 @@ private: ::rtl::OUString msStatus; ::rtl::OUString msMacroEnter; ::rtl::OUString msMacroExit; - + ::std::vector< ::rtl::OUString > msListEntries; - + protected: void WriteOUString(SvStream * pStream, const ::rtl::OUString & rStr, bool bAddZero); - + public: WW8FFData(); ~WW8FFData(); - + void setType(sal_uInt8 nType) { mnType = nType; } sal_uInt8 getType() const { return mnType; } void setResult(sal_uInt8 nResult) { mnResult = nResult; } @@ -109,9 +109,9 @@ public: const ::rtl::OUString & getMacroEnter() const { return msMacroEnter; } void setMacroExit(const ::rtl::OUString & rMacroExit) { msMacroExit = rMacroExit; } const ::rtl::OUString & getMacroExit() const { return msMacroExit; } - + void addListboxEntry(const ::rtl::OUString & rEntry); - + void Write(SvStream * pDataStrm); }; } diff --git a/sw/source/filter/ww8/WW8FibData.cxx b/sw/source/filter/ww8/WW8FibData.cxx index 5226f4b0d669..6a9cddd71052 100644 --- a/sw/source/filter/ww8/WW8FibData.cxx +++ b/sw/source/filter/ww8/WW8FibData.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/filter/ww8/WW8FibData.hxx b/sw/source/filter/ww8/WW8FibData.hxx index b6a886be9886..0fd655dd861f 100644 --- a/sw/source/filter/ww8/WW8FibData.hxx +++ b/sw/source/filter/ww8/WW8FibData.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,7 +43,7 @@ public: void setReadOnlyRecommended(bool bReadOnlyRecommended); void setWriteReservation(bool bWriteReservation); - + bool getReadOnlyRecommended() const; bool getWriteReservation() const; }; diff --git a/sw/source/filter/ww8/WW8Sttbf.cxx b/sw/source/filter/ww8/WW8Sttbf.cxx index 07271945430a..28f3135baf74 100644 --- a/sw/source/filter/ww8/WW8Sttbf.cxx +++ b/sw/source/filter/ww8/WW8Sttbf.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,66 +41,66 @@ namespace ww8 : mn_offset(0), mn_size(nSize) { rSt.Seek(nPos); - + mp_data.reset(new BYTE[nSize]); - rSt.Read(mp_data.get(), nSize); + rSt.Read(mp_data.get(), nSize); } - + WW8Struct::WW8Struct(WW8Struct * pStruct, sal_uInt32 nPos, sal_uInt32 nSize) - : mp_data(pStruct->mp_data), mn_offset(pStruct->mn_offset + nPos), + : mp_data(pStruct->mp_data), mn_offset(pStruct->mn_offset + nPos), mn_size(nSize) { } - + WW8Struct::~WW8Struct() { } - + sal_uInt8 WW8Struct::getU8(sal_uInt32 nOffset) { sal_uInt8 nResult = 0; - + if (nOffset < mn_size) { nResult = mp_data[mn_offset + nOffset]; } - + return nResult; } - - ::rtl::OUString WW8Struct::getUString(sal_uInt32 nOffset, + + ::rtl::OUString WW8Struct::getUString(sal_uInt32 nOffset, sal_uInt32 nCount) { ::rtl::OUString aResult; - + if (nCount > 0) { rtl_uString * pNew = 0; rtl_uString_newFromStr_WithLength (&pNew, reinterpret_cast<const sal_Unicode *>(&mp_data[mn_offset + nOffset]), nCount); - + aResult = rtl::OUString(pNew); } #ifdef DEBUG char sBuffer[256]; - snprintf(sBuffer, sizeof(sBuffer), "offset=\"%" SAL_PRIuUINT32 "\" count=\"%" SAL_PRIuUINT32 "\"", + snprintf(sBuffer, sizeof(sBuffer), "offset=\"%" SAL_PRIuUINT32 "\" count=\"%" SAL_PRIuUINT32 "\"", nOffset, nCount); - ::std::clog << "<WW8Struct-getUString" << sBuffer << ">" - << dbg_out(aResult) << "</WW8Struct-getUString>" + ::std::clog << "<WW8Struct-getUString" << sBuffer << ">" + << dbg_out(aResult) << "</WW8Struct-getUString>" << ::std::endl; #endif return aResult; - + } - ::rtl::OUString WW8Struct::getString(sal_uInt32 nOffset, + ::rtl::OUString WW8Struct::getString(sal_uInt32 nOffset, sal_uInt32 nCount) { ::rtl::OUString aResult; - + if (nCount > 0) { ::rtl::OString aOStr(reinterpret_cast<const sal_Char *>(&mp_data[mn_offset + nOffset]), @@ -108,17 +108,17 @@ namespace ww8 ::rtl::OUString aOUStr(rtl::OStringToOUString(aOStr, RTL_TEXTENCODING_ASCII_US)); aResult = rtl::OUString(aOUStr); } - + #ifdef DEBUG char sBuffer[256]; - snprintf(sBuffer, sizeof(sBuffer), "offset=\"%" SAL_PRIuUINT32 "\" count=\"%" SAL_PRIuUINT32 "\"", + snprintf(sBuffer, sizeof(sBuffer), "offset=\"%" SAL_PRIuUINT32 "\" count=\"%" SAL_PRIuUINT32 "\"", nOffset, nCount); - ::std::clog << "<WW8Struct-getString " << sBuffer << ">" - << dbg_out(aResult) << "</WW8Struct-getUString>" + ::std::clog << "<WW8Struct-getString " << sBuffer << ">" + << dbg_out(aResult) << "</WW8Struct-getUString>" << ::std::endl; #endif - return aResult; + return aResult; } } diff --git a/sw/source/filter/ww8/WW8Sttbf.hxx b/sw/source/filter/ww8/WW8Sttbf.hxx index 0741a221a248..e1ce52815788 100644 --- a/sw/source/filter/ww8/WW8Sttbf.hxx +++ b/sw/source/filter/ww8/WW8Sttbf.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,31 +37,31 @@ namespace ww8 { typedef boost::shared_array<BYTE> DataArray_t; - + class WW8Struct : public ::sw::ExternalData { DataArray_t mp_data; sal_uInt32 mn_offset; sal_uInt32 mn_size; - + public: WW8Struct(SvStream& rSt, sal_uInt32 nPos, sal_uInt32 nSize); WW8Struct(WW8Struct * pStruct, sal_uInt32 nPos, sal_uInt32 nSize); virtual ~WW8Struct(); - + sal_uInt8 getU8(sal_uInt32 nOffset); - sal_uInt16 getU16(sal_uInt32 nOffset) + sal_uInt16 getU16(sal_uInt32 nOffset) { return getU8(nOffset) + (getU8(nOffset + 1) << 8); } sal_uInt32 getU32(sal_uInt32 nOffset) { return getU16(nOffset) + (getU16(nOffset + 1) << 16); } - + ::rtl::OUString getUString(sal_uInt32 nOffset, sal_uInt32 nCount); - + ::rtl::OUString getString(sal_uInt32 nOffset, sal_uInt32 nCount); }; - + typedef ::std::vector<rtl::OUString> StringVector_t; template <class T> class WW8Sttb : public WW8Struct @@ -71,11 +71,11 @@ typedef ::std::vector<rtl::OUString> StringVector_t; bool bDoubleByteCharacters; StringVector_t m_Strings; ExtrasVector_t m_Extras; - + public: WW8Sttb(SvStream& rSt, INT32 nPos, sal_uInt32 nSize); virtual ~WW8Sttb(); - + sal_uInt32 getCount() const; ::rtl::OUString getEntry(sal_uInt32 nEntry) const { @@ -86,48 +86,48 @@ typedef ::std::vector<rtl::OUString> StringVector_t; { return m_Strings; } - + const T * getExtra(sal_uInt32 nEntry) const { return dynamic_cast<const T *> (m_Extras[nEntry].get()); } }; - + template <class T> WW8Sttb<T>::WW8Sttb(SvStream& rSt, INT32 nPos, sal_uInt32 nSize) : WW8Struct(rSt, nPos, nSize), bDoubleByteCharacters(false) { sal_uInt32 nOffset = 0; - + if (getU16(nOffset) == 0xffff) { bDoubleByteCharacters = true; nOffset += 2; } - + sal_uInt16 nCount = getU16(nOffset); sal_uInt16 ncbExtra = getU16(nOffset + 2); - + nOffset += 4; for (sal_uInt16 i = 0; i < nCount; i++) { if (bDoubleByteCharacters) { sal_uInt16 nStrLen = getU16(nOffset); - + m_Strings.push_back(getUString(nOffset +2, nStrLen)); - + nOffset += 2 + 2 * nStrLen; } else { sal_uInt8 nStrLen = getU8(nOffset); - + m_Strings.push_back(getUString(nOffset, nStrLen)); - + nOffset += 1 + nStrLen; } - + if (ncbExtra > 0) { ExtraPointer_t pExtra(new T(this, nOffset, ncbExtra)); @@ -137,7 +137,7 @@ typedef ::std::vector<rtl::OUString> StringVector_t; } } } - + template <class T> WW8Sttb<T>::~WW8Sttb() { diff --git a/sw/source/filter/ww8/WW8TableInfo.cxx b/sw/source/filter/ww8/WW8TableInfo.cxx index 0400babd7380..ca8205dce3be 100644 --- a/sw/source/filter/ww8/WW8TableInfo.cxx +++ b/sw/source/filter/ww8/WW8TableInfo.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,9 +29,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sw.hxx" -#include <iostream> +#include <iostream> #include <set> -#include <stdio.h> +#include <stdio.h> #include "WW8TableInfo.hxx" #include "fmtfsize.hxx" #include "attributeoutputbase.hxx" @@ -41,7 +41,7 @@ #include "ndtxt.hxx" #include "dbgoutsw.hxx" -namespace ww8 +namespace ww8 { // WW8TableNodeInfoInner @@ -92,7 +92,7 @@ void WW8TableNodeInfoInner::setShadowsAfter(sal_uInt32 nShadowsAfter) void WW8TableNodeInfoInner::setEndOfLine(bool bEndOfLine) { - mbEndOfLine = bEndOfLine; + mbEndOfLine = bEndOfLine; } void WW8TableNodeInfoInner::setEndOfCell(bool bEndOfCell) @@ -169,10 +169,10 @@ bool WW8TableNodeInfoInner::isFirstInTable() const const SwNode * WW8TableNodeInfoInner::getNode() const { const SwNode * pResult = NULL; - + if (mpParent != NULL) pResult = mpParent->getNode(); - + return pResult; } @@ -180,14 +180,14 @@ TableBoxVectorPtr WW8TableNodeInfoInner::getTableBoxesOfRow() { TableBoxVectorPtr pResult(new TableBoxVector); - WW8TableCellGrid::Pointer_t pCellGrid = + WW8TableCellGrid::Pointer_t pCellGrid = mpParent->getParent()->getCellGridForTable(getTable(), false); if (pCellGrid.get() == NULL) { const SwTableLine * pTabLine = getTableBox()->GetUpper(); const SwTableBoxes & rTblBoxes = pTabLine->GetTabBoxes(); - + sal_uInt8 nBoxes = rTblBoxes.Count(); for ( sal_uInt8 n = 0; n < nBoxes; n++ ) { @@ -209,27 +209,27 @@ GridColsPtr WW8TableNodeInfoInner::getGridColsOfRow(AttributeOutputBase & rBase) OSL_ENSURE(pFmt,"Impossible"); if (!pFmt) return pResult; - + const SwFmtFrmSize &rSize = pFmt->GetFrmSize(); unsigned long nTblSz = static_cast<unsigned long>(rSize.GetWidth()); - + sal_uInt32 nPageSize = 0; bool bRelBoxSize = false; - + rBase.GetTablePageSize ( this, nPageSize, bRelBoxSize ); - + SwTwips nSz = 0; - Widths::const_iterator aWidthsEnd = pWidths->end(); - for ( Widths::const_iterator aIt = pWidths->begin(); - aIt != aWidthsEnd; + Widths::const_iterator aWidthsEnd = pWidths->end(); + for ( Widths::const_iterator aIt = pWidths->begin(); + aIt != aWidthsEnd; aIt++) { nSz += *aIt; SwTwips nCalc = nSz; if ( bRelBoxSize ) nCalc = ( nCalc * nPageSize ) / nTblSz; - + pResult->push_back( nCalc ); } @@ -240,11 +240,11 @@ WidthsPtr WW8TableNodeInfoInner::getWidthsOfRow() { WidthsPtr pWidths; - WW8TableCellGrid::Pointer_t pCellGrid = + WW8TableCellGrid::Pointer_t pCellGrid = mpParent->getParent()->getCellGridForTable(getTable(), false); if (pCellGrid.get() == NULL) - { + { const SwTableBox * pTabBox = getTableBox(); const SwTableLine * pTabLine = pTabBox->GetUpper(); const SwTableBoxes & rTabBoxes = pTabLine->GetTabBoxes(); @@ -254,7 +254,7 @@ WidthsPtr WW8TableNodeInfoInner::getWidthsOfRow() sal_uInt32 nBoxes = rTabBoxes.Count(); if ( nBoxes > 32 ) nBoxes = 32; - + for (sal_uInt32 n = 0; n < nBoxes; n++) { const SwFrmFmt* pBoxFmt = rTabBoxes[ n ]->GetFrmFmt(); @@ -273,9 +273,9 @@ RowSpansPtr WW8TableNodeInfoInner::getRowSpansOfRow() { RowSpansPtr pResult(new RowSpans); - WW8TableCellGrid::Pointer_t pCellGrid = + WW8TableCellGrid::Pointer_t pCellGrid = mpParent->getParent()->getCellGridForTable(getTable(), false); - + if (pCellGrid.get() == NULL) { const SwTableBox * pTabBox = getTableBox(); @@ -285,7 +285,7 @@ RowSpansPtr WW8TableNodeInfoInner::getRowSpansOfRow() sal_uInt32 nBoxes = rTabBoxes.Count(); if (nBoxes > 32) nBoxes = 32; - + for (sal_uInt32 n = 0; n < nBoxes; ++n) { pResult->push_back(rTabBoxes[n]->getRowSpan()); @@ -315,7 +315,7 @@ const SwRect & WW8TableNodeInfoInner::getRect() const string WW8TableNodeInfoInner::toString() const { static char buffer[256]; - snprintf(buffer, sizeof(buffer), + snprintf(buffer, sizeof(buffer), "<tableinner depth=\"%" SAL_PRIuUINT32 "\"" " cell=\"%" SAL_PRIuUINT32 "\"" " row=\"%" SAL_PRIuUINT32 "\"" @@ -330,15 +330,15 @@ string WW8TableNodeInfoInner::toString() const mnShadowsBefore, mnShadowsAfter, mbVertMerge ? "yes" : "no"); - + return string(buffer); } // WW8TableTextNodeInfo -WW8TableNodeInfo::WW8TableNodeInfo(WW8TableInfo * pParent, +WW8TableNodeInfo::WW8TableNodeInfo(WW8TableInfo * pParent, const SwNode * pNode) : mpParent(pParent), - mnDepth(0), + mnDepth(0), mpNode(pNode), mpNext(NULL), mpNextNode(NULL) @@ -352,38 +352,38 @@ WW8TableNodeInfo::~WW8TableNodeInfo() ::std::string WW8TableNodeInfo::toString() const { static char buffer[1024]; - snprintf(buffer, sizeof(buffer), + snprintf(buffer, sizeof(buffer), "<tableNodeInfo p=\"%p\" depth=\"%" SAL_PRIuUINT32 "\">" ,this, getDepth()); ::std::string sResult(buffer); - + Inners_t::const_iterator aIt(mInners.begin()); Inners_t::const_iterator aEnd(mInners.end()); - + while (aIt != aEnd) { WW8TableNodeInfoInner::Pointer_t pInner = aIt->second; sResult += pInner->toString(); - + aIt++; } -#ifdef DEBUG +#ifdef DEBUG sResult += dbg_out(*mpNode); #endif sResult += "</tableNodeInfo>"; - + return sResult; } void WW8TableNodeInfo::setDepth(sal_uInt32 nDepth) { mnDepth = nDepth; - + Inners_t::iterator aIt = mInners.find(mnDepth); if (aIt == mInners.end()) mInners[mnDepth] = WW8TableNodeInfoInner::Pointer_t(new WW8TableNodeInfoInner(this)); - + mInners[mnDepth]->setDepth(mnDepth); } @@ -393,7 +393,7 @@ void WW8TableNodeInfo::setEndOfLine(bool bEndOfLine) pInner->setEndOfLine(bEndOfLine); #ifdef DEBUG - ::std::clog << "<endOfLine depth=\"" << mnDepth << "\">" + ::std::clog << "<endOfLine depth=\"" << mnDepth << "\">" << toString() << "</endOfLine>" << ::std::endl; #endif } @@ -402,9 +402,9 @@ void WW8TableNodeInfo::setEndOfCell(bool bEndOfCell) { WW8TableNodeInfoInner::Pointer_t pInner = getInnerForDepth(mnDepth); pInner->setEndOfCell(bEndOfCell); - + #ifdef DEBUG - ::std::clog << "<endOfCell depth=\"" << mnDepth << "\">" + ::std::clog << "<endOfCell depth=\"" << mnDepth << "\">" << toString() << "</endOfCell>" << ::std::endl; #endif } @@ -416,9 +416,9 @@ void WW8TableNodeInfo::setFirstInTable(bool bFirstInTable) pInner->setFirstInTable(bFirstInTable); #ifdef DEBUG - ::std::clog << "<firstInTable depth=\"" << mnDepth << "\">" + ::std::clog << "<firstInTable depth=\"" << mnDepth << "\">" << toString() << "</firstInTable>" << ::std::endl; -#endif +#endif } void WW8TableNodeInfo::setVertMerge(bool bVertMerge) @@ -426,10 +426,10 @@ void WW8TableNodeInfo::setVertMerge(bool bVertMerge) WW8TableNodeInfoInner::Pointer_t pInner = getInnerForDepth(mnDepth); pInner->setVertMerge(bVertMerge); - + #ifdef DEBUG - ::std::clog << "<vertMerge depth=\"" << mnDepth << "\">" + ::std::clog << "<vertMerge depth=\"" << mnDepth << "\">" << toString() << "</vertMerge>" << ::std::endl; #endif } @@ -449,8 +449,8 @@ void WW8TableNodeInfo::setNext(WW8TableNodeInfo * pNext) mpNext = pNext; #ifdef DEBUG - ::std::clog << "<setnext><from>" << toString() << "</from><to>" - << pNext->toString() << "</to></setnext>" + ::std::clog << "<setnext><from>" << toString() << "</from><to>" + << pNext->toString() << "</to></setnext>" << ::std::endl; #endif } @@ -494,7 +494,7 @@ sal_uInt32 WW8TableNodeInfo::getDepth() const { if (mInners.size() > 0) return mInners.begin()->second->getDepth(); - + return mnDepth; } @@ -542,7 +542,7 @@ sal_uInt32 WW8TableNodeInfo::getCell() const { return getInnerForDepth(mnDepth)->getCell(); } - + sal_uInt32 WW8TableNodeInfo::getRow() const { return getInnerForDepth(mnDepth)->getRow(); @@ -556,26 +556,26 @@ const ww8::WW8TableNodeInfo::Inners_t & WW8TableNodeInfo::getInners() const const WW8TableNodeInfoInner::Pointer_t WW8TableNodeInfo::getFirstInner() const { WW8TableNodeInfoInner::Pointer_t pResult; - + if (mInners.size() > 0) pResult = mInners.begin()->second; - + return pResult; } const WW8TableNodeInfoInner::Pointer_t WW8TableNodeInfo::getInnerForDepth(sal_uInt32 nDepth) const { WW8TableNodeInfoInner::Pointer_t pResult; - + Inners_t::const_iterator aIt = mInners.find(nDepth); if (aIt != mInners.end()) { pResult = aIt->second; } - + return pResult; } - + // WW8TableInfo WW8TableInfo::WW8TableInfo() @@ -597,37 +597,37 @@ WW8TableInfo::processSwTableByLayout(const SwTable * pTable) SwRect aRect = aTableCellInfo.getRect(); #ifdef DEBUG - static char sBuffer[1024]; + static char sBuffer[1024]; ::std::clog << "<CellFrm>" << ::std::endl; - snprintf(sBuffer, sizeof(sBuffer), + snprintf(sBuffer, sizeof(sBuffer), "<rect top=\"%ld\" bottom=\"%ld\" left=\"%ld\" right=\"%ld\"/>", aRect.Top(), aRect.Bottom(), aRect.Left(), aRect.Right()); ::std::clog << sBuffer << ::std::endl; #endif const SwTableBox * pTableBox = aTableCellInfo.getTableBox(); const SwStartNode * pSttNd = pTableBox->GetSttNd(); - + if (pSttNd != NULL) { SwPaM aPam(*pSttNd, 0); - + bool bDone = false; do { SwNode & rNode = aPam.GetPoint()->nNode.GetNode(); insertTableNodeInfo(&rNode, pTable, pTableBox, 0, 0, 1, & aRect); - + if (rNode.IsEndNode()) { SwEndNode * pEndNode = rNode.GetEndNode(); SwStartNode * pTmpSttNd = pEndNode->StartOfSectionNode(); - + if (pTmpSttNd == pSttNd) - bDone = true; + bDone = true; } - + aPam.GetPoint()->nNode++; } while (!bDone); @@ -645,12 +645,12 @@ WW8TableInfo::processSwTableByLayout(const SwTable * pTable) void WW8TableInfo::processSwTable(const SwTable * pTable) { -#ifdef DEBUG +#ifdef DEBUG ::std::clog << "<processSwTable>" << ::std::endl; #endif WW8TableNodeInfo * pPrev = NULL; - + SwFrmFmt * pFrmFmt = pTable->GetFrmFmt(); if (pFrmFmt != NULL && pTable->IsTblComplex()) { @@ -664,21 +664,21 @@ void WW8TableInfo::processSwTable(const SwTable * pTable) else { const SwTableLines & rLines = pTable->GetTabLines(); - + for (USHORT n = 0; n < rLines.Count(); n++) { const SwTableLine * pLine = rLines[n]; - + pPrev = processTableLine(pTable, pLine, n, 1, pPrev); } - + } if (pPrev != NULL) { SwTableNode * pTableNode = pTable->GetTableNode(); SwEndNode * pEndNode = pTableNode->EndOfSectionNode(); - + pPrev->setNextNode(pEndNode); } #ifdef DEBUG @@ -686,28 +686,28 @@ void WW8TableInfo::processSwTable(const SwTable * pTable) #endif } -WW8TableNodeInfo * -WW8TableInfo::processTableLine(const SwTable * pTable, - const SwTableLine * pTableLine, +WW8TableNodeInfo * +WW8TableInfo::processTableLine(const SwTable * pTable, + const SwTableLine * pTableLine, sal_uInt32 nRow, sal_uInt32 nDepth, WW8TableNodeInfo * pPrev) { #ifdef DEBUG - ::std::clog << "<processTableLine row=\"" << nRow << "\" depth=\"" + ::std::clog << "<processTableLine row=\"" << nRow << "\" depth=\"" << nDepth << "\">" << ::std::endl; #endif const SwTableBoxes & rBoxes = pTableLine->GetTabBoxes(); - + WW8TableNodeInfo::Pointer_t pTextNodeInfo; - + for (USHORT n = 0; n < rBoxes.Count(); n++) { const SwTableBox * pBox = rBoxes[n]; - + pPrev = processTableBox(pTable, pBox, nRow, n, nDepth, n == rBoxes.Count() - 1, pPrev); - } - + } + #ifdef DEBUG ::std::clog << "</processTableLine>" << ::std::endl; #endif @@ -724,22 +724,22 @@ WW8TableInfo::processTableBoxLines(const SwTableBox * pBox, sal_uInt32 nDepth) { #ifdef DEBUG - ::std::clog << "<processTableBoxLines depth=\"" << nDepth + ::std::clog << "<processTableBoxLines depth=\"" << nDepth << "\" row=\"" << nRow << "\" cell=\"" << nCell << "\">" << ::std::endl; #endif const SwTableLines & rLines = pBox->GetTabLines(); WW8TableNodeInfo::Pointer_t pNodeInfo; - + if (rLines.Count() > 0) { for (sal_uInt32 n = 0; n < rLines.Count(); n++) { const SwTableLine * pLine = rLines[n]; const SwTableBoxes & rBoxes = pLine->GetTabBoxes(); - + for (USHORT nBox = 0; nBox < rBoxes.Count(); nBox++) - pNodeInfo = processTableBoxLines(rBoxes[nBox], pTable, pBoxToSet, nRow, nCell, nDepth); + pNodeInfo = processTableBoxLines(rBoxes[nBox], pTable, pBoxToSet, nRow, nCell, nDepth); } } else @@ -748,21 +748,21 @@ WW8TableInfo::processTableBoxLines(const SwTableBox * pBox, const SwEndNode * pEndNd = pSttNd->EndOfSectionNode(); SwPaM aPaM(*pSttNd, 0); SwPaM aEndPaM(*pEndNd, 0); - + bool bDone = false; - while (!bDone) + while (!bDone) { SwNode & rNode = aPaM.GetPoint()->nNode.GetNode(); - - pNodeInfo = insertTableNodeInfo(&rNode, pTable, pBoxToSet, nRow, nCell, nDepth); - + + pNodeInfo = insertTableNodeInfo(&rNode, pTable, pBoxToSet, nRow, nCell, nDepth); + if (aPaM.GetPoint()->nNode == aEndPaM.GetPoint()->nNode) bDone = true; else aPaM.GetPoint()->nNode++; } } - + #ifdef DEBUG ::std::clog << "</processTableBoxLines>" << ::std::endl; #endif @@ -771,8 +771,8 @@ WW8TableInfo::processTableBoxLines(const SwTableBox * pBox, } WW8TableNodeInfo * -WW8TableInfo::processTableBox(const SwTable * pTable, - const SwTableBox * pBox, +WW8TableInfo::processTableBox(const SwTable * pTable, + const SwTableBox * pBox, sal_uInt32 nRow, sal_uInt32 nCell, sal_uInt32 nDepth, @@ -790,30 +790,30 @@ WW8TableInfo::processTableBox(const SwTable * pTable, WW8TableNodeInfo::Pointer_t pEndOfCellInfo; if (rLines.Count() > 0) - { + { pNodeInfo = processTableBoxLines(pBox, pTable, pBox, nRow, nCell, nDepth); pNodeInfo->setEndOfCell(true); if (bEndOfLine) pNodeInfo->setEndOfLine(true); - + for (sal_uInt32 n = 0; n < rLines.Count(); n++) { const SwTableLine * pLine = rLines[n]; - + pPrev = processTableLine(pTable, pLine, n, 1, pPrev); } } else - { + { SwPaM aPaM(*pSttNd, 0); - + bool bDone = false; sal_uInt32 nDepthInsideCell = 0; - + do { SwNode & rNode = aPaM.GetPoint()->nNode.GetNode(); - + if (rNode.IsStartNode()) { if (nDepthInsideCell > 0) @@ -821,24 +821,24 @@ WW8TableInfo::processTableBox(const SwTable * pTable, nDepthInsideCell++; } - + pNodeInfo = insertTableNodeInfo(&rNode, pTable, pBox, nRow, nCell, nDepth); - + if (pPrev != NULL) pPrev->setNext(pNodeInfo.get()); - + pPrev = pNodeInfo.get(); - + if (nDepthInsideCell == 1 && rNode.IsTxtNode()) pEndOfCellInfo = pNodeInfo; - + if (rNode.IsEndNode()) { nDepthInsideCell--; if (nDepthInsideCell == 0 && pEndOfCellInfo.get() == NULL) pEndOfCellInfo = pNodeInfo; - + SwEndNode * pEndNode = rNode.GetEndNode( ); SwStartNode * pTmpSttNd = pEndNode->StartOfSectionNode(); if (pTmpSttNd == pSttNd) @@ -851,12 +851,12 @@ WW8TableInfo::processTableBox(const SwTable * pTable, if (pEndOfCellInfo.get() != NULL) { - pEndOfCellInfo->setEndOfCell(true); - + pEndOfCellInfo->setEndOfCell(true); + if (bEndOfLine) pEndOfCellInfo->setEndOfLine(true); } - } + } #ifdef DEBUG ::std::clog << "</processTableBox>" << ::std::endl; @@ -866,8 +866,8 @@ WW8TableInfo::processTableBox(const SwTable * pTable, } WW8TableNodeInfo::Pointer_t WW8TableInfo::insertTableNodeInfo -(const SwNode * pNode, - const SwTable * pTable, +(const SwNode * pNode, + const SwTable * pTable, const SwTableBox * pTableBox, sal_uInt32 nRow, sal_uInt32 nCell, @@ -875,10 +875,10 @@ WW8TableNodeInfo::Pointer_t WW8TableInfo::insertTableNodeInfo SwRect * pRect) { WW8TableNodeInfo::Pointer_t pNodeInfo = getTableNodeInfo(pNode); - + if (pNodeInfo.get() == NULL) { - pNodeInfo = + pNodeInfo = WW8TableNodeInfo::Pointer_t(new WW8TableNodeInfo(this, pNode)); mMap.insert(Map_t::value_type(pNode, pNodeInfo)); } @@ -904,7 +904,7 @@ WW8TableNodeInfo::Pointer_t WW8TableInfo::insertTableNodeInfo if (pRect) { WW8TableCellGrid::Pointer_t pCellGrid = getCellGridForTable(pTable); - + pCellGrid->insert(*pRect, pNodeInfo.get()); pNodeInfo->setRect(*pRect); } @@ -941,26 +941,26 @@ WW8TableNodeInfo::Pointer_t WW8TableInfo::getTableNodeInfo { WW8TableNodeInfo::Pointer_t pResult; Map_t::iterator aIt = mMap.find(pNode); - + if (aIt != mMap.end()) pResult = (*aIt).second; - + return pResult; } const SwNode * WW8TableInfo::getNextNode(const SwNode * pNode) { const SwNode * pResult = NULL; - + WW8TableNodeInfo::Pointer_t pNodeInfo = getTableNodeInfo(pNode); - + if (pNodeInfo.get() != NULL) { WW8TableNodeInfo * pNextInfo = pNodeInfo->getNext(); - + if (pNextInfo != NULL) pResult = pNextInfo->getNode(); - else + else { const SwNode * pNextNode = pNodeInfo->getNextNode(); @@ -968,7 +968,7 @@ const SwNode * WW8TableInfo::getNextNode(const SwNode * pNode) pResult = pNextNode; } } - + return pResult; } @@ -1032,8 +1032,8 @@ bool CellInfo::operator < (const CellInfo & aCellInfo) const ::std::string CellInfo::toString() const { static char sBuffer[256]; - - snprintf(sBuffer, sizeof(sBuffer), + + snprintf(sBuffer, sizeof(sBuffer), "<cellinfo left=\"%ld\"" " right=\"%ld\"" " top=\"%ld\"" @@ -1044,7 +1044,7 @@ bool CellInfo::operator < (const CellInfo & aCellInfo) const top(), bottom(), m_pNodeInfo); - + return sBuffer; } @@ -1087,7 +1087,7 @@ WW8TableCellGridRow::Pointer_t WW8TableCellGrid::getRow(long nTop, bool bCreate) } } else - pResult = m_aRows[nTop]; + pResult = m_aRows[nTop]; return pResult; } @@ -1112,7 +1112,7 @@ CellInfoMultiSet::const_iterator WW8TableCellGrid::getCellsEnd(long nTop) return getRow(nTop)->end(); } -void WW8TableCellGrid::insert(const SwRect & rRect, +void WW8TableCellGrid::insert(const SwRect & rRect, WW8TableNodeInfo * pNodeInfo, unsigned long * pFmtFrmWidth) { @@ -1149,15 +1149,15 @@ void WW8TableCellGrid::addShadowCells() SwRect aRect = aCellIt->getRect(); long nRowSpan = 1; while (aCellIt != aCellEndIt) - { + { WW8TableNodeInfo * pNodeInfo = aCellIt->getTableNodeInfo(); if (bBeginningOfCell) { RowTops_t::const_iterator aRowSpanIt(aTopsIt); - aRowSpanIt++; - - if (aRowSpanIt != getRowTopsEnd() && + aRowSpanIt++; + + if (aRowSpanIt != getRowTopsEnd() && *aRowSpanIt < aCellIt->bottom()) { aRect.Top(*aRowSpanIt); @@ -1170,30 +1170,30 @@ void WW8TableCellGrid::addShadowCells() bVertMerge = false; nRowSpan = 1; - while (aRowSpanIt != getRowTopsEnd() && + while (aRowSpanIt != getRowTopsEnd() && *aRowSpanIt < aCellIt->bottom()) { aRowSpanIt++; nRowSpan++; } - + if (pNodeInfo != NULL) pRowSpans->push_back(nRowSpan); else pRowSpans->push_back(-nRowSpan); } - + if (pNodeInfo != NULL) { pNodeInfo->setVertMerge(bVertMerge); } aCellIt++; - + bBeginningOfCell = (aRect.Left() != aCellIt->left()); aRect = aCellIt->getRect(); } - + WW8TableCellGridRow::Pointer_t pRow = getRow(*aTopsIt); if (pRow.get() != NULL) pRow->setRowSpans(pRowSpans); @@ -1217,7 +1217,7 @@ WW8TableNodeInfo * WW8TableCellGrid::connectCells() CellInfoMultiSet::const_iterator aCellEndIt = getCellsEnd(*aTopsIt); GridColsPtr pWidths(new Widths); TableBoxVectorPtr pTableBoxes(new TableBoxVector); - + sal_uInt32 nShadows = 0; sal_uInt32 nCell = 0; bool bBeginningOfCell = true; @@ -1267,7 +1267,7 @@ WW8TableNodeInfo * WW8TableCellGrid::connectCells() if (bBeginningOfCell) { pWidths->push_back(aCellIt->getFmtFrmWidth()); - + if (pNodeInfo != NULL) pTableBoxes->push_back(pNodeInfo->getTableBox()); else @@ -1292,7 +1292,7 @@ WW8TableNodeInfo * WW8TableCellGrid::connectCells() } pLastNodeInfo->setShadowsAfter(nShadows); - + if (pEndOfCellInfo == NULL) { pEndOfCellInfo = pLastNodeInfo; @@ -1300,7 +1300,7 @@ WW8TableNodeInfo * WW8TableCellGrid::connectCells() pEndOfCellInfo->setEndOfCell(true); pLastNodeInfo->setEndOfLine(true); - + WW8TableCellGridRow::Pointer_t pRow(getRow(*aTopsIt)); pRow->setTableBoxVector(pTableBoxes); pRow->setWidths(pWidths); @@ -1390,7 +1390,7 @@ string WW8TableCellGrid::toString() } sResult += "</WW8TableCellGrid>\n"; - + return sResult; } @@ -1398,7 +1398,7 @@ TableBoxVectorPtr WW8TableCellGrid::getTableBoxesOfRow (WW8TableNodeInfoInner * pNodeInfoInner) { TableBoxVectorPtr pResult; - WW8TableCellGridRow::Pointer_t pRow = + WW8TableCellGridRow::Pointer_t pRow = getRow(pNodeInfoInner->getRect().Top(), false); if (pRow.get() != NULL) @@ -1414,7 +1414,7 @@ WidthsPtr WW8TableCellGrid::getWidthsOfRow { GridColsPtr pResult; - WW8TableCellGridRow::Pointer_t pRow = + WW8TableCellGridRow::Pointer_t pRow = getRow(pNodeInfoInner->getRect().Top(), false); if (pRow.get() != NULL) @@ -1423,27 +1423,27 @@ WidthsPtr WW8TableCellGrid::getWidthsOfRow } return pResult; -} +} RowSpansPtr WW8TableCellGrid::getRowSpansOfRow (WW8TableNodeInfoInner * pNodeInfoInner) { RowSpansPtr pResult; - - WW8TableCellGridRow::Pointer_t pRow = + + WW8TableCellGridRow::Pointer_t pRow = getRow(pNodeInfoInner->getRect().Top(), false); if (pRow.get() != NULL) { pResult = pRow->getRowSpans(); } - + return pResult; } WW8TableCellGridRow::WW8TableCellGridRow() : m_pCellInfos(new CellInfoMultiSet) -{ +{ } WW8TableCellGridRow::~WW8TableCellGridRow() @@ -1455,8 +1455,8 @@ void WW8TableCellGridRow::insert(const CellInfo & rCellInfo) m_pCellInfos->insert(rCellInfo); #ifdef DEBUG - ::std::clog << "<gridRowInsert>" - << rCellInfo.toString() + ::std::clog << "<gridRowInsert>" + << rCellInfo.toString() << "</gridRowInsert>" << ::std::endl; #endif @@ -1479,9 +1479,9 @@ void WW8TableCellGridRow::setTableBoxVector(TableBoxVectorPtr pTableBoxVector) void WW8TableCellGridRow::setWidths(WidthsPtr pWidths) { - m_pWidths = pWidths; + m_pWidths = pWidths; } - + void WW8TableCellGridRow::setRowSpans(RowSpansPtr pRowSpans) { m_pRowSpans = pRowSpans; diff --git a/sw/source/filter/ww8/WW8TableInfo.hxx b/sw/source/filter/ww8/WW8TableInfo.hxx index bd913e93fe65..9dc10486f251 100644 --- a/sw/source/filter/ww8/WW8TableInfo.hxx +++ b/sw/source/filter/ww8/WW8TableInfo.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 WW8_TABLE_INFO_HXX #define WW8_TABLE_INFO_HXX #include <hash_map> @@ -49,7 +49,7 @@ namespace ww8 using namespace ::std; class WW8TableNodeInfo; -typedef boost::shared_ptr<SwRect> SwRectPtr; +typedef boost::shared_ptr<SwRect> SwRectPtr; typedef ::std::vector<const SwTableBox *> TableBoxVector; typedef boost::shared_ptr<TableBoxVector> TableBoxVectorPtr; typedef ::std::vector<sal_uInt32> GridCols; @@ -74,13 +74,13 @@ class WW8TableNodeInfoInner const SwTableBox * mpTableBox; const SwTable * mpTable; SwRect maRect; - + public: typedef boost::shared_ptr<WW8TableNodeInfoInner> Pointer_t; WW8TableNodeInfoInner(WW8TableNodeInfo * pParent); ~WW8TableNodeInfoInner(); - + void setDepth(sal_uInt32 nDepth); void setCell(sal_uInt32 nCell); void setRow(sal_uInt32 nRow); @@ -93,7 +93,7 @@ public: void setTableBox(const SwTableBox * pTableBox); void setTable(const SwTable * pTable); void setRect(const SwRect & rRect); - + sal_uInt32 getDepth() const; sal_uInt32 getCell() const; sal_uInt32 getRow() const; @@ -106,7 +106,7 @@ public: const SwTableBox * getTableBox() const; const SwTable * getTable() const; const SwRect & getRect() const; - + const SwNode * getNode() const; TableBoxVectorPtr getTableBoxesOfRow(); @@ -125,9 +125,9 @@ class WW8TableInfo; class WW8TableNodeInfo { public: - typedef map<sal_uInt32, WW8TableNodeInfoInner::Pointer_t, + typedef map<sal_uInt32, WW8TableNodeInfoInner::Pointer_t, greater<sal_uInt32> > Inners_t; - + private: WW8TableInfo * mpParent; sal_uInt32 mnDepth; @@ -141,7 +141,7 @@ public: WW8TableNodeInfo(WW8TableInfo * pParent, const SwNode * pTxtNode); virtual ~WW8TableNodeInfo(); - + void setDepth(sal_uInt32 nDepth); void setEndOfLine(bool bEndOfLine); void setEndOfCell(bool bEndOfCell); @@ -156,7 +156,7 @@ public: void setNext(WW8TableNodeInfo * pNext); void setNextNode(const SwNode * pNode); void setRect(const SwRect & rRect); - + WW8TableInfo * getParent() const; sal_uInt32 getDepth() const; bool isEndOfLine() const; @@ -172,7 +172,7 @@ public: const Inners_t & getInners() const; const WW8TableNodeInfoInner::Pointer_t getFirstInner() const; const WW8TableNodeInfoInner::Pointer_t getInnerForDepth(sal_uInt32 nDepth) const; - + sal_uInt32 getCell() const; sal_uInt32 getRow() const; @@ -180,16 +180,16 @@ public: bool operator < (const WW8TableNodeInfo & rInfo) const; }; - + struct hashNode { - size_t operator()(const SwNode * pNode) const + size_t operator()(const SwNode * pNode) const { return reinterpret_cast<size_t>(pNode); } }; - + struct hashTable { - size_t operator()(const SwTable * pTable) const + size_t operator()(const SwTable * pTable) const { return reinterpret_cast<size_t>(pTable); } }; @@ -210,7 +210,7 @@ public: CellInfoMultiSet::const_iterator end() const; void setTableBoxVector(TableBoxVectorPtr pTableBoxVector); - void setWidths(WidthsPtr pGridCols); + void setWidths(WidthsPtr pGridCols); void setRowSpans(RowSpansPtr pRowSpans); TableBoxVectorPtr getTableBoxVector() const; @@ -225,7 +225,7 @@ class WW8TableCellGrid RowTops_t m_aRowTops; Rows_t m_aRows; - + WW8TableCellGridRow::Pointer_t getRow(long nTop, bool bCreate = true); RowTops_t::const_iterator getRowTopsBegin() const; RowTops_t::const_iterator getRowTopsEnd() const; @@ -238,7 +238,7 @@ public: WW8TableCellGrid(); ~WW8TableCellGrid(); - void insert(const SwRect & rRect, WW8TableNodeInfo * pNodeInfo, + void insert(const SwRect & rRect, WW8TableNodeInfo * pNodeInfo, unsigned long * pFmtFrmWidth = NULL); void addShadowCells(); WW8TableNodeInfo * connectCells(); @@ -248,7 +248,7 @@ public: TableBoxVectorPtr getTableBoxesOfRow(WW8TableNodeInfoInner * pNodeInfo); WidthsPtr getWidthsOfRow(WW8TableNodeInfoInner * pNodeInfo); RowSpansPtr getRowSpansOfRow(WW8TableNodeInfoInner * pNodeInfo); -}; +}; class WW8TableInfo { @@ -260,21 +260,21 @@ class WW8TableInfo CellGridMap_t mCellGridMap; typedef hash_map<const SwTable *, const SwNode *, hashTable > FirstInTableMap_t; - FirstInTableMap_t mFirstInTableMap; + FirstInTableMap_t mFirstInTableMap; WW8TableNodeInfo * - processTableLine(const SwTable * pTable, + processTableLine(const SwTable * pTable, const SwTableLine * pTableLine, - sal_uInt32 nRow, + sal_uInt32 nRow, sal_uInt32 nDepth, WW8TableNodeInfo * pPrev); WW8TableNodeInfo * processTableBox(const SwTable * pTable, const SwTableBox * pTableBox, sal_uInt32 nRow, - sal_uInt32 nCell, + sal_uInt32 nCell, sal_uInt32 nDepth, bool bEndOfLine, WW8TableNodeInfo * pPrev); - + WW8TableNodeInfo::Pointer_t processTableBoxLines(const SwTableBox * pBox, const SwTable * pTable, @@ -282,25 +282,25 @@ class WW8TableInfo sal_uInt32 nRow, sal_uInt32 nCell, sal_uInt32 nDepth); - + WW8TableNodeInfo::Pointer_t - insertTableNodeInfo(const SwNode * pNode, - const SwTable * pTable, + insertTableNodeInfo(const SwNode * pNode, + const SwTable * pTable, const SwTableBox * pTableBox, sal_uInt32 nRow, sal_uInt32 nCell, sal_uInt32 nDepth, SwRect * pRect = NULL); - WW8TableCellGrid::Pointer_t getCellGridForTable(const SwTable * pTable, + WW8TableCellGrid::Pointer_t getCellGridForTable(const SwTable * pTable, bool bCreate = true); - -public: + +public: typedef boost::shared_ptr<WW8TableInfo> Pointer_t; WW8TableInfo(); virtual ~WW8TableInfo(); - + void processSwTable(const SwTable * pTable); WW8TableNodeInfo * processSwTableByLayout(const SwTable * pTable); WW8TableNodeInfo::Pointer_t getTableNodeInfo(const SwNode * pNode); @@ -309,7 +309,7 @@ public: WW8TableNodeInfo * reorderByLayout(const SwTable * pTable); }; - + class CellInfo { SwRect m_aRect; @@ -320,7 +320,7 @@ public: CellInfo(const SwRect & aRect, WW8TableNodeInfo * pNodeInfo); CellInfo(const CellInfo & aRectAndTableInfo) - : m_aRect(aRectAndTableInfo.m_aRect), + : m_aRect(aRectAndTableInfo.m_aRect), m_pNodeInfo(aRectAndTableInfo.m_pNodeInfo), m_nFmtFrmWidth(aRectAndTableInfo.m_nFmtFrmWidth) { @@ -337,7 +337,7 @@ public: long width() const { return m_aRect.Width(); } long height() const { return m_aRect.Height(); } SwRect getRect() const { return m_aRect; } - WW8TableNodeInfo * getTableNodeInfo() const + WW8TableNodeInfo * getTableNodeInfo() const { return m_pNodeInfo; } unsigned long getFmtFrmWidth() const { diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx index 37ceb71897c8..a6326f14c887 100644 --- a/sw/source/filter/ww8/docxattributeoutput.hxx +++ b/sw/source/filter/ww8/docxattributeoutput.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 @@ -99,7 +99,7 @@ public: /// Output text (inside a run). virtual void RunText( const String& rText, rtl_TextEncoding eCharSet = RTL_TEXTENCODING_UTF8 ); - + /// Output text (without markup). virtual void RawText( const String& rText, bool bForceUnicode, rtl_TextEncoding eCharSet ); @@ -252,7 +252,7 @@ public: /// Start of the abstract numbering definition instance. virtual void StartAbstractNumbering( USHORT nId ); - + /// End of the abstract numbering definition instance. virtual void EndAbstractNumbering(); @@ -304,13 +304,13 @@ private: /// Output graphic fly frames. void FlyFrameGraphic( const SwGrfNode& rGrfNode, const Size& rSize ); void WriteOLE2Obj( const SdrObject* pSdrObj, const Size& rSize ); - + void InitTableHelper( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ); void StartTable( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ); void StartTableRow( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ); - + void StartTableCell( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ); void TableCellProperties( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ); @@ -517,7 +517,7 @@ protected: virtual void RefField( const SwField& rFld, const String& rRef ); virtual void HiddenField( const SwField& rFld ); - virtual void SetField( const SwField& rFld, ww::eField eType, const String& rCmd ); + virtual void SetField( const SwField& rFld, ww::eField eType, const String& rCmd ); virtual void PostitField( const SwField* pFld ); virtual bool DropdownField( const SwField* pFld ); @@ -584,7 +584,7 @@ private: bool m_bParagraphOpened; - // Remember that a column break has to be opened at the + // Remember that a column break has to be opened at the // beginning of the next paragraph DocxColBreakStatus m_nColBreakStatus; @@ -603,13 +603,13 @@ public: /// Occasionnaly need to use this serializer from the outside ::sax_fastparser::FSHelperPtr GetSerializer( ) { return m_pSerializer; } - + /// Do we have any footnotes? bool HasFootnotes(); /// Do we have any endnotes? bool HasEndnotes(); - + /// Output the content of the footnotes.xml resp. endnotes.xml void FootnotesEndnotes( bool bFootnotes ); }; diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx index 2df417d6b877..ad916cdc3d50 100644 --- a/sw/source/filter/ww8/docxexport.cxx +++ b/sw/source/filter/ww8/docxexport.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -132,11 +132,11 @@ void DocxExport::AppendBookmarks( const SwTxtNode& rNode, xub_StrLen nAktPos, xu it < end; ++it ) { IMark* pMark = (*it); - + xub_StrLen nStart = pMark->GetMarkStart().nContent.GetIndex(); xub_StrLen nEnd = pMark->GetMarkEnd().nContent.GetIndex(); - if ( nStart == nAktPos ) + if ( nStart == nAktPos ) aStarts.push_back( pMark->GetName() ); if ( nEnd == nAktPos ) @@ -243,41 +243,41 @@ void DocxExport::DoComboBox(const rtl::OUString& rName, { m_pDocumentFS->startElementNS( XML_w, XML_ffData, FSEND ); - m_pDocumentFS->singleElementNS( XML_w, XML_name, + m_pDocumentFS->singleElementNS( XML_w, XML_name, FSNS( XML_w, XML_val ), OUStringToOString( rName, RTL_TEXTENCODING_UTF8 ).getStr(), FSEND ); m_pDocumentFS->singleElementNS( XML_w, XML_enabled, FSEND ); if ( rHelp.getLength( ) > 0 ) - m_pDocumentFS->singleElementNS( XML_w, XML_helpText, + m_pDocumentFS->singleElementNS( XML_w, XML_helpText, FSNS( XML_w, XML_val ), OUStringToOString( rHelp, RTL_TEXTENCODING_UTF8 ).getStr(), FSEND ); - + if ( rToolTip.getLength( ) > 0 ) - m_pDocumentFS->singleElementNS( XML_w, XML_statusText, + m_pDocumentFS->singleElementNS( XML_w, XML_statusText, FSNS( XML_w, XML_val ), OUStringToOString( rToolTip, RTL_TEXTENCODING_UTF8 ).getStr(), FSEND ); m_pDocumentFS->startElementNS( XML_w, XML_ddList, FSEND ); - + // Output the 0-based index of the selected value sal_uInt32 nListItems = rListItems.getLength(); sal_Int32 nId = 0; sal_uInt32 nI = 0; while ( ( nI < nListItems ) && ( nId == 0 ) ) { - if ( rListItems[nI] == rSelected ) + if ( rListItems[nI] == rSelected ) nId = nI; nI++; } - m_pDocumentFS->singleElementNS( XML_w, XML_result, + m_pDocumentFS->singleElementNS( XML_w, XML_result, FSNS( XML_w, XML_val ), rtl::OString::valueOf( nId ).getStr( ), FSEND ); // Loop over the entries - + for (sal_uInt32 i = 0; i < nListItems; i++) { m_pDocumentFS->singleElementNS( XML_w, XML_listEntry, @@ -332,7 +332,7 @@ void DocxExport::ExportDocument_Impl() WriteMainText(); WriteFootnotesEndnotes(); - + WriteNumbering(); WriteFonts(); @@ -384,7 +384,7 @@ void DocxExport::OutputEndNode( const SwEndNode& rEndNode ) nRstLnNum = 0; AttrOutput().SectionBreak( msword::PageBreak, m_pSections->CurrentSectionInfo( ) ); - m_pSections->AppendSection( pAktPageDesc, pParentFmt, nRstLnNum ); + m_pSections->AppendSection( pAktPageDesc, pParentFmt, nRstLnNum ); } } } @@ -411,7 +411,7 @@ void DocxExport::OutputLinkedOLE( const OUString& ) ULONG DocxExport::ReplaceCr( BYTE ) { - // Completely unused for Docx export... only here for code sharing + // Completely unused for Docx export... only here for code sharing // purpose with binary export return 0; } @@ -549,7 +549,7 @@ void DocxExport::WriteHeaderFooter( const SwFmt& rFmt, bool bHeader, const char* aRelId = m_pFilter->addRelation( m_pDocumentFS->getOutputStream(), S( "http://schemas.openxmlformats.org/officeDocument/2006/relationships/header" ), aName ); - + pFS = m_pFilter->openFragmentStreamWithSerializer( OUStringBuffer().appendAscii( "word/" ).append( aName ).makeStringAndClear(), S( "application/vnd.openxmlformats-officedocument.wordprocessingml.header+xml" ) ); @@ -562,7 +562,7 @@ void DocxExport::WriteHeaderFooter( const SwFmt& rFmt, bool bHeader, const char* aRelId = m_pFilter->addRelation( m_pDocumentFS->getOutputStream(), S( "http://schemas.openxmlformats.org/officeDocument/2006/relationships/footer" ), aName ); - + pFS = m_pFilter->openFragmentStreamWithSerializer( OUStringBuffer().appendAscii( "word/" ).append( aName ).makeStringAndClear(), S( "application/vnd.openxmlformats-officedocument.wordprocessingml.footer+xml" ) ); @@ -625,14 +625,14 @@ void DocxExport::WriteFonts() } -void DocxExport::WriteProperties( ) +void DocxExport::WriteProperties( ) { // Write the core properties SwDocShell* pDocShell( pDoc->GetDocShell( ) ); uno::Reference<document::XDocumentProperties> xDocProps; if ( pDocShell ) { - uno::Reference<document::XDocumentPropertiesSupplier> xDPS( + uno::Reference<document::XDocumentPropertiesSupplier> xDPS( pDocShell->GetModel( ), uno::UNO_QUERY ); xDocProps = xDPS->getDocumentProperties(); } @@ -652,7 +652,7 @@ void DocxExport::WriteMainText() // body m_pDocumentFS->startElementNS( XML_w, XML_body, FSEND ); - + pCurPam->GetPoint()->nNode = pDoc->GetNodes().GetEndOfContent().StartOfSectionNode()->GetIndex(); // the text diff --git a/sw/source/filter/ww8/docxexportfilter.hxx b/sw/source/filter/ww8/docxexportfilter.hxx index 0d6432a79805..a3ec5c1bbe7f 100644 --- a/sw/source/filter/ww8/docxexportfilter.hxx +++ b/sw/source/filter/ww8/docxexportfilter.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/sw/source/filter/ww8/docxfootnotes.hxx b/sw/source/filter/ww8/docxfootnotes.hxx index 1d715e7ff260..ed9f160c94b6 100644 --- a/sw/source/filter/ww8/docxfootnotes.hxx +++ b/sw/source/filter/ww8/docxfootnotes.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/sw/source/filter/ww8/dump/dump8.cxx b/sw/source/filter/ww8/dump/dump8.cxx index ecd8e4fb1944..67e9aa5ccea6 100644 --- a/sw/source/filter/ww8/dump/dump8.cxx +++ b/sw/source/filter/ww8/dump/dump8.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -127,7 +127,7 @@ void MyApp::Main() Execute(); } DeInit(); -// SvFactory::DeInit(); +// SvFactory::DeInit(); } // ----------------------------------------------------------------------- diff --git a/sw/source/filter/ww8/dump/dump8a.cxx b/sw/source/filter/ww8/dump/dump8a.cxx index f9c6fe779409..b35a64bce7bf 100644 --- a/sw/source/filter/ww8/dump/dump8a.cxx +++ b/sw/source/filter/ww8/dump/dump8a.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,8 +29,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sw.hxx" -#include <string.h> // memset(), ... -#include <io.h> // access() +#include <string.h> // memset(), ... +#include <io.h> // access() #include <tools/solar.h> #include <sot/storage.hxx> @@ -47,12 +47,12 @@ WW8ScannerBase* pSBase = 0; //WW8PLCFMan* pPLCFMan = 0; -WW8Fib* pWwFib = 0; -SvStorageRef* pxStor; +WW8Fib* pWwFib = 0; +SvStorageRef* pxStor; SvStorageStreamRef xStrm; -SvStorageStreamRef xTableStream; // ist bei Ver6-7 mit xStrm identisch, +SvStorageStreamRef xTableStream; // ist bei Ver6-7 mit xStrm identisch, // ansonsten entweder 0TABLE oder 1TABLE -SvStorageStreamRef xDataStream; // ist bei Ver6-7 mit xStrm identisch, +SvStorageStreamRef xDataStream; // ist bei Ver6-7 mit xStrm identisch, // ansonsten DATA typedef void (*FNDumpData)( void* ); @@ -235,7 +235,7 @@ static void DumpNumList() for( USHORT nLevel = 0; nLevel < nWW8MaxListLevel; nLevel++ ) *xTableStream >> aStyleIdArr[ nLevel ]; *xTableStream >> nByte; - xTableStream->SeekRel( 1 ); // Dummy ueberlesen + xTableStream->SeekRel( 1 ); // Dummy ueberlesen *pOut << "ListId: " << nLstId << " TemplateId " << nTplId << endl1 @@ -334,7 +334,7 @@ static void DumpBookLow() *pOut << endl1; WW8PLCFspecial aStarts( &xStrm, pWwFib->fcPlcfbkf, pWwFib->lcbPlcfbkf, 4 ); - WW8PLCFspecial aEnds( &xStrm, pWwFib->fcPlcfbkl, pWwFib->lcbPlcfbkl, 0, -1, TRUE ); + WW8PLCFspecial aEnds( &xStrm, pWwFib->fcPlcfbkl, pWwFib->lcbPlcfbkl, 0, -1, TRUE ); USHORT i = 0; while( 1 ){ @@ -381,7 +381,7 @@ static void DumpBookHigh() *pOut << indent2 << i << ". Cp:" << hex6 << nPos << dec; *pOut << ( ( aBook.GetIsEnd() ) ? " Ende " : " Anfang" ); *pOut << " Handle: " << aBook.GetHandle(); -// *pOut << " Len: " << hex4 << aBook.GetLen() << dec; +// *pOut << " Len: " << hex4 << aBook.GetLen() << dec; ByteString sName( *aBook.GetName(), RTL_TEXTENCODING_MS_1252 ); if( sName.Len() ) *pOut << " Name: " << sName.GetBuffer() << endl1; @@ -422,51 +422,51 @@ static BOOL DumpField2( WW8PLCFspecial& rPlc ) { WW8_CP nSCode, nECode, nSRes, nERes; void* pData; - if( !rPlc.Get( nSCode, pData ) ) // Ende des Plc1 ? + if( !rPlc.Get( nSCode, pData ) ) // Ende des Plc1 ? return FALSE; rPlc++; if( ((BYTE*)pData)[0] != 19 ){ *pOut << "Field Error, " << (USHORT)((BYTE*)pData)[0] << endl1; - return TRUE; // nicht abbrechen + return TRUE; // nicht abbrechen } *pOut << " " << indent1 << begin1 << "Field" << " Cp: " << hex << nSCode << " Typ: " << dec << (USHORT)((BYTE*)pData)[1] << endl1; - if( !rPlc.Get( nECode, pData ) ) // Ende des Plc1 ? + if( !rPlc.Get( nECode, pData ) ) // Ende des Plc1 ? return FALSE; DumpShortPlainText( nSCode, nECode - nSCode, "Code" ); // Code, bei nested abgeschnitten - nSRes = nECode; // Default + nSRes = nECode; // Default - while( ((BYTE*)pData)[0] == 19 ){ // immer noch neue (nested) Anfaenge ? - DumpField2( rPlc ); // nested Field im Beschreibungsteil - if( !rPlc.Get( nSRes, pData ) ) // Ende des Plc1 ? + while( ((BYTE*)pData)[0] == 19 ){ // immer noch neue (nested) Anfaenge ? + DumpField2( rPlc ); // nested Field im Beschreibungsteil + if( !rPlc.Get( nSRes, pData ) ) // Ende des Plc1 ? return FALSE; } - if( ((BYTE*)pData)[0] == 20 ){ // Field Separator ? + if( ((BYTE*)pData)[0] == 20 ){ // Field Separator ? rPlc++; *pOut << " " << indent1 << "Field Seperator" << " Cp: " << hex << nSRes << ", Flags = 0x" << hex << (USHORT)((BYTE*)pData)[1] << dec << endl1; - if( !rPlc.Get( nERes, pData ) ) // Ende des Plc1 ? + if( !rPlc.Get( nERes, pData ) ) // Ende des Plc1 ? return FALSE; - while( ((BYTE*)pData)[0] == 19 ){ // immer noch neue (nested) Anfaenge ? - DumpField2( rPlc ); // nested Field im Resultatteil - if( !rPlc.Get( nERes, pData ) ) // Ende des Plc1 ? + while( ((BYTE*)pData)[0] == 19 ){ // immer noch neue (nested) Anfaenge ? + DumpField2( rPlc ); // nested Field im Resultatteil + if( !rPlc.Get( nERes, pData ) ) // Ende des Plc1 ? return FALSE; } DumpShortPlainText( nSRes, nERes - nSRes, "Result" ); // Result, bei nested incl. nested Field }else{ - nERes = nSRes; // Kein Result vorhanden + nERes = nSRes; // Kein Result vorhanden } rPlc++; - if( ((BYTE*)pData)[0] == 21 ){ // Field Ende ? + if( ((BYTE*)pData)[0] == 21 ){ // Field Ende ? *pOut << " " << end1 << " Field " << " Cp: " << hex << nERes << ", Flags = 0x" << hex << (USHORT)((BYTE*)pData)[1] << dec << endl1; }else{ @@ -496,7 +496,7 @@ static void DumpField1( WW8_FC nPos, long nLen, char* pName ) << endl1; -// while( DumpField2( aPlc ) ){} +// while( DumpField2( aPlc ) ){} while( (long)aPlc.GetIdx() < aPlc.GetIMax() ) { DumpField3( aPlc ); @@ -525,7 +525,7 @@ static void DumpFonts() sOut = ByteString( p->sFontname, RTL_TEXTENCODING_MS_1252 ); *pOut << "Id:" << i << " Name:\"" << sOut.GetBuffer() << '"'; // Name - if( p->ibszAlt ) // gibt es einen alternativen Font ? + if( p->ibszAlt ) // gibt es einen alternativen Font ? { sOut = ByteString( p->sFontname.Copy( p->ibszAlt ), RTL_TEXTENCODING_MS_1252 ); @@ -542,7 +542,7 @@ static void DumpFonts() //----------------------------------------- -// class DFib +// class DFib //----------------------------------------- class DFib: public WW8Fib @@ -755,7 +755,7 @@ void DFib::Dump() } //----------------------------------------- -// class DStyle +// class DStyle //----------------------------------------- class DStyle: public WW8Style @@ -769,7 +769,7 @@ public: }; //----------------------------------------- -// universelle Hilfsroutinen +// universelle Hilfsroutinen //----------------------------------------- static void DumpIt( SvStream& rSt, short nLen ) @@ -819,7 +819,7 @@ static short DumpSprm( BYTE nVersion, SvStream& rSt, short nSprmsLen ) indent( *pOut, rSt ); BYTE x[512]; - rSt.Read( x, 512 ); // Token und folgende lesen + rSt.Read( x, 512 ); // Token und folgende lesen USHORT nId = WW8GetSprmId( nVersion, x, &nDelta ); @@ -846,9 +846,9 @@ static short DumpSprm( BYTE nVersion, SvStream& rSt, short nSprmsLen ) rSt.Seek( nSprmPos + 1 + nDelta + WW8SprmDataOfs( nId ) );// gehe zum eigentlichen // Inhalt if( rSprm.pOutFnc ) - rSprm.pOutFnc( rSt, nSprmNL ); // Rufe Ausgabefunktion + rSprm.pOutFnc( rSt, nSprmNL ); // Rufe Ausgabefunktion else - DumpItSmall( rSt, nSprmNL ); // oder Dumper + DumpItSmall( rSt, nSprmNL ); // oder Dumper *pOut << endl1; return nSprmsLen; @@ -873,7 +873,7 @@ static void DumpMemSprm( BYTE nVersion, INT16* pSprm ) BYTE* p = (BYTE*)pSprm; USHORT nId = WW8GetSprmId( nVersion, p, 0 ); - *pOut << (USHORT)p[0]; // Ausgabe: Token in Dez + *pOut << (USHORT)p[0]; // Ausgabe: Token in Dez *pOut << '/' << WW8GetSprmSizeBrutto( nVersion, p, &nId ); // Laenge incl. alles in Dez *pOut << '/' << WW8GetSprmSizeNetto( nVersion, p, &nId ); // Laenge excl Token in Dez @@ -884,7 +884,7 @@ static void DumpMemSprm( BYTE nVersion, INT16* pSprm ) //----------------------------------------- -// Hilfsroutinen: SEPX +// Hilfsroutinen: SEPX //----------------------------------------- void DumpSepx( BYTE nVersion, long nPos ) { @@ -901,7 +901,7 @@ void DumpSepx( BYTE nVersion, long nPos ) //----------------------------------------- -// Hilfsroutinen: FKP.CHPX, FKP.PAPX +// Hilfsroutinen: FKP.CHPX, FKP.PAPX //----------------------------------------- static void DumpPhe( WW8_PHE_Base& rPhe ) { @@ -957,7 +957,7 @@ void DumpFkp( BYTE nVersion, long nPos, short nItemSize, ePLCFT ePlc ) int i; WW8_FC aF[2]; BYTE c; - long nStartOfs = nPos + ( nElem + 1 ) * 4; // bei dieser Pos faengt Offset-Array an + long nStartOfs = nPos + ( nElem + 1 ) * 4; // bei dieser Pos faengt Offset-Array an short nOfs; WW8_PHE_Base aPhe; @@ -965,14 +965,14 @@ void DumpFkp( BYTE nVersion, long nPos, short nItemSize, ePLCFT ePlc ) { xStrm->Seek( nPos + i * 4 ); indent( *pOut, *xStrm ); - xStrm->Read( aF, sizeof( aF ) ); // lese 2 FCs + xStrm->Read( aF, sizeof( aF ) ); // lese 2 FCs xStrm->Seek( nStartOfs + i * nItemSize ); - xStrm->Read( &c, 1 ); // lese Word Offset ( evtl. Teil von BX ) + xStrm->Read( &c, 1 ); // lese Word Offset ( evtl. Teil von BX ) if( ePlc == PAP ) xStrm->Read( &aPhe, sizeof( aPhe ) ); - nOfs= c * 2; // -> Byte Offset + nOfs= c * 2; // -> Byte Offset xStrm->Seek( nPos + nOfs ); xStrm->Read( &c, 1 ); @@ -993,7 +993,7 @@ void DumpFkp( BYTE nVersion, long nPos, short nItemSize, ePLCFT ePlc ) break; case PAP: - short nLen = c * 2; // So weit bis zum naechsten ! + short nLen = c * 2; // So weit bis zum naechsten ! short nIStd; @@ -1015,18 +1015,18 @@ void DumpFkp( BYTE nVersion, long nPos, short nItemSize, ePLCFT ePlc ) } //----------------------------------------- -// WW8_DOP ( Document Properties ) +// WW8_DOP ( Document Properties ) //----------------------------------------- //!!! WW8LoadDop gibt's jetzt auch in WW8scan.cxx void DumpDop( WW8Fib& rFib ) { // nicht loeschen! - xTableStream->Seek( rFib.fcDop ); // diese Aktion dient lediglich dazu, die + xTableStream->Seek( rFib.fcDop ); // diese Aktion dient lediglich dazu, die // Positions-Ausgabe der folgenden Anweisung // mit dem alten Dumper uebereinstimmen zu lassen. -// *pOut << begin( *pOut, *xTableStream ) << "Dop, Size " << rFib.lcbDop << ", DefaultSize 84" << endl1; +// *pOut << begin( *pOut, *xTableStream ) << "Dop, Size " << rFib.lcbDop << ", DefaultSize 84" << endl1; begin( *pOut, *xTableStream ) << "Dop, Size " << rFib.lcbDop << ", DefaultSize 84" << endl1; WW8Dop* pD = new WW8Dop( *xTableStream, rFib.nFib, rFib.fcDop, rFib.lcbDop ); @@ -1153,7 +1153,7 @@ void DumpDop( WW8Fib& rFib ) } //----------------------------------------- -// PLCF.PCD ( Piece Table ) +// PLCF.PCD ( Piece Table ) //----------------------------------------- #ifdef __WW8_NEEDS_PACK @@ -1164,13 +1164,13 @@ struct WW8_PCD1 { BYTE aBits1; BYTE aBits2; -// INT16 fNoParaLast : 1; // when 1, means that piece contains no end of parag -// BYTE fPaphNil : 1; // used internally by Word -// BYTE fCopied : 1; // used internally by Word - // * int :5 -// BYTE aBits2; // fn int:8, used internally by Word - INT32 fc; // file offset of beginning of piece. The size of th - INT16 prm; // PRM contains either a single sprm or else an inde +// INT16 fNoParaLast : 1; // when 1, means that piece contains no end of parag +// BYTE fPaphNil : 1; // used internally by Word +// BYTE fCopied : 1; // used internally by Word + // * int :5 +// BYTE aBits2; // fn int:8, used internally by Word + INT32 fc; // file offset of beginning of piece. The size of th + INT16 prm; // PRM contains either a single sprm or else an inde }; #ifdef __WW8_NEEDS_PACK @@ -1248,12 +1248,12 @@ static void DumpPcd( BYTE nVersion, long nPos, long nLen ) indent( *pOut, *xTableStream ) << "grpprl No. " << i << ", Len: " << cb << endl1; long nPos = xTableStream->Tell(); - DumpSprms( nVersion, *xTableStream, cb ); // Dumpe Sprms - xTableStream->Seek( nPos + cb ); // gehe hinter grpprl + DumpSprms( nVersion, *xTableStream, cb ); // Dumpe Sprms + xTableStream->Seek( nPos + cb ); // gehe hinter grpprl nLen1 -= cb; i++; -// *pOut << " " << indent1 << "grpprl: " << cb << "Bytes ueberlesen"; -// *pOut << endl1; +// *pOut << " " << indent1 << "grpprl: " << cb << "Bytes ueberlesen"; +// *pOut << endl1; } INT32 nLen2; xTableStream->Read( &nLen2, 4 ); @@ -1268,7 +1268,7 @@ static void DumpPcd( BYTE nVersion, long nPos, long nLen ) } //----------------------------------------- -// PLCF.CHPX, PLCF.PAPX, PLCF.SEPX +// PLCF.CHPX, PLCF.PAPX, PLCF.SEPX //----------------------------------------- static void DumpPLCF( long nPos, long nLen, ePLCFT ePlc ) @@ -1304,7 +1304,7 @@ static void DumpPLCF( long nPos, long nLen, ePLCFT ePlc ) return; } -// SvStream* pSt = (SEP == ePlc) ? &xTableStream : &xStrm; +// SvStream* pSt = (SEP == ePlc) ? &xTableStream : &xStrm; SvStream* pSt = &xTableStream; WW8PLCF aPlc( pSt, nPos, nLen, pPlcSizeTab[ ePlc ] ); @@ -1411,7 +1411,7 @@ static void DumpPLCF( long nPos, long nLen, ePLCFT ePlc ) } //----------------------------------------- -// Text ohne Attribute +// Text ohne Attribute //----------------------------------------- static void DumpPlainText1( WW8_CP nStartCp, long nTextLen ) @@ -1430,7 +1430,7 @@ static void DumpPlainText1( WW8_CP nStartCp, long nTextLen ) *pOut << endl1; indent( *pOut, *xStrm ); } -// DumpChar( c ); +// DumpChar( c ); } } @@ -1456,7 +1456,7 @@ void DumpPlainText( WW8_CP nStartCp, long nTextLen, char* pName ) } //----------------------------------------- -// Text mit Attributen +// Text mit Attributen //----------------------------------------- BOOL DumpChar( BYTE c ) @@ -1466,7 +1466,7 @@ BOOL DumpChar( BYTE c ) return FALSE; }else{ switch (c){ - case 0xe4: // dt. Umlaute + case 0xe4: // dt. Umlaute case 0xf6: case 0xfc: case 0xdf: @@ -1486,7 +1486,7 @@ BOOL DumpChar( BYTE c ) } //----------------------------------------- -// Header / Footer +// Header / Footer //----------------------------------------- static void DumpPlcText( WW8_FC nPos, long nLen, long nOfs, @@ -1595,7 +1595,7 @@ void DumpTxtStoryEntry( void* pData ) short* ps = (short*)p; *pOut << " fReusable: 0x" << *ps++ << endl1; p = (long*)ps; - ++p; // reserved + ++p; // reserved *pOut << " " << indent1 << "lid: 0x" << *p++; *pOut << " txidUndo: 0x" << *p++ << dec << endl1; @@ -1760,27 +1760,27 @@ BOOL ReadEsherRec( SvStream& rStrm, UINT8& rVer, UINT16& rInst, const char* _GetShapeTypeNm( UINT16 nId ) { const char* aNmArr[ 202 + 2 + 1 ] = { -/* 0*/ "NotPrimitive","Rectangle","RoundRectangle","Ellipse","Diamond","IsocelesTriangle","RightTriangle","Parallelogram","Trapezoid","Hexagon", -/* 10*/ "Octagon","Plus","Star","Arrow","ThickArrow","HomePlate","Cube","Balloon","Seal","Arc", -/* 20*/ "Line","Plaque","Can","Donut","TextSimple","TextOctagon","TextHexagon","TextCurve","TextWave","TextRing", -/* 30*/ "TextOnCurve","TextOnRing","StraightConnector1","BentConnector2","BentConnector3","BentConnector4","BentConnector5","CurvedConnector2","CurvedConnector3","CurvedConnector4", -/* 40*/ "CurvedConnector5","Callout1","Callout2","Callout3","AccentCallout1","AccentCallout2","AccentCallout3","BorderCallout1","BorderCallout2","BorderCallout3", -/* 50*/ "AccentBorderCallout1","AccentBorderCallout2","AccentBorderCallout3","Ribbon","Ribbon2","Chevron","Pentagon","NoSmoking","Seal8","Seal16", -/* 60*/ "Seal32","WedgeRectCallout","WedgeRRectCallout","WedgeEllipseCallout","Wave","FoldedCorner","LeftArrow","DownArrow","UpArrow","LeftRightArrow", -/* 70*/ "UpDownArrow","IrregularSeal1","IrregularSeal2","LightningBolt","Heart","PictureFrame","QuadArrow","LeftArrowCallout","RightArrowCallout","UpArrowCallout", -/* 80*/ "DownArrowCallout","LeftRightArrowCallout","UpDownArrowCallout","QuadArrowCallout","Bevel","LeftBracket","RightBracket","LeftBrace","RightBrace","LeftUpArrow", -/* 90*/ "BentUpArrow","BentArrow","Seal24","StripedRightArrow","NotchedRightArrow","BlockArc","SmileyFace","VerticalScroll","HorizontalScroll","CircularArrow", -/* 100*/ "NotchedCircularArrow","UturnArrow","CurvedRightArrow","CurvedLeftArrow","CurvedUpArrow","CurvedDownArrow","CloudCallout","EllipseRibbon","EllipseRibbon2","FlowChartProcess", -/* 110*/ "FlowChartDecision","FlowChartInputOutput","FlowChartPredefinedProcess","FlowChartInternalStorage","FlowChartDocument","FlowChartMultidocument","FlowChartTerminator","FlowChartPreparation","FlowChartManualInput","FlowChartManualOperation", -/* 120*/ "FlowChartConnector","FlowChartPunchedCard","FlowChartPunchedTape","FlowChartSummingJunction","FlowChartOr","FlowChartCollate","FlowChartSort","FlowChartExtract","FlowChartMerge","FlowChartOfflineStorage", -/* 130*/ "FlowChartOnlineStorage","FlowChartMagneticTape","FlowChartMagneticDisk","FlowChartMagneticDrum","FlowChartDisplay","FlowChartDelay","TextPlainText","TextStop","TextTriangle","TextTriangleInverted", -/* 140*/ "TextChevron","TextChevronInverted","TextRingInside","TextRingOutside","TextArchUpCurve","TextArchDownCurve","TextCircleCurve","TextButtonCurve","TextArchUpPour","TextArchDownPour", -/* 150*/ "TextCirclePour","TextButtonPour","TextCurveUp","TextCurveDown","TextCascadeUp","TextCascadeDown","TextWave1","TextWave2","TextWave3","TextWave4", -/* 160*/ "TextInflate","TextDeflate","TextInflateBottom","TextDeflateBottom","TextInflateTop","TextDeflateTop","TextDeflateInflate","TextDeflateInflateDeflate","TextFadeRight","TextFadeLeft", -/* 170*/ "TextFadeUp","TextFadeDown","TextSlantUp","TextSlantDown","TextCanUp","TextCanDown","FlowChartAlternateProcess","FlowChartOffpageConnector","Callout90","AccentCallout90", -/* 180*/ "BorderCallout90","AccentBorderCallout90","LeftRightUpArrow","Sun","Moon","BracketPair","BracePair","Seal4","DoubleWave","ActionButtonBlank", -/* 190*/ "ActionButtonHome","ActionButtonHelp","ActionButtonInformation","ActionButtonForwardNext","ActionButtonBackPrevious","ActionButtonEnd","ActionButtonBeginning","ActionButtonReturn","ActionButtonDocument","ActionButtonSound", -/* 200*/ "ActionButtonMovie","HostControl","TextBox","Nil", "???" +/* 0*/ "NotPrimitive","Rectangle","RoundRectangle","Ellipse","Diamond","IsocelesTriangle","RightTriangle","Parallelogram","Trapezoid","Hexagon", +/* 10*/ "Octagon","Plus","Star","Arrow","ThickArrow","HomePlate","Cube","Balloon","Seal","Arc", +/* 20*/ "Line","Plaque","Can","Donut","TextSimple","TextOctagon","TextHexagon","TextCurve","TextWave","TextRing", +/* 30*/ "TextOnCurve","TextOnRing","StraightConnector1","BentConnector2","BentConnector3","BentConnector4","BentConnector5","CurvedConnector2","CurvedConnector3","CurvedConnector4", +/* 40*/ "CurvedConnector5","Callout1","Callout2","Callout3","AccentCallout1","AccentCallout2","AccentCallout3","BorderCallout1","BorderCallout2","BorderCallout3", +/* 50*/ "AccentBorderCallout1","AccentBorderCallout2","AccentBorderCallout3","Ribbon","Ribbon2","Chevron","Pentagon","NoSmoking","Seal8","Seal16", +/* 60*/ "Seal32","WedgeRectCallout","WedgeRRectCallout","WedgeEllipseCallout","Wave","FoldedCorner","LeftArrow","DownArrow","UpArrow","LeftRightArrow", +/* 70*/ "UpDownArrow","IrregularSeal1","IrregularSeal2","LightningBolt","Heart","PictureFrame","QuadArrow","LeftArrowCallout","RightArrowCallout","UpArrowCallout", +/* 80*/ "DownArrowCallout","LeftRightArrowCallout","UpDownArrowCallout","QuadArrowCallout","Bevel","LeftBracket","RightBracket","LeftBrace","RightBrace","LeftUpArrow", +/* 90*/ "BentUpArrow","BentArrow","Seal24","StripedRightArrow","NotchedRightArrow","BlockArc","SmileyFace","VerticalScroll","HorizontalScroll","CircularArrow", +/* 100*/ "NotchedCircularArrow","UturnArrow","CurvedRightArrow","CurvedLeftArrow","CurvedUpArrow","CurvedDownArrow","CloudCallout","EllipseRibbon","EllipseRibbon2","FlowChartProcess", +/* 110*/ "FlowChartDecision","FlowChartInputOutput","FlowChartPredefinedProcess","FlowChartInternalStorage","FlowChartDocument","FlowChartMultidocument","FlowChartTerminator","FlowChartPreparation","FlowChartManualInput","FlowChartManualOperation", +/* 120*/ "FlowChartConnector","FlowChartPunchedCard","FlowChartPunchedTape","FlowChartSummingJunction","FlowChartOr","FlowChartCollate","FlowChartSort","FlowChartExtract","FlowChartMerge","FlowChartOfflineStorage", +/* 130*/ "FlowChartOnlineStorage","FlowChartMagneticTape","FlowChartMagneticDisk","FlowChartMagneticDrum","FlowChartDisplay","FlowChartDelay","TextPlainText","TextStop","TextTriangle","TextTriangleInverted", +/* 140*/ "TextChevron","TextChevronInverted","TextRingInside","TextRingOutside","TextArchUpCurve","TextArchDownCurve","TextCircleCurve","TextButtonCurve","TextArchUpPour","TextArchDownPour", +/* 150*/ "TextCirclePour","TextButtonPour","TextCurveUp","TextCurveDown","TextCascadeUp","TextCascadeDown","TextWave1","TextWave2","TextWave3","TextWave4", +/* 160*/ "TextInflate","TextDeflate","TextInflateBottom","TextDeflateBottom","TextInflateTop","TextDeflateTop","TextDeflateInflate","TextDeflateInflateDeflate","TextFadeRight","TextFadeLeft", +/* 170*/ "TextFadeUp","TextFadeDown","TextSlantUp","TextSlantDown","TextCanUp","TextCanDown","FlowChartAlternateProcess","FlowChartOffpageConnector","Callout90","AccentCallout90", +/* 180*/ "BorderCallout90","AccentBorderCallout90","LeftRightUpArrow","Sun","Moon","BracketPair","BracePair","Seal4","DoubleWave","ActionButtonBlank", +/* 190*/ "ActionButtonHome","ActionButtonHelp","ActionButtonInformation","ActionButtonForwardNext","ActionButtonBackPrevious","ActionButtonEnd","ActionButtonBeginning","ActionButtonReturn","ActionButtonDocument","ActionButtonSound", +/* 200*/ "ActionButtonMovie","HostControl","TextBox","Nil", "???" }; if( 203 < nId ) nId = 204; @@ -1793,296 +1793,296 @@ void DumpEscherProp( UINT16 nId, BOOL bBid, BOOL bComplex, UINT32 nOp, const char* pRecNm = 0; switch( nId ) { - case 4: pRecNm = "DFF_Prop_Rotation"; break; + case 4: pRecNm = "DFF_Prop_Rotation"; break; // Protection - case 119: pRecNm = "DFF_Prop_LockRotation"; break; - case 120: pRecNm = "DFF_Prop_LockAspectRatio"; break; - case 121: pRecNm = "DFF_Prop_LockPosition"; break; - case 122: pRecNm = "DFF_Prop_LockAgainstSelect"; break; - case 123: pRecNm = "DFF_Prop_LockCropping"; break; - case 124: pRecNm = "DFF_Prop_LockVertices"; break; - case 125: pRecNm = "DFF_Prop_LockText"; break; - case 126: pRecNm = "DFF_Prop_LockAdjustHandles"; break; - case 127: pRecNm = "DFF_Prop_LockAgainstGrouping"; break; + case 119: pRecNm = "DFF_Prop_LockRotation"; break; + case 120: pRecNm = "DFF_Prop_LockAspectRatio"; break; + case 121: pRecNm = "DFF_Prop_LockPosition"; break; + case 122: pRecNm = "DFF_Prop_LockAgainstSelect"; break; + case 123: pRecNm = "DFF_Prop_LockCropping"; break; + case 124: pRecNm = "DFF_Prop_LockVertices"; break; + case 125: pRecNm = "DFF_Prop_LockText"; break; + case 126: pRecNm = "DFF_Prop_LockAdjustHandles"; break; + case 127: pRecNm = "DFF_Prop_LockAgainstGrouping"; break; // Text - case 128: pRecNm = "DFF_Prop_lTxid"; break; - case 129: pRecNm = "DFF_Prop_dxTextLeft"; break; - case 130: pRecNm = "DFF_Prop_dyTextTop"; break; - case 131: pRecNm = "DFF_Prop_dxTextRight"; break; - case 132: pRecNm = "DFF_Prop_dyTextBottom"; break; - case 133: pRecNm = "DFF_Prop_WrapText"; break; - case 134: pRecNm = "DFF_Prop_scaleText"; break; - case 135: pRecNm = "DFF_Prop_anchorText"; break; - case 136: pRecNm = "DFF_Prop_txflTextFlow"; break; - case 137: pRecNm = "DFF_Prop_cdirFont"; break; - case 138: pRecNm = "DFF_Prop_hspNext"; break; - case 139: pRecNm = "DFF_Prop_txdir"; break; - case 187: pRecNm = "DFF_Prop_SelectText"; break; - case 188: pRecNm = "DFF_Prop_AutoTextMargin"; break; - case 189: pRecNm = "DFF_Prop_RotateText"; break; - case 190: pRecNm = "DFF_Prop_FitShapeToText"; break; - case 191: pRecNm = "DFF_Prop_FitTextToShape"; break; + case 128: pRecNm = "DFF_Prop_lTxid"; break; + case 129: pRecNm = "DFF_Prop_dxTextLeft"; break; + case 130: pRecNm = "DFF_Prop_dyTextTop"; break; + case 131: pRecNm = "DFF_Prop_dxTextRight"; break; + case 132: pRecNm = "DFF_Prop_dyTextBottom"; break; + case 133: pRecNm = "DFF_Prop_WrapText"; break; + case 134: pRecNm = "DFF_Prop_scaleText"; break; + case 135: pRecNm = "DFF_Prop_anchorText"; break; + case 136: pRecNm = "DFF_Prop_txflTextFlow"; break; + case 137: pRecNm = "DFF_Prop_cdirFont"; break; + case 138: pRecNm = "DFF_Prop_hspNext"; break; + case 139: pRecNm = "DFF_Prop_txdir"; break; + case 187: pRecNm = "DFF_Prop_SelectText"; break; + case 188: pRecNm = "DFF_Prop_AutoTextMargin"; break; + case 189: pRecNm = "DFF_Prop_RotateText"; break; + case 190: pRecNm = "DFF_Prop_FitShapeToText"; break; + case 191: pRecNm = "DFF_Prop_FitTextToShape"; break; // GeoText - case 192: pRecNm = "DFF_Prop_gtextUNICODE"; break; - case 193: pRecNm = "DFF_Prop_gtextRTF"; break; - case 194: pRecNm = "DFF_Prop_gtextAlign"; break; - case 195: pRecNm = "DFF_Prop_gtextSize"; break; - case 196: pRecNm = "DFF_Prop_gtextSpacing"; break; - case 197: pRecNm = "DFF_Prop_gtextFont"; break; - case 240: pRecNm = "DFF_Prop_gtextFReverseRows"; break; - case 241: pRecNm = "DFF_Prop_fGtext"; break; - case 242: pRecNm = "DFF_Prop_gtextFVertical"; break; - case 243: pRecNm = "DFF_Prop_gtextFKern"; break; - case 244: pRecNm = "DFF_Prop_gtextFTight"; break; - case 245: pRecNm = "DFF_Prop_gtextFStretch"; break; - case 246: pRecNm = "DFF_Prop_gtextFShrinkFit"; break; - case 247: pRecNm = "DFF_Prop_gtextFBestFit"; break; - case 248: pRecNm = "DFF_Prop_gtextFNormalize"; break; - case 249: pRecNm = "DFF_Prop_gtextFDxMeasure"; break; - case 250: pRecNm = "DFF_Prop_gtextFBold"; break; - case 251: pRecNm = "DFF_Prop_gtextFItalic"; break; - case 252: pRecNm = "DFF_Prop_gtextFUnderline"; break; - case 253: pRecNm = "DFF_Prop_gtextFShadow"; break; - case 254: pRecNm = "DFF_Prop_gtextFSmallcaps"; break; - case 255: pRecNm = "DFF_Prop_gtextFStrikethrough"; break; + case 192: pRecNm = "DFF_Prop_gtextUNICODE"; break; + case 193: pRecNm = "DFF_Prop_gtextRTF"; break; + case 194: pRecNm = "DFF_Prop_gtextAlign"; break; + case 195: pRecNm = "DFF_Prop_gtextSize"; break; + case 196: pRecNm = "DFF_Prop_gtextSpacing"; break; + case 197: pRecNm = "DFF_Prop_gtextFont"; break; + case 240: pRecNm = "DFF_Prop_gtextFReverseRows"; break; + case 241: pRecNm = "DFF_Prop_fGtext"; break; + case 242: pRecNm = "DFF_Prop_gtextFVertical"; break; + case 243: pRecNm = "DFF_Prop_gtextFKern"; break; + case 244: pRecNm = "DFF_Prop_gtextFTight"; break; + case 245: pRecNm = "DFF_Prop_gtextFStretch"; break; + case 246: pRecNm = "DFF_Prop_gtextFShrinkFit"; break; + case 247: pRecNm = "DFF_Prop_gtextFBestFit"; break; + case 248: pRecNm = "DFF_Prop_gtextFNormalize"; break; + case 249: pRecNm = "DFF_Prop_gtextFDxMeasure"; break; + case 250: pRecNm = "DFF_Prop_gtextFBold"; break; + case 251: pRecNm = "DFF_Prop_gtextFItalic"; break; + case 252: pRecNm = "DFF_Prop_gtextFUnderline"; break; + case 253: pRecNm = "DFF_Prop_gtextFShadow"; break; + case 254: pRecNm = "DFF_Prop_gtextFSmallcaps"; break; + case 255: pRecNm = "DFF_Prop_gtextFStrikethrough"; break; // Blip - case 256: pRecNm = "DFF_Prop_cropFromTop"; break; - case 257: pRecNm = "DFF_Prop_cropFromBottom"; break; - case 258: pRecNm = "DFF_Prop_cropFromLeft"; break; - case 259: pRecNm = "DFF_Prop_cropFromRight"; break; - case 260: pRecNm = "DFF_Prop_pib"; break; - case 261: pRecNm = "DFF_Prop_pibName"; break; - case 262: pRecNm = "DFF_Prop_pibFlags"; break; - case 263: pRecNm = "DFF_Prop_pictureTransparent"; break; - case 264: pRecNm = "DFF_Prop_pictureContrast"; break; - case 265: pRecNm = "DFF_Prop_pictureBrightness"; break; - case 266: pRecNm = "DFF_Prop_pictureGamma"; break; - case 267: pRecNm = "DFF_Prop_pictureId"; break; - case 268: pRecNm = "DFF_Prop_pictureDblCrMod"; break; - case 269: pRecNm = "DFF_Prop_pictureFillCrMod"; break; - case 270: pRecNm = "DFF_Prop_pictureLineCrMod"; break; - case 271: pRecNm = "DFF_Prop_pibPrint"; break; - case 272: pRecNm = "DFF_Prop_pibPrintName"; break; - case 273: pRecNm = "DFF_Prop_pibPrintFlags"; break; - case 316: pRecNm = "DFF_Prop_fNoHitTestPicture"; break; - case 317: pRecNm = "DFF_Prop_pictureGray"; break; - case 318: pRecNm = "DFF_Prop_pictureBiLevel"; break; - case 319: pRecNm = "DFF_Prop_pictureActive"; break; + case 256: pRecNm = "DFF_Prop_cropFromTop"; break; + case 257: pRecNm = "DFF_Prop_cropFromBottom"; break; + case 258: pRecNm = "DFF_Prop_cropFromLeft"; break; + case 259: pRecNm = "DFF_Prop_cropFromRight"; break; + case 260: pRecNm = "DFF_Prop_pib"; break; + case 261: pRecNm = "DFF_Prop_pibName"; break; + case 262: pRecNm = "DFF_Prop_pibFlags"; break; + case 263: pRecNm = "DFF_Prop_pictureTransparent"; break; + case 264: pRecNm = "DFF_Prop_pictureContrast"; break; + case 265: pRecNm = "DFF_Prop_pictureBrightness"; break; + case 266: pRecNm = "DFF_Prop_pictureGamma"; break; + case 267: pRecNm = "DFF_Prop_pictureId"; break; + case 268: pRecNm = "DFF_Prop_pictureDblCrMod"; break; + case 269: pRecNm = "DFF_Prop_pictureFillCrMod"; break; + case 270: pRecNm = "DFF_Prop_pictureLineCrMod"; break; + case 271: pRecNm = "DFF_Prop_pibPrint"; break; + case 272: pRecNm = "DFF_Prop_pibPrintName"; break; + case 273: pRecNm = "DFF_Prop_pibPrintFlags"; break; + case 316: pRecNm = "DFF_Prop_fNoHitTestPicture"; break; + case 317: pRecNm = "DFF_Prop_pictureGray"; break; + case 318: pRecNm = "DFF_Prop_pictureBiLevel"; break; + case 319: pRecNm = "DFF_Prop_pictureActive"; break; // Geometry - case 320: pRecNm = "DFF_Prop_geoLeft"; break; - case 321: pRecNm = "DFF_Prop_geoTop"; break; - case 322: pRecNm = "DFF_Prop_geoRight"; break; - case 323: pRecNm = "DFF_Prop_geoBottom"; break; - case 324: pRecNm = "DFF_Prop_shapePath"; break; - case 325: pRecNm = "DFF_Prop_pVertices"; break; - case 326: pRecNm = "DFF_Prop_pSegmentInfo"; break; - case 327: pRecNm = "DFF_Prop_adjustValue"; break; - case 328: pRecNm = "DFF_Prop_adjust2Value"; break; - case 329: pRecNm = "DFF_Prop_adjust3Value"; break; - case 330: pRecNm = "DFF_Prop_adjust4Value"; break; - case 331: pRecNm = "DFF_Prop_adjust5Value"; break; - case 332: pRecNm = "DFF_Prop_adjust6Value"; break; - case 333: pRecNm = "DFF_Prop_adjust7Value"; break; - case 334: pRecNm = "DFF_Prop_adjust8Value"; break; - case 335: pRecNm = "DFF_Prop_adjust9Value"; break; - case 336: pRecNm = "DFF_Prop_adjust10Value"; break; - case 378: pRecNm = "DFF_Prop_fShadowOK"; break; - case 379: pRecNm = "DFF_Prop_f3DOK"; break; - case 380: pRecNm = "DFF_Prop_fLineOK"; break; - case 381: pRecNm = "DFF_Prop_fGtextOK"; break; - case 382: pRecNm = "DFF_Prop_fFillShadeShapeOK"; break; - case 383: pRecNm = "DFF_Prop_fFillOK"; break; + case 320: pRecNm = "DFF_Prop_geoLeft"; break; + case 321: pRecNm = "DFF_Prop_geoTop"; break; + case 322: pRecNm = "DFF_Prop_geoRight"; break; + case 323: pRecNm = "DFF_Prop_geoBottom"; break; + case 324: pRecNm = "DFF_Prop_shapePath"; break; + case 325: pRecNm = "DFF_Prop_pVertices"; break; + case 326: pRecNm = "DFF_Prop_pSegmentInfo"; break; + case 327: pRecNm = "DFF_Prop_adjustValue"; break; + case 328: pRecNm = "DFF_Prop_adjust2Value"; break; + case 329: pRecNm = "DFF_Prop_adjust3Value"; break; + case 330: pRecNm = "DFF_Prop_adjust4Value"; break; + case 331: pRecNm = "DFF_Prop_adjust5Value"; break; + case 332: pRecNm = "DFF_Prop_adjust6Value"; break; + case 333: pRecNm = "DFF_Prop_adjust7Value"; break; + case 334: pRecNm = "DFF_Prop_adjust8Value"; break; + case 335: pRecNm = "DFF_Prop_adjust9Value"; break; + case 336: pRecNm = "DFF_Prop_adjust10Value"; break; + case 378: pRecNm = "DFF_Prop_fShadowOK"; break; + case 379: pRecNm = "DFF_Prop_f3DOK"; break; + case 380: pRecNm = "DFF_Prop_fLineOK"; break; + case 381: pRecNm = "DFF_Prop_fGtextOK"; break; + case 382: pRecNm = "DFF_Prop_fFillShadeShapeOK"; break; + case 383: pRecNm = "DFF_Prop_fFillOK"; break; // FillStyle - case 384: pRecNm = "DFF_Prop_fillType"; break; - case 385: pRecNm = "DFF_Prop_fillColor"; break; - case 386: pRecNm = "DFF_Prop_fillOpacity"; break; - case 387: pRecNm = "DFF_Prop_fillBackColor"; break; - case 388: pRecNm = "DFF_Prop_fillBackOpacity"; break; - case 389: pRecNm = "DFF_Prop_fillCrMod"; break; - case 390: pRecNm = "DFF_Prop_fillBlip"; break; - case 391: pRecNm = "DFF_Prop_fillBlipName"; break; - case 392: pRecNm = "DFF_Prop_fillBlipFlags"; break; - case 393: pRecNm = "DFF_Prop_fillWidth"; break; - case 394: pRecNm = "DFF_Prop_fillHeight"; break; - case 395: pRecNm = "DFF_Prop_fillAngle"; break; - case 396: pRecNm = "DFF_Prop_fillFocus"; break; - case 397: pRecNm = "DFF_Prop_fillToLeft"; break; - case 398: pRecNm = "DFF_Prop_fillToTop"; break; - case 399: pRecNm = "DFF_Prop_fillToRight"; break; - case 400: pRecNm = "DFF_Prop_fillToBottom"; break; - case 401: pRecNm = "DFF_Prop_fillRectLeft"; break; - case 402: pRecNm = "DFF_Prop_fillRectTop"; break; - case 403: pRecNm = "DFF_Prop_fillRectRight"; break; - case 404: pRecNm = "DFF_Prop_fillRectBottom"; break; - case 405: pRecNm = "DFF_Prop_fillDztype"; break; - case 406: pRecNm = "DFF_Prop_fillShadePreset"; break; - case 407: pRecNm = "DFF_Prop_fillShadeColors"; break; - case 408: pRecNm = "DFF_Prop_fillOriginX"; break; - case 409: pRecNm = "DFF_Prop_fillOriginY"; break; - case 410: pRecNm = "DFF_Prop_fillShapeOriginX"; break; - case 411: pRecNm = "DFF_Prop_fillShapeOriginY"; break; - case 412: pRecNm = "DFF_Prop_fillShadeType"; break; - case 443: pRecNm = "DFF_Prop_fFilled"; break; - case 444: pRecNm = "DFF_Prop_fHitTestFill"; break; - case 445: pRecNm = "DFF_Prop_fillShape"; break; - case 446: pRecNm = "DFF_Prop_fillUseRect"; break; - case 447: pRecNm = "DFF_Prop_fNoFillHitTest"; break; + case 384: pRecNm = "DFF_Prop_fillType"; break; + case 385: pRecNm = "DFF_Prop_fillColor"; break; + case 386: pRecNm = "DFF_Prop_fillOpacity"; break; + case 387: pRecNm = "DFF_Prop_fillBackColor"; break; + case 388: pRecNm = "DFF_Prop_fillBackOpacity"; break; + case 389: pRecNm = "DFF_Prop_fillCrMod"; break; + case 390: pRecNm = "DFF_Prop_fillBlip"; break; + case 391: pRecNm = "DFF_Prop_fillBlipName"; break; + case 392: pRecNm = "DFF_Prop_fillBlipFlags"; break; + case 393: pRecNm = "DFF_Prop_fillWidth"; break; + case 394: pRecNm = "DFF_Prop_fillHeight"; break; + case 395: pRecNm = "DFF_Prop_fillAngle"; break; + case 396: pRecNm = "DFF_Prop_fillFocus"; break; + case 397: pRecNm = "DFF_Prop_fillToLeft"; break; + case 398: pRecNm = "DFF_Prop_fillToTop"; break; + case 399: pRecNm = "DFF_Prop_fillToRight"; break; + case 400: pRecNm = "DFF_Prop_fillToBottom"; break; + case 401: pRecNm = "DFF_Prop_fillRectLeft"; break; + case 402: pRecNm = "DFF_Prop_fillRectTop"; break; + case 403: pRecNm = "DFF_Prop_fillRectRight"; break; + case 404: pRecNm = "DFF_Prop_fillRectBottom"; break; + case 405: pRecNm = "DFF_Prop_fillDztype"; break; + case 406: pRecNm = "DFF_Prop_fillShadePreset"; break; + case 407: pRecNm = "DFF_Prop_fillShadeColors"; break; + case 408: pRecNm = "DFF_Prop_fillOriginX"; break; + case 409: pRecNm = "DFF_Prop_fillOriginY"; break; + case 410: pRecNm = "DFF_Prop_fillShapeOriginX"; break; + case 411: pRecNm = "DFF_Prop_fillShapeOriginY"; break; + case 412: pRecNm = "DFF_Prop_fillShadeType"; break; + case 443: pRecNm = "DFF_Prop_fFilled"; break; + case 444: pRecNm = "DFF_Prop_fHitTestFill"; break; + case 445: pRecNm = "DFF_Prop_fillShape"; break; + case 446: pRecNm = "DFF_Prop_fillUseRect"; break; + case 447: pRecNm = "DFF_Prop_fNoFillHitTest"; break; // LineStyle - case 448: pRecNm = "DFF_Prop_lineColor"; break; - case 449: pRecNm = "DFF_Prop_lineOpacity"; break; - case 450: pRecNm = "DFF_Prop_lineBackColor"; break; - case 451: pRecNm = "DFF_Prop_lineCrMod"; break; - case 452: pRecNm = "DFF_Prop_lineType"; break; - case 453: pRecNm = "DFF_Prop_lineFillBlip"; break; - case 454: pRecNm = "DFF_Prop_lineFillBlipName"; break; - case 455: pRecNm = "DFF_Prop_lineFillBlipFlags"; break; - case 456: pRecNm = "DFF_Prop_lineFillWidth"; break; - case 457: pRecNm = "DFF_Prop_lineFillHeight"; break; - case 458: pRecNm = "DFF_Prop_lineFillDztype"; break; - case 459: pRecNm = "DFF_Prop_lineWidth"; break; - case 460: pRecNm = "DFF_Prop_lineMiterLimit"; break; - case 461: pRecNm = "DFF_Prop_lineStyle"; break; - case 462: pRecNm = "DFF_Prop_lineDashing"; break; - case 463: pRecNm = "DFF_Prop_lineDashStyle"; break; - case 464: pRecNm = "DFF_Prop_lineStartArrowhead"; break; - case 465: pRecNm = "DFF_Prop_lineEndArrowhead"; break; - case 466: pRecNm = "DFF_Prop_lineStartArrowWidth"; break; - case 467: pRecNm = "DFF_Prop_lineStartArrowLength"; break; - case 468: pRecNm = "DFF_Prop_lineEndArrowWidth"; break; - case 469: pRecNm = "DFF_Prop_lineEndArrowLength"; break; - case 470: pRecNm = "DFF_Prop_lineJoinStyle"; break; - case 471: pRecNm = "DFF_Prop_lineEndCapStyle"; break; - case 507: pRecNm = "DFF_Prop_fArrowheadsOK"; break; - case 508: pRecNm = "DFF_Prop_fLine"; break; - case 509: pRecNm = "DFF_Prop_fHitTestLine"; break; - case 510: pRecNm = "DFF_Prop_lineFillShape"; break; - case 511: pRecNm = "DFF_Prop_fNoLineDrawDash"; break; + case 448: pRecNm = "DFF_Prop_lineColor"; break; + case 449: pRecNm = "DFF_Prop_lineOpacity"; break; + case 450: pRecNm = "DFF_Prop_lineBackColor"; break; + case 451: pRecNm = "DFF_Prop_lineCrMod"; break; + case 452: pRecNm = "DFF_Prop_lineType"; break; + case 453: pRecNm = "DFF_Prop_lineFillBlip"; break; + case 454: pRecNm = "DFF_Prop_lineFillBlipName"; break; + case 455: pRecNm = "DFF_Prop_lineFillBlipFlags"; break; + case 456: pRecNm = "DFF_Prop_lineFillWidth"; break; + case 457: pRecNm = "DFF_Prop_lineFillHeight"; break; + case 458: pRecNm = "DFF_Prop_lineFillDztype"; break; + case 459: pRecNm = "DFF_Prop_lineWidth"; break; + case 460: pRecNm = "DFF_Prop_lineMiterLimit"; break; + case 461: pRecNm = "DFF_Prop_lineStyle"; break; + case 462: pRecNm = "DFF_Prop_lineDashing"; break; + case 463: pRecNm = "DFF_Prop_lineDashStyle"; break; + case 464: pRecNm = "DFF_Prop_lineStartArrowhead"; break; + case 465: pRecNm = "DFF_Prop_lineEndArrowhead"; break; + case 466: pRecNm = "DFF_Prop_lineStartArrowWidth"; break; + case 467: pRecNm = "DFF_Prop_lineStartArrowLength"; break; + case 468: pRecNm = "DFF_Prop_lineEndArrowWidth"; break; + case 469: pRecNm = "DFF_Prop_lineEndArrowLength"; break; + case 470: pRecNm = "DFF_Prop_lineJoinStyle"; break; + case 471: pRecNm = "DFF_Prop_lineEndCapStyle"; break; + case 507: pRecNm = "DFF_Prop_fArrowheadsOK"; break; + case 508: pRecNm = "DFF_Prop_fLine"; break; + case 509: pRecNm = "DFF_Prop_fHitTestLine"; break; + case 510: pRecNm = "DFF_Prop_lineFillShape"; break; + case 511: pRecNm = "DFF_Prop_fNoLineDrawDash"; break; // ShadowStyle - case 512: pRecNm = "DFF_Prop_shadowType"; break; - case 513: pRecNm = "DFF_Prop_shadowColor"; break; - case 514: pRecNm = "DFF_Prop_shadowHighlight"; break; - case 515: pRecNm = "DFF_Prop_shadowCrMod"; break; - case 516: pRecNm = "DFF_Prop_shadowOpacity"; break; - case 517: pRecNm = "DFF_Prop_shadowOffsetX"; break; - case 518: pRecNm = "DFF_Prop_shadowOffsetY"; break; - case 519: pRecNm = "DFF_Prop_shadowSecondOffsetX"; break; - case 520: pRecNm = "DFF_Prop_shadowSecondOffsetY"; break; - case 521: pRecNm = "DFF_Prop_shadowScaleXToX"; break; - case 522: pRecNm = "DFF_Prop_shadowScaleYToX"; break; - case 523: pRecNm = "DFF_Prop_shadowScaleXToY"; break; - case 524: pRecNm = "DFF_Prop_shadowScaleYToY"; break; - case 525: pRecNm = "DFF_Prop_shadowPerspectiveX"; break; - case 526: pRecNm = "DFF_Prop_shadowPerspectiveY"; break; - case 527: pRecNm = "DFF_Prop_shadowWeight"; break; - case 528: pRecNm = "DFF_Prop_shadowOriginX"; break; - case 529: pRecNm = "DFF_Prop_shadowOriginY"; break; - case 574: pRecNm = "DFF_Prop_fShadow"; break; - case 575: pRecNm = "DFF_Prop_fshadowObscured"; break; + case 512: pRecNm = "DFF_Prop_shadowType"; break; + case 513: pRecNm = "DFF_Prop_shadowColor"; break; + case 514: pRecNm = "DFF_Prop_shadowHighlight"; break; + case 515: pRecNm = "DFF_Prop_shadowCrMod"; break; + case 516: pRecNm = "DFF_Prop_shadowOpacity"; break; + case 517: pRecNm = "DFF_Prop_shadowOffsetX"; break; + case 518: pRecNm = "DFF_Prop_shadowOffsetY"; break; + case 519: pRecNm = "DFF_Prop_shadowSecondOffsetX"; break; + case 520: pRecNm = "DFF_Prop_shadowSecondOffsetY"; break; + case 521: pRecNm = "DFF_Prop_shadowScaleXToX"; break; + case 522: pRecNm = "DFF_Prop_shadowScaleYToX"; break; + case 523: pRecNm = "DFF_Prop_shadowScaleXToY"; break; + case 524: pRecNm = "DFF_Prop_shadowScaleYToY"; break; + case 525: pRecNm = "DFF_Prop_shadowPerspectiveX"; break; + case 526: pRecNm = "DFF_Prop_shadowPerspectiveY"; break; + case 527: pRecNm = "DFF_Prop_shadowWeight"; break; + case 528: pRecNm = "DFF_Prop_shadowOriginX"; break; + case 529: pRecNm = "DFF_Prop_shadowOriginY"; break; + case 574: pRecNm = "DFF_Prop_fShadow"; break; + case 575: pRecNm = "DFF_Prop_fshadowObscured"; break; // PerspectiveStyle - case 576: pRecNm = "DFF_Prop_perspectiveType"; break; - case 577: pRecNm = "DFF_Prop_perspectiveOffsetX"; break; - case 578: pRecNm = "DFF_Prop_perspectiveOffsetY"; break; - case 579: pRecNm = "DFF_Prop_perspectiveScaleXToX"; break; - case 580: pRecNm = "DFF_Prop_perspectiveScaleYToX"; break; - case 581: pRecNm = "DFF_Prop_perspectiveScaleXToY"; break; - case 582: pRecNm = "DFF_Prop_perspectiveScaleYToY"; break; - case 583: pRecNm = "DFF_Prop_perspectivePerspectiveX"; break; - case 584: pRecNm = "DFF_Prop_perspectivePerspectiveY"; break; - case 585: pRecNm = "DFF_Prop_perspectiveWeight"; break; - case 586: pRecNm = "DFF_Prop_perspectiveOriginX"; break; - case 587: pRecNm = "DFF_Prop_perspectiveOriginY"; break; - case 639: pRecNm = "DFF_Prop_fPerspective"; break; + case 576: pRecNm = "DFF_Prop_perspectiveType"; break; + case 577: pRecNm = "DFF_Prop_perspectiveOffsetX"; break; + case 578: pRecNm = "DFF_Prop_perspectiveOffsetY"; break; + case 579: pRecNm = "DFF_Prop_perspectiveScaleXToX"; break; + case 580: pRecNm = "DFF_Prop_perspectiveScaleYToX"; break; + case 581: pRecNm = "DFF_Prop_perspectiveScaleXToY"; break; + case 582: pRecNm = "DFF_Prop_perspectiveScaleYToY"; break; + case 583: pRecNm = "DFF_Prop_perspectivePerspectiveX"; break; + case 584: pRecNm = "DFF_Prop_perspectivePerspectiveY"; break; + case 585: pRecNm = "DFF_Prop_perspectiveWeight"; break; + case 586: pRecNm = "DFF_Prop_perspectiveOriginX"; break; + case 587: pRecNm = "DFF_Prop_perspectiveOriginY"; break; + case 639: pRecNm = "DFF_Prop_fPerspective"; break; // 3D Object - case 640: pRecNm = "DFF_Prop_c3DSpecularAmt"; break; - case 641: pRecNm = "DFF_Prop_c3DDiffuseAmt"; break; - case 642: pRecNm = "DFF_Prop_c3DShininess"; break; - case 643: pRecNm = "DFF_Prop_c3DEdgeThickness"; break; - case 644: pRecNm = "DFF_Prop_c3DExtrudeForward"; break; - case 645: pRecNm = "DFF_Prop_c3DExtrudeBackward"; break; - case 646: pRecNm = "DFF_Prop_c3DExtrudePlane"; break; - case 647: pRecNm = "DFF_Prop_c3DExtrusionColor"; break; - case 648: pRecNm = "DFF_Prop_c3DCrMod"; break; - case 700: pRecNm = "DFF_Prop_f3D"; break; - case 701: pRecNm = "DFF_Prop_fc3DMetallic"; break; - case 702: pRecNm = "DFF_Prop_fc3DUseExtrusionColor"; break; - case 703: pRecNm = "DFF_Prop_fc3DLightFace"; break; + case 640: pRecNm = "DFF_Prop_c3DSpecularAmt"; break; + case 641: pRecNm = "DFF_Prop_c3DDiffuseAmt"; break; + case 642: pRecNm = "DFF_Prop_c3DShininess"; break; + case 643: pRecNm = "DFF_Prop_c3DEdgeThickness"; break; + case 644: pRecNm = "DFF_Prop_c3DExtrudeForward"; break; + case 645: pRecNm = "DFF_Prop_c3DExtrudeBackward"; break; + case 646: pRecNm = "DFF_Prop_c3DExtrudePlane"; break; + case 647: pRecNm = "DFF_Prop_c3DExtrusionColor"; break; + case 648: pRecNm = "DFF_Prop_c3DCrMod"; break; + case 700: pRecNm = "DFF_Prop_f3D"; break; + case 701: pRecNm = "DFF_Prop_fc3DMetallic"; break; + case 702: pRecNm = "DFF_Prop_fc3DUseExtrusionColor"; break; + case 703: pRecNm = "DFF_Prop_fc3DLightFace"; break; // 3D Style - case 704: pRecNm = "DFF_Prop_c3DYRotationAngle"; break; - case 705: pRecNm = "DFF_Prop_c3DXRotationAngle"; break; - case 706: pRecNm = "DFF_Prop_c3DRotationAxisX"; break; - case 707: pRecNm = "DFF_Prop_c3DRotationAxisY"; break; - case 708: pRecNm = "DFF_Prop_c3DRotationAxisZ"; break; - case 709: pRecNm = "DFF_Prop_c3DRotationAngle"; break; - case 710: pRecNm = "DFF_Prop_c3DRotationCenterX"; break; - case 711: pRecNm = "DFF_Prop_c3DRotationCenterY"; break; - case 712: pRecNm = "DFF_Prop_c3DRotationCenterZ"; break; - case 713: pRecNm = "DFF_Prop_c3DRenderMode"; break; - case 714: pRecNm = "DFF_Prop_c3DTolerance"; break; - case 715: pRecNm = "DFF_Prop_c3DXViewpoint"; break; - case 716: pRecNm = "DFF_Prop_c3DYViewpoint"; break; - case 717: pRecNm = "DFF_Prop_c3DZViewpoint"; break; - case 718: pRecNm = "DFF_Prop_c3DOriginX"; break; - case 719: pRecNm = "DFF_Prop_c3DOriginY"; break; - case 720: pRecNm = "DFF_Prop_c3DSkewAngle"; break; - case 721: pRecNm = "DFF_Prop_c3DSkewAmount"; break; - case 722: pRecNm = "DFF_Prop_c3DAmbientIntensity"; break; - case 723: pRecNm = "DFF_Prop_c3DKeyX"; break; - case 724: pRecNm = "DFF_Prop_c3DKeyY"; break; - case 725: pRecNm = "DFF_Prop_c3DKeyZ"; break; - case 726: pRecNm = "DFF_Prop_c3DKeyIntensity"; break; - case 727: pRecNm = "DFF_Prop_c3DFillX"; break; - case 728: pRecNm = "DFF_Prop_c3DFillY"; break; - case 729: pRecNm = "DFF_Prop_c3DFillZ"; break; - case 730: pRecNm = "DFF_Prop_c3DFillIntensity"; break; - case 763: pRecNm = "DFF_Prop_fc3DConstrainRotation"; break; - case 764: pRecNm = "DFF_Prop_fc3DRotationCenterAuto"; break; - case 765: pRecNm = "DFF_Prop_fc3DParallel"; break; - case 766: pRecNm = "DFF_Prop_fc3DKeyHarsh"; break; - case 767: pRecNm = "DFF_Prop_fc3DFillHarsh"; break; + case 704: pRecNm = "DFF_Prop_c3DYRotationAngle"; break; + case 705: pRecNm = "DFF_Prop_c3DXRotationAngle"; break; + case 706: pRecNm = "DFF_Prop_c3DRotationAxisX"; break; + case 707: pRecNm = "DFF_Prop_c3DRotationAxisY"; break; + case 708: pRecNm = "DFF_Prop_c3DRotationAxisZ"; break; + case 709: pRecNm = "DFF_Prop_c3DRotationAngle"; break; + case 710: pRecNm = "DFF_Prop_c3DRotationCenterX"; break; + case 711: pRecNm = "DFF_Prop_c3DRotationCenterY"; break; + case 712: pRecNm = "DFF_Prop_c3DRotationCenterZ"; break; + case 713: pRecNm = "DFF_Prop_c3DRenderMode"; break; + case 714: pRecNm = "DFF_Prop_c3DTolerance"; break; + case 715: pRecNm = "DFF_Prop_c3DXViewpoint"; break; + case 716: pRecNm = "DFF_Prop_c3DYViewpoint"; break; + case 717: pRecNm = "DFF_Prop_c3DZViewpoint"; break; + case 718: pRecNm = "DFF_Prop_c3DOriginX"; break; + case 719: pRecNm = "DFF_Prop_c3DOriginY"; break; + case 720: pRecNm = "DFF_Prop_c3DSkewAngle"; break; + case 721: pRecNm = "DFF_Prop_c3DSkewAmount"; break; + case 722: pRecNm = "DFF_Prop_c3DAmbientIntensity"; break; + case 723: pRecNm = "DFF_Prop_c3DKeyX"; break; + case 724: pRecNm = "DFF_Prop_c3DKeyY"; break; + case 725: pRecNm = "DFF_Prop_c3DKeyZ"; break; + case 726: pRecNm = "DFF_Prop_c3DKeyIntensity"; break; + case 727: pRecNm = "DFF_Prop_c3DFillX"; break; + case 728: pRecNm = "DFF_Prop_c3DFillY"; break; + case 729: pRecNm = "DFF_Prop_c3DFillZ"; break; + case 730: pRecNm = "DFF_Prop_c3DFillIntensity"; break; + case 763: pRecNm = "DFF_Prop_fc3DConstrainRotation"; break; + case 764: pRecNm = "DFF_Prop_fc3DRotationCenterAuto"; break; + case 765: pRecNm = "DFF_Prop_fc3DParallel"; break; + case 766: pRecNm = "DFF_Prop_fc3DKeyHarsh"; break; + case 767: pRecNm = "DFF_Prop_fc3DFillHarsh"; break; // Shape - case 769: pRecNm = "DFF_Prop_hspMaster"; break; - case 771: pRecNm = "DFF_Prop_cxstyle"; break; - case 772: pRecNm = "DFF_Prop_bWMode"; break; - case 773: pRecNm = "DFF_Prop_bWModePureBW"; break; - case 774: pRecNm = "DFF_Prop_bWModeBW"; break; - case 826: pRecNm = "DFF_Prop_fOleIcon"; break; - case 827: pRecNm = "DFF_Prop_fPreferRelativeResize"; break; - case 828: pRecNm = "DFF_Prop_fLockShapeType"; break; - case 830: pRecNm = "DFF_Prop_fDeleteAttachedObject"; break; - case 831: pRecNm = "DFF_Prop_fBackground"; break; + case 769: pRecNm = "DFF_Prop_hspMaster"; break; + case 771: pRecNm = "DFF_Prop_cxstyle"; break; + case 772: pRecNm = "DFF_Prop_bWMode"; break; + case 773: pRecNm = "DFF_Prop_bWModePureBW"; break; + case 774: pRecNm = "DFF_Prop_bWModeBW"; break; + case 826: pRecNm = "DFF_Prop_fOleIcon"; break; + case 827: pRecNm = "DFF_Prop_fPreferRelativeResize"; break; + case 828: pRecNm = "DFF_Prop_fLockShapeType"; break; + case 830: pRecNm = "DFF_Prop_fDeleteAttachedObject"; break; + case 831: pRecNm = "DFF_Prop_fBackground"; break; // Callout - case 832: pRecNm = "DFF_Prop_spcot"; break; - case 833: pRecNm = "DFF_Prop_dxyCalloutGap"; break; - case 834: pRecNm = "DFF_Prop_spcoa"; break; - case 835: pRecNm = "DFF_Prop_spcod"; break; - case 836: pRecNm = "DFF_Prop_dxyCalloutDropSpecified"; break; - case 837: pRecNm = "DFF_Prop_dxyCalloutLengthSpecified"; break; - case 889: pRecNm = "DFF_Prop_fCallout"; break; - case 890: pRecNm = "DFF_Prop_fCalloutAccentBar"; break; - case 891: pRecNm = "DFF_Prop_fCalloutTextBorder"; break; - case 892: pRecNm = "DFF_Prop_fCalloutMinusX"; break; - case 893: pRecNm = "DFF_Prop_fCalloutMinusY"; break; - case 894: pRecNm = "DFF_Prop_fCalloutDropAuto"; break; - case 895: pRecNm = "DFF_Prop_fCalloutLengthSpecified"; break; + case 832: pRecNm = "DFF_Prop_spcot"; break; + case 833: pRecNm = "DFF_Prop_dxyCalloutGap"; break; + case 834: pRecNm = "DFF_Prop_spcoa"; break; + case 835: pRecNm = "DFF_Prop_spcod"; break; + case 836: pRecNm = "DFF_Prop_dxyCalloutDropSpecified"; break; + case 837: pRecNm = "DFF_Prop_dxyCalloutLengthSpecified"; break; + case 889: pRecNm = "DFF_Prop_fCallout"; break; + case 890: pRecNm = "DFF_Prop_fCalloutAccentBar"; break; + case 891: pRecNm = "DFF_Prop_fCalloutTextBorder"; break; + case 892: pRecNm = "DFF_Prop_fCalloutMinusX"; break; + case 893: pRecNm = "DFF_Prop_fCalloutMinusY"; break; + case 894: pRecNm = "DFF_Prop_fCalloutDropAuto"; break; + case 895: pRecNm = "DFF_Prop_fCalloutLengthSpecified"; break; // GroupShape - case 896: pRecNm = "DFF_Prop_wzName"; break; - case 897: pRecNm = "DFF_Prop_wzDescription"; break; - case 898: pRecNm = "DFF_Prop_pihlShape"; break; - case 899: pRecNm = "DFF_Prop_pWrapPolygonVertices"; break; - case 900: pRecNm = "DFF_Prop_dxWrapDistLeft"; break; - case 901: pRecNm = "DFF_Prop_dyWrapDistTop"; break; - case 902: pRecNm = "DFF_Prop_dxWrapDistRight"; break; - case 903: pRecNm = "DFF_Prop_dyWrapDistBottom"; break; - case 904: pRecNm = "DFF_Prop_lidRegroup"; break; - case 953: pRecNm = "DFF_Prop_fEditedWrap"; break; - case 954: pRecNm = "DFF_Prop_fBehindDocument"; break; - case 955: pRecNm = "DFF_Prop_fOnDblClickNotify"; break; - case 956: pRecNm = "DFF_Prop_fIsButton"; break; - case 957: pRecNm = "DFF_Prop_fOneD"; break; - case 958: pRecNm = "DFF_Prop_fHidden"; break; - case 959: pRecNm = "DFF_Prop_fPrint"; break; + case 896: pRecNm = "DFF_Prop_wzName"; break; + case 897: pRecNm = "DFF_Prop_wzDescription"; break; + case 898: pRecNm = "DFF_Prop_pihlShape"; break; + case 899: pRecNm = "DFF_Prop_pWrapPolygonVertices"; break; + case 900: pRecNm = "DFF_Prop_dxWrapDistLeft"; break; + case 901: pRecNm = "DFF_Prop_dyWrapDistTop"; break; + case 902: pRecNm = "DFF_Prop_dxWrapDistRight"; break; + case 903: pRecNm = "DFF_Prop_dyWrapDistBottom"; break; + case 904: pRecNm = "DFF_Prop_lidRegroup"; break; + case 953: pRecNm = "DFF_Prop_fEditedWrap"; break; + case 954: pRecNm = "DFF_Prop_fBehindDocument"; break; + case 955: pRecNm = "DFF_Prop_fOnDblClickNotify"; break; + case 956: pRecNm = "DFF_Prop_fIsButton"; break; + case 957: pRecNm = "DFF_Prop_fOneD"; break; + case 958: pRecNm = "DFF_Prop_fHidden"; break; + case 959: pRecNm = "DFF_Prop_fPrint"; break; } *pOut << " " << indent1 << ' '; @@ -2091,7 +2091,7 @@ void DumpEscherProp( UINT16 nId, BOOL bBid, BOOL bComplex, UINT32 nOp, else *pOut << "Prop" ; - *pOut << " Id: " << dec << nId << " (=0x" << hex << nId << ')'; + *pOut << " Id: " << dec << nId << " (=0x" << hex << nId << ')'; if( bBid ) *pOut << " Bid: 0x" << (UINT16)bBid; @@ -2101,7 +2101,7 @@ void DumpEscherProp( UINT16 nId, BOOL bBid, BOOL bComplex, UINT32 nOp, // .... rStreamOffset += nOp; } -// else +// else *pOut << " op: 0x" << nOp; *pOut << dec << endl1; @@ -2113,39 +2113,39 @@ void DumpEscherRec( ULONG nPos, UINT8 nVer, UINT16 nInst, const char* pRecNm = 0; switch( nFbt ) { - case 0xF000: pRecNm = "DFF_msofbtDggContainer"; break; - case 0xF006: pRecNm = "DFF_msofbtDgg"; break; - case 0xF016: pRecNm = "DFF_msofbtCLSID"; break; - case 0xF00B: pRecNm = "DFF_msofbtOPT"; break; - case 0xF11A: pRecNm = "DFF_msofbtColorMRU"; break; - case 0xF11E: pRecNm = "DFF_msofbtSplitMenuColors"; break; - case 0xF001: pRecNm = "DFF_msofbtBstoreContainer"; break; - case 0xF007: pRecNm = "DFF_msofbtBSE"; break; - case 0xF018: pRecNm = "DFF_msofbtBlipFirst"; break; - case 0xF117: pRecNm = "DFF_msofbtBlipLast"; break; - case 0xF002: pRecNm = "DFF_msofbtDgContainer"; break; - case 0xF008: pRecNm = "DFF_msofbtDg"; break; - case 0xF118: pRecNm = "DFF_msofbtRegroupItems"; break; - case 0xF120: pRecNm = "DFF_msofbtColorScheme"; break; - case 0xF003: pRecNm = "DFF_msofbtSpgrContainer"; break; - case 0xF004: pRecNm = "DFF_msofbtSpContainer"; break; - case 0xF009: pRecNm = "DFF_msofbtSpgr"; break; - case 0xF00A: pRecNm = "DFF_msofbtSp"; break; - case 0xF00C: pRecNm = "DFF_msofbtTextbox"; break; - case 0xF00D: pRecNm = "DFF_msofbtClientTextbox"; break; - case 0xF00E: pRecNm = "DFF_msofbtAnchor"; break; - case 0xF00F: pRecNm = "DFF_msofbtChildAnchor"; break; - case 0xF010: pRecNm = "DFF_msofbtClientAnchor"; break; - case 0xF011: pRecNm = "DFF_msofbtClientData"; break; - case 0xF11F: pRecNm = "DFF_msofbtOleObject"; break; - case 0xF11D: pRecNm = "DFF_msofbtDeletedPspl"; break; - case 0xF005: pRecNm = "DFF_msofbtSolverContainer"; break; - case 0xF012: pRecNm = "DFF_msofbtConnectorRule"; break; - case 0xF013: pRecNm = "DFF_msofbtAlignRule"; break; - case 0xF014: pRecNm = "DFF_msofbtArcRule"; break; - case 0xF015: pRecNm = "DFF_msofbtClientRule"; break; - case 0xF017: pRecNm = "DFF_msofbtCalloutRule"; break; - case 0xF122: pRecNm = "DFF_msofbtUDefProp"; break; + case 0xF000: pRecNm = "DFF_msofbtDggContainer"; break; + case 0xF006: pRecNm = "DFF_msofbtDgg"; break; + case 0xF016: pRecNm = "DFF_msofbtCLSID"; break; + case 0xF00B: pRecNm = "DFF_msofbtOPT"; break; + case 0xF11A: pRecNm = "DFF_msofbtColorMRU"; break; + case 0xF11E: pRecNm = "DFF_msofbtSplitMenuColors"; break; + case 0xF001: pRecNm = "DFF_msofbtBstoreContainer"; break; + case 0xF007: pRecNm = "DFF_msofbtBSE"; break; + case 0xF018: pRecNm = "DFF_msofbtBlipFirst"; break; + case 0xF117: pRecNm = "DFF_msofbtBlipLast"; break; + case 0xF002: pRecNm = "DFF_msofbtDgContainer"; break; + case 0xF008: pRecNm = "DFF_msofbtDg"; break; + case 0xF118: pRecNm = "DFF_msofbtRegroupItems"; break; + case 0xF120: pRecNm = "DFF_msofbtColorScheme"; break; + case 0xF003: pRecNm = "DFF_msofbtSpgrContainer"; break; + case 0xF004: pRecNm = "DFF_msofbtSpContainer"; break; + case 0xF009: pRecNm = "DFF_msofbtSpgr"; break; + case 0xF00A: pRecNm = "DFF_msofbtSp"; break; + case 0xF00C: pRecNm = "DFF_msofbtTextbox"; break; + case 0xF00D: pRecNm = "DFF_msofbtClientTextbox"; break; + case 0xF00E: pRecNm = "DFF_msofbtAnchor"; break; + case 0xF00F: pRecNm = "DFF_msofbtChildAnchor"; break; + case 0xF010: pRecNm = "DFF_msofbtClientAnchor"; break; + case 0xF011: pRecNm = "DFF_msofbtClientData"; break; + case 0xF11F: pRecNm = "DFF_msofbtOleObject"; break; + case 0xF11D: pRecNm = "DFF_msofbtDeletedPspl"; break; + case 0xF005: pRecNm = "DFF_msofbtSolverContainer"; break; + case 0xF012: pRecNm = "DFF_msofbtConnectorRule"; break; + case 0xF013: pRecNm = "DFF_msofbtAlignRule"; break; + case 0xF014: pRecNm = "DFF_msofbtArcRule"; break; + case 0xF015: pRecNm = "DFF_msofbtClientRule"; break; + case 0xF017: pRecNm = "DFF_msofbtCalloutRule"; break; + case 0xF122: pRecNm = "DFF_msofbtUDefProp"; break; } *pOut << hex6 << nPos << indent1; @@ -2159,7 +2159,7 @@ void DumpEscherRec( ULONG nPos, UINT8 nVer, UINT16 nInst, switch( nFbt ) { - case 0xf00b: // DFF_msofbtOPT + case 0xf00b: // DFF_msofbtOPT { UINT16 nId; UINT32 nOp, nStreamOffset = nInst * 6; BOOL bBid, bComplex; @@ -2177,9 +2177,9 @@ void DumpEscherRec( ULONG nPos, UINT8 nVer, UINT16 nInst, } break; - case 0xF00d: // DFF_msofbtClientTextbox - case 0xF010: // DFF_msofbtClientAnchor - case 0xF011: // DFF_msofbtClientData + case 0xF00d: // DFF_msofbtClientTextbox + case 0xF010: // DFF_msofbtClientAnchor + case 0xF011: // DFF_msofbtClientData { UINT32 nData; if( 4 == nLength && WW8ReadUINT32( *xTableStream, nData )) @@ -2188,7 +2188,7 @@ void DumpEscherRec( ULONG nPos, UINT8 nVer, UINT16 nInst, } break; - case 0xf00a: // DFF_msofbtSp + case 0xf00a: // DFF_msofbtSp { UINT32 nId, nData; if( WW8ReadUINT32( *xTableStream, nId ) && @@ -2202,8 +2202,8 @@ void DumpEscherRec( ULONG nPos, UINT8 nVer, UINT16 nInst, } break; - case 0xf009: // DFF_msofbtSpgr - case 0xf00f: // DFF_msofbtChildAnchor + case 0xf009: // DFF_msofbtSpgr + case 0xf00f: // DFF_msofbtChildAnchor { UINT32 nL, nT, nR, nB; if( WW8ReadUINT32( *xTableStream, nL ) && @@ -2219,12 +2219,12 @@ void DumpEscherRec( ULONG nPos, UINT8 nVer, UINT16 nInst, case 0xf006: //ESCHER_Dgg { - UINT32 spidMax, // The current maximum shape ID - cidcl, // The number of ID clusters (FIDCLs) - cspSaved, // The total number of shapes saved + UINT32 spidMax, // The current maximum shape ID + cidcl, // The number of ID clusters (FIDCLs) + cspSaved, // The total number of shapes saved // (including deleted shapes, if undo // information was saved) - cdgSaved; // The total number of drawings saved + cdgSaved; // The total number of drawings saved if( WW8ReadUINT32( *xTableStream, spidMax ) && WW8ReadUINT32( *xTableStream, cidcl ) && @@ -2276,26 +2276,26 @@ void DumpEscherRec( ULONG nPos, UINT8 nVer, UINT16 nInst, } break; - case 0xF016: //ESCHER_CLSID - case 0xF11A: //ESCHER_ColorMRU - case 0xF11E: //ESCHER_SplitMenuColors -// case 0xF001: //ESCHER_BstoreContainer - case 0xF007: //ESCHER_BSE - case 0xF018: //ESCHER_BlipFirst - case 0xF117: //ESCHER_BlipLast - case 0xF118: //ESCHER_RegroupItems - case 0xF120: //ESCHER_ColorScheme - case 0xF00C: //ESCHER_Textbox - case 0xF00E: //ESCHER_Anchor - case 0xF11F: //ESCHER_OleObject - case 0xF11D: //ESCHER_DeletedPspl - case 0xF005: //ESCHER_SolverContainer - case 0xF012: //ESCHER_ConnectorRule - case 0xF013: //ESCHER_AlignRule - case 0xF014: //ESCHER_ArcRule - case 0xF015: //ESCHER_ClientRule - case 0xF017: //ESCHER_CalloutRule - case 0xF119: //ESCHER_Selection + case 0xF016: //ESCHER_CLSID + case 0xF11A: //ESCHER_ColorMRU + case 0xF11E: //ESCHER_SplitMenuColors +// case 0xF001: //ESCHER_BstoreContainer + case 0xF007: //ESCHER_BSE + case 0xF018: //ESCHER_BlipFirst + case 0xF117: //ESCHER_BlipLast + case 0xF118: //ESCHER_RegroupItems + case 0xF120: //ESCHER_ColorScheme + case 0xF00C: //ESCHER_Textbox + case 0xF00E: //ESCHER_Anchor + case 0xF11F: //ESCHER_OleObject + case 0xF11D: //ESCHER_DeletedPspl + case 0xF005: //ESCHER_SolverContainer + case 0xF012: //ESCHER_ConnectorRule + case 0xF013: //ESCHER_AlignRule + case 0xF014: //ESCHER_ArcRule + case 0xF015: //ESCHER_ClientRule + case 0xF017: //ESCHER_CalloutRule + case 0xF119: //ESCHER_Selection case 0xf008: //ESCHER_Dg { int nCnt = 128; @@ -2363,7 +2363,7 @@ void DumpEscherRecs( ULONG nPos, UINT32 nLength ) switch( nFbt ) { case 0xF000: - case 0xF001: //ESCHER_BstoreContainer + case 0xF001: //ESCHER_BstoreContainer case 0xF002: case 0xF003: case 0xF004: @@ -2399,7 +2399,7 @@ void DumpDrawing() //----------------------------------------- -// Hilfroutinen fuer Styles +// Hilfroutinen fuer Styles //----------------------------------------- static short DumpStyleUPX( BYTE nVersion, short nLen, BOOL bPAP ) @@ -2419,7 +2419,7 @@ static short DumpStyleUPX( BYTE nVersion, short nLen, BOOL bPAP ) indent( *pOut, *xTableStream ); xTableStream->Read( &cbUPX, 2 ); - nLen-= 2; + nLen-= 2; if ( cbUPX > nLen ) { @@ -2443,13 +2443,13 @@ static short DumpStyleUPX( BYTE nVersion, short nLen, BOOL bPAP ) xTableStream->Read( &id, 2 ); cbUPX-= 2; - nLen-= 2; + nLen-= 2; *pOut << "ID:" << id; } *pOut << endl1; - ULONG nPos = xTableStream->Tell(); // falls etwas falsch interpretiert + ULONG nPos = xTableStream->Tell(); // falls etwas falsch interpretiert // wird, gehts danach wieder richtig DumpSprms( nVersion, *xTableStream, cbUPX ); @@ -2475,8 +2475,8 @@ static void DumpStyleGrupx( BYTE nVersion, short nLen, BOOL bPara ) begin( *pOut, *xTableStream ) << "Grupx, Len:" << nLen << endl1; - if( bPara ) nLen = DumpStyleUPX( nVersion, nLen, TRUE ); // Grupx.Papx - DumpStyleUPX( nVersion, nLen, FALSE ); // Grupx.Chpx + if( bPara ) nLen = DumpStyleUPX( nVersion, nLen, TRUE ); // Grupx.Papx + DumpStyleUPX( nVersion, nLen, FALSE ); // Grupx.Chpx end( *pOut, *xTableStream ) << "Grupx" << endl1; } @@ -2486,12 +2486,12 @@ static void PrintStyleId( USHORT nId ) switch ( nId ){ case 0xffe: *pOut << "User "; break; case 0xfff: *pOut << "Nil "; break; - default: *pOut << nId << ' '; break; + default: *pOut << nId << ' '; break; } } //----------------------------------------- -// Styles +// Styles //----------------------------------------- void DStyle::Dump1Style( USHORT nNr ) @@ -2503,7 +2503,7 @@ void DStyle::Dump1Style( USHORT nNr ) WW8_STD* pStd = Read1Style( nSkip, &aStr, &cbStd ); // lese Style - if ( aStr.Len() ) // echter Style + if ( aStr.Len() ) // echter Style { *pOut << begin1; switch ( pStd->sgc ){ @@ -2521,17 +2521,17 @@ void DStyle::Dump1Style( USHORT nNr ) *pOut << "No of Upx & Upe:" << pStd->cupx << ' '; *pOut << "bchUpe:" << pStd->bchUpe << ' '; *pOut << "nSkip:" << nSkip << endl1; - }else{ // leerer Slot + }else{ // leerer Slot *pOut << "empty Slot Nr:" << nNr << endl1; } - long nPos = xTableStream->Tell(); // falls etwas falsch interpretiert + long nPos = xTableStream->Tell(); // falls etwas falsch interpretiert // wird, gehts danach wieder richtig if( pStd && ( pStd->sgc == 1 || pStd->sgc == 2 ) ) DumpStyleGrupx( nVersion, nSkip, pStd->sgc == 1 ); - if ( aStr.Len() ) // echter Style + if ( aStr.Len() ) // echter Style end( *pOut, *xTableStream ) << c << "-Style" << endl1; xTableStream->Seek( nPos+nSkip ); @@ -2543,7 +2543,7 @@ void DStyle::Dump() { *pOut << hex6 << nStyleStart << ' ' << dec2 << indent1; - *pOut << begin1 << cstd << " Styles, "; + *pOut << begin1 << cstd << " Styles, "; *pOut << "Base:" << cbSTDBaseInFile; *pOut << ", Written:" << (fStdStylenamesWritten) ? 'T' : 'F'; *pOut << ", MaxSti:" << stiMaxWhenSaved; @@ -2559,7 +2559,7 @@ void DStyle::Dump() } //----------------------------------------- -// Main +// Main //----------------------------------------- //char cName [266]; @@ -2629,7 +2629,7 @@ int DoConvert( const String& rName, BYTE nVersion ) // welcher Table-Stream gueltig ist. // Diesen oeffnen wir nun. - switch( pWwFib->nVersion ) // 6 steht fuer "6 ODER 7", 7 steht fuer "NUR 7" + switch( pWwFib->nVersion ) // 6 steht fuer "6 ODER 7", 7 steht fuer "NUR 7" { case 6: case 7: @@ -2664,10 +2664,10 @@ int DoConvert( const String& rName, BYTE nVersion ) // erstmal die Lowlevel-Funktionen - ((DFib*)pWwFib)->Dump(); // FIB - DumpDop( *pWwFib ); // WW8_DOP + ((DFib*)pWwFib)->Dump(); // FIB + DumpDop( *pWwFib ); // WW8_DOP - if( ( 8 > pWwFib->nVersion && pWwFib->fComplex ) || + if( ( 8 > pWwFib->nVersion && pWwFib->fComplex ) || pWwFib->lcbClx ) DumpPcd( pWwFib->nVersion, pWwFib->fcClx, pWwFib->lcbClx ); @@ -2676,18 +2676,18 @@ int DoConvert( const String& rName, BYTE nVersion ) DumpBookHigh(); - DumpPLCF( pWwFib->fcPlcfsed, pWwFib->lcbPlcfsed, SEP ); // SEPX + DumpPLCF( pWwFib->fcPlcfsed, pWwFib->lcbPlcfsed, SEP ); // SEPX DumpPLCF( pWwFib->fcPlcfbteChpx, pWwFib->lcbPlcfbteChpx, CHP ); // CHPX DumpPLCF( pWwFib->fcPlcfbtePapx, pWwFib->lcbPlcfbtePapx, PAP ); // PAPX { - DStyle aStyle( *xTableStream, *pWwFib ); // Styles + DStyle aStyle( *xTableStream, *pWwFib ); // Styles aStyle.Dump(); } - DumpFonts(); // WW8_FFN + DumpFonts(); // WW8_FFN // ... und jetzt die High-Level-Funktionen @@ -2698,7 +2698,7 @@ int DoConvert( const String& rName, BYTE nVersion ) DumpField1( pWwFib->fcPlcffldMom, pWwFib->lcbPlcffldMom, "MainText Fields" ); - DumpHeader( pSBase ); // Header / Footer + DumpHeader( pSBase ); // Header / Footer DumpField1( pWwFib->fcPlcffldHdr, pWwFib->lcbPlcffldHdr, "Header/Footer Fields" ); @@ -2734,7 +2734,7 @@ int DoConvert( const String& rName, BYTE nVersion ) void DeInit() { -// DELETEZ( aWwStor ); +// DELETEZ( aWwStor ); xStrm.Clear(); DELETEZ( pxStor ); DELETEZ( pOut ); diff --git a/sw/source/filter/ww8/dump/msvbasic.cxx b/sw/source/filter/ww8/dump/msvbasic.cxx index 0acbb3dab7fc..7f9659b77b1a 100644 --- a/sw/source/filter/ww8/dump/msvbasic.cxx +++ b/sw/source/filter/ww8/dump/msvbasic.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,9 +30,9 @@ #include "precompiled_sw.hxx" -#include <string.h> // memset(), ... +#include <string.h> // memset(), ... #ifndef UNX -#include <io.h> // access() +#include <io.h> // access() #endif #include <msvbasic.hxx> @@ -286,7 +286,7 @@ int VBA_Impl::ReadVBAProject(const SvStorageRef &rxVBAStorage) xVBAProject->Read(&junksize,2); // usually 18 02, sometimes 1e 02 //but sometimes its a run of numbers until 0xffff, gagh!!! //*pOut << "position is " << xVBAProject->Tell() << "len is " - // << junksize << endl; + // << junksize << endl; } UINT16 ftest; @@ -395,7 +395,7 @@ const String &VBA_Impl::Decompress( UINT16 nIndex, int *pOverflow) xVBAStream->GetError() ) { DBG_WARNING("Not able to open vb module "); -// DBG_WARNING((pOffsets[nIndex].sName).GetStr()); +// DBG_WARNING((pOffsets[nIndex].sName).GetStr()); } else { @@ -403,7 +403,7 @@ const String &VBA_Impl::Decompress( UINT16 nIndex, int *pOverflow) DecompressVBA(nIndex,xVBAStream); /* * if len was too big for a single string set that variable ? - * if ((len > XX) && (pOverflow)) + * if ((len > XX) && (pOverflow)) *pOverflow=1; */ if (bCommented) diff --git a/sw/source/filter/ww8/dump/msvbasic.hxx b/sw/source/filter/ww8/dump/msvbasic.hxx index bb12e9509511..86326c0015aa 100644 --- a/sw/source/filter/ww8/dump/msvbasic.hxx +++ b/sw/source/filter/ww8/dump/msvbasic.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 @@ public: //0 for failure, 1 for success BOOL Open( const String &rToplevel, const String &rSublevel); const String & Decompress( UINT16 nIndex, int *pOverflow=0); - UINT16 GetNoStreams() const { return nOffsets; } + UINT16 GetNoStreams() const { return nOffsets; } const String &GetStreamName( UINT16 nIndex ) const { DBG_ASSERT( nIndex < nOffsets, "Index out of range" ); diff --git a/sw/source/filter/ww8/dump/ww8darr.cxx b/sw/source/filter/ww8/dump/ww8darr.cxx index ae33501a5bee..da2deb130277 100644 --- a/sw/source/filter/ww8/dump/ww8darr.cxx +++ b/sw/source/filter/ww8/dump/ww8darr.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,7 +31,7 @@ #include <stdlib.h> -#include "ww8dout.hxx" // OutShort() +#include "ww8dout.hxx" // OutShort() #include "ww8darr.hxx" @@ -44,17 +44,17 @@ SprmDumpInfo aSprmDumpTab[] = { 0, (FnOut)0, "NOP(0)", 2, OutShort, "sprmPIstd", // pap.istd (style code) - 3, (FnOut)0, "sprmPIstdPermute", // pap.istd permutation + 3, (FnOut)0, "sprmPIstdPermute", // pap.istd permutation 4, OutByte, "sprmPIncLv1", // pap.istddifference 5, OutByte, "sprmPJc", // pap.jc (justification) 6, OutBool, "sprmPFSideBySide", // pap.fSideBySide 7, OutBool, "sprmPFKeep", // pap.fKeep - 8, OutBool, "sprmPFKeepFollow ", // pap.fKeepFollow + 8, OutBool, "sprmPFKeepFollow ", // pap.fKeepFollow 9, OutBool, "sprmPPageBreakBefore", // pap.fPageBreakBefore - 10, (FnOut)0, "sprmPBrcl", // pap.brcl + 10, (FnOut)0, "sprmPBrcl", // pap.brcl 11, (FnOut)0, "sprmPBrcp ", // pap.brcp - 12, (FnOut)0, "sprmPAnld", // pap.anld (ANLD structure) + 12, (FnOut)0, "sprmPAnld", // pap.anld (ANLD structure) 13, OutByte, "sprmPNLvlAnm", // pap.nLvlAnm nn 14, OutBool, "sprmPFNoLineNumb", //ap.fNoLnn @@ -67,9 +67,9 @@ SprmDumpInfo aSprmDumpTab[] = { 18, OutWord, "sprmPNest", // pap.dxaLeft 19, OutShort, "sprmPDxaLeft1", // pap.dxaLeft1 - 20, OutShorts, "sprmPDyaLine", // pap.lspd an LSPD + 20, OutShorts, "sprmPDyaLine", // pap.lspd an LSPD 21, OutWord, "sprmPDyaBefore", // pap.dyaBefore - 22, OutWord, "sprmPDyaAfter", // pap.dyaAfter + 22, OutWord, "sprmPDyaAfter", // pap.dyaAfter //?? @@ -124,7 +124,7 @@ SprmDumpInfo aSprmDumpTab[] = { 72, OutShort, "sprmCRMReason", // chp.idslRMReason an index to a table 73, (FnOut)0, "sprmCChse", // chp.fChsDiff and chp.chse see below 3 bytes 74, (FnOut)0, "sprmCSymbol", // chp.fSpec, chp.chSym and chp.ftcSym - 75, OutBool, "sprmCFOle2", // chp.fOle2 1 or 0 bit + 75, OutBool, "sprmCFOle2", // chp.fOle2 1 or 0 bit 80, OutShort, "sprmCIstd", // chp.istd istd, see stylesheet definition short 81, (FnOut)0, "sprmCIstdPermute", // chp.istd permutation vector (see below) @@ -169,7 +169,7 @@ SprmDumpInfo aSprmDumpTab[] = { 118, OutBool, "sprmCFObj", // chp.fObj 1 or 0 bit 119, (FnOut)0, "sprmPicBrcl", // pic.brcl brcl (see PIC structure definition) byte - 120, (FnOut)0, "sprmPicScale", // pic.mx, pic.my, pic.dxaCropleft, + 120, (FnOut)0, "sprmPicScale", // pic.mx, pic.my, pic.dxaCropleft, 121, (FnOut)0, "sprmPicBrcTop", // pic.brcTop BRC word 122, (FnOut)0, "sprmPicBrcLeft", // pic.brcLeft BRC word 123, (FnOut)0, "sprmPicBrcBottom", // pic.brcBottom BRC word diff --git a/sw/source/filter/ww8/dump/ww8darr.hxx b/sw/source/filter/ww8/dump/ww8darr.hxx index 158fa11ab1f5..64a8e9c6e636 100644 --- a/sw/source/filter/ww8/dump/ww8darr.hxx +++ b/sw/source/filter/ww8/dump/ww8darr.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/sw/source/filter/ww8/dump/ww8dout.cxx b/sw/source/filter/ww8/dump/ww8dout.cxx index 771233b1f029..a0a77dd393f7 100644 --- a/sw/source/filter/ww8/dump/ww8dout.cxx +++ b/sw/source/filter/ww8/dump/ww8dout.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,9 +29,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sw.hxx" -#include <stdio.h> // getchar +#include <stdio.h> // getchar -#include <tools/solar.h> // BYTE +#include <tools/solar.h> // BYTE #include "ww8dout.hxx" #include <tools/stream.hxx> @@ -39,7 +39,7 @@ extern SvStorageStreamRef xStrm; extern SvStorageStreamRef xTableStream; -extern SvStorageStreamRef xDataStream; // ist bei Ver6-7 mit xStrm identisch, +extern SvStorageStreamRef xDataStream; // ist bei Ver6-7 mit xStrm identisch, void DumpSprms( BYTE nVersion, SvStream& rSt, short nLen ); ostream* pOut = 0; @@ -47,7 +47,7 @@ ostream* pOut = 0; #define DumpVer8 //----------------------------------------- -// Streams +// Streams //----------------------------------------- @@ -152,7 +152,7 @@ ostream& __cdecl end1( ostream& s ) { level--; return s << indent1 << "END "; } ostream& __cdecl end2( ostream& s ) { level--; return s << indent2 << "END "; } //----------------------------------------- -// Ausgabe-Funktionen +// Ausgabe-Funktionen //----------------------------------------- void OutBool( SvStream& rSt, short ) @@ -285,7 +285,7 @@ void OutTab( SvStream& rSt, short ) rSt.Read( &nDel, sizeof( nDel ) ); *pOut << "Del " << (USHORT)nDel; - if ( nDel ) *pOut << ": "; + if ( nDel ) *pOut << ": "; else *pOut << ", "; for( i=1; i<=nDel; i++){ @@ -296,7 +296,7 @@ void OutTab( SvStream& rSt, short ) } rSt.Read( &nIns, sizeof( nIns ) ); *pOut << "Ins " << (USHORT)nIns; - if ( nIns ) *pOut << ": "; + if ( nIns ) *pOut << ": "; for( i=1; i<=nIns; i++){ rSt.Read( &nPos, sizeof( nPos ) ); @@ -304,7 +304,7 @@ void OutTab( SvStream& rSt, short ) if( i<nIns ) *pOut << ','; else *pOut << ' '; } - if ( nIns ) *pOut << "Typ: "; + if ( nIns ) *pOut << "Typ: "; for( i=1; i<=nIns; i++){ rSt.Read( &nType, sizeof( nType ) ); @@ -313,9 +313,9 @@ void OutTab( SvStream& rSt, short ) else *pOut << ' '; } -// nSiz = 1 + 2 * nDel + 1 + nIns * 3; // genaue Laenge, +// nSiz = 1 + 2 * nDel + 1 + nIns * 3; // genaue Laenge, // stimmt auch bei Laenge > 256 -// bei diesem Tab-Befehl anscheinend nicht noetig +// bei diesem Tab-Befehl anscheinend nicht noetig } void OutTab190( SvStream& rSt, short nLen ) @@ -364,7 +364,7 @@ void OutHugeHex( SvStream& rSt, short nLen ) xDataStream->Read( &nLen, sizeof( nLen ) ); -// *pOut << ", Len max: " << nLen << ", ID:" << nIStd << endl1; +// *pOut << ", Len max: " << nLen << ", ID:" << nIStd << endl1; *pOut << endl1; DumpSprms( 8, *xDataStream, nLen ); @@ -375,7 +375,7 @@ void OutTabD608( SvStream& rSt, short nLen ) { BYTE nHi, nCols; rSt.Read( &nHi, sizeof( nHi ) ); -// nLen += ((short)nHi) << 8; +// nLen += ((short)nHi) << 8; rSt.Read( &nCols, sizeof( nCols ) ); *pOut << " Cols: " << (short)nCols << ' ' << endl1 << indent2; diff --git a/sw/source/filter/ww8/dump/ww8dout.hxx b/sw/source/filter/ww8/dump/ww8dout.hxx index 5bcb34db96c2..56d786e34acf 100644 --- a/sw/source/filter/ww8/dump/ww8dout.hxx +++ b/sw/source/filter/ww8/dump/ww8dout.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 @@ -30,10 +30,10 @@ #define _WW8DOUT_HXX #ifndef INC_FSTREAM - #include <fstream.h> // ostream + #include <fstream.h> // ostream #endif #ifndef SOLAR_H - #include <tools/solar.h> // BYTE + #include <tools/solar.h> // BYTE #endif class SvStream; diff --git a/sw/source/filter/ww8/dump/ww8scan.cxx b/sw/source/filter/ww8/dump/ww8scan.cxx index 7ecb639a1b75..cf58b2814c69 100644 --- a/sw/source/filter/ww8/dump/ww8scan.cxx +++ b/sw/source/filter/ww8/dump/ww8scan.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ #include <algorithm> #include <functional> -#include <string.h> // memset() +#include <string.h> // memset() #include <osl/endian.h> #include <rtl/tencinfo.h> @@ -41,12 +41,12 @@ #define ERR_SWG_READ_ERROR 1234 #define OSL_ENSURE( a, b ) -#else // dump -#include <swerror.h> // ERR_WW6_... -#include <errhdl.hxx> // OSL_ENSURE() -#include <swtypes.hxx> // DELETEZ +#else // dump +#include <swerror.h> // ERR_WW6_... +#include <errhdl.hxx> // OSL_ENSURE() +#include <swtypes.hxx> // DELETEZ -#endif // dump +#endif // dump #include <tools/debug.hxx> #include "ww8scan.hxx" @@ -239,7 +239,7 @@ const wwSprmSearcher *wwSprmParser::GetWW6SprmSearcher() { 72, 2, L_FIX}, // "sprmCRMReason" chp.idslRMReason an index to a table { 73, 3, L_FIX}, // "sprmCChse" chp.fChsDiff and chp.chse { 74, 0, L_VAR}, // "sprmCSymbol" chp.fSpec, chp.chSym and chp.ftcSym - { 75, 1, L_FIX}, // "sprmCFOle2" chp.fOle2 1 or 0 bit + { 75, 1, L_FIX}, // "sprmCFOle2" chp.fOle2 1 or 0 bit { 79, 0, L_VAR}, // unknown { 80, 2, L_FIX}, // "sprmCIstd" chp.istd istd, see stylesheet definition { 81, 0, L_VAR}, // "sprmCIstdPermute" chp.istd permutation vector @@ -602,7 +602,7 @@ const wwSprmSearcher *wwSprmParser::GetWW8SprmSearcher() {0x9031, 2, L_FIX}, // "sprmSDyaLinePitch" // sep.dyaLinePitch;dya; WRONG:long; RIGHT:short; ! {0x5032, 2, L_FIX}, // "sprmSClm" ;;; - {0x5033, 2, L_FIX}, // "sprmSTextFlow" sep.wTextFlow;complex + {0x5033, 2, L_FIX}, // "sprmSTextFlow" sep.wTextFlow;complex {0x5400, 2, L_FIX}, // "sprmTJc" tap.jc;jc;word (low order byte is // significant); {0x9601, 2, L_FIX}, // "sprmTDxaLeft" tap.rgdxaCenter @@ -837,7 +837,7 @@ const BYTE* WW8SprmIter::FindSprm(USHORT nId) } //----------------------------------------- -// temporaerer Test +// temporaerer Test //----------------------------------------- // WW8PLCFx_PCDAttrs halten sich an WW8PLCF_Pcd fest und besitzen deshalb keine // eigenen Iteratoren. Alle sich auf Iteratoren beziehenden Methoden @@ -905,9 +905,9 @@ void WW8PLCFx_PCDAttrs::GetSprms(WW8PLCFxDesc* p) } const BYTE* pSprms = pGrpprls[ nSprmIdx ]; - p->nSprmsLen = SVBT16ToShort( pSprms ); // Length + p->nSprmsLen = SVBT16ToShort( pSprms ); // Length pSprms += 2; - p->pMemPos = pSprms; // Position + p->pMemPos = pSprms; // Position } else { @@ -920,7 +920,7 @@ void WW8PLCFx_PCDAttrs::GetSprms(WW8PLCFxDesc* p) { aShortSprm[0] = (BYTE)( ( nPrm & 0xfe) >> 1 ); aShortSprm[1] = (BYTE)( nPrm >> 8 ); - p->nSprmsLen = ( nPrm ) ? 2 : 0; // Laenge + p->nSprmsLen = ( nPrm ) ? 2 : 0; // Laenge // store Postion of internal mini storage in Data Pointer p->pMemPos = aShortSprm; @@ -1160,20 +1160,20 @@ WW8_CP WW8PLCFx_PCD::AktPieceStartFc2Cp( WW8_FC nStartPos ) } //----------------------------------------- -// Hilfsroutinen fuer alle +// Hilfsroutinen fuer alle //----------------------------------------- DateTime WW8ScannerBase::WW8DTTM2DateTime(long lDTTM) { /* - mint short :6 0000003F minutes (0-59) - hr short :5 000007C0 hours (0-23) - dom short :5 0000F800 days of month (1-31) - mon short :4 000F0000 months (1-12) - yr short :9 1FF00000 years (1900-2411)-1900 - wdy short :3 E0000000 weekday(Sunday=0 + mint short :6 0000003F minutes (0-59) + hr short :5 000007C0 hours (0-23) + dom short :5 0000F800 days of month (1-31) + mon short :4 000F0000 months (1-12) + yr short :9 1FF00000 years (1900-2411)-1900 + wdy short :3 E0000000 weekday(Sunday=0 Monday=1 - ( wdy can be ignored ) Tuesday=2 + ( wdy can be ignored ) Tuesday=2 Wednesday=3 Thursday=4 Friday=5 @@ -1182,13 +1182,13 @@ DateTime WW8ScannerBase::WW8DTTM2DateTime(long lDTTM) DateTime aDateTime(Date( 0 ), Time( 0 )); if( lDTTM ) { - USHORT lMin = (USHORT)(lDTTM & 0x0000003F); + USHORT lMin = (USHORT)(lDTTM & 0x0000003F); lDTTM >>= 6; USHORT lHour= (USHORT)(lDTTM & 0x0000001F); lDTTM >>= 5; - USHORT lDay = (USHORT)(lDTTM & 0x0000001F); + USHORT lDay = (USHORT)(lDTTM & 0x0000001F); lDTTM >>= 5; - USHORT lMon = (USHORT)(lDTTM & 0x0000000F); + USHORT lMon = (USHORT)(lDTTM & 0x0000000F); lDTTM >>= 4; USHORT lYear= (USHORT)(lDTTM & 0x000001FF) + 1900; aDateTime = DateTime(Date(lDay, lMon, lYear), Time(lHour, lMin)); @@ -1211,7 +1211,7 @@ short WW8_BRC::DetermineBorderProperties(bool bVer67, short *pSpace, if( bVer67 ) { UINT16 aBrc1 = SVBT16ToShort(aBits1); - nCol = ((aBrc1 >> 6) & 0x1f); // aBor.ico + nCol = ((aBrc1 >> 6) & 0x1f); // aBor.ico nSpace = (aBrc1 & 0xF800) >> 11; nMSTotalWidth = aBrc1 & 0x07; @@ -1228,7 +1228,7 @@ short WW8_BRC::DetermineBorderProperties(bool bVer67, short *pSpace, else { nIdx = aBits1[1]; - nCol = aBits2[0]; // aBor.ico + nCol = aBits2[0]; // aBor.ico nSpace = aBits2[1] & 0x1F; //space between line and object //Specification in 8ths of a point, 1 Point = 20 Twips, so by 2.5 @@ -1429,7 +1429,7 @@ WW8_CP WW8ScannerBase::WW8Fc2Cp( WW8_FC nFcPos ) const long nCpStart, nCpEnd; void* pData; if( !pPieceIter->Get( nCpStart, nCpEnd, pData ) ) - { // ausserhalb PLCFfpcd ? + { // ausserhalb PLCFfpcd ? OSL_ENSURE( !this, "PLCFpcd-WW8Fc2Cp() ging schief" ); break; } @@ -1462,7 +1462,7 @@ WW8_CP WW8ScannerBase::WW8Fc2Cp( WW8_FC nFcPos ) const } } // not found - pPieceIter->SetIdx( nOldPos ); // not found + pPieceIter->SetIdx( nOldPos ); // not found /* If it was not found, then this is because it has fallen between two stools, i.e. either it is the last cp/fc of the last piece, or it is @@ -1489,7 +1489,7 @@ WW8_FC WW8ScannerBase::WW8Cp2Fc(WW8_CP nCpPos, bool* pIsUnicode, pIsUnicode = &bIsUnicode; if( pPieceIter ) - { // Complex File + { // Complex File if( pNextPieceCp ) *pNextPieceCp = LONG_MAX; @@ -1535,7 +1535,7 @@ WW8_FC WW8ScannerBase::WW8Cp2Fc(WW8_CP nCpPos, bool* pIsUnicode, } //----------------------------------------- -// class WW8ScannerBase +// class WW8ScannerBase //----------------------------------------- WW8PLCFpcd* WW8ScannerBase::OpenPieceTable( SvStream* pStr, const WW8Fib* pWwF ) @@ -1554,43 +1554,43 @@ WW8PLCFpcd* WW8ScannerBase::OpenPieceTable( SvStream* pStr, const WW8Fib* pWwF ) { *pStr >> clxt; nLeft--; - if( 2 == clxt ) // PLCFfpcd ? - break; // PLCFfpcd gefunden - if( 1 == clxt ) // clxtGrpprl ? + if( 2 == clxt ) // PLCFfpcd ? + break; // PLCFfpcd gefunden + if( 1 == clxt ) // clxtGrpprl ? nGrpprl++; UINT16 nLen; *pStr >> nLen; nLeft -= 2 + nLen; if( nLeft < 0 ) - return 0; // schiefgegangen - pStr->SeekRel( nLen ); // ueberlies grpprl + return 0; // schiefgegangen + pStr->SeekRel( nLen ); // ueberlies grpprl } pStr->Seek( nClxPos ); nLeft = nClxLen; pPieceGrpprls = new BYTE*[nGrpprl + 1]; memset( pPieceGrpprls, 0, ( nGrpprl + 1 ) * 4 ); nPieceGrpprls = nGrpprl; - INT16 nAktGrpprl = 0; // lies Grpprls ein + INT16 nAktGrpprl = 0; // lies Grpprls ein while( 1 ) { *pStr >> clxt; nLeft--; - if( 2 == clxt) // PLCFfpcd ? - break; // PLCFfpcd gefunden + if( 2 == clxt) // PLCFfpcd ? + break; // PLCFfpcd gefunden UINT16 nLen; *pStr >> nLen; nLeft -= 2 + nLen; if( nLeft < 0 ) - return 0; // schiefgegangen - if( 1 == clxt ) // clxtGrpprl ? + return 0; // schiefgegangen + if( 1 == clxt ) // clxtGrpprl ? { - BYTE* p = new BYTE[nLen+2]; // alloziere - ShortToSVBT16(nLen, p); // trage Laenge ein - pStr->Read( p+2, nLen ); // lies grpprl - pPieceGrpprls[nAktGrpprl++] = p; // trage in Array ein + BYTE* p = new BYTE[nLen+2]; // alloziere + ShortToSVBT16(nLen, p); // trage Laenge ein + pStr->Read( p+2, nLen ); // lies grpprl + pPieceGrpprls[nAktGrpprl++] = p; // trage in Array ein } else - pStr->SeekRel( nLen ); // ueberlies nicht-Grpprl + pStr->SeekRel( nLen ); // ueberlies nicht-Grpprl } // lies Piece Table PLCF ein INT32 nPLCFfLen; @@ -1616,7 +1616,7 @@ WW8ScannerBase::WW8ScannerBase( SvStream* pSt, SvStream* pTblSt, pMainTxbxBkd(0), pHdFtTxbx(0), pHdFtTxbxBkd(0), pMagicTables(0), pPieceGrpprls(0) { - pPiecePLCF = OpenPieceTable( pTblSt, pWw8Fib ); // Complex + pPiecePLCF = OpenPieceTable( pTblSt, pWw8Fib ); // Complex if( pPiecePLCF ) { pPieceIter = new WW8PLCFpcd_Iter( *pPiecePLCF ); @@ -1633,10 +1633,10 @@ WW8ScannerBase::WW8ScannerBase( SvStream* pSt, SvStream* pTblSt, } // pChpPLCF and pPapPLCF may NOT be created before pPLCFx_PCD !! - pChpPLCF = new WW8PLCFx_Cp_FKP( pSt, pTblSt, pDataSt, *this, CHP ); // CHPX - pPapPLCF = new WW8PLCFx_Cp_FKP( pSt, pTblSt, pDataSt, *this, PAP ); // PAPX + pChpPLCF = new WW8PLCFx_Cp_FKP( pSt, pTblSt, pDataSt, *this, CHP ); // CHPX + pPapPLCF = new WW8PLCFx_Cp_FKP( pSt, pTblSt, pDataSt, *this, PAP ); // PAPX - pSepPLCF = new WW8PLCFx_SEPX( pSt, pTblSt, *pWwFib, 0 ); // SEPX + pSepPLCF = new WW8PLCFx_SEPX( pSt, pTblSt, *pWwFib, 0 ); // SEPX // Footnotes pFtnPLCF = new WW8PLCFx_SubDoc( pTblSt, pWwFib->nVersion, 0, @@ -1767,20 +1767,20 @@ WW8ScannerBase::~WW8ScannerBase() } //----------------------------------------- -// Fields +// Fields //----------------------------------------- static bool WW8SkipField(WW8PLCFspecial& rPLCF) { void* pData; long nP; - if (!rPLCF.Get(nP, pData)) // Ende des PLCFspecial ? + if (!rPLCF.Get(nP, pData)) // Ende des PLCFspecial ? return false; rPLCF++; - if((((BYTE*)pData)[0] & 0x1f ) != 0x13 ) // Kein Anfang ? - return true; // Bei Fehler nicht abbrechen + if((((BYTE*)pData)[0] & 0x1f ) != 0x13 ) // Kein Anfang ? + return true; // Bei Fehler nicht abbrechen if( !rPLCF.Get( nP, pData ) ) return false; @@ -1789,7 +1789,7 @@ static bool WW8SkipField(WW8PLCFspecial& rPLCF) while((((BYTE*)pData)[0] & 0x1f ) == 0x13 ) { // immer noch neue (nested) Anfaenge ? - WW8SkipField( rPLCF ); // nested Field im Beschreibungsteil + WW8SkipField( rPLCF ); // nested Field im Beschreibungsteil if( !rPLCF.Get( nP, pData ) ) return false; } @@ -1806,7 +1806,7 @@ static bool WW8SkipField(WW8PLCFspecial& rPLCF) while ((((BYTE*)pData)[0] & 0x1f ) == 0x13) { // immer noch neue (nested) Anfaenge ? - WW8SkipField( rPLCF ); // nested Field im Resultatteil + WW8SkipField( rPLCF ); // nested Field im Resultatteil if( !rPLCF.Get( nP, pData ) ) return false; } @@ -1823,12 +1823,12 @@ static bool WW8GetFieldPara(WW8PLCFspecial& rPLCF, WW8FieldDesc& rF) rF.nLen = rF.nId = rF.nOpt = rF.bCodeNest = rF.bResNest = 0; - if( !rPLCF.Get( rF.nSCode, pData ) ) // Ende des PLCFspecial ? + if( !rPLCF.Get( rF.nSCode, pData ) ) // Ende des PLCFspecial ? goto Err; rPLCF++; - if((((BYTE*)pData)[0] & 0x1f ) != 0x13 ) // Kein Anfang ? + if((((BYTE*)pData)[0] & 0x1f ) != 0x13 ) // Kein Anfang ? goto Err; rF.nId = ((BYTE*)pData)[1]; @@ -1836,20 +1836,20 @@ static bool WW8GetFieldPara(WW8PLCFspecial& rPLCF, WW8FieldDesc& rF) if( !rPLCF.Get( rF.nLCode, pData ) ) goto Err; - rF.nSRes = rF.nLCode; // Default - rF.nSCode++; // ohne Marken - rF.nLCode -= rF.nSCode; // Pos zu Laenge + rF.nSRes = rF.nLCode; // Default + rF.nSCode++; // ohne Marken + rF.nLCode -= rF.nSCode; // Pos zu Laenge while((((BYTE*)pData)[0] & 0x1f ) == 0x13 ) { // immer noch neue (nested) Anfaenge ? - WW8SkipField( rPLCF ); // nested Field im Beschreibungsteil + WW8SkipField( rPLCF ); // nested Field im Beschreibungsteil rF.bCodeNest = true; if( !rPLCF.Get( rF.nSRes, pData ) ) goto Err; } - if((((BYTE*)pData)[0] & 0x1f ) == 0x14 ){ // Field Separator ? + if((((BYTE*)pData)[0] & 0x1f ) == 0x14 ){ // Field Separator ? rPLCF++; if( !rPLCF.Get( rF.nLRes, pData ) ) @@ -1858,19 +1858,19 @@ static bool WW8GetFieldPara(WW8PLCFspecial& rPLCF, WW8FieldDesc& rF) while((((BYTE*)pData)[0] & 0x1f ) == 0x13 ) { // immer noch neue (nested) Anfaenge ? - WW8SkipField( rPLCF ); // nested Field im Resultatteil + WW8SkipField( rPLCF ); // nested Field im Resultatteil rF.bResNest = true; if( !rPLCF.Get( rF.nLRes, pData ) ) goto Err; } - rF.nLen = rF.nLRes - rF.nSCode + 2; // nLRes ist noch die Endposition - rF.nLRes -= rF.nSRes; // nun: nLRes = Laenge - rF.nSRes++; // Endpos encl. Marken + rF.nLen = rF.nLRes - rF.nSCode + 2; // nLRes ist noch die Endposition + rF.nLRes -= rF.nSRes; // nun: nLRes = Laenge + rF.nSRes++; // Endpos encl. Marken rF.nLRes--; }else{ - rF.nLRes = 0; // Kein Result vorhanden - rF.nLen = rF.nSRes - rF.nSCode + 2; // Gesamtlaenge + rF.nLRes = 0; // Kein Result vorhanden + rF.nLen = rF.nSRes - rF.nSCode + 2; // Gesamtlaenge } rPLCF++; @@ -1878,9 +1878,9 @@ static bool WW8GetFieldPara(WW8PLCFspecial& rPLCF, WW8FieldDesc& rF) { // Field Ende ? // INDEX-Fld hat Bit7 gesetzt!?! - rF.nOpt = ((BYTE*)pData)[1]; // Ja -> Flags uebernehmen + rF.nOpt = ((BYTE*)pData)[1]; // Ja -> Flags uebernehmen }else{ - rF.nId = 0; // Nein -> Feld ungueltig + rF.nId = 0; // Nein -> Feld ungueltig } rPLCF.SetIdx( nOldIdx ); @@ -1915,7 +1915,7 @@ String WW8ReadPString(SvStream& rStrm, rtl_TextEncoding eEnc, } if( bAtEndSeekRel1 ) - rStrm.SeekRel( 1 ); // ueberspringe das Null-Byte am Ende. + rStrm.SeekRel( 1 ); // ueberspringe das Null-Byte am Ende. return String( aByteStr, eEnc ); @@ -1953,7 +1953,7 @@ String WW8Read_xstz(SvStream& rStrm, USHORT nChars, bool bAtEndSeekRel1) } if( bAtEndSeekRel1 ) - rStrm.SeekRel( 2 ); // ueberspringe das Null-Character am Ende. + rStrm.SeekRel( 2 ); // ueberspringe das Null-Character am Ende. return aStr; } @@ -1978,7 +1978,7 @@ USHORT WW8ScannerBase::WW8ReadString( SvStream& rStrm, String& rStr, long nTotalRead = 0; WW8_CP nBehindTextCp = nAktStartCp + nTotalLen; - WW8_CP nNextPieceCp = nBehindTextCp; // Initialisierung wichtig fuer Ver6 + WW8_CP nNextPieceCp = nBehindTextCp; // Initialisierung wichtig fuer Ver6 do { bool bIsUnicode, bPosOk; @@ -2019,7 +2019,7 @@ USHORT WW8ScannerBase::WW8ReadString( SvStream& rStrm, String& rStr, } //----------------------------------------- -// WW8PLCFspecial +// WW8PLCFspecial //----------------------------------------- // Bei nStartPos < 0 wird das erste Element des PLCFs genommen @@ -2045,7 +2045,7 @@ WW8PLCFspecial::WW8PLCFspecial(SvStream* pSt, long nFilePos, long nPLCF, if( nStruct ) // Pointer auf Inhalts-Array pPLCF_Contents = (BYTE*)&pPLCF_PosArray[nIMax + 1]; else - pPLCF_Contents = 0; // kein Inhalt + pPLCF_Contents = 0; // kein Inhalt if( nStartPos >= 0 ) SeekPos( nStartPos ); @@ -2061,7 +2061,7 @@ bool WW8PLCFspecial::SeekPos(long nP) if( nP < pPLCF_PosArray[0] ) { nIdx = 0; - return false; // Not found: nP unterhalb kleinstem Eintrag + return false; // Not found: nP unterhalb kleinstem Eintrag } // Search from beginning? @@ -2074,17 +2074,17 @@ bool WW8PLCFspecial::SeekPos(long nP) for(int n = (1==nIdx ? 1 : 2); n; --n ) { for( ; nI <=nEnd; ++nI) - { // Suchen mit um 1 erhoehtem Index + { // Suchen mit um 1 erhoehtem Index if( nP < pPLCF_PosArray[nI] ) - { // Position gefunden - nIdx = nI - 1; // nI - 1 ist der richtige Index - return true; // ... und fertig + { // Position gefunden + nIdx = nI - 1; // nI - 1 ist der richtige Index + return true; // ... und fertig } } nI = 1; nEnd = nIdx-1; } - nIdx = nIMax; // Nicht gefunden, groesser als alle Eintraege + nIdx = nIMax; // Nicht gefunden, groesser als alle Eintraege return false; } @@ -2097,7 +2097,7 @@ bool WW8PLCFspecial::SeekPosExact(long nP) if( nP < pPLCF_PosArray[0] ) { nIdx = 0; - return false; // Not found: nP unterhalb kleinstem Eintrag + return false; // Not found: nP unterhalb kleinstem Eintrag } // Search from beginning? if( nP <=pPLCF_PosArray[nIdx] ) @@ -2111,15 +2111,15 @@ bool WW8PLCFspecial::SeekPosExact(long nP) for( ; nI < nEnd; ++nI) { if( nP <=pPLCF_PosArray[nI] ) - { // Position gefunden - nIdx = nI; // nI ist der richtige Index - return true; // ... und fertig + { // Position gefunden + nIdx = nI; // nI ist der richtige Index + return true; // ... und fertig } } nI = 0; nEnd = nIdx; } - nIdx = nIMax; // Not found, groesser als alle Eintraege + nIdx = nIMax; // Not found, groesser als alle Eintraege return false; } @@ -2141,7 +2141,7 @@ bool WW8PLCFspecial::GetData(long nInIdx, long& rPos, void*& rpValue) const } //----------------------------------------- -// WW8PLCF z.B. fuer SEPX +// WW8PLCF z.B. fuer SEPX //----------------------------------------- // Ctor fuer *andere* als Fkps @@ -2203,30 +2203,30 @@ void WW8PLCF::GeneratePLCF( SvStream* pSt, long nPN, long ncpN ) OSL_ENSURE( nIMax < (long)ncpN, "Pcl.Fkp: Warum ist PLCF zu gross ?" ); nIMax = ncpN; long nSiz = 6 * nIMax + 4; - pPLCF_PosArray = new INT32[ ( nSiz + 3 ) / 4 ]; // Pointer auf Pos-Array + pPLCF_PosArray = new INT32[ ( nSiz + 3 ) / 4 ]; // Pointer auf Pos-Array memset( pPLCF_PosArray, 0, (size_t)nSiz ); INT32 nFc; USHORT i; - for( i = 0; i < ncpN; i++ ){ // Baue FC-Eintraege - pSt->Seek( ( nPN + i ) << 9 ); // erster FC-Eintrag jedes Fkp + for( i = 0; i < ncpN; i++ ){ // Baue FC-Eintraege + pSt->Seek( ( nPN + i ) << 9 ); // erster FC-Eintrag jedes Fkp *pSt >> nFc; pPLCF_PosArray[i] = nFc; } ULONG nLastFkpPos = ( ( nPN + nIMax - 1 ) << 9 ); - pSt->Seek( nLastFkpPos + 511 ); // Anz. Fkp-Eintraege des letzten Fkp + pSt->Seek( nLastFkpPos + 511 ); // Anz. Fkp-Eintraege des letzten Fkp BYTE nb; *pSt >> nb; - pSt->Seek( nLastFkpPos + nb * 4 ); // letzer FC-Eintrag des letzten Fkp + pSt->Seek( nLastFkpPos + nb * 4 ); // letzer FC-Eintrag des letzten Fkp *pSt >> nFc; - pPLCF_PosArray[nIMax] = nFc; // Ende des letzten Fkp + pPLCF_PosArray[nIMax] = nFc; // Ende des letzten Fkp // Pointer auf Inhalts-Array pPLCF_Contents = (BYTE*)&pPLCF_PosArray[nIMax + 1]; BYTE* p = pPLCF_Contents; - for( i = 0; i < ncpN; i++ ) // Baue PNs + for( i = 0; i < ncpN; i++ ) // Baue PNs { ShortToSVBT16(nPN + i, p); p+=2; @@ -2253,19 +2253,19 @@ bool WW8PLCF::SeekPos(long nPos) for(int n = (1==nIdx ? 1 : 2); n; --n ) { - for( ; nI <=nEnd; ++nI) // Suchen mit um 1 erhoehtem Index + for( ; nI <=nEnd; ++nI) // Suchen mit um 1 erhoehtem Index { - if( nP < pPLCF_PosArray[nI] ) // Position gefunden + if( nP < pPLCF_PosArray[nI] ) // Position gefunden { - nIdx = nI - 1; // nI - 1 ist der richtige Index - return true; // ... und fertig + nIdx = nI - 1; // nI - 1 ist der richtige Index + return true; // ... und fertig } } nI = 1; nEnd = nIdx-1; } - nIdx = nIMax; // Nicht gefunden, groesser als alle Eintraege + nIdx = nIMax; // Nicht gefunden, groesser als alle Eintraege return false; } @@ -2291,14 +2291,14 @@ long WW8PLCF::Where() const } //----------------------------------------- -// WW8PLCFpcd +// WW8PLCFpcd //----------------------------------------- WW8PLCFpcd::WW8PLCFpcd( SvStream* pSt, long nFilePos, long nPLCF, long nStruct ) :nStru( nStruct ) { nIMax = ( nPLCF - 4 ) / ( 4 + nStruct ); - pPLCF_PosArray = new INT32[ ( nPLCF + 3 ) / 4 ]; // Pointer auf Pos-Array + pPLCF_PosArray = new INT32[ ( nPLCF + 3 ) / 4 ]; // Pointer auf Pos-Array long nOldPos = pSt->Tell(); @@ -2330,7 +2330,7 @@ bool WW8PLCFpcd_Iter::SeekPos(long nPos) if( nP < rPLCF.pPLCF_PosArray[0] ) { nIdx = 0; - return false; // Nicht gefunden: nPos unterhalb kleinstem Eintrag + return false; // Nicht gefunden: nPos unterhalb kleinstem Eintrag } // Search from beginning? if( (1 > nIdx) || (nP < rPLCF.pPLCF_PosArray[ nIdx-1 ]) ) @@ -2352,7 +2352,7 @@ bool WW8PLCFpcd_Iter::SeekPos(long nPos) nI = 1; nEnd = nIdx-1; } - nIdx = rPLCF.nIMax; // Nicht gefunden, groesser als alle Eintraege + nIdx = rPLCF.nIMax; // Nicht gefunden, groesser als alle Eintraege return false; } @@ -2520,7 +2520,7 @@ bool WW8PLCFx_Fc_FKP::WW8Fkp::SeekPos(WW8_FC nFc) if (nFc < maEntries[0].mnFC) { nIdx = 0; - return false; // Nicht gefunden: nPos unterhalb kleinstem Eintrag + return false; // Nicht gefunden: nPos unterhalb kleinstem Eintrag } // Search from beginning? if( (1 > nIdx) || (nFc < maEntries[nIdx-1].mnFC) ) @@ -2542,7 +2542,7 @@ bool WW8PLCFx_Fc_FKP::WW8Fkp::SeekPos(WW8_FC nFc) nI = 1; nEnd = nIdx-1; } - nIdx = nIMax; // Nicht gefunden, groesser als alle Eintraege + nIdx = nIMax; // Nicht gefunden, groesser als alle Eintraege return false; } @@ -2681,11 +2681,11 @@ bool WW8PLCFx_Fc_FKP::NewFkp() if (!pPLCF->Get( nPLCFStart, nPLCFEnd, pPage )) { pFkp = 0; - return false; // PLCF fertig abgearbeitet + return false; // PLCF fertig abgearbeitet } (*pPLCF)++; long nPo = SVBT16ToShort( (BYTE *)pPage ); - nPo <<= 9; // shift als LONG + nPo <<= 9; // shift als LONG long nAktFkpFilePos = pFkp ? pFkp->GetFilePos() : -1; if (nAktFkpFilePos == nPo) @@ -2712,7 +2712,7 @@ bool WW8PLCFx_Fc_FKP::NewFkp() } } - SetStartFc( -1 ); // Nur das erste Mal + SetStartFc( -1 ); // Nur das erste Mal return true; } @@ -2760,11 +2760,11 @@ void WW8PLCFx_Fc_FKP::SetIdx( ULONG nIdx ) pFkp = 0; } else - { //Es gab einen Fkp + { //Es gab einen Fkp //Lese PLCF um 1 Pos zurueck, um die Adresse des Fkp wiederzubekommen pPLCF->SetIdx( ( nIdx >> 8 ) - 1 ); - if ( NewFkp() ) // und lese Fkp wieder ein - pFkp->SetIdx( nIdx & 0xff ); // Dann stelle Fkp-Pos wieder ein + if ( NewFkp() ) // und lese Fkp wieder ein + pFkp->SetIdx( nIdx & 0xff ); // Dann stelle Fkp-Pos wieder ein } } @@ -2782,7 +2782,7 @@ bool WW8PLCFx_Fc_FKP::SeekPos(WW8_FC nFcPos) if( pFkp && pPLCF->Get( nPLCFStart, nPLCFEnd, pPage ) ) { long nPo = SVBT16ToShort( (BYTE *)pPage ); - nPo <<= 9; // shift als LONG + nPo <<= 9; // shift als LONG if (nPo != pFkp->GetFilePos()) pFkp = 0; else @@ -2802,13 +2802,13 @@ WW8_FC WW8PLCFx_Fc_FKP::Where() if( nP != LONG_MAX ) return nP; - pFkp = 0; // FKP beendet -> hole neuen - return Where(); // am einfachsten rekursiv + pFkp = 0; // FKP beendet -> hole neuen + return Where(); // am einfachsten rekursiv } BYTE* WW8PLCFx_Fc_FKP::GetSprmsAndPos(WW8_FC& rStart, WW8_FC& rEnd, long& rLen) { - rLen = 0; // Default + rLen = 0; // Default rStart = rEnd = LONG_MAX; if( !pFkp ) // Fkp not there ? @@ -2981,9 +2981,9 @@ void WW8PLCFx_Cp_FKP::SetPCDIdx( ULONG nIdx ) bool WW8PLCFx_Cp_FKP::SeekPos(WW8_CP nCpPos) { - if( pPcd ) // Complex + if( pPcd ) // Complex { - if( !pPcd->SeekPos( nCpPos ) ) // Piece setzen + if( !pPcd->SeekPos( nCpPos ) ) // Piece setzen return false; if (pPCDAttrs && !pPCDAttrs->GetIter()->SeekPos(nCpPos)) return false; @@ -2997,8 +2997,8 @@ WW8_CP WW8PLCFx_Cp_FKP::Where() { WW8_FC nFc = WW8PLCFx_Fc_FKP::Where(); if( pPcd ) - return pPcd->AktPieceStartFc2Cp( nFc ); // Piece ermitteln - return rSBase.WW8Fc2Cp( nFc ); // KEINE Piece-Table !!! + return pPcd->AktPieceStartFc2Cp( nFc ); // Piece ermitteln + return rSBase.WW8Fc2Cp( nFc ); // KEINE Piece-Table !!! } void WW8PLCFx_Cp_FKP::GetSprms(WW8PLCFxDesc* p) @@ -3031,7 +3031,7 @@ void WW8PLCFx_Cp_FKP::GetSprms(WW8PLCFxDesc* p) return; } - if( pPcd ) // Piece-Table vorhanden !!! + if( pPcd ) // Piece-Table vorhanden !!! { // Init ( noch kein ++ gerufen ) if( (nAttrStart > nAttrEnd) || (nAttrStart == -1) ) @@ -3103,7 +3103,7 @@ void WW8PLCFx_Cp_FKP::GetSprms(WW8PLCFxDesc* p) If the FKP FC that was found was greater than the FC of the end of the piece, scan piece by piece toward the end of the document until a piece is found that - contains a paragraph end mark. + contains a paragraph end mark. */ /* @@ -3168,7 +3168,7 @@ void WW8PLCFx_Cp_FKP::GetSprms(WW8PLCFxDesc* p) p->bRealLineEnd = bLineEnd; } } - else // KEINE Piece-Table !!! + else // KEINE Piece-Table !!! { p->nStartPos = rSBase.WW8Fc2Cp( p->nStartPos ); p->nEndPos = rSBase.WW8Fc2Cp( p->nEndPos ); @@ -3183,13 +3183,13 @@ WW8PLCFx& WW8PLCFx_Cp_FKP::operator ++( int ) if ( !bComplex || !pPcd ) return *this; - if( GetPCDIdx() >= GetPCDIMax() ) // End of PLCF + if( GetPCDIdx() >= GetPCDIMax() ) // End of PLCF { nAttrStart = nAttrEnd = LONG_MAX; return *this; } - long nFkpLen; // Fkp-Eintrag + long nFkpLen; // Fkp-Eintrag // Fkp-Eintrag holen WW8PLCFx_Fc_FKP::GetSprmsAndPos(nAttrStart, nAttrEnd, nFkpLen); @@ -3210,7 +3210,7 @@ WW8PLCFx_SEPX::WW8PLCFx_SEPX(SvStream* pSt, SvStream* pTblSt, ? new WW8PLCF(pTblSt, rFib.fcPlcfsed, rFib.lcbPlcfsed, 12, nStartCp) : 0; - pSprms = new BYTE[nArrMax]; // maximum length + pSprms = new BYTE[nArrMax]; // maximum length } WW8PLCFx_SEPX::~WW8PLCFx_SEPX() @@ -3248,7 +3248,7 @@ void WW8PLCFx_SEPX::GetSprms(WW8PLCFxDesc* p) p->bRealLineEnd = false; if (!pPLCF->Get( p->nStartPos, p->nEndPos, pData )) { - p->nStartPos = p->nEndPos = LONG_MAX; // PLCF fertig abgearbeitet + p->nStartPos = p->nEndPos = LONG_MAX; // PLCF fertig abgearbeitet p->pMemPos = 0; p->nSprmsLen = 0; } @@ -3257,25 +3257,25 @@ void WW8PLCFx_SEPX::GetSprms(WW8PLCFxDesc* p) long nPo = SVBT32ToUInt32( (BYTE*)pData+2 ); if (nPo == -1L) { - p->nStartPos = p->nEndPos = LONG_MAX; // Sepx empty + p->nStartPos = p->nEndPos = LONG_MAX; // Sepx empty p->pMemPos = 0; p->nSprmsLen = 0; } else { pStrm->Seek( nPo ); - *pStrm >> nSprmSiz; // read len + *pStrm >> nSprmSiz; // read len if( nSprmSiz > nArrMax ) - { // passt nicht + { // passt nicht delete[] pSprms; - nArrMax = nSprmSiz; // Hole mehr Speicher + nArrMax = nSprmSiz; // Hole mehr Speicher pSprms = new BYTE[nArrMax]; } - pStrm->Read( pSprms, nSprmSiz ); // read Sprms + pStrm->Read( pSprms, nSprmSiz ); // read Sprms p->nSprmsLen = nSprmSiz; - p->pMemPos = pSprms; // return Position + p->pMemPos = pSprms; // return Position } } } @@ -3366,7 +3366,7 @@ const BYTE* WW8PLCFx_SEPX::HasSprm( USHORT nId, BYTE n2nd ) const pSp += x; } - return 0; // Sprm nicht gefunden + return 0; // Sprm nicht gefunden } //----------------------------------------- @@ -3424,7 +3424,7 @@ long WW8PLCFx_SubDoc::GetNoSprms( WW8_CP& rStart, long& rEnd, long& rLen ) if ( !pRef ) { - rStart = LONG_MAX; // Es gibt keine Noten + rStart = LONG_MAX; // Es gibt keine Noten rLen = 0; return -1; } @@ -3433,7 +3433,7 @@ long WW8PLCFx_SubDoc::GetNoSprms( WW8_CP& rStart, long& rEnd, long& rLen ) if (!pRef->Get( rStart, nE, pData )) { - rStart = LONG_MAX; // PLCF fertig abgearbeitet + rStart = LONG_MAX; // PLCF fertig abgearbeitet rLen = 0; return -1; } @@ -3441,7 +3441,7 @@ long WW8PLCFx_SubDoc::GetNoSprms( WW8_CP& rStart, long& rEnd, long& rLen ) if(!pTxt->Get( nSt, rLen, pData )) { - rStart = LONG_MAX; // PLCF fertig abgearbeitet + rStart = LONG_MAX; // PLCF fertig abgearbeitet rLen = 0; return -1; } @@ -3461,7 +3461,7 @@ WW8PLCFx& WW8PLCFx_SubDoc::operator ++( int ) } //----------------------------------------- -// Felder +// Felder //----------------------------------------- WW8PLCFx_FLD::WW8PLCFx_FLD( SvStream* pSt, const WW8Fib& rMyFib, short nType) @@ -3573,7 +3573,7 @@ void WW8PLCFx_FLD::GetSprms(WW8PLCFxDesc* p) if (!pPLCF) { - p->nStartPos = LONG_MAX; // Es gibt keine Felder + p->nStartPos = LONG_MAX; // Es gibt keine Felder return; } @@ -3581,18 +3581,18 @@ void WW8PLCFx_FLD::GetSprms(WW8PLCFxDesc* p) long nP; void *pData; - if (!pPLCF->Get(nP, pData)) // Ende des PLCFspecial ? + if (!pPLCF->Get(nP, pData)) // Ende des PLCFspecial ? { - p->nStartPos = LONG_MAX; // PLCF fertig abgearbeitet + p->nStartPos = LONG_MAX; // PLCF fertig abgearbeitet return; } p->nStartPos = nP; (*pPLCF)++; - if (!pPLCF->Get(nP, pData)) // Ende des PLCFspecial ? + if (!pPLCF->Get(nP, pData)) // Ende des PLCFspecial ? { - p->nStartPos = LONG_MAX; // PLCF fertig abgearbeitet + p->nStartPos = LONG_MAX; // PLCF fertig abgearbeitet return; } @@ -3625,7 +3625,7 @@ bool WW8PLCFx_FLD::GetPara(long nIdx, WW8FieldDesc& rF) } //----------------------------------------- -// class WW8PLCF_Book +// class WW8PLCF_Book //----------------------------------------- /* to be optimized like this: */ @@ -3637,7 +3637,7 @@ void WW8ReadSTTBF(bool bVer8, SvStream& rStrm, UINT32 nStart, INT32 nLen, rStrm.Seek( nStart ); UINT16 nLen2; - rStrm >> nLen2; // bVer67: total length of structure + rStrm >> nLen2; // bVer67: total length of structure // bVer8 : count of strings if( bVer8 ) @@ -3745,7 +3745,7 @@ WW8PLCFx_Book::WW8PLCFx_Book(SvStream* pTblSt, const WW8Fib& rFib) nIMax = aBookNames.size(); - if( pBook[0]->GetIMax() < nIMax ) // Count of Bookmarks + if( pBook[0]->GetIMax() < nIMax ) // Count of Bookmarks nIMax = pBook[0]->GetIMax(); if( pBook[1]->GetIMax() < nIMax ) nIMax = pBook[1]->GetIMax(); @@ -3782,7 +3782,7 @@ void WW8PLCFx_Book::SetIdx2( ULONG nI ) if( nIMax ) { pBook[1]->SetIdx( nI & 0x7fffffff ); - nIsEnd = (USHORT)( ( nI >> 31 ) & 1 ); // 0 oder 1 + nIsEnd = (USHORT)( ( nI >> 31 ) & 1 ); // 0 oder 1 } } @@ -3815,7 +3815,7 @@ long WW8PLCFx_Book::GetNoSprms( long& rStart, long& rEnd, long& rLen ) return -1; } - pBook[nIsEnd]->Get( rStart, pData ); // Pos. abfragen + pBook[nIsEnd]->Get( rStart, pData ); // Pos. abfragen return pBook[nIsEnd]->GetIdx(); } @@ -3975,7 +3975,7 @@ const String* WW8PLCFx_Book::GetName() const } //----------------------------------------- -// WW8PLCFMan +// WW8PLCFMan //----------------------------------------- #ifndef DUMP @@ -4002,7 +4002,7 @@ void WW8PLCFMan::AdjustEnds( WW8PLCFxDesc& rDesc ) if ( (&rDesc == pPap) && rDesc.bRealLineEnd ) { - if ( pPap->nEndPos != LONG_MAX ) // Para adjust + if ( pPap->nEndPos != LONG_MAX ) // Para adjust { nLineEnd = pPap->nEndPos;// nLineEnd zeigt *hinter* das <CR> pPap->nEndPos--; // Absatzende um 1 Zeichen verkuerzen @@ -4021,8 +4021,8 @@ void WW8PLCFMan::AdjustEnds( WW8PLCFxDesc& rDesc ) else if ( (&rDesc == pChp) || (&rDesc == pSep) ) { // Char Adjust oder Sep Adjust Wenn Ende Char-Attr == Absatzende ... - if( (rDesc.nEndPos == nLineEnd) && (rDesc.nEndPos > rDesc.nStartPos) ) - rDesc.nEndPos--; // ... dann um 1 Zeichen verkuerzen + if( (rDesc.nEndPos == nLineEnd) && (rDesc.nEndPos > rDesc.nStartPos) ) + rDesc.nEndPos--; // ... dann um 1 Zeichen verkuerzen } } @@ -4085,7 +4085,7 @@ USHORT WW8PLCFMan::GetId(const WW8PLCFxDesc* p) const else if (p->nSprmsLen > 0) nId = maSprmParser.GetSprmId(p->pMemPos); else - nId = 0; // Id = 0 for empty attributes + nId = 0; // Id = 0 for empty attributes return nId; } @@ -4143,7 +4143,7 @@ WW8PLCFMan::WW8PLCFMan(WW8ScannerBase* pBase, short nType, long nStartCp, pPap = &aD[5]; pSep = &aD[6]; // Dummy - pAnd = pFtn = pEdn = 0; // unbenutzt bei SpezText + pAnd = pFtn = pEdn = 0; // unbenutzt bei SpezText } pChp->pPLCFx = pBase->pChpPLCF; @@ -4157,7 +4157,7 @@ WW8PLCFMan::WW8PLCFMan(WW8ScannerBase* pBase, short nType, long nStartCp, pMagicTables = pBase->pMagicTables; - switch( nType ) // Feld-Initialisierung + switch( nType ) // Feld-Initialisierung { case MAN_HDFT: pFld->pPLCFx = pBase->pFldHdFtPLCF; @@ -4209,7 +4209,7 @@ WW8PLCFMan::WW8PLCFMan(WW8ScannerBase* pBase, short nType, long nStartCp, } if( nStartCp || nCpO ) - SeekPos( nStartCp ); // PLCFe auf Text-StartPos einstellen + SeekPos( nStartCp ); // PLCFe auf Text-StartPos einstellen // initialisieren der Member-Vars Low-Level GetChpPLCF()->ResetAttrStartEnd(); @@ -4264,7 +4264,7 @@ WW8PLCFMan::WW8PLCFMan(WW8ScannerBase* pBase, short nType, long nStartCp, GetNewSprms( *p ); } else - GetNewSprms( *p ); // bei allen PLCFen initialisiert sein + GetNewSprms( *p ); // bei allen PLCFen initialisiert sein } else if( p->pPLCFx ) GetNewNoSprms( *p ); @@ -4283,9 +4283,9 @@ WW8PLCFMan::~WW8PLCFMan() USHORT WW8PLCFMan::WhereIdx(bool* pbStart, long* pPos) const { OSL_ENSURE(nPLCF,"What the hell"); - long nNext = LONG_MAX; // SuchReihenfolge: + long nNext = LONG_MAX; // SuchReihenfolge: USHORT nNextIdx = nPLCF;// first ending found ( CHP, PAP, ( SEP ) ), - bool bStart = true; // dann Anfaenge finden ( ( SEP ), PAP, CHP ) + bool bStart = true; // dann Anfaenge finden ( ( SEP ), PAP, CHP ) USHORT i; const WW8PLCFxDesc* pD; for (i=0; i < nPLCF; i++) @@ -4293,7 +4293,7 @@ USHORT WW8PLCFMan::WhereIdx(bool* pbStart, long* pPos) const pD = &aD[i]; if (pD != pPcdA) { - if( (pD->nEndPos < nNext) && (pD->nStartPos == LONG_MAX) ) + if( (pD->nEndPos < nNext) && (pD->nStartPos == LONG_MAX) ) { // sonst ist Anfang = Ende nNext = pD->nEndPos; @@ -4402,7 +4402,7 @@ void WW8PLCFMan::GetSprmEnd( short nIdx, WW8PLCFManResult* pRes ) const const WW8PLCFxDesc* p = &aD[nIdx]; if (!(p->pIdStk->empty())) - pRes->nSprmId = p->pIdStk->top(); // get end position + pRes->nSprmId = p->pIdStk->top(); // get end position else { OSL_ENSURE( !this, "No Id on the Stack" ); @@ -4435,12 +4435,12 @@ void WW8PLCFMan::GetNoSprmStart( short nIdx, WW8PLCFManResult* pRes ) const GetSprmStart( nIdx+1, pRes ); } else - pRes->nSprmId = 0; // default: not found + pRes->nSprmId = 0; // default: not found } void WW8PLCFMan::GetNoSprmEnd( short nIdx, WW8PLCFManResult* pRes ) const { - pRes->nMemLen = -1; // Ende-Kennzeichen + pRes->nMemLen = -1; // Ende-Kennzeichen if( &aD[nIdx] == pBkm ) pRes->nSprmId = eBKN; @@ -4472,7 +4472,7 @@ bool WW8PLCFMan::TransferOpenSprms(std::stack<USHORT> &rStack) void WW8PLCFMan::AdvSprm(short nIdx, bool bStart) { - WW8PLCFxDesc* p = &aD[nIdx]; // Sprm-Klasse(!) ermitteln + WW8PLCFxDesc* p = &aD[nIdx]; // Sprm-Klasse(!) ermitteln p->bFirstSprm = false; if( bStart ) @@ -4481,7 +4481,7 @@ void WW8PLCFMan::AdvSprm(short nIdx, bool bStart) p->pIdStk->push(nLastId); // merke Id fuer Attribut-Ende if( p->nSprmsLen ) - { /* + { /* Pruefe, ob noch Sprm(s) abzuarbeiten sind */ if( p->pMemPos ) @@ -4506,7 +4506,7 @@ void WW8PLCFMan::AdvSprm(short nIdx, bool bStart) p->nSprmsLen = 0; } if (p->nSprmsLen < maSprmParser.MinSprmLen()) - p->nStartPos = LONG_MAX; // es folgen Enden + p->nStartPos = LONG_MAX; // es folgen Enden } else { @@ -4571,8 +4571,8 @@ void WW8PLCFMan::AdvSprm(short nIdx, bool bStart) } else { - (*p->pPLCFx)++; // next Group of Sprms - p->pMemPos = 0; // !!! + (*p->pPLCFx)++; // next Group of Sprms + p->pMemPos = 0; // !!! p->nSprmsLen = 0; GetNewSprms( *p ); } @@ -4631,7 +4631,7 @@ void WW8PLCFMan::AdvNoSprm(short nIdx, bool bStart) else { // NoSprm ohne Ende (*p->pPLCFx)++; - p->pMemPos = 0; // MemPos ungueltig + p->pMemPos = 0; // MemPos ungueltig p->nSprmsLen = 0; GetNewNoSprms( *p ); } @@ -4645,18 +4645,18 @@ WW8PLCFMan& WW8PLCFMan::operator ++(int) { WW8PLCFxDesc* p = &aD[nIdx]; - p->bFirstSprm = true; // Default + p->bFirstSprm = true; // Default if( p->pPLCFx->IsSprm() ) AdvSprm( nIdx, bStart ); - else // NoSprm + else // NoSprm AdvNoSprm( nIdx, bStart ); } return *this; } // Rueckgabe true fuer Anfang eines Attributes oder Fehler, -// false fuer Ende d. Attr +// false fuer Ende d. Attr // Restliche Rueckgabewerte werden in der vom Aufrufer zu stellenden Struktur // WW8PclxManResults geliefert. bool WW8PLCFMan::Get(WW8PLCFManResult* pRes) const @@ -4831,7 +4831,7 @@ WW8Fib::WW8Fib( SvStream& rSt, BYTE nWantedVersion,UINT32 nOffset ) { BYTE aBits1; BYTE aBits2; - BYTE aVer8Bits1; // nur ab WinWord 8 benutzt + BYTE aVer8Bits1; // nur ab WinWord 8 benutzt rSt.Seek( nOffset ); /* Wunsch-Nr vermerken, File-Versionsnummer ermitteln @@ -4849,22 +4849,22 @@ WW8Fib::WW8Fib( SvStream& rSt, BYTE nWantedVersion,UINT32 nOffset ) switch( nVersion ) { case 6: - nFibMin = 0x0065; // von 101 WinWord 6.0 + nFibMin = 0x0065; // von 101 WinWord 6.0 // 102 " // und 103 WinWord 6.0 fuer Macintosh // 104 " - nFibMax = 0x0069; // bis 105 WinWord 95 + nFibMax = 0x0069; // bis 105 WinWord 95 break; case 7: - nFibMin = 0x0069; // von 105 WinWord 95 - nFibMax = 0x0069; // bis 105 WinWord 95 + nFibMin = 0x0069; // von 105 WinWord 95 + nFibMax = 0x0069; // bis 105 WinWord 95 break; case 8: - nFibMin = 0x006A; // von 106 WinWord 97 - nFibMax = 0x00c1; // bis 193 WinWord 97 (?) + nFibMin = 0x006A; // von 106 WinWord 97 + nFibMax = 0x00c1; // bis 193 WinWord 97 (?) break; default: - nFibMin = 0; // Programm-Fehler! + nFibMin = 0; // Programm-Fehler! nFibMax = 0; nFib = 1; OSL_ENSURE( !this, "Es wurde vergessen, nVersion zu kodieren!" ); @@ -4872,7 +4872,7 @@ WW8Fib::WW8Fib( SvStream& rSt, BYTE nWantedVersion,UINT32 nOffset ) } if ( (nFib < nFibMin) || (nFib > nFibMax) ) { - nFibError = ERR_SWG_READ_ERROR; // Error melden + nFibError = ERR_SWG_READ_ERROR; // Error melden return; // und hopp raus! } } @@ -4896,7 +4896,7 @@ WW8Fib::WW8Fib( SvStream& rSt, BYTE nWantedVersion,UINT32 nOffset ) rSt >> lKey1; rSt >> lKey2; rSt >> envr; - rSt >> aVer8Bits1; // unter Ver67 nur leeres Reservefeld + rSt >> aVer8Bits1; // unter Ver67 nur leeres Reservefeld // Inhalt von aVer8Bits1 // // BYTE fMac :1; @@ -4924,15 +4924,15 @@ WW8Fib::WW8Fib( SvStream& rSt, BYTE nWantedVersion,UINT32 nOffset ) /* // dies sind die 9 unused Felder: - && (bVer67 || WW8ReadINT16( rSt, pnFbpChpFirst_W6 )) // 1 - && (bVer67 || WW8ReadINT16( rSt, pnChpFirst_W6 )) // 2 - && (bVer67 || WW8ReadINT16( rSt, cpnBteChp_W6 )) // 3 - && (bVer67 || WW8ReadINT16( rSt, pnFbpPapFirst_W6 )) // 4 - && (bVer67 || WW8ReadINT16( rSt, pnPapFirst_W6 )) // 5 - && (bVer67 || WW8ReadINT16( rSt, cpnBtePap_W6 )) // 6 - && (bVer67 || WW8ReadINT16( rSt, pnFbpLvcFirst_W6 )) // 7 - && (bVer67 || WW8ReadINT16( rSt, pnLvcFirst_W6 )) // 8 - && (bVer67 || WW8ReadINT16( rSt, cpnBteLvc_W6 )) // 9 + && (bVer67 || WW8ReadINT16( rSt, pnFbpChpFirst_W6 )) // 1 + && (bVer67 || WW8ReadINT16( rSt, pnChpFirst_W6 )) // 2 + && (bVer67 || WW8ReadINT16( rSt, cpnBteChp_W6 )) // 3 + && (bVer67 || WW8ReadINT16( rSt, pnFbpPapFirst_W6 )) // 4 + && (bVer67 || WW8ReadINT16( rSt, pnPapFirst_W6 )) // 5 + && (bVer67 || WW8ReadINT16( rSt, cpnBtePap_W6 )) // 6 + && (bVer67 || WW8ReadINT16( rSt, pnFbpLvcFirst_W6 )) // 7 + && (bVer67 || WW8ReadINT16( rSt, pnLvcFirst_W6 )) // 8 + && (bVer67 || WW8ReadINT16( rSt, cpnBteLvc_W6 )) // 9 */ rSt >> lidFE; rSt >> clw; @@ -5144,7 +5144,7 @@ WW8Fib::WW8Fib( SvStream& rSt, BYTE nWantedVersion,UINT32 nOffset ) } else if( bVer8 ) { - fMac = aVer8Bits1 & 0x01 ; + fMac = aVer8Bits1 & 0x01 ; fEmptySpecial = ( aVer8Bits1 & 0x02 ) >> 1; fLoadOverridePage = ( aVer8Bits1 & 0x04 ) >> 2; fFuturesavedUndo = ( aVer8Bits1 & 0x08 ) >> 3; @@ -5171,10 +5171,10 @@ WW8Fib::WW8Fib( SvStream& rSt, BYTE nWantedVersion,UINT32 nOffset ) nFibError = ERR_SWG_READ_ERROR; } - rSt.Seek( 0x372 ); // fcSttbListNames + rSt.Seek( 0x372 ); // fcSttbListNames rSt >> fcSttbListNames; rSt >> lcbSttbListNames; - rSt.Seek( 0x382 ); // MagicTables + rSt.Seek( 0x382 ); // MagicTables rSt >> fcMagicTable; rSt >> lcbMagicTable; if( 0 != rSt.GetError() ) @@ -5185,7 +5185,7 @@ WW8Fib::WW8Fib( SvStream& rSt, BYTE nWantedVersion,UINT32 nOffset ) } else { - nFibError = ERR_SWG_READ_ERROR; // Error melden + nFibError = ERR_SWG_READ_ERROR; // Error melden } } @@ -5202,16 +5202,16 @@ WW8Fib::WW8Fib(BYTE nVer) nFibBack = 0xbf; nProduct = 0x204D; - csw = 0x0e; // muss das sein ??? - cfclcb = 0x6c; // -""- - clw = 0x16; // -""- + csw = 0x0e; // muss das sein ??? + cfclcb = 0x6c; // -""- + clw = 0x16; // -""- pnFbpChpFirst = pnFbpPapFirst = pnFbpLvcFirst = 0x000fffff; fExtChar = true; fWord97Saved = fWord2000Saved = true; // diese Flags muessen nicht gesetzt werden; koennen aber. - // wMagicCreated = wMagicRevised = 0x6a62; - // wMagicCreatedPrivate = wMagicRevisedPrivate = 0xb3b2; + // wMagicCreated = wMagicRevised = 0x6a62; + // wMagicCreatedPrivate = wMagicRevisedPrivate = 0xb3b2; // wMagicCreated = 0x6143; @@ -5249,14 +5249,14 @@ bool WW8Fib::Write(SvStream& rStrm) Set_UInt16( pData, pnNext ); UINT16 nBits16 = 0; - if( fDot ) nBits16 |= 0x0001; - if( fGlsy) nBits16 |= 0x0002; - if( fComplex ) nBits16 |= 0x0004; - if( fHasPic ) nBits16 |= 0x0008; + if( fDot ) nBits16 |= 0x0001; + if( fGlsy) nBits16 |= 0x0002; + if( fComplex ) nBits16 |= 0x0004; + if( fHasPic ) nBits16 |= 0x0008; nBits16 |= (0xf0 & ( cQuickSaves << 4 )); - if( fEncrypted ) nBits16 |= 0x0100; - if( fWhichTblStm ) nBits16 |= 0x0200; - if( fExtChar ) nBits16 |= 0x1000; + if( fEncrypted ) nBits16 |= 0x0100; + if( fWhichTblStm ) nBits16 |= 0x0200; + if( fExtChar ) nBits16 |= 0x1000; Set_UInt16( pData, nBits16 ); Set_UInt16( pData, nFibBack ); @@ -5267,11 +5267,11 @@ bool WW8Fib::Write(SvStream& rStrm) BYTE nBits8 = 0; if( bVer8 ) { - if( fMac ) nBits8 |= 0x0001; - if( fEmptySpecial ) nBits8 |= 0x0002; - if( fLoadOverridePage ) nBits8 |= 0x0004; - if( fFuturesavedUndo ) nBits8 |= 0x0008; - if( fWord97Saved ) nBits8 |= 0x0010; + if( fMac ) nBits8 |= 0x0001; + if( fEmptySpecial ) nBits8 |= 0x0002; + if( fLoadOverridePage ) nBits8 |= 0x0004; + if( fFuturesavedUndo ) nBits8 |= 0x0008; + if( fWord97Saved ) nBits8 |= 0x0010; if( fWord2000Saved ) nBits8 |= 0x0020; } // unter Ver67 these are only reserved @@ -5477,7 +5477,7 @@ bool WW8Fib::Write(SvStream& rStrm) if( bVer8 ) { - pData += 0x2e2 - 0x27a; // Pos + Offset (fcPlcfLst - fcStwUser) + pData += 0x2e2 - 0x27a; // Pos + Offset (fcPlcfLst - fcStwUser) Set_UInt32( pData, fcPlcfLst ); Set_UInt32( pData, lcbPlcfLst ); Set_UInt32( pData, fcPlfLfo ); @@ -5487,7 +5487,7 @@ bool WW8Fib::Write(SvStream& rStrm) Set_UInt32( pData, fcPlcfHdrtxbxBkd ); Set_UInt32( pData, lcbPlcfHdrtxbxBkd ); - pData += 0x372 - 0x302; // Pos + Offset (fcSttbListNames - fcDocUndo) + pData += 0x372 - 0x302; // Pos + Offset (fcSttbListNames - fcDocUndo) Set_UInt32( pData, fcSttbListNames ); Set_UInt32( pData, lcbSttbListNames ); @@ -5525,12 +5525,12 @@ WW8Style::WW8Style(SvStream& rStream, WW8Fib& rFibPara) rSt.Seek(nStyleStart); - USHORT cbStshi = 0; // 2 bytes size of the following STSHI structure + USHORT cbStshi = 0; // 2 bytes size of the following STSHI structure // alte Version ? if (rFib.nFib < 67) - cbStshi = 4; // -> Laengenfeld fehlt - else // neue Version: + cbStshi = 4; // -> Laengenfeld fehlt + else // neue Version: // lies die Laenge der in der Datei gespeicherten Struktur rSt >> cbStshi; @@ -5571,7 +5571,7 @@ WW8Style::WW8Style(SvStream& rStream, WW8Fib& rFibPara) if( 18 < nRead ) rSt.SeekRel( nRead-18 ); } - while( !this ); // Trick: obiger Block wird genau einmal durchlaufen + while( !this ); // Trick: obiger Block wird genau einmal durchlaufen // und kann vorzeitig per "break" verlassen werden. if( 0 != rSt.GetError() ) @@ -5589,7 +5589,7 @@ WW8_STD* WW8Style::Read1STDFixed( short& rSkip, short* pcbStd ) WW8_STD* pStd = 0; UINT16 cbStd; - rSt >> cbStd; // lies Laenge + rSt >> cbStd; // lies Laenge UINT16 nRead = cbSTDBaseInFile; if( cbStd >= cbSTDBaseInFile ) @@ -5636,18 +5636,18 @@ WW8_STD* WW8Style::Read1STDFixed( short& rSkip, short* pcbStd ) if( 10 < nRead ) rSt.SeekRel( nRead-10 ); } - while( !this ); // Trick: obiger Block wird genau einmal durchlaufen + while( !this ); // Trick: obiger Block wird genau einmal durchlaufen // und kann vorzeitig per "break" verlassen werden. if( (0 != rSt.GetError()) || !nRead ) - DELETEZ( pStd ); // per NULL den Error melden + DELETEZ( pStd ); // per NULL den Error melden rSkip = cbStd - cbSTDBaseInFile; } else - { // Fixed part zu kurz + { // Fixed part zu kurz if( cbStd ) - rSt.SeekRel( cbStd ); // ueberlies Reste + rSt.SeekRel( cbStd ); // ueberlies Reste rSkip = 0; } if( pcbStd ) @@ -5660,11 +5660,11 @@ WW8_STD* WW8Style::Read1Style( short& rSkip, String* pString, short* pcbStd ) // Attention: MacWord-Documents have their Stylenames // always in ANSI, even if eStructCharSet == CHARSET_MAC !! - WW8_STD* pStd = Read1STDFixed( rSkip, pcbStd ); // lese STD + WW8_STD* pStd = Read1STDFixed( rSkip, pcbStd ); // lese STD // String gewuenscht ? if( pString ) - { // echter Style ? + { // echter Style ? if ( pStd ) { switch( rFib.nVersion ) @@ -5707,7 +5707,7 @@ WW8_STD* WW8Style::Read1Style( short& rSkip, String* pString, short* pcbStd ) } } else - *pString = aEmptyStr; // Kann keinen Namen liefern + *pString = aEmptyStr; // Kann keinen Namen liefern } return pStd; } @@ -5719,7 +5719,7 @@ WW8_STD* WW8Style::Read1Style( short& rSkip, String* pString, short* pcbStd ) struct WW8_FFN_Ver6 : public WW8_FFN_BASE { // ab Ver6 - sal_Char szFfn[65]; // 0x6 bzw. 0x40 ab Ver8 zero terminated string that + sal_Char szFfn[65]; // 0x6 bzw. 0x40 ab Ver8 zero terminated string that // records name of font. // Maximal size of szFfn is 65 characters. // Vorsicht: Dieses Array kann auch kleiner sein!!! @@ -5731,8 +5731,8 @@ struct WW8_FFN_Ver8 : public WW8_FFN_BASE { // ab Ver8 sind folgende beiden Felder eingeschoben, // werden von uns ignoriert. - sal_Char panose[ 10 ]; // 0x6 PANOSE - sal_Char fs[ 24 ]; // 0x10 FONTSIGNATURE + sal_Char panose[ 10 ]; // 0x6 PANOSE + sal_Char fs[ 24 ]; // 0x10 FONTSIGNATURE // ab Ver8 als Unicode UINT16 szFfn[65]; // 0x6 bzw. 0x40 ab Ver8 zero terminated string that @@ -5792,7 +5792,7 @@ WW8Fonts::WW8Fonts( SvStream& rSt, WW8Fib& rFib ) break; nMax++; nLeft -= nNextSiz; - if( nLeft < 1 ) // can we read the given ammount of bytes ? + if( nLeft < 1 ) // can we read the given ammount of bytes ? break; // increase p by nNextSiz Bytes p = (WW8_FFN *)( ( (BYTE*)p ) + nNextSiz ); @@ -5831,12 +5831,12 @@ WW8Fonts::WW8Fonts( SvStream& rSt, WW8Fib& rFib ) if ((eEnc == RTL_TEXTENCODING_SYMBOL) || (eEnc == RTL_TEXTENCODING_DONTKNOW)) eEnc = RTL_TEXTENCODING_MS_1252; p->sFontname = String(pVer6->szFfn, eEnc); -// p->sFontname = String(pVer6->szFfn, RTL_TEXTENCODING_MS_1252); +// p->sFontname = String(pVer6->szFfn, RTL_TEXTENCODING_MS_1252); if (p->ibszAlt) { p->sFontname.Append(';'); p->sFontname += String(pVer6->szFfn+p->ibszAlt, eEnc); -// RTL_TEXTENCODING_MS_1252 ); +// RTL_TEXTENCODING_MS_1252 ); } pVer6 = (WW8_FFN_Ver6*)( ((BYTE*)pVer6) + pVer6->cbFfnM1 + 1 ); } @@ -5848,7 +5848,7 @@ WW8Fonts::WW8Fonts( SvStream& rSt, WW8Fib& rFib ) for(USHORT i=0; i<nMax; ++i, ++p) { p->cbFfnM1 = pVer8->cbFfnM1; - c2 = *(((BYTE*)pVer8) + 1); + c2 = *(((BYTE*)pVer8) + 1); p->prg = c2 & 0x02; p->fTrueType = (c2 & 0x04) >> 2; @@ -5904,11 +5904,11 @@ const WW8_FFN* WW8Fonts::GetFont( USHORT nNum ) const // 1) Am Anfang des Einlesens muss WWPLCF_HdFt mit Fib und Dop konstruiert werden // 2) Der Haupttext muss sequentiell ueber alle Sections gelesen werden // 3) Fuer jedes vorkommende Header / Footer - Attribut des Haupttextes -// ( Darf pro Section maximal eins sein ) muss UpdateIndex() genau einmal +// ( Darf pro Section maximal eins sein ) muss UpdateIndex() genau einmal // mit dem Parameter des Attributes gerufen werden. Dieser Aufruf muss *nach* // dem letzten Aufruf von GetTextPos() passieren. // 4) GetTextPos() darf mit genau einem der obenstehen WW_... aufgerufen werden -// ( nicht verodern ! ) +// ( nicht verodern ! ) // -> dann liefert GetTextPos() vielleicht auch ein richtiges Ergebnis WW8PLCF_HdFt::WW8PLCF_HdFt( SvStream* pSt, WW8Fib& rFib, WW8Dop& rDop ) @@ -5929,7 +5929,7 @@ WW8PLCF_HdFt::WW8PLCF_HdFt( SvStream* pSt, WW8Fib& rFib, WW8Dop& rDop ) footers in this PLCF, UpdateIndex does that task. */ for( BYTE nI = 0x1; nI <= 0x20; nI <<= 1 ) - if( nI & rDop.grpfIhdt ) // Bit gesetzt ? + if( nI & rDop.grpfIhdt ) // Bit gesetzt ? nIdxOffset++; nTextOfs = rFib.ccpText + rFib.ccpFtn; // Groesse des Haupttextes @@ -5944,18 +5944,18 @@ bool WW8PLCF_HdFt::GetTextPos(BYTE grpfIhdt, BYTE nWhich, WW8_CP& rStart, while (true) { if( nI & nWhich ) - break; // found + break; // found if( grpfIhdt & nI ) - nIdx++; // uninteresting Header / Footer - nI <<= 1; // text next bit + nIdx++; // uninteresting Header / Footer + nI <<= 1; // text next bit if( nI > 0x20 ) - return false; // not found + return false; // not found } // nIdx ist HdFt-Index WW8_CP nEnd; void* pData; - aPLCF.SetIdx( nIdx ); // Lookup suitable CP + aPLCF.SetIdx( nIdx ); // Lookup suitable CP aPLCF.Get( rStart, nEnd, pData ); rLen = nEnd - rStart; aPLCF++; @@ -5968,7 +5968,7 @@ bool WW8PLCF_HdFt::GetTextPosExact(short nIdx, WW8_CP& rStart, long& rLen) WW8_CP nEnd; void* pData; - aPLCF.SetIdx( nIdx ); // Lookup suitable CP + aPLCF.SetIdx( nIdx ); // Lookup suitable CP aPLCF.Get( rStart, nEnd, pData ); rLen = nEnd - rStart; return true; @@ -5983,7 +5983,7 @@ void WW8PLCF_HdFt::UpdateIndex( BYTE grpfIhdt ) } //----------------------------------------- -// WW8Dop +// WW8Dop //----------------------------------------- WW8Dop::WW8Dop( SvStream& rSt, INT16 nFib, INT32 nPos, INT32 nSize ) @@ -5995,8 +5995,8 @@ WW8Dop::WW8Dop( SvStream& rSt, INT16 nFib, INT32 nPos, INT32 nSize ) rSt.Seek( nPos ); if( 2 > nSize || nRead != rSt.Read( pData, nRead )) { - memset( &nDataStart, 0, (&nDataEnd - &nDataStart) ); - nDopError = ERR_SWG_READ_ERROR; // Error melden + memset( &nDataStart, 0, (&nDataEnd - &nDataStart) ); + nDopError = ERR_SWG_READ_ERROR; // Error melden } else { @@ -6118,23 +6118,23 @@ WW8Dop::WW8Dop( SvStream& rSt, INT16 nFib, INT32 nPos, INT32 nSize ) if( nFib >= 103 ) { a32Bit = Get_ULong( pData ); - fNoTabForInd = ( a32Bit & 0x00000001 ) ; - fNoSpaceRaiseLower = ( a32Bit & 0x00000002 ) >> 1 ; - fSupressSpbfAfterPageBreak = ( a32Bit & 0x00000004 ) >> 2 ; - fWrapTrailSpaces = ( a32Bit & 0x00000008 ) >> 3 ; - fMapPrintTextColor = ( a32Bit & 0x00000010 ) >> 4 ; - fNoColumnBalance = ( a32Bit & 0x00000020 ) >> 5 ; - fConvMailMergeEsc = ( a32Bit & 0x00000040 ) >> 6 ; - fSupressTopSpacing = ( a32Bit & 0x00000080 ) >> 7 ; - fOrigWordTableRules = ( a32Bit & 0x00000100 ) >> 8 ; - fTransparentMetafiles = ( a32Bit & 0x00000200 ) >> 9 ; - fShowBreaksInFrames = ( a32Bit & 0x00000400 ) >> 10 ; - fSwapBordersFacingPgs = ( a32Bit & 0x00000800 ) >> 11 ; - fSuppressTopSpacingMac5 = ( a32Bit & 0x00010000 ) >> 16 ; - fTruncDxaExpand = ( a32Bit & 0x00020000 ) >> 17 ; - fPrintBodyBeforeHdr = ( a32Bit & 0x00040000 ) >> 18 ; - fNoLeading = ( a32Bit & 0x00080000 ) >> 19 ; - fMWSmallCaps = ( a32Bit & 0x00200000 ) >> 21 ; + fNoTabForInd = ( a32Bit & 0x00000001 ) ; + fNoSpaceRaiseLower = ( a32Bit & 0x00000002 ) >> 1 ; + fSupressSpbfAfterPageBreak = ( a32Bit & 0x00000004 ) >> 2 ; + fWrapTrailSpaces = ( a32Bit & 0x00000008 ) >> 3 ; + fMapPrintTextColor = ( a32Bit & 0x00000010 ) >> 4 ; + fNoColumnBalance = ( a32Bit & 0x00000020 ) >> 5 ; + fConvMailMergeEsc = ( a32Bit & 0x00000040 ) >> 6 ; + fSupressTopSpacing = ( a32Bit & 0x00000080 ) >> 7 ; + fOrigWordTableRules = ( a32Bit & 0x00000100 ) >> 8 ; + fTransparentMetafiles = ( a32Bit & 0x00000200 ) >> 9 ; + fShowBreaksInFrames = ( a32Bit & 0x00000400 ) >> 10 ; + fSwapBordersFacingPgs = ( a32Bit & 0x00000800 ) >> 11 ; + fSuppressTopSpacingMac5 = ( a32Bit & 0x00010000 ) >> 16 ; + fTruncDxaExpand = ( a32Bit & 0x00020000 ) >> 17 ; + fPrintBodyBeforeHdr = ( a32Bit & 0x00040000 ) >> 18 ; + fNoLeading = ( a32Bit & 0x00080000 ) >> 19 ; + fMWSmallCaps = ( a32Bit & 0x00200000 ) >> 21 ; fUsePrinterMetrics = ( a32Bit & 0x80000000 ) >> 31 ; } @@ -6153,16 +6153,16 @@ WW8Dop::WW8Dop( SvStream& rSt, INT16 nFib, INT32 nPos, INT32 nSize ) a16Bit = Get_UShort( pData ); // die untersten 9 Bit sind uninteressant - fHtmlDoc = ( a16Bit & 0x0200 ) >> 9 ; - fSnapBorder = ( a16Bit & 0x0800 ) >> 11 ; - fIncludeHeader = ( a16Bit & 0x1000 ) >> 12 ; - fIncludeFooter = ( a16Bit & 0x2000 ) >> 13 ; - fForcePageSizePag = ( a16Bit & 0x4000 ) >> 14 ; - fMinFontSizePag = ( a16Bit & 0x8000 ) >> 15 ; + fHtmlDoc = ( a16Bit & 0x0200 ) >> 9 ; + fSnapBorder = ( a16Bit & 0x0800 ) >> 11 ; + fIncludeHeader = ( a16Bit & 0x1000 ) >> 12 ; + fIncludeFooter = ( a16Bit & 0x2000 ) >> 13 ; + fForcePageSizePag = ( a16Bit & 0x4000 ) >> 14 ; + fMinFontSizePag = ( a16Bit & 0x8000 ) >> 15 ; a16Bit = Get_UShort( pData ); - fHaveVersions = 0 != ( a16Bit & 0x0001 ); - fAutoVersion = 0 != ( a16Bit & 0x0002 ); + fHaveVersions = 0 != ( a16Bit & 0x0001 ); + fAutoVersion = 0 != ( a16Bit & 0x0002 ); pData += 12; @@ -6189,7 +6189,7 @@ WW8Dop::WW8Dop( SvStream& rSt, INT16 nFib, INT32 nPos, INT32 nSize ) WW8Dop::WW8Dop() { // first set everything to a default of 0 - memset( &nDataStart, 0, (&nDataEnd - &nDataStart) ); + memset( &nDataStart, 0, (&nDataEnd - &nDataStart) ); fWidowControl = 1; fpc = 1; @@ -6240,23 +6240,23 @@ WW8Dop::WW8Dop() UINT32 WW8Dop::GetCompatabilityOptions() const { UINT32 a32Bit = 0; - if (fNoTabForInd) a32Bit |= 0x00000001; - if (fNoSpaceRaiseLower) a32Bit |= 0x00000002; - if (fSupressSpbfAfterPageBreak) a32Bit |= 0x00000004; - if (fWrapTrailSpaces) a32Bit |= 0x00000008; - if (fMapPrintTextColor) a32Bit |= 0x00000010; - if (fNoColumnBalance) a32Bit |= 0x00000020; - if (fConvMailMergeEsc) a32Bit |= 0x00000040; - if (fSupressTopSpacing) a32Bit |= 0x00000080; - if (fOrigWordTableRules) a32Bit |= 0x00000100; - if (fTransparentMetafiles) a32Bit |= 0x00000200; - if (fShowBreaksInFrames) a32Bit |= 0x00000400; - if (fSwapBordersFacingPgs) a32Bit |= 0x00000800; - if (fSuppressTopSpacingMac5) a32Bit |= 0x00010000; - if (fTruncDxaExpand) a32Bit |= 0x00020000; - if (fPrintBodyBeforeHdr) a32Bit |= 0x00040000; - if (fNoLeading) a32Bit |= 0x00080000; - if (fMWSmallCaps) a32Bit |= 0x00200000; + if (fNoTabForInd) a32Bit |= 0x00000001; + if (fNoSpaceRaiseLower) a32Bit |= 0x00000002; + if (fSupressSpbfAfterPageBreak) a32Bit |= 0x00000004; + if (fWrapTrailSpaces) a32Bit |= 0x00000008; + if (fMapPrintTextColor) a32Bit |= 0x00000010; + if (fNoColumnBalance) a32Bit |= 0x00000020; + if (fConvMailMergeEsc) a32Bit |= 0x00000040; + if (fSupressTopSpacing) a32Bit |= 0x00000080; + if (fOrigWordTableRules) a32Bit |= 0x00000100; + if (fTransparentMetafiles) a32Bit |= 0x00000200; + if (fShowBreaksInFrames) a32Bit |= 0x00000400; + if (fSwapBordersFacingPgs) a32Bit |= 0x00000800; + if (fSuppressTopSpacingMac5) a32Bit |= 0x00010000; + if (fTruncDxaExpand) a32Bit |= 0x00020000; + if (fPrintBodyBeforeHdr) a32Bit |= 0x00040000; + if (fNoLeading) a32Bit |= 0x00080000; + if (fMWSmallCaps) a32Bit |= 0x00200000; if (fUsePrinterMetrics) a32Bit |= 0x80000000; return a32Bit; } @@ -6297,55 +6297,55 @@ bool WW8Dop::Write(SvStream& rStrm, WW8Fib& rFib) const Set_UInt8( pData, a8Bit ); a8Bit = 0; - if( fOnlyMacPics ) a8Bit |= 0x01; - if( fOnlyWinPics ) a8Bit |= 0x02; - if( fLabelDoc ) a8Bit |= 0x04; - if( fHyphCapitals ) a8Bit |= 0x08; - if( fAutoHyphen ) a8Bit |= 0x10; - if( fFormNoFields ) a8Bit |= 0x20; - if( fLinkStyles ) a8Bit |= 0x40; - if( fRevMarking ) a8Bit |= 0x80; + if( fOnlyMacPics ) a8Bit |= 0x01; + if( fOnlyWinPics ) a8Bit |= 0x02; + if( fLabelDoc ) a8Bit |= 0x04; + if( fHyphCapitals ) a8Bit |= 0x08; + if( fAutoHyphen ) a8Bit |= 0x10; + if( fFormNoFields ) a8Bit |= 0x20; + if( fLinkStyles ) a8Bit |= 0x40; + if( fRevMarking ) a8Bit |= 0x80; Set_UInt8( pData, a8Bit ); a8Bit = 0; - if( fBackup ) a8Bit |= 0x01; - if( fExactCWords ) a8Bit |= 0x02; - if( fPagHidden ) a8Bit |= 0x04; - if( fPagResults ) a8Bit |= 0x08; - if( fLockAtn ) a8Bit |= 0x10; - if( fMirrorMargins ) a8Bit |= 0x20; - if( fReadOnlyRecommended ) a8Bit |= 0x40; - if( fDfltTrueType ) a8Bit |= 0x80; + if( fBackup ) a8Bit |= 0x01; + if( fExactCWords ) a8Bit |= 0x02; + if( fPagHidden ) a8Bit |= 0x04; + if( fPagResults ) a8Bit |= 0x08; + if( fLockAtn ) a8Bit |= 0x10; + if( fMirrorMargins ) a8Bit |= 0x20; + if( fReadOnlyRecommended ) a8Bit |= 0x40; + if( fDfltTrueType ) a8Bit |= 0x80; Set_UInt8( pData, a8Bit ); a8Bit = 0; - if( fPagSuppressTopSpacing ) a8Bit |= 0x01; - if( fProtEnabled ) a8Bit |= 0x02; - if( fDispFormFldSel ) a8Bit |= 0x04; - if( fRMView ) a8Bit |= 0x08; - if( fRMPrint ) a8Bit |= 0x10; - if( fWriteReservation ) a8Bit |= 0x20; - if( fLockRev ) a8Bit |= 0x40; - if( fEmbedFonts ) a8Bit |= 0x80; + if( fPagSuppressTopSpacing ) a8Bit |= 0x01; + if( fProtEnabled ) a8Bit |= 0x02; + if( fDispFormFldSel ) a8Bit |= 0x04; + if( fRMView ) a8Bit |= 0x08; + if( fRMPrint ) a8Bit |= 0x10; + if( fWriteReservation ) a8Bit |= 0x20; + if( fLockRev ) a8Bit |= 0x40; + if( fEmbedFonts ) a8Bit |= 0x80; Set_UInt8( pData, a8Bit ); a8Bit = 0; - if( copts_fNoTabForInd ) a8Bit |= 0x01; - if( copts_fNoSpaceRaiseLower ) a8Bit |= 0x02; - if( copts_fSupressSpbfAfterPgBrk ) a8Bit |= 0x04; - if( copts_fWrapTrailSpaces ) a8Bit |= 0x08; - if( copts_fMapPrintTextColor ) a8Bit |= 0x10; - if( copts_fNoColumnBalance ) a8Bit |= 0x20; - if( copts_fConvMailMergeEsc ) a8Bit |= 0x40; - if( copts_fSupressTopSpacing ) a8Bit |= 0x80; + if( copts_fNoTabForInd ) a8Bit |= 0x01; + if( copts_fNoSpaceRaiseLower ) a8Bit |= 0x02; + if( copts_fSupressSpbfAfterPgBrk ) a8Bit |= 0x04; + if( copts_fWrapTrailSpaces ) a8Bit |= 0x08; + if( copts_fMapPrintTextColor ) a8Bit |= 0x10; + if( copts_fNoColumnBalance ) a8Bit |= 0x20; + if( copts_fConvMailMergeEsc ) a8Bit |= 0x40; + if( copts_fSupressTopSpacing ) a8Bit |= 0x80; Set_UInt8( pData, a8Bit ); a8Bit = 0; - if( copts_fOrigWordTableRules ) a8Bit |= 0x01; - if( copts_fTransparentMetafiles ) a8Bit |= 0x02; - if( copts_fShowBreaksInFrames ) a8Bit |= 0x04; - if( copts_fSwapBordersFacingPgs ) a8Bit |= 0x08; + if( copts_fOrigWordTableRules ) a8Bit |= 0x01; + if( copts_fTransparentMetafiles ) a8Bit |= 0x02; + if( copts_fShowBreaksInFrames ) a8Bit |= 0x04; + if( copts_fSwapBordersFacingPgs ) a8Bit |= 0x08; Set_UInt8( pData, a8Bit ); Set_UInt16( pData, dxaTab ); @@ -6372,10 +6372,10 @@ bool WW8Dop::Write(SvStream& rStrm, WW8Fib& rFib) const a16Bit |= (0x0003 & epc ); a16Bit |= (0x003c & (nfcFtnRef << 2)); a16Bit |= (0x03c0 & (nfcEdnRef << 6)); - if( fPrintFormData ) a16Bit |= 0x0400; - if( fSaveFormData ) a16Bit |= 0x0800; - if( fShadeFormData ) a16Bit |= 0x1000; - if( fWCFtnEdn ) a16Bit |= 0x8000; + if( fPrintFormData ) a16Bit |= 0x0400; + if( fSaveFormData ) a16Bit |= 0x0800; + if( fShadeFormData ) a16Bit |= 0x1000; + if( fWCFtnEdn ) a16Bit |= 0x8000; Set_UInt16( pData, a16Bit ); Set_UInt32( pData, cLines ); @@ -6387,7 +6387,7 @@ bool WW8Dop::Write(SvStream& rStrm, WW8Fib& rFib) const Set_UInt32( pData, lKeyProtDoc ); a16Bit = 0; - if (wvkSaved) + if (wvkSaved) a16Bit |= 0x0007; a16Bit |= (0x0ff8 & (wScaleSaved << 3)); a16Bit |= (0x3000 & (zkSaved << 12)); @@ -6404,18 +6404,18 @@ bool WW8Dop::Write(SvStream& rStrm, WW8Fib& rFib) const memcpy( pData, &dogrid, sizeof( WW8_DOGRID )); pData += sizeof( WW8_DOGRID ); - a16Bit = 0x12; // lvl auf 9 setzen - if( fHtmlDoc ) a16Bit |= 0x0200; - if( fSnapBorder ) a16Bit |= 0x0800; - if( fIncludeHeader ) a16Bit |= 0x1000; - if( fIncludeFooter ) a16Bit |= 0x2000; - if( fForcePageSizePag ) a16Bit |= 0x4000; - if( fMinFontSizePag ) a16Bit |= 0x8000; + a16Bit = 0x12; // lvl auf 9 setzen + if( fHtmlDoc ) a16Bit |= 0x0200; + if( fSnapBorder ) a16Bit |= 0x0800; + if( fIncludeHeader ) a16Bit |= 0x1000; + if( fIncludeFooter ) a16Bit |= 0x2000; + if( fForcePageSizePag ) a16Bit |= 0x4000; + if( fMinFontSizePag ) a16Bit |= 0x8000; Set_UInt16( pData, a16Bit ); a16Bit = 0; - if( fHaveVersions ) a16Bit |= 0x0001; - if( fAutoVersion ) a16Bit |= 0x0002; + if( fHaveVersions ) a16Bit |= 0x0001; + if( fAutoVersion ) a16Bit |= 0x0002; Set_UInt16( pData, a16Bit ); pData += 12; @@ -6435,7 +6435,7 @@ bool WW8Dop::Write(SvStream& rStrm, WW8Fib& rFib) const Set_UInt16( pData, nfcEdnRef ); Set_UInt16( pData, hpsZoonFontPag ); Set_UInt16( pData, dywDispPag ); - + //500 -> 508, Appear to be repeated here in 2000+ pData += 8; Set_UInt32(pData, GetCompatabilityOptions()); @@ -6503,16 +6503,16 @@ USHORT WW8DopTypography::GetConvertedLang() const */ switch(reserved1 & 0xE) { - case 2: //Japan + case 2: //Japan nLang = LANGUAGE_JAPANESE; break; - case 4: //Chinese (Peoples Republic) + case 4: //Chinese (Peoples Republic) nLang = LANGUAGE_CHINESE_SIMPLIFIED; break; - case 6: //Korean + case 6: //Korean nLang = LANGUAGE_KOREAN; break; - case 8: //Chinese (Taiwan) + case 8: //Chinese (Taiwan) nLang = LANGUAGE_CHINESE_TRADITIONAL; break; default: @@ -6530,9 +6530,9 @@ USHORT WW8DopTypography::GetConvertedLang() const } //----------------------------------------- -// Sprms +// Sprms //----------------------------------------- -USHORT wwSprmParser::GetSprmTailLen(sal_uInt16 nId, const sal_uInt8* pSprm) +USHORT wwSprmParser::GetSprmTailLen(sal_uInt16 nId, const sal_uInt8* pSprm) const { SprmInfo aSprm = GetSprmInfo(nId); @@ -6610,16 +6610,16 @@ USHORT wwSprmParser::GetSprmId(const sal_uInt8* pSp) const ASSERT_RET_ON_FAIL(pSp, "Why GetSprmId with pSp of 0", 0); USHORT nId = 0; - switch (mnVersion) // 6 stands for "6 OR 7", 7 stands for "ONLY 7" + switch (mnVersion) // 6 stands for "6 OR 7", 7 stands for "ONLY 7" { case 6: - case 7: + case 7: nId = *pSp; - if (0x0100 < nId) + if (0x0100 < nId) nId = 0; break; default: - case 8: + case 8: nId = SVBT16ToShort(pSp); if (0x0800 > nId) nId = 0; @@ -6655,8 +6655,8 @@ SEPr::SEPr() : xaPage(12242), yaPage(15842), xaPageNUp(12242), yaPageNUp(15842), dxaLeft(1800), dxaRight(1800), dyaTop(1440), dyaBottom(1440), dzaGutter(0), dyaHdrTop(720), dyaHdrBottom(720), ccolM1(0), fEvenlySpaced(1), - reserved3(0), fBiDi(0), fFacingCol(0), fRTLGutter(0), fRTLAlignment(0), - dxaColumns(720), dxaColumnWidth(0), dmOrientFirst(0), fLayout(0), + reserved3(0), fBiDi(0), fFacingCol(0), fRTLGutter(0), fRTLAlignment(0), + dxaColumns(720), dxaColumnWidth(0), dmOrientFirst(0), fLayout(0), reserved4(0) { memset(rgdxaColumnWidthSpacing, 0, sizeof(rgdxaColumnWidthSpacing)); diff --git a/sw/source/filter/ww8/dump/ww8scan.hxx b/sw/source/filter/ww8/dump/ww8scan.hxx index f27ae65cdf89..403dcf412783 100644 --- a/sw/source/filter/ww8/dump/ww8scan.hxx +++ b/sw/source/filter/ww8/dump/ww8scan.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,7 +34,7 @@ #include <limits.h> #endif #include <sal/types.h> -#include <tools/solar.h> // UINTXX +#include <tools/solar.h> // UINTXX #include <tools/table.hxx> #include <tools/datetime.hxx> #include <tools/stream.hxx> @@ -44,7 +44,7 @@ #define _SVSTDARR_STRINGS #include <svl/svstdarr.hxx> -#include <ww8struc.hxx> // FIB, STSHI, STD +#include <ww8struc.hxx> // FIB, STSHI, STD #include <ww8scan.hxx> @@ -85,7 +85,7 @@ String WW8Read_xstz(SvStream& rStrm, // attention: the *extra data* of each string are SKIPPED and ignored /* to be optimized like this: */ -void WW8ReadSTTBF( BOOL bVer8, SvStream& rStrm, +void WW8ReadSTTBF( BOOL bVer8, SvStream& rStrm, UINT32 nStart, INT32 nLen, USHORT nSkip, rtl_TextEncoding eCS, SvStrings &rArray, SvStrings* pExtraArray = 0 ); @@ -99,15 +99,15 @@ BYTE WW8SprmDataOfs( USHORT nId ); struct WW8FieldDesc { - long nLen; // Gesamtlaenge ( zum Text ueberlesen ) + long nLen; // Gesamtlaenge ( zum Text ueberlesen ) WW8_CP nSCode; // Anfang Befehlscode - long nLCode; // Laenge - WW8_CP nSRes; // Anfang Ergebnis - long nLRes; // Laenge ( == 0, falls kein Ergebnis ) - USHORT nId; // WW-Id fuer Felder - BYTE nOpt; // WW-Flags ( z.B.: vom User geaendert ) - BOOL bCodeNest:1; // Befehl rekursiv verwendet - BOOL bResNest:1; // Befehl in Resultat eingefuegt + long nLCode; // Laenge + WW8_CP nSRes; // Anfang Ergebnis + long nLRes; // Laenge ( == 0, falls kein Ergebnis ) + USHORT nId; // WW-Id fuer Felder + BYTE nOpt; // WW-Flags ( z.B.: vom User geaendert ) + BOOL bCodeNest:1; // Befehl rekursiv verwendet + BOOL bResNest:1; // Befehl in Resultat eingefuegt }; BOOL WW8GetFieldPara( BYTE nVersion, WW8PLCFspecial& rPLCF, WW8FieldDesc& rF ); @@ -116,7 +116,7 @@ BOOL WW8GetFieldPara( BYTE nVersion, WW8PLCFspecial& rPLCF, WW8FieldDesc& rF ); struct WW8PLCFxSave1 { ULONG nPLCFxPos; - ULONG nPLCFxPos2; // fuer PLCF_Cp_Fkp: PieceIter-Pos + ULONG nPLCFxPos2; // fuer PLCF_Cp_Fkp: PieceIter-Pos long nPLCFxMemOfs; WW8_CP nAttrStart; WW8_CP nAttrEnd; @@ -128,12 +128,12 @@ struct WW8PLCFxSave1 u.a. fuer Felder, also genausoviele Attr wie Positionen, falls Ctor-Param bNoEnd = false */ -class WW8PLCFspecial // Iterator fuer PLCFs +class WW8PLCFspecial // Iterator fuer PLCFs { - INT32* pPLCF_PosArray; // Pointer auf Pos-Array und auf ganze Struktur - BYTE* pPLCF_Contents; // Pointer auf Inhalts-Array-Teil des Pos-Array - long nIMax; // Anzahl der Elemente - long nIdx; // Merker, wo wir gerade sind + INT32* pPLCF_PosArray; // Pointer auf Pos-Array und auf ganze Struktur + BYTE* pPLCF_Contents; // Pointer auf Inhalts-Array-Teil des Pos-Array + long nIMax; // Anzahl der Elemente + long nIdx; // Merker, wo wir gerade sind long nStru; public: @@ -141,9 +141,9 @@ public: long nStruct, long nStartPos = -1, BOOL bNoEnd = FALSE ); ~WW8PLCFspecial(){ delete( pPLCF_PosArray ); pPLCF_PosArray = 0; } ULONG GetIdx() const { return (ULONG)nIdx; } - void SetIdx( ULONG nI ) { nIdx = (long)nI; } // geht ueber Nummer + void SetIdx( ULONG nI ) { nIdx = (long)nI; } // geht ueber Nummer long GetIMax(){ return nIMax; } - BOOL SeekPos( long nPos ); // geht ueber FC- bzw. CP-Wert + BOOL SeekPos( long nPos ); // geht ueber FC- bzw. CP-Wert // bzw. naechste groesseren Wert BOOL SeekPosExact( long nPos ); long Where() { return ( nIdx >= nIMax ) ? LONG_MAX : pPLCF_PosArray[nIdx]; } @@ -168,15 +168,15 @@ public: class WW8SprmIter { // these members will be updated - BYTE* pSprms; // remaining part of the SPRMs ( == start of akt. SPRM) - BYTE* pAktParams; // start of akt. SPRM's parameters + BYTE* pSprms; // remaining part of the SPRMs ( == start of akt. SPRM) + BYTE* pAktParams; // start of akt. SPRM's parameters USHORT nAktId; short nAktSizeBrutto; // these members will *not* be updated by UpdateMyMembers() BYTE nVersion; BYTE nDelta; - short nRemLen; // length of remaining SPRMs (including akt. SPRM) + short nRemLen; // length of remaining SPRMs (including akt. SPRM) void UpdateMyMembers(); public: @@ -195,11 +195,11 @@ public: /* u.a. fuer FKPs auf normale Attr., also ein Attr weniger als Positionen */ -class WW8PLCF // Iterator fuer PLCFs +class WW8PLCF // Iterator fuer PLCFs { - INT32* pPLCF_PosArray; // Pointer auf Pos-Array und auf ganze Struktur - BYTE* pPLCF_Contents; // Pointer auf Inhalts-Array-Teil des Pos-Array - long nIMax; // Anzahl der Elemente + INT32* pPLCF_PosArray; // Pointer auf Pos-Array und auf ganze Struktur + BYTE* pPLCF_Contents; // Pointer auf Inhalts-Array-Teil des Pos-Array + long nIMax; // Anzahl der Elemente long nIdx; long nStru; @@ -245,8 +245,8 @@ class WW8PLCFpcd { friend class WW8PLCFpcd_Iter; WW8Pcd_FC_sortArr aFC_sort; // sorted PCD entries by FC - INT32* pPLCF_PosArray; // Pointer auf Pos-Array und auf ganze Struktur - BYTE* pPLCF_Contents; // Pointer auf Inhalts-Array-Teil des Pos-Array + INT32* pPLCF_PosArray; // Pointer auf Pos-Array und auf ganze Struktur + BYTE* pPLCF_Contents; // Pointer auf Inhalts-Array-Teil des Pos-Array long nIMax; long nStru; @@ -266,12 +266,12 @@ class WW8PLCFpcd_Iter public: WW8PLCFpcd_Iter( WW8PLCFpcd& rPLCFpcd, long nStartPos = -1 ); -// ~WW8PLCFpcd_Iter() {} +// ~WW8PLCFpcd_Iter() {} ULONG GetIdx() const { return (ULONG)nIdx; } void SetIdx( ULONG nI ) { nIdx = (long)nI; } long GetIMax(){ return rPLCF.nIMax; } BOOL SeekPos( long nPos ); -// BOOL SeekMaxMainFC( WW8Fib& rWwF, long& rMaxPosData ); +// BOOL SeekMaxMainFC( WW8Fib& rWwF, long& rMaxPosData ); long Where(); BOOL Get( long& rStart, long& rEnd, void*& rpValue ); ULONG FindIdx( WW8_FC nFC ) const { return rPLCF.FindIdx( nFC ); } @@ -284,10 +284,10 @@ enum ePLCFT{ CHP=0, PAP, SEP, /*HED, FNR, ENR,*/ PLCF_END }; /* pure virtual: */ -class WW8PLCFx // virtueller Iterator fuer Piece Table Exceptions +class WW8PLCFx // virtueller Iterator fuer Piece Table Exceptions { - BYTE nVersion; // Versionsnummer des FIB - BOOL bIsSprm; // PLCF von Sprms oder von anderem ( Footnote, ... ) + BYTE nVersion; // Versionsnummer des FIB + BOOL bIsSprm; // PLCF von Sprms oder von anderem ( Footnote, ... ) public: WW8PLCFx( BYTE nFibVersion, BOOL bSprm ) @@ -300,7 +300,7 @@ public: virtual void SetIdx2( ULONG nIdx ); virtual BOOL SeekPos( WW8_CP nCpPos ) = 0; virtual long Where() = 0; -// virtual BYTE* GetSprms( long& rStart, long& rEnd, long& rLen ); +// virtual BYTE* GetSprms( long& rStart, long& rEnd, long& rLen ); virtual void GetSprms( WW8PLCFxDesc* p ); virtual long GetNoSprms( long& rStart, long&, long& rLen ); virtual WW8PLCFx& operator ++( int ) = 0; @@ -316,10 +316,10 @@ class WW8PLCFx_PCDAttrs : public WW8PLCFx { WW8PLCFpcd_Iter* pPcdI; WW8PLCFx_PCD* pPcd; - BYTE** pGrpprls; // Attribute an Piece-Table - SVBT32 aShortSprm; // mini storage: can contain ONE sprm with + BYTE** pGrpprls; // Attribute an Piece-Table + SVBT32 aShortSprm; // mini storage: can contain ONE sprm with // 1 byte param - UINT16 nGrpprls; // Attribut Anzahl davon + UINT16 nGrpprls; // Attribut Anzahl davon public: WW8PLCFx_PCDAttrs( BYTE nVersion, WW8PLCFx_PCD* pPLCFx_PCD, WW8ScannerBase* pBase ); @@ -334,7 +334,7 @@ public: WW8PLCFpcd_Iter* GetIter() const { return pPcdI; } }; -class WW8PLCFx_PCD : public WW8PLCFx // Iterator fuer Piece Table +class WW8PLCFx_PCD : public WW8PLCFx // Iterator fuer Piece Table { WW8PLCFpcd_Iter* pPcdI; BOOL bVer67; @@ -347,7 +347,7 @@ public: virtual void SetIdx( ULONG nI ); virtual BOOL SeekPos( WW8_CP nCpPos ); virtual long Where(); -// virtual void GetSprms( WW8PLCFxDesc* p ); +// virtual void GetSprms( WW8PLCFxDesc* p ); virtual long GetNoSprms( long& rStart, long&, long& rLen ); virtual WW8PLCFx& operator ++( int ); WW8_CP AktPieceStartFc2Cp( WW8_FC nStartPos ); @@ -366,13 +366,13 @@ public: }; -class WW8PLCFx_Fc_FKP : public WW8PLCFx // Iterator fuer Piece Table Exceptions of Fkps +class WW8PLCFx_Fc_FKP : public WW8PLCFx // Iterator fuer Piece Table Exceptions of Fkps // arbeitet nur auf FCs, nicht auf CPs ! // ( Low-Level ) { - class WW8Fkp // Iterator fuer Formatted Disk Page + class WW8Fkp // Iterator fuer Formatted Disk Page { struct WW8Grpprl { @@ -382,15 +382,15 @@ class WW8PLCFx_Fc_FKP : public WW8PLCFx // Iterator fuer Piece Table Excepti BOOL bMustDelete; }; - WW8Grpprl* pGrpprl; // Pointer of Meta Array (pointing + WW8Grpprl* pGrpprl; // Pointer of Meta Array (pointing - BYTE* pFkp; // gesamter Fkp + BYTE* pFkp; // gesamter Fkp - long nItemSize; // entweder 1 Byte oder ein komplettes BX - long nFilePos; // Offset in Stream where last read of 52 bytes took place - short nIdx; // Pos-Merker + long nItemSize; // entweder 1 Byte oder ein komplettes BX + long nFilePos; // Offset in Stream where last read of 52 bytes took place + short nIdx; // Pos-Merker ePLCFT ePLCF; - BYTE nIMax; // Anzahl der Eintraege + BYTE nIMax; // Anzahl der Eintraege BYTE nVersion; public: @@ -421,15 +421,15 @@ class WW8PLCFx_Fc_FKP : public WW8PLCFx // Iterator fuer Piece Table Excepti */ BYTE* HasSprm( USHORT nId ); - ULONG GetParaHeight() const; // fuer Header/Footer bei Papx-Fkps + ULONG GetParaHeight() const; // fuer Header/Footer bei Papx-Fkps BYTE GetVersion() const { return nVersion; } }; WW8PLCFx_PCDAttrs* pPCDAttrs; - SvStream* pFKPStrm; // Input-File - SvStream* pDataStrm; // Input-File + SvStream* pFKPStrm; // Input-File + SvStream* pDataStrm; // Input-File WW8PLCF* pPLCF; WW8Fkp* pFkp; WW8_FC nStartFc; @@ -488,7 +488,7 @@ public: -class WW8PLCFx_SEPX : public WW8PLCFx // Iterator fuer Piece Table Exceptions of Sepx +class WW8PLCFx_SEPX : public WW8PLCFx // Iterator fuer Piece Table Exceptions of Sepx { SvStream* pStrm; WW8PLCF* pPLCF; @@ -548,7 +548,7 @@ public: long Count() { return ( pRef ) ? pRef->GetIMax() : 0; } }; -class WW8PLCFx_FLD : public WW8PLCFx // Iterator fuer Fuss- und Endnoten +class WW8PLCFx_FLD : public WW8PLCFx // Iterator fuer Fuss- und Endnoten { WW8PLCFspecial* pPLCF; WW8Fib& rFib; @@ -567,12 +567,12 @@ public: enum eBookStatus { BOOK_NORMAL = 0, BOOK_IGNORE = 0x1, BOOK_ONLY_REF = 0x2 }; -class WW8PLCFx_Book : public WW8PLCFx // Iterator fuer Booknotes +class WW8PLCFx_Book : public WW8PLCFx // Iterator fuer Booknotes { - WW8PLCFspecial* pBook[2]; // Start- und EndPosition - SvStrings aBookNames; // Name + WW8PLCFspecial* pBook[2]; // Start- und EndPosition + SvStrings aBookNames; // Name eBookStatus* pStatus; - long nIMax; // Anzahl der Booknotes + long nIMax; // Anzahl der Booknotes USHORT nIsEnd; public: WW8PLCFx_Book( SvStream* pSt, SvStream* pTblSt, WW8Fib& rFib, WW8_CP nStartCp ); @@ -606,24 +606,24 @@ public: */ struct WW8PLCFManResult { - WW8_CP nCpPos; // Attribut-Anfangsposition - long nMemLen; // Laenge dazu - long nCp2OrIdx; // footnote-textpos oder Index in PLCF - WW8_CP nAktCp; // wird nur vom Aufrufer benutzt - BYTE* pMemPos; // Mem-Pos fuer Sprms - USHORT nSprmId; // Sprm-Id ( 0 = ungueltige Id -> ueberspringen! ) + WW8_CP nCpPos; // Attribut-Anfangsposition + long nMemLen; // Laenge dazu + long nCp2OrIdx; // footnote-textpos oder Index in PLCF + WW8_CP nAktCp; // wird nur vom Aufrufer benutzt + BYTE* pMemPos; // Mem-Pos fuer Sprms + USHORT 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 + BYTE nFlags; // Absatz- oder Section-Anfang }; #define MAN_ANZ_PLCF 12 -#define MAN_MASK_NEW_PAP 1 // neue Zeile -#define MAN_MASK_NEW_SEP 2 // neue Section +#define MAN_MASK_NEW_PAP 1 // neue Zeile +#define MAN_MASK_NEW_SEP 2 // neue Section -#define MAN_MAINTEXT 0 // Defines fuer PLCFMan-ctor +#define MAN_MAINTEXT 0 // Defines fuer PLCFMan-ctor #define MAN_FTN 1 #define MAN_EDN 2 #define MAN_HDFT 3 @@ -643,14 +643,14 @@ struct WW8PLCFxDesc { WW8PLCFx* pPLCFx; UShortStk* pIdStk;// Speicher fuer Attr-Id fuer Attr-Ende(n) - BYTE* pMemPos; // wo liegen die Sprm(s) + BYTE* pMemPos; // wo liegen die Sprm(s) long nStartPos; long nEndPos; - long nCp2OrIdx; // wo liegen die NoSprm(s) - long nSprmsLen; // wie viele Bytes fuer weitere Sprms / Laenge Fussnote - long nCpOfs; // fuer Offset Header .. Footnote - BOOL bFirstSprm; // fuer Erkennung erster Sprm einer Gruppe - BOOL bRealLineEnd; // FALSE bei Pap-Piece-Ende + long nCp2OrIdx; // wo liegen die NoSprm(s) + long nSprmsLen; // wie viele Bytes fuer weitere Sprms / Laenge Fussnote + long nCpOfs; // fuer Offset Header .. Footnote + BOOL bFirstSprm; // fuer Erkennung erster Sprm einer Gruppe + BOOL bRealLineEnd; // FALSE bei Pap-Piece-Ende void Save( WW8PLCFxSave1& rSave ) const; void Restore( const WW8PLCFxSave1& rSave ); }; @@ -660,11 +660,11 @@ struct WW8PLCFxDesc class WW8PLCFMan { - long nCpO; // Origin Cp -- the basis for nNewCp + long nCpO; // Origin Cp -- the basis for nNewCp - long nLineEnd; // zeigt *hinter* das <CR> - long nLastWhereIdxCp; // last result of WhereIdx() - USHORT nPLCF; // so viele PLCFe werden verwaltet + long nLineEnd; // zeigt *hinter* das <CR> + long nLastWhereIdxCp; // last result of WhereIdx() + USHORT nPLCF; // so viele PLCFe werden verwaltet short nManType; WW8PLCFxDesc aD[MAN_ANZ_PLCF]; @@ -700,13 +700,13 @@ public: BOOL Get( WW8PLCFManResult* pResult ); WW8PLCFMan& operator ++( int ); - USHORT GetColl() const; // liefert aktuellen Style + USHORT GetColl() const; // liefert aktuellen Style WW8PLCFx_FLD* GetFld() const; WW8PLCFx_SubDoc* GetEdn() const { return (WW8PLCFx_SubDoc*)pEdn->pPLCFx; } WW8PLCFx_SubDoc* GetFtn() const { return (WW8PLCFx_SubDoc*)pFtn->pPLCFx; } WW8PLCFx_SubDoc* GetAtn() const { return (WW8PLCFx_SubDoc*)pAnd->pPLCFx; } WW8PLCFx_Book* GetBook() const { return (WW8PLCFx_Book*)pBkm->pPLCFx; } - long GetCpOfs() const { return pChp->nCpOfs; } // fuer Header/Footer... + long GetCpOfs() const { return pChp->nCpOfs; } // fuer Header/Footer... /* fragt, ob *aktueller Absatz* einen Sprm diesen Typs hat @@ -725,9 +725,9 @@ public: void SeekPos( long nNewCp ); void SaveAllPLCFx( WW8PLCFxSaveAll& rSave ) const; void RestoreAllPLCFx( const WW8PLCFxSaveAll& rSave ); - WW8PLCFspecial* GetFdoa() { return pFdoa; } - WW8PLCFspecial* GetTxbx() { return pTxbx; } - WW8PLCFspecial* GetTxbxBkd(){ return pTxbxBkd; } + WW8PLCFspecial* GetFdoa() { return pFdoa; } + WW8PLCFspecial* GetTxbx() { return pTxbx; } + WW8PLCFspecial* GetTxbxBkd(){ return pTxbxBkd; } short GetManType() { return nManType; } }; @@ -749,34 +749,34 @@ friend class SwWw8ImplReader; #endif WW8Fib* pWw8Fib; - WW8PLCFx_Cp_FKP* pChpPLCF; // Character-Attrs - WW8PLCFx_Cp_FKP* pPapPLCF; // Para-Attrs - WW8PLCFx_SEPX* pSepPLCF; // Section-Attrs - WW8PLCFx_SubDoc* pFtnPLCF; // Footnotes - WW8PLCFx_SubDoc* pEdnPLCF; // EndNotes - WW8PLCFx_SubDoc* pAndPLCF; // Anmerkungen - WW8PLCFx_FLD* pFldPLCF; // Fields in Main Text - WW8PLCFx_FLD* pFldHdFtPLCF; // Fields in Header / Footer - WW8PLCFx_FLD* pFldTxbxPLCF; // Fields in Textboxes in Main Text - WW8PLCFx_FLD* pFldTxbxHdFtPLCF; // Fields in Textboxes in Header / Footer - WW8PLCFx_FLD* pFldFtnPLCF; // Fields in Footnotes - WW8PLCFx_FLD* pFldEdnPLCF; // Fields in Endnotes - WW8PLCFx_FLD* pFldAndPLCF; // Fields in Anmerkungen - WW8PLCFspecial* pMainFdoa; // Graphic Primitives in Main Text - WW8PLCFspecial* pHdFtFdoa; // Graphic Primitives in Header / Footer - WW8PLCFspecial* pMainTxbx; // Textboxen in Main Text - WW8PLCFspecial* pMainTxbxBkd; // Break-Deskriptoren fuer diese - WW8PLCFspecial* pHdFtTxbx; // TextBoxen in Header / Footer - WW8PLCFspecial* pHdFtTxbxBkd; // Break-Deskriptoren fuer diese - 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 - USHORT nNoAttrScan; // Attribute komplett(!) ignorieren, die ueber n CPs + WW8PLCFx_Cp_FKP* pChpPLCF; // Character-Attrs + WW8PLCFx_Cp_FKP* pPapPLCF; // Para-Attrs + WW8PLCFx_SEPX* pSepPLCF; // Section-Attrs + WW8PLCFx_SubDoc* pFtnPLCF; // Footnotes + WW8PLCFx_SubDoc* pEdnPLCF; // EndNotes + WW8PLCFx_SubDoc* pAndPLCF; // Anmerkungen + WW8PLCFx_FLD* pFldPLCF; // Fields in Main Text + WW8PLCFx_FLD* pFldHdFtPLCF; // Fields in Header / Footer + WW8PLCFx_FLD* pFldTxbxPLCF; // Fields in Textboxes in Main Text + WW8PLCFx_FLD* pFldTxbxHdFtPLCF; // Fields in Textboxes in Header / Footer + WW8PLCFx_FLD* pFldFtnPLCF; // Fields in Footnotes + WW8PLCFx_FLD* pFldEdnPLCF; // Fields in Endnotes + WW8PLCFx_FLD* pFldAndPLCF; // Fields in Anmerkungen + WW8PLCFspecial* pMainFdoa; // Graphic Primitives in Main Text + WW8PLCFspecial* pHdFtFdoa; // Graphic Primitives in Header / Footer + WW8PLCFspecial* pMainTxbx; // Textboxen in Main Text + WW8PLCFspecial* pMainTxbxBkd; // Break-Deskriptoren fuer diese + WW8PLCFspecial* pHdFtTxbx; // TextBoxen in Header / Footer + WW8PLCFspecial* pHdFtTxbxBkd; // Break-Deskriptoren fuer diese + 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 + USHORT nNoAttrScan; // Attribute komplett(!) ignorieren, die ueber n CPs // aufgespannt sind; z.B. bei Char #7 (Zellen-/Zeilenende) WW8PLCFpcd* OpenPieceTable( SvStream* pStr, WW8Fib* pWwF ); @@ -811,7 +811,7 @@ public: von uns verlangte Programm-Version: in Ctor wird geprueft, ob sie zu nFib passt */ - BYTE nVersion; // 6 steht fuer "WinWord 6 oder WinWord 95", + BYTE nVersion; // 6 steht fuer "WinWord 6 oder WinWord 95", // 7 steht fuer "nur WinWord 95" // 8 steht fuer "nur WinWord 97" /* @@ -823,16 +823,16 @@ public: (entspricht nur ungefaehr der tatsaechlichen Struktur des Winword-FIB) */ - UINT16 wIdent; // 0x0 int magic number - UINT16 nFib; // 0x2 FIB version written - UINT16 nProduct; // 0x4 product version written by - INT16 lid; // 0x6 language stamp---localized version; - WW8_PN pnNext; // 0x8 + UINT16 wIdent; // 0x0 int magic number + UINT16 nFib; // 0x2 FIB version written + UINT16 nProduct; // 0x4 product version written by + INT16 lid; // 0x6 language stamp---localized version; + WW8_PN pnNext; // 0x8 - UINT16 fDot :1; // 0xa 0001 + 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 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 @@ -846,67 +846,67 @@ public: UINT16 fExtChar :1; // 1000 =1, when using extended character set in file // UINT16 u2 :3; - UINT16 nFibBack; // 0xc - INT16 lKey1; // 0xe file encrypted key, only valid if fEncrypted. - INT16 lKey2; // 0x10 key in 2 Portionen wg. Misalignment - UINT8 envr; // 0x12 environment in which file was created + UINT16 nFibBack; // 0xc + INT16 lKey1; // 0xe file encrypted key, only valid if fEncrypted. + INT16 lKey2; // 0x10 key in 2 Portionen wg. Misalignment + 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 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 :3; - UINT16 chse; // 0x14 default extended character set id for text in document stream. (overidden by chp.chse) + 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 + 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 + 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" + 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 + 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 + UINT16 wMagicRevised; // identifies the File's last modifier + UINT16 wMagicCreatedPrivate; // private data + 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 + 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 */ - INT16 lidFE; // Language id if document was written by Far East version + 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 + UINT16 clw; // Number of fields in the array of longs // Ende des Einschubs fuer WW8 ******************************************* // Marke: "rglw" Beginning of the array of longs - WW8_FC cbMac; // 0x20 file offset of last byte written to file + 1. - - // WW8_FC u4[4]; // 0x24 - WW8_CP ccpText; // 0x34 length of main document text stream - WW8_CP ccpFtn; // 0x38 length of footnote subdocument text stream - WW8_CP ccpHdr; // 0x3c length of header subdocument text stream - WW8_CP ccpMcr; // 0x40 length of macro subdocument text stream - WW8_CP ccpAtn; // 0x44 length of annotation subdocument text stream - WW8_CP ccpEdn; // 0x48 length of endnote subdocument text stream - WW8_CP ccpTxbx; // 0x4c length of textbox subdocument text stream - WW8_CP ccpHdrTxbx; // 0x50 length of header textbox subdocument text stream + WW8_FC cbMac; // 0x20 file offset of last byte written to file + 1. + + // WW8_FC u4[4]; // 0x24 + WW8_CP ccpText; // 0x34 length of main document text stream + WW8_CP ccpFtn; // 0x38 length of footnote subdocument text stream + WW8_CP ccpHdr; // 0x3c length of header subdocument text stream + WW8_CP ccpMcr; // 0x40 length of macro subdocument text stream + WW8_CP ccpAtn; // 0x44 length of annotation subdocument text stream + WW8_CP ccpEdn; // 0x48 length of endnote subdocument text stream + WW8_CP ccpTxbx; // 0x4c length of textbox subdocument text stream + 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 + 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. @@ -914,13 +914,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 + 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 + 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 + 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 @@ -928,251 +928,251 @@ 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 + 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 + 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 + 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 + 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 + 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. + INT32 fcIslandFirst; // ? + INT32 fcIslandLim; // ? + UINT16 cfclcb; // Number of fields in the array of FC/LCB pairs. // Ende des Einschubs fuer WW8 ******************************************* // Marke: "rgfclcb" Beginning of array of FC/LCB pairs. - WW8_FC fcStshfOrig; // file offset of original allocation for STSH in table + 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 - WW8_FC fcStshf; // 0x60 file offset of STSH in file. - 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 + 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 + WW8_FC fcPlcffndRef; // 0x68 file offset of footnote reference PLCF. + 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. + WW8_FC fcPlcffndTxt; // 0x70 file offset of footnote text PLCF. + 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. + WW8_FC fcPlcfandRef; // 0x78 file offset of annotation reference PLCF. + 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 + WW8_FC fcPlcfandTxt; // 0x80 file offset of annotation text PLCF. + 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. + WW8_FC fcPlcfsed; // 8x88 file offset of section descriptor PLCF. + 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. + WW8_FC fcPlcfpad; // 0x90 file offset of paragraph descriptor PLCF + 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. + WW8_FC fcPlcfphe; // 0x98 file offset of PLCF of paragraph heights. + 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. - // == 0 for non-glossary documents. - // !=0 for glossary documents. + WW8_FC fcSttbfglsy; // 0xa0 file offset of glossary string table. + 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. - // == 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. + // == 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. - // == 0 if document contains no headers + WW8_FC fcPlcfhdd; // 0xb0 byte offset of header PLCF. + 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. + WW8_FC fcPlcfbteChpx; // 0xb8 file offset of character property bin table.PLCF. INT32 lcbPlcfbteChpx;// 0xbc count of bytes of character property bin table PLCF. - WW8_FC fcPlcfbtePapx; // 0xc0 file offset of paragraph 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. - 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. + 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. - WW8_FC fcSttbfffn; // 0xd0 file offset of font information STTBF. See the FFN file structure definition. - INT32 lcbSttbfffn; // 0xd4 count of bytes in sttbfffn. + WW8_FC fcSttbfffn; // 0xd0 file offset of font information STTBF. See the FFN file structure definition. + 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 + WW8_FC fcPlcffldMom; // 0xd8 offset in doc stream to the PLCF of field positions in the main document. + INT32 lcbPlcffldMom; // 0xdc - WW8_FC fcPlcffldHdr; // 0xe0 offset in doc stream to the PLCF of field positions in the header subdocument. - INT32 lcbPlcffldHdr; // 0xe4 + WW8_FC fcPlcffldHdr; // 0xe0 offset in doc stream to the PLCF of field positions in the header subdocument. + INT32 lcbPlcffldHdr; // 0xe4 - WW8_FC fcPlcffldFtn; // 0xe8 offset in doc stream to the PLCF of field positions in the footnote subdocument. - INT32 lcbPlcffldFtn; // 0xec + WW8_FC fcPlcffldFtn; // 0xe8 offset in doc stream to the PLCF of field positions in the footnote subdocument. + INT32 lcbPlcffldFtn; // 0xec - WW8_FC fcPlcffldAtn; // 0xf0 offset in doc stream to the PLCF of field positions in the annotation subdocument. - INT32 lcbPlcffldAtn; // 0xf4 + WW8_FC fcPlcffldAtn; // 0xf0 offset in doc stream to the PLCF of field positions in the annotation subdocument. + INT32 lcbPlcffldAtn; // 0xf4 - WW8_FC fcPlcffldMcr; // 0xf8 offset in doc stream to the PLCF of field positions in the macro subdocument. - INT32 lcbPlcffldMcr; // 9xfc + WW8_FC fcPlcffldMcr; // 0xf8 offset in doc stream to the PLCF of field positions in the macro subdocument. + 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 + WW8_FC fcSttbfbkmk; // 0x100 offset in document stream of the STTBF that records bookmark names in the main document + 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 + 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 - 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 + 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 - WW8_FC fcCmds; // 0x118 FC - INT32 lcbCmds; // 0x11c + WW8_FC fcCmds; // 0x118 FC + INT32 lcbCmds; // 0x11c - WW8_FC fcPlcfmcr; // 0x120 FC - INT32 lcbPlcfmcr; // 0x124 + WW8_FC fcPlcfmcr; // 0x120 FC + INT32 lcbPlcfmcr; // 0x124 - WW8_FC fcSttbfmcr; // 0x128 FC - INT32 lcbSttbfmcr; // 0x12c + WW8_FC fcSttbfmcr; // 0x128 FC + 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...) + 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...) - 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. + 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. - 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. + 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. - 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. + 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. - WW8_FC fcDop; // 0x150 file offset of document property data structure. - INT32 lcbDop; // 0x154 count of bytes of document properties. + WW8_FC fcDop; // 0x150 file offset of document property data structure. + INT32 lcbDop; // 0x154 count of bytes of document properties. // cbDOP is 84 when nFib < 103 - WW8_FC fcSttbfAssoc; // 0x158 offset to STTBF of associated strings. See STTBFASSOC. - INT32 cbSttbfAssoc; // 0x15C + WW8_FC fcSttbfAssoc; // 0x158 offset to STTBF of associated strings. See STTBFASSOC. + INT32 cbSttbfAssoc; // 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. + 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. - 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. - // ==0 if document has not been paginated. The length of the PGD is 8 bytes. + 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. + // ==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. + 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. - 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 + 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 - 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 + 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 // Einschubs fuer WW67 *************************************************** - // INT16 wSpare4Fib; // Reserve, muss hier nicht deklariert werden + // INT16 wSpare4Fib; // Reserve, muss hier nicht deklariert werden /* // folgende Felder existieren zwar so in der Datei, // wir benutzen jedoch unten deklarierte General-Variablen // fuer Ver67 und Ver8 gemeinsam. - WW8_PN pnChpFirst; // the page number of the lowest numbered page in + WW8_PN pnChpFirst; // the page number of the lowest numbered page in // the document that records CHPX FKP information - WW8_PN pnPapFirst; // the page number of the lowest numbered page in + WW8_PN pnPapFirst; // the page number of the lowest numbered page in // the document that records PAPX FKP information - WW8_PN cpnBteChp; // count of CHPX FKPs recorded in file. In non-complex + WW8_PN 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. - WW8_PN cpnBtePap; // count of PAPX FKPs recorded in file. In non-complex + WW8_PN 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. */ // Ende des Einschubs fuer WW67 ****************************************** - 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. + 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 + 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. + 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 + 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. + 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 + 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. + 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 + 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 + 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 - 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 + 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 - WW8_FC fcPms; // 0x1C2 file offset of PMS (Print Merge State) information block - INT32 lcbPMS; // 0x1C6 length in bytes of PMS + WW8_FC fcPms; // 0x1C2 file offset of PMS (Print Merge State) information block + 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 + 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 - WW8_FC fcPlcfendRef; // 0x1D2 file offset of PLCFendRef which points to endnote references in the main document stream - INT32 lcbPlcfendRef; // 0x1D6 + WW8_FC fcPlcfendRef; // 0x1D2 file offset of PLCFendRef which points to endnote references in the main document stream + 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 + 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 - WW8_FC fcPlcffldEdn; // 0x1E2 offset to PLCF of field positions in the endnote subdoc - INT32 lcbPlcffldEdn; // 0x1E6 + WW8_FC fcPlcffldEdn; // 0x1E2 offset to PLCF of field positions in the endnote subdoc + INT32 lcbPlcffldEdn; // 0x1E6 - WW8_FC fcPlcfpgdEdn; // 0x1EA offset to PLCF of page boundaries in the endnote subdoc. - INT32 lcbPlcfpgdEdn; // 0x1EE + WW8_FC fcPlcfpgdEdn; // 0x1EA offset to PLCF of page boundaries in the endnote subdoc. + INT32 lcbPlcfpgdEdn; // 0x1EE - WW8_FC fcDggInfo; // offset in table stream of the office art object table data. + 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 + 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 - WW8_FC fcSttbfCaption; // 0x202 offset to STTBF that records caption titles... - INT32 lcbSttbfCaption; // 0x206 - WW8_FC fcSttbAutoCaption; // offset in table stream to the STTBF that records the object names and + WW8_FC fcSttbfRMark; // 0x1fa offset to STTBF that records the author abbreviations... + INT32 lcbSttbfRMark; // 0x1fe + WW8_FC fcSttbfCaption; // 0x202 offset to STTBF that records caption titles... + 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 + INT32 lcbSttbAutoCaption; // 0x20e - WW8_FC fcPlcfwkb; // 0x212 offset to PLCF that describes the boundaries of contributing documents... - INT32 lcbPlcfwkb; // 0x216 + WW8_FC fcPlcfwkb; // 0x212 offset to PLCF that describes the boundaries of contributing documents... + INT32 lcbPlcfwkb; // 0x216 - WW8_FC fcPlcfspl; // offset in table stream of PLCF (of SPLS structures) that records spell check state + 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 + INT32 lcbPlcfspl; // war in Ver67 nur leere Reserve - WW8_FC fcPlcftxbxTxt; // 0x222 ...PLCF of beginning CP in the text box subdoc - INT32 lcbPlcftxbxTxt; // 0x226 - WW8_FC fcPlcffldTxbx; // 0x22a ...PLCF of field boundaries recorded in the textbox subdoc. - INT32 lcbPlcffldTxbx; // 0x22e + WW8_FC fcPlcftxbxTxt; // 0x222 ...PLCF of beginning CP in the text box subdoc + INT32 lcbPlcftxbxTxt; // 0x226 + WW8_FC fcPlcffldTxbx; // 0x22a ...PLCF of field boundaries recorded in the textbox subdoc. + INT32 lcbPlcffldTxbx; // 0x22e WW8_FC fcPlcfHdrtxbxTxt;// 0x232 ...PLCF of beginning CP in the header text box subdoc INT32 lcbPlcfHdrtxbxTxt;// 0x236 WW8_FC fcPlcffldHdrTxbx;// 0x23a ...PLCF of field boundaries recorded in the header textbox subdoc. @@ -1181,15 +1181,15 @@ public: /* spezielle Listenverwaltung fuer WW8 */ - WW8_FC fcPlcfLst; // 0x02e2 offset in the table stream of list format information. - INT32 lcbPlcfLst; // 0x02e6 length - WW8_FC fcPlfLfo; // 0x02ea offset in the table stream of list format override information. - INT32 lcbPlfLfo; // 0x02ee length + WW8_FC fcPlcfLst; // 0x02e2 offset in the table stream of list format information. + INT32 lcbPlcfLst; // 0x02e6 length + WW8_FC fcPlfLfo; // 0x02ea offset in the table stream of list format override information. + 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 + WW8_FC fcPlcftxbxBkd; // 0x02f2 PLCF fuer TextBox-Break-Deskriptoren im Maintext + INT32 lcbPlcftxbxBkd; // 0x02f6 WW8_FC fcPlcfHdrtxbxBkd;// 0x02fa PLCF fuer TextBox-Break-Deskriptoren im Header-/Footer-Bereich INT32 lcbPlcfHdrtxbxBkd;// 0x02fe @@ -1225,20 +1225,20 @@ protected: SvStream& rSt; long nStyleStart; long nStyleLen; -// WW8_STSHI* pStishi; +// WW8_STSHI* pStishi; - 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 this file was written - UINT16 istdMaxFixedWhenSaved; // How many fixed-index istds are there? - UINT16 nVerBuiltInNamesWhenSaved; // Current version of built-in stylenames - UINT16 ftcStandardChpStsh; // ftc used by StandardChpStsh for this document + 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 this file was written + UINT16 istdMaxFixedWhenSaved; // How many fixed-index istds are there? + UINT16 nVerBuiltInNamesWhenSaved; // Current version of built-in stylenames + UINT16 ftcStandardChpStsh; // ftc used by StandardChpStsh for this document public: WW8Style( SvStream& rSt, WW8Fib& rFibPara ); -// ~WW8Style(){ delete( pStishi ); pStishi = 0; } +// ~WW8Style(){ delete( pStishi ); pStishi = 0; } WW8_STD* Read1STDFixed( short& rSkip, short* pcbStd ); WW8_STD* Read1Style( short& rSkip, String* pString, short* pcbStd ); const UINT16 GetCount() const { return cstd; } @@ -1248,9 +1248,9 @@ public: class WW8Fonts { protected: - WW8_FFN* pFontA; // Array of Pointers to Font Description + WW8_FFN* pFontA; // Array of Pointers to Font Description // Hilfs-Vari - USHORT nMax; // Array-Groesse + USHORT nMax; // Array-Groesse public: WW8Fonts( SvStream& rSt, WW8Fib& rFib ); ~WW8Fonts(){ if( pFontA ) delete [] pFontA; } @@ -1276,146 +1276,146 @@ public: // Initialisier-Dummy: BYTE 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 + 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 //------------------------- - UINT16 grpfIhdt : 8; // 0 specification of document headers and footers. See explanation under Headers and Footers topic. + 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 - // 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 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 + // 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 - - 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 - // 3 Upper case Letter, 4 Lower case Letter + 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 + + 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 + // 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 - // 3 Upper case Letter, 4 Lower case Letter + // 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; - - // hier sollte bei nFib < 103 Schluss sein, sonst ist Datei fehlerhaft! + 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; + + // 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 :4; // reserved - UINT32 fSuppressTopSpacingMac5 :1; // Suppress extra line spacing at top + 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 :4; // reserved + 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 :1; // reserved - UINT32 fMWSmallCaps :1; // Use larger small caps like MacWord 5.x - UINT32 :10;// reserved + 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 :1; // reserved + UINT32 fMWSmallCaps :1; // Use larger small caps like MacWord 5.x + UINT32 :10;// reserved - // hier sollte bei nFib <= 105 Schluss sein, sonst ist Datei fehlerhaft! + // hier sollte bei nFib <= 105 Schluss sein, sonst ist Datei fehlerhaft! /* bei nFib > 105 gehts weiter: */ - INT16 adt; // Autoformat Document Type: + INT16 adt; // Autoformat Document Type: // 0 for normal. 1 for letter, and 2 for email. - WW8_DOPTYPOGRAPHY doptypography; // siehe WW8STRUC.HXX - WW8_DOGRID dogrid; // siehe 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 + WW8_DOPTYPOGRAPHY doptypography; // siehe WW8STRUC.HXX + WW8_DOGRID dogrid; // siehe 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 + UINT16 fHaveVersions :1; // versioning is turned on + UINT16 fAutoVersion :1; // autoversioning is enabled + UINT16 :14; // reserved // hier 12 Byte ueberspringen: ASUMI INT32 cChWS; INT32 cChWSFtnEdn; @@ -1472,7 +1472,7 @@ class WW8PLCF_HdFt public: WW8PLCF_HdFt( SvStream* pSt, WW8Fib& rFib, WW8Dop& rDop ); -// ~WW8PLCF_HdFt() {} +// ~WW8PLCF_HdFt() {} BOOL GetTextPos( BYTE grpfIhdt, BYTE nWhich, WW8_CP& rStart, long& rLen ); BOOL GetTextPosExact( short nIdx, WW8_CP& rStart, long& rLen ); void UpdateIndex( BYTE grpfIhdt ); diff --git a/sw/source/filter/ww8/dump/ww8struc.hxx b/sw/source/filter/ww8/dump/ww8struc.hxx index 92797f9c6c64..c8ab5bd8d1eb 100644 --- a/sw/source/filter/ww8/dump/ww8struc.hxx +++ b/sw/source/filter/ww8/dump/ww8struc.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 @@ -38,17 +38,17 @@ inline BYTE Get_Byte( BYTE *& p ) - { BYTE n = SVBT8ToByte( *(SVBT8*)p ); p += 1; return n; } + { BYTE n = SVBT8ToByte( *(SVBT8*)p ); p += 1; return n; } inline short Get_Short( BYTE *& p ) - { short n = SVBT16ToShort( *(SVBT16*)p ); p += 2; return n; } + { short n = SVBT16ToShort( *(SVBT16*)p ); p += 2; return n; } inline USHORT Get_UShort( BYTE *& p ) - { USHORT n = SVBT16ToShort( *(SVBT16*)p ); p += 2; return n; } + { USHORT n = SVBT16ToShort( *(SVBT16*)p ); p += 2; return n; } inline long Get_Long( BYTE *& p ) - { long n = SVBT32ToUInt32( *(SVBT32*)p ); p += 4; return n; } + { long n = SVBT32ToUInt32( *(SVBT32*)p ); p += 4; return n; } inline ULONG Get_ULong( BYTE *& p ) - { ULONG n = SVBT32ToUInt32( *(SVBT32*)p ); p += 4; return n; } + { ULONG n = SVBT32ToUInt32( *(SVBT32*)p ); p += 4; return n; } inline void Set_UInt8( BYTE *& p, UINT8 n ) { ByteToSVBT8( n, *(SVBT8*)p ); p+= 1; } @@ -85,50 +85,50 @@ typedef INT32 WW8_CP; struct WW8_STD { // Base part of STD: - UINT16 sti : 12; // invariant style identifier - UINT16 fScratch : 1; // spare field for any temporary use, + UINT16 sti : 12; // invariant style identifier + UINT16 fScratch : 1; // spare field for any temporary use, // always reset back to zero! - UINT16 fInvalHeight : 1; // PHEs of all text with this style are wrong - UINT16 fHasUpe : 1; // UPEs have been generated - UINT16 fMassCopy : 1; // std has been mass-copied; if unused at + UINT16 fInvalHeight : 1; // PHEs of all text with this style are wrong + UINT16 fHasUpe : 1; // UPEs have been generated + UINT16 fMassCopy : 1; // std has been mass-copied; if unused at // save time, style should be deleted - UINT16 sgc : 4; // style type code - UINT16 istdBase : 12; // base style - UINT16 cupx : 4; // # of UPXs (and UPEs) - UINT16 istdNext : 12; // next style - UINT16 bchUpe; // offset to end of upx's, start of upe's + UINT16 sgc : 4; // style type code + UINT16 istdBase : 12; // base style + UINT16 cupx : 4; // # of UPXs (and UPEs) + UINT16 istdNext : 12; // next style + UINT16 bchUpe; // offset to end of upx's, start of upe's //-------- jetzt neu: // ab Ver8 gibts zwei Felder mehr: - UINT16 fAutoRedef : 1; /* auto redefine style when appropriate */ - UINT16 fHidden : 1; /* hidden from UI? */ - UINT16 : 14; /* unused bits */ + UINT16 fAutoRedef : 1; /* auto redefine style when appropriate */ + UINT16 fHidden : 1; /* hidden from UI? */ + UINT16 : 14; /* unused bits */ // Variable length part of STD: - // UINT8 stzName[2]; /* sub-names are separated by chDelimStyle - // char grupx[]; + // UINT8 stzName[2]; /* sub-names are separated by chDelimStyle + // char grupx[]; // the UPEs are not stored on the file; they are a cache of the based-on // chain - // char grupe[]; + // char grupe[]; }; /* Basis zum Einlesen UND zum Arbeiten (wird jeweils unter schiedlich beerbt) */ -struct WW8_FFN_BASE // Font Descriptor +struct WW8_FFN_BASE // Font Descriptor { // ab Ver6 - BYTE cbFfnM1; // 0x0 total length of FFN - 1. + BYTE cbFfnM1; // 0x0 total length of FFN - 1. - BYTE prg: 2; // 0x1:03 pitch request - BYTE fTrueType : 1; // 0x1:04 when 1, font is a TrueType font - // 0x1:08 reserved - BYTE ff : 3; // 0x1:70 font family id - // 0x1:80 reserved + BYTE prg: 2; // 0x1:03 pitch request + BYTE fTrueType : 1; // 0x1:04 when 1, font is a TrueType font + // 0x1:08 reserved + BYTE ff : 3; // 0x1:70 font family id + // 0x1:80 reserved - short wWeight; // 0x2 base weight of font - BYTE chs; // 0x4 character set identifier - BYTE ibszAlt; // 0x5 index into ffn.szFfn to the name of the alternate font + short wWeight; // 0x2 base weight of font + BYTE chs; // 0x4 character set identifier + BYTE ibszAlt; // 0x5 index into ffn.szFfn to the name of the alternate font }; /* @@ -148,35 +148,35 @@ struct WW8_FFN : public WW8_FFN_BASE -struct WW8_BRCVer6 // alter Border Code +struct WW8_BRCVer6 // alter Border Code { SVBT16 aBits1; -// UINT16 dxpLineWidth : 3;// 0007 When dxpLineWidth is 0, 1, 2, 3, 4, or 5, this field is the width of +// UINT16 dxpLineWidth : 3;// 0007 When dxpLineWidth is 0, 1, 2, 3, 4, or 5, this field is the width of // a single line of border in units of 0.75 points // Must be nonzero when brcType is nonzero. // 6 == dotted, 7 == dashed. -// UINT16 brcType : 2; // 0018 border type code: 0 == none, 1 == single, 2 == thick, 3 == double -// UINT16 fShadow : 1; // 0020 when 1, border is drawn with shadow. Must be 0 when BRC is a substructure of the TC -// UINT16 ico : 5; // 07C0 color code (see chp.ico) -// UINT16 dxpSpace : 5; // F800 width of space to maintain between border and text within border. +// UINT16 brcType : 2; // 0018 border type code: 0 == none, 1 == single, 2 == thick, 3 == double +// UINT16 fShadow : 1; // 0020 when 1, border is drawn with shadow. Must be 0 when BRC is a substructure of the TC +// UINT16 ico : 5; // 07C0 color code (see chp.ico) +// UINT16 dxpSpace : 5; // F800 width of space to maintain between border and text within border. // Must be 0 when BRC is a substructure of the TC. Stored in points for Windows. }; struct WW8_BRC : public WW8_BRCVer6 // Border Code { SVBT16 aBits2; -// UINT16 dxpLineWidth : 3;// 0007 When dxpLineWidth is 0, 1, 2, 3, 4, or 5, this field is the width of +// UINT16 dxpLineWidth : 3;// 0007 When dxpLineWidth is 0, 1, 2, 3, 4, or 5, this field is the width of // a single line of border in units of 0.75 points // Must be nonzero when brcType is nonzero. // 6 == dotted, 7 == dashed. -// UINT16 brcType : 2; // 0018 border type code: 0 == none, 1 == single, 2 == thick, 3 == double -// UINT16 fShadow : 1; // 0020 when 1, border is drawn with shadow. Must be 0 when BRC is a substructure of the TC -// UINT16 ico : 5; // 07C0 color code (see chp.ico) -// UINT16 dxpSpace : 5; // F800 width of space to maintain between border and text within border. +// UINT16 brcType : 2; // 0018 border type code: 0 == none, 1 == single, 2 == thick, 3 == double +// UINT16 fShadow : 1; // 0020 when 1, border is drawn with shadow. Must be 0 when BRC is a substructure of the TC +// UINT16 ico : 5; // 07C0 color code (see chp.ico) +// UINT16 dxpSpace : 5; // F800 width of space to maintain between border and text within border. // Must be 0 when BRC is a substructure of the TC. Stored in points for Windows. }; -typedef WW8_BRC WW8_BRC5[5]; // 5 * Border Code +typedef WW8_BRC WW8_BRC5[5]; // 5 * Border Code #define WW8_TOP 0 #define WW8_LEFT 1 @@ -188,7 +188,7 @@ typedef WW8_BRC WW8_BRC5[5]; // 5 * Border Code -struct WW8_BordersSO // fuer StarOffice-Border Code +struct WW8_BordersSO // fuer StarOffice-Border Code { USHORT Out; USHORT In; @@ -248,45 +248,45 @@ struct WW8_BordersSO // fuer StarOffice-Border Code #define DEF_DOUBLE_LINE9_IN DEF_LINE_WIDTH_0 #define DEF_DOUBLE_LINE9_DIST DEF_LINE_WIDTH_2 -#define DEF_DOUBLE_LINE10_OUT DEF_LINE_WIDTH_3 -#define DEF_DOUBLE_LINE10_IN DEF_LINE_WIDTH_0 -#define DEF_DOUBLE_LINE10_DIST DEF_LINE_WIDTH_2 +#define DEF_DOUBLE_LINE10_OUT DEF_LINE_WIDTH_3 +#define DEF_DOUBLE_LINE10_IN DEF_LINE_WIDTH_0 +#define DEF_DOUBLE_LINE10_DIST DEF_LINE_WIDTH_2 */ // Deklarationen gemaess BOXITEM.HXX -#define WW8_DECL_LINETAB_ARRAY \ - static WW8_BordersSO __READONLY_DATA nLineTabVer8[] = \ - { \ -/* 0*/ { DEF_LINE_WIDTH_0, 0, 0 }, \ -/* 1*/ { DEF_LINE_WIDTH_1, 0, 0 }, \ -/* 2*/ { DEF_LINE_WIDTH_2, 0, 0 }, \ -/* 3*/ { DEF_LINE_WIDTH_3, 0, 0 }, \ -/* 4*/ { DEF_LINE_WIDTH_4, 0, 0 }, \ -/* 5*/ { DEF_DOUBLE_LINE0_OUT, DEF_DOUBLE_LINE0_IN, DEF_DOUBLE_LINE0_DIST },\ -/* 6*/ { DEF_DOUBLE_LINE1_OUT, DEF_DOUBLE_LINE1_IN, DEF_DOUBLE_LINE1_DIST },\ -/* 7*/ { DEF_DOUBLE_LINE2_OUT, DEF_DOUBLE_LINE2_IN, DEF_DOUBLE_LINE2_DIST },\ -/* 8*/ { DEF_DOUBLE_LINE3_OUT, DEF_DOUBLE_LINE3_IN, DEF_DOUBLE_LINE3_DIST },\ -/* 9*/ { DEF_DOUBLE_LINE4_OUT, DEF_DOUBLE_LINE4_IN, DEF_DOUBLE_LINE4_DIST },\ -/*10*/ { DEF_DOUBLE_LINE5_OUT, DEF_DOUBLE_LINE5_IN, DEF_DOUBLE_LINE5_DIST },\ -/*11*/ { DEF_DOUBLE_LINE6_OUT, DEF_DOUBLE_LINE6_IN, DEF_DOUBLE_LINE6_DIST },\ -/*12*/ { DEF_DOUBLE_LINE7_OUT, DEF_DOUBLE_LINE7_IN, DEF_DOUBLE_LINE7_DIST },\ -/*13*/ { DEF_DOUBLE_LINE8_OUT, DEF_DOUBLE_LINE8_IN, DEF_DOUBLE_LINE8_DIST },\ -/*14*/ { DEF_DOUBLE_LINE9_OUT, DEF_DOUBLE_LINE9_IN, DEF_DOUBLE_LINE9_DIST },\ -/*15*/ { DEF_DOUBLE_LINE10_OUT,DEF_DOUBLE_LINE10_IN,DEF_DOUBLE_LINE10_DIST} \ +#define WW8_DECL_LINETAB_ARRAY \ + static WW8_BordersSO __READONLY_DATA nLineTabVer8[] = \ + { \ +/* 0*/ { DEF_LINE_WIDTH_0, 0, 0 }, \ +/* 1*/ { DEF_LINE_WIDTH_1, 0, 0 }, \ +/* 2*/ { DEF_LINE_WIDTH_2, 0, 0 }, \ +/* 3*/ { DEF_LINE_WIDTH_3, 0, 0 }, \ +/* 4*/ { DEF_LINE_WIDTH_4, 0, 0 }, \ +/* 5*/ { DEF_DOUBLE_LINE0_OUT, DEF_DOUBLE_LINE0_IN, DEF_DOUBLE_LINE0_DIST },\ +/* 6*/ { DEF_DOUBLE_LINE1_OUT, DEF_DOUBLE_LINE1_IN, DEF_DOUBLE_LINE1_DIST },\ +/* 7*/ { DEF_DOUBLE_LINE2_OUT, DEF_DOUBLE_LINE2_IN, DEF_DOUBLE_LINE2_DIST },\ +/* 8*/ { DEF_DOUBLE_LINE3_OUT, DEF_DOUBLE_LINE3_IN, DEF_DOUBLE_LINE3_DIST },\ +/* 9*/ { DEF_DOUBLE_LINE4_OUT, DEF_DOUBLE_LINE4_IN, DEF_DOUBLE_LINE4_DIST },\ +/*10*/ { DEF_DOUBLE_LINE5_OUT, DEF_DOUBLE_LINE5_IN, DEF_DOUBLE_LINE5_DIST },\ +/*11*/ { DEF_DOUBLE_LINE6_OUT, DEF_DOUBLE_LINE6_IN, DEF_DOUBLE_LINE6_DIST },\ +/*12*/ { DEF_DOUBLE_LINE7_OUT, DEF_DOUBLE_LINE7_IN, DEF_DOUBLE_LINE7_DIST },\ +/*13*/ { DEF_DOUBLE_LINE8_OUT, DEF_DOUBLE_LINE8_IN, DEF_DOUBLE_LINE8_DIST },\ +/*14*/ { DEF_DOUBLE_LINE9_OUT, DEF_DOUBLE_LINE9_IN, DEF_DOUBLE_LINE9_DIST },\ +/*15*/ { DEF_DOUBLE_LINE10_OUT,DEF_DOUBLE_LINE10_IN,DEF_DOUBLE_LINE10_DIST} \ }; -#define WW8_DECL_LINETAB_OFS_DOUBLE 5 // Beginn des DOUBLE_LINE Abschnitts in meiner Liste +#define WW8_DECL_LINETAB_OFS_DOUBLE 5 // Beginn des DOUBLE_LINE Abschnitts in meiner Liste -struct WW8_XCHAR // Hilfs-Konstrukt fuer WW8_DOPTYPOGRAPHY +struct WW8_XCHAR // Hilfs-Konstrukt fuer WW8_DOPTYPOGRAPHY { sal_Char A; sal_Char B; }; struct WW8_DOPTYPOGRAPHY -{ /* +{ /* Document Typography Info (DOPTYPOGRAPHY) These options are Far East only, and are accessible through the Typography tab of the Tools/Options dialog. @@ -302,21 +302,21 @@ struct WW8_DOPTYPOGRAPHY - short fKerningPunct : 1; // true if we're kerning punctuation - short iJustification : 2; // Kinsoku method of justification: - // 0 = always expand - // 1 = compress punctuation - // 2 = compress punctuation and kana. - short iLevelOfKinsoku: 2; // Level of Kinsoku: - // 0 = Level 1 - // 1 = Level 2 - // 2 = Custom - short f2on1 : 1; // 2-page-on-1 feature is turned on. - short :10; // reserved - short cchFollowingPunct; // length of rgxchFPunct - short cchLeadingPunct; // length of rgxchLPunct + short fKerningPunct : 1; // true if we're kerning punctuation + short iJustification : 2; // Kinsoku method of justification: + // 0 = always expand + // 1 = compress punctuation + // 2 = compress punctuation and kana. + short iLevelOfKinsoku: 2; // Level of Kinsoku: + // 0 = Level 1 + // 1 = Level 2 + // 2 = Custom + short f2on1 : 1; // 2-page-on-1 feature is turned on. + short :10; // reserved + short cchFollowingPunct; // length of rgxchFPunct + short cchLeadingPunct; // length of rgxchLPunct - WW8_XCHAR rgxchFPunct[101]; // array of characters that should + WW8_XCHAR rgxchFPunct[101]; // array of characters that should // never appear at the start of a line WW8_XCHAR rgxchLPunct[51]; // array of characters that should // never appear at the end of a line @@ -324,10 +324,10 @@ struct WW8_DOPTYPOGRAPHY struct WW8_DOGRID { - short xaGrid; // x-coord of the upper left-hand corner of the grid - short yaGrid; // y-coord of the upper left-hand corner of the grid - short dxaGrid; // width of each grid square - short dyaGrid; // height of each grid square + short xaGrid; // x-coord of the upper left-hand corner of the grid + short yaGrid; // y-coord of the upper left-hand corner of the grid + short dxaGrid; // width of each grid square + short dyaGrid; // height of each grid square @@ -339,164 +339,164 @@ struct WW8_DOGRID - short dyGridDisplay:7; // the number of grid squares (in the y direction) + short dyGridDisplay:7; // the number of grid squares (in the y direction) // between each gridline drawn on the screen. 0 means // don't display any gridlines in the y direction. - short fTurnItOff :1; // suppress display of gridlines - short dxGridDisplay:7; // the number of grid squares (in the x direction) + short fTurnItOff :1; // suppress display of gridlines + short dxGridDisplay:7; // the number of grid squares (in the x direction) // between each gridline drawn on the screen. 0 means // don't display any gridlines in the y direction. - short fFollowMargins:1; // if true, the grid will start at the left and top + short fFollowMargins:1; // if true, the grid will start at the left and top // margins and ignore xaGrid and yaGrid. }; struct WW8_PIC { - INT32 lcb; // 0x0 number of bytes in the PIC structure plus size of following picture data which may be a Window's metafile, a bitmap, or the filename of a TIFF file. - UINT16 cbHeader; // 0x4 number of bytes in the PIC (to allow for future expansion). + INT32 lcb; // 0x0 number of bytes in the PIC structure plus size of following picture data which may be a Window's metafile, a bitmap, or the filename of a TIFF file. + UINT16 cbHeader; // 0x4 number of bytes in the PIC (to allow for future expansion). struct { - INT16 mm; // 0x6 int - INT16 xExt; // 0x8 int - INT16 yExt; // 0xa int - INT16 hMF; // 0xc int + INT16 mm; // 0x6 int + INT16 xExt; // 0x8 int + INT16 yExt; // 0xa int + INT16 hMF; // 0xc int }MFP; -// BYTE bm[14]; // 0xe BITMAP(14 bytes) Window's bitmap structure when PIC describes a BITMAP. - BYTE rcWinMF[14]; // 0xe rc (rectangle - 8 bytes) rect for window origin - // and extents when metafile is stored -- ignored if 0 - INT16 dxaGoal; // 0x1c horizontal measurement in twips of the rectangle the picture should be imaged within. - INT16 dyaGoal; // 0x1e vertical measurement in twips of the rectangle the picture should be imaged within. - UINT16 mx; // 0x20 horizontal scaling factor supplied by user in .1% units. - UINT16 my; // 0x22 vertical scaling factor supplied by user in .1% units. - INT16 dxaCropLeft; // 0x24 the amount the picture has been cropped on the left in twips. - INT16 dyaCropTop; // 0x26 the amount the picture has been cropped on the top in twips. - INT16 dxaCropRight; // 0x28 the amount the picture has been cropped on the right in twips. - INT16 dyaCropBottom;// 0x2a the amount the picture has been cropped on the bottom in twips. - INT16 brcl : 4; // 000F Obsolete, superseded by brcTop, etc. In - INT16 fFrameEmpty : 1; // 0010 picture consists of a single frame - INT16 fBitmap : 1; // 0020 ==1, when picture is just a bitmap - INT16 fDrawHatch : 1; // 0040 ==1, when picture is an active OLE object - INT16 fError : 1; // 0080 ==1, when picture is just an error message - INT16 bpp : 8; // FF00 bits per pixel, 0 = unknown +// BYTE bm[14]; // 0xe BITMAP(14 bytes) Window's bitmap structure when PIC describes a BITMAP. + BYTE rcWinMF[14]; // 0xe rc (rectangle - 8 bytes) rect for window origin + // and extents when metafile is stored -- ignored if 0 + INT16 dxaGoal; // 0x1c horizontal measurement in twips of the rectangle the picture should be imaged within. + INT16 dyaGoal; // 0x1e vertical measurement in twips of the rectangle the picture should be imaged within. + UINT16 mx; // 0x20 horizontal scaling factor supplied by user in .1% units. + UINT16 my; // 0x22 vertical scaling factor supplied by user in .1% units. + INT16 dxaCropLeft; // 0x24 the amount the picture has been cropped on the left in twips. + INT16 dyaCropTop; // 0x26 the amount the picture has been cropped on the top in twips. + INT16 dxaCropRight; // 0x28 the amount the picture has been cropped on the right in twips. + INT16 dyaCropBottom;// 0x2a the amount the picture has been cropped on the bottom in twips. + INT16 brcl : 4; // 000F Obsolete, superseded by brcTop, etc. In + INT16 fFrameEmpty : 1; // 0010 picture consists of a single frame + INT16 fBitmap : 1; // 0020 ==1, when picture is just a bitmap + INT16 fDrawHatch : 1; // 0040 ==1, when picture is an active OLE object + INT16 fError : 1; // 0080 ==1, when picture is just an error message + INT16 bpp : 8; // FF00 bits per pixel, 0 = unknown WW8_BRC rgbrc[4]; -// BRC brcTop; // 0x2e specification for border above picture -// BRC brcLeft; // 0x30 specification for border to the left -// BRC brcBottom; // 0x32 specification for border below picture -// BRC brcRight; // 0x34 specification for border to the right - INT16 dxaOrigin; // 0x36 horizontal offset of hand annotation origin - INT16 dyaOrigin; // 0x38 vertical offset of hand annotation origin -// BYTE rgb[]; // 0x3a variable array of bytes containing Window's metafile, bitmap or TIFF file filename. +// BRC brcTop; // 0x2e specification for border above picture +// BRC brcLeft; // 0x30 specification for border to the left +// BRC brcBottom; // 0x32 specification for border below picture +// BRC brcRight; // 0x34 specification for border to the right + INT16 dxaOrigin; // 0x36 horizontal offset of hand annotation origin + INT16 dyaOrigin; // 0x38 vertical offset of hand annotation origin +// BYTE rgb[]; // 0x3a variable array of bytes containing Window's metafile, bitmap or TIFF file filename. }; struct WW8_PIC_SHADOW { - SVBT32 lcb; // 0x0 number of bytes in the PIC structure plus size of following picture data which may be a Window's metafile, a bitmap, or the filename of a TIFF file. - SVBT16 cbHeader; // 0x4 number of bytes in the PIC (to allow for future expansion). + SVBT32 lcb; // 0x0 number of bytes in the PIC structure plus size of following picture data which may be a Window's metafile, a bitmap, or the filename of a TIFF file. + SVBT16 cbHeader; // 0x4 number of bytes in the PIC (to allow for future expansion). struct { - SVBT16 mm; // 0x6 int - SVBT16 xExt; // 0x8 int - SVBT16 yExt; // 0xa int - SVBT16 hMF; // 0xc int + SVBT16 mm; // 0x6 int + SVBT16 xExt; // 0x8 int + SVBT16 yExt; // 0xa int + SVBT16 hMF; // 0xc int }MFP; -// SVBT8 bm[14]; // 0xe BITMAP(14 bytes) Window's bitmap structure when PIC describes a BITMAP. - SVBT8 rcWinMF[14]; // 0xe rc (rectangle - 8 bytes) rect for window origin - // and extents when metafile is stored -- ignored if 0 - SVBT16 dxaGoal; // 0x1c horizontal measurement in twips of the rectangle the picture should be imaged within. - SVBT16 dyaGoal; // 0x1e vertical measurement in twips of the rectangle the picture should be imaged within. - SVBT16 mx; // 0x20 horizontal scaling factor supplied by user in .1% units. - SVBT16 my; // 0x22 vertical scaling factor supplied by user in .1% units. - SVBT16 dxaCropLeft; // 0x24 the amount the picture has been cropped on the left in twips. - SVBT16 dyaCropTop; // 0x26 the amount the picture has been cropped on the top in twips. - SVBT16 dxaCropRight; // 0x28 the amount the picture has been cropped on the right in twips. - SVBT16 dyaCropBottom;// 0x2a the amount the picture has been cropped on the bottom in twips. +// SVBT8 bm[14]; // 0xe BITMAP(14 bytes) Window's bitmap structure when PIC describes a BITMAP. + SVBT8 rcWinMF[14]; // 0xe rc (rectangle - 8 bytes) rect for window origin + // and extents when metafile is stored -- ignored if 0 + SVBT16 dxaGoal; // 0x1c horizontal measurement in twips of the rectangle the picture should be imaged within. + SVBT16 dyaGoal; // 0x1e vertical measurement in twips of the rectangle the picture should be imaged within. + SVBT16 mx; // 0x20 horizontal scaling factor supplied by user in .1% units. + SVBT16 my; // 0x22 vertical scaling factor supplied by user in .1% units. + SVBT16 dxaCropLeft; // 0x24 the amount the picture has been cropped on the left in twips. + SVBT16 dyaCropTop; // 0x26 the amount the picture has been cropped on the top in twips. + SVBT16 dxaCropRight; // 0x28 the amount the picture has been cropped on the right in twips. + SVBT16 dyaCropBottom;// 0x2a the amount the picture has been cropped on the bottom in twips. SVBT8 aBits1; //0x2c SVBT8 aBits2; WW8_BRC rgbrc[4]; -// BRC brcTop; // 0x2e specification for border above picture -// BRC brcLeft; // 0x30 specification for border to the left -// BRC brcBottom; // 0x32 specification for border below picture -// BRC brcRight; // 0x34 specification for border to the right - SVBT16 dxaOrigin; // 0x36 horizontal offset of hand annotation origin - SVBT16 dyaOrigin; // 0x38 vertical offset of hand annotation origin -// SVBT8 rgb[]; // 0x3a variable array of bytes containing Window's metafile, bitmap or TIFF file filename. +// BRC brcTop; // 0x2e specification for border above picture +// BRC brcLeft; // 0x30 specification for border to the left +// BRC brcBottom; // 0x32 specification for border below picture +// BRC brcRight; // 0x34 specification for border to the right + SVBT16 dxaOrigin; // 0x36 horizontal offset of hand annotation origin + SVBT16 dyaOrigin; // 0x38 vertical offset of hand annotation origin +// SVBT8 rgb[]; // 0x3a variable array of bytes containing Window's metafile, bitmap or TIFF file filename. }; struct WW8_TBD { SVBT8 aBits1; -// BYTE jc : 3; // 0x07 justification code: 0=left tab, 1=centered tab, 2=right tab, 3=decimal tab, 4=bar -// BYTE tlc : 3; // 0x38 tab leader code: 0=no leader, 1=dotted leader, +// BYTE jc : 3; // 0x07 justification code: 0=left tab, 1=centered tab, 2=right tab, 3=decimal tab, 4=bar +// BYTE tlc : 3; // 0x38 tab leader code: 0=no leader, 1=dotted leader, // 2=hyphenated leader, 3=single line leader, 4=heavy line leader -// * int :2 C0 reserved +// * int :2 C0 reserved }; -struct WW8_TCell // hiermit wird weitergearbeitet (entspricht weitestgehend dem Ver8-Format) +struct WW8_TCell // hiermit wird weitergearbeitet (entspricht weitestgehend dem Ver8-Format) { - BOOL bFirstMerged : 1;// 0001 set to 1 when cell is first cell of a range of cells that have been merged. - BOOL bMerged : 1;// 0002 set to 1 when cell has been merged with preceding cell. - BOOL bVertical : 1;// set to 1 when cell has vertical text flow - BOOL bBackward : 1;// for a vertical table cell, text flow is bottom to top when 1 and is bottom to top when 0. - BOOL bRotateFont : 1;// set to 1 when cell has rotated characters (i.e. uses @font) - BOOL bVertMerge : 1;// set to 1 when cell is vertically merged with the cell(s) above and/or below. When cells are vertically merged, the display area of the merged cells are consolidated. The consolidated area is used to display the contents of the first vertically merged cell (the cell with fVertRestart set to 1), and all other vertically merged cells (those with fVertRestart set to 0) must be empty. Cells can only be merged vertically if their left and right boundaries are (nearly) identical (i.e. if corresponding entries in rgdxaCenter of the table rows differ by at most 3). - BOOL bVertRestart : 1;// set to 1 when the cell is the first of a set of vertically merged cells. The contents of a cell with fVertStart set to 1 are displayed in the consolidated area belonging to the entire set of vertically merged cells. Vertically merged cells with fVertRestart set to 0 must be empty. - BYTE nVertAlign : 2;// specifies the alignment of the cell contents relative to text flow (e.g. in a cell with bottom to top text flow and bottom vertical alignment, the text is shifted horizontally to match the cell's right boundary): - // 0 top - // 1 center - // 2 bottom - UINT16 fUnused : 7;// reserved - nicht loeschen: macht das UINT16 voll !! + BOOL bFirstMerged : 1;// 0001 set to 1 when cell is first cell of a range of cells that have been merged. + BOOL bMerged : 1;// 0002 set to 1 when cell has been merged with preceding cell. + BOOL bVertical : 1;// set to 1 when cell has vertical text flow + BOOL bBackward : 1;// for a vertical table cell, text flow is bottom to top when 1 and is bottom to top when 0. + BOOL bRotateFont : 1;// set to 1 when cell has rotated characters (i.e. uses @font) + BOOL bVertMerge : 1;// set to 1 when cell is vertically merged with the cell(s) above and/or below. When cells are vertically merged, the display area of the merged cells are consolidated. The consolidated area is used to display the contents of the first vertically merged cell (the cell with fVertRestart set to 1), and all other vertically merged cells (those with fVertRestart set to 0) must be empty. Cells can only be merged vertically if their left and right boundaries are (nearly) identical (i.e. if corresponding entries in rgdxaCenter of the table rows differ by at most 3). + BOOL bVertRestart : 1;// set to 1 when the cell is the first of a set of vertically merged cells. The contents of a cell with fVertStart set to 1 are displayed in the consolidated area belonging to the entire set of vertically merged cells. Vertically merged cells with fVertRestart set to 0 must be empty. + BYTE nVertAlign : 2;// specifies the alignment of the cell contents relative to text flow (e.g. in a cell with bottom to top text flow and bottom vertical alignment, the text is shifted horizontally to match the cell's right boundary): + // 0 top + // 1 center + // 2 bottom + UINT16 fUnused : 7;// reserved - nicht loeschen: macht das UINT16 voll !! - WW8_BRC rgbrc[4]; // border codes + WW8_BRC rgbrc[4]; // border codes //notational convenience for referring to brcTop, brcLeft, etc fields. -// BRC brcTop; // specification of the top border of a table cell -// BRC brcLeft; // specification of left border of table row -// BRC brcBottom; // specification of bottom border of table row -// BRC brcRight; // specification of right border of table row. +// BRC brcTop; // specification of the top border of a table cell +// BRC brcLeft; // specification of left border of table row +// BRC brcBottom; // specification of bottom border of table row +// BRC brcRight; // specification of right border of table row. }; // cbTC (count of bytes of a TC) is 18(decimal), 12(hex). -struct WW8_TCellVer6 // wird aus der Datei gelesen +struct WW8_TCellVer6 // wird aus der Datei gelesen { SVBT8 aBits1Ver6; SVBT8 aBits2Ver6; -// UINT16 fFirstMerged : 1;// 0001 set to 1 when cell is first cell of a range of cells that have been merged. -// UINT16 fMerged : 1; // 0002 set to 1 when cell has been merged with preceding cell. -// UINT16 fUnused : 14; // FFFC reserved +// UINT16 fFirstMerged : 1;// 0001 set to 1 when cell is first cell of a range of cells that have been merged. +// UINT16 fMerged : 1; // 0002 set to 1 when cell has been merged with preceding cell. +// UINT16 fUnused : 14; // FFFC reserved WW8_BRCVer6 rgbrcVer6[4]; // notational convenience for referring to brcTop, brcLeft, etc fields: -// BRC brcTop; // specification of the top border of a table cell -// BRC brcLeft; // specification of left border of table row -// BRC brcBottom; // specification of bottom border of table row -// BRC brcRight; // specification of right border of table row. +// BRC brcTop; // specification of the top border of a table cell +// BRC brcLeft; // specification of left border of table row +// BRC brcBottom; // specification of bottom border of table row +// BRC brcRight; // specification of right border of table row. }; // cbTC (count of bytes of a TC) is 10(decimal), A(hex). -struct WW8_TCellVer8 // wird aus der Datei gelesen +struct WW8_TCellVer8 // wird aus der Datei gelesen { - SVBT16 aBits1Ver8; // Dokumentation siehe oben unter WW8_TCell - SVBT16 aUnused; // reserve - WW8_BRC rgbrcVer8[4]; // Dokumentation siehe oben unter WW8_TCell + SVBT16 aBits1Ver8; // Dokumentation siehe oben unter WW8_TCell + SVBT16 aUnused; // reserve + WW8_BRC rgbrcVer8[4]; // Dokumentation siehe oben unter WW8_TCell }; // cbTC (count of bytes of a TC) is 20(decimal), 14(hex). -struct WW8_SHD // struct SHD fehlt in der Beschreibung +struct WW8_SHD // struct SHD fehlt in der Beschreibung { private: UINT16 aBits; -// UINT16 nFore : 5; // 0x001f ForegroundColor -// UINT16 nBack : 5; // 0x03e0 BackgroundColor -// UINT16 nStyle : 5; // 0x7c00 Percentage and Style -// UINT16 nDontKnow : 1; // 0x8000 ??? ab Ver8: ebenfalls fuer Style +// UINT16 nFore : 5; // 0x001f ForegroundColor +// UINT16 nBack : 5; // 0x03e0 BackgroundColor +// UINT16 nStyle : 5; // 0x7c00 Percentage and Style +// UINT16 nDontKnow : 1; // 0x8000 ??? ab Ver8: ebenfalls fuer Style public: WW8_SHD(){ aBits = 0; } - BYTE GetFore() const { return (BYTE)( aBits & 0x1f); } - BYTE GetBack() const { return (BYTE)((aBits >> 5 ) & 0x1f); } - BYTE GetStyle(BOOL bVer67) const { return (BYTE)((aBits >> 10) & ( bVer67?0x1f:0x3f ) ); } + BYTE GetFore() const { return (BYTE)( aBits & 0x1f); } + BYTE GetBack() const { return (BYTE)((aBits >> 5 ) & 0x1f); } + BYTE GetStyle(BOOL bVer67) const { return (BYTE)((aBits >> 10) & ( bVer67?0x1f:0x3f ) ); } - UINT16 GetValue() const { return aBits; } + UINT16 GetValue() const { return aBits; } void SetValue( UINT16 nVal ){ aBits = nVal; } void SetWWValue( SVBT16 nVal ){ aBits = (UINT16)SVBT16ToShort( nVal ); } @@ -511,135 +511,135 @@ public: struct WW8_ANLV { - SVBT8 nfc; // 0 number format code, 0=Arabic, 1=Upper case Roman, 2=Lower case Roman - // 3=Upper case Letter, 4=Lower case letter, 5=Ordinal - SVBT8 cbTextBefore; // 1 offset into anld.rgch limit of prefix text - SVBT8 cbTextAfter; // 2 + SVBT8 nfc; // 0 number format code, 0=Arabic, 1=Upper case Roman, 2=Lower case Roman + // 3=Upper case Letter, 4=Lower case letter, 5=Ordinal + SVBT8 cbTextBefore; // 1 offset into anld.rgch limit of prefix text + SVBT8 cbTextAfter; // 2 SVBT8 aBits1; -// BYTE jc : 2; // 3 : 0x03 justification code, 0=left, 1=center, 2=right, 3=left and right justify -// BYTE fPrev : 1; // 0x04 when ==1, include previous levels -// BYTE fHang : 1; // 0x08 when ==1, number will be displayed using a hanging indent -// BYTE fSetBold : 1; // 0x10 when ==1, boldness of number will be determined by anld.fBold. -// BYTE fSetItalic : 1;// 0x20 when ==1, italicness of number will be determined by anld.fItalic -// BYTE fSetSmallCaps : 1;// 0x40 when ==1, anld.fSmallCaps will determine whether number will be displayed in small caps or not. -// BYTE fSetCaps : 1; // 0x80 when ==1, anld.fCaps will determine whether number will be displayed capitalized or not +// BYTE jc : 2; // 3 : 0x03 justification code, 0=left, 1=center, 2=right, 3=left and right justify +// BYTE fPrev : 1; // 0x04 when ==1, include previous levels +// BYTE fHang : 1; // 0x08 when ==1, number will be displayed using a hanging indent +// BYTE fSetBold : 1; // 0x10 when ==1, boldness of number will be determined by anld.fBold. +// BYTE fSetItalic : 1;// 0x20 when ==1, italicness of number will be determined by anld.fItalic +// BYTE fSetSmallCaps : 1;// 0x40 when ==1, anld.fSmallCaps will determine whether number will be displayed in small caps or not. +// BYTE fSetCaps : 1; // 0x80 when ==1, anld.fCaps will determine whether number will be displayed capitalized or not SVBT8 aBits2; -// BYTE fSetStrike : 1;// 4 : 0x01 when ==1, anld.fStrike will determine whether the number will be displayed using strikethrough or not. -// BYTE fSetKul : 1; // 0x02 when ==1, anld.kul will determine the underlining state of the autonumber. -// BYTE fPrevSpace : 1;// 0x04 when ==1, autonumber will be displayed with a single prefixing space character -// BYTE fBold : 1; // 0x08 determines boldness of autonumber when anld.fSetBold == 1. -// BYTE fItalic : 1; // 0x10 determines italicness of autonumber when anld.fSetItalic == 1. -// BYTE fSmallCaps : 1;// 0x20 determines whether autonumber will be displayed using small caps when anld.fSetSmallCaps == 1. -// BYTE fCaps : 1; // 0x40 determines whether autonumber will be displayed using caps when anld.fSetCaps == 1. -// BYTE fStrike : 1; // 0x80 determines whether autonumber will be displayed using caps when anld.fSetStrike == 1. +// BYTE fSetStrike : 1;// 4 : 0x01 when ==1, anld.fStrike will determine whether the number will be displayed using strikethrough or not. +// BYTE fSetKul : 1; // 0x02 when ==1, anld.kul will determine the underlining state of the autonumber. +// BYTE fPrevSpace : 1;// 0x04 when ==1, autonumber will be displayed with a single prefixing space character +// BYTE fBold : 1; // 0x08 determines boldness of autonumber when anld.fSetBold == 1. +// BYTE fItalic : 1; // 0x10 determines italicness of autonumber when anld.fSetItalic == 1. +// BYTE fSmallCaps : 1;// 0x20 determines whether autonumber will be displayed using small caps when anld.fSetSmallCaps == 1. +// BYTE fCaps : 1; // 0x40 determines whether autonumber will be displayed using caps when anld.fSetCaps == 1. +// BYTE fStrike : 1; // 0x80 determines whether autonumber will be displayed using caps when anld.fSetStrike == 1. SVBT8 aBits3; -// BYTE kul : 3; // 5 : 0x07 determines whether autonumber will be displayed with underlining when anld.fSetKul == 1. -// BYTE ico : 5; // 0xF1 color of autonumber - SVBT16 ftc; // 6 font code of autonumber - SVBT16 hps; // 8 font half point size (or 0=auto) - SVBT16 iStartAt; // 0x0a starting value (0 to 65535) - SVBT16 dxaIndent; // 0x0c *short?* *USHORT?* width of prefix text (same as indent) - SVBT16 dxaSpace; // 0x0e minimum space between number and paragraph +// BYTE kul : 3; // 5 : 0x07 determines whether autonumber will be displayed with underlining when anld.fSetKul == 1. +// BYTE ico : 5; // 0xF1 color of autonumber + SVBT16 ftc; // 6 font code of autonumber + SVBT16 hps; // 8 font half point size (or 0=auto) + SVBT16 iStartAt; // 0x0a starting value (0 to 65535) + SVBT16 dxaIndent; // 0x0c *short?* *USHORT?* width of prefix text (same as indent) + SVBT16 dxaSpace; // 0x0e minimum space between number and paragraph }; // *cbANLV (count of bytes of ANLV) is 16 (decimal), 10(hex). struct WW8_ANLD { - WW8_ANLV eAnlv; // 0 - SVBT8 fNumber1; // 0x10 number only 1 item per table cell - SVBT8 fNumberAcross; // 0x11 number across cells in table rows(instead of down) - SVBT8 fRestartHdn; // 0x12 restart heading number on section boundary - SVBT8 fSpareX; // 0x13 unused( should be 0) - BYTE rgchAnld[32]; // 0x14 characters displayed before/after autonumber + WW8_ANLV eAnlv; // 0 + SVBT8 fNumber1; // 0x10 number only 1 item per table cell + SVBT8 fNumberAcross; // 0x11 number across cells in table rows(instead of down) + SVBT8 fRestartHdn; // 0x12 restart heading number on section boundary + SVBT8 fSpareX; // 0x13 unused( should be 0) + BYTE rgchAnld[32]; // 0x14 characters displayed before/after autonumber }; struct WW8_OLST { - WW8_ANLV rganlv[9]; // 0 an array of 9 ANLV structures (heading levels) - SVBT8 fRestartHdr; // 0x90 when ==1, restart heading on section break - SVBT8 fSpareOlst2; // 0x91 reserved - SVBT8 fSpareOlst3; // 0x92 reserved - SVBT8 fSpareOlst4; // 0x93 reserved - BYTE rgch[64]; // 0x94 array of 64 chars text before/after number + WW8_ANLV rganlv[9]; // 0 an array of 9 ANLV structures (heading levels) + SVBT8 fRestartHdr; // 0x90 when ==1, restart heading on section break + SVBT8 fSpareOlst2; // 0x91 reserved + SVBT8 fSpareOlst3; // 0x92 reserved + SVBT8 fSpareOlst4; // 0x93 reserved + BYTE rgch[64]; // 0x94 array of 64 chars text before/after number }; // cbOLST is 212(decimal), D4(hex). struct WW8_FDOA { - SVBT32 fc; // 0 FC pointing to drawing object data - SVBT16 ctxbx; // 4 count of textboxes in the drawing object + SVBT32 fc; // 0 FC pointing to drawing object data + SVBT16 ctxbx; // 4 count of textboxes in the drawing object }; struct WW8_DO { - SVBT16 dok; // 0 Drawn Object Kind, currently this is always 0 - SVBT16 cb; // 2 size (count of bytes) of the entire DO - SVBT8 bx; // 4 x position relative to anchor CP - SVBT8 by; // 5 y position relative to anchor CP - SVBT16 dhgt; // 6 height of DO + SVBT16 dok; // 0 Drawn Object Kind, currently this is always 0 + SVBT16 cb; // 2 size (count of bytes) of the entire DO + SVBT8 bx; // 4 x position relative to anchor CP + SVBT8 by; // 5 y position relative to anchor CP + SVBT16 dhgt; // 6 height of DO SVBT16 aBits1; -// UINT16 fAnchorLock : 1; // 8 1 if the DO anchor is locked -// BYTE[] rgdp; // 0xa variable length array of drawing primitives +// UINT16 fAnchorLock : 1; // 8 1 if the DO anchor is locked +// BYTE[] rgdp; // 0xa variable length array of drawing primitives }; struct WW8_DPHEAD { - SVBT16 dpk; // 0 Drawn Primitive Kind REVIEW davebu - // 0=start of grouping, 1=line, 2=textbox, 3=rectangle, - // 4=arc, 5=elipse, 6=polyline, 7=callout textbox, - // 8=end of grouping, 9=sample primitve holding default values - SVBT16 cb; // 2 size (count of bytes) of this DP - SVBT16 xa; // 4 These 2 points describe the rectangle - SVBT16 ya; // 6 enclosing this DP relative to the origin of - SVBT16 dxa; // 8 the DO - SVBT16 dya; // 0xa + SVBT16 dpk; // 0 Drawn Primitive Kind REVIEW davebu + // 0=start of grouping, 1=line, 2=textbox, 3=rectangle, + // 4=arc, 5=elipse, 6=polyline, 7=callout textbox, + // 8=end of grouping, 9=sample primitve holding default values + SVBT16 cb; // 2 size (count of bytes) of this DP + SVBT16 xa; // 4 These 2 points describe the rectangle + SVBT16 ya; // 6 enclosing this DP relative to the origin of + SVBT16 dxa; // 8 the DO + SVBT16 dya; // 0xa }; struct WW8_DP_LINETYPE { - SVBT32 lnpc; // LiNe Property Color -- RGB color value - SVBT16 lnpw; // line property weight in twips - SVBT16 lnps; // line property style : 0=Solid, 1=Dashed + SVBT32 lnpc; // LiNe Property Color -- RGB color value + SVBT16 lnpw; // line property weight in twips + SVBT16 lnps; // line property style : 0=Solid, 1=Dashed // 2=Dotted, 3=Dash Dot, 4=Dash Dot Dot, 5=Hollow }; -struct WW8_DP_SHADOW // Schattierung! +struct WW8_DP_SHADOW // Schattierung! { - SVBT16 shdwpi; // Shadow Property Intensity - SVBT16 xaOffset; // x offset of shadow - SVBT16 yaOffset; // y offset of shadow + SVBT16 shdwpi; // Shadow Property Intensity + SVBT16 xaOffset; // x offset of shadow + SVBT16 yaOffset; // y offset of shadow }; struct WW8_DP_FILL { - SVBT32 dlpcFg; // FiLl Property Color ForeGround -- RGB color value - SVBT32 dlpcBg; // Property Color BackGround -- RGB color value - SVBT16 flpp; // FiLl Property Pattern REVIEW davebu + SVBT32 dlpcFg; // FiLl Property Color ForeGround -- RGB color value + SVBT32 dlpcBg; // Property Color BackGround -- RGB color value + SVBT16 flpp; // FiLl Property Pattern REVIEW davebu }; struct WW8_DP_LINEEND { SVBT16 aStartBits; -// UINT16 eppsStart : 2; // Start EndPoint Property Style +// UINT16 eppsStart : 2; // Start EndPoint Property Style // 0=None, 1=Hollow, 2=Filled -// UINT16 eppwStart : 2; // Start EndPoint Property Weight -// UINT16 epplStart : 2; // Start EndPoint Property length -// UINT16 dummyStart : 10; // Alignment +// UINT16 eppwStart : 2; // Start EndPoint Property Weight +// UINT16 epplStart : 2; // Start EndPoint Property length +// UINT16 dummyStart : 10; // Alignment SVBT16 aEndBits; -// UINT16 eppsEnd : 2; // End EndPoint Property Style -// UINT16 eppwEnd : 2; // End EndPoint Property Weight -// UINT16 epplEnd : 2; // End EndPoint Property length -// UINT16 dummyEnd : 10; // Alignment +// UINT16 eppsEnd : 2; // End EndPoint Property Style +// UINT16 eppwEnd : 2; // End EndPoint Property Weight +// UINT16 epplEnd : 2; // End EndPoint Property length +// UINT16 dummyEnd : 10; // Alignment }; struct WW8_DP_LINE { -// WW8_DPHEAD dphead; // 0 Common header for a drawing primitive - SVBT16 xaStart; // starting point for line - SVBT16 yaStart; // - SVBT16 xaEnd; // ending point for line +// WW8_DPHEAD dphead; // 0 Common header for a drawing primitive + SVBT16 xaStart; // starting point for line + SVBT16 yaStart; // + SVBT16 xaEnd; // ending point for line SVBT16 yaEnd; WW8_DP_LINETYPE aLnt; WW8_DP_LINEEND aEpp; @@ -652,9 +652,9 @@ struct WW8_DP_TXTBOX WW8_DP_FILL aFill; WW8_DP_SHADOW aShd; SVBT16 aBits1; -// UINT16 fRoundCorners : 1; //0x24 0001 1 if the textbox has rounded corners -// UINT16 zaShape : 15; // 0x24 000e REVIEW davebu - SVBT16 dzaInternalMargin; // 0x26 REVIEW davebu +// UINT16 fRoundCorners : 1; //0x24 0001 1 if the textbox has rounded corners +// UINT16 zaShape : 15; // 0x24 000e REVIEW davebu + SVBT16 dzaInternalMargin; // 0x26 REVIEW davebu }; struct WW8_DP_RECT @@ -663,8 +663,8 @@ struct WW8_DP_RECT WW8_DP_FILL aFill; WW8_DP_SHADOW aShd; SVBT16 aBits1; -// UINT16 fRoundCorners : 1; // 0x24 0001 1 if the textbox has rounded corners -// UINT16 zaShape : 15; // 0x24 000e REVIEW davebu +// UINT16 fRoundCorners : 1; // 0x24 0001 1 if the textbox has rounded corners +// UINT16 zaShape : 15; // 0x24 000e REVIEW davebu }; struct WW8_DP_ARC @@ -672,10 +672,10 @@ struct WW8_DP_ARC WW8_DP_LINETYPE aLnt; WW8_DP_FILL aFill; WW8_DP_SHADOW aShd; - SVBT8 fLeft; // 0x24 00ff REVIEW davebu - SVBT8 fUp; // 0x24 ff00 REVIEW davebu -// UINT16 fLeft : 8; // 0x24 00ff REVIEW davebu -// UINT16 fUp : 8; // 0x24 ff00 REVIEW davebu + SVBT8 fLeft; // 0x24 00ff REVIEW davebu + SVBT8 fUp; // 0x24 ff00 REVIEW davebu +// UINT16 fLeft : 8; // 0x24 00ff REVIEW davebu +// UINT16 fUp : 8; // 0x24 ff00 REVIEW davebu }; struct WW8_DP_ELIPSE @@ -692,25 +692,25 @@ struct WW8_DP_POLYLINE WW8_DP_LINEEND aEpp; WW8_DP_SHADOW aShd; SVBT16 aBits1; -// UINT16 fPolygon : 1; // 0x28 0001 1 if this is a polygon -// UINT16 cpt : 15; // 0x28 00fe count of points -// short xaFirst; // 0x2a These are the endpoints of the first line. -// short yaFirst; // 0x2c -// short xaEnd; // 0x2e -// short yaEnd; // 0x30 -// short rgpta[]; // 0x32 An array of xa,ya pairs for the remaining points +// UINT16 fPolygon : 1; // 0x28 0001 1 if this is a polygon +// UINT16 cpt : 15; // 0x28 00fe count of points +// short xaFirst; // 0x2a These are the endpoints of the first line. +// short yaFirst; // 0x2c +// short xaEnd; // 0x2e +// short yaEnd; // 0x30 +// short rgpta[]; // 0x32 An array of xa,ya pairs for the remaining points }; struct WW8_DP_CALLOUT_TXTBOX { - SVBT16 flags; // 0x0c REVIEW davebu flags - SVBT16 dzaOffset; // 0x0e REVIEW davebu - SVBT16 dzaDescent; // 0x10 REVIEW davebu - SVBT16 dzaLength; // 0x12 REVIEW davebu - WW8_DPHEAD dpheadTxbx; // 0x14 DPHEAD for a textbox - WW8_DP_TXTBOX dptxbx; // 0x20 DP for a textbox - WW8_DPHEAD dpheadPolyLine; // 0x4c DPHEAD for a Polyline - WW8_DP_POLYLINE dpPolyLine; // 0x48 DP for a polyline + SVBT16 flags; // 0x0c REVIEW davebu flags + SVBT16 dzaOffset; // 0x0e REVIEW davebu + SVBT16 dzaDescent; // 0x10 REVIEW davebu + SVBT16 dzaLength; // 0x12 REVIEW davebu + WW8_DPHEAD dpheadTxbx; // 0x14 DPHEAD for a textbox + WW8_DP_TXTBOX dptxbx; // 0x20 DP for a textbox + WW8_DPHEAD dpheadPolyLine; // 0x4c DPHEAD for a Polyline + WW8_DP_POLYLINE dpPolyLine; // 0x48 DP for a polyline }; struct WW8_DP_DEFAULTS @@ -719,29 +719,29 @@ struct WW8_DP_DEFAULTS WW8_DP_FILL aFill; WW8_DP_LINEEND aEpp; WW8_DP_SHADOW aShd; - SVBT16 dzaOffset; // 0x2a REVIEW davebu - SVBT16 dzaDescent; // 0x2c REVIEW davebu - SVBT16 dzaLength; // 0x2e REVIEW davebu + SVBT16 dzaOffset; // 0x2a REVIEW davebu + SVBT16 dzaDescent; // 0x2c REVIEW davebu + SVBT16 dzaLength; // 0x2e REVIEW davebu SVBT16 aBits3; -// UINT16 fRoundCorners : 1; // 0x30 0001 1 if the textbox has rounded corners -// UINT16 zaShape : 15; // 0x30 000fe REVIEW davebu - SVBT16 dzaInternalMargin; // 0x32 REVIEW davebu +// UINT16 fRoundCorners : 1; // 0x30 0001 1 if the textbox has rounded corners +// UINT16 zaShape : 15; // 0x30 000fe REVIEW davebu + SVBT16 dzaInternalMargin; // 0x32 REVIEW davebu }; struct WW8_PCD { SVBT8 aBits1; -// BYTE fNoParaLast : 1; // when 1, means that piece contains no end of paragraph marks. -// BYTE fPaphNil : 1; // used internally by Word -// BYTE fCopied : 1; // used internally by Word -// * int :5 - SVBT8 aBits2; // fn int:8, used internally by Word - SVBT32 fc; // file offset of beginning of piece. The size of the +// BYTE fNoParaLast : 1; // when 1, means that piece contains no end of paragraph marks. +// BYTE fPaphNil : 1; // used internally by Word +// BYTE fCopied : 1; // used internally by Word +// * int :5 + SVBT8 aBits2; // fn int:8, used internally by Word + SVBT32 fc; // file offset of beginning of piece. The size of the // ithpiece can be determined by subtracting rgcp[i] of // the containing plcfpcd from its rgcp[i+1]. - SVBT16 prm; // PRM contains either a single sprm or else an index number + SVBT16 prm; // PRM contains either a single sprm or else an index number // of the grpprl which contains the sprms that modify the // properties of the piece. }; @@ -749,21 +749,21 @@ struct WW8_PCD struct WW8_PHE_Base { BYTE aBits1; // -// 0 0 fSpare int :1 0001 reserved -// fUnk int :1 0002 phe entry is invalid -// when == 1 -// fDiffLines int :1 0004 when 1, total -// height of paragraph is known but lines in -// paragraph have different heights. -// * int :5 00F8 reserved - BYTE nlMac; // when fDiffLines is 0 is number of lines in -// // paragraph - SVBT16 dxaCol; // width of lines in paragraph +// 0 0 fSpare int :1 0001 reserved +// fUnk int :1 0002 phe entry is invalid +// when == 1 +// fDiffLines int :1 0004 when 1, total +// height of paragraph is known but lines in +// paragraph have different heights. +// * int :5 00F8 reserved + BYTE nlMac; // when fDiffLines is 0 is number of lines in +// // paragraph + SVBT16 dxaCol; // width of lines in paragraph SVBT16 dyl; -// 4 4 dylLine int when fDiffLines is 0, -// is height of every line in paragraph.in pixels -// 4 4 dylHeight uns when fDiffLines is 1, -// is the total height in pixels of the paragraph +// 4 4 dylLine int when fDiffLines is 0, +// is height of every line in paragraph.in pixels +// 4 4 dylHeight uns when fDiffLines is 1, +// is the total height in pixels of the paragraph }; /* @@ -771,38 +771,38 @@ eigentlich muessten wir das jetzt in etwa *so* praezisieren: struct WW8_PHE_Ver6 : public WW8_PHE_Base { - // 6 Bytes gross + // 6 Bytes gross }; struct WW8_PHE_Ver6 : public WW8_PHE_Base { SVBT16 a; SVBT16 b; - SVBT16 c; // 12 Byte gross + SVBT16 c; // 12 Byte gross }; */ // AnnoTation Refernce Descriptor (ATRD) -struct WW8_ATRD // fuer die 8-Version +struct WW8_ATRD // fuer die 8-Version { - SVBT16 xstUsrInitl[ 10 ]; // pascal-style String holding initials + SVBT16 xstUsrInitl[ 10 ]; // pascal-style String holding initials // of annotation author - SVBT16 ibst; // index into GrpXstAtnOwners - SVBT16 ak; // not used - SVBT16 grfbmc; // not used - SVBT32 ITagBkmk; // when not -1, this tag identifies the + SVBT16 ibst; // index into GrpXstAtnOwners + SVBT16 ak; // not used + SVBT16 grfbmc; // not used + SVBT32 ITagBkmk; // when not -1, this tag identifies the // annotation bookmark that locates the // range of CPs in the main document which // this annotation references. }; -struct WW67_ATRD // fuer die 6/7-Version +struct WW67_ATRD // fuer die 6/7-Version { - sal_Char xstUsrInitl[ 10 ]; // pascal-style String holding initials + sal_Char xstUsrInitl[ 10 ]; // pascal-style String holding initials // of annotation author - SVBT16 ibst; // index into GrpXstAtnOwners - SVBT16 ak; // not used - SVBT16 grfbmc; // not used - SVBT32 ITagBkmk; // when not -1, this tag identifies the + SVBT16 ibst; // index into GrpXstAtnOwners + SVBT16 ak; // not used + SVBT16 grfbmc; // not used + SVBT32 ITagBkmk; // when not -1, this tag identifies the // annotation bookmark that locates the // range of CPs in the main document which // this annotation references. diff --git a/sw/source/filter/ww8/fields.cxx b/sw/source/filter/ww8/fields.cxx index 8df80add18f3..fa99b3a2811a 100644 --- a/sw/source/filter/ww8/fields.cxx +++ b/sw/source/filter/ww8/fields.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/filter/ww8/fields.hxx b/sw/source/filter/ww8/fields.hxx index a491109c0b7d..b70f816a0949 100644 --- a/sw/source/filter/ww8/fields.hxx +++ b/sw/source/filter/ww8/fields.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 @@ -32,11 +32,11 @@ namespace ww { - enum eField + enum eField { eNONE = 0, eUNKNOWN = 1, - ePOSSIBLEBOOKMARK = 2, + ePOSSIBLEBOOKMARK = 2, eREF = 3, eXE = 4, eFOOTREF = 5, @@ -131,9 +131,9 @@ namespace ww eGREETINGLINE = 94, eSHAPE = 95 }; - + /** Find the English Field Name from a winword index - + See OpenOffice.org issue 12831 (http://www.openoffice.org/issues/show_bug.cgi?id=12831) and MS Knowledge Base article 268717 diff --git a/sw/source/filter/ww8/hash_wrap.hxx b/sw/source/filter/ww8/hash_wrap.hxx index e089a15e1436..ff71be2369e5 100644 --- a/sw/source/filter/ww8/hash_wrap.hxx +++ b/sw/source/filter/ww8/hash_wrap.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/sw/source/filter/ww8/needed_cast.hxx b/sw/source/filter/ww8/needed_cast.hxx index 10fd8bedae45..8506fff9d07a 100644 --- a/sw/source/filter/ww8/needed_cast.hxx +++ b/sw/source/filter/ww8/needed_cast.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 @@ -53,7 +53,7 @@ namespace ww template<typename Ret, typename Param> Ret needed_cast(Param in) { /* - Massage a single argument and a ret value into two arguments to allow + Massage a single argument and a ret value into two arguments to allow a determination if the dest type is the same as the sourct type */ return checking_cast(in, Ret()); diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index 0776a5db231d..ba53111c3e83 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -2672,7 +2672,7 @@ void RtfAttributeOutput::FormatULSpace( const SvxULSpaceItem& rULSpace ) { if( m_rExport.bOutPageDescs ) { - + OSL_ENSURE( m_rExport.GetCurItemSet(), "Impossible" ); if ( !m_rExport.GetCurItemSet() ) return; @@ -3201,15 +3201,15 @@ static OString WriteHex(OString sString) } void lcl_AppendSP( OStringBuffer& rBuffer, - const char cName[], - const ::rtl::OUString& rValue, + const char cName[], + const ::rtl::OUString& rValue, const RtfExport& rExport ) { rBuffer.append( "{" OOO_STRING_SVTOOLS_RTF_SP "{" ); // "{\sp{" rBuffer.append( OOO_STRING_SVTOOLS_RTF_SN " " );//" \sn " - rBuffer.append( cName ); //"PropName" + rBuffer.append( cName ); //"PropName" rBuffer.append( "}{" OOO_STRING_SVTOOLS_RTF_SV " " ); -// "}{ \sv " +// "}{ \sv " rBuffer.append( rExport.OutString( rValue, rExport.eCurrentEncoding ) ); rBuffer.append( "}}" ); } diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx index ca837d9d97e4..d9696139fa6e 100644 --- a/sw/source/filter/ww8/rtfexport.cxx +++ b/sw/source/filter/ww8/rtfexport.cxx @@ -363,7 +363,7 @@ void RtfExport::DoFormText(const SwInputField* pFld ) if( sStatus.getLength() ) m_pAttrOutput->RunText().append( OOO_STRING_SVTOOLS_RTF_FFOWNSTAT ); m_pAttrOutput->RunText().append( OOO_STRING_SVTOOLS_RTF_FFTYPETXT "0" ); - + if( sName.getLength() ) m_pAttrOutput->RunText().append( "{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_FFNAME " ").append( OutString( sName, eDefaultEncoding )).append( "}" ); if( sHelp.getLength() ) @@ -548,7 +548,7 @@ void RtfExport::ExportDocument_Impl() if( pDoc->GetPageDescCnt() ) { //JP 06.04.99: Bug 64361 - Seeking the first SwFmtPageDesc. If - // no set, the default is valid + // no set, the default is valid const SwFmtPageDesc* pSttPgDsc = 0; { const SwNode& rSttNd = *pDoc->GetNodes()[ @@ -622,7 +622,7 @@ void RtfExport::ExportDocument_Impl() // All sections are unlocked by default Strm() << OOO_STRING_SVTOOLS_RTF_SECTUNLOCKED; OutLong(1); - OutPageDescription( rPageDesc, FALSE, TRUE ); // Changed bCheckForFirstPage to TRUE so headers + OutPageDescription( rPageDesc, FALSE, TRUE ); // Changed bCheckForFirstPage to TRUE so headers // following title page are correctly added - i13107 if( pSttPgDsc ) { @@ -647,24 +647,24 @@ void RtfExport::ExportDocument_Impl() switch( rFtnInfo.eNum ) { - case FTNNUM_PAGE: pOut = OOO_STRING_SVTOOLS_RTF_FTNRSTPG; break; - case FTNNUM_DOC: pOut = OOO_STRING_SVTOOLS_RTF_FTNRSTCONT; break; + case FTNNUM_PAGE: pOut = OOO_STRING_SVTOOLS_RTF_FTNRSTPG; break; + case FTNNUM_DOC: pOut = OOO_STRING_SVTOOLS_RTF_FTNRSTCONT; break; // case FTNNUM_CHAPTER: - default: pOut = OOO_STRING_SVTOOLS_RTF_FTNRESTART; break; + default: pOut = OOO_STRING_SVTOOLS_RTF_FTNRESTART; break; } Strm() << pOut; switch( rFtnInfo.aFmt.GetNumberingType() ) { case SVX_NUM_CHARS_LOWER_LETTER: - case SVX_NUM_CHARS_LOWER_LETTER_N: pOut = OOO_STRING_SVTOOLS_RTF_FTNNALC; break; + case SVX_NUM_CHARS_LOWER_LETTER_N: pOut = OOO_STRING_SVTOOLS_RTF_FTNNALC; break; case SVX_NUM_CHARS_UPPER_LETTER: - case SVX_NUM_CHARS_UPPER_LETTER_N: pOut = OOO_STRING_SVTOOLS_RTF_FTNNAUC; break; - case SVX_NUM_ROMAN_LOWER: pOut = OOO_STRING_SVTOOLS_RTF_FTNNRLC; break; - case SVX_NUM_ROMAN_UPPER: pOut = OOO_STRING_SVTOOLS_RTF_FTNNRUC; break; - case SVX_NUM_CHAR_SPECIAL: pOut = OOO_STRING_SVTOOLS_RTF_FTNNCHI; break; + case SVX_NUM_CHARS_UPPER_LETTER_N: pOut = OOO_STRING_SVTOOLS_RTF_FTNNAUC; break; + case SVX_NUM_ROMAN_LOWER: pOut = OOO_STRING_SVTOOLS_RTF_FTNNRLC; break; + case SVX_NUM_ROMAN_UPPER: pOut = OOO_STRING_SVTOOLS_RTF_FTNNRUC; break; + case SVX_NUM_CHAR_SPECIAL: pOut = OOO_STRING_SVTOOLS_RTF_FTNNCHI; break; // case SVX_NUM_ARABIC: - default: pOut = OOO_STRING_SVTOOLS_RTF_FTNNAR; break; + default: pOut = OOO_STRING_SVTOOLS_RTF_FTNNAR; break; } Strm() << pOut; @@ -678,14 +678,14 @@ void RtfExport::ExportDocument_Impl() switch( rEndNoteInfo.aFmt.GetNumberingType() ) { case SVX_NUM_CHARS_LOWER_LETTER: - case SVX_NUM_CHARS_LOWER_LETTER_N: pOut = OOO_STRING_SVTOOLS_RTF_AFTNNALC; break; + case SVX_NUM_CHARS_LOWER_LETTER_N: pOut = OOO_STRING_SVTOOLS_RTF_AFTNNALC; break; case SVX_NUM_CHARS_UPPER_LETTER: - case SVX_NUM_CHARS_UPPER_LETTER_N: pOut = OOO_STRING_SVTOOLS_RTF_AFTNNAUC; break; - case SVX_NUM_ROMAN_LOWER: pOut = OOO_STRING_SVTOOLS_RTF_AFTNNRLC; break; - case SVX_NUM_ROMAN_UPPER: pOut = OOO_STRING_SVTOOLS_RTF_AFTNNRUC; break; - case SVX_NUM_CHAR_SPECIAL: pOut = OOO_STRING_SVTOOLS_RTF_AFTNNCHI; break; + case SVX_NUM_CHARS_UPPER_LETTER_N: pOut = OOO_STRING_SVTOOLS_RTF_AFTNNAUC; break; + case SVX_NUM_ROMAN_LOWER: pOut = OOO_STRING_SVTOOLS_RTF_AFTNNRLC; break; + case SVX_NUM_ROMAN_UPPER: pOut = OOO_STRING_SVTOOLS_RTF_AFTNNRUC; break; + case SVX_NUM_CHAR_SPECIAL: pOut = OOO_STRING_SVTOOLS_RTF_AFTNNCHI; break; // case SVX_NUM_ARABIC: - default: pOut = OOO_STRING_SVTOOLS_RTF_AFTNNAR; break; + default: pOut = OOO_STRING_SVTOOLS_RTF_AFTNNAR; break; } Strm() << pOut; } diff --git a/sw/source/filter/ww8/rtfsdrexport.cxx b/sw/source/filter/ww8/rtfsdrexport.cxx index cdb75421951d..f2a97c8b5e12 100644 --- a/sw/source/filter/ww8/rtfsdrexport.cxx +++ b/sw/source/filter/ww8/rtfsdrexport.cxx @@ -475,7 +475,7 @@ sal_Int32 RtfSdrExport::StartShape() for(std::map<OString,OString>::reverse_iterator i = m_aShapeProps.rbegin(); i != m_aShapeProps.rend(); i++) lcl_AppendSP(m_rAttrOutput.RunText(), (*i).first, (*i).second ); - + lcl_AppendSP(m_rAttrOutput.RunText(), "wzDescription", RtfExport::OutString( m_pSdrObject->GetDescription(), m_rExport.eCurrentEncoding)); lcl_AppendSP(m_rAttrOutput.RunText(), "wzName", RtfExport::OutString( m_pSdrObject->GetTitle(), m_rExport.eCurrentEncoding)); diff --git a/sw/source/filter/ww8/sortedarray.hxx b/sw/source/filter/ww8/sortedarray.hxx index 6147964e4d2f..93e62b9c3dff 100644 --- a/sw/source/filter/ww8/sortedarray.hxx +++ b/sw/source/filter/ww8/sortedarray.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/sw/source/filter/ww8/staticassert.hxx b/sw/source/filter/ww8/staticassert.hxx index 3d1a3c2bceea..d2a998cf7e14 100644 --- a/sw/source/filter/ww8/staticassert.hxx +++ b/sw/source/filter/ww8/staticassert.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/sw/source/filter/ww8/styles.cxx b/sw/source/filter/ww8/styles.cxx index 517c412117a8..928c1408e144 100644 --- a/sw/source/filter/ww8/styles.cxx +++ b/sw/source/filter/ww8/styles.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,7 +52,7 @@ namespace const sal_Char **GetStiNames() throw() { - static const sal_Char *stiName[] = + static const sal_Char *stiName[] = { "Normal", "Heading 1", @@ -201,9 +201,9 @@ namespace ww return stiUser; else { - static sti aMapping[] = + static sti aMapping[] = { - stiNil, stiAtnRef, stiAtnText, stiToc8, stiToc7, stiToc6, + stiNil, stiAtnRef, stiAtnText, stiToc8, stiToc7, stiToc6, stiToc5, stiToc4, stiToc3, stiToc2, stiToc1, stiIndex7, stiIndex6, stiIndex5, stiIndex4, stiIndex3, stiIndex2, stiIndex1, stiLnn, stiIndexHeading, stiFooter, stiHeader, diff --git a/sw/source/filter/ww8/tracer.cxx b/sw/source/filter/ww8/tracer.cxx index 78b27197676f..fe3141900e75 100644 --- a/sw/source/filter/ww8/tracer.cxx +++ b/sw/source/filter/ww8/tracer.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/filter/ww8/tracer.hxx b/sw/source/filter/ww8/tracer.hxx index df6d7c497108..1d885866a923 100644 --- a/sw/source/filter/ww8/tracer.hxx +++ b/sw/source/filter/ww8/tracer.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 @@ -78,7 +78,7 @@ namespace sw Tracer(const SfxMedium &rMedium); MSFilterTracer *GetTrace() const { return mpTrace; } void EnterEnvironment(Environment eContext); - void EnterEnvironment(Environment eContext, + void EnterEnvironment(Environment eContext, const rtl::OUString &rDetails); void Log(Problem eProblem); void LeaveEnvironment(Environment eContext); diff --git a/sw/source/filter/ww8/types.hxx b/sw/source/filter/ww8/types.hxx index 652baec7bfc1..af9df2069201 100644 --- a/sw/source/filter/ww8/types.hxx +++ b/sw/source/filter/ww8/types.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,14 +45,14 @@ namespace ww inline bool IsSevenMinus(WordVersion eVer) { return eVer <= eWW7; } inline bool IsEightPlus(WordVersion eVer) { return eVer >= eWW8; } - /** For custom wrapping + /** For custom wrapping When you edit the wrap points of a contour in word, word uses a relative scale of 0 to 21600 where 21600 is apparently 100% of the graphic width */ const int nWrap100Percent = 21600; } - + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/ww8/typessw.hxx b/sw/source/filter/ww8/typessw.hxx index 7d12833d49fe..0c35a3b00377 100644 --- a/sw/source/filter/ww8/typessw.hxx +++ b/sw/source/filter/ww8/typessw.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/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx index 8b7dbb8bc669..31c1d6be25ed 100644 --- a/sw/source/filter/ww8/writerhelper.cxx +++ b/sw/source/filter/ww8/writerhelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ #include <com/sun/star/util/XCloseable.hpp> #include <doc.hxx> -# include "writerhelper.hxx" +# include "writerhelper.hxx" # include <msfilter.hxx> #include <com/sun/star/container/XChild.hpp> #include <com/sun/star/embed/EmbedStates.hpp> diff --git a/sw/source/filter/ww8/writerhelper.hxx b/sw/source/filter/ww8/writerhelper.hxx index 0e5edf1bb182..3cdd0c4d69e1 100644 --- a/sw/source/filter/ww8/writerhelper.hxx +++ b/sw/source/filter/ww8/writerhelper.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/sw/source/filter/ww8/writerwordglue.cxx b/sw/source/filter/ww8/writerwordglue.cxx index d37b2f07ac77..89f7d4b51504 100644 --- a/sw/source/filter/ww8/writerwordglue.cxx +++ b/sw/source/filter/ww8/writerwordglue.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,7 +57,7 @@ # include <fmtfsize.hxx> //SwFmtFrmSize # include <swrect.hxx> //SwRect # include <fmthdft.hxx> //SwFmtHeader/SwFmtFooter -# include <frmatr.hxx> //GetLRSpace... +# include <frmatr.hxx> //GetLRSpace... # include <ndtxt.hxx> //SwTxtNode # include <breakit.hxx> //pBreakIt @@ -997,7 +997,7 @@ namespace sw } ++nI; } - + if (bForceNatNum) bForceJapanese = true; diff --git a/sw/source/filter/ww8/writerwordglue.hxx b/sw/source/filter/ww8/writerwordglue.hxx index e52d29940d83..b267ba302b48 100644 --- a/sw/source/filter/ww8/writerwordglue.hxx +++ b/sw/source/filter/ww8/writerwordglue.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 @@ -141,7 +141,7 @@ namespace sw bool HasHeader() const { return mbHasHeader; } bool HasFooter() const { return mbHasFooter; } - /** Is the top of the page the same in both objects + /** Is the top of the page the same in both objects Ignoring the difference in header and footers, will the main document text have the same top/bottom bounds in word between diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index 2f7220460104..2bc80af8dcd0 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -173,8 +173,8 @@ void WW8Export::DoComboBox(uno::Reference<beans::XPropertySet> xPropSet) // --> OD 2010-05-14 #160026# // property "Help" does not exist and due to the no-existence an exception is thrown. // uno::Any aTmp = xPropSet->getPropertyValue(C2U("Help")); - try - { + try + { uno::Any aTmp = xPropSet->getPropertyValue(C2U("HelpText")); // <-- const rtl::OUString *pStr = (const rtl::OUString *)aTmp.getValue(); diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx index 01bd84f1e6e1..faf6002853a6 100644 --- a/sw/source/filter/ww8/wrtw8nds.cxx +++ b/sw/source/filter/ww8/wrtw8nds.cxx @@ -602,9 +602,10 @@ const SfxPoolItem* SwWW8AttrIter::HasTextItem( USHORT nWhich ) const { const SfxPoolItem* pRet = 0; const SwpHints* pTxtAttrs = rNd.GetpSwpHints(); - xub_StrLen nTmpSwPos = m_rExport.m_aCurrentCharPropStarts.top(); - if (pTxtAttrs) + + if (pTxtAttrs && m_rExport.m_aCurrentCharPropStarts.size()) { + xub_StrLen nTmpSwPos = m_rExport.m_aCurrentCharPropStarts.top(); for (USHORT i = 0; i < pTxtAttrs->Count(); ++i) { const SwTxtAttr* pHt = (*pTxtAttrs)[i]; @@ -1821,7 +1822,7 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode ) IDocumentMarkAccess* const pMarkAccess = pDoc->getIDocumentMarkAccess(); if ( ch == CH_TXT_ATR_FIELDSTART ) { - SwPosition aPosition( rNode, SwIndex( const_cast< SwTxtNode* >( &rNode ), nAktPos + 1 ) ); + SwPosition aPosition( rNode, SwIndex( const_cast< SwTxtNode* >( &rNode ), nAktPos ) ); ::sw::mark::IFieldmark const * const pFieldmark = pMarkAccess->getFieldmarkFor( aPosition ); OSL_ENSURE( pFieldmark, "Looks like this doc is broken...; where is the Fieldmark for the FIELDSTART??" ); @@ -1873,9 +1874,9 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode ) } else if ( ch == CH_TXT_ATR_FIELDEND ) { - SwPosition aPosition( rNode, SwIndex( const_cast< SwTxtNode* >( &rNode ), nAktPos ) ); + SwPosition aPosition( rNode, SwIndex( const_cast< SwTxtNode* >( &rNode ), nAktPos - 1 ) ); ::sw::mark::IFieldmark const * const pFieldmark = pMarkAccess->getFieldmarkFor( aPosition ); - OSL_ENSURE( pFieldmark, "Looks like this doc is broken...; where is the Fieldmark for the FIELDSTART??" ); + OSL_ENSURE( pFieldmark, "Looks like this doc is broken...; where is the Fieldmark for the FIELDEND??" ); ww::eField eFieldId = lcl_getFieldId( pFieldmark ); if ( pFieldmark->GetFieldname().equalsAscii( ODF_UNHANDLED ) ) diff --git a/sw/source/filter/ww8/wrtw8num.cxx b/sw/source/filter/ww8/wrtw8num.cxx index 8abe5c4200e9..b430366e0477 100644 --- a/sw/source/filter/ww8/wrtw8num.cxx +++ b/sw/source/filter/ww8/wrtw8num.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -234,7 +234,7 @@ void WW8AttributeOutput::NumberingLevel( BYTE /*nLevel*/, default: nAlign = 0; break; } *m_rWW8Export.pTableStrm << nAlign; - + // Write the rgbxchNums[9], positions of placeholders for paragraph // numbers in the text m_rWW8Export.pTableStrm->Write( pNumLvlPos, WW8ListManager::nMaxLevel ); diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index 05e535cff636..f8b34bb3174f 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -268,19 +268,19 @@ static void WriteDop( WW8Export& rWrt ) xDocProps = xDPS->getDocumentProperties(); DBG_ASSERT(xDocProps.is(), "DocumentProperties is null"); - rDop.lKeyProtDoc = pDocShell->GetModifyPasswordHash(); + rDop.lKeyProtDoc = pDocShell->GetModifyPasswordHash(); } if ((rWrt.pSepx && rWrt.pSepx->DocumentIsProtected()) || rDop.lKeyProtDoc != 0) - { + { rDop.fProtEnabled = 1; } - else + else { rDop.fProtEnabled = 0; } - + if (!xDocProps.is()) { rDop.dttmCreated = rDop.dttmRevised = rDop.dttmLastPrint = 0x45FBAC69; } else { @@ -1624,7 +1624,7 @@ void SwWW8Writer::WriteString_xstz(SvStream& rStrm, const String& rStr, bool bAd ww::bytes aBytes; SwWW8Writer::InsUInt16(aBytes, rStr.Len()); SwWW8Writer::InsAsString16(aBytes, rStr); - if (bAddZero) + if (bAddZero) SwWW8Writer::InsUInt16(aBytes, 0); rStrm.Write(&aBytes[0], aBytes.size()); } @@ -1712,7 +1712,7 @@ void WW8Export::OutSwString(const String& rStr, xub_StrLen nStt, if( nStt || nLen != rStr.Len() ) { String sOut( rStr.Copy( nStt, nLen ) ); - + #ifdef DEBUG ::std::clog << ::rtl::OUStringToOString(sOut, RTL_TEXTENCODING_ASCII_US).getStr() << ::std::endl; #endif @@ -1722,7 +1722,7 @@ void WW8Export::OutSwString(const String& rStr, xub_StrLen nStt, else SwWW8Writer::WriteString8(Strm(), sOut, false, eChrSet); } - else + else { #ifdef DEBUG ::std::clog << ::rtl::OUStringToOString(rStr, RTL_TEXTENCODING_ASCII_US).getStr() << ::std::endl; @@ -1734,9 +1734,9 @@ void WW8Export::OutSwString(const String& rStr, xub_StrLen nStt, SwWW8Writer::WriteString8(Strm(), rStr, false, eChrSet); } } - + #ifdef DEBUG - ::std::clog << "</OutSwString>" << ::std::endl; + ::std::clog << "</OutSwString>" << ::std::endl; #endif } @@ -1746,7 +1746,7 @@ void WW8Export::WriteCR(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo WriteChar('\007'); else WriteChar( '\015' ); - + pPiece->SetParaBreak(); } @@ -1878,12 +1878,12 @@ void WW8AttributeOutput::TableInfoCell( ww8::WW8TableNodeInfoInner::Pointer_t pT if ( nDepth > 0 ) { - /* Cell */ + /* Cell */ m_rWW8Export.InsUInt16( NS_sprm::LN_PFInTable ); m_rWW8Export.pO->Insert( (BYTE)0x1, m_rWW8Export.pO->Count() ); m_rWW8Export.InsUInt16( NS_sprm::LN_PTableDepth ); m_rWW8Export.InsUInt32( nDepth ); - + if ( nDepth > 1 && pTableTextNodeInfoInner->isEndOfCell() ) { m_rWW8Export.InsUInt16( NS_sprm::LN_PCell ); @@ -1965,15 +1965,15 @@ static sal_uInt16 lcl_TCFlags(const SwTableBox * pBox, long nRowSpan) void WW8AttributeOutput::TableVerticalCell( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) { const SwTableBox * pTabBox = pTableTextNodeInfoInner->getTableBox(); - const SwTableLine * pTabLine = pTabBox->GetUpper(); + const SwTableLine * pTabLine = pTabBox->GetUpper(); const SwTableBoxes & rTblBoxes = pTabLine->GetTabBoxes(); - + sal_uInt8 nBoxes = rTblBoxes.Count(); for ( sal_uInt8 n = 0; n < nBoxes; n++ ) { const SwTableBox * pTabBox1 = rTblBoxes[n]; const SwFrmFmt * pFrmFmt = pTabBox1->GetFrmFmt(); - + if ( FRMDIR_VERT_TOP_RIGHT == m_rWW8Export.TrueFrameDirection( *pFrmFmt ) ) { m_rWW8Export.InsUInt16( NS_sprm::LN_TTextFlow ); @@ -1987,7 +1987,7 @@ void WW8AttributeOutput::TableVerticalCell( ww8::WW8TableNodeInfoInner::Pointer_ void WW8AttributeOutput::TableCanSplit( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) { const SwTableBox * pTabBox = pTableTextNodeInfoInner->getTableBox(); - const SwTableLine * pTabLine = pTabBox->GetUpper(); + const SwTableLine * pTabLine = pTabBox->GetUpper(); const SwFrmFmt * pLineFmt = pTabLine->GetFrmFmt(); /* @@ -1995,7 +1995,7 @@ void WW8AttributeOutput::TableCanSplit( ww8::WW8TableNodeInfoInner::Pointer_t pT feature equivalent to this, Word stores 1 for fCantSplit if the row cannot be split, we set true if we can split it. An example is #i4569# */ - + const SwFmtRowSplit& rSplittable = pLineFmt->GetRowSplit(); BYTE nCantSplit = (!rSplittable.GetValue()) ? 1 : 0; if ( m_rWW8Export.bWrtWW8 ) @@ -2015,7 +2015,7 @@ void WW8AttributeOutput::TableBidi( ww8::WW8TableNodeInfoInner::Pointer_t pTable { const SwTable * pTable = pTableTextNodeInfoInner->getTable(); const SwFrmFmt * pFrmFmt = pTable->GetFrmFmt(); - + if ( m_rWW8Export.bWrtWW8 ) { if ( m_rWW8Export.TrueFrameDirection(*pFrmFmt) == FRMDIR_HORI_RIGHT_TOP ) @@ -2029,7 +2029,7 @@ void WW8AttributeOutput::TableBidi( ww8::WW8TableNodeInfoInner::Pointer_t pTable void WW8AttributeOutput::TableHeight( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) { const SwTableBox * pTabBox = pTableTextNodeInfoInner->getTableBox(); - const SwTableLine * pTabLine = pTabBox->GetUpper(); + const SwTableLine * pTabLine = pTabBox->GetUpper(); const SwFrmFmt * pLineFmt = pTabLine->GetFrmFmt(); // Zeilenhoehe ausgeben sprmTDyaRowHeight @@ -2051,21 +2051,21 @@ void WW8AttributeOutput::TableHeight( ww8::WW8TableNodeInfoInner::Pointer_t pTab m_rWW8Export.pO->Insert( 189, m_rWW8Export.pO->Count() ); m_rWW8Export.InsUInt16( (USHORT)nHeight ); } - + } void WW8AttributeOutput::TableOrientation( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) { const SwTable * pTable = pTableTextNodeInfoInner->getTable(); - + const SwFrmFmt *pFmt = pTable->GetFrmFmt(); OSL_ENSURE(pFmt,"Impossible"); if (!pFmt) return; - + const SwFmtHoriOrient &rHori = pFmt->GetHoriOrient(); const SwFmtVertOrient &rVert = pFmt->GetVertOrient(); - + if ( (text::RelOrientation::PRINT_AREA == rHori.GetRelationOrient() || text::RelOrientation::FRAME == rHori.GetRelationOrient()) @@ -2095,11 +2095,11 @@ void WW8AttributeOutput::TableSpacing(ww8::WW8TableNodeInfoInner::Pointer_t pTab { const SwTable * pTable = pTableTextNodeInfoInner->getTable(); const SwTableFmt * pTableFmt = dynamic_cast<const SwTableFmt *>(pTable->GetRegisteredIn()); - + if (pTableFmt != NULL) { const SvxULSpaceItem & rUL = pTableFmt->GetULSpace(); - + if (rUL.GetUpper() > 0) { sal_uInt8 nPadding = 2; @@ -2123,13 +2123,13 @@ void WW8AttributeOutput::TableSpacing(ww8::WW8TableNodeInfoInner::Pointer_t pTab m_rWW8Export.InsUInt16(NS_sprm::LN_TDyaFromTextBottom); m_rWW8Export.InsUInt16(rUL.GetLower()); } - } + } } void WW8AttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) { const SwTable * pTable = pTableTextNodeInfoInner->getTable(); - + if ( pTable->GetRowsToRepeat() > pTableTextNodeInfoInner->getRow() ) { if( m_rWW8Export.bWrtWW8 ) @@ -2139,11 +2139,11 @@ void WW8AttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t m_rWW8Export.pO->Insert( 1, m_rWW8Export.pO->Count() ); } - ww8::TableBoxVectorPtr pTableBoxes = + ww8::TableBoxVectorPtr pTableBoxes = pTableTextNodeInfoInner->getTableBoxesOfRow(); // number of cell written sal_uInt32 nBoxes = pTableBoxes->size(); - + // sprm header m_rWW8Export.InsUInt16( NS_sprm::LN_TDefTable ); sal_uInt16 nSprmSize = 2 + (nBoxes + 1) * 2 + nBoxes * 20; @@ -2152,7 +2152,7 @@ void WW8AttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t // number of boxes m_rWW8Export.pO->Insert( static_cast<BYTE>(nBoxes), m_rWW8Export.pO->Count() ); - /* cellxs */ + /* cellxs */ /* ALWAYS relative when text::HoriOrientation::NONE (nPageSize + ( nPageSize / 10 )) < nTblSz, in that case the cell width's and table width's are not real. The table @@ -2167,9 +2167,9 @@ void WW8AttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t const SwFmtHoriOrient &rHori = pFmt->GetHoriOrient(); const SwFmtVertOrient &rVert = pFmt->GetVertOrient(); - + sal_uInt16 nTblOffset = 0; - + if ( (text::RelOrientation::PRINT_AREA == rHori.GetRelationOrient() || text::RelOrientation::FRAME == rHori.GetRelationOrient()) @@ -2192,61 +2192,61 @@ void WW8AttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t break; } } - + m_rWW8Export.InsUInt16( nTblOffset ); - + ww8::GridColsPtr pGridCols = GetGridCols( pTableTextNodeInfoInner ); - for ( ww8::GridCols::const_iterator it = pGridCols->begin(), + for ( ww8::GridCols::const_iterator it = pGridCols->begin(), end = pGridCols->end(); it != end; ++it ) { m_rWW8Export.InsUInt16( static_cast<USHORT>( *it ) + nTblOffset ); } - + /* TCs */ ww8::RowSpansPtr pRowSpans = pTableTextNodeInfoInner->getRowSpansOfRow(); ww8::RowSpans::const_iterator aItRowSpans = pRowSpans->begin(); ww8::TableBoxVector::const_iterator aIt; ww8::TableBoxVector::const_iterator aItEnd = pTableBoxes->end(); - + #ifdef DEBUG size_t nRowSpans = pRowSpans->size(); size_t nTableBoxes = pTableBoxes->size(); (void) nRowSpans; (void) nTableBoxes; #endif - + for( aIt = pTableBoxes->begin(); aIt != aItEnd; ++aIt, ++aItRowSpans) { #ifdef DEBUG sal_uInt16 npOCount = m_rWW8Export.pO->Count(); #endif - + const SwTableBox * pTabBox1 = *aIt; const SwFrmFmt * pBoxFmt = NULL; if (pTabBox1 != NULL) pBoxFmt = pTabBox1->GetFrmFmt(); - + if ( m_rWW8Export.bWrtWW8 ) { - sal_uInt16 nFlags = + sal_uInt16 nFlags = lcl_TCFlags(pTabBox1, *aItRowSpans); m_rWW8Export.InsUInt16( nFlags ); } - + static BYTE aNullBytes[] = { 0x0, 0x0 }; - + m_rWW8Export.pO->Insert( aNullBytes, 2, m_rWW8Export.pO->Count() ); // dummy if (pBoxFmt != NULL) { const SvxBoxItem & rBoxItem = pBoxFmt->GetBox(); - + m_rWW8Export.Out_SwFmtTableBox( *m_rWW8Export.pO, &rBoxItem ); // 8/16 Byte } else m_rWW8Export.Out_SwFmtTableBox( *m_rWW8Export.pO, NULL); // 8/16 Byte - + #ifdef DEBUG - ::std::clog << "<tclength>" << m_rWW8Export.pO->Count() - npOCount << "</tclength>" + ::std::clog << "<tclength>" << m_rWW8Export.pO->Count() - npOCount << "</tclength>" << ::std::endl; #endif } @@ -2256,7 +2256,7 @@ ww8::GridColsPtr AttributeOutputBase::GetGridCols( ww8::WW8TableNodeInfoInner::P { return pTableTextNodeInfoInner->getGridColsOfRow(*this); } - + void AttributeOutputBase::GetTablePageSize( ww8::WW8TableNodeInfoInner * pTableTextNodeInfoInner, sal_uInt32& rPageSize, bool& rRelBoxSize ) { sal_uInt32 nPageSize = 0; @@ -2310,9 +2310,9 @@ void AttributeOutputBase::GetTablePageSize( ww8::WW8TableNodeInfoInner * pTableT const SvxLRSpaceItem &rLR = pFmt->GetLRSpace(); nPageSize -= (rLR.GetLeft() + rLR.GetRight()); } - + } - + OSL_ENSURE(nWidthPercent, "Impossible"); if (nWidthPercent) { @@ -2337,7 +2337,7 @@ void WW8AttributeOutput::TableDefaultBorders( ww8::WW8TableNodeInfoInner::Pointe BOX_LINE_TOP, BOX_LINE_LEFT, BOX_LINE_BOTTOM, BOX_LINE_RIGHT }; - + for ( int i = 0; i < 4; ++i ) { SwWW8Writer::InsUInt16( *m_rWW8Export.pO, 0xD634 ); @@ -2346,7 +2346,7 @@ void WW8AttributeOutput::TableDefaultBorders( ww8::WW8TableNodeInfoInner::Pointe m_rWW8Export.pO->Insert( BYTE(1), m_rWW8Export.pO->Count() ); m_rWW8Export.pO->Insert( BYTE(1 << i), m_rWW8Export.pO->Count() ); m_rWW8Export.pO->Insert( BYTE(3), m_rWW8Export.pO->Count() ); - + SwWW8Writer::InsUInt16( *m_rWW8Export.pO, pFrmFmt->GetBox().GetDistance( aBorders[i] ) ); } @@ -2364,17 +2364,17 @@ void WW8AttributeOutput::TableBackgrounds( ww8::WW8TableNodeInfoInner::Pointer_t else m_rWW8Export.pO->Insert( (BYTE)191, m_rWW8Export.pO->Count() ); m_rWW8Export.pO->Insert( (BYTE)(nBoxes * 2), m_rWW8Export.pO->Count() ); // Len - + for ( sal_uInt8 n = 0; n < nBoxes; n++ ) { const SwTableBox * pBox1 = rTabBoxes[n]; const SwFrmFmt * pFrmFmt = pBox1->GetFrmFmt(); const SfxPoolItem * pI = NULL; Color aColor; - + if ( SFX_ITEM_ON == pFrmFmt->GetAttrSet().GetItemState( RES_BACKGROUND, false, &pI ) ) { - aColor = dynamic_cast<const SvxBrushItem *>(pI)->GetColor(); + aColor = dynamic_cast<const SvxBrushItem *>(pI)->GetColor(); } else aColor = COL_AUTO; @@ -2390,32 +2390,32 @@ void WW8AttributeOutput::TableBackgrounds( ww8::WW8TableNodeInfoInner::Pointer_t sal_uInt8 nBoxes0 = rTabBoxes.Count(); if (nBoxes0 > 21) nBoxes0 = 21; - + for (sal_uInt32 m = 0; m < 2; m++) { m_rWW8Export.InsUInt16( aSprmIds[m] ); - m_rWW8Export.pO->Insert( static_cast<BYTE>(nBoxes0 * 10), + m_rWW8Export.pO->Insert( static_cast<BYTE>(nBoxes0 * 10), m_rWW8Export.pO->Count() ); - + for ( sal_uInt8 n = 0; n < nBoxes0; n++ ) { const SwTableBox * pBox1 = rTabBoxes[n]; const SwFrmFmt * pFrmFmt = pBox1->GetFrmFmt(); const SfxPoolItem * pI = NULL; Color aColor; - - if ( SFX_ITEM_ON == + + if ( SFX_ITEM_ON == pFrmFmt->GetAttrSet(). GetItemState( RES_BACKGROUND, false, &pI ) ) { - aColor = dynamic_cast<const SvxBrushItem *>(pI)->GetColor(); + aColor = dynamic_cast<const SvxBrushItem *>(pI)->GetColor(); } else aColor = COL_AUTO; - + WW8SHDLong aSHD; aSHD.setCvFore( 0xFF000000 ); - + sal_uInt32 nBgColor = aColor.GetColor(); if ( nBgColor == COL_AUTO ) aSHD.setCvBack( 0xFF000000 ); @@ -2423,8 +2423,8 @@ void WW8AttributeOutput::TableBackgrounds( ww8::WW8TableNodeInfoInner::Pointer_t aSHD.setCvBack( wwUtility::RGBToBGR( nBgColor ) ); aSHD.Write( m_rWW8Export ); - } - } + } + } } } @@ -2522,16 +2522,16 @@ void MSWordExportBase::WriteText() SwNode * pCurrentNode = &pCurPam->GetPoint()->nNode.GetNode(); const SwNode * pNextNode = mpTableInfo->getNextNode(pCurrentNode); - + if (pNextNode != NULL) pCurPam->GetPoint()->nNode = SwNodeIndex(*pNextNode); else pCurPam->GetPoint()->nNode++; - + ULONG nPos = pCurPam->GetPoint()->nNode.GetIndex(); ::SetProgressState( nPos, pCurPam->GetDoc()->GetDocShell() ); } - + #ifdef DEBUG ::std::clog << "</WriteText>" << ::std::endl; #endif @@ -2720,13 +2720,13 @@ void WW8Export::WriteFkpPlcUsw() // Reclaim stored FIB data from document. ::ww8::WW8FibData * pFibData = dynamic_cast<ww8::WW8FibData *> (pDoc->getExternalData(::sw::FIB).get()); - + if ( pFibData ) // <-- { - pFib->fReadOnlyRecommended = + pFib->fReadOnlyRecommended = pFibData->getReadOnlyRecommended() ? 1 : 0; - pFib->fWriteReservation = + pFib->fWriteReservation = pFibData->getWriteReservation() ? 1 : 0; } @@ -2868,7 +2868,7 @@ namespace rCtx.Encode(in, nBS, in, nBS); rOut.Write(in, nBS); } - } + } } void MSWordExportBase::ExportDocument( bool bWriteAll ) @@ -3073,12 +3073,12 @@ void WW8Export::ExportDocument_Impl() StoreDoc1(); if ( bEncrypt ) - { + { // Generate random number with a seed of time as salt. TimeValue aTime; osl_getSystemTime( &aTime ); rtlRandomPool aRandomPool = rtl_random_createPool (); - rtl_random_addBytes ( aRandomPool, &aTime, 8 ); + rtl_random_addBytes ( aRandomPool, &aTime, 8 ); sal_uInt8 aDocId[ 16 ] = {0}; rtl_random_getBytes( aRandomPool, aDocId, 16 ); @@ -3098,11 +3098,11 @@ void WW8Export::ExportDocument_Impl() pDataStrmTemp = &xDataStrm; if ( pDataStrmTemp && pDataStrmTemp != pStrmTemp) - EncryptRC4(aCtx, *pDataStrm, *pDataStrmTemp); + EncryptRC4(aCtx, *pDataStrm, *pDataStrmTemp); EncryptRC4(aCtx, *pTableStrm, *pTableStrmTemp); - // Write Unencrypted Header 52 bytes to the start of the table stream + // Write Unencrypted Header 52 bytes to the start of the table stream // EncryptionVersionInfo (4 bytes): A Version structure where Version.vMajor MUST be 0x0001, and Version.vMinor MUST be 0x0001. pTableStrmTemp->Seek( 0 ); sal_uInt32 nEncType = 0x10001; @@ -3114,19 +3114,19 @@ void WW8Export::ExportDocument_Impl() pTableStrmTemp->Write( aDocId, 16 ); pTableStrmTemp->Write( pSaltData, 16 ); - pTableStrmTemp->Write( pSaltDigest, 16 ); + pTableStrmTemp->Write( pSaltDigest, 16 ); EncryptRC4(aCtx, GetWriter().Strm(), *pStrmTemp); - // Write Unencrypted Fib 68 bytes to the start of the workdocument stream + // Write Unencrypted Fib 68 bytes to the start of the workdocument stream pFib->fEncrypted = 1; // fEncrypted indicates the document is encrypted. pFib->fObfuscated = 0; // Must be 0 for RC4. pFib->nHash = 0x34; // encrypt header bytes count of table stream. pFib->nKey = 0; // lkey2 must be 0 for RC4. - pStrmTemp->Seek( 0 ); - pFib->WriteHeader( *pStrmTemp ); - } + pStrmTemp->Seek( 0 ); + pFib->WriteHeader( *pStrmTemp ); + } if (pUsedNumTbl) // all used NumRules { @@ -3320,7 +3320,7 @@ ULONG SwWW8Writer::Write( SwPaM& rPaM, SfxMedium& rMed, MSWordExportBase::MSWordExportBase( SwDoc *pDocument, SwPaM *pCurrentPam, SwPaM *pOriginalPam ) : aMainStg(sMainStream), pISet(0), pUsedNumTbl(0), mpTopNodeOfHdFtPage(0), - pBmpPal(0), pKeyMap(0), pOLEExp(0), pOCXExp(0), pOleMap(0), + pBmpPal(0), pKeyMap(0), pOLEExp(0), pOCXExp(0), pOleMap(0), mpTableInfo(new ww8::WW8TableInfo()), nUniqueList(0), mnHdFtIndex(0), pAktPageDesc(0), pPapPlc(0), pChpPlc(0), pChpIter(0), pStyles( NULL ), @@ -3554,13 +3554,19 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark ) pChpPlc->AppendFkpEntry( Strm().Tell(), sizeof( aArr1 ), aArr1 ); - sal_uInt8 aFldHeader[] = + struct FFDataHeader { - 0xFF, 0xFF, 0xFF, 0xFF, // Unicode Marker... - 0, 0, 0, 0,// 0, 0, 0, 0 + sal_uInt32 version; + sal_uInt16 bits; + sal_uInt16 cch; + sal_uInt16 hps; + FFDataHeader() : version( 0xFFFFFFFF ), bits(0), cch(0), hps(0) {} }; - aFldHeader[4] |= (type & 0x03); + + FFDataHeader aFldHeader; + aFldHeader.bits |= (type & 0x03); + sal_Int32 ffres = 0; // rFieldmark.GetFFRes(); if ( pAsCheckbox && pAsCheckbox->IsChecked() ) ffres = 1; @@ -3572,12 +3578,12 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark ) else ffres = 0; } - aFldHeader[4] |= ( (ffres<<2) & 0x7C ); + aFldHeader.bits |= ( (ffres<<2) & 0x7C ); std::vector< ::rtl::OUString > aListItems; if (type==2) { - aFldHeader[5] |= 0x80; // ffhaslistbox + aFldHeader.bits |= 0x8000; // ffhaslistbox const ::sw::mark::IFieldmark::parameter_map_t* const pParameters = rFieldmark.GetParameters(); ::sw::mark::IFieldmark::parameter_map_t::const_iterator pListEntries = pParameters->find(::rtl::OUString::createFromAscii(ODF_FORMDROPDOWN_LISTENTRY)); if(pListEntries != pParameters->end()) @@ -3598,16 +3604,16 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark ) const sal_uInt8 aFldData[] = { - 0x44,0, // the start of "next" data + 0x44,0, // the start of "next" data 0,0,0,0,0,0,0,0,0,0, // PIC-Structure! /10 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // | /16 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // | /16 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // | /16 0,0,0,0, // / /4 }; - sal_uInt32 slen = sizeof(sal_uInt32) + sal_uInt32 slen = sizeof(sal_uInt32) + sizeof(aFldData) - + sizeof( aFldHeader ) + + sizeof( aFldHeader.version ) + sizeof( aFldHeader.bits ) + sizeof( aFldHeader.cch ) + sizeof( aFldHeader.hps ) + 2*ffname.getLength() + 4 + 2*ffdeftext.getLength() + 4 + 2*ffformat.getLength() + 4 @@ -3615,8 +3621,10 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark ) + 2*ffstattext.getLength() + 4 + 2*ffentrymcr.getLength() + 4 + 2*ffexitmcr.getLength() + 4; + if ( type ) + slen += 2; // wDef if ( type==2 ) { - slen += 2; // for 0xFF, 0xFF + slen += 2; // sttb ( fExtend ) slen += 4; // for num of list items const int items = aListItems.size(); for( int i = 0; i < items; i++ ) { @@ -3631,17 +3639,14 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark ) OSL_ENSURE( len == 0x44-sizeof(sal_uInt32), "SwWW8Writer::WriteFormData(..) - wrong aFldData length" ); pDataStrm->Write( aFldData, len ); - len = sizeof( aFldHeader ); - OSL_ENSURE( len == 8, "SwWW8Writer::WriteFormData(..) - wrong aFldHeader length" ); - - pDataStrm->Write( aFldHeader, len ); + *pDataStrm << aFldHeader.version << aFldHeader.bits << aFldHeader.cch << aFldHeader.hps; SwWW8Writer::WriteString_xstz( *pDataStrm, ffname, true ); // Form field name - if ( type == 0 ) - SwWW8Writer::WriteString_xstz( *pDataStrm, ffdeftext, true ); - else - pDataStrm->WriteNumber( (sal_uInt16)0 ); + SwWW8Writer::WriteString_xstz( *pDataStrm, ffdeftext, true ); + if ( type ) + *pDataStrm << sal_uInt16(0); + SwWW8Writer::WriteString_xstz( *pDataStrm, String( ffformat ), true ); SwWW8Writer::WriteString_xstz( *pDataStrm, String( ffhelptext ), true ); @@ -3674,7 +3679,7 @@ void WW8AttributeOutput::TableNodeInfoInner( ww8::WW8TableNodeInfoInner::Pointer #endif m_rWW8Export.pO->Remove( 0, m_rWW8Export.pO->Count() ); // leeren - + sal_uInt32 nShadowsBefore = pNodeInfoInner->getShadowsBefore(); if (nShadowsBefore > 0) { @@ -3687,14 +3692,14 @@ void WW8AttributeOutput::TableNodeInfoInner( ww8::WW8TableNodeInfoInner::Pointer for (sal_uInt32 n = 0; n < nShadowsBefore; ++n) { m_rWW8Export.WriteCR(pTmpNodeInfoInner); - - m_rWW8Export.pO->Insert( (BYTE*)&nStyle, 2, + + m_rWW8Export.pO->Insert( (BYTE*)&nStyle, 2, m_rWW8Export.pO->Count() ); // Style # TableInfoCell(pTmpNodeInfoInner); m_rWW8Export.pPapPlc->AppendFkpEntry ( m_rWW8Export.Strm().Tell(), m_rWW8Export.pO->Count(), m_rWW8Export.pO->GetData() ); - + m_rWW8Export.pO->Remove( 0, m_rWW8Export.pO->Count() ); // leeren } } @@ -3705,33 +3710,33 @@ void WW8AttributeOutput::TableNodeInfoInner( ww8::WW8TableNodeInfoInner::Pointer ::std::clog << "<endOfCell/>" << ::std::endl; #endif m_rWW8Export.WriteCR(pNodeInfoInner); - + m_rWW8Export.pO->Insert( (BYTE*)&nStyle, 2, m_rWW8Export.pO->Count() ); // Style # TableInfoCell(pNodeInfoInner); m_rWW8Export.pPapPlc->AppendFkpEntry( m_rWW8Export.Strm().Tell(), m_rWW8Export.pO->Count(), m_rWW8Export.pO->GetData() ); - + m_rWW8Export.pO->Remove( 0, m_rWW8Export.pO->Count() ); // leeren } - + sal_uInt32 nShadowsAfter = pNodeInfoInner->getShadowsAfter(); if (nShadowsAfter > 0) { ww8::WW8TableNodeInfoInner::Pointer_t pTmpNodeInfoInner(new ww8::WW8TableNodeInfoInner(NULL)); - + pTmpNodeInfoInner->setDepth(pNodeInfoInner->getDepth()); pTmpNodeInfoInner->setEndOfCell(true); for (sal_uInt32 n = 0; n < nShadowsAfter; ++n) { m_rWW8Export.WriteCR(pTmpNodeInfoInner); - + m_rWW8Export.pO->Insert( (BYTE*)&nStyle, 2, m_rWW8Export.pO->Count() ); // Style # TableInfoCell(pTmpNodeInfoInner); m_rWW8Export.pPapPlc->AppendFkpEntry( m_rWW8Export.Strm().Tell(), m_rWW8Export.pO->Count(), m_rWW8Export.pO->GetData() ); - + m_rWW8Export.pO->Remove( 0, m_rWW8Export.pO->Count() ); // leeren } } @@ -3742,13 +3747,13 @@ void WW8AttributeOutput::TableNodeInfoInner( ww8::WW8TableNodeInfoInner::Pointer ::std::clog << "<endOfLine/>" << ::std::endl; #endif TableRowEnd(pNodeInfoInner->getDepth()); - + ShortToSVBT16(0, nStyle); m_rWW8Export.pO->Insert( (BYTE*)&nStyle, 2, m_rWW8Export.pO->Count() ); // Style # TableInfoRow(pNodeInfoInner); m_rWW8Export.pPapPlc->AppendFkpEntry( m_rWW8Export.Strm().Tell(), m_rWW8Export.pO->Count(), m_rWW8Export.pO->GetData() ); - + m_rWW8Export.pO->Remove( 0, m_rWW8Export.pO->Count() ); // leeren } #ifdef DEBUG @@ -3759,7 +3764,7 @@ void WW8AttributeOutput::TableNodeInfoInner( ww8::WW8TableNodeInfoInner::Pointer void MSWordExportBase::OutputStartNode( const SwStartNode & rNode) { - ww8::WW8TableNodeInfo::Pointer_t pNodeInfo = + ww8::WW8TableNodeInfo::Pointer_t pNodeInfo = mpTableInfo->getTableNodeInfo( &rNode ); if (pNodeInfo.get() != NULL) @@ -3767,14 +3772,14 @@ void MSWordExportBase::OutputStartNode( const SwStartNode & rNode) #ifdef DEBUG ::std::clog << pNodeInfo->toString() << ::std::endl; #endif - + const ww8::WW8TableNodeInfo::Inners_t aInners = pNodeInfo->getInners(); ww8::WW8TableNodeInfo::Inners_t::const_reverse_iterator aIt(aInners.rbegin()); ww8::WW8TableNodeInfo::Inners_t::const_reverse_iterator aEnd(aInners.rend()); while (aIt != aEnd) { ww8::WW8TableNodeInfoInner::Pointer_t pInner = aIt->second; - + AttrOutput().TableNodeInfoInner(pInner); aIt++; } @@ -3793,13 +3798,13 @@ void MSWordExportBase::OutputEndNode( const SwEndNode &rNode ) #endif ww8::WW8TableNodeInfo::Pointer_t pNodeInfo = mpTableInfo->getTableNodeInfo( &rNode ); - + if (pNodeInfo.get() != NULL) { #ifdef DEBUG ::std::clog << pNodeInfo->toString() << ::std::endl; #endif - + const ww8::WW8TableNodeInfo::Inners_t aInners = pNodeInfo->getInners(); ww8::WW8TableNodeInfo::Inners_t::const_iterator aIt(aInners.begin()); ww8::WW8TableNodeInfo::Inners_t::const_iterator aEnd(aInners.end()); diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx index 7160d691cdf2..4af4bb137a9d 100644 --- a/sw/source/filter/ww8/wrtww8.hxx +++ b/sw/source/filter/ww8/wrtww8.hxx @@ -544,7 +544,7 @@ public: BYTE bHasHdr : 1; BYTE bHasFtr : 1; BYTE bSubstituteBullets : 1; // true: SubstituteBullet() gets called - + bool mbExportModeRTF; SwDoc *pDoc; @@ -1405,7 +1405,7 @@ public: bool IsTxtAttr(xub_StrLen nSwPos); - void NextPos() { nAktSwPos = SearchNext( nAktSwPos + 1 ); } + void NextPos() { if ( nAktSwPos < STRING_NOTFOUND ) nAktSwPos = SearchNext( nAktSwPos + 1 ); } void OutAttr( xub_StrLen nSwPos ); virtual const SfxPoolItem* HasTextItem( USHORT nWhich ) const; @@ -1466,7 +1466,7 @@ public: bool IsDropCap( int nSwPos ); bool RequiresImplicitBookmark(); - void NextPos() { nAktSwPos = SearchNext( nAktSwPos + 1 ); } + void NextPos() { if ( nAktSwPos < STRING_NOTFOUND ) nAktSwPos = SearchNext( nAktSwPos + 1 ); } void OutAttr( xub_StrLen nSwPos, bool bRuby = false ); virtual const SfxPoolItem* HasTextItem( USHORT nWhich ) const; diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx index bee910ffb4d7..bd18e5f4a0c4 100644 --- a/sw/source/filter/ww8/wrtww8gr.cxx +++ b/sw/source/filter/ww8/wrtww8gr.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/filter/ww8/ww8attributeoutput.hxx b/sw/source/filter/ww8/ww8attributeoutput.hxx index 3553d320a1c0..5300b852468e 100644 --- a/sw/source/filter/ww8/ww8attributeoutput.hxx +++ b/sw/source/filter/ww8/ww8attributeoutput.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,7 +70,7 @@ public: /// Output text. virtual void RunText( const String& rText, rtl_TextEncoding eCharSet ); - + /// Output text (without markup). virtual void RawText( const String& rText, bool bForceUnicode, rtl_TextEncoding eCharSet ); @@ -397,13 +397,13 @@ protected: /// Sfx item RES_FRAMEDIR virtual void FormatFrameDirection( const SvxFrameDirectionItem& ); - + /// Write the expanded field virtual void WriteExpand( const SwField* pFld ); - + virtual void RefField ( const SwField& rFld, const String& rRef ); virtual void HiddenField( const SwField& rFld ); - virtual void SetField( const SwField& rFld, ww::eField eType, const String& rCmd ); + virtual void SetField( const SwField& rFld, ww::eField eType, const String& rCmd ); virtual void PostitField( const SwField* pFld ); virtual bool DropdownField( const SwField* pFld ); @@ -445,7 +445,7 @@ public: protected: /// Output the bold etc. attributes void OutputWW8Attribute( BYTE nId, bool bVal ); - + /// Output the bold etc. attributes, the Complex Text Layout version void OutputWW8AttributeCTL( BYTE nId, bool bVal ); diff --git a/sw/source/filter/ww8/ww8glsy.cxx b/sw/source/filter/ww8/ww8glsy.cxx index 3dc151feb782..6755ac255a0a 100644 --- a/sw/source/filter/ww8/ww8glsy.cxx +++ b/sw/source/filter/ww8/ww8glsy.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -257,16 +257,16 @@ bool WW8GlossaryFib::IsGlossaryFib() } UINT32 WW8GlossaryFib::FindGlossaryFibOffset(SvStream & /* rTableStrm */, - SvStream & /* rStrm */, + SvStream & /* rStrm */, const WW8Fib &rFib) { UINT32 nGlossaryFibOffset = 0; - if ( rFib.fDot ) // its a template + if ( rFib.fDot ) // its a template { if ( rFib.pnNext ) nGlossaryFibOffset = ( rFib.pnNext * 512 ); } - return nGlossaryFibOffset; + return nGlossaryFibOffset; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/ww8/ww8glsy.hxx b/sw/source/filter/ww8/ww8glsy.hxx index c2d0a6ca64c5..af8b9ade088c 100644 --- a/sw/source/filter/ww8/ww8glsy.hxx +++ b/sw/source/filter/ww8/ww8glsy.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/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx index 9597ec2b7dc5..2a1e7a11f4e4 100644 --- a/sw/source/filter/ww8/ww8graf.cxx +++ b/sw/source/filter/ww8/ww8graf.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/filter/ww8/ww8graf.hxx b/sw/source/filter/ww8/ww8graf.hxx index c3b970e4613c..21523f4dc792 100644 --- a/sw/source/filter/ww8/ww8graf.hxx +++ b/sw/source/filter/ww8/ww8graf.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/sw/source/filter/ww8/ww8graf2.cxx b/sw/source/filter/ww8/ww8graf2.cxx index dc5c440ff57b..44bb9c246341 100644 --- a/sw/source/filter/ww8/ww8graf2.cxx +++ b/sw/source/filter/ww8/ww8graf2.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 7fe474c8fda4..76c6ae1b2caf 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -395,7 +395,7 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt, && maShapeRecords.Current()->nRecLen ) { UINT32 nBytesLeft = maShapeRecords.Current()->nRecLen; - UINT32 nUDData; + UINT32 nUDData; UINT16 nPID; while( 5 < nBytesLeft ) { @@ -604,10 +604,10 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt, aSet.Put( SdrTextRightDistItem( nTextRight ) ); aSet.Put( SdrTextUpperDistItem( nTextTop ) ); aSet.Put( SdrTextLowerDistItem( nTextBottom ) ); - pImpRec->nDxTextLeft = nTextLeft; - pImpRec->nDyTextTop = nTextTop; - pImpRec->nDxTextRight = nTextRight; - pImpRec->nDyTextBottom = nTextBottom; + pImpRec->nDxTextLeft = nTextLeft; + pImpRec->nDyTextTop = nTextTop; + pImpRec->nDxTextRight = nTextRight; + pImpRec->nDyTextBottom = nTextBottom; // --> SJ 2009-03-06 : taking the correct default (which is mso_anchorTop) MSO_Anchor eTextAnchor = @@ -701,19 +701,19 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt, double fExtraTextRotation = 0.0; if ( mnFix16Angle && !( GetPropertyValue( DFF_Prop_FitTextToShape ) & 4 ) ) - { // text is already rotated, we have to take back the object rotation if DFF_Prop_RotateText is false + { // text is already rotated, we have to take back the object rotation if DFF_Prop_RotateText is false fExtraTextRotation = -mnFix16Angle; } - if ( rObjData.nSpFlags & SP_FFLIPV ) // sj: in ppt the text is flipped, whereas in word the text - { // remains unchanged, so we have to take back the flipping here - fExtraTextRotation += 18000.0; // because our core will flip text if the shape is flipped. + if ( rObjData.nSpFlags & SP_FFLIPV ) // sj: in ppt the text is flipped, whereas in word the text + { // remains unchanged, so we have to take back the flipping here + fExtraTextRotation += 18000.0; // because our core will flip text if the shape is flipped. } fExtraTextRotation += nTextRotationAngle; if ( !::basegfx::fTools::equalZero( fExtraTextRotation ) ) { fExtraTextRotation /= 100.0; SdrCustomShapeGeometryItem aGeometryItem( (SdrCustomShapeGeometryItem&)pCustomShape->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) ); - const rtl::OUString sTextRotateAngle( RTL_CONSTASCII_USTRINGPARAM ( "TextRotateAngle" ) ); + const rtl::OUString sTextRotateAngle( RTL_CONSTASCII_USTRINGPARAM ( "TextRotateAngle" ) ); com::sun::star::beans::PropertyValue aPropVal; aPropVal.Name = sTextRotateAngle; aPropVal.Value <<= fExtraTextRotation; @@ -756,7 +756,7 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt, pImpRec->bDrawHell = FALSE; if (GetPropertyValue(DFF_Prop_fPrint) & 0x02) pImpRec->bHidden = TRUE; - pImpRec->nNextShapeId = GetPropertyValue( DFF_Prop_hspNext, 0 ); + pImpRec->nNextShapeId = GetPropertyValue( DFF_Prop_hspNext, 0 ); if ( nTextId ) { @@ -3001,7 +3001,7 @@ long SwWW8ImplReader::ReadTextAttr(WW8_CP& rTxtPos, bool& rbStartLine) aRes.nAktCp = rTxtPos; // Akt. Cp-Pos bool bNewSection = (aRes.nFlags & MAN_MASK_NEW_SEP) && !bIgnoreText; - if ( bNewSection ) // neue Section + if ( bNewSection ) // neue Section { OSL_ENSURE(pPaM->GetNode()->GetTxtNode(), "Missing txtnode"); // PageDesc erzeugen und fuellen @@ -4845,8 +4845,8 @@ public: outlineeq(BYTE nNum) : mnNum(nNum) {} bool operator()(const SwTxtFmtColl *pTest) const { - //return pTest->GetOutlineLevel() == mnNum; //#outline level,zhaojianwei - return pTest->IsAssignedToListLevelOfOutlineStyle() && pTest->GetAssignedOutlineStyleLevel() == mnNum; //<-end,zhaojianwei + //return pTest->GetOutlineLevel() == mnNum; //#outline level,zhaojianwei + return pTest->IsAssignedToListLevelOfOutlineStyle() && pTest->GetAssignedOutlineStyleLevel() == mnNum; //<-end,zhaojianwei } }; @@ -4884,7 +4884,7 @@ void SwWW8ImplReader::SetOutLineStyles() for ( sw::ParaStyles::reverse_iterator aIter = aOutLined.rbegin(); aIter < aEnd; ++aIter) // <-- { - //if ((*aIter)->GetOutlineLevel() < MAXLEVEL) //#outline level,zhaojianwei, + //if ((*aIter)->GetOutlineLevel() < MAXLEVEL) //#outline level,zhaojianwei, //nFlagsStyleOutlLevel |= 1 << (*aIter)->GetOutlineLevel(); if ((*aIter)->IsAssignedToListLevelOfOutlineStyle()) nFlagsStyleOutlLevel |= 1 << (*aIter)->GetAssignedOutlineStyleLevel();//<-end,zhaojianwei @@ -4958,7 +4958,7 @@ void SwWW8ImplReader::SetOutLineStyles() //if ((*aIter)->GetOutlineLevel() < MAXLEVEL)//#outline level,zhaojianwei // (*aIter)->SetOutlineLevel(NO_NUMBERING); if((*aIter)->IsAssignedToListLevelOfOutlineStyle()) - (*aIter)->DeleteAssignmentToListLevelOfOutlineStyle(); //<-end + (*aIter)->DeleteAssignmentToListLevelOfOutlineStyle(); //<-end else break; @@ -5030,7 +5030,7 @@ void SwWW8ImplReader::SetOutLineStyles() aOutlineRule.Set(nToLevel, rRule); // Set my outline level //((SwTxtFmtColl*)rSI.pFmt)->SetOutlineLevel(nToLevel);//#outline level,zhaojianwei - ((SwTxtFmtColl*)rSI.pFmt)->AssignToListLevelOfOutlineStyle(nToLevel); //<-end,zhaojianwei + ((SwTxtFmtColl*)rSI.pFmt)->AssignToListLevelOfOutlineStyle(nToLevel); //<-end,zhaojianwei // If there are more styles on this level ignore them nFlagsStyleOutlLevel |= nAktFlags; } diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index 588bc97a0b9f..a4b663254176 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -1613,7 +1613,7 @@ void UseListIndent(SwWW8StyInf &rStyle, const SwNumFmt &rFmt); void SetStyleIndent(SwWW8StyInf &rStyleInfo, const SwNumFmt &rFmt); // --> OD 2010-05-06 #i103711# // --> OD 2010-05-11 #i105414# -void SyncIndentWithList( SvxLRSpaceItem &rLR, +void SyncIndentWithList( SvxLRSpaceItem &rLR, const SwNumFmt &rFmt, const bool bFirstLineOfStSet, const bool bLeftIndentSet ); diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx index 6a21e524b18d..d5a73b9ac209 100644 --- a/sw/source/filter/ww8/ww8par2.cxx +++ b/sw/source/filter/ww8/ww8par2.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -833,7 +833,7 @@ void SwWW8ImplReader::Read_ANLevelNo( USHORT, const BYTE* pData, short nLen ) { nSwNumLevel = *pData - 1; if (!bNoAttrImport) - //((SwTxtFmtColl*)pAktColl)->SetOutlineLevel( nSwNumLevel ); //#outline level,zhaojianwei + //((SwTxtFmtColl*)pAktColl)->SetOutlineLevel( nSwNumLevel ); //#outline level,zhaojianwei ((SwTxtFmtColl*)pAktColl)->AssignToListLevelOfOutlineStyle( nSwNumLevel ); //<-end,zhaojianwei // Bei WW-NoNumbering koennte auch NO_NUMBERING gesetzt // werden. ( Bei normaler Nummerierung muss NO_NUM gesetzt @@ -860,7 +860,7 @@ void SwWW8ImplReader::Read_ANLevelNo( USHORT, const BYTE* pData, short nLen ) void SwWW8ImplReader::Read_ANLevelDesc( USHORT, const BYTE* pData, short nLen ) // Sprm 12 { { - SwWW8StyInf * pStyInf = GetStyle(nAktColl); + SwWW8StyInf * pStyInf = GetStyle(nAktColl); if( !pAktColl || nLen <= 0 // nur bei Styledef || (pStyInf && !pStyInf->bColl) // CharFmt -> ignorieren || ( nIniFlags & WW8FL_NO_OUTLINE ) ){ @@ -2399,7 +2399,7 @@ void WW8TabDesc::CalcDefaults() } } */ - if ((nMinLeft && !bIsBiDi && text::HoriOrientation::LEFT == eOri) || + if ((nMinLeft && !bIsBiDi && text::HoriOrientation::LEFT == eOri) || (nMinLeft != -108 && bIsBiDi && text::HoriOrientation::RIGHT == eOri)) // Word sets the first nCenter value to -108 when no indent is used eOri = text::HoriOrientation::LEFT_AND_WIDTH; // absolutely positioned @@ -2572,7 +2572,7 @@ void WW8TabDesc::CreateSwTable() nLeft = GetMinLeft(); else { - if (nPreferredWidth) + if (nPreferredWidth) { nLeft = pIo->maSectionManager.GetTextAreaWidth(); nLeft = nLeft - nPreferredWidth - nOrgDxaLeft; @@ -3602,25 +3602,25 @@ bool SwWW8ImplReader::StartTable(WW8_CP nStartCp) bool lcl_PamContainsFly(SwPaM & rPam) { - bool bResult = false; + bool bResult = false; SwNodeRange aRg( rPam.Start()->nNode, rPam.End()->nNode ); SwDoc * pDoc = rPam.GetDoc(); - - sal_uInt16 n = 0; + + sal_uInt16 n = 0; SwSpzFrmFmts * pSpzFmts = pDoc->GetSpzFrmFmts(); - sal_uInt16 nCount = pSpzFmts->Count(); + sal_uInt16 nCount = pSpzFmts->Count(); while (!bResult && n < nCount) { SwFrmFmt* pFly = (*pSpzFmts)[n]; const SwFmtAnchor* pAnchor = &pFly->GetAnchor(); - + switch (pAnchor->GetAnchorId()) { case FLY_AT_PARA: case FLY_AT_CHAR: { const SwPosition* pAPos = pAnchor->GetCntntAnchor(); - + if (pAPos != NULL && aRg.aStart <= pAPos->nNode && pAPos->nNode <= aRg.aEnd) @@ -3632,10 +3632,10 @@ bool lcl_PamContainsFly(SwPaM & rPam) default: break; } - + ++n; } - + return bResult; } @@ -3920,28 +3920,17 @@ WW8RStyle::WW8RStyle(WW8Fib& _rFib, SwWW8ImplReader* pI) void WW8RStyle::Set1StyleDefaults() { + // see #i25247#, #i25561#, #i48064#, #i92341# for default font if (!bCJKFontChanged) // Style no CJK Font? set the default - pIo->SetNewFontAttr(ftcStandardChpCJKStsh, true, RES_CHRATR_CJK_FONT); - - // see i25247 - const WW8_FFN* pF = pIo->pFonts->GetFont(3); - if (pF) - { - rtl_TextEncoding eEnc = WW8Fib::GetFIBCharset(pF->chs); - if ((ftcStandardChpCTLStsh == 0) && (eEnc == RTL_TEXTENCODING_MS_1255)) - ftcStandardChpCTLStsh = 3; - } - - if (ftcStandardChpCJKStsh == 0) - ftcStandardChpCJKStsh = 2; + pIo->SetNewFontAttr(ftcFE, true, RES_CHRATR_CJK_FONT); if (!bCTLFontChanged) // Style no CTL Font? set the default - pIo->SetNewFontAttr(ftcStandardChpCTLStsh, true, RES_CHRATR_CTL_FONT); + pIo->SetNewFontAttr(ftcBi, true, RES_CHRATR_CTL_FONT); //#88976# western 2nd to make western charset conversion the default if (!bFontChanged) // Style has no Font? set the default, { - pIo->SetNewFontAttr(ftcStandardChpStsh, true, RES_CHRATR_FONT); + pIo->SetNewFontAttr(ftcAsci, true, RES_CHRATR_FONT); /* removed by a patch from cmc for #i52786# if (pIo->bVer67) SetStyleCharSet(pIo->pCollA[pIo->nAktColl]); diff --git a/sw/source/filter/ww8/ww8par2.hxx b/sw/source/filter/ww8/ww8par2.hxx index 01753f3d9371..0886fe2d1bcd 100644 --- a/sw/source/filter/ww8/ww8par2.hxx +++ b/sw/source/filter/ww8/ww8par2.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/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx index 18754f06ce4c..ce066fc5bb96 100644 --- a/sw/source/filter/ww8/ww8par3.cxx +++ b/sw/source/filter/ww8/ww8par3.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -2222,6 +2222,8 @@ void WW8FormulaControl::FormulaRead(SwWw8ControlType nWhich, nChecked = true; break; case 25: //undefined, Undefined checkboxes are treated as unchecked + //but it appear that both visually and the value are picked up from the default in that case + break; case 0: //unchecked nChecked = false; break; diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx index 72db69dd31c8..72a4980e7b1b 100644 --- a/sw/source/filter/ww8/ww8par4.cxx +++ b/sw/source/filter/ww8/ww8par4.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index d8295b17bbfa..bb1a210a35d9 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -343,7 +343,7 @@ long SwWW8ImplReader::Read_Book(WW8PLCFManResult*) if( !pName || pName->EqualsIgnoreCaseAscii( "_Toc", 0, 4 ) || pName->EqualsIgnoreCaseAscii( "_Hlt", 0, 4 ) ) return 0; -#endif +#endif //JP 16.11.98: ToUpper darf auf keinen Fall gemacht werden, weil der //Bookmark- name ein Hyperlink-Ziel sein kann! @@ -875,7 +875,7 @@ FieldEntry &FieldEntry::operator=(const FieldEntry &rOther) throw() return msMarkCode; } -void FieldEntry::SetBookmarkName(::rtl::OUString bookmarkName) +void FieldEntry::SetBookmarkName(::rtl::OUString bookmarkName) { msBookmarkName=bookmarkName; } diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index ce7d03aa3259..5f4ffd46312e 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -2730,15 +2730,15 @@ void SwWW8ImplReader::NewAttr( const SfxPoolItem& rAttr, pAktColl->SetFmtAttr(rAttr); } else if (pAktItemSet) - { + { pAktItemSet->Put(rAttr); } else if (rAttr.Which() == RES_FLTR_REDLINE) - { + { mpRedlineStack->open(*pPaM->GetPoint(), rAttr); } else - { + { pCtrlStck->NewAttr(*pPaM->GetPoint(), rAttr); // --> OD 2010-05-06 #i103711# if ( bFirstLineOfStSet ) @@ -3569,7 +3569,7 @@ bool SwWW8ImplReader::GetFontParams( USHORT nFCode, FontFamily& reFamily, USHORT SwWW8ImplReader::CorrectResIdForCharset(CharSet nCharSet, USHORT nWhich) { USHORT nResult = 0; - + switch (nCharSet) { case RTL_TEXTENCODING_MS_932: nResult = RES_CHRATR_CJK_FONT; @@ -3579,7 +3579,7 @@ USHORT SwWW8ImplReader::CorrectResIdForCharset(CharSet nCharSet, USHORT nWhich) nResult = nWhich; break; } - + return nResult; } @@ -3608,7 +3608,7 @@ bool SwWW8ImplReader::SetNewFontAttr(USHORT nFCode, bool bSetEnums, { eSrcCharSet = RTL_TEXTENCODING_DONTKNOW; } - + maFontSrcCJKCharSets.push(eSrcCharSet); } else @@ -3621,7 +3621,7 @@ bool SwWW8ImplReader::SetNewFontAttr(USHORT nFCode, bool bSetEnums, { eSrcCharSet = RTL_TEXTENCODING_DONTKNOW; } - + maFontSrcCharSets.push(eSrcCharSet); } } @@ -3631,7 +3631,7 @@ bool SwWW8ImplReader::SetNewFontAttr(USHORT nFCode, bool bSetEnums, CharSet eDstCharSet = eSrcCharSet; SvxFontItem aFont( eFamily, aName, aEmptyStr, ePitch, eDstCharSet, nWhich); - + nWhich = CorrectResIdForCharset(eSrcCharSet, nWhich); if( bSetEnums ) @@ -3690,18 +3690,18 @@ void SwWW8ImplReader::Read_FontCode( USHORT nId, const BYTE* pData, short nLen ) { // (siehe sprmCSymbol) gesetzte Font ! switch( nId ) { - // case 0x4a51: //font to bias towards all else being equal ? case 113: - case 0x4a5E: + case 0x4A51: //"Other" font, override with BiDi if it exists + case 0x4A5E: //BiDi Font nId = RES_CHRATR_CTL_FONT; break; case 93: case 111: - case 0x4a4f: + case 0x4A4f: nId = RES_CHRATR_FONT; break; case 112: - case 0x4a50: + case 0x4A50: nId = RES_CHRATR_CJK_FONT; break; default: @@ -3713,7 +3713,7 @@ void SwWW8ImplReader::Read_FontCode( USHORT nId, const BYTE* pData, short nLen ) pCtrlStck->SetAttr( *pPaM->GetPoint(), nId ); if (nId == RES_CHRATR_CJK_FONT) ResetCJKCharSetVars(); - else + else ResetCharSetVars(); } else @@ -4047,7 +4047,7 @@ void SwWW8ImplReader::Read_LR( USHORT nId, const BYTE* pData, short nLen ) case 0x845E: aLR.SetTxtLeft( nPara ); if (pAktColl) - { + { pCollA[nAktColl].bListReleventIndentSet = true; } // --> OD 2010-05-11 #i105414# @@ -4084,7 +4084,7 @@ void SwWW8ImplReader::Read_LR( USHORT nId, const BYTE* pData, short nLen ) aLR.SetTxtFirstLineOfst(nPara); if (pAktColl) - { + { pCollA[nAktColl].bListReleventIndentSet = true; } // --> OD 2010-05-06 #i103711# @@ -5916,8 +5916,8 @@ const wwSprmDispatcher *GetWW8SprmDispatcher() {0x085B, 0}, //"sprmCFDiacColor" {0x085C, &SwWW8ImplReader::Read_BoldBiDiUsw},//"sprmCFBoldBi" {0x085D, &SwWW8ImplReader::Read_BoldBiDiUsw},//"sprmCFItalicBi" - {0x4A5E, &SwWW8ImplReader::Read_FontCode}, - {0x485F, &SwWW8ImplReader::Read_Language}, // "sprmCLidBi" + {0x4A5E, &SwWW8ImplReader::Read_FontCode}, //"sprmCFtcBi" + {0x485F, &SwWW8ImplReader::Read_Language}, //"sprmCLidBi" //0x4A60, ? ? ?, //"sprmCIcoBi", {0x4A61, &SwWW8ImplReader::Read_FontSize}, //"sprmCHpsBi" {0xCA62, 0}, //"sprmCDispFldRMark" diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index ff16c58cbc21..f781e017ea71 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -3446,7 +3446,7 @@ WW8PLCFx_SEPX::WW8PLCFx_SEPX(SvStream* pSt, SvStream* pTblSt, pStrm(pSt), nArrMax(256), nSprmSiz(0) { pPLCF = rFib.lcbPlcfsed - ? new WW8PLCF(pTblSt, rFib.fcPlcfsed, rFib.lcbPlcfsed, + ? new WW8PLCF(pTblSt, rFib.fcPlcfsed, rFib.lcbPlcfsed, GetFIBVersion() <= ww::eWW2 ? 6 : 12, nStartCp) : 0; @@ -3506,13 +3506,13 @@ void WW8PLCFx_SEPX::GetSprms(WW8PLCFxDesc* p) pStrm->Seek( nPo ); // read len - if (GetFIBVersion() <= ww::eWW2) // eWW6 ?, docs say yes, but... + if (GetFIBVersion() <= ww::eWW2) // eWW6 ?, docs say yes, but... { BYTE nSiz(0); *pStrm >> nSiz; nSprmSiz = nSiz; } - else + else *pStrm >> nSprmSiz; if( nSprmSiz > nArrMax ) @@ -5182,7 +5182,7 @@ WW8_CP WW8Fib::GetBaseCp(ManTypes nType) const nOffset = ccpText + ccpFtn + ccpHdr + ccpMcr + ccpAtn + ccpEdn; break; case MAN_TXBX_HDFT: - nOffset = ccpText + ccpFtn + ccpHdr + ccpMcr + ccpAtn + ccpEdn + + nOffset = ccpText + ccpFtn + ccpHdr + ccpMcr + ccpAtn + ccpEdn + ccpTxbx; break; } @@ -5572,14 +5572,14 @@ WW8Fib::WW8Fib(SvStream& rSt, BYTE nWantedVersion, UINT32 nOffset) rSt.Seek( 0x372 ); // fcSttbListNames rSt >> fcSttbListNames; rSt >> lcbSttbListNames; - + if (cfclcb > 93) { rSt.Seek( 0x382 ); // MagicTables rSt >> fcPlcfTch; rSt >> lcbPlcfTch; } - + if (cfclcb > 113) { rSt.Seek( 0x41A ); // new ATRD @@ -5640,7 +5640,7 @@ WW8Fib::WW8Fib(BYTE nVer) nProduct = 0xc02d; } - // --> #i90932# + // --> #i90932# lid = 0x409; // LANGUAGE_ENGLISH_US LanguageType nLang = Application::GetSettings().GetLanguage(); @@ -5663,7 +5663,7 @@ WW8Fib::WW8Fib(BYTE nVer) fFarEast = false; break; }; - // <-- #i90932# + // <-- #i90932# Locale aTempLocale; SvxLanguageToLocale( aTempLocale, lid ); @@ -5677,7 +5677,7 @@ sal_Unicode WW8Fib::getNumDecimalSep() const } bool WW8Fib::WriteHeader(SvStream& rStrm) -{ +{ bool bVer8 = 8 == nVersion; size_t nUnencryptedHdr = bVer8 ? 0x44 : 0x24; @@ -5696,22 +5696,22 @@ bool WW8Fib::WriteHeader(SvStream& rStrm) Set_UInt16( pData, pnNext ); UINT16 nBits16 = 0; - if( fDot ) nBits16 |= 0x0001; - if( fGlsy) nBits16 |= 0x0002; - if( fComplex ) nBits16 |= 0x0004; - if( fHasPic ) nBits16 |= 0x0008; + if( fDot ) nBits16 |= 0x0001; + if( fGlsy) nBits16 |= 0x0002; + if( fComplex ) nBits16 |= 0x0004; + if( fHasPic ) nBits16 |= 0x0008; nBits16 |= (0xf0 & ( cQuickSaves << 4 )); - if( fEncrypted ) nBits16 |= 0x0100; - if( fWhichTblStm ) nBits16 |= 0x0200; + if( fEncrypted ) nBits16 |= 0x0100; + if( fWhichTblStm ) nBits16 |= 0x0200; - if (fReadOnlyRecommended) + if (fReadOnlyRecommended) nBits16 |= 0x0400; - if (fWriteReservation) + if (fWriteReservation) nBits16 |= 0x0800; - if( fExtChar ) nBits16 |= 0x1000; + if( fExtChar ) nBits16 |= 0x1000; if( fFarEast ) nBits16 |= 0x4000; // #i90932# - if( fObfuscated ) nBits16 |= 0x8000; + if( fObfuscated ) nBits16 |= 0x8000; Set_UInt16( pData, nBits16 ); Set_UInt16( pData, nFibBack ); @@ -5722,11 +5722,11 @@ bool WW8Fib::WriteHeader(SvStream& rStrm) BYTE nBits8 = 0; if( bVer8 ) { - if( fMac ) nBits8 |= 0x0001; - if( fEmptySpecial ) nBits8 |= 0x0002; - if( fLoadOverridePage ) nBits8 |= 0x0004; - if( fFuturesavedUndo ) nBits8 |= 0x0008; - if( fWord97Saved ) nBits8 |= 0x0010; + if( fMac ) nBits8 |= 0x0001; + if( fEmptySpecial ) nBits8 |= 0x0002; + if( fLoadOverridePage ) nBits8 |= 0x0004; + if( fFuturesavedUndo ) nBits8 |= 0x0008; + if( fWord97Saved ) nBits8 |= 0x0010; if( fWord2000Saved ) nBits8 |= 0x0020; } // unter Ver67 these are only reserved @@ -5776,7 +5776,7 @@ bool WW8Fib::Write(SvStream& rStrm) ULONG nPos = rStrm.Tell(); cbMac = rStrm.Seek( STREAM_SEEK_TO_END ); - rStrm.Seek( nPos ); + rStrm.Seek( nPos ); // 2 Longs uebergehen, da unwichtiger Quatsch pData += 2 * sizeof( INT32); @@ -6004,7 +6004,7 @@ rtl_TextEncoding WW8Fib::GetFIBCharset(UINT16 chs) WW8Style::WW8Style(SvStream& rStream, WW8Fib& rFibPara) : rFib(rFibPara), rSt(rStream), cstd(0), cbSTDBaseInFile(0), stiMaxWhenSaved(0), istdMaxFixedWhenSaved(0), nVerBuiltInNamesWhenSaved(0), - ftcStandardChpStsh(0), ftcStandardChpCJKStsh(0), ftcStandardChpCTLStsh(0) + ftcAsci(0), ftcFE(0), ftcOther(0), ftcBi(0) { nStyleStart = rFib.fcStshf; nStyleLen = rFib.lcbStshf; @@ -6049,17 +6049,22 @@ WW8Style::WW8Style(SvStream& rStream, WW8Fib& rFibPara) rSt >> nVerBuiltInNamesWhenSaved; if( 14 > nRead ) break; - rSt >> ftcStandardChpStsh; + rSt >> ftcAsci; if( 16 > nRead ) break; - rSt >> ftcStandardChpCJKStsh; + rSt >> ftcFE; if ( 18 > nRead ) break; - rSt >> ftcStandardChpCTLStsh; + rSt >> ftcOther; + + ftcBi = ftcOther; + + if ( 20 > nRead ) break; + rSt >> ftcBi; // ggfs. den Rest ueberlesen - if( 18 < nRead ) - rSt.SeekRel( nRead-18 ); + if( 20 < nRead ) + rSt.SeekRel( nRead-20 ); } while( !this ); // Trick: obiger Block wird genau einmal durchlaufen // und kann vorzeitig per "break" verlassen werden. @@ -6907,44 +6912,44 @@ UINT32 WW8Dop::GetCompatabilityOptions() const // i#78591# void WW8Dop::SetCompatabilityOptions2(UINT32 a32Bit) { - fCompatabilityOptions_Unknown2_1 = ( a32Bit & 0x00000001 ); - fCompatabilityOptions_Unknown2_2 = ( a32Bit & 0x00000002 ) >> 1 ; - fDontUseHTMLAutoSpacing = ( a32Bit & 0x00000004 ) >> 2 ; - fCompatabilityOptions_Unknown2_4 = ( a32Bit & 0x00000008 ) >> 3 ; - fCompatabilityOptions_Unknown2_5 = ( a32Bit & 0x00000010 ) >> 4 ; - fCompatabilityOptions_Unknown2_6 = ( a32Bit & 0x00000020 ) >> 5 ; - fCompatabilityOptions_Unknown2_7 = ( a32Bit & 0x00000040 ) >> 6 ; - fCompatabilityOptions_Unknown2_8 = ( a32Bit & 0x00000080 ) >> 7 ; - fCompatabilityOptions_Unknown2_9 = ( a32Bit & 0x00000100 ) >> 8 ; - fCompatabilityOptions_Unknown2_10 = ( a32Bit & 0x00000200 ) >> 9 ; - fCompatabilityOptions_Unknown2_11 = ( a32Bit & 0x00000400 ) >> 10 ; - fCompatabilityOptions_Unknown2_12 = ( a32Bit & 0x00000800 ) >> 11 ; - fCompatabilityOptions_Unknown2_13 = ( a32Bit & 0x00001000 ) >> 12 ; - fCompatabilityOptions_Unknown2_14 = ( a32Bit & 0x00002000 ) >> 13 ; - fCompatabilityOptions_Unknown2_15 = ( a32Bit & 0x00004000 ) >> 14 ; - fCompatabilityOptions_Unknown2_16 = ( a32Bit & 0x00008000 ) >> 15 ; - fCompatabilityOptions_Unknown2_17 = ( a32Bit & 0x00010000 ) >> 16 ; - fCompatabilityOptions_Unknown2_18 = ( a32Bit & 0x00020000 ) >> 17 ; - fCompatabilityOptions_Unknown2_19 = ( a32Bit & 0x00040000 ) >> 18 ; - fCompatabilityOptions_Unknown2_20 = ( a32Bit & 0x00080000 ) >> 19 ; - fCompatabilityOptions_Unknown2_21 = ( a32Bit & 0x00100000 ) >> 20 ; - fCompatabilityOptions_Unknown2_22 = ( a32Bit & 0x00200000 ) >> 21 ; - fCompatabilityOptions_Unknown2_23 = ( a32Bit & 0x00400000 ) >> 22 ; - fCompatabilityOptions_Unknown2_24 = ( a32Bit & 0x00800800 ) >> 23 ; - fCompatabilityOptions_Unknown2_25 = ( a32Bit & 0x01000800 ) >> 24 ; - fCompatabilityOptions_Unknown2_26 = ( a32Bit & 0x02000800 ) >> 25 ; - fCompatabilityOptions_Unknown2_27 = ( a32Bit & 0x04000800 ) >> 26 ; - fCompatabilityOptions_Unknown2_28 = ( a32Bit & 0x08000800 ) >> 27 ; - fCompatabilityOptions_Unknown2_29 = ( a32Bit & 0x10000800 ) >> 28 ; - fCompatabilityOptions_Unknown2_30 = ( a32Bit & 0x20000800 ) >> 29 ; - fCompatabilityOptions_Unknown2_31 = ( a32Bit & 0x40000800 ) >> 30 ; - fCompatabilityOptions_Unknown2_32 = ( a32Bit & 0x80000000 ) >> 31 ; + fCompatabilityOptions_Unknown2_1 = ( a32Bit & 0x00000001 ); + fCompatabilityOptions_Unknown2_2 = ( a32Bit & 0x00000002 ) >> 1 ; + fDontUseHTMLAutoSpacing = ( a32Bit & 0x00000004 ) >> 2 ; + fCompatabilityOptions_Unknown2_4 = ( a32Bit & 0x00000008 ) >> 3 ; + fCompatabilityOptions_Unknown2_5 = ( a32Bit & 0x00000010 ) >> 4 ; + fCompatabilityOptions_Unknown2_6 = ( a32Bit & 0x00000020 ) >> 5 ; + fCompatabilityOptions_Unknown2_7 = ( a32Bit & 0x00000040 ) >> 6 ; + fCompatabilityOptions_Unknown2_8 = ( a32Bit & 0x00000080 ) >> 7 ; + fCompatabilityOptions_Unknown2_9 = ( a32Bit & 0x00000100 ) >> 8 ; + fCompatabilityOptions_Unknown2_10 = ( a32Bit & 0x00000200 ) >> 9 ; + fCompatabilityOptions_Unknown2_11 = ( a32Bit & 0x00000400 ) >> 10 ; + fCompatabilityOptions_Unknown2_12 = ( a32Bit & 0x00000800 ) >> 11 ; + fCompatabilityOptions_Unknown2_13 = ( a32Bit & 0x00001000 ) >> 12 ; + fCompatabilityOptions_Unknown2_14 = ( a32Bit & 0x00002000 ) >> 13 ; + fCompatabilityOptions_Unknown2_15 = ( a32Bit & 0x00004000 ) >> 14 ; + fCompatabilityOptions_Unknown2_16 = ( a32Bit & 0x00008000 ) >> 15 ; + fCompatabilityOptions_Unknown2_17 = ( a32Bit & 0x00010000 ) >> 16 ; + fCompatabilityOptions_Unknown2_18 = ( a32Bit & 0x00020000 ) >> 17 ; + fCompatabilityOptions_Unknown2_19 = ( a32Bit & 0x00040000 ) >> 18 ; + fCompatabilityOptions_Unknown2_20 = ( a32Bit & 0x00080000 ) >> 19 ; + fCompatabilityOptions_Unknown2_21 = ( a32Bit & 0x00100000 ) >> 20 ; + fCompatabilityOptions_Unknown2_22 = ( a32Bit & 0x00200000 ) >> 21 ; + fCompatabilityOptions_Unknown2_23 = ( a32Bit & 0x00400000 ) >> 22 ; + fCompatabilityOptions_Unknown2_24 = ( a32Bit & 0x00800800 ) >> 23 ; + fCompatabilityOptions_Unknown2_25 = ( a32Bit & 0x01000800 ) >> 24 ; + fCompatabilityOptions_Unknown2_26 = ( a32Bit & 0x02000800 ) >> 25 ; + fCompatabilityOptions_Unknown2_27 = ( a32Bit & 0x04000800 ) >> 26 ; + fCompatabilityOptions_Unknown2_28 = ( a32Bit & 0x08000800 ) >> 27 ; + fCompatabilityOptions_Unknown2_29 = ( a32Bit & 0x10000800 ) >> 28 ; + fCompatabilityOptions_Unknown2_30 = ( a32Bit & 0x20000800 ) >> 29 ; + fCompatabilityOptions_Unknown2_31 = ( a32Bit & 0x40000800 ) >> 30 ; + fCompatabilityOptions_Unknown2_32 = ( a32Bit & 0x80000000 ) >> 31 ; } UINT32 WW8Dop::GetCompatabilityOptions2() const { UINT32 a32Bit = 0; - if (fCompatabilityOptions_Unknown2_1) a32Bit |= 0x00000001; + if (fCompatabilityOptions_Unknown2_1) a32Bit |= 0x00000001; if (fCompatabilityOptions_Unknown2_2) a32Bit |= 0x00000002; if (fDontUseHTMLAutoSpacing) a32Bit |= 0x00000004; if (fCompatabilityOptions_Unknown2_4) a32Bit |= 0x00000008; @@ -6958,13 +6963,13 @@ UINT32 WW8Dop::GetCompatabilityOptions2() const if (fCompatabilityOptions_Unknown2_12) a32Bit |= 0x00000800; if (fCompatabilityOptions_Unknown2_13) a32Bit |= 0x00001000; //#i42909# set thai "line breaking rules" compatibility option - // pflin, wonder whether bUseThaiLineBreakingRules is correct + // pflin, wonder whether bUseThaiLineBreakingRules is correct // when importing word document. if (bUseThaiLineBreakingRules) a32Bit |= 0x00002000; - else if (fCompatabilityOptions_Unknown2_14) a32Bit |= 0x00002000; + else if (fCompatabilityOptions_Unknown2_14) a32Bit |= 0x00002000; if (fCompatabilityOptions_Unknown2_15) a32Bit |= 0x00004000; if (fCompatabilityOptions_Unknown2_16) a32Bit |= 0x00008000; - if (fCompatabilityOptions_Unknown2_17) a32Bit |= 0x00010000; + if (fCompatabilityOptions_Unknown2_17) a32Bit |= 0x00010000; if (fCompatabilityOptions_Unknown2_18) a32Bit |= 0x00020000; if (fCompatabilityOptions_Unknown2_19) a32Bit |= 0x00040000; if (fCompatabilityOptions_Unknown2_20) a32Bit |= 0x00080000; @@ -7176,7 +7181,7 @@ bool WW8Dop::Write(SvStream& rStrm, WW8Fib& rFib) const a16Bit |= 0x2000; } Set_UInt16(pData, a16Bit); - + pData += 48; a16Bit = 0x0080; Set_UInt16(pData, a16Bit); @@ -7206,7 +7211,7 @@ void WW8DopTypography::ReadFromMem(BYTE *&pData) if (cchFollowingPunct >= 0 && cchFollowingPunct < nMaxFollowing) rgxchFPunct[cchFollowingPunct]=0; - else + else rgxchFPunct[nMaxFollowing - 1]=0; if (cchLeadingPunct >= 0 && cchLeadingPunct < nMaxLeading) diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx index f032dc40ef1e..7e29e0aefa18 100644 --- a/sw/source/filter/ww8/ww8scan.hxx +++ b/sw/source/filter/ww8/ww8scan.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 @@ -129,7 +129,7 @@ private: enum SprmType {L_FIX=0, L_VAR=1, L_VAR2=2}; public: //7- ids are very different to 8+ ones - wwSprmParser(ww::WordVersion eVersion); + wwSprmParser(ww::WordVersion eVersion); /// Return the SPRM id at the beginning of this byte sequence sal_uInt16 GetSprmId(const sal_uInt8* pSp) const; @@ -157,7 +157,7 @@ class WW8PLCFspecial; struct WW8PLCFxDesc; class WW8PLCFx_PCD; -String WW8ReadPString( SvStream& rStrm, rtl_TextEncoding eEnc, +String WW8ReadPString( SvStream& rStrm, rtl_TextEncoding eEnc, bool bAtEndSeekRel1 = true); /** @@ -220,20 +220,20 @@ public: long nStruct, long nStartPos = -1 ); ~WW8PLCFspecial() { delete[] pPLCF_PosArray; } long GetIdx() const { return nIdx; } - void SetIdx( long nI ) { nIdx = nI; } + void SetIdx( long nI ) { nIdx = nI; } long GetIMax() const { return nIMax; } bool SeekPos(long nPos); // geht ueber FC- bzw. CP-Wert // bzw. naechste groesseren Wert bool SeekPosExact(long nPos); - INT32 Where() const + 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; - const void* GetData( long nInIdx ) const + const void* GetData( long nInIdx ) const { - return ( nInIdx >= nIMax ) ? 0 - : (const void*)&pPLCF_Contents[nInIdx * nStru]; + return ( nInIdx >= nIMax ) ? 0 + : (const void*)&pPLCF_Contents[nInIdx * nStru]; } INT32 GetPos( long nInIdx ) const { return ( nInIdx >= nIMax ) ? SAL_MAX_INT32 : pPLCF_PosArray[nInIdx]; } @@ -262,7 +262,7 @@ public: void SetSprms( const BYTE* pSprms_, long nLen_ ); const BYTE* FindSprm(USHORT nId); const BYTE* operator ++( int ); - const BYTE* GetSprms() const + const BYTE* GetSprms() const { return ( pSprms && (0 < nRemLen) ) ? pSprms : 0; } const BYTE* GetAktParams() const { return pAktParams; } USHORT GetAktId() const { return nAktId; } @@ -292,13 +292,13 @@ private: void MakeFailedPLCF(); public: - WW8PLCF( SvStream* pSt, WW8_FC nFilePos, INT32 nPLCF, int nStruct, + WW8PLCF( SvStream* pSt, WW8_FC nFilePos, 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, + WW8PLCF( SvStream* pSt, WW8_FC nFilePos, INT32 nPLCF, int nStruct, WW8_CP nStartPos, INT32 nPN, INT32 ncpN ); ~WW8PLCF(){ delete[] pPLCF_PosArray; } @@ -310,10 +310,10 @@ public: 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( INT32 nInIdx ) const { - return ( nInIdx >= nIMax ) ? 0 : - (const void*)&pPLCF_Contents[nInIdx * nStru]; + return ( nInIdx >= nIMax ) ? 0 : + (const void*)&pPLCF_Contents[nInIdx * nStru]; } }; @@ -348,11 +348,11 @@ public: bool SeekPos(long nPos); INT32 Where() const; bool Get(WW8_CP& rStart, WW8_CP& rEnd, void*& rpValue) const; - WW8PLCFpcd_Iter& operator ++( int ) - { - if( nIdx < rPLCF.nIMax ) - nIdx++; - return *this; + WW8PLCFpcd_Iter& operator ++( int ) + { + if( nIdx < rPLCF.nIMax ) + nIdx++; + return *this; } }; @@ -377,7 +377,7 @@ private: WW8PLCFx(const WW8PLCFx&); WW8PLCFx& operator=(const WW8PLCFx&); public: - WW8PLCFx(ww::WordVersion eVersion, bool bSprm) + WW8PLCFx(ww::WordVersion eVersion, bool bSprm) : meVer(eVersion), bIsSprm(bSprm), bDirty(false) {} virtual ~WW8PLCFx() {} bool IsSprm() const { return bIsSprm; } @@ -437,7 +437,7 @@ private: WW8PLCFx_PCD(const WW8PLCFx_PCD&); WW8PLCFx_PCD& operator=(const WW8PLCFx_PCD&); public: - WW8PLCFx_PCD(ww::WordVersion eVersion, WW8PLCFpcd* pPLCFpcd, + WW8PLCFx_PCD(ww::WordVersion eVersion, WW8PLCFpcd* pPLCFpcd, WW8_CP nStartCp, bool bVer67P); virtual ~WW8PLCFx_PCD(); virtual ULONG GetIMax() const; @@ -449,7 +449,7 @@ public: virtual WW8PLCFx& operator ++( int ); WW8_CP AktPieceStartFc2Cp( WW8_FC nStartPos ); WW8_FC AktPieceStartCp2Fc( WW8_CP nCp ); - void AktPieceFc2Cp(WW8_CP& rStartPos, WW8_CP& rEndPos, + void AktPieceFc2Cp(WW8_CP& rStartPos, WW8_CP& rEndPos, const WW8ScannerBase *pSBase); WW8PLCFpcd_Iter* GetPLCFIter() { return pPcdI; } void SetClipStart(WW8_CP nIn) { nClipStart = nIn; } @@ -477,49 +477,49 @@ public: public: WW8_FC mnFC; - sal_uInt8* mpData; + sal_uInt8* mpData; sal_uInt16 mnLen; sal_uInt16 mnIStd; // only for Fkp.Papx (actualy Style-Nr) bool mbMustDelete; - explicit Entry(WW8_FC nFC) : mnFC(nFC), mpData(0), mnLen(0), + explicit Entry(WW8_FC nFC) : mnFC(nFC), mpData(0), mnLen(0), mnIStd(0), mbMustDelete(false) {} Entry(const Entry &rEntry); ~Entry(); bool operator<(const Entry& rEntry) const; Entry& operator=(const Entry& rEntry); }; - + sal_uInt8 maRawData[512]; std::vector<Entry> maEntries; long nItemSize; // entweder 1 Byte oder ein komplettes BX // Offset in Stream where last read of 52 bytes took place - long nFilePos; + long nFilePos; sal_uInt8 mnIdx; // Pos-Merker ePLCFT ePLCF; sal_uInt8 mnIMax; // Anzahl der Eintraege - + wwSprmParser maSprmParser; public: - WW8Fkp (ww::WordVersion eVersion, SvStream* pFKPStrm, - SvStream* pDataStrm, long _nFilePos, long nItemSiz, ePLCFT ePl, + WW8Fkp (ww::WordVersion eVersion, SvStream* pFKPStrm, + SvStream* pDataStrm, long _nFilePos, long nItemSiz, ePLCFT ePl, WW8_FC nStartFc = -1); void Reset(WW8_FC nPos); long GetFilePos() const { return nFilePos; } sal_uInt8 GetIdx() const { return mnIdx; } bool SetIdx(sal_uInt8 nI); bool SeekPos(WW8_FC nFc); - WW8_FC Where() const - { - return (mnIdx < mnIMax) ? maEntries[mnIdx].mnFC : WW8_FC_MAX; + WW8_FC Where() const + { + return (mnIdx < mnIMax) ? maEntries[mnIdx].mnFC : WW8_FC_MAX; } - WW8Fkp& operator ++( int ) - { + WW8Fkp& operator ++( int ) + { if (mnIdx < mnIMax) mnIdx++; - return *this; + return *this; } BYTE* Get( WW8_FC& rStart, WW8_FC& rEnd, sal_Int32& rLen ) const; sal_uInt16 GetIstd() const { return maEntries[mnIdx].mnIStd; } @@ -601,7 +601,7 @@ private: WW8PLCFx_Cp_FKP(const WW8PLCFx_Cp_FKP&); WW8PLCFx_Cp_FKP& operator=(const WW8PLCFx_Cp_FKP&); public: - WW8PLCFx_Cp_FKP( SvStream* pSt, SvStream* pTblSt, SvStream* pDataSt, + WW8PLCFx_Cp_FKP( SvStream* pSt, SvStream* pTblSt, SvStream* pDataSt, const WW8ScannerBase& rBase, ePLCFT ePl ); virtual ~WW8PLCFx_Cp_FKP(); void ResetAttrStartEnd(); @@ -633,7 +633,7 @@ private: WW8PLCFx_SEPX(const WW8PLCFx_SEPX&); WW8PLCFx_SEPX& operator=(const WW8PLCFx_SEPX&); public: - WW8PLCFx_SEPX( SvStream* pSt, SvStream* pTblxySt, const WW8Fib& rFib, + WW8PLCFx_SEPX( SvStream* pSt, SvStream* pTblxySt, const WW8Fib& rFib, WW8_CP nStartCp ); virtual ~WW8PLCFx_SEPX(); virtual ULONG GetIdx() const; @@ -662,7 +662,7 @@ private: WW8PLCFx_SubDoc(const WW8PLCFx_SubDoc&); WW8PLCFx_SubDoc& operator=(const WW8PLCFx_SubDoc&); public: - WW8PLCFx_SubDoc(SvStream* pSt, ww::WordVersion eVersion, WW8_CP nStartCp, + 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; @@ -683,7 +683,7 @@ public: long Count() const { return ( pRef ) ? pRef->GetIMax() : 0; } }; -/// Iterator for footnotes and endnotes +/// Iterator for fields class WW8PLCFx_FLD : public WW8PLCFx { private: @@ -718,7 +718,7 @@ private: long nIMax; // Number of Booknotes USHORT nIsEnd; int nBookmarkId; // counter incremented by GetUniqueBookmarkName. - + //No copying WW8PLCFx_Book(const WW8PLCFx_Book&); WW8PLCFx_Book& operator=(const WW8PLCFx_Book&); @@ -835,7 +835,7 @@ private: //drawboxes we want the true offsets WW8PLCFxDesc aD[MAN_ANZ_PLCF]; - WW8PLCFxDesc *pChp, *pPap, *pSep, *pFld, *pFtn, *pEdn, *pBkm, *pPcd, + WW8PLCFxDesc *pChp, *pPap, *pSep, *pFld, *pFtn, *pEdn, *pBkm, *pPcd, *pPcdA, *pAnd; WW8PLCFspecial *pFdoa, *pTxbx, *pTxbxBkd,*pMagicTables, *pSubdocs; BYTE* pExtendedAtrds; @@ -854,7 +854,7 @@ private: void AdvNoSprm(short nIdx, bool bStart); USHORT GetId(const WW8PLCFxDesc* p ) const; public: - WW8PLCFMan(WW8ScannerBase* pBase, ManTypes nType, long nStartCp, + WW8PLCFMan(WW8ScannerBase* pBase, ManTypes nType, long nStartCp, bool bDoingDrawTextBox = false); ~WW8PLCFMan(); @@ -881,11 +881,11 @@ public: const BYTE* HasCharSprm( USHORT nId ) const; bool HasCharSprm(USHORT nId, std::vector<const BYTE *> &rResult) const; - WW8PLCFx_Cp_FKP* GetChpPLCF() const + WW8PLCFx_Cp_FKP* GetChpPLCF() const { return (WW8PLCFx_Cp_FKP*)pChp->pPLCFx; } - WW8PLCFx_Cp_FKP* GetPapPLCF() const + WW8PLCFx_Cp_FKP* GetPapPLCF() const { return (WW8PLCFx_Cp_FKP*)pPap->pPLCFx; } - WW8PLCFx_SEPX* GetSepPLCF() const + WW8PLCFx_SEPX* GetSepPLCF() const { return (WW8PLCFx_SEPX*)pSep->pPLCFx; } WW8PLCFxDesc* GetPap() const { return pPap; } bool TransferOpenSprms(std::stack<USHORT> &rStack); @@ -911,7 +911,7 @@ struct WW8PLCFxSaveAll class WW8ScannerBase { -friend WW8PLCFx_PCDAttrs::WW8PLCFx_PCDAttrs(ww::WordVersion eVersion, +friend WW8PLCFx_PCDAttrs::WW8PLCFx_PCDAttrs(ww::WordVersion eVersion, WW8PLCFx_PCD* pPLCFx_PCD, const WW8ScannerBase* pBase ); friend WW8PLCFx_Cp_FKP::WW8PLCFx_Cp_FKP( SvStream*, SvStream*, SvStream*, const WW8ScannerBase&, ePLCFT ); @@ -969,10 +969,10 @@ public: //given that we never write fastsaved files you can use it, otherwise //I will beat you with a stick WW8_CP WW8Fc2Cp(WW8_FC nFcPos) const ; - WW8_FC WW8Cp2Fc(WW8_CP nCpPos, bool* pIsUnicode = 0, + WW8_FC WW8Cp2Fc(WW8_CP nCpPos, bool* pIsUnicode = 0, WW8_CP* pNextPieceCp = 0, bool* pTestFlag = 0) const; - xub_StrLen WW8ReadString(SvStream& rStrm, String& rStr, WW8_CP nAktStartCp, + xub_StrLen WW8ReadString(SvStream& rStrm, String& rStr, WW8_CP nAktStartCp, long nTotalLen, rtl_TextEncoding eEnc ) const; }; @@ -1418,7 +1418,7 @@ public: // 0x422 - 0x4D4 == ignore WW8_FC fcHplxsdr; //bizarrely, word xp seems to require this set to shows dates from AtrdExtra - UINT32 lcbHplxsdr; + UINT32 lcbHplxsdr; /* General-Varaiblen, die fuer Ver67 und Ver8 verwendet werden, @@ -1429,7 +1429,7 @@ public: INT32 cpnBteChp; INT32 cpnBtePap; /* - The actual nFib, moved here because some readers assumed + The actual nFib, moved here because some readers assumed they couldn't read any format with nFib > some constant */ UINT16 nFib_actual; // 0x05bc #i56856# @@ -1464,11 +1464,13 @@ protected: UINT16 istdMaxFixedWhenSaved; // How many fixed-index istds are there? UINT16 nVerBuiltInNamesWhenSaved; // Current version of built-in stylenames // ftc used by StandardChpStsh for this document - UINT16 ftcStandardChpStsh; + UINT16 ftcAsci; // CJK ftc used by StandardChpStsh for this document - UINT16 ftcStandardChpCJKStsh; + UINT16 ftcFE; + // CTL/Other ftc used by StandardChpStsh for this document + UINT16 ftcOther; // CTL ftc used by StandardChpStsh for this document - UINT16 ftcStandardChpCTLStsh; + UINT16 ftcBi; //No copying WW8Style(const WW8Style&); @@ -1495,12 +1497,12 @@ public: typedef BYTE HdFtFlags; namespace nsHdFtFlags { - const HdFtFlags WW8_HEADER_EVEN = 0x01; - const HdFtFlags WW8_HEADER_ODD = 0x02; - const HdFtFlags WW8_FOOTER_EVEN = 0x04; - const HdFtFlags WW8_FOOTER_ODD = 0x08; - const HdFtFlags WW8_HEADER_FIRST = 0x10; - const HdFtFlags WW8_FOOTER_FIRST = 0x20; + const HdFtFlags WW8_HEADER_EVEN = 0x01; + const HdFtFlags WW8_HEADER_ODD = 0x02; + const HdFtFlags WW8_FOOTER_EVEN = 0x04; + const HdFtFlags WW8_FOOTER_ODD = 0x08; + const HdFtFlags WW8_HEADER_FIRST = 0x10; + const HdFtFlags WW8_FOOTER_FIRST = 0x20; } /// Document Properties @@ -1626,26 +1628,26 @@ public: 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 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 // 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 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 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 // hier sollte bei nFib <= 105 Schluss sein, sonst ist Datei fehlerhaft! @@ -1685,38 +1687,38 @@ public: INT16 hpsZoonFontPag; INT16 dywDispPag; - UINT32 fCompatabilityOptions_Unknown2_1 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown2_2 :1; // #i78591# + 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# + 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; diff --git a/sw/source/filter/ww8/ww8struc.hxx b/sw/source/filter/ww8/ww8struc.hxx index 5d943b80a759..a17853521072 100644 --- a/sw/source/filter/ww8/ww8struc.hxx +++ b/sw/source/filter/ww8/ww8struc.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 |