diff options
| author | Roberto C. Sanchez <roberto@connexer.com> | 2014-10-21 22:48:49 -0400 |
|---|---|---|
| committer | Roberto C. Sanchez <roberto@connexer.com> | 2014-10-21 22:48:49 -0400 |
| commit | 579657c8cb4ecd8a313221e70bdbbc7267f20286 (patch) | |
| tree | dff1f966a17b4c6f76dc6a0ce5e0871e3f81386a /src/backend/rendering | |
| parent | 00bc0a3de99e088902379dcb2905fb1546c7eca2 (diff) | |
Imported Upstream version 2.9.2
Diffstat (limited to 'src/backend/rendering')
| -rw-r--r-- | src/backend/rendering/cdisplayrendering.cpp | 7 | ||||
| -rw-r--r-- | src/backend/rendering/chtmlexportrendering.cpp | 5 | ||||
| -rw-r--r-- | src/backend/rendering/ctextrendering.h | 2 |
3 files changed, 6 insertions, 8 deletions
diff --git a/src/backend/rendering/cdisplayrendering.cpp b/src/backend/rendering/cdisplayrendering.cpp index 175cf4e..bd5aa87 100644 --- a/src/backend/rendering/cdisplayrendering.cpp +++ b/src/backend/rendering/cdisplayrendering.cpp @@ -147,12 +147,11 @@ QString CDisplayRendering::finishText(const QString &text, const KeyTree &tree) CDisplayTemplateMgr::Settings settings; settings.modules = modules; - settings.langAbbrev = ((modules.count() == 1) && lang->isValid()) ? lang->abbrev() : QString::null; + if (modules.count() == 1 && lang->isValid()) + settings.langAbbrev = lang->abbrev(); if (modules.count() == 1) - settings.pageDirection = (modules.first()->textDirection() == CSwordModuleInfo::LeftToRight) ? "ltr" : "rtl"; - else - settings.pageDirection = QString::null; + settings.textDirection = modules.first()->textDirection(); return tMgr->fillTemplate(CDisplayTemplateMgr::activeTemplateName(), text, settings); } diff --git a/src/backend/rendering/chtmlexportrendering.cpp b/src/backend/rendering/chtmlexportrendering.cpp index 66897b5..0e19897 100644 --- a/src/backend/rendering/chtmlexportrendering.cpp +++ b/src/backend/rendering/chtmlexportrendering.cpp @@ -232,12 +232,9 @@ QString CHTMLExportRendering::finishText(const QString &text, const KeyTree &tre const CSwordModuleInfo * const firstModule = settings.modules.first(); const CLanguageMgr::Language * const lang = firstModule->language(); settings.langAbbrev = lang->isValid() ? lang->abbrev() : "unknown"; - if (firstModule->textDirection() == CSwordModuleInfo::RightToLeft) { - settings.pageDirection = "rtl"; - } + settings.textDirection = firstModule->textDirection(); } else { settings.langAbbrev = "unknown"; - settings.pageDirection = QString::null; } return CDTM::instance()->fillTemplate(QObject::tr("Export"), text, settings); diff --git a/src/backend/rendering/ctextrendering.h b/src/backend/rendering/ctextrendering.h index 161deef..9d467cc 100644 --- a/src/backend/rendering/ctextrendering.h +++ b/src/backend/rendering/ctextrendering.h @@ -134,6 +134,8 @@ class CTextRendering { public: /* Methods: */ + virtual inline ~CTextRendering() {} + const QString renderKeyTree(const KeyTree &tree); const QString renderKeyRange( |