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/fltini.hxx6
-rw-r--r--sw/source/filter/inc/fltshell.hxx26
-rw-r--r--sw/source/filter/inc/msfilter.hxx34
-rw-r--r--sw/source/filter/inc/wrt_fn.hxx4
-rw-r--r--sw/source/filter/inc/wrtswtbl.hxx2
-rw-r--r--sw/source/filter/inc/wwstyles.hxx4
6 files changed, 38 insertions, 38 deletions
diff --git a/sw/source/filter/inc/fltini.hxx b/sw/source/filter/inc/fltini.hxx
index f89c4f96aa12..26a63f81bfef 100644
--- a/sw/source/filter/inc/fltini.hxx
+++ b/sw/source/filter/inc/fltini.hxx
@@ -21,9 +21,9 @@
#include <shellio.hxx>
-class SwNumRuleTbl;
+class SwNumRuleTable;
class SwDoc;
-class SwTxtNode;
+class SwTextNode;
class SwNumRule;
class SwNodeIndex;
@@ -64,7 +64,7 @@ void GetWW8Writer( const OUString&, const OUString&, WriterRef& );
// Absatz-Einzug abgezogen werden muss.
class SW_DLLPUBLIC SwRelNumRuleSpaces
{
- SwNumRuleTbl* pNumRuleTbl; // Liste aller benannten NumRules
+ SwNumRuleTable* pNumRuleTable; // Liste aller benannten NumRules
public:
SwRelNumRuleSpaces( SwDoc& rDoc, bool bNewDoc );
diff --git a/sw/source/filter/inc/fltshell.hxx b/sw/source/filter/inc/fltshell.hxx
index 94301c82bd8c..57fd9f5df436 100644
--- a/sw/source/filter/inc/fltshell.hxx
+++ b/sw/source/filter/inc/fltshell.hxx
@@ -58,40 +58,40 @@ struct SW_DLLPUBLIC SwFltPosition
{
public:
SwNodeIndex m_nNode;
- sal_Int32 m_nCntnt;
+ sal_Int32 m_nContent;
public:
SwFltPosition(const SwFltPosition &rOther)
: m_nNode(rOther.m_nNode)
- , m_nCntnt(rOther.m_nCntnt)
+ , m_nContent(rOther.m_nContent)
{
}
SwFltPosition &operator=(const SwFltPosition &rOther)
{
m_nNode = rOther.m_nNode;
- m_nCntnt = rOther.m_nCntnt;
+ m_nContent = rOther.m_nContent;
return *this;
}
bool operator==(const SwFltPosition &rOther) const
{
- return (m_nCntnt == rOther.m_nCntnt &&
+ return (m_nContent == rOther.m_nContent &&
m_nNode == rOther.m_nNode);
}
void SetPos(SwNodeIndex &rNode, sal_uInt16 nIdx)
{
m_nNode = rNode;
- m_nCntnt = nIdx;
+ m_nContent = nIdx;
}
//operators with SwPosition, where the node is hacked to the previous one,
//and the offset to content is de-dynamic-ified
SwFltPosition(const SwPosition &rPos)
: m_nNode(rPos.nNode, -1)
- , m_nCntnt(rPos.nContent.GetIndex())
+ , m_nContent(rPos.nContent.GetIndex())
{
}
void SetPos(const SwPosition &rPos)
{
m_nNode = rPos.nNode.GetIndex()-1;
- m_nCntnt = rPos.nContent.GetIndex();
+ m_nContent = rPos.nContent.GetIndex();
}
};
@@ -184,7 +184,7 @@ public:
void StealAttr(const SwNodeIndex& rNode, sal_uInt16 nAttrId = 0);
void MarkAllAttrsOld();
void KillUnlockedAttrs(const SwPosition& pPos);
- SfxPoolItem* GetFmtStackAttr(sal_uInt16 nWhich, sal_uInt16 * pPos = 0);
+ SfxPoolItem* GetFormatStackAttr(sal_uInt16 nWhich, sal_uInt16 * pPos = 0);
const SfxPoolItem* GetOpenStackAttr(const SwPosition& rPos, sal_uInt16 nWhich);
void Delete(const SwPaM &rPam);
@@ -199,20 +199,20 @@ class SwFltAnchorClient;
class SW_DLLPUBLIC SwFltAnchor : public SfxPoolItem
{
- SwFrmFmt* pFrmFmt;
+ SwFrameFormat* pFrameFormat;
SwFltAnchorClient * pClient;
public:
- SwFltAnchor(SwFrmFmt* pFlyFmt);
+ SwFltAnchor(SwFrameFormat* pFlyFormat);
SwFltAnchor(const SwFltAnchor&);
virtual ~SwFltAnchor();
// "pure virtual Methoden" vom SfxPoolItem
virtual bool operator==(const SfxPoolItem&) const SAL_OVERRIDE;
virtual SfxPoolItem* Clone(SfxItemPool* = 0) const SAL_OVERRIDE;
- void SetFrmFmt(SwFrmFmt * _pFrmFmt);
- const SwFrmFmt* GetFrmFmt() const { return pFrmFmt;}
- SwFrmFmt* GetFrmFmt() { return pFrmFmt;}
+ void SetFrameFormat(SwFrameFormat * _pFrameFormat);
+ const SwFrameFormat* GetFrameFormat() const { return pFrameFormat;}
+ SwFrameFormat* GetFrameFormat() { return pFrameFormat;}
};
class SwFltAnchorClient : public SwClient
diff --git a/sw/source/filter/inc/msfilter.hxx b/sw/source/filter/inc/msfilter.hxx
index dec1cc891b10..069e6b6ec1d6 100644
--- a/sw/source/filter/inc/msfilter.hxx
+++ b/sw/source/filter/inc/msfilter.hxx
@@ -39,8 +39,8 @@ class SwDoc;
class SwPaM;
class SwTableNode;
class SwNodeIndex;
-class SwNoTxtNode;
-class SwTxtNode;
+class SwNoTextNode;
+class SwTextNode;
class WW8TabDesc;
namespace myImplHelpers
@@ -48,10 +48,10 @@ namespace myImplHelpers
template<class C> class StyleMapperImpl;
}
-class SwTxtFmtColl;
-class SwCharFmt;
-typedef myImplHelpers::StyleMapperImpl<SwTxtFmtColl> ParaMapper;
-typedef myImplHelpers::StyleMapperImpl<SwCharFmt> CharMapper;
+class SwTextFormatColl;
+class SwCharFormat;
+typedef myImplHelpers::StyleMapperImpl<SwTextFormatColl> ParaMapper;
+typedef myImplHelpers::StyleMapperImpl<SwCharFormat> CharMapper;
namespace sw
{
@@ -129,7 +129,7 @@ namespace sw
@author
<a href="mailto:mmaher@openoffice.org">Martin Maher</a
*/
- void SwapQuotesInField(OUString &rFmt);
+ void SwapQuotesInField(OUString &rFormat);
}
@@ -191,7 +191,7 @@ namespace sw
StyleResult is a std::pair of a pointer to a style and a flag
which is true if the style existed previously in the document.
*/
- typedef std::pair<SwTxtFmtColl*, bool> StyleResult;
+ typedef std::pair<SwTextFormatColl*, bool> StyleResult;
/** Get the writer style which the word style should map to
@@ -251,7 +251,7 @@ namespace sw
StyleResult is a std::pair of a pointer to a style and a flag
which is true if the style existed previously in the document.
*/
- typedef std::pair<SwCharFmt*, bool> StyleResult;
+ typedef std::pair<SwCharFormat*, bool> StyleResult;
/** Get the writer style which the word style should map to
@@ -311,7 +311,7 @@ namespace sw
their layout frms deleted and recalculated. This TableManager
detects the necessity to do this, and all tables inserted into
a document should be registered with this manager with
- InsertTable, and before finialization DelAndMakeTblFrms should
+ InsertTable, and before finialization DelAndMakeTableFrms should
be called.
@author
@@ -322,14 +322,14 @@ namespace sw
class InsertedTablesManager
{
public:
- typedef std::map<InsertedTableClient *, SwNodeIndex *> TblMap;
- typedef TblMap::iterator TblMapIter;
- void DelAndMakeTblFrms();
+ typedef std::map<InsertedTableClient *, SwNodeIndex *> TableMap;
+ typedef TableMap::iterator TableMapIter;
+ void DelAndMakeTableFrms();
void InsertTable(SwTableNode &rTableNode, SwPaM &rPaM);
InsertedTablesManager(const SwDoc &rDoc);
private:
bool mbHasRoot;
- TblMap maTables;
+ TableMap maTables;
};
/**
@@ -439,11 +439,11 @@ namespace sw
So this function finds these ranges and returns a STL container
of CharRuns
- @param rTxtNd
+ @param rTextNd
The TextNode we want to ranges from
@param nStart
- The position in the TxtNode to start processing from
+ The position in the TextNode to start processing from
@param bSplitOnCharSet
Set to true is we want to split on ranges of characters that
@@ -459,7 +459,7 @@ namespace sw
@see #i22537# for example
*/
- CharRuns GetPseudoCharRuns(const SwTxtNode& rTxtNd,
+ CharRuns GetPseudoCharRuns(const SwTextNode& rTextNd,
sal_Int32 nStart = 0, bool bSplitOnCharSet = false);
}
}
diff --git a/sw/source/filter/inc/wrt_fn.hxx b/sw/source/filter/inc/wrt_fn.hxx
index 4a3ccf22fb31..828c4f99d965 100644
--- a/sw/source/filter/inc/wrt_fn.hxx
+++ b/sw/source/filter/inc/wrt_fn.hxx
@@ -22,7 +22,7 @@
// einige Forward-Deklarationen
class SwNode;
-class SwCntntNode;
+class SwContentNode;
class Writer;
class SfxPoolItem;
class SfxItemSet;
@@ -46,7 +46,7 @@ RES_NODE_BEGIN = 0,
RES_NODE_END
};
-typedef Writer& (*FnNodeOut)( Writer&, SwCntntNode& );
+typedef Writer& (*FnNodeOut)( Writer&, SwContentNode& );
typedef FnNodeOut SwNodeFnTab[ RES_NODE_END - RES_NODE_BEGIN ];
SW_DLLPUBLIC Writer& Out( const SwNodeFnTab, SwNode&, Writer & rWrt );
diff --git a/sw/source/filter/inc/wrtswtbl.hxx b/sw/source/filter/inc/wrtswtbl.hxx
index fa50d3c03eb5..6af8e2edf6ed 100644
--- a/sw/source/filter/inc/wrtswtbl.hxx
+++ b/sw/source/filter/inc/wrtswtbl.hxx
@@ -235,7 +235,7 @@ protected:
sal_uInt16 nBorder; // Dicke der ausseren Umrandung
sal_uInt16 nInnerBorder; // Dicke der inneren Umrandung
- sal_uInt32 nBaseWidth; // Bezugsgroesse fur Breiten SwFmtFrmSize
+ sal_uInt32 nBaseWidth; // Bezugsgroesse fur Breiten SwFormatFrmSize
sal_uInt16 nHeadEndRow; // letzte Zeile des Tabellen-Kopfes
diff --git a/sw/source/filter/inc/wwstyles.hxx b/sw/source/filter/inc/wwstyles.hxx
index 01e9c1039674..efb11063fc02 100644
--- a/sw/source/filter/inc/wwstyles.hxx
+++ b/sw/source/filter/inc/wwstyles.hxx
@@ -61,7 +61,7 @@ namespace ww
stiTocFirst = stiToc1,
stiTocLast = stiToc9,
stiNormIndent = 28, // 0x001C
- stiFtnText = 29, // 0x001D
+ stiFootnoteText = 29, // 0x001D
stiAtnText = 30, // 0x001E
stiHeader = 31, // 0x001F
stiFooter = 32, // 0x0020
@@ -70,7 +70,7 @@ namespace ww
stiToCaption = 35, // 0x0023
stiEnvAddr = 36, // 0x0024
stiEnvRet = 37, // 0x0025
- stiFtnRef = 38, // 0x0026 char style
+ stiFootnoteRef = 38, // 0x0026 char style
stiAtnRef = 39, // 0x0027 char style
stiLnn = 40, // 0x0028 char style
stiPgn = 41, // 0x0029 char style
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-01 17:24:19 +0000