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

[Hossein (via logerrit)]

 dev/null                                     |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx     |    9 ---------
 sw/qa/extras/ooxmlexport/ooxmlexport3.cxx    |    2 +-
 sw/source/filter/ww8/docxattributeoutput.cxx |    3 ---
 4 files changed, 1 insertion(+), 13 deletions(-)

New commits:
commit e0bedd3f7311bf47392a46d097304e3c7afcb246
Author:     Hossein <hoss...@libreoffice.org>
AuthorDate: Wed Oct 4 22:22:06 2023 +0200
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Thu Oct 5 10:14:59 2023 +0200

    Revert "tdf#155470 DOCX export: fix RTL numbers changed to LTR"
    
    This reverts commit 40ed8dd3a5a16f21f2e98440c62efa0fa6ec60ff.
    
    Reason for revert: tdf#157598 problem with LTR documents
    
    Change-Id: I6f25913df4e308be660070e1eeca81f08c0547ea
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157547
    Tested-by: Jenkins
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>

diff --git a/sw/qa/extras/ooxmlexport/data/numbers-rtl.docx 
b/sw/qa/extras/ooxmlexport/data/numbers-rtl.docx
deleted file mode 100644
index 2142967a3619..000000000000
Binary files a/sw/qa/extras/ooxmlexport/data/numbers-rtl.docx and /dev/null 
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 60e097925829..cbca150319b7 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -1106,15 +1106,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf115094v3)
     assertXPath(pXmlDoc, "/w:document/w:body/w:tbl/w:tblPr/w:tblpPr", "tblpY", 
"1064");
 }
 
-CPPUNIT_TEST_FIXTURE(Test, testTdf155470)
-{
-    loadAndSave("numbers-rtl.docx");
-    xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
-
-    // Make sure that <w:rtl/> is preserved
-    assertXPath(pXmlDoc, "/w:document/w:body/w:p/w:r/w:rPr/w:rtl");
-}
-
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
index 9458051ea6d3..db2abe3513a7 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
@@ -174,7 +174,7 @@ CPPUNIT_TEST_FIXTURE(Test, testStyleInheritance)
 
     // We output exactly 2 properties in rPrDefault, nothing else was
     // introduced as an additional default
-    assertXPath(pXmlStyles, "/w:styles/w:docDefaults/w:rPrDefault/w:rPr/*", 3);
+    assertXPath(pXmlStyles, "/w:styles/w:docDefaults/w:rPrDefault/w:rPr/*", 2);
     // Check that we output real content of rPrDefault
     assertXPath(pXmlStyles, 
"/w:styles/w:docDefaults/w:rPrDefault/w:rPr/w:rFonts", "ascii", "Times New 
Roman");
     assertXPath(pXmlStyles, 
"/w:styles/w:docDefaults/w:rPrDefault/w:rPr/w:lang", "bidi", "ar-SA");
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 4f0c67f3ce99..9c67855acbdd 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -160,7 +160,6 @@
 #include <frozen/bits/defines.h>
 #include <frozen/bits/elsa_std.h>
 #include <frozen/unordered_map.h>
-#include <i18nlangtag/mslangid.hxx>
 
 using ::editeng::SvxBorderLine;
 
@@ -7932,8 +7931,6 @@ void DocxAttributeOutput::CharLanguage( const 
SvxLanguageItem& rLanguage )
             AddToAttrList( m_pCharLangAttrList, FSNS( XML_w, XML_eastAsia ), 
aLanguageCode );
             break;
         case RES_CHRATR_CTL_LANGUAGE:
-            if (MsLangId::isRightToLeft(rLanguage.GetLanguage()))
-                m_pSerializer->singleElementNS(XML_w, XML_rtl);
             AddToAttrList( m_pCharLangAttrList, FSNS( XML_w, XML_bidi ), 
aLanguageCode );
             break;
     }