commit 000832f9d967cba9901db5f74bea7eaf1b49e31b
Author: Jean-Marc Lasgouttes <[email protected]>
Date: Tue Jan 24 19:33:03 2017 +0100
Use Paragraph::getAlign in TextMetrics
This avoids some duplicate code. Note that the return value of
Paragraph::getAlign had to be changed. I suspect it was set to char to
avoid reading one header file in Paragraph.h.
---
src/Paragraph.cpp | 2 +-
src/Paragraph.h | 3 ++-
src/TextMetrics.cpp | 15 ++-------------
3 files changed, 5 insertions(+), 15 deletions(-)
diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 425ac39..c1aa2b9 100644
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -1948,7 +1948,7 @@ depth_type Paragraph::getMaxDepthAfter() const
}
-char Paragraph::getAlign() const
+LyXAlignment Paragraph::getAlign() const
{
if (d->params_.align() == LYX_ALIGN_LAYOUT)
return d->layout_->align;
diff --git a/src/Paragraph.h b/src/Paragraph.h
index 03a652e..ec1c8c8 100644
--- a/src/Paragraph.h
+++ b/src/Paragraph.h
@@ -17,6 +17,7 @@
#define PARAGRAPH_H
#include "FontEnums.h"
+#include "LayoutEnums.h"
#include "SpellChecker.h"
#include "support/strfwd.h"
@@ -309,7 +310,7 @@ public:
/// Set label width string.
void setLabelWidthString(docstring const & s);
/// Actual paragraph alignment used
- char getAlign() const;
+ LyXAlignment getAlign() const;
/// The nesting depth of a paragraph
depth_type getDepth() const;
/// The maximal possible depth of a paragraph after this one
diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp
index 17ee2e4..3f6457e 100644
--- a/src/TextMetrics.cpp
+++ b/src/TextMetrics.cpp
@@ -514,13 +514,7 @@ bool TextMetrics::redoParagraph(pit_type const pit)
LyXAlignment TextMetrics::getAlign(Paragraph const & par, Row const & row)
const
{
- Layout const & layout = par.layout();
-
- LyXAlignment align;
- if (par.params().align() == LYX_ALIGN_LAYOUT)
- align = layout.align;
- else
- align = par.params().align();
+ LyXAlignment align = par.getAlign();
// handle alignment inside tabular cells
Inset const & owner = text_->inset();
@@ -1788,12 +1782,7 @@ int TextMetrics::leftMargin(int max_width,
if (!par.params().leftIndent().zero())
l_margin += par.params().leftIndent().inPixels(max_width,
lfm.em());
- LyXAlignment align;
-
- if (par.params().align() == LYX_ALIGN_LAYOUT)
- align = layout.align;
- else
- align = par.params().align();
+ LyXAlignment align = par.getAlign();
// set the correct parindent
if (pos == 0
