sw/qa/extras/ooxmlexport/data/tdf106174_rtlParaAlign.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport11.cxx | 21 +++++++
writerfilter/source/dmapper/DomainMapper.cxx | 41 ++++++++++----
3 files changed, 51 insertions(+), 11 deletions(-)
New commits:
commit 9fc9510ae3f46e5c1fd65303bac9f01ddc79cb5c
Author: Justin Luth <justin_l...@sil.org>
AuthorDate: Mon Jul 9 21:05:07 2018 +0300
Commit: Miklos Vajna <vmik...@collabora.co.uk>
CommitDate: Wed Jul 25 10:18:22 2018 +0200
tdf#106174 writerfilter: bidi - prev adjust? prev bidi?
Four situations to handle:
1.) bidi same as previous setting: no adjust change
2.) no previous adjust: set appropriate default for this bidi
3.) previous adjust and bidi different from previous: swap adjusts
4.) previous adjust and no previous bidi: RTL swaps adjust
The previous method was pretty heavy-handed, especially when
clobbering the inherited ParaAdjust value. It essentially
only handled situation #2.
There are several commits that this one builds on or that
enhance it. Look in this bug 106174 and in bug 72560.
Change-Id: I07192ed93d50b07911cc8134a4ee57da87023d78
Reviewed-on: https://gerrit.libreoffice.org/57196
Tested-by: Jenkins
Reviewed-by: Justin Luth <justin_l...@sil.org>
Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>
diff --git a/sw/qa/extras/ooxmlexport/data/tdf106174_rtlParaAlign.docx
b/sw/qa/extras/ooxmlexport/data/tdf106174_rtlParaAlign.docx
new file mode 100644
index 000000000000..a222f5881461
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/tdf106174_rtlParaAlign.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index b4d6dad88132..229b3d66096c 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -11,6 +11,7 @@
#include <com/sun/star/awt/Size.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/style/ParagraphAdjust.hpp>
#include <com/sun/star/table/BorderLine.hpp>
#include <com/sun/star/text/XDependentTextField.hpp>
#include <com/sun/star/text/XFootnote.hpp>
@@ -70,6 +71,26 @@ DECLARE_OOXMLEXPORT_TEST(testTdf63561_clearTabs2,
"tdf63561_clearTabs2.docx")
CPPUNIT_ASSERT_EQUAL(sal_Int32(4), getProperty<
uno::Sequence<style::TabStop> >(getParagraph(4), "ParaTabStops").getLength());
}
+DECLARE_OOXMLEXPORT_TEST(testTdf106174_rtlParaAlign,
"tdf106174_rtlParaAlign.docx")
+{
+ CPPUNIT_ASSERT_EQUAL(sal_Int16(style::ParagraphAdjust_CENTER),
getProperty<sal_Int16>(getParagraph(1), "ParaAdjust"));
+ CPPUNIT_ASSERT_EQUAL(sal_Int16(style::ParagraphAdjust_CENTER),
getProperty<sal_Int16>(getParagraph(2), "ParaAdjust"));
+ uno::Reference<beans::XPropertySet>
xPropertySet(getStyles("ParagraphStyles")->getByName("Another paragraph aligned
to right"), uno::UNO_QUERY);
+ CPPUNIT_ASSERT_EQUAL(sal_Int16(style::ParagraphAdjust_RIGHT),
getProperty<sal_Int16>(xPropertySet, "ParaAdjust"));
+ CPPUNIT_ASSERT_EQUAL(sal_Int16(style::ParagraphAdjust_RIGHT),
getProperty<sal_Int16>(getParagraph(3), "ParaAdjust"));
+ CPPUNIT_ASSERT_EQUAL(sal_Int16(style::ParagraphAdjust_RIGHT),
getProperty<sal_Int16>(getParagraph(4), "ParaAdjust"));
+ CPPUNIT_ASSERT_EQUAL(sal_Int16(style::ParagraphAdjust_RIGHT),
getProperty<sal_Int16>(getParagraph(5), "ParaAdjust"));
+ CPPUNIT_ASSERT_EQUAL(sal_Int16(style::ParagraphAdjust_LEFT),
getProperty<sal_Int16>(getParagraph(6), "ParaAdjust"));
+ CPPUNIT_ASSERT_EQUAL(sal_Int16(style::ParagraphAdjust_RIGHT),
getProperty<sal_Int16>(getParagraph(7), "ParaAdjust"));
+ CPPUNIT_ASSERT_EQUAL(sal_Int16(style::ParagraphAdjust_RIGHT),
getProperty<sal_Int16>(getParagraph(8), "ParaAdjust"));
+ CPPUNIT_ASSERT_EQUAL(sal_Int16(style::ParagraphAdjust_LEFT),
getProperty<sal_Int16>(getParagraph(9), "ParaAdjust"));
+ CPPUNIT_ASSERT_EQUAL(sal_Int16(style::ParagraphAdjust_LEFT),
getProperty<sal_Int16>(getParagraph(10), "ParaAdjust"));
+ CPPUNIT_ASSERT_EQUAL(sal_Int16(style::ParagraphAdjust_RIGHT),
getProperty<sal_Int16>(getParagraph(11), "ParaAdjust"));
+ CPPUNIT_ASSERT_EQUAL(sal_Int16(style::ParagraphAdjust_LEFT),
getProperty<sal_Int16>(getParagraph(12), "ParaAdjust"));
+ CPPUNIT_ASSERT_EQUAL(sal_Int16(style::ParagraphAdjust_LEFT),
getProperty<sal_Int16>(getParagraph(13), "ParaAdjust"));
+ CPPUNIT_ASSERT_EQUAL(sal_Int16(style::ParagraphAdjust_RIGHT),
getProperty<sal_Int16>(getParagraph(14), "ParaAdjust"));
+}
+
DECLARE_OOXMLEXPORT_TEST(testTdf82065_Ind_start_strict,
"tdf82065_Ind_start_strict.docx")
{
uno::Reference<beans::XPropertySet>
xPropertySet(getStyles("NumberingStyles")->getByName("WWNum1"), uno::UNO_QUERY);
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index c1e3141ed9f5..45ae707e3b46 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1451,18 +1451,37 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const
PropertyMapPtr& rContext )
break;
case NS_ooxml::LN_CT_PPrBase_bidi:
{
- if (nIntValue != 0)
- {
- rContext->Insert(PROP_WRITING_MODE, uno::makeAny(
sal_Int16(text::WritingMode2::RL_TB) ));
- if (!IsRTFImport())
- rContext->Insert(PROP_PARA_ADJUST, uno::makeAny(
style::ParagraphAdjust_RIGHT ), /*bOverwrite=*/false);
- }
- else
- {
- rContext->Insert(PROP_WRITING_MODE, uno::makeAny(
sal_Int16(text::WritingMode2::LR_TB) ));
- if (!IsRTFImport())
- rContext->Insert(PROP_PARA_ADJUST, uno::makeAny(
style::ParagraphAdjust_LEFT ), /*bOverwrite=*/false);
+ // Four situations to handle:
+ // 1.) bidi same as previous setting: no adjust change
+ // 2.) no previous adjust: set appropriate default for this bidi
+ // 3.) previous adjust and bidi different from previous: swap
adjusts
+ // 4.) previous adjust and no previous bidi: RTL swaps adjust
+
+ sal_Int16 nParentBidi = -1;
+ m_pImpl->GetPropertyFromStyleSheet(PROP_WRITING_MODE) >>=
nParentBidi;
+ // Paragraph justification reverses its meaning in an RTL context.
+ // 1. Only make adjustments if the BiDi changes.
+ if ( nParentBidi != nIntValue && !IsRTFImport() )
+ {
+ style::ParagraphAdjust eAdjust = style::ParagraphAdjust(-1);
+ // 2. no adjust property exists yet
+ if ( !(m_pImpl->GetAnyProperty(PROP_PARA_ADJUST, rContext) >>=
eAdjust) )
+ {
+ // RTL defaults to right adjust
+ eAdjust = nIntValue ? style::ParagraphAdjust_RIGHT :
style::ParagraphAdjust_LEFT;
+ rContext->Insert(PROP_PARA_ADJUST, uno::makeAny( eAdjust
), /*bOverwrite=*/false);
+ }
+ // 3,4. existing adjust: if RTL, then swap. If LTR, but
previous was RTL, also swap.
+ else if ( nIntValue || nParentBidi ==
sal_Int16(text::WritingMode2::RL_TB) )
+ {
+ if ( eAdjust == style::ParagraphAdjust_RIGHT )
+ rContext->Insert(PROP_PARA_ADJUST, uno::makeAny(
style::ParagraphAdjust_LEFT ));
+ else if ( eAdjust == style::ParagraphAdjust_LEFT )
+ rContext->Insert(PROP_PARA_ADJUST, uno::makeAny(
style::ParagraphAdjust_RIGHT ));
+ }
}
+ sal_Int16 nWritingMode = nIntValue ? text::WritingMode2::RL_TB :
text::WritingMode2::LR_TB;
+ rContext->Insert(PROP_WRITING_MODE, uno::makeAny( nWritingMode ));
}
break;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
