[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - 2 commits - dbaccess/source sw/uiconfig

[Caolán McNamara (via logerrit)]

 dbaccess/source/filter/hsqldb/rowinputbinary.cxx |    4 ++--
 sw/uiconfig/swriter/ui/dropdownfielddialog.ui    |    3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit a40e8da905ca2de1b8155456da9d9be83a140bd9
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Jul 17 14:42:03 2019 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Aug 5 09:54:38 2019 +0200

    Resolves: tdf#126439 dialog should be modal
    
    Change-Id: Ib922be4375533aff69264ee5dc99d521306f93c5
    Reviewed-on: https://gerrit.libreoffice.org/75789
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    Tested-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    (cherry picked from commit 02507a9e2bd37b5556895fc52dd94c8d17b2b770)
    Reviewed-on: https://gerrit.libreoffice.org/76932
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/sw/uiconfig/swriter/ui/dropdownfielddialog.ui b/sw/uiconfig/swriter/ui/dropdownfielddialog.ui
index 6b5bb1911539..b0f9d5f84f0f 100644
--- a/sw/uiconfig/swriter/ui/dropdownfielddialog.ui
+++ b/sw/uiconfig/swriter/ui/dropdownfielddialog.ui
@@ -15,6 +15,9 @@
     <property name="border_width">6</property>
     <property name="title" translatable="yes" context="dropdownfielddialog|DropdownFieldDialog">Choose Item: </property>
     <property name="resizable">False</property>
+    <property name="modal">True</property>
+    <property name="default_width">0</property>
+    <property name="default_height">0</property>
     <property name="type_hint">dialog</property>
     <child>
       <placeholder/>
commit dd7f2329e445de5b5c4fd62437caf84f4345c4de
Author:     Xisco Fauli <xiscofauli at libreoffice.org>
AuthorDate: Wed Jul 10 19:06:13 2019 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Aug 5 09:54:29 2019 +0200

    tdf#126268: Check for the sign value at the right place
    
    This commit contains 25277bcb727994072239c9c2549c271fdd62150e
    and 2e26ef34bf1a2e5d1293e45cf3b1415d9514b056 for backporting
    
    Code introduced in 6039d2463b4cc503b963811b3b1471de3291ee09
    
    Unittest removed in libreoffice-6-2 branch
    See 7991a4d718c282f1fd999e76f683e333b5c220af
    
    Change-Id: Id0e249e47a91b274a247fb7e8b71353114149650
    Reviewed-on: https://gerrit.libreoffice.org/75375
    Tested-by: Jenkins
    Reviewed-by: Lionel Elie Mamane <lionel at mamane.lu>
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>
    Reviewed-on: https://gerrit.libreoffice.org/75420
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>
    Signed-off-by: Xisco Fauli <xiscofauli at libreoffice.org>
    Reviewed-on: https://gerrit.libreoffice.org/75761
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    (cherry picked from commit 08bc5b49cb4fed31c3c08c61f178ee021db87246)
    Reviewed-on: https://gerrit.libreoffice.org/76931
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/dbaccess/source/filter/hsqldb/rowinputbinary.cxx b/dbaccess/source/filter/hsqldb/rowinputbinary.cxx
index 5a447cacb4f3..cb02cde52a23 100644
--- a/dbaccess/source/filter/hsqldb/rowinputbinary.cxx
+++ b/dbaccess/source/filter/hsqldb/rowinputbinary.cxx
@@ -89,10 +89,10 @@ OUString lcl_double_dabble(const std::vector<sal_uInt8>& bytes)
 OUString lcl_makeStringFromBigint(const std::vector<sal_uInt8>& bytes)
 {
     std::vector<sal_uInt8> aBytes{ bytes };
-
     OUStringBuffer sRet;
+
     // two's complement
-    if (aBytes[0] == 1)
+    if ((aBytes[0] & 0x80) != 0)
     {
         sRet.append("-");
         for (auto& byte : aBytes)