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

[Mike Kaganski (via logerrit)]

 editeng/source/editeng/editdoc.cxx  |    2 +-
 editeng/source/editeng/editobj.cxx  |    2 +-
 editeng/source/editeng/impedit4.cxx |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit da2746382a4e02d1cf88d72ec51f24c86230e295
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Thu Jul 22 10:23:46 2021 +0300
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Thu Jul 22 12:20:54 2021 +0200

    BinTextObject was renamed to EditTextObject long ago
    
    ... so update comments accordingly
    
    Change-Id: I5fe423c510912dc3bc3e113afcd5c5daaba3d717
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119357
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx
index 774d3ad52cf9..27aa19ed2992 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -2735,7 +2735,7 @@ void CharAttribList::InsertAttrib( EditCharAttrib* pAttrib )
 
     // Maybe just simply iterate backwards:
     // The most common and critical case: Attributes are already sorted
-    // (InsertBinTextObject!) binary search would not be optimal here.
+    // (InsertTextObject!) binary search would not be optimal here.
     // => Would bring something!
 
     const sal_Int32 nStart = pAttrib->GetStart(); // may be better for Comp.Opt.
diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx
index 579f8d73c30a..9f8cc2cb76df 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -309,7 +309,7 @@ EditTextObjectImpl::EditTextObjectImpl( const EditTextObjectImpl& r )
     if ( !r.mbOwnerOfPool )
     {
         // reuse alien pool; this must be an EditEngineItemPool
-        // since there is no other way to construct a BinTextObject
+        // since there is no other way to construct an EditTextObject
         // than it's regular constructor where that is ensured
         mpPool = r.mpPool;
         mbOwnerOfPool = false;
diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx
index 962939fa1914..1786b3215d88 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -1073,7 +1073,7 @@ std::unique_ptr<EditTextObject> ImpEditEngine::CreateTextObject( EditSelection a
                     if ( aX.GetEnd() > (nEndPos-nStartPos) )
                         aX.GetEnd() = nEndPos-nStartPos;
                 }
-                DBG_ASSERT( aX.GetEnd() <= (nEndPos-nStartPos), "CreateBinTextObject: Attribute too long!" );
+                DBG_ASSERT( aX.GetEnd() <= (nEndPos-nStartPos), "CreateTextObject: Attribute too long!" );
                 if ( !aX.GetLen() && !bEmptyPara )
                     pTxtObj->DestroyAttrib(aX);
                 else
@@ -1324,7 +1324,7 @@ EditSelection ImpEditEngine::InsertTextObject( const EditTextObject& rTextObject
                     nTPLen += rParaPortion.GetTextPortions()[--nTest].GetLen();
                 for ( nTest = rParaPortion.GetLines().Count(); nTest; )
                     nTxtLen += rParaPortion.GetLines()[--nTest].GetLen();
-                DBG_ASSERT( ( nTPLen == rParaPortion.GetNode()->Len() ) && ( nTxtLen == rParaPortion.GetNode()->Len() ), "InsertBinTextObject: ParaPortion not completely formatted!" );
+                DBG_ASSERT( ( nTPLen == rParaPortion.GetNode()->Len() ) && ( nTxtLen == rParaPortion.GetNode()->Len() ), "InsertTextObject: ParaPortion not completely formatted!" );
 #endif
             }
         }