aboutsummaryrefslogtreecommitdiff
path: root/dw/textblock.cc
diff options
context:
space:
mode:
authorSebastian Geerken <devnull@localhost>2014-12-08 17:35:18 +0100
committerSebastian Geerken <devnull@localhost>2014-12-08 17:35:18 +0100
commit3d521d286174264448cbd1b2315ff89f9d8e8edf (patch)
tree37515aa58dc935014b677c7212ada0fdfab7b2bd /dw/textblock.cc
parentde2139f76ee1fa4f14970914bb6c87fe46feed17 (diff)
parent2bb03c759cb44241d42e3385336a1c6b9a8d7d9f (diff)
Merged with main repo (part 1/2).
Diffstat (limited to 'dw/textblock.cc')
-rw-r--r--dw/textblock.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/dw/textblock.cc b/dw/textblock.cc
index c9709f4d..20c114fa 100644
--- a/dw/textblock.cc
+++ b/dw/textblock.cc
@@ -2539,7 +2539,7 @@ void Textblock::fillSpace (int wordNo, core::style::Style *style)
setBreakOption (word, style, 0, 0, false);
word->content.space = true;
- word->effSpace = word->origSpace =
+ word->origSpace = word->effSpace =
style->font->spaceWidth + style->wordSpacing;
removeSpaceImgRenderer (wordNo);
@@ -3156,8 +3156,6 @@ Textblock *Textblock::getTextblockForLine (int firstWord, int lastWord)
Textblock *textblock = NULL;
if (firstWord < words->size ()) {
- DBG_MSG_WORD ("resize", 1, "<i>first word:</i> ", firstWord, "");
-
// A textblock is always between two line breaks, and so the
// first word of the line.
Word *word = words->getRef (firstWord);