summaryrefslogtreecommitdiff
path: root/sw/source/filter/inc
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/filter/inc')
-rw-r--r--sw/source/filter/inc/fltbase.hxx18
-rw-r--r--sw/source/filter/inc/fltglbls.hxx48
-rw-r--r--sw/source/filter/inc/fltini.hxx6
-rw-r--r--sw/source/filter/inc/fltshell.hxx114
-rw-r--r--sw/source/filter/inc/msfilter.hxx70
-rw-r--r--sw/source/filter/inc/rtf.hxx22
-rw-r--r--sw/source/filter/inc/wrt_fn.hxx6
-rw-r--r--sw/source/filter/inc/wrtswtbl.hxx86
-rw-r--r--sw/source/filter/inc/wwstyles.hxx18
9 files changed, 194 insertions, 194 deletions
diff --git a/sw/source/filter/inc/fltbase.hxx b/sw/source/filter/inc/fltbase.hxx
index b67b54ce314a..3959f1cc9878 100644
--- a/sw/source/filter/inc/fltbase.hxx
+++ b/sw/source/filter/inc/fltbase.hxx
@@ -1,7 +1,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
@@ -33,15 +33,15 @@
class SwFilterBase
{
protected:
- SvStream *pIn;
- sal_Char *pReadBuff; // Groessenangabe
- INT32 nBytesLeft; // noch zu lesende Bytes des aktuelle Records
+ SvStream *pIn;
+ sal_Char *pReadBuff; // Groessenangabe
+ INT32 nBytesLeft; // noch zu lesende Bytes des aktuelle Records
- CharSet eQuellChar; // Quell-Zeichensatz (interner Zeichensatz)
-// CharSet eZielChar; // Ziel-Zeichensatz
+ CharSet eQuellChar; // Quell-Zeichensatz (interner Zeichensatz)
+// CharSet eZielChar; // Ziel-Zeichensatz
- USHORT nTab; // z.Zt. bearbeitete Tabelle
- USHORT nReadBuffSize;// temporaerer Lesepuffer mit
+ USHORT nTab; // z.Zt. bearbeitete Tabelle
+ USHORT nReadBuffSize;// temporaerer Lesepuffer mit
// ----------------------------------------------------------
inline void ReadChar( char &rC );
@@ -53,7 +53,7 @@ protected:
inline void Read( USHORT &rN1, USHORT &rN2 );
inline void Read( USHORT &rN1, USHORT &rN2, USHORT &rN3, USHORT &rN4 );
inline void Read( double &rF );
- void Read( String &rS ); // liest 0-terminierten C-String!
+ void Read( String &rS ); // liest 0-terminierten C-String!
inline void ClearBytesLeft( void );
};
diff --git a/sw/source/filter/inc/fltglbls.hxx b/sw/source/filter/inc/fltglbls.hxx
index cf2c4a29610b..12b64317014a 100644
--- a/sw/source/filter/inc/fltglbls.hxx
+++ b/sw/source/filter/inc/fltglbls.hxx
@@ -1,7 +1,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,43 +53,43 @@ extern LotGlob *pLotGlob;
class FilterGlobals
{
protected:
- SvPtrarr aTblFmts;
- USHORT nColStart;
- USHORT nColEnd;
- USHORT nRowStart;
- USHORT nRowEnd;
- USHORT nAnzCols;
- USHORT nAnzRows;
+ SvPtrarr aTblFmts;
+ USHORT nColStart;
+ USHORT nColEnd;
+ USHORT nRowStart;
+ USHORT nRowEnd;
+ USHORT nAnzCols;
+ USHORT nAnzRows;
public:
FilterGlobals( SwDoc& rDoc, const SwPaM& rPam );
~FilterGlobals();
- SwDoc *pD;
- SwPaM *pPam;
- const SwTable *pTable;
+ SwDoc *pD;
+ SwPaM *pPam;
+ const SwTable *pTable;
SvNumberFormatter *pNumFormatter;
- LanguageType eDefLanguage;
- ULONG nStandard;
- ULONG nDefFormat; // = 0xFFFFFFFF
+ LanguageType eDefLanguage;
+ ULONG nStandard;
+ ULONG nDefFormat; // = 0xFFFFFFFF
void SetRange( USHORT nCS, USHORT nCE, USHORT nRS, USHORT nRE );
BOOL IsInColRange( USHORT nCol )
- { return ( nCol >= nColStart && nCol <= nColEnd ); }
+ { return ( nCol >= nColStart && nCol <= nColEnd ); }
BOOL IsInRowRange( USHORT nRow )
- { return ( nRow >= nRowStart && nRow <= nRowEnd ); }
+ { return ( nRow >= nRowStart && nRow <= nRowEnd ); }
BOOL IsInRange( USHORT nCol, USHORT nRow )
- { return IsInRowRange(nRow) && IsInColRange(nCol); }
+ { return IsInRowRange(nRow) && IsInColRange(nCol); }
- void NormalizeCol( USHORT &rCol ) { rCol -= nColStart; }
- void NormalizeRow( USHORT &rRow ) { rRow -= nRowStart; }
+ void NormalizeCol( USHORT &rCol ) { rCol -= nColStart; }
+ void NormalizeRow( USHORT &rRow ) { rRow -= nRowStart; }
void Normalize( USHORT &rCol, USHORT &rRow )
- { NormalizeCol( rCol ); NormalizeRow( rRow ); }
+ { NormalizeCol( rCol ); NormalizeRow( rRow ); }
- USHORT AnzCols() const { return nAnzCols; }
- USHORT AnzRows() const { return nAnzRows; }
+ USHORT AnzCols() const { return nAnzCols; }
+ USHORT AnzRows() const { return nAnzRows; }
BOOL ColRangeLimitter( USHORT &rCS, USHORT &rCE );
@@ -97,8 +97,8 @@ public:
void CreateTable();
void InsertAttr( const SfxPoolItem& rItem );
- inline void ColLimitter( USHORT &rCol );
- inline void RowLimitter( USHORT &rRow );
+ inline void ColLimitter( USHORT &rCol );
+ inline void RowLimitter( USHORT &rRow );
};
diff --git a/sw/source/filter/inc/fltini.hxx b/sw/source/filter/inc/fltini.hxx
index a9711f1331a5..7a9ad65f392f 100644
--- a/sw/source/filter/inc/fltini.hxx
+++ b/sw/source/filter/inc/fltini.hxx
@@ -1,7 +1,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
@@ -80,7 +80,7 @@ void GetWW8Writer( const String&, const String&, WriterRef& );
// Absatz-Einzug abgezogen werden muss.
class SW_DLLPUBLIC SwRelNumRuleSpaces
{
- SwNumRuleTbl* pNumRuleTbl; // Liste aller benannten NumRules
+ SwNumRuleTbl* pNumRuleTbl; // Liste aller benannten NumRules
BOOL bNewDoc;
void SetNumLSpace( SwTxtNode& rNd, const SwNumRule& rRule );
@@ -94,7 +94,7 @@ public:
const SwNodeIndex& rEnd );
};
-#define SW_SV_BRUSH_25 0
+#define SW_SV_BRUSH_25 0
#define SW_SV_BRUSH_50 1
#define SW_SV_BRUSH_75 2
#define SW_SV_BRUSH_NULL 3
diff --git a/sw/source/filter/inc/fltshell.hxx b/sw/source/filter/inc/fltshell.hxx
index c511d4aab02a..80ac2592651f 100644
--- a/sw/source/filter/inc/fltshell.hxx
+++ b/sw/source/filter/inc/fltshell.hxx
@@ -1,7 +1,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
@@ -68,11 +68,11 @@ public:
SwNodeIndex nMkNode;
SwNodeIndex nPtNode;
SfxPoolItem * pAttr;// Format Attribute
- long nHandle; // fuer verschachtelte Attrs, z.B. Bookmarks
+ long nHandle; // fuer verschachtelte Attrs, z.B. Bookmarks
xub_StrLen nMkCntnt;// Nachbildung von Mark()
xub_StrLen nPtCntnt;// Nachbildung von GetPoint()
- BOOL bOld; // to mark Attributes *before* skipping field results
+ BOOL bOld; // to mark Attributes *before* skipping field results
BOOL bLocked;
BOOL bCopied;
BOOL bConsumedByField;
@@ -83,7 +83,7 @@ public:
void SetStartPos(const SwPosition & rStartPos);
SW_DLLPUBLIC void SetEndPos( const SwPosition & rEndPos);
- SW_DLLPUBLIC BOOL MakeRegion(SwDoc* pDoc, SwPaM& rRegion, BOOL bCheck );
+ SW_DLLPUBLIC BOOL MakeRegion(SwDoc* pDoc, SwPaM& rRegion, BOOL bCheck );
};
class SW_DLLPUBLIC SwFltControlStack
@@ -120,7 +120,7 @@ public:
SwFltControlStack(SwDoc* pDo, ULONG nFieldFl);
virtual ~SwFltControlStack();
- BOOL IsFlagSet(Flags no) const { return ::SwFltGetFlag(nFieldFlags, no);}
+ BOOL IsFlagSet(Flags no) const { return ::SwFltGetFlag(nFieldFlags, no);}
void NewAttr(const SwPosition& rPos, const SfxPoolItem & rAttr );
@@ -155,7 +155,7 @@ public:
virtual int operator==(const SfxPoolItem&) const;
virtual SfxPoolItem* Clone(SfxItemPool* = 0) const;
void SetFrmFmt(SwFrmFmt * _pFrmFmt);
- const SwFrmFmt* GetFrmFmt() const;
+ const SwFrmFmt* GetFrmFmt() const;
SwFrmFmt* GetFrmFmt();
};
@@ -173,18 +173,18 @@ public:
class SW_DLLPUBLIC SwFltRedline : public SfxPoolItem
{
public:
- DateTime aStamp;
- DateTime aStampPrev;
- RedlineType_t eType;
- RedlineType_t eTypePrev;
- USHORT nAutorNo;
- USHORT nAutorNoPrev;
-
- SwFltRedline(RedlineType_t eType_,
- USHORT nAutorNo_,
+ DateTime aStamp;
+ DateTime aStampPrev;
+ RedlineType_t eType;
+ RedlineType_t eTypePrev;
+ USHORT nAutorNo;
+ USHORT nAutorNoPrev;
+
+ SwFltRedline(RedlineType_t eType_,
+ USHORT nAutorNo_,
const DateTime& rStamp_,
- RedlineType_t eTypePrev_ = nsRedlineType_t::REDLINE_INSERT,
- USHORT nAutorNoPrev_ = USHRT_MAX,
+ RedlineType_t eTypePrev_ = nsRedlineType_t::REDLINE_INSERT,
+ USHORT nAutorNoPrev_ = USHRT_MAX,
const DateTime* pStampPrev_ = 0)
: SfxPoolItem(RES_FLTR_REDLINE), aStamp(rStamp_), eType(eType_),
eTypePrev(eTypePrev_), nAutorNo(nAutorNo_), nAutorNoPrev(nAutorNoPrev_)
@@ -195,12 +195,12 @@ public:
SwFltRedline(const SwFltRedline& rCpy):
SfxPoolItem(RES_FLTR_REDLINE),
- aStamp( rCpy.aStamp ),
- aStampPrev( rCpy.aStampPrev ),
- eType( rCpy.eType ),
- eTypePrev( rCpy.eTypePrev ),
- nAutorNo( rCpy.nAutorNo ),
- nAutorNoPrev( rCpy.nAutorNoPrev )
+ aStamp( rCpy.aStamp ),
+ aStampPrev( rCpy.aStampPrev ),
+ eType( rCpy.eType ),
+ eTypePrev( rCpy.eTypePrev ),
+ nAutorNo( rCpy.nAutorNo ),
+ nAutorNoPrev( rCpy.nAutorNoPrev )
{}
// "pure virtual Methoden" vom SfxPoolItem
virtual int operator==(const SfxPoolItem& rItem) const;
@@ -209,11 +209,11 @@ public:
class SW_DLLPUBLIC SwFltBookmark : public SfxPoolItem
{
- friend class SwFltShell; // darf aName und aVal uebersetzen
+ friend class SwFltShell; // darf aName und aVal uebersetzen
long nHandle;
String aName;
String aVal;
- BOOL bOnlyRef; // "FRAGE"-Feld, Ref/Seitenrf oder nichts
+ BOOL bOnlyRef; // "FRAGE"-Feld, Ref/Seitenrf oder nichts
BOOL bRef;
BOOL bPgRef;
public:
@@ -223,14 +223,14 @@ public:
// "pure virtual Methoden" vom SfxPoolItem
virtual int operator==(const SfxPoolItem&) const;
virtual SfxPoolItem* Clone(SfxItemPool* = 0) const;
- const String& GetName() const { return aName; }
- const String& GetValSys() const { return aVal; }
- BOOL IsOnlyRef() const { return bOnlyRef; }
- BOOL IsRef() const { return bRef; }
- void SetRef(BOOL b = TRUE) { bRef = b; }
- BOOL IsPgRef() const { return bPgRef; }
- void SetPgRef(BOOL b = TRUE) { bPgRef = b; }
- long GetHandle() const { return nHandle; }
+ const String& GetName() const { return aName; }
+ const String& GetValSys() const { return aVal; }
+ BOOL IsOnlyRef() const { return bOnlyRef; }
+ BOOL IsRef() const { return bRef; }
+ void SetRef(BOOL b = TRUE) { bRef = b; }
+ BOOL IsPgRef() const { return bPgRef; }
+ void SetPgRef(BOOL b = TRUE) { bPgRef = b; }
+ long GetHandle() const { return nHandle; }
};
class SW_DLLPUBLIC SwFltTOX : public SfxPoolItem
@@ -245,8 +245,8 @@ public:
// "pure virtual Methoden" vom SfxPoolItem
virtual int operator==(const SfxPoolItem&) const;
virtual SfxPoolItem* Clone(SfxItemPool* = 0) const;
- SwTOXBase* GetBase() { return pTOXBase; }
- USHORT GetCols() const { return nCols; }
+ SwTOXBase* GetBase() { return pTOXBase; }
+ USHORT GetCols() const { return nCols; }
void SetHadBreakItem( BOOL bVal ) { bHadBreakItem = bVal; }
void SetHadPageDescItem( BOOL bVal ) { bHadPageDescItem = bVal; }
BOOL HadBreakItem() const { return bHadBreakItem; }
@@ -299,7 +299,7 @@ protected:
RndStdIds eFlyAnchor;
BOOL bFlyAbsPos;
- SwDoc& GetDoc() { return rDoc; }
+ SwDoc& GetDoc() { return rDoc; }
SfxItemSet* NewFlyDefaults();
SwFltOutBase(SwDoc& rDocu);
virtual ~SwFltOutBase();
@@ -344,7 +344,7 @@ class SwFltOutDoc : public SwFltOutBase
SwTwips nTableWidth;
USHORT usTableX;
USHORT usTableY;
- BOOL bReadNoTbl; // Keine Tabellen
+ BOOL bReadNoTbl; // Keine Tabellen
SwTableBox* GetBox(USHORT ny, USHORT nx = USHRT_MAX);
BOOL SeekCell( short nRow, short nCol, BOOL bPam );
@@ -357,8 +357,8 @@ public:
nTableWidth(0), bReadNoTbl(FALSE)
{}
- void SetReadNoTable() { bReadNoTbl = TRUE; }
- BOOL IsTableWidthSet() const { return 0 != nTableWidth; }
+ void SetReadNoTable() { bReadNoTbl = TRUE; }
+ BOOL IsTableWidthSet() const { return 0 != nTableWidth; }
virtual SwFltOutBase& operator << (const SfxPoolItem& rItem);
@@ -391,7 +391,7 @@ public:
class SwFltFormatCollection : public SwFltOutBase
{
SwTxtFmtColl* pColl;
- SfxItemSet* pFlyAttrs; // Simulation der Flys in Styles
+ SfxItemSet* pFlyAttrs; // Simulation der Flys in Styles
BOOL bHasFly;
public:
SwFltFormatCollection(SwDoc&, RES_POOL_COLLFMT_TYPE nType);
@@ -408,10 +408,10 @@ public:
void Derived(SwTxtFmtColl* pBase)
{ pColl->SetDerivedFrom(pBase); }
-// SwTxtFmtColl* Search(String, CharSet eSrc);
- SwTxtFmtColl* GetColl() { return pColl; }
- void SetHasFly() { bHasFly = TRUE; }
- SfxItemSet* GetpFlyAttrs() { return pFlyAttrs; }
+// SwTxtFmtColl* Search(String, CharSet eSrc);
+ SwTxtFmtColl* GetColl() { return pColl; }
+ void SetHasFly() { bHasFly = TRUE; }
+ SfxItemSet* GetpFlyAttrs() { return pFlyAttrs; }
virtual SwFltOutBase& operator << (const SfxPoolItem& rItem);
virtual const SfxPoolItem& GetAttr(USHORT nWhich);
@@ -443,7 +443,7 @@ class SwFltShell
SwFltFormatCollection* pColls[256];
SwFltOutBase* pOut;
-// SwFltFormatCollection* pFormat; // set when in style-mode
+// SwFltFormatCollection* pFormat; // set when in style-mode
SwPageDesc* pCurrentPageDesc;
SwPosition* pSavedPos; // set, when in footnote or header/footer -mode
#ifdef None
@@ -461,7 +461,7 @@ class SwFltShell
} eSubMode;
// Fly items:
- USHORT nAktStyle; // zur Indizierung pStyleFlyTable
+ USHORT nAktStyle; // zur Indizierung pStyleFlyTable
//
SwFltControlStack aStack;
SwFltEndStack aEndStack;
@@ -479,18 +479,18 @@ public:
SwFltShell(SwDoc* , SwPaM& , const String& rBaseURL, BOOL bNew, ULONG = 0);
~SwFltShell();
- SwDoc& GetDoc() { return *aStack.pDoc; }
+ SwDoc& GetDoc() { return *aStack.pDoc; }
- CharSet SetCharSet(CharSet eNew) { CharSet eOld = eSrcCharSet;
+ CharSet SetCharSet(CharSet eNew) { CharSet eOld = eSrcCharSet;
eSrcCharSet = eNew;
return eOld;
}
- void SetUseStdPageDesc() { bStdPD = TRUE; }
- void SetProtect() { bProtect = TRUE; }
+ void SetUseStdPageDesc() { bStdPD = TRUE; }
+ void SetProtect() { bProtect = TRUE; }
SwPageDesc* MakePageDesc(SwPageDesc* pFirstPageDesc = NULL);
- SwPageDesc& GetPageDesc() { return *pCurrentPageDesc; }
- void NextTab() { (*this) << BYTE(0x09); }
- void NextLine() { (*this) << BYTE(0x0a); }
+ SwPageDesc& GetPageDesc() { return *pCurrentPageDesc; }
+ void NextTab() { (*this) << BYTE(0x09); }
+ void NextLine() { (*this) << BYTE(0x0a); }
void NextParagraph();
void NextPage();
void NextSection() { pCurrentPageDesc = MakePageDesc(); }
@@ -503,15 +503,15 @@ public:
SwFltShell& operator << ( Graphic& );
SwFltShell& operator << ( SwFltBookmark& aBook );
void SetBookEnd(long nHandle);
- SwFltShell& operator << ( const String& ); // Vorsicht: CHARSET_ANSI
+ SwFltShell& operator << ( const String& ); // Vorsicht: CHARSET_ANSI
SwFltShell& operator << ( const sal_Unicode );
SwFltShell& operator << ( const SwField& );
SwFltShell& operator << ( const SfxPoolItem& rItem )
{ *pOut << rItem; return *this; }
-// SwFltShell& operator >> (SfxPoolItem&);
+// SwFltShell& operator >> (SfxPoolItem&);
// methode zum beenden einer sub-sektion, zB Fusznote etc
- void End() { eSubMode = None; }
+ void End() { eSubMode = None; }
// methoden zur verwaltung von Header/Footer
void BeginHeader(SwPageDesc* =NULL);
void BeginFooter(SwPageDesc* =NULL);
@@ -596,7 +596,7 @@ public:
void EndStyle()
{
-// ASSERT(eSubMode == Style, "wrong state for style");
+// ASSERT(eSubMode == Style, "wrong state for style");
nAktStyle = 0;
pOut = pOutDoc;
eSubMode = None;
diff --git a/sw/source/filter/inc/msfilter.hxx b/sw/source/filter/inc/msfilter.hxx
index 2f93e279c21d..f9cbd310a297 100644
--- a/sw/source/filter/inc/msfilter.hxx
+++ b/sw/source/filter/inc/msfilter.hxx
@@ -1,7 +1,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
@@ -71,13 +71,13 @@ namespace sw
{
/** MSOffice appears to set the charset of unicode fonts to MS 932
- Arial Unicode MS for example is a unicode font, but word sets
+ Arial Unicode MS for example is a unicode font, but word sets
exported uses of it to the MS 932 charset
@param eTextEncoding
the OOo encoding to convert from
- @return
+ @return
a msoffice equivalent charset identifier
@author
@@ -168,8 +168,8 @@ namespace sw
/** Clips a value to MAX/MIN 16bit value to make it safe for use
as a position value to give to writer. i.e. +-57.8cm. Sometimes
we see ridiculous values for positioning in rtf and word document,
- this captures such ones and clips them to values which are
- still outside the document, but of a value that doesn't cause
+ this captures such ones and clips them to values which are
+ still outside the document, but of a value that doesn't cause
problems for writer's layout, e.g. see
http://www.openoffice.org/issues/show_bug.cgi?id=i9245
@@ -187,14 +187,14 @@ namespace sw
Mapping a word style to a writer style has to consider mapping
the word builtin styles like "Normal" as the default root style
to our default root style which is called "Default" in english,
- and "Normal" in german.
-
+ and "Normal" in german.
+
Additionally it then has to avoid name collisions such as
a) styles "Normal" and "Default" in a single document, where
we can use the original distinct names "Normal" and "Default" and..
b) styles "Normal" and "Default" in a single document, where
- we can not use the original names, and must come up with an
+ we can not use the original names, and must come up with an
alternative name for one of them..
And it needs to report to the importer if the style being mapped to
@@ -209,7 +209,7 @@ namespace sw
{
private:
//I hate these things stupid pImpl things, but its warranted here
- ParaMapper *mpImpl;
+ ParaMapper *mpImpl;
public:
ParaStyleMapper(SwDoc &rDoc);
~ParaStyleMapper();
@@ -225,21 +225,21 @@ namespace sw
@param rName
The name of the word style
- @param eSti
+ @param eSti
The style id of the word style, we are really only interested
in knowing if the style has either a builtin standard id, or is
a user defined style.
-
+
@return
The equivalent writer style packaged as a StyleResult to use
for this word style.
-
+
It will only return a failure in the pathological case of
catastropic failure elsewhere of there exist already styles
rName and WW-rName[0..SAL_MAX_INT32], which is both unlikely
and impossible.
*/
- StyleResult GetStyle(const String& rName, ww::sti eSti);
+ StyleResult GetStyle(const String& rName, ww::sti eSti);
};
/** Knows which writer style a given word style should be imported as
@@ -247,14 +247,14 @@ namespace sw
Mapping a word style to a writer style has to consider mapping
the word builtin styles like "Normal" as the default root style
to our default root style which is called "Default" in english,
- and "Normal" in german.
-
+ and "Normal" in german.
+
Additionally it then has to avoid name collisions such as
a) styles "Normal" and "Default" in a single document, where
we can use the original distinct names "Normal" and "Default" and..
b) styles "Normal" and "Default" in a single document, where
- we can not use the original names, and must come up with an
+ we can not use the original names, and must come up with an
alternative name for one of them..
And it needs to report to the importer if the style being mapped to
@@ -269,7 +269,7 @@ namespace sw
{
private:
//I hate these things stupid pImpl things, but its warranted here
- CharMapper *mpImpl;
+ CharMapper *mpImpl;
public:
CharStyleMapper(SwDoc &rDoc);
~CharStyleMapper();
@@ -285,25 +285,25 @@ namespace sw
@param rName
The name of the word style
- @param eSti
+ @param eSti
The style id of the word style, we are really only interested
in knowing if the style has either a builtin standard id, or is
a user defined style.
-
+
@return
The equivalent writer style packaged as a StyleResult to use
for this word style.
-
+
It will only return a failure in the pathological case of
catastropic failure elsewhere of there exist already styles
rName and WW-rName[0..SAL_MAX_INT32], which is both unlikely
and impossible.
*/
- StyleResult GetStyle(const String& rName, ww::sti eSti);
+ StyleResult GetStyle(const String& rName, ww::sti eSti);
};
/** Find suitable names for exporting this font
-
+
Given a fontname description find the best primary and secondary
fallback font to use from MSWord's persp font
@@ -320,7 +320,7 @@ namespace sw
bool HasDistinctSecondary() const;
FontMapExport(const String &rFontDescription);
};
-
+
class InsertedTableClient : public SwClient
{
public:
@@ -329,11 +329,11 @@ namespace sw
};
/** Handle requirements for table formatting in insert->file mode.
-
+
When inserting a table into a document which already has been
formatted and laid out (e.g using insert->file) then tables
must be handled in a special way, (or so previous comments and
- code in the filters leads me to believe).
+ code in the filters leads me to believe).
Before the document is finalized the new tables need to have
their layout frms deleted and recalculated. This TableManager
@@ -341,7 +341,7 @@ namespace sw
a document should be registered with this manager with
InsertTable, and before finialization DelAndMakeTblFrms should
be called.
-
+
@author
<a href="mailto:cmc@openoffice.org">Caol&aacute;n McNamara</a>
@@ -455,8 +455,8 @@ namespace sw
/** Given a SwNoTxtNode (ole/graphic) get original size
Get the uncropped and unscaled size of the underlying graphic or
- ole object associated with a given SwNoTxtNode.
-
+ ole object associated with a given SwNoTxtNode.
+
This function will swap in the graphic if it is swapped out from
the graphic or object cache, but will swap it out if that was the
case, i.e. rNd is logically unchanged before and after
@@ -465,7 +465,7 @@ namespace sw
@param rNd
the SwNoTxtNode whose objects original size we want
- @return
+ @return
the uncropped unscaled size of the SwNoTxtNode
@author
@@ -479,9 +479,9 @@ namespace sw
sal_uInt16 mnScript;
rtl_TextEncoding meCharSet;
bool mbRTL;
- CharRunEntry(xub_StrLen nEndPos, sal_uInt16 nScript,
- rtl_TextEncoding eCharSet, bool bRTL)
- : mnEndPos(nEndPos), mnScript(nScript), meCharSet(eCharSet),
+ CharRunEntry(xub_StrLen nEndPos, sal_uInt16 nScript,
+ rtl_TextEncoding eCharSet, bool bRTL)
+ : mnEndPos(nEndPos), mnScript(nScript), meCharSet(eCharSet),
mbRTL(bRTL)
{
}
@@ -490,7 +490,7 @@ namespace sw
typedef std::vector<CharRunEntry> CharRuns;
typedef CharRuns::const_iterator cCharRunIter;
- /** Collect the ranges of Text which share
+ /** Collect the ranges of Text which share
Word generally requires characters which share the same direction,
the same script, and occasionally (depending on the format) the
@@ -513,13 +513,13 @@ namespace sw
@return STL container of CharRuns which describe the shared
direction, script and optionally script of the contigious sequences
of characters
-
+
@author
<a href="mailto:cmc@openoffice.org">Caol&aacute;n McNamara</a>
@see #i22537# for example
*/
- CharRuns GetPseudoCharRuns(const SwTxtNode& rTxtNd,
+ CharRuns GetPseudoCharRuns(const SwTxtNode& rTxtNd,
xub_StrLen nStart = 0, bool bSplitOnCharSet = false);
}
}
diff --git a/sw/source/filter/inc/rtf.hxx b/sw/source/filter/inc/rtf.hxx
index 9f7578fd5f71..9b1b6530dffa 100644
--- a/sw/source/filter/inc/rtf.hxx
+++ b/sw/source/filter/inc/rtf.hxx
@@ -1,7 +1,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,14 +43,14 @@ class RTFVertOrient
public:
RTFVertOrient( USHORT nValue ) { Value.nVal = nValue; }
- RTFVertOrient( USHORT nOrient, USHORT nRelOrient ) {
+ RTFVertOrient( USHORT nOrient, USHORT nRelOrient ) {
Value.Flags.nOrient = nOrient;
Value.Flags.nRelOrient = nRelOrient;
}
- USHORT GetOrient() const { return Value.Flags.nOrient; }
+ USHORT GetOrient() const { return Value.Flags.nOrient; }
USHORT GetRelation() const { return Value.Flags.nRelOrient; }
- USHORT GetValue() const { return Value.nVal; }
+ USHORT GetValue() const { return Value.nVal; }
};
@@ -74,9 +74,9 @@ public:
Value.Flags.nRelAnchor = 0;
}
- USHORT GetOrient() const { return Value.Flags.nOrient; }
+ USHORT GetOrient() const { return Value.Flags.nOrient; }
USHORT GetRelation() const { return Value.Flags.nRelOrient; }
- USHORT GetValue() const { return Value.nVal; }
+ USHORT GetValue() const { return Value.nVal; }
};
class RTFProtect
@@ -98,10 +98,10 @@ public:
Value.Flags.bPos = bPos;
}
- BOOL GetCntnt() const { return Value.Flags.bCntnt; }
- BOOL GetSize() const { return Value.Flags.bSize; }
- BOOL GetPos() const { return Value.Flags.bPos; }
- USHORT GetValue() const { return Value.nVal; }
+ BOOL GetCntnt() const { return Value.Flags.bCntnt; }
+ BOOL GetSize() const { return Value.Flags.bSize; }
+ BOOL GetPos() const { return Value.Flags.bPos; }
+ USHORT GetValue() const { return Value.nVal; }
};
@@ -124,7 +124,7 @@ public:
BYTE GetOrder() const { return (BYTE)Value.Flags.nOrder; }
BOOL GetGoldCut() const { return (BOOL)Value.Flags.nGoldCut; }
- USHORT GetValue() const { return Value.nVal; }
+ USHORT GetValue() const { return Value.nVal; }
};
#endif // _RTF_HXX
diff --git a/sw/source/filter/inc/wrt_fn.hxx b/sw/source/filter/inc/wrt_fn.hxx
index f190811a6f46..9bff549e4c6a 100644
--- a/sw/source/filter/inc/wrt_fn.hxx
+++ b/sw/source/filter/inc/wrt_fn.hxx
@@ -1,7 +1,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
@@ -26,7 +26,7 @@
************************************************************************/
#ifndef _WRT_FN_HXX
#define _WRT_FN_HXX
-#include "hintids.hxx" // fuer die Konstanten
+#include "hintids.hxx" // fuer die Konstanten
// einige Forward-Deklarationen
class SwNode;
@@ -63,4 +63,4 @@ SW_DLLPUBLIC Writer& Out( const SwNodeFnTab, SwNode&, Writer & rWrt );
-#endif // _WRT_FN_HXX
+#endif // _WRT_FN_HXX
diff --git a/sw/source/filter/inc/wrtswtbl.hxx b/sw/source/filter/inc/wrtswtbl.hxx
index 5bbf776351a1..f97a68c8409c 100644
--- a/sw/source/filter/inc/wrtswtbl.hxx
+++ b/sw/source/filter/inc/wrtswtbl.hxx
@@ -1,7 +1,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 @@ class SvxBrushItem;
class SvxBorderLine;
//---------------------------------------------------------------------------
-// Code aus dem HTML-Filter fuers schreiben von Tabellen
+// Code aus dem HTML-Filter fuers schreiben von Tabellen
//---------------------------------------------------------------------------
#define COLFUZZY 20
@@ -56,18 +56,18 @@ class SvxBorderLine;
class SwWriteTableCell
{
- const SwTableBox *pBox; // SwTableBox der Zelle
- const SvxBrushItem *pBackground; // geerbter Hintergrund einer Zeile
+ const SwTableBox *pBox; // SwTableBox der Zelle
+ const SvxBrushItem *pBackground; // geerbter Hintergrund einer Zeile
- long nHeight; // fixe/Mindest-Hoehe der Zeile
+ long nHeight; // fixe/Mindest-Hoehe der Zeile
- USHORT nWidthOpt; // Breite aus Option;
+ USHORT nWidthOpt; // Breite aus Option;
- USHORT nRow; // Start-Zeile
- USHORT nCol; // Start-Spalte
+ USHORT nRow; // Start-Zeile
+ USHORT nCol; // Start-Spalte
- USHORT nRowSpan; // ueberspannte Zeilen
- USHORT nColSpan; // ueberspannte Spalten
+ USHORT nRowSpan; // ueberspannte Zeilen
+ USHORT nColSpan; // ueberspannte Spalten
BOOL bPrcWidthOpt;
@@ -111,10 +111,10 @@ SV_DECL_PTRARR_DEL( SwWriteTableCells, SwWriteTableCellPtr, 5, 5 )
class SwWriteTableRow
{
- SwWriteTableCells aCells; // Alle Zellen der Rows
+ SwWriteTableCells aCells; // Alle Zellen der Rows
const SvxBrushItem *pBackground;// Hintergrund
- long nPos; // End-Position (twips) der Zeile
+ long nPos; // End-Position (twips) der Zeile
BOOL mbUseLayoutHeights;
// Forbidden and not implemented.
@@ -128,10 +128,10 @@ protected:
public:
- USHORT nTopBorder; // Dicke der oberen/unteren Umrandugen
+ USHORT nTopBorder; // Dicke der oberen/unteren Umrandugen
USHORT nBottomBorder;
- BOOL bTopBorder : 1; // Welche Umrandungen sind da?
+ BOOL bTopBorder : 1; // Welche Umrandungen sind da?
BOOL bBottomBorder : 1;
SwWriteTableRow( long nPos, BOOL bUseLayoutHeights );
@@ -148,11 +148,11 @@ public:
}
const SvxBrushItem *GetBackground() const { return pBackground; }
- BOOL HasTopBorder() const { return bTopBorder; }
- BOOL HasBottomBorder() const { return bBottomBorder; }
+ BOOL HasTopBorder() const { return bTopBorder; }
+ BOOL HasBottomBorder() const { return bBottomBorder; }
- long GetPos() const { return nPos; }
- const SwWriteTableCells& GetCells() const { return aCells; }
+ long GetPos() const { return nPos; }
+ const SwWriteTableCells& GetCells() const { return aCells; }
inline int operator==( const SwWriteTableRow& rRow ) const;
inline int operator<( const SwWriteTableRow& rRow2 ) const;
@@ -180,29 +180,29 @@ SV_DECL_PTRARR_SORT_DEL( SwWriteTableRows, SwWriteTableRowPtr, 5, 5 )
class SwWriteTableCol
{
- USHORT nPos; // End Position der Spalte
+ USHORT nPos; // End Position der Spalte
USHORT nWidthOpt;
BOOL bRelWidthOpt : 1;
- BOOL bOutWidth : 1; // Spaltenbreite ausgeben?
+ BOOL bOutWidth : 1; // Spaltenbreite ausgeben?
public:
- BOOL bLeftBorder : 1; // Welche Umrandungen sind da?
+ BOOL bLeftBorder : 1; // Welche Umrandungen sind da?
BOOL bRightBorder : 1;
SwWriteTableCol( USHORT nPosition );
- USHORT GetPos() const { return nPos; }
+ USHORT GetPos() const { return nPos; }
- void SetLeftBorder( BOOL bBorder ) { bLeftBorder = bBorder; }
- BOOL HasLeftBorder() const { return bLeftBorder; }
+ void SetLeftBorder( BOOL bBorder ) { bLeftBorder = bBorder; }
+ BOOL HasLeftBorder() const { return bLeftBorder; }
- void SetRightBorder( BOOL bBorder ) { bRightBorder = bBorder; }
- BOOL HasRightBorder() const { return bRightBorder; }
+ void SetRightBorder( BOOL bBorder ) { bRightBorder = bBorder; }
+ BOOL HasRightBorder() const { return bRightBorder; }
- void SetOutWidth( BOOL bSet ) { bOutWidth = bSet; }
- BOOL GetOutWidth() const { return bOutWidth; }
+ void SetOutWidth( BOOL bSet ) { bOutWidth = bSet; }
+ BOOL GetOutWidth() const { return bOutWidth; }
inline int operator==( const SwWriteTableCol& rCol ) const;
inline int operator<( const SwWriteTableCol& rCol ) const;
@@ -211,8 +211,8 @@ public:
{
nWidthOpt = nWidth; bRelWidthOpt = bRel;
}
- USHORT GetWidthOpt() const { return nWidthOpt; }
- BOOL HasRelWidthOpt() const { return bRelWidthOpt; }
+ USHORT GetWidthOpt() const { return nWidthOpt; }
+ BOOL HasRelWidthOpt() const { return bRelWidthOpt; }
};
inline int SwWriteTableCol::operator==( const SwWriteTableCol& rCol ) const
@@ -238,27 +238,27 @@ SV_DECL_PTRARR_SORT_DEL( SwWriteTableCols, SwWriteTableColPtr, 5, 5 )
class SW_DLLPUBLIC SwWriteTable
{
protected:
- SwWriteTableCols aCols; // alle Spalten
- SwWriteTableRows aRows; // alle Zellen
+ SwWriteTableCols aCols; // alle Spalten
+ SwWriteTableRows aRows; // alle Zellen
- UINT32 nBorderColor; // Umrandungsfarbe
+ UINT32 nBorderColor; // Umrandungsfarbe
- USHORT nCellSpacing; // Dicke der inneren Umrandung
- USHORT nCellPadding; // Absatnd Umrandung-Inhalt
+ USHORT nCellSpacing; // Dicke der inneren Umrandung
+ USHORT nCellPadding; // Absatnd Umrandung-Inhalt
- USHORT nBorder; // Dicke der ausseren Umrandung
- USHORT nInnerBorder; // Dicke der inneren Umrandung
- USHORT nBaseWidth; // Bezugsgroesse fur Breiten SwFmtFrmSize
+ USHORT nBorder; // Dicke der ausseren Umrandung
+ USHORT nInnerBorder; // Dicke der inneren Umrandung
+ USHORT nBaseWidth; // Bezugsgroesse fur Breiten SwFmtFrmSize
- USHORT nHeadEndRow; // letzte Zeile des Tabellen-Kopfes
+ USHORT nHeadEndRow; // letzte Zeile des Tabellen-Kopfes
USHORT nLeftSub;
USHORT nRightSub;
- long nTabWidth; // Absolute/Relative Breite der Tabelle
+ long nTabWidth; // Absolute/Relative Breite der Tabelle
- BOOL bRelWidths : 1; // Breiten relativ ausgeben?
- BOOL bUseLayoutHeights : 1; // Layout zur Hoehenbestimmung nehmen?
+ BOOL bRelWidths : 1; // Breiten relativ ausgeben?
+ BOOL bUseLayoutHeights : 1; // Layout zur Hoehenbestimmung nehmen?
#ifdef DBG_UTIL
BOOL bGetLineHeightCalled : 1;
#endif
@@ -298,7 +298,7 @@ protected:
public:
static long GetBoxWidth( const SwTableBox *pBox );
-
+
USHORT GetRawWidth( USHORT nCol, USHORT nColSpan ) const;
USHORT GetAbsWidth( USHORT nCol, USHORT nColSpan ) const;
USHORT GetRelWidth( USHORT nCol, USHORT nColSpan ) const;
diff --git a/sw/source/filter/inc/wwstyles.hxx b/sw/source/filter/inc/wwstyles.hxx
index 75b819676adc..d5517a25ca53 100644
--- a/sw/source/filter/inc/wwstyles.hxx
+++ b/sw/source/filter/inc/wwstyles.hxx
@@ -1,7 +1,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
@@ -144,9 +144,9 @@ namespace ww
stiUser = 0x0ffe, // user styles are distinguished by name
stiNil = 0x0fff // max for 12 bits
};
-
+
/** Find the WinWord sti index of an english style name.
-
+
When importing a RTF document we would like to treat styles as similiar
to how word does as possible, to this end word will treat some styles
with special names as inbuilt styles, and some as user defined styles.
@@ -171,10 +171,10 @@ namespace ww
sti GetCanonicalStiFromEnglishName(const String &rString) throw();
/** Find the WinWord sti index of an old <= Word2 stc (style code)
-
- When importing a Word 2 document we would like to treat styles as
- similiar to how word 8 does as possible, to this end word will treat
- some styles with special codes as inbuilt styles, and some as user
+
+ When importing a Word 2 document we would like to treat styles as
+ similiar to how word 8 does as possible, to this end word will treat
+ some styles with special codes as inbuilt styles, and some as user
defined styles.
@param
@@ -190,7 +190,7 @@ namespace ww
sti GetCanonicalStiFromStc(sal_uInt8 stc) throw();
/** Find the WinWord english name from a sti index
-
+
Map the word style index to it's english name
@param
@@ -205,7 +205,7 @@ namespace ww
const sal_Char* GetEnglishNameFromSti(sti eSti) throw();
/** Determine if the WinWord sti is standard Character Style
-
+
@param
sti the Style index