diff options
Diffstat (limited to 'sw/inc')
-rw-r--r-- | sw/inc/ndarr.hxx | 11 | ||||
-rw-r--r-- | sw/inc/node.hxx | 4 |
2 files changed, 6 insertions, 9 deletions
diff --git a/sw/inc/ndarr.hxx b/sw/inc/ndarr.hxx index 7e095c8fb0a6..dea24da0ca81 100644 --- a/sw/inc/ndarr.hxx +++ b/sw/inc/ndarr.hxx @@ -64,8 +64,7 @@ namespace sw { class DocumentContentOperationsManager; } namespace svt { class EmbeddedObjectRef; } -typedef SwNode * SwNodePtr; -typedef bool (*FnForEach_SwNodes)( const SwNodePtr&, void* pArgs ); +typedef bool (*FnForEach_SwNodes)( SwNode*, void* pArgs ); typedef struct _xmlTextWriter *xmlTextWriterPtr; struct CompareSwOutlineNodes @@ -96,10 +95,8 @@ class SW_DLLPUBLIC SwNodes final SwNodeIndex* m_vIndices; ///< ring of all indices on nodes. void RemoveNode( sal_uLong nDelPos, sal_uLong nLen, bool bDel ); - void InsertNode( const SwNodePtr pNode, - const SwNodeIndex& rPos ); - void InsertNode( const SwNodePtr pNode, - sal_uLong nPos ); + void InsertNode( SwNode* pNode, const SwNodeIndex& rPos ); + void InsertNode( SwNode* pNode, sal_uLong nPos ); SwDoc& m_rMyDoc; ///< This Doc contains the nodes-array. @@ -137,7 +134,7 @@ public: typedef std::vector<SwNodeRange> NodeRanges_t; typedef std::vector<NodeRanges_t> TableRanges_t; - SwNodePtr operator[]( sal_uLong n ) const; // defined in node.hxx + SwNode* operator[]( sal_uLong n ) const; // defined in node.hxx sal_uLong Count() const { return BigPtrArray::Count(); } void ForEach( FnForEach_SwNodes fnForEach, void* pArgs = nullptr ) diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx index 6639aefb5f97..df30db2b9f9e 100644 --- a/sw/inc/node.hxx +++ b/sw/inc/node.hxx @@ -730,9 +730,9 @@ inline SwPlaceholderNode::SwPlaceholderNode(const SwNodeIndex &rWhere) { } -inline SwNodePtr SwNodes::operator[]( sal_uLong n ) const +inline SwNode* SwNodes::operator[]( sal_uLong n ) const { - return static_cast<SwNodePtr>(BigPtrArray::operator[] ( n )); + return static_cast<SwNode*>(BigPtrArray::operator[] ( n )); } #endif |