summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorCaolán McNamara <cmc@openoffice.org>2002-12-10 11:41:19 +0000
committerCaolán McNamara <cmc@openoffice.org>2002-12-10 11:41:19 +0000
commit986923e59e9edfbdda2bea8bfd3efb4c3fa75a89 (patch)
treee9cb619851b7b9d7b429a32657511197703f7c50 /sw
parent6e9a37c317c82876b0ae670017cf7a74887f34c4 (diff)
#105916# remove worthless if 0'ed code
Diffstat (limited to 'sw')
-rw-r--r--sw/source/filter/ww8/escher.hxx7
-rw-r--r--sw/source/filter/ww8/wrtw8esh.cxx15
-rw-r--r--sw/source/filter/ww8/wrtw8num.cxx11
-rw-r--r--sw/source/filter/ww8/wrtww8.cxx12
-rw-r--r--sw/source/filter/ww8/wrtww8.hxx8
-rw-r--r--sw/source/filter/ww8/ww8atr.cxx15
-rw-r--r--sw/source/filter/ww8/ww8glsy.cxx9
-rw-r--r--sw/source/filter/ww8/ww8glsy.hxx7
-rw-r--r--sw/source/filter/ww8/ww8graf.hxx88
-rw-r--r--sw/source/filter/ww8/ww8par.cxx67
-rw-r--r--sw/source/filter/ww8/ww8par.hxx9
-rw-r--r--sw/source/filter/ww8/ww8par2.cxx26
-rw-r--r--sw/source/filter/ww8/ww8par3.cxx74
-rw-r--r--sw/source/filter/ww8/ww8par4.cxx19
-rw-r--r--sw/source/filter/ww8/ww8par5.cxx27
-rw-r--r--sw/source/filter/ww8/ww8par6.cxx54
-rw-r--r--sw/source/filter/ww8/ww8scan.cxx53
-rw-r--r--sw/source/filter/ww8/ww8scan.hxx11
-rw-r--r--sw/source/filter/ww8/ww8struc.hxx140
19 files changed, 169 insertions, 483 deletions
diff --git a/sw/source/filter/ww8/escher.hxx b/sw/source/filter/ww8/escher.hxx
index e635d57ed2a8..de208f41c6b7 100644
--- a/sw/source/filter/ww8/escher.hxx
+++ b/sw/source/filter/ww8/escher.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: escher.hxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: cmc $ $Date: 2002-11-07 16:54:12 $
+ * last change: $Author: cmc $ $Date: 2002-12-10 12:41:14 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -59,6 +59,9 @@
*
************************************************************************/
+/* vi:set tabstop=4 shiftwidth=4 expandtab: */
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
+
#ifndef _ESCHER_HXX
#define _ESCHER_HXX
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index 53659d3073f3..5e79c975b557 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: wrtw8esh.cxx,v $
*
- * $Revision: 1.56 $
+ * $Revision: 1.57 $
*
- * last change: $Author: dr $ $Date: 2002-11-29 11:54:46 $
+ * last change: $Author: cmc $ $Date: 2002-12-10 12:41:14 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1327,17 +1327,6 @@ void SwBasicEscherEx::WriteGrfAttr(const SwNoTxtNode& rNd,
if (nBrightness != 0)
rPropOpt.AddOpt( ESCHER_Prop_pictureBrightness, nBrightness * 327 );
-#if 0
- //gamma not seen
- if( SFX_ITEM_SET == rNd.GetSwAttrSet().GetItemState( RES_GRFATR_GAMMA,
- true, &pItem ) )
- {
- double fGamma = ((SwGammaGrf*)pItem)->GetValue();
- rPropOpt.AddOpt( ESCHER_Prop_pictureGamma,
- static_cast<sal_uInt32>(fGamma * 655) );
- }
-#endif
-
if (SFX_ITEM_SET == rNd.GetSwAttrSet().GetItemState(RES_GRFATR_CROPGRF,
true, &pItem))
{
diff --git a/sw/source/filter/ww8/wrtw8num.cxx b/sw/source/filter/ww8/wrtw8num.cxx
index 0f1674c91cc0..e026691b6e7a 100644
--- a/sw/source/filter/ww8/wrtw8num.cxx
+++ b/sw/source/filter/ww8/wrtw8num.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: wrtw8num.cxx,v $
*
- * $Revision: 1.18 $
+ * $Revision: 1.19 $
*
- * last change: $Author: cmc $ $Date: 2002-12-05 17:53:19 $
+ * last change: $Author: cmc $ $Date: 2002-12-10 12:41:14 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -343,13 +343,6 @@ void SwWW8Writer::OutListTab()
else
pO->Insert(93, pO->Count());
InsUInt16(nFontID);
-#if 0
- if (bWrtWW8)
- {
- InsUInt16(0x286F);
- pO->Insert(01, pO->Count());
- }
-#endif
}
else
pOutSet = &rFmt.GetCharFmt()->GetAttrSet();
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 4fd51ee20402..d9c6c19fd2ba 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: wrtww8.cxx,v $
*
- * $Revision: 1.49 $
+ * $Revision: 1.50 $
*
- * last change: $Author: hbrinkm $ $Date: 2002-12-04 16:00:42 $
+ * last change: $Author: cmc $ $Date: 2002-12-10 12:41:14 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -2120,12 +2120,6 @@ ULONG SwWW8Writer::StoreDoc()
PrepareStorage();
maFontHelper.InitFontTable(bWrtWW8, *pDoc);
-#if 0
- //I reckon we don't need this with the new ww font code
- PutNumFmtFontsInAttrPool();
- PutEditEngFontsInAttrPool();
- PutCJKandCTLFontsInAttrPool();
-#endif
pFib = new WW8Fib( bWrtWW8 ? 8 : 6 );
@@ -2257,7 +2251,7 @@ ULONG SwWW8Writer::StoreDoc()
// set AutoHyphenation flag if found in default para style
const SfxPoolItem* pItem;
SwTxtFmtColl* pStdTxtFmtColl =
- pDoc->GetTxtCollFromPoolSimple(RES_POOLCOLL_STANDARD, FALSE);
+ pDoc->GetTxtCollFromPoolSimple(RES_POOLCOLL_STANDARD, false);
if (pStdTxtFmtColl && SFX_ITEM_SET == pStdTxtFmtColl->GetItemState(
RES_PARATR_HYPHENZONE, false, &pItem))
{
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index 53c96ff4f983..17e293158737 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: wrtww8.hxx,v $
*
- * $Revision: 1.41 $
+ * $Revision: 1.42 $
*
- * last change: $Author: cmc $ $Date: 2002-11-22 12:56:00 $
+ * last change: $Author: cmc $ $Date: 2002-12-10 12:41:15 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -58,6 +58,10 @@
*
*
************************************************************************/
+
+/* vi:set tabstop=4 shiftwidth=4 expandtab: */
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
+
#ifndef _WRTWW8_HXX
#define _WRTWW8_HXX
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index a7cd85ceec5c..254e096b02b9 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: ww8atr.cxx,v $
*
- * $Revision: 1.55 $
+ * $Revision: 1.56 $
*
- * last change: $Author: cmc $ $Date: 2002-12-10 09:43:16 $
+ * last change: $Author: cmc $ $Date: 2002-12-10 12:41:15 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -360,19 +360,12 @@
#define ATTRFNTAB_SIZE 130
#if ATTRFNTAB_SIZE != POOLATTR_END - POOLATTR_BEGIN
-#error "Attribut-Tabelle ist ungueltigt. Wurden neue Hint-ID's zugefuegt ??"
-#endif
-
-#if 0
-#define FORMATTAB_SIZE 6
-#if FORMATTAB_SIZE != RES_FMT_END - RES_FMT_BEGIN
-#error "Format-Tabelle ist ungueltigt. Wurden neue Hint-ID's zugefuegt ??"
-#endif
+# error "Attribut-Tabelle ist ungueltigt. Wurden neue Hint-ID's zugefuegt ??"
#endif
#define NODETAB_SIZE 3
#if NODETAB_SIZE != RES_NODE_END - RES_NODE_BEGIN
-#error "Node-Tabelle ist ungueltigt. Wurden neue Hint-ID's zugefuegt ??"
+# error "Node-Tabelle ist ungueltigt. Wurden neue Hint-ID's zugefuegt ??"
#endif
#endif
diff --git a/sw/source/filter/ww8/ww8glsy.cxx b/sw/source/filter/ww8/ww8glsy.cxx
index 12d4b8b77a70..718879b9c7a8 100644
--- a/sw/source/filter/ww8/ww8glsy.cxx
+++ b/sw/source/filter/ww8/ww8glsy.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: ww8glsy.cxx,v $
*
- * $Revision: 1.11 $
+ * $Revision: 1.12 $
*
- * last change: $Author: hbrinkm $ $Date: 2002-12-04 16:01:59 $
+ * last change: $Author: cmc $ $Date: 2002-12-10 12:41:15 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -59,6 +59,9 @@
*
************************************************************************/
+/* vi:set tabstop=4 shiftwidth=4 expandtab: */
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
+
#ifdef PRECOMPILED
#include "filt_pch.hxx"
#endif
@@ -174,7 +177,7 @@ bool WW8Glossary::MakeEntries(SwDoc *pD, SwTextBlocks &rBlocks,
if( aStart < aDocEnd )
{
SwTxtFmtColl* pColl = pD->GetTxtCollFromPoolSimple
- ( RES_POOLCOLL_STANDARD, FALSE );
+ (RES_POOLCOLL_STANDARD, false);
USHORT nGlosEntry = 0;
SwCntntNode* pCNd = 0;
do {
diff --git a/sw/source/filter/ww8/ww8glsy.hxx b/sw/source/filter/ww8/ww8glsy.hxx
index 8298839fed4d..446b3bb98ac1 100644
--- a/sw/source/filter/ww8/ww8glsy.hxx
+++ b/sw/source/filter/ww8/ww8glsy.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: ww8glsy.hxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: cmc $ $Date: 2002-07-01 13:55:13 $
+ * last change: $Author: cmc $ $Date: 2002-12-10 12:41:15 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -59,6 +59,9 @@
*
************************************************************************/
+/* vi:set tabstop=4 shiftwidth=4 expandtab: */
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
+
#ifndef _WW8GLSY_HXX
#define _WW8GLSY_HXX
diff --git a/sw/source/filter/ww8/ww8graf.hxx b/sw/source/filter/ww8/ww8graf.hxx
index 9088213a3def..5c6fbfdcb09c 100644
--- a/sw/source/filter/ww8/ww8graf.hxx
+++ b/sw/source/filter/ww8/ww8graf.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: ww8graf.hxx,v $
*
- * $Revision: 1.9 $
+ * $Revision: 1.10 $
*
- * last change: $Author: cmc $ $Date: 2002-09-24 14:39:51 $
+ * last change: $Author: cmc $ $Date: 2002-12-10 12:41:16 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -59,6 +59,9 @@
*
************************************************************************/
+/* vi:set tabstop=4 shiftwidth=4 expandtab: */
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
+
#ifndef _WW8GRAF_HXX
#define _WW8GRAF_HXX
@@ -69,87 +72,6 @@
#include <stack>
#endif
-#if defined WNT || defined WIN || defined OS2
-#define __WW8_NEEDS_PACK
-#pragma pack(2)
-#endif
-
-struct WW8_FSPA
-{
-public:
- long nSpId; //Shape Identifier. Used in conjunction with the office art data (found via fcDggInfo in the FIB) to find the actual data for this shape.
- long nXaLeft; //left of rectangle enclosing shape relative to the origin of the shape
- long nYaTop; //top of rectangle enclosing shape relative to the origin of the shape
- long nXaRight; //right of rectangle enclosing shape relative to the origin of the shape
- long nYaBottom;//bottom of the rectangle enclosing shape relative to the origin of the shape
- USHORT bHdr:1;
- //0001 1 in the undo doc when shape is from the header doc, 0 otherwise (undefined when not in the undo doc)
- USHORT nbx:2;
- //0006 x position of shape relative to anchor CP
- //0 relative to page margin
- //1 relative to top of page
- //2 relative to text (column for horizontal text; paragraph for vertical text)
- //3 reserved for future use
- USHORT nby:2;
- //0018 y position of shape relative to anchor CP
- //0 relative to page margin
- //1 relative to top of page
- //2 relative to text (paragraph for horizontal text; column for vertical text)
- USHORT nwr:4;
- //01E0 text wrapping mode
- //0 like 2, but doesn't require absolute object
- //1 no text next to shape
- //2 wrap around absolute object
- //3 wrap as if no object present
- //4 wrap tightly around object
- //5 wrap tightly, but allow holes
- //6-15 reserved for future use
- USHORT nwrk:4;
- //1E00 text wrapping mode type (valid only for wrapping modes 2 and 4
- //0 wrap both sides
- //1 wrap only on left
- //2 wrap only on right
- //3 wrap only on largest side
- USHORT bRcaSimple:1;
- //2000 when set, temporarily overrides bx, by, forcing the xaLeft, xaRight, yaTop, and yaBottom fields to all be page relative.
- USHORT bBelowText:1;
- //4000
- //1 shape is below text
- //0 shape is above text
- USHORT bAnchorLock:1;
- //8000 1 anchor is locked
- // 0 anchor is not locked
- long nTxbx; //count of textboxes in shape (undo doc only)
-public:
- enum FSPAOrient {RelPgMargin, RelPageBorder, RelText};
-};
-
-
-struct WW8_FSPA_SHADOW // alle Member an gleicher Position und Groesse,
-{ // wegen: pF = (WW8_FSPA*)pFS;
- SVBT32 nSpId;
- SVBT32 nXaLeft;
- SVBT32 nYaTop;
- SVBT32 nXaRight;
- SVBT32 nYaBottom;
- SVBT16 aBits1;
- SVBT32 nTxbx;
-};
-
-struct WW8_TXBXS
-{
- SVBT32 cTxbx_iNextReuse;
- SVBT32 cReusable;
- SVBT16 fReusable;
- SVBT32 reserved;
- SVBT32 ShapeId;
- SVBT32 txidUndo;
-};
-
-#ifdef __WW8_NEEDS_PACK
-#pragma pack()
-#endif
-
struct EscherShape
{
ULONG mnEscherShapeOrder;
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index b608f8ac386e..700582d880b9 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: ww8par.cxx,v $
*
- * $Revision: 1.100 $
+ * $Revision: 1.101 $
*
- * last change: $Author: aidan $ $Date: 2002-12-06 12:56:30 $
+ * last change: $Author: cmc $ $Date: 2002-12-10 12:41:16 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1006,8 +1006,8 @@ long SwWW8ImplReader::Read_And(WW8PLCFManResult* pRes)
}
SwNodeIndex aNdIdx( rDoc.GetNodes().GetEndOfExtras() );
- aNdIdx = *rDoc.GetNodes().MakeTextSection( aNdIdx, SwNormalStartNode,
- rDoc.GetTxtCollFromPoolSimple( RES_POOLCOLL_STANDARD, FALSE ));
+ aNdIdx = *rDoc.GetNodes().MakeTextSection(aNdIdx, SwNormalStartNode,
+ rDoc.GetTxtCollFromPoolSimple(RES_POOLCOLL_STANDARD, false));
{
SwPaM *pTempPaM = pPaM;
@@ -1143,15 +1143,6 @@ void SwWW8ImplReader::Read_HdFt1( BYTE nPara, BYTE nWhichItems, SwPageDesc* pPD
}
}
-#if 0
-static BYTE ReadBSprm( const WW8PLCFx_SEPX* pSep, USHORT nId, BYTE nDefaultVal )
-{
- const BYTE* pS = pSep->HasSprm( nId ); // sprm da ?
- BYTE nVal = ( pS ) ? SVBT8ToByte( pS ) : nDefaultVal;
- return nVal;
-}
-#endif
-
void SwWW8ImplReader::SetHdFt( SwPageDesc* pPageDesc0, SwPageDesc* pPageDesc1,
BYTE nIPara )
{
@@ -1307,7 +1298,7 @@ SwPageDesc* SwWW8ImplReader::CreatePageDesc(SwPageDesc* pFirstPageDesc,
USHORT nPageDescCount = rDoc.GetPageDescCnt();
nPos = rDoc.MakePageDesc(
ViewShell::GetShellRes()->GetPageDescName(nPageDescCount,false,bFollow),
- bFollow ? pFirstPageDesc : 0, FALSE );
+ bFollow ? pFirstPageDesc : 0, false);
pNewPD = &rDoc._GetPageDesc( nPos );
@@ -1496,9 +1487,7 @@ bool SwWW8ImplReader::ProcessSpecial(bool bAllEnd, bool* pbReSync,
bWasTabRowEnd = false; // must be deactivated right here to prevent next
// WW8TabDesc::TableCellEnd() from making nonsense
-#if 0
- //we shouldn't need this anymore with table in table support.
-#endif
+
if (nInTable && !bStopTab && (nInTable == nCellLevel && (bStartApo || bStopApo)))
bStopTab = bStartTab = true; // Required to stop and start table
@@ -1563,41 +1552,6 @@ bool SwWW8ImplReader::ProcessSpecial(bool bAllEnd, bool* pbReSync,
return bTableRowEnd;
}
-#if defined OS2
-// eigentlich besser inline, aber das kann der BLC nicht
-static UCHAR ConvOs2( UCHAR ch, CharSet eDst )
-{
- switch( ch )
- {
- case 132:
- case 148:
- return ( eDst == CHARSET_IBMPC_865 ) ? '"' : 175;
- // typographische "(links) gegen aehnliche
- // im OS/2-Charset
- case 147:
- return ( eDst == CHARSET_IBMPC_865 ) ? '"' : 174;
- case 173:
- // kurze, mittellange und lange Striche gegen Minus
- case 150:
- case 151:
- return '-';
- case 130:
- return ',';
- case 145:
- case 146:
- return '\''; // typographische ' gegen normale
- case 139:
- return '<';
- case 155:
- return '>';
- case 152:
- return '~';
- } // ansonsten macht noch TM AErger.
-
- return 0; // kenn ick nich
-}
-#endif
-
CharSet SwWW8ImplReader::GetCurrentCharSet()
{
/*
@@ -2434,10 +2388,6 @@ ULONG SwWW8ImplReader::LoadDoc1( SwPaM& rPaM ,WW8Glossary *pGloss)
}
- else if( ( nIniFlags & WW8FL_NO_COMPLEX ) && pWwFib->fComplex )
- {
- nErrRet = WARN_WW6_FASTSAVE_ERR; // Warning melden
- }
else
{
mpSprmParser = new wwSprmParser(pWwFib->nVersion);
@@ -2667,8 +2617,8 @@ ULONG SwWW8ImplReader::LoadDoc1( SwPaM& rPaM ,WW8Glossary *pGloss)
{
SwNodeIndex aIdx( rDoc.GetNodes().GetEndOfContent());
SwTxtFmtColl* pColl =
- rDoc.GetTxtCollFromPoolSimple( RES_POOLCOLL_STANDARD,
- FALSE );
+ rDoc.GetTxtCollFromPoolSimple(RES_POOLCOLL_STANDARD,
+ false);
SwStartNode *pNode =
rDoc.GetNodes().MakeTextSection(aIdx,
SwNormalStartNode,pColl);
@@ -3327,3 +3277,4 @@ bool SwWW8ImplReader::InEqualApo(int nLvl) const
--nLvl;
return maApos[nLvl];
}
+
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 0b235097ed71..15818ddb4c62 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: ww8par.hxx,v $
*
- * $Revision: 1.104 $
+ * $Revision: 1.105 $
*
- * last change: $Author: aidan $ $Date: 2002-12-06 12:56:30 $
+ * last change: $Author: cmc $ $Date: 2002-12-10 12:41:16 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -180,7 +180,6 @@ namespace com{namespace sun {namespace star{
#define WW8FL_NO_TEXT 1
#define WW8FL_NO_STYLES 2
#define WW8FL_NO_ZSTYLES 4 // keine Zeichenstyles importieren
-#define WW8FL_NO_APO 8
#define WW8FL_NO_FTN 0x20
#define WW8FL_NO_FLD 0x40 // keine Felder
#define WW8FL_NO_GRAF 0x80
@@ -191,15 +190,11 @@ namespace com{namespace sun {namespace star{
// ueberschreiben
#define WW8FL_NO_DEFSTYLES 0x400
-#define WW8FL_NO_TABLE 0x800
#define WW8FL_NO_OUTLINE 0x1000
#define WW8FL_NO_NUMRULE 0x2000
#define WW8FL_NO_IMPLPASP 0x4000 // no implicit para space
#define WW8FL_NO_GRAFLAYER 0x8000
-#define WW8FL_NO_COMPLEX 0x10000
#define WW8FL_NO_OLE 0x20000
-#define WW8FL_OLE_TO_GRAF 0x40000
-#define WW8FL_NO_STD_STY_DYA 0x100000
#define WW8FL_NO_COLS 0x200000
#define WW8FL_NO_TOX 0x400000
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 712c6f8dc063..b17099d6b693 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: ww8par2.cxx,v $
*
- * $Revision: 1.77 $
+ * $Revision: 1.78 $
*
- * last change: $Author: cmc $ $Date: 2002-12-05 17:53:20 $
+ * last change: $Author: cmc $ $Date: 2002-12-10 12:41:17 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -2024,25 +2024,9 @@ void WW8TabDesc::CalcDefaults()
nMinCols = pR->nSwCols;
}
-#if 1
if (nMinLeft && (HORI_LEFT == eOri))
eOri = HORI_LEFT_AND_WIDTH; // absolutely positioned
-#else
- // 4. Ausrichtung der Tabelle
- long nMidTab = ( (long)nMinLeft + nMaxRight ) / 2; // TabellenMitte
- long nRight = pIo->nPgWidth - pIo->nPgRight - pIo->nPgLeft;
- // set Position if not on adjusted to left border
- if (nMinLeft && (HORI_LEFT == eOri))
- {
- if(MINLAY > abs(nMidTab - nRight/2))
- eOri = HORI_CENTER; // very near the center IS centered
- else if ((nMaxRight - nRight) == 0)
- eOri = HORI_RIGHT;
- else
- eOri = HORI_LEFT_AND_WIDTH; // absolutely positioned
- }
-#endif
nDefaultSwCols = nMinCols; // da Zellen einfuegen billiger ist als Mergen
if( nDefaultSwCols == 0 )
bOk = false;
@@ -3454,7 +3438,7 @@ SwTxtFmtColl* WW8RStyle::SearchFmtColl( const String& rName )
// Collection noch nicht gefunden, vielleicht im Pool ?
USHORT n = SwStyleNameMapper::GetPoolIdFromUIName( rName , GET_POOLID_TXTCOLL );
if ( n != USHRT_MAX ) // gefunden oder Standard
- pColl = pIo->rDoc.GetTxtCollFromPoolSimple( n, FALSE );
+ pColl = pIo->rDoc.GetTxtCollFromPoolSimple(n, false);
}
return pColl;
}
@@ -3542,7 +3526,7 @@ SwTxtFmtColl* WW8RStyle::MakeOrGetFmtColl(bool * pbStyExist, WW8_STD* pStd,
&& !( pIo->nIniFlags & WW8FL_NO_DEFSTYLES ) ) // nicht abgeschaltet
{
SwTxtFmtColl* pCol =
- pIo->rDoc.GetTxtCollFromPoolSimple(aArr[pStd->sti], FALSE);
+ pIo->rDoc.GetTxtCollFromPoolSimple(aArr[pStd->sti], false);
if(pCol)
{
*pbStyExist = true;
@@ -3785,7 +3769,7 @@ void WW8RStyle::Import()
{
pIo->pDfltTxtFmtColl = pIo->rDoc.GetDfltTxtFmtColl();
pIo->pStandardFmtColl =
- pIo->rDoc.GetTxtCollFromPoolSimple(RES_POOLCOLL_STANDARD, FALSE);
+ pIo->rDoc.GetTxtCollFromPoolSimple(RES_POOLCOLL_STANDARD, false);
if( pIo->nIniFlags & WW8FL_NO_STYLES )
return;
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 2297c8f688bd..4cd148313dac 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: ww8par3.cxx,v $
*
- * $Revision: 1.40 $
+ * $Revision: 1.41 $
*
- * last change: $Author: cmc $ $Date: 2002-12-03 12:01:29 $
+ * last change: $Author: cmc $ $Date: 2002-12-10 12:41:17 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1404,11 +1404,6 @@ bool SwWW8ImplReader::SetTxtFmtCollAndListLevel(const SwPaM& rRg,
RegisterNumFmtOnTxtNode(rStyleInfo.nLFOIndex,
rStyleInfo.nListLevel, false);
}
-#if 0 //Assume that style knows best, and allows #99550# to
- //work correctly
- else
- pTxtNode->UpdateNum( SwNodeNum(NO_NUMBERING) );
-#endif
if (rStyleInfo.bHasStyNumRule && pTxtNode)
pTxtNode->SetNumLSpace(false);
@@ -1840,7 +1835,7 @@ sal_Bool SwMSConvertControls::InsertFormula(WW8FormulaControl &rFormula)
if ((bRet = rFormula.Import(rServiceFactory, xFComp, aSz)))
{
uno::Reference <drawing::XShape> xShapeRef;
- if ((bRet = InsertControl(xFComp, aSz, &xShapeRef, FALSE)))
+ if ((bRet = InsertControl(xFComp, aSz, &xShapeRef, false)))
GetShapes()->add(xShapeRef);
}
return bRet;
@@ -2074,69 +2069,6 @@ WW8FormulaEditBox::WW8FormulaEditBox(SwWW8ImplReader &rR)
{
}
-/*
-#i3029#
-We are no longer importing the lagacy word95 edit boxes as uno textboxes,
-instead they are imported as writer input fields.
-*/
-#if 0
-sal_Bool WW8FormulaEditBox::Import(const uno::Reference<
- lang::XMultiServiceFactory >& rServiceFactory,
- uno::Reference< form::XFormComponent >& rFComp, awt::Size &rSz)
-{
- uno::Reference< uno::XInterface > xCreate = rServiceFactory->createInstance(
- C2U("com.sun.star.form.component.TextField"));
-
- if( !xCreate.is() )
- return sal_False;
-
- rFComp = uno::Reference< form::XFormComponent >( xCreate, uno::UNO_QUERY );
- if( !rFComp.is() )
- return sal_False;
-
- uno::Reference< beans::XPropertySet > xPropSet( xCreate, uno::UNO_QUERY );
-
- uno::Any aTmp;
- if( sTitle.Len() )
- aTmp <<= rtl::OUString(sTitle);
- else
- aTmp <<= rtl::OUString(sName);
- xPropSet->setPropertyValue(C2U("Name"), aTmp);
-
- sal_Bool bTemp = sal_False;
- aTmp.setValue(&bTemp, ::getBooleanCppuType());
- xPropSet->setPropertyValue(C2U("MultiLine"), aTmp);
-
- aTmp <<= (sal_Int16)0; //No Border
- xPropSet->setPropertyValue(C2U("Border"), aTmp);
-
- if( sDefault.Len() )
- {
- aTmp <<= rtl::OUString(sDefault);
- xPropSet->setPropertyValue(C2U("DefaultText"), aTmp);
- }
-
- rSz.Width = 300;
- rSz.Height = 200;
-
- aTmp <<= (sal_Int32)(0x00C0C0C0);
- xPropSet->setPropertyValue(C2U("BackgroundColor"), aTmp);
-
- SetOthersFromDoc(rSz,xPropSet);
-
- aTmp <<= (sal_Int16)nSize;
- xPropSet->setPropertyValue(C2U("MaxTextLen"), aTmp);
-
- if( sToolTip.Len() )
- {
- aTmp <<= rtl::OUString(sToolTip);
- xPropSet->setPropertyValue(C2U("HelpText"), aTmp );
- }
-
- return sal_True;
-}
-#endif
-
sal_Bool SwMSConvertControls::InsertControl(
const uno::Reference< form::XFormComponent > & rFComp,
const awt::Size& rSize, uno::Reference< drawing::XShape > *pShape,
diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx
index 4c50141c9cd4..aee64aacea56 100644
--- a/sw/source/filter/ww8/ww8par4.cxx
+++ b/sw/source/filter/ww8/ww8par4.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: ww8par4.cxx,v $
*
- * $Revision: 1.35 $
+ * $Revision: 1.36 $
*
- * last change: $Author: cmc $ $Date: 2002-11-07 16:54:19 $
+ * last change: $Author: cmc $ $Date: 2002-12-10 12:41:17 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -59,6 +59,9 @@
*
************************************************************************/
+/* vi:set tabstop=4 shiftwidth=4 expandtab: */
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
+
#ifdef PCH
#include "filt_pch.hxx"
#endif
@@ -148,7 +151,7 @@
#endif
#ifndef _WW8SCAN_HXX
-#include "ww8scan.hxx" // __WW_NEEDS_COPY
+#include "ww8scan.hxx"
#endif
#ifndef _WW8PAR_HXX
#include "ww8par.hxx"
@@ -496,12 +499,12 @@ SdrObject* SwWW8ImplReader::ImportOleBase( Graphic& rGraph,
}
}
- if( GRAPHIC_GDIMETAFILE == rGraph.GetType() ||
- GRAPHIC_BITMAP == rGraph.GetType() )
+ if (GRAPHIC_GDIMETAFILE == rGraph.GetType() ||
+ GRAPHIC_BITMAP == rGraph.GetType())
{
::SetProgressState( nProgress, rDoc.GetDocShell() ); // Update
- if( bOleOk && !( nIniFlags & WW8FL_OLE_TO_GRAF ))
+ if (bOleOk)
{
ULONG nOldPos = pDataStream->Tell();
pDataStream->Seek(STREAM_SEEK_TO_END);
@@ -715,10 +718,6 @@ void SwWW8ImplReader::Read_CRevisionMark(SwRedlineType eType,
ASSERT(nLen < 0 || (pSprmCIbstRMark || pSprmCDttmRMark),
"The wheels have fallen off revision mark import");
-#if 0
- if (!pSprmCIbstRMark || !pSprmCDttmRMark)
- return;
-#endif
if (nLen < 0)
mpRedlineStack->close(*pPaM->GetPoint(), eType);
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index 32792b0fd97a..63b02ccb0f87 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: ww8par5.cxx,v $
*
- * $Revision: 1.61 $
+ * $Revision: 1.62 $
*
- * last change: $Author: aidan $ $Date: 2002-12-06 12:56:31 $
+ * last change: $Author: cmc $ $Date: 2002-12-10 12:41:18 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1765,29 +1765,6 @@ eF_ResT SwWW8ImplReader::Read_F_CurPage( WW8FieldDesc*, String& rStr )
eF_ResT SwWW8ImplReader::Read_F_Symbol( WW8FieldDesc*, String& rStr )
{ // Symbol-Zeichensatz
-/*
- char* p;
- char* pQ = Find1stPara( pStr, &p ); // 1. Para ist Ascii-Wert
- USHORT nC = String( pQ );
- if( !nC ) // ungueltige Syntax
- return FLD_TAGIGN; // -> kein 0-Zeichen in Text
- char* pCSet = FindPara( p, 'f', 'F' ); // \f -> Zeichensatz
- char* pSiz = FindPara( p, 's', 'S' ); // \s -> FontSize
- if( pCSet ){ // Charset angegeben ?
- String aName( pCSet );
- if( eStructCharSet != eSysCharSet ) // OS2, WIN mit Mac-Doc,...
- aName.Convert( eStructCharSet, eSysCharSet );
- SvxFontItem aFont( FAMILY_DONTKNOW, aName, // "WingDings",
- aEmptyStr,
- PITCH_DONTKNOW, CHARSET_SYMBOL);
- NewAttr( aFont ); // neuer Font
- }
- if( pSiz ){ // Size angegeben ?
- ULONG nSiz = String( pSiz ); // in pt
- SvxFontHeightItem aSz( nSiz * 20 ); // pT -> twip
- NewAttr( aSz );
- }
-*/
String aQ;
String aName;
String aSiz;
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 12c964508c70..83c256961f06 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: ww8par6.cxx,v $
*
- * $Revision: 1.127 $
+ * $Revision: 1.128 $
*
- * last change: $Author: aidan $ $Date: 2002-12-06 12:56:31 $
+ * last change: $Author: cmc $ $Date: 2002-12-10 12:41:18 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -374,18 +374,6 @@ static short ReadULSprm( const WW8PLCFx_SEPX* pSep, USHORT nId, short nDefaultVa
return nVal;
}
-#if 0
-static short ReadLRSprm(const WW8PLCFx_SEPX* pSep, USHORT nId,
- short nDefaultVal )
-{
- const BYTE* pS = pSep->HasSprm(nId); // sprm da ?
- short nVal = pS ? SVBT16ToShort(pS) : nDefaultVal;
- if (nVal < 0) // < 0 ist beim SW nicht erlaubt
- nVal = 0;
- return nVal;
-}
-#endif
-
// WW nimmt es mit den Groessen nicht so genau. Wird dieses nicht
// korrigiert, dann erkennt es der Writer nur als Benutzergroesse
// statt als richtiges Papierformat
@@ -2748,13 +2736,7 @@ WW8FlySet::WW8FlySet(SwWW8ImplReader& rReader, const WW8FlyPara* pFW,
if (pFS->nUpMgn || pFS->nLoMgn)
Put(SvxULSpaceItem(pFS->nUpMgn, pFS->nLoMgn));
- SwFmtSurround aSur( pFS->eSurround ); // Umfluss
-#if 0
- //Why did we want this again, there was a good reason :-(
- aSur.SetAnchorOnly( true);
-#endif
-
- Put(aSur);
+ Put(SwFmtSurround(pFS->eSurround)); // Umfluss
short aSizeArray[5]={0};
rReader.SetFlyBordersShadow(*this,(const WW8_BRC*)pFW->brc,&aSizeArray[0]);
@@ -3820,29 +3802,6 @@ bool SwWW8ImplReader::GetFontParams( USHORT nFCode, FontFamily& reFamily,
rName = String( pF->sFontname );
-#if defined( OS2 )
- if ( rName.EqualsIgnoreCaseAscii( "Helv" )
- || rName.EqualsIgnoreCaseAscii( "Arial" ) )
- rName.AssignAscii( "Helvetica" );
- else if ( rName.EqualsIgnoreCaseAscii( "Tms Rmn" )
- || rName.EqualsIgnoreCaseAscii( "Times New Roman" ) )
- rName.AssignAscii( "Times New Roman" );
- else if ( rName.EqualsIgnoreCaseAscii( "Courier New" ) )
- rName.AssignAscii( "Courier" );
- else if ( rName.EqualsIgnoreCaseAscii( "Symbol" ) )
- rName.AssignAscii( "Symbol Set" );
-#endif // OS2
-#if defined( MAC )
- if ( rName.EqualsIgnoreCaseAscii( "Helv" )
- || rName.EqualsIgnoreCaseAscii( "Arial" ))
- rName.AssignAscii( "Helvetica" );
- else if ( rName.EqualsIgnoreCaseAscii( "Tms Rmn" )
- || rName.EqualsIgnoreCaseAscii( "Times New Roman" ) )
- rName.AssignAscii( "Times" );
- else if ( rName.EqualsIgnoreCaseAscii( "Courier New" ) )
- rName.AssignAscii( "Courier" );
-#endif // MAC
-
// pF->prg : Pitch
rePitch = ePitchA[pF->prg];
@@ -4454,7 +4413,7 @@ void SwWW8ImplReader::Read_LR( USHORT nId, const BYTE* pData, short nLen )
void SwWW8ImplReader::Read_LineSpace( USHORT, const BYTE* pData, short nLen )
{
// Kommentear siehe Read_UL()
- if( bStyNormal && ( bWWBugNormal || ( nIniFlags & WW8FL_NO_STD_STY_DYA ) ) )
+ if (bStyNormal && bWWBugNormal)
return;
if( nLen < 0 ){
@@ -4597,14 +4556,9 @@ void SwWW8ImplReader::Read_UL( USHORT nId, const BYTE* pData, short nLen )
// Fehler in der benutzten WW-Version hin. Wenn sich die Styles <Standard> bzw.
// <Normal> zwischen WW und SW im Absatz- oder Zeilenabstand unterscheiden,
// dann bitte dieses Doc SH zukommen lassen." );
-// if( bStyNormal && ( bWWBugNormal || ( nIniFlags & WW8FL_NO_STD_STY_DYA ) ) )
-// return;
// bWWBugNormal ist kein hinreichendes Kriterium dafuer, dass der
// angegebene Abstand falsch ist
- if( bStyNormal && ( nIniFlags & WW8FL_NO_STD_STY_DYA ) )
- return;
-
if( nLen < 0 )
{
// Ende des Attributes
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index f6482c3bca22..293cd02b7a1e 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: ww8scan.cxx,v $
*
- * $Revision: 1.92 $
+ * $Revision: 1.93 $
*
- * last change: $Author: cmc $ $Date: 2002-12-04 09:56:32 $
+ * last change: $Author: cmc $ $Date: 2002-12-10 12:41:18 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -2664,42 +2664,7 @@ bool WW8PLCFx_Fc_FKP::WW8Fkp::HasSprm(USHORT nId,
return !rResult.empty();
}
-#if 0
-ULONG WW8PLCFx_Fc_FKP::WW8Fkp::GetParaHeight() const
-{
- if( ePLCF != PAP )
- {
- ASSERT( !this, "Fkp::GetParaHeight: Falscher Fkp" );
- return 0;
- }
-
- if( nIdx >= nIMax )
- return 0;
-
- BYTE *pScratch = (BYTE*)pFCFkp;
-
- WW8_PHE_Base* pPhe = (WW8_PHE_Base*)( (pScratch + (nIMax + 1) * 4)
- + ( nIdx * nItemSize ) + 1 );
-
- if( pPhe->aBits1 & 0x2 ) // fUnk
- return 0; // invalid
-
- if( pPhe->aBits1 & 0x4 ) // fDiffLines
- return SVBT16ToShort( pPhe->dyl ); // Gesamthoehe
- else
- {
- // nlMac gleich hohe Zeilen
- INT32 nH = (INT16)SVBT16ToShort( pPhe->dyl ); // Zeilenhoehe
- if( nH < 0 ) // negative Werte wollen wir
- nH = 0; // nicht
- nH *= (INT32)pPhe->nlMac; // Hoehe einer Zeile * Zeilen
- return (ULONG)nH;
- }
-}
-#endif
-
//-----------------------------------------
-
void WW8PLCFx::GetSprms( WW8PLCFxDesc* p )
{
ASSERT( !this, "Falsches GetSprms gerufen" );
@@ -3012,18 +2977,6 @@ bool WW8PLCFx_Fc_FKP::HasSprm(USHORT nId, std::vector<const BYTE *> &rResult)
return !rResult.empty();
}
-#if 0
-ULONG WW8PLCFx_Fc_FKP::GetParaHeight() const
-{
- if( !pFkp )
- {
- ASSERT( !this, "GetParaHeight: pFkp nicht da" );
- return 0;
- }
- return pFkp->GetParaHeight();
-}
-#endif
-
//-----------------------------------------
WW8PLCFx_Cp_FKP::WW8PLCFx_Cp_FKP( SvStream* pSt, SvStream* pTblSt,
@@ -5878,7 +5831,6 @@ WW8_STD* WW8Style::Read1STDFixed( short& rSkip, short* pcbStd )
WW8_STD* WW8Style::Read1Style( short& rSkip, String* pString, short* pcbStd )
{
- // OS2, or WIN with Mac-Doc,...
// Attention: MacWord-Documents have their Stylenames
// always in ANSI, even if eStructCharSet == CHARSET_MAC !!
@@ -5968,7 +5920,6 @@ struct WW8_FFN_Ver8 : public WW8_FFN_BASE
WW8Fonts::WW8Fonts( SvStream& rSt, WW8Fib& rFib )
{
- // OS2, or WIN with Mac-Doc,...
// Attention: MacWord-Documents have their Fontnames
// always in ANSI, even if eStructCharSet == CHARSET_MAC !!
if( rFib.lcbSttbfffn <= 2 )
diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
index 0139d2e6b91e..445b4a45fa7d 100644
--- a/sw/source/filter/ww8/ww8scan.hxx
+++ b/sw/source/filter/ww8/ww8scan.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: ww8scan.hxx,v $
*
- * $Revision: 1.56 $
+ * $Revision: 1.57 $
*
- * last change: $Author: cmc $ $Date: 2002-12-03 13:30:32 $
+ * last change: $Author: cmc $ $Date: 2002-12-10 12:41:19 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -575,10 +575,6 @@ public:
const BYTE* HasSprm( USHORT nId );
bool HasSprm(USHORT nId, std::vector<const BYTE *> &rResult);
-#if 0
- ULONG GetParaHeight() const; // fuer Header/Footer bei Papx-Fkps
-#endif
-
const wwSprmParser &GetSprmParser() const { return maSprmParser; }
};
private:
@@ -626,9 +622,6 @@ public:
void GetPCDSprms( WW8PLCFxDesc& rDesc );
const BYTE* HasSprm( USHORT nId );
bool HasSprm(USHORT nId, std::vector<const BYTE *> &rResult);
-#if 0
- ULONG GetParaHeight() const;
-#endif
bool HasFkp() const { return (0 != pFkp); }
};
diff --git a/sw/source/filter/ww8/ww8struc.hxx b/sw/source/filter/ww8/ww8struc.hxx
index e671b9a07ce8..827c1e3f3f27 100644
--- a/sw/source/filter/ww8/ww8struc.hxx
+++ b/sw/source/filter/ww8/ww8struc.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: ww8struc.hxx,v $
*
- * $Revision: 1.21 $
+ * $Revision: 1.22 $
*
- * last change: $Author: cmc $ $Date: 2002-11-15 13:31:34 $
+ * last change: $Author: cmc $ $Date: 2002-12-10 12:41:19 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -59,6 +59,9 @@
*
************************************************************************/
+/* vi:set tabstop=4 shiftwidth=4 expandtab: */
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
+
#ifndef _WW8STRUC_HXX
#define _WW8STRUC_HXX
@@ -66,13 +69,18 @@
#include <tools/string.hxx>
#endif
+#ifndef _SAL_CONFIG_H_
+#include <sal/config.h>
+#endif
+
#if defined __BIGENDIAN || __ALIGNMENT4 > 2 || defined UNX
-#define __WW8_NEEDS_COPY
-#else
-#if defined WNT || defined WIN || defined OS2
-#define __WW8_NEEDS_PACK
-#pragma pack(2)
+# define __WW8_NEEDS_COPY
#endif
+
+#ifdef SAL_W32
+# pragma pack(push, 2)
+#elif defined(SAL_OS2)
+# pragma pack(2)
#endif
inline void Set_UInt8( BYTE *& p, UINT8 n )
@@ -93,9 +101,9 @@ inline void Set_UInt32( BYTE *& p, UINT32 n )
p+= 4;
}
-typedef INT16 WW8_PN;
-typedef INT32 WW8_FC;
-typedef INT32 WW8_CP;
+typedef sal_Int16 WW8_PN;
+typedef sal_Int32 WW8_FC;
+typedef sal_Int32 WW8_CP;
// STD: STyle Definition
// The STD contains the entire definition of a style.
@@ -728,41 +736,6 @@ struct WW8_PCD
// properties of the piece.
};
-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
- 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
-};
-
-/*
-eigentlich muessten wir das jetzt in etwa *so* praezisieren:
-
- struct WW8_PHE_Ver6 : public WW8_PHE_Base
- {
- // 6 Bytes gross
- };
- struct WW8_PHE_Ver6 : public WW8_PHE_Base
- {
- SVBT16 a;
- SVBT16 b;
- SVBT16 c; // 12 Byte gross
- };
-*/
-
// AnnoTation Refernce Descriptor (ATRD)
struct WW8_ATRD // fuer die 8-Version
{
@@ -802,9 +775,82 @@ struct WW8_TablePos
BYTE nSp37;
};
+struct WW8_FSPA
+{
+public:
+ long nSpId; //Shape Identifier. Used in conjunction with the office art data (found via fcDggInfo in the FIB) to find the actual data for this shape.
+ long nXaLeft; //left of rectangle enclosing shape relative to the origin of the shape
+ long nYaTop; //top of rectangle enclosing shape relative to the origin of the shape
+ long nXaRight; //right of rectangle enclosing shape relative to the origin of the shape
+ long nYaBottom;//bottom of the rectangle enclosing shape relative to the origin of the shape
+ USHORT bHdr:1;
+ //0001 1 in the undo doc when shape is from the header doc, 0 otherwise (undefined when not in the undo doc)
+ USHORT nbx:2;
+ //0006 x position of shape relative to anchor CP
+ //0 relative to page margin
+ //1 relative to top of page
+ //2 relative to text (column for horizontal text; paragraph for vertical text)
+ //3 reserved for future use
+ USHORT nby:2;
+ //0018 y position of shape relative to anchor CP
+ //0 relative to page margin
+ //1 relative to top of page
+ //2 relative to text (paragraph for horizontal text; column for vertical text)
+ USHORT nwr:4;
+ //01E0 text wrapping mode
+ //0 like 2, but doesn't require absolute object
+ //1 no text next to shape
+ //2 wrap around absolute object
+ //3 wrap as if no object present
+ //4 wrap tightly around object
+ //5 wrap tightly, but allow holes
+ //6-15 reserved for future use
+ USHORT nwrk:4;
+ //1E00 text wrapping mode type (valid only for wrapping modes 2 and 4
+ //0 wrap both sides
+ //1 wrap only on left
+ //2 wrap only on right
+ //3 wrap only on largest side
+ USHORT bRcaSimple:1;
+ //2000 when set, temporarily overrides bx, by, forcing the xaLeft, xaRight, yaTop, and yaBottom fields to all be page relative.
+ USHORT bBelowText:1;
+ //4000
+ //1 shape is below text
+ //0 shape is above text
+ USHORT bAnchorLock:1;
+ //8000 1 anchor is locked
+ // 0 anchor is not locked
+ long nTxbx; //count of textboxes in shape (undo doc only)
+public:
+ enum FSPAOrient {RelPgMargin, RelPageBorder, RelText};
+};
+
+
+struct WW8_FSPA_SHADOW // alle Member an gleicher Position und Groesse,
+{ // wegen: pF = (WW8_FSPA*)pFS;
+ SVBT32 nSpId;
+ SVBT32 nXaLeft;
+ SVBT32 nYaTop;
+ SVBT32 nXaRight;
+ SVBT32 nYaBottom;
+ SVBT16 aBits1;
+ SVBT32 nTxbx;
+};
+
+struct WW8_TXBXS
+{
+ SVBT32 cTxbx_iNextReuse;
+ SVBT32 cReusable;
+ SVBT16 fReusable;
+ SVBT32 reserved;
+ SVBT32 ShapeId;
+ SVBT32 txidUndo;
+};
-#ifdef __WW8_NEEDS_PACK
-#pragma pack()
+#ifdef SAL_W32
+# pragma pack(pop)
+#elif defined(SAL_OS2)
+# pragma pack()
#endif
namespace wwUtility