richedit: Removed ME_InsertRun since it uses character offsets.

The function was used in one place, and was simply a wrapper around a call to ME_InsertRunAtCursor, so I removed it to avoids it use in other parts of the code.

richedit: Removed ME_InsertRun since it uses character offsets.
8f0dfaba · Dylan Smith · Alexandre Julliard · 02228ee1 · 8f0dfaba · 8f0dfaba
Commit 8f0dfaba authored Aug 13, 2009 by Dylan Smith Committed by Alexandre Julliard Aug 13, 2009
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 24 deletions

editor.h dlls/riched20/editor.h +0 -2

run.c dlls/riched20/run.c +0 -21

undo.c dlls/riched20/undo.c +6 -1

No files found.
--- a/dlls/riched20/editor.h
+++ b/dlls/riched20/editor.h
@@ -126,8 +126,6 @@ int ME_RowNumberFromCharOfs(ME_TextEditor *editor, int nOfs);

 /* run.c */
 ME_DisplayItem *ME_MakeRun(ME_Style *s, ME_String *strData, int nFlags);
-/* note: ME_InsertRun inserts a copy of the specified run - so you need to destroy the original */
-ME_DisplayItem *ME_InsertRun(ME_TextEditor *editor, int nCharOfs, ME_DisplayItem *pItem);
 ME_DisplayItem *ME_InsertRunAtCursor(ME_TextEditor *editor, ME_Cursor *cursor,
                                     ME_Style *style, const WCHAR *str, int len, int flags);
 void ME_CheckCharOffsets(ME_TextEditor *editor);

--- a/dlls/riched20/run.c
+++ b/dlls/riched20/run.c
@@ -348,27 +348,6 @@ ME_DisplayItem *ME_MakeRun(ME_Style *s, ME_String *strData, int nFlags)
 }

 /******************************************************************************
- * ME_InsertRun
- * 
- * Inserts a run at a given character position (offset).
- */   
-ME_DisplayItem *ME_InsertRun(ME_TextEditor *editor, int nCharOfs, ME_DisplayItem *pItem)
-{
-  ME_Cursor tmp;
-  ME_DisplayItem *pDI;
-
-  assert(pItem->type == diRun || pItem->type == diUndoInsertRun);
-
-  ME_CursorFromCharOfs(editor, nCharOfs, &tmp);
-  pDI = ME_InsertRunAtCursor(editor, &tmp, pItem->member.run.style,
-                             pItem->member.run.strText->szData,
-                             pItem->member.run.strText->nLen,
-                             pItem->member.run.nFlags);
-  
-  return pDI;
-}
-
-/******************************************************************************
 * ME_InsertRunAtCursor
 *
 * Inserts a new run with given style, flags and content at a given position,

--- a/dlls/riched20/undo.c
+++ b/dlls/riched20/undo.c
@@ -307,7 +307,12 @@ static void ME_PlayUndoItem(ME_TextEditor *editor, ME_DisplayItem *pItem)
  }
  case diUndoInsertRun:
  {
-    ME_InsertRun(editor, pItem->member.run.nCharOfs, pItem);
+    ME_Cursor tmp;
+    ME_CursorFromCharOfs(editor, pItem->member.run.nCharOfs, &tmp);
+    ME_InsertRunAtCursor(editor, &tmp, pItem->member.run.style,
+                         pItem->member.run.strText->szData,
+                         pItem->member.run.strText->nLen,
+                         pItem->member.run.nFlags);
    break;
  }
  case diUndoDeleteRun: