diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-09-07 09:09:14 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-09-08 08:33:46 +0200 |
| commit | e61b20dc1aeb271fab1f143e336cdc5b886b3d17 (patch) | |
| tree | de24306dbc7ce5a0c12b2bbaca654ca69cd2af47 | |
| parent | 17b1bbb548cd193cde68a35b84d1ace6452e7036 (diff) | |
rename CollapsAttribs -> CollapseAttribs
Change-Id: Ic70f67fb7e0e557a3a726f44aef25931def49835
| -rw-r--r-- | editeng/source/editeng/editdoc.cxx | 4 | ||||
| -rw-r--r-- | editeng/source/editeng/editdoc.hxx | 2 | ||||
| -rw-r--r-- | vcl/source/edit/textdoc.cxx | 4 | ||||
| -rw-r--r-- | vcl/source/edit/textdoc.hxx | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx index 12e36a397b9f..2f04b7181412 100644 --- a/editeng/source/editeng/editdoc.cxx +++ b/editeng/source/editeng/editdoc.cxx @@ -1406,7 +1406,7 @@ void ContentNode::ExpandAttribs( sal_Int32 nIndex, sal_Int32 nNew, SfxItemPool& #endif } -void ContentNode::CollapsAttribs( sal_Int32 nIndex, sal_Int32 nDeleted, SfxItemPool& rItemPool ) +void ContentNode::CollapseAttribs( sal_Int32 nIndex, sal_Int32 nDeleted, SfxItemPool& rItemPool ) { if ( !nDeleted ) return; @@ -2392,7 +2392,7 @@ void EditDoc::RemoveChars( EditPaM aPaM, sal_Int32 nChars ) { // Maybe remove Features! aPaM.GetNode()->Erase( aPaM.GetIndex(), nChars ); - aPaM.GetNode()->CollapsAttribs( aPaM.GetIndex(), nChars, GetItemPool() ); + aPaM.GetNode()->CollapseAttribs( aPaM.GetIndex(), nChars, GetItemPool() ); SetModified( true ); } diff --git a/editeng/source/editeng/editdoc.hxx b/editeng/source/editeng/editdoc.hxx index 0c8f09b8aeb7..063a54475195 100644 --- a/editeng/source/editeng/editdoc.hxx +++ b/editeng/source/editeng/editdoc.hxx @@ -254,7 +254,7 @@ public: const CharAttribList& GetCharAttribs() const { return aCharAttribList; } void ExpandAttribs( sal_Int32 nIndex, sal_Int32 nNewChars, SfxItemPool& rItemPool ); - void CollapsAttribs( sal_Int32 nIndex, sal_Int32 nDelChars, SfxItemPool& rItemPool ); + void CollapseAttribs( sal_Int32 nIndex, sal_Int32 nDelChars, SfxItemPool& rItemPool ); void AppendAttribs( ContentNode* pNextNode ); void CopyAndCutAttribs( ContentNode* pPrevNode, SfxItemPool& rPool, bool bKeepEndingAttribs ); diff --git a/vcl/source/edit/textdoc.cxx b/vcl/source/edit/textdoc.cxx index 0e935a90b2f5..c54e1358c1b8 100644 --- a/vcl/source/edit/textdoc.cxx +++ b/vcl/source/edit/textdoc.cxx @@ -229,7 +229,7 @@ void TextNode::ExpandAttribs( sal_Int32 nIndex, sal_Int32 nNew ) maCharAttribs.ResortAttribs(); } -void TextNode::CollapsAttribs( sal_Int32 nIndex, sal_Int32 nDeleted ) +void TextNode::CollapseAttribs( sal_Int32 nIndex, sal_Int32 nDeleted ) { if ( !nDeleted ) return; @@ -306,7 +306,7 @@ void TextNode::InsertText( sal_Int32 nPos, sal_Unicode c ) void TextNode::RemoveText( sal_Int32 nPos, sal_Int32 nChars ) { maText = maText.replaceAt( nPos, nChars, "" ); - CollapsAttribs( nPos, nChars ); + CollapseAttribs( nPos, nChars ); } TextNode* TextNode::Split( sal_Int32 nPos ) diff --git a/vcl/source/edit/textdoc.hxx b/vcl/source/edit/textdoc.hxx index 9f0929f89fe7..dce060d713be 100644 --- a/vcl/source/edit/textdoc.hxx +++ b/vcl/source/edit/textdoc.hxx @@ -68,7 +68,7 @@ private: protected: void ExpandAttribs( sal_Int32 nIndex, sal_Int32 nNewChars ); - void CollapsAttribs( sal_Int32 nIndex, sal_Int32 nDelChars ); + void CollapseAttribs( sal_Int32 nIndex, sal_Int32 nDelChars ); public: TextNode( const OUString& rText ); |