[Git][libreoffice-team/libreoffice/libreoffice][debian-experimental-6.0] 2 commits: git update; update no-check-if-root.diff

Rene Engelhard rene at debian.org
Wed Jan 10 22:02:22 UTC 2018


Rene Engelhard pushed to branch debian-experimental-6.0 at Debian LibreOffice Maintainers / libreoffice / libreoffice


Commits:
8f9bafbb by Rene Engelhard at 2018-01-10T20:47:47+01:00
git update; update no-check-if-root.diff

- - - - -
44d794c9 by Rene Engelhard at 2018-01-10T21:58:15+01:00
also add the new linespacing test to disable-tests-somehow-needing-more-fonts.diff

Reverts upstreams f4a97dff08468027c1d9972815aad5d85d02ce79

- - - - -


3 changed files:

- changelog
- patches/disable-tests-somehow-needing-more-fonts.diff
- patches/no-check-if-root.diff


Changes:

=====================================
changelog
=====================================
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:6.0.0~rc2~git20180108-1) UNRELEASED; urgency=medium
+libreoffice (1:6.0.0~rc2~git20180110-1) UNRELEASED; urgency=medium
 
   * New upstream snapshot
 


=====================================
patches/disable-tests-somehow-needing-more-fonts.diff
=====================================
--- a/patches/disable-tests-somehow-needing-more-fonts.diff
+++ b/patches/disable-tests-somehow-needing-more-fonts.diff
@@ -101,3 +101,135 @@ index 0398e15e6ebe..cbfc0955842a 100644
  
  void SwUiWriterTest::testTdf108524()
  {
+
+diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx
+index c65b1c2f391e..8becb860cc0b 100644
+--- a/editeng/qa/unit/core-test.cxx
++++ b/editeng/qa/unit/core-test.cxx
+@@ -21,7 +21,6 @@
+ #include <editeng/editeng.hxx>
+ #include <editeng/eeitem.hxx>
+ #include <editeng/editids.hrc>
+-#include <editeng/lspcitem.hxx>
+ #include <editeng/svxacorr.hxx>
+ #include <editeng/unofield.hxx>
+ #include <editeng/wghtitem.hxx>
+@@ -31,8 +30,6 @@
+ #include <editeng/flditem.hxx>
+ #include <editeng/udlnitem.hxx>
+ #include <svl/srchitem.hxx>
+-#include <editeng/fontitem.hxx>
+-#include <editeng/fhgtitem.hxx>
+ 
+ #include <com/sun/star/text/textfield/Type.hpp>
+ 
+@@ -51,9 +48,6 @@ public:
+     virtual void setUp() override;
+     virtual void tearDown() override;
+ 
+-    /// Test text portions position when percentage line spacing is set
+-    void testLineSpacing();
+-
+     void testConstruction();
+ 
+     /// Test UNO service class that implements text field items.
+@@ -98,7 +92,6 @@ public:
+     DECL_STATIC_LINK( Test, CalcFieldValueHdl, EditFieldInfo*, void );
+ 
+     CPPUNIT_TEST_SUITE(Test);
+-    CPPUNIT_TEST(testLineSpacing);
+     CPPUNIT_TEST(testConstruction);
+     CPPUNIT_TEST(testUnoTextFields);
+     CPPUNIT_TEST(testAutocorrect);
+@@ -137,91 +130,6 @@ void Test::tearDown()
+     test::BootstrapFixture::tearDown();
+ }
+ 
+-void Test::testLineSpacing()
+-{
+-    // Create EditEngine's instance
+-    EditEngine aEditEngine(mpItemPool);
+-
+-    if(aEditEngine.GetRefDevice()->GetDPIY() != 96
+-        || aEditEngine.GetRefDevice()->GetDPIScaleFactor() != 1.0)
+-        return;
+-
+-    // Get EditDoc for current EditEngine's instance
+-    EditDoc &rDoc = aEditEngine.GetEditDoc();
+-
+-    // Initially no text should be there
+-    CPPUNIT_ASSERT_EQUAL(sal_uLong(0), rDoc.GetTextLen());
+-    CPPUNIT_ASSERT_EQUAL(OUString(), rDoc.GetParaAsString(sal_Int32(0)));
+-
+-    // Set initial text
+-    OUString aText = "This is multi-line paragraph";
+-
+-    sal_Int32 aTextLen = aText.getLength();
+-    aEditEngine.SetText(aText);
+-
+-    // Assert changes - text insertion
+-    CPPUNIT_ASSERT_EQUAL(sal_uLong(aTextLen), rDoc.GetTextLen());
+-    CPPUNIT_ASSERT_EQUAL(aText, rDoc.GetParaAsString(sal_Int32(0)));
+-
+-    // Get ItemSet for line spacing - 60%
+-    std::unique_ptr<SfxItemSet> pSet(new SfxItemSet(aEditEngine.GetEmptyItemSet()));
+-    SvxLineSpacingItem aLineSpacing(LINE_SPACE_DEFAULT_HEIGHT, EE_PARA_SBL);
+-    aLineSpacing.SetPropLineSpace(60);
+-    pSet->Put(aLineSpacing);
+-
+-    // Set font
+-    SvxFontItem aFont(EE_CHAR_FONTINFO);
+-    aFont.SetFamilyName("Liberation Sans");
+-    pSet->Put(aFont);
+-    SvxFontHeightItem aFontSize(240, 100, EE_CHAR_FONTHEIGHT);
+-    pSet->Put(aFontSize);
+-
+-    CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt16>(3), pSet->Count());
+-
+-    // Select all paragraphs and set spacing
+-    ESelection aSelection(0, 0, 0, aTextLen);
+-    aEditEngine.QuickSetAttribs(*pSet, aSelection);
+-
+-    // Force multiple lines
+-    aEditEngine.SetPaperSize(Size(1000, 6000));
+-    CPPUNIT_ASSERT_EQUAL((sal_Int32)4, aEditEngine.GetLineCount(0));
+-
+-    // Assert changes
+-    ParaPortion* pParaPortion = aEditEngine.GetParaPortions()[0];
+-    ContentNode* const pNode = pParaPortion->GetNode();
+-    const SvxLineSpacingItem& rLSItem = pNode->GetContentAttribs().GetItem(EE_PARA_SBL);
+-    CPPUNIT_ASSERT_EQUAL(SvxInterLineSpaceRule::Prop, rLSItem.GetInterLineSpaceRule());
+-    CPPUNIT_ASSERT_EQUAL((sal_uInt16)60, rLSItem.GetPropLineSpace());
+-
+-    // Check the first line
+-    ParagraphInfos aInfo = aEditEngine.GetParagraphInfos(0);
+-    CPPUNIT_ASSERT_EQUAL((sal_uInt16)122, aInfo.nFirstLineMaxAscent);
+-    CPPUNIT_ASSERT_EQUAL((sal_uInt16)153, (sal_uInt16)aEditEngine.GetLineHeight(0));
+-
+-    // Prepare second case - 150%
+-    std::unique_ptr<SfxItemSet> pSet2(new SfxItemSet(aEditEngine.GetEmptyItemSet()));
+-    SvxLineSpacingItem aLineSpacing2(LINE_SPACE_DEFAULT_HEIGHT, EE_PARA_SBL);
+-    aLineSpacing2.SetPropLineSpace(150);
+-    pSet2->Put(aLineSpacing2);
+-    pSet2->Put(aFont);
+-    pSet2->Put(aFontSize);
+-
+-    CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt16>(3), pSet2->Count());
+-
+-    // Select all paragraphs and set spacing
+-    aEditEngine.QuickSetAttribs(*pSet2, aSelection);
+-
+-    // Assert changes
+-    const SvxLineSpacingItem& rLSItem2 = pNode->GetContentAttribs().GetItem(EE_PARA_SBL);
+-    CPPUNIT_ASSERT_EQUAL(SvxInterLineSpaceRule::Prop, rLSItem2.GetInterLineSpaceRule());
+-    CPPUNIT_ASSERT_EQUAL((sal_uInt16)150, rLSItem2.GetPropLineSpace());
+-
+-    // Check the first line
+-    ParagraphInfos aInfo2 = aEditEngine.GetParagraphInfos(0);
+-    CPPUNIT_ASSERT_EQUAL((sal_uInt16)269, aInfo2.nFirstLineMaxAscent);
+-    CPPUNIT_ASSERT_EQUAL((sal_uInt16)382, (sal_uInt16)aEditEngine.GetLineHeight(0));
+-}
+-
+ void Test::testConstruction()
+ {
+     EditEngine aEngine(mpItemPool);


=====================================
patches/no-check-if-root.diff
=====================================
--- a/patches/no-check-if-root.diff
+++ b/patches/no-check-if-root.diff
@@ -1,14 +1,5 @@
 --- a/Makefile.in	2017-07-28 06:09:37.072183489 +0000
 +++ b/Makefile.in	2017-10-18 12:43:59.215567467 +0000
-@@ -9,7 +9,7 @@
- 
- gb_Top_MODULE_CHECK_TARGETS := slowcheck unitcheck subsequentcheck perfcheck uicheck screenshot
- 
--.PHONY : all check-if-root bootstrap gbuild build build-non-l10n-only build-l10n-only check clean clean-build clean-host test-install distclean distro-pack-install distro-pack-install-strip docs download etags fetch get-submodules id install install-gdb-printers install-strip tags debugrun help showmodules translations packageinfo internal.clean $(gb_Top_MODULE_CHECK_TARGETS)
-+.PHONY : all bootstrap gbuild build build-non-l10n-only build-l10n-only check clean clean-build clean-host test-install distclean distro-pack-install distro-pack-install-strip docs download etags fetch get-submodules id install install-gdb-printers install-strip tags debugrun help showmodules translations packageinfo internal.clean $(gb_Top_MODULE_CHECK_TARGETS)
- 
- MAKECMDGOALS?=all
- build_goal:=$(if $(filter build check,$(MAKECMDGOALS)),all)\
 @@ -57,14 +57,6 @@ else # MAKE_RESTARTS
  
  all: build



View it on GitLab: https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice/compare/2a69de4ec1b4beb3cd419fd4af0f614d92205895...44d794c95331454ba1595cb3a03353be6676aea3

---
View it on GitLab: https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice/compare/2a69de4ec1b4beb3cd419fd4af0f614d92205895...44d794c95331454ba1595cb3a03353be6676aea3
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-openoffice-commits/attachments/20180110/c68d5a89/attachment-0001.html>


More information about the Pkg-openoffice-commits mailing list