[Libreoffice-commits] core.git: 2 commits - editeng/source vcl/source

[Noel Grandin]

 editeng/source/editeng/editdoc.cxx |   13 ++++++-------
 editeng/source/editeng/editdoc.hxx |    2 +-
 vcl/source/edit/textdoc.cxx        |    4 ++--
 vcl/source/edit/textdoc.hxx        |    2 +-
 4 files changed, 10 insertions(+), 11 deletions(-)

New commits:
commit e61b20dc1aeb271fab1f143e336cdc5b886b3d17
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Wed Sep 7 09:09:14 2016 +0200

    rename CollapsAttribs -> CollapseAttribs
    
    Change-Id: Ic70f67fb7e0e557a3a726f44aef25931def49835

diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx
index 12e36a3..2f04b71 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 0c8f09b..063a544 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 0e935a9..c54e135 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 9f0929f..dce060d 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 );
commit 17b1bbb548cd193cde68a35b84d1ace6452e7036
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Wed Sep 7 09:08:29 2016 +0200

    improve comment grammar
    
    Change-Id: Ic7da4b4d67bb006290af6c7b9e5d084d13b6ca98

diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx
index 458dc14..12e36a3 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -1276,8 +1276,7 @@ void ContentNode::ExpandAttribs( sal_Int32 nIndex, sal_Int32 nNew, SfxItemPool&
 #endif
 
     // Since features are treated differently than normal character attributes,
-    // can also the order of the start list be change!
-    // In every if ...,  in the next (n) opportunities due to bFeature or
+    // but can also affect the order of the start list.    // In every if ...,  in the next (n) opportunities due to bFeature or
     // an existing special case, must (n-1) opportunities be provided with
     // bResort. The most likely possibility receives no bResort, so that is
     // not sorted anew when all attributes are the same.
@@ -1417,7 +1416,7 @@ void ContentNode::CollapsAttribs( sal_Int32 nIndex, sal_Int32 nDeleted, SfxItemP
 #endif
 
     // Since features are treated differently than normal character attributes,
-    // can also the order of the start list be change!
+    // but can also affect the order of the start list
     bool bResort = false;
     sal_Int32 nEndChanges = nIndex+nDeleted;
 
@@ -1474,8 +1473,8 @@ void ContentNode::CollapsAttribs( sal_Int32 nIndex, sal_Int32 nDeleted, SfxItemP
         }
         DBG_ASSERT( !pAttrib->IsFeature() || ( pAttrib->GetLen() == 1 ), "Expand: FeaturesLen != 1" );
 
-        DBG_ASSERT( pAttrib->GetStart() <= pAttrib->GetEnd(), "Collaps: Attribut distorted!" );
-        DBG_ASSERT( ( pAttrib->GetEnd() <= Len()) || bDelAttr, "Collaps: Attribute larger than paragraph!" );
+        DBG_ASSERT( pAttrib->GetStart() <= pAttrib->GetEnd(), "Collapse: Attribute distorted!" );
+        DBG_ASSERT( ( pAttrib->GetEnd() <= Len()) || bDelAttr, "Collapse: Attribute larger than paragraph!" );
         if ( bDelAttr )
         {
             bResort = true;