summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@suse.cz>2013-05-13 11:07:43 +0200
committerMiklos Vajna <vmiklos@suse.cz>2013-05-13 11:43:36 +0200
commit7d0dd9bd5b9fcd3b575c77e22c909bff15519a84 (patch)
tree49290ac30534a81b656fb5c4f40f64c6fc1aab8b
parent983beed96af004002fed6b71324c292b0fd9d1f4 (diff)
sw: move WW8TabBandDesc to ww8par.hxx
I'll need this struct in ww8par6.cxx soon. Change-Id: I4cf546ff585c89c076e4fdad93dbbb9b8ea72eca
-rw-r--r--sw/source/filter/ww8/ww8par.hxx56
-rw-r--r--sw/source/filter/ww8/ww8par2.cxx56
2 files changed, 56 insertions, 56 deletions
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index e6d706a70775..d6b9f0526449 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -913,6 +913,62 @@ struct WW8PostProcessAttrsInfo
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
//-----------------------------------------
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 7b6b6490713c..49951cf07efb 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -67,8 +67,6 @@
#include <iostream>
-#define MAX_COL 64 // WW6-description: 32, WW6-UI: 31 & WW8-UI: 63!
-
using namespace ::com::sun::star;
@@ -90,60 +88,6 @@ public:
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()
{
memset(this, 0, sizeof(*this));