[Libreoffice-commits] core.git: sw/source

[Libreoffice Gerrit user]

 sw/source/filter/ww8/rtfattributeoutput.cxx |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit aebc79b670fb60c43dd07e8e963abe019754c092
Author:     Justin Luth <justin_luth at sil.org>
AuthorDate: Sat Jan 26 19:28:47 2019 +0300
Commit:     Justin Luth <justin_luth at sil.org>
CommitDate: Tue Feb 26 20:26:49 2019 +0100

    tdf#116404 RTF: check locale if BiDi inherits Environment
    
    RTF is a bit simplistic compared to the others, but at least
    we can handle the Environment situation similarly.
    
    Change-Id: I87bc389373275d19f1229e11ffd742836a0fd498
    Reviewed-on: https://gerrit.libreoffice.org/66966
    Tested-by: Jenkins
    Reviewed-by: Justin Luth <justin_luth at sil.org>

diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 0b169f9c5336..da67362138c9 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -3490,7 +3490,11 @@ void RtfAttributeOutput::FormatFrameDirection(const SvxFrameDirectionItem& rDire
 {
     if (!m_rExport.m_bOutPageDescs)
     {
-        if (rDirection.GetValue() == SvxFrameDirection::Horizontal_RL_TB)
+        SvxFrameDirection nDir = rDirection.GetValue();
+        if (nDir == SvxFrameDirection::Environment)
+            nDir = GetExport().GetDefaultFrameDirection();
+
+        if (nDir == SvxFrameDirection::Horizontal_RL_TB)
             m_aStyles.append(OOO_STRING_SVTOOLS_RTF_RTLPAR);
         else
             m_aStyles.append(OOO_STRING_SVTOOLS_RTF_LTRPAR);