Ticket #2452: 2452.patch

src/main/java/org/sophie2/main/func/text/view/HotTextLogic.java

@@ -573 +573 @@
 
                 if (transferable.getDndData(StringData.class) != null) {
                         String text = transferable.getDndData(StringData.class).getContent();
+                        text = text.replaceAll("\n", CommonChar.PARA_BREAK + "\n");
                         return new ImmHotText(text, null);
                 }
 

src/main/java/org/sophie2/main/func/text/rtf/ApplyRtfStylesUtility.java

@@ -16 +16 @@
 import org.sophie2.base.commons.util.ImmMap;
 import org.sophie2.base.model.text.HotAttr;
 import org.sophie2.base.model.text.elements.CommonAttr;
+import org.sophie2.base.model.text.elements.CommonChar;
 import org.sophie2.base.model.text.elements.TextAlign;
 import org.sophie2.base.model.text.model.ImmHotText;
 import org.sophie2.base.model.text.model.ImmText;
@@ -74 +75 @@
 
                 applyStyles(element, builder, entries);
 
+
                 ImmText newText = new ImmHotText(builder.toString(), null);
                 int curPos = newText.getBegin();
 
@@ -95 +97 @@
                         int begin = element.getStartOffset();
                         int end = element.getEndOffset();
                         String text = element.getDocument().getText(begin, end - begin);
+                        text = text.replaceAll("\n",  CommonChar.PARA_BREAK +  "\n");
                         Map<HotAttr<?>, Object> styleValues = new HashMap<HotAttr<?>, Object>();
                         AttributeSet set;
 

src/main/java/org/sophie2/main/func/text/rtf/RtfTextImportManager.java

@@ -13 +13 @@
 import org.sophie2.base.dnd.DndTransferable;
 import org.sophie2.base.dnd.dnddata.RtfData;
 import org.sophie2.base.model.resources.r4.resources.ResourceH;
+import org.sophie2.base.model.text.elements.CommonChar;
 import org.sophie2.base.model.text.model.ImmTextInterval;
 import org.sophie2.base.model.text.model.ImmText;
 import org.sophie2.base.model.text.model.ImmTextUtils;
@@ -72 +73 @@
                         text = utility.createStyled(doc.getDefaultRootElement());
                         
                         int endPos = text.getEnd();
-                        int beginPos = ImmTextUtils.advance(text, endPos, -2);
+                        int beginPos = ImmTextUtils.advance(text, endPos, -4);
                         ImmTextInterval interval = new ImmTextInterval(beginPos, endPos);
-                        if (text.subText(interval).toString().equals("\n\n")) {
+                        if (text.subText(interval).toString().equals("\n"+ CommonChar.PARA_BREAK +
+                                        "\n" + CommonChar.PARA_BREAK)) {
                                 text = text.replace(interval, ImmTextUtils.createEmptyText());
                         }               
                 } catch (BadLocationException e) {