summaryrefslogtreecommitdiffstats
path: root/src/text-editing.cpp
diff options
context:
space:
mode:
authorJoshua L. Blocher <verbalshadow@gmail.com>2008-12-04 01:28:36 +0000
committerverbalshadow <verbalshadow@users.sourceforge.net>2008-12-04 01:28:36 +0000
commitdcf1d3e407baec634caf6a3cc05636a28678bb5e (patch)
treeb7161e006a7d8e21a6d3772e2ea75fc29c4d6be7 /src/text-editing.cpp
parentFix compile when lcms is disabled (diff)
downloadinkscape-dcf1d3e407baec634caf6a3cc05636a28678bb5e.tar.gz
inkscape-dcf1d3e407baec634caf6a3cc05636a28678bb5e.zip
NR -> 2geom some headers in src/
(bzr r6935)
Diffstat (limited to 'src/text-editing.cpp')
-rw-r--r--src/text-editing.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/text-editing.cpp b/src/text-editing.cpp
index 231d834ca..482f6faeb 100644
--- a/src/text-editing.cpp
+++ b/src/text-editing.cpp
@@ -943,7 +943,7 @@ text_tag_attributes_at_position(SPItem *item, Inkscape::Text::Layout::iterator c
}
void
-sp_te_adjust_kerning_screen (SPItem *item, Inkscape::Text::Layout::iterator const &start, Inkscape::Text::Layout::iterator const &end, SPDesktop *desktop, NR::Point by)
+sp_te_adjust_kerning_screen (SPItem *item, Inkscape::Text::Layout::iterator const &start, Inkscape::Text::Layout::iterator const &end, SPDesktop *desktop, Geom::Point by)
{
// divide increment by zoom
// divide increment by matrix expansion
@@ -1094,7 +1094,7 @@ sp_te_get_average_linespacing (SPItem *text)
return 0;
unsigned line_count = layout->lineIndex(layout->end());
- double all_lines_height = layout->characterAnchorPoint(layout->end())[NR::Y] - layout->characterAnchorPoint(layout->begin())[NR::Y];
+ double all_lines_height = layout->characterAnchorPoint(layout->end())[Geom::Y] - layout->characterAnchorPoint(layout->begin())[Geom::Y];
double average_line_height = all_lines_height / (line_count == 0 ? 1 : line_count);
return average_line_height;
}
@@ -1118,7 +1118,7 @@ sp_te_adjust_linespacing_screen (SPItem *text, Inkscape::Text::Layout::iterator
}
unsigned line_count = layout->lineIndex(layout->end());
- double all_lines_height = layout->characterAnchorPoint(layout->end())[NR::Y] - layout->characterAnchorPoint(layout->begin())[NR::Y];
+ double all_lines_height = layout->characterAnchorPoint(layout->end())[Geom::Y] - layout->characterAnchorPoint(layout->begin())[Geom::Y];
double average_line_height = all_lines_height / (line_count == 0 ? 1 : line_count);
if (fabs(average_line_height) < 0.001) average_line_height = 0.001;