summaryrefslogtreecommitdiffstats
path: root/src/ui
diff options
context:
space:
mode:
authorTavmjong Bah <tavmjong@free.fr>2017-11-14 12:40:32 +0000
committerTavmjong Bah <tavmjong@free.fr>2017-11-14 12:40:32 +0000
commitb66c3b342d59f791ceb62dd8bfc901c98258ee50 (patch)
tree678d7ac5ee6265b3b8d2727ca5e0471bc2244445 /src/ui
parentSymbols: Fix uninitialized variable and some minor consistency fixes (diff)
downloadinkscape-b66c3b342d59f791ceb62dd8bfc901c98258ee50.tar.gz
inkscape-b66c3b342d59f791ceb62dd8bfc901c98258ee50.zip
Don't set a default 'font-size' when copying text if one is not set.
Fixes bug reported by crogers when pasting into flowed text.
Diffstat (limited to 'src/ui')
-rw-r--r--src/ui/clipboard.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/ui/clipboard.cpp b/src/ui/clipboard.cpp
index dbeee644c..118d7ae1f 100644
--- a/src/ui/clipboard.cpp
+++ b/src/ui/clipboard.cpp
@@ -1049,9 +1049,12 @@ bool ClipboardManagerImpl::_pasteText(SPDesktop *desktop)
SPCSSAttr *css = take_style_from_item(tc->text);
for (int i = 0; i < nr_blocks; ++i)
{
- gchar const *w = sp_repr_css_property(css, "font-size", "40px");
- if (w)
+ gchar const *w = sp_repr_css_property(css, "font-size", "0px");
+
+ // Don't set font-size if it wasn't set.
+ if (w && strcmp(w, "0px") != 0) {
sp_repr_css_set_property(te_selected_style[i], "font-size", w);
+ }
}
for (int i = 0; i < text.length(); ++i)