[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0-29' - 2 commits - desktop/qa instsetoo_native/util

[Andras Timar (via logerrit)]

 desktop/qa/desktop_lib/test_desktop_lib.cxx |    1 -
 instsetoo_native/util/openoffice.lst.in     |    2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit e4c7ae6708bd3d92aae0421b88a72fd54874529e
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Wed Nov 27 23:11:25 2019 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Wed Nov 27 23:11:25 2019 +0100

    Change PACKAGEREVISION to 20191127
    
    Change-Id: If0321c2481be214aa2e10d3edfd9e9bb69440909

diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in
index a26600d6668e..c21aab5f40b6 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -61,7 +61,7 @@ CollaboraOffice
             ADD_INCLUDE_FILES cli_ure/version/version.txt,unoil/climaker/version.txt
             ADDSYSTEMINTEGRATION 1
             PACKAGEVERSION @LIBO_VERSION_MAJOR at .@LIBO_VERSION_MINOR at .@LIBO_VERSION_MICRO at .@LIBO_VERSION_PATCH@
-            PACKAGEREVISION 20191019
+            PACKAGEREVISION 20191127
             LICENSENAME LGPL
             ROOTMODULEGID gid_Module_Root
             GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
commit 922c47937bdd52d39f4a101eca20a38f0b67afb8
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Wed Nov 27 23:10:23 2019 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Wed Nov 27 23:10:23 2019 +0100

    build fix: remove extra ] from cxx file
    
    Change-Id: I794a214ec63a44f60249c08b5a7a70704252a29b

diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index cb42ab2d75b4..a89f8589d60a 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -2772,7 +2772,6 @@ void DesktopLOKTest::testABI()
     CPPUNIT_ASSERT_EQUAL(documentClassOffset(49), offsetof(struct _LibreOfficeKitDocumentClass, selectPart));
     CPPUNIT_ASSERT_EQUAL(documentClassOffset(50), offsetof(struct _LibreOfficeKitDocumentClass, moveSelectedParts));
     CPPUNIT_ASSERT_EQUAL(documentClassOffset(51), offsetof(struct _LibreOfficeKitDocumentClass, renderFontOrientation));
-]
 
     // Extending is fine, update this, and add new assert for the offsetof the
     // new method