[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - 2 commits - desktop/unx sw/qa writerfilter/source

[Julien Nabet]

 desktop/unx/source/splashx.c                 |    4 ++++
 sw/qa/extras/rtfimport/data/tdf94435.rtf     |    7 +++++++
 sw/qa/extras/rtfimport/rtfimport.cxx         |    6 ++++++
 writerfilter/source/dmapper/DomainMapper.cxx |    4 ++--
 4 files changed, 19 insertions(+), 2 deletions(-)

New commits:
commit f019692639bac82fd17ef8b990cfbe6b5fefdf49
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Tue Oct 6 22:27:00 2015 +0200

    tdf#94829: Splash screen sets invalid XSizeHints
    
    Change-Id: I70b86624b4d34eb6cb8f2efee0305539f6689335
    Reviewed-on: https://gerrit.libreoffice.org/19219
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    (cherry picked from commit a614568c4356fe37ba132972e6f3649d606e2c9a)
    Reviewed-on: https://gerrit.libreoffice.org/19273
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/desktop/unx/source/splashx.c b/desktop/unx/source/splashx.c
index db9e01e..3545dfc 100644
--- a/desktop/unx/source/splashx.c
+++ b/desktop/unx/source/splashx.c
@@ -481,6 +481,10 @@ static int splash_create_window( struct splash* splash, int argc, char** argv )
     splash->gc = XCreateGC( splash->display, splash->win, value_mask, &values );
 
     size_hints.flags = PPosition | PSize | PMinSize | PMaxSize;
+    size_hints.x = display_x_pos;
+    size_hints.y = display_y_pos;
+    size_hints.width = splash->width;
+    size_hints.height = splash->height;
     size_hints.min_width = splash->width;
     size_hints.max_width = splash->width;
     size_hints.min_height = splash->height;
commit d5db91d310de658631f4cb85d1335fbe55c82453
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Mon Oct 5 09:16:19 2015 +0200

    tdf#94435 RTF import: \ltrpar should not override \qc
    
    Change-Id: I342191cd8cf8b3998089236aea5743ea7cdd26f1
    (cherry picked from commit 92fd894ea18672cba4cf961bdc4c0bc98f168102)
    Reviewed-on: https://gerrit.libreoffice.org/19274
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/qa/extras/rtfimport/data/tdf94435.rtf b/sw/qa/extras/rtfimport/data/tdf94435.rtf
new file mode 100644
index 0000000..c1dbf0e
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/tdf94435.rtf
@@ -0,0 +1,7 @@
+{\rtf1\ansi\deff3\adeflang1025
+\paperh15840\paperw12240\margl1260\margr720\margt180\margb67\sectd\sbknone\sectunlocked1\pgndec\pgwsxn12240\pghsxn15840\marglsxn1260\margrsxn720\margtsxn180\margbsxn67\ftnbj\ftnstart1\ftnrstcont\ftnnar\aenddoc\aftnrstcont\aftnstart1\aftnnrlc
+{\*\ftnsep\chftnsep}
+\pgndec\pard\plain \s0\ql\widctlpar\ltrpar\hyphpar0\cf0\dbch\af0\dbch\af0\afs24\alang1025\langfe2052\loch\f0\fs24\lang1033\qc\li0\ri720\lin0\rin720\fi0
+{\cf17\b\afs32\fs22\lang1049\rtlch \ltrch\loch\fs32\lang1049
+xxx}
+\par}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx
index 616986d..c7f34c2 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -2338,6 +2338,12 @@ DECLARE_RTFIMPORT_TEST(testTdf94456, "tdf94456.rtf")
     CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(-762), getProperty<sal_Int32>(getParagraph(1), "ParaFirstLineIndent"));
 }
 
+DECLARE_RTFIMPORT_TEST(testTdf94435, "tdf94435.rtf")
+{
+    // This was style::ParagraphAdjust_LEFT, \ltrpar undone the effect of \qc.
+    CPPUNIT_ASSERT_EQUAL(style::ParagraphAdjust_CENTER, static_cast<style::ParagraphAdjust>(getProperty<sal_Int16>(getParagraph(1), "ParaAdjust")));
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index d264dc4..4b11157 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1376,12 +1376,12 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext )
             if (nIntValue != 0)
             {
                 rContext->Insert(PROP_WRITING_MODE, uno::makeAny( text::WritingMode2::RL_TB ));
-                rContext->Insert(PROP_PARA_ADJUST, uno::makeAny( style::ParagraphAdjust_RIGHT ));
+                rContext->Insert(PROP_PARA_ADJUST, uno::makeAny( style::ParagraphAdjust_RIGHT ), /*bOverwrite=*/false);
             }
             else
             {
                 rContext->Insert(PROP_WRITING_MODE, uno::makeAny( text::WritingMode2::LR_TB ));
-                rContext->Insert(PROP_PARA_ADJUST, uno::makeAny( style::ParagraphAdjust_LEFT ));
+                rContext->Insert(PROP_PARA_ADJUST, uno::makeAny( style::ParagraphAdjust_LEFT ), /*bOverwrite=*/false);
             }
         }