Kaydet (Commit) 7d0dd9bd authored tarafından Miklos Vajna's avatar Miklos Vajna

sw: move WW8TabBandDesc to ww8par.hxx

I'll need this struct in ww8par6.cxx soon.

Change-Id: I4cf546ff585c89c076e4fdad93dbbb9b8ea72eca
üst 983beed9
...@@ -913,6 +913,62 @@ struct WW8PostProcessAttrsInfo ...@@ -913,6 +913,62 @@ struct WW8PostProcessAttrsInfo
WW8PostProcessAttrsInfo(WW8_CP nCpStart, WW8_CP nCpEnd, SwPaM & rPaM); WW8PostProcessAttrsInfo(WW8_CP nCpStart, WW8_CP nCpEnd, SwPaM & rPaM);
}; };
#define MAX_COL 64 // WW6-description: 32, WW6-UI: 31 & WW8-UI: 63!
struct WW8TabBandDesc
{
WW8TabBandDesc* pNextBand;
short nGapHalf;
short mnDefaultLeft;
short mnDefaultTop;
short mnDefaultRight;
short mnDefaultBottom;
bool mbHasSpacing;
short nLineHeight;
short nRows;
sal_uInt16 maDirections[MAX_COL + 1];
short nCenter[MAX_COL + 1]; // X-edge of all cells of this band
short nWidth[MAX_COL + 1]; // length of all cells of this band
short nWwCols; // sal_uInt8 would be sufficient, alignment -> short
short nSwCols; // SW: number of columns for the writer
bool bLEmptyCol; // SW: an additional empty column at the left
bool bREmptyCol; // SW: same at the right
bool bCantSplit;
bool bCantSplit90;
WW8_TCell* pTCs;
sal_uInt8 nOverrideSpacing[MAX_COL + 1];
short nOverrideValues[MAX_COL + 1][4];
WW8_SHD* pSHDs;
sal_uInt32* pNewSHDs;
WW8_BRC aDefBrcs[6];
bool bExist[MAX_COL]; // does this cell exist ?
sal_uInt8 nTransCell[MAX_COL + 2]; // translation WW-Index -> SW-Index
sal_uInt8 transCell(sal_uInt8 nWwCol) const
{
return nWwCol < SAL_N_ELEMENTS(nTransCell) ? nTransCell[nWwCol] : 0xFF;
}
WW8TabBandDesc();
WW8TabBandDesc(WW8TabBandDesc& rBand); // deep copy
~WW8TabBandDesc();
static void setcelldefaults(WW8_TCell *pCells, short nCells);
void ReadDef(bool bVer67, const sal_uInt8* pS);
void ProcessDirection(const sal_uInt8* pParams);
void ProcessSprmTSetBRC(bool bVer67, const sal_uInt8* pParamsTSetBRC);
void ProcessSprmTTableBorders(bool bVer67, const sal_uInt8* pParams);
void ProcessSprmTDxaCol(const sal_uInt8* pParamsTDxaCol);
void ProcessSprmTDelete(const sal_uInt8* pParamsTDelete);
void ProcessSprmTInsert(const sal_uInt8* pParamsTInsert);
void ProcessSpacing(const sal_uInt8* pParamsTInsert);
void ProcessSpecificSpacing(const sal_uInt8* pParamsTInsert);
void ReadShd(const sal_uInt8* pS );
void ReadNewShd(const sal_uInt8* pS, bool bVer67);
enum wwDIR {wwTOP = 0, wwLEFT = 1, wwBOTTOM = 2, wwRIGHT = 3};
};
//----------------------------------------- //-----------------------------------------
// Storage-Reader // Storage-Reader
//----------------------------------------- //-----------------------------------------
......
...@@ -67,8 +67,6 @@ ...@@ -67,8 +67,6 @@
#include <iostream> #include <iostream>
#define MAX_COL 64 // WW6-description: 32, WW6-UI: 31 & WW8-UI: 63!
using namespace ::com::sun::star; using namespace ::com::sun::star;
...@@ -90,60 +88,6 @@ public: ...@@ -90,60 +88,6 @@ public:
typedef boost::ptr_vector<WW8SelBoxInfo> WW8MergeGroups; typedef boost::ptr_vector<WW8SelBoxInfo> WW8MergeGroups;
struct WW8TabBandDesc
{
WW8TabBandDesc* pNextBand;
short nGapHalf;
short mnDefaultLeft;
short mnDefaultTop;
short mnDefaultRight;
short mnDefaultBottom;
bool mbHasSpacing;
short nLineHeight;
short nRows;
sal_uInt16 maDirections[MAX_COL + 1];
short nCenter[MAX_COL + 1]; // X-edge of all cells of this band
short nWidth[MAX_COL + 1]; // length of all cells of this band
short nWwCols; // sal_uInt8 would be sufficient, alignment -> short
short nSwCols; // SW: number of columns for the writer
bool bLEmptyCol; // SW: an additional empty column at the left
bool bREmptyCol; // SW: same at the right
bool bCantSplit;
bool bCantSplit90;
WW8_TCell* pTCs;
sal_uInt8 nOverrideSpacing[MAX_COL + 1];
short nOverrideValues[MAX_COL + 1][4];
WW8_SHD* pSHDs;
sal_uInt32* pNewSHDs;
WW8_BRC aDefBrcs[6];
bool bExist[MAX_COL]; // does this cell exist ?
sal_uInt8 nTransCell[MAX_COL + 2]; // translation WW-Index -> SW-Index
sal_uInt8 transCell(sal_uInt8 nWwCol) const
{
return nWwCol < SAL_N_ELEMENTS(nTransCell) ? nTransCell[nWwCol] : 0xFF;
}
WW8TabBandDesc();
WW8TabBandDesc(WW8TabBandDesc& rBand); // deep copy
~WW8TabBandDesc();
static void setcelldefaults(WW8_TCell *pCells, short nCells);
void ReadDef(bool bVer67, const sal_uInt8* pS);
void ProcessDirection(const sal_uInt8* pParams);
void ProcessSprmTSetBRC(bool bVer67, const sal_uInt8* pParamsTSetBRC);
void ProcessSprmTTableBorders(bool bVer67, const sal_uInt8* pParams);
void ProcessSprmTDxaCol(const sal_uInt8* pParamsTDxaCol);
void ProcessSprmTDelete(const sal_uInt8* pParamsTDelete);
void ProcessSprmTInsert(const sal_uInt8* pParamsTInsert);
void ProcessSpacing(const sal_uInt8* pParamsTInsert);
void ProcessSpecificSpacing(const sal_uInt8* pParamsTInsert);
void ReadShd(const sal_uInt8* pS );
void ReadNewShd(const sal_uInt8* pS, bool bVer67);
enum wwDIR {wwTOP = 0, wwLEFT = 1, wwBOTTOM = 2, wwRIGHT = 3};
};
WW8TabBandDesc::WW8TabBandDesc() WW8TabBandDesc::WW8TabBandDesc()
{ {
memset(this, 0, sizeof(*this)); memset(this, 0, sizeof(*this));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment