summaryrefslogtreecommitdiffstats
path: root/src/ui/tools/text-tool.cpp
diff options
context:
space:
mode:
authorJabiertxof <jabier.arraiza@marker.es>2019-09-16 14:41:18 +0000
committerJabiertxof <jabier.arraiza@marker.es>2019-09-16 14:41:18 +0000
commitc239b8d513fae662a4e3be85f85efb794d98d83d (patch)
treec2528a5760b21acc685f13cde3b5426284d6fc5b /src/ui/tools/text-tool.cpp
parentAllow paste on flowbox at same sice of origin, also improve creation to get r... (diff)
downloadinkscape-c239b8d513fae662a4e3be85f85efb794d98d83d.tar.gz
inkscape-c239b8d513fae662a4e3be85f85efb794d98d83d.zip
Allow paste preserving new lines into a flowtext element
Diffstat (limited to '')
-rw-r--r--src/ui/tools/text-tool.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/ui/tools/text-tool.cpp b/src/ui/tools/text-tool.cpp
index 161b20aa2..5919d7fb2 100644
--- a/src/ui/tools/text-tool.cpp
+++ b/src/ui/tools/text-tool.cpp
@@ -1326,6 +1326,10 @@ bool sp_text_paste_inline(ToolBase *ec)
if (textitem) {
textitem->hide_shape_inside();
}
+ SPFlowtext *flowtext = dynamic_cast<SPFlowtext *>(tc->text);
+ if (flowtext) {
+ flowtext->fix_overflow_flowregion(false);
+ }
// Fix for 244940
// The XML standard defines the following as valid characters
// (Extensible Markup Language (XML) 1.0 (Fourth Edition) paragraph 2.2)
@@ -1374,6 +1378,9 @@ bool sp_text_paste_inline(ToolBase *ec)
if (textitem) {
textitem->show_shape_inside();
}
+ if (flowtext) {
+ flowtext->fix_overflow_flowregion(true);
+ }
DocumentUndo::done(ec->desktop->getDocument(), SP_VERB_CONTEXT_TEXT,
_("Paste text"));