diff options
author | Miklos Vajna <vmiklos@suse.cz> | 2013-05-13 12:55:41 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@suse.cz> | 2013-05-13 13:01:41 +0200 |
commit | 3c922c203efb19e095c1687c0047e27d89c18c83 (patch) | |
tree | ba7e6f425d94a0bacc83f7d9a6bf49b57965023c | |
parent | 8378527a678f15b588550fcdfda84ac45613f84c (diff) |
bnc#816603 sw: move WW8TabBandDesc to ww8par.hxx
I'll need this struct in ww8par6.cxx soon.
(cherry picked from commit 7d0dd9bd5b9fcd3b575c77e22c909bff15519a84)
Change-Id: I4cf546ff585c89c076e4fdad93dbbb9b8ea72eca
Conflicts:
sw/source/filter/ww8/ww8par2.cxx
-rw-r--r-- | sw/source/filter/ww8/ww8par.hxx | 56 | ||||
-rw-r--r-- | sw/source/filter/ww8/ww8par2.cxx | 56 |
2 files changed, 56 insertions, 56 deletions
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index e2cc68053ebb..5655def6ad04 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -914,6 +914,62 @@ struct WW8PostProcessAttrsInfo WW8PostProcessAttrsInfo(WW8_CP nCpStart, WW8_CP nCpEnd, SwPaM & rPaM); }; +#define MAX_COL 64 // WW6-Beschreibung: 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-Rand aller Zellen dieses Bandes + short nWidth[MAX_COL + 1]; // Laenge aller Zellen dieses Bandes + short nWwCols; // sal_uInt8 wuerde reichen, alignment -> short + short nSwCols; // SW: so viele Spalten fuer den Writer + bool bLEmptyCol; // SW: Links eine leere Zusatz-Spalte + bool bREmptyCol; // SW: dito rechts + 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]; // Existiert diese Zelle ? + sal_uInt8 nTransCell[MAX_COL + 2]; // UEbersetzung WW-Index -> SW-Index + + sal_uInt8 transCell(sal_uInt8 nWwCol) const + { + return nWwCol < SAL_N_ELEMENTS(nTransCell) ? nTransCell[nWwCol] : 0xFF; + } + + WW8TabBandDesc(); + WW8TabBandDesc(WW8TabBandDesc& rBand); // tief kopieren + ~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 679f1161df60..fe0ee48a5365 100644 --- a/sw/source/filter/ww8/ww8par2.cxx +++ b/sw/source/filter/ww8/ww8par2.cxx @@ -75,8 +75,6 @@ #include <iostream> -#define MAX_COL 64 // WW6-Beschreibung: 32, WW6-UI: 31 & WW8-UI: 63! - using namespace ::com::sun::star; @@ -97,60 +95,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-Rand aller Zellen dieses Bandes - short nWidth[MAX_COL + 1]; // Laenge aller Zellen dieses Bandes - short nWwCols; // sal_uInt8 wuerde reichen, alignment -> short - short nSwCols; // SW: so viele Spalten fuer den Writer - bool bLEmptyCol; // SW: Links eine leere Zusatz-Spalte - bool bREmptyCol; // SW: dito rechts - 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]; // Existiert diese Zelle ? - sal_uInt8 nTransCell[MAX_COL + 2]; // UEbersetzung WW-Index -> SW-Index - - sal_uInt8 transCell(sal_uInt8 nWwCol) const - { - return nWwCol < SAL_N_ELEMENTS(nTransCell) ? nTransCell[nWwCol] : 0xFF; - } - - WW8TabBandDesc(); - WW8TabBandDesc(WW8TabBandDesc& rBand); // tief kopieren - ~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)); |