move 8 copies of the same function to common code

[wxWidgets.git] / src / richtext / richtextbuffer.cpp

diff --git a/src/richtext/richtextbuffer.cpp b/src/richtext/richtextbuffer.cpp
index 38b0f76f74b1a32af0e94e5163f8f43a484eb15b..0135fa961f0fe24953bb16c7881f5343a2139b7d 100644 (file)
--- a/src/richtext/richtextbuffer.cpp
+++ b/src/richtext/richtextbuffer.cpp
@@ -1796,8 +1796,7 @@ bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const
                 // we only want the paragraphs to hold this character style, then we _don't_ want to
                 // apply the character style. So we need to be able to choose.
 
                 // we only want the paragraphs to hold this character style, then we _don't_ want to
                 // apply the character style. So we need to be able to choose.
 

-                // if (!paragraphStyle && characterStyle && range.GetStart() != newPara->GetRange().GetEnd())
-                if (!parasOnly && characterStyle && range.GetStart() != newPara->GetRange().GetEnd())
+                if (!parasOnly && (characterStyle|charactersOnly) && range.GetStart() != newPara->GetRange().GetEnd())

                 {
                     wxRichTextRange childRange(range);
                     childRange.LimitTo(newPara->GetRange());
                 {
                     wxRichTextRange childRange(range);
                     childRange.LimitTo(newPara->GetRange());


@@ -6161,10 +6160,10 @@ bool wxRichTextBuffer::PasteFromClipboard(long position)
                 if (action->GetNewParagraphs().GetChildCount() == 1)
                     action->GetNewParagraphs().SetPartialParagraph(true);
 
                 if (action->GetNewParagraphs().GetChildCount() == 1)
                     action->GetNewParagraphs().SetPartialParagraph(true);
 

-                action->SetPosition(position);
+                action->SetPosition(position+1);

 
                 // Set the range we'll need to delete in Undo
 
                 // Set the range we'll need to delete in Undo

-                action->SetRange(wxRichTextRange(position, position));
+                action->SetRange(wxRichTextRange(position+1, position+1));

 
                 SubmitAction(action);
 
 
                 SubmitAction(action);