[Libreoffice-commits] core.git: 2 commits - dbaccess/source dbaccess/uiconfig sc/source

[Libreoffice Gerrit user]

 dbaccess/source/ui/dlg/sqlmessage.cxx |    6 ++++++
 dbaccess/uiconfig/ui/sqlexception.ui  |    4 ++--
 sc/source/core/data/documen3.cxx      |    4 ++++
 3 files changed, 12 insertions(+), 2 deletions(-)

New commits:
commit 3abcd34f37b6aba5025631c64a49d4c8c34effd2
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat Dec 1 20:16:16 2018 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Dec 3 00:43:12 2018 +0100

    Resolves: tdf#121810 wrong column order
    
    Change-Id: Ie82c47ea772b6eb5fc7b84426bb3c1cc98dc9c14
    Reviewed-on: https://gerrit.libreoffice.org/64409
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx
index f1683f82f700..74b4f115e6ec 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.cxx
+++ b/dbaccess/source/ui/dlg/sqlmessage.cxx
@@ -323,6 +323,12 @@ OExceptionChainDialog::OExceptionChainDialog(weld::Window* pParent, const Except
 
         lcl_insertExceptionEntry(*m_xExceptionList, m_aExceptions.size() - 1, aInfo22018);
     }
+
+    if (m_xExceptionList->n_children())
+    {
+        m_xExceptionList->select(0);
+        OnExceptionSelected(*m_xExceptionList);
+    }
 }
 
 IMPL_LINK_NOARG(OExceptionChainDialog, OnExceptionSelected, weld::TreeView&, void)
diff --git a/dbaccess/uiconfig/ui/sqlexception.ui b/dbaccess/uiconfig/ui/sqlexception.ui
index 86521e0a9102..ef392f219271 100644
--- a/dbaccess/uiconfig/ui/sqlexception.ui
+++ b/dbaccess/uiconfig/ui/sqlexception.ui
@@ -4,10 +4,10 @@
   <requires lib="gtk+" version="3.18"/>
   <object class="GtkTreeStore" id="liststore1">
     <columns>
-      <!-- column-name text -->
-      <column type="gchararray"/>
       <!-- column-name image -->
       <column type="GdkPixbuf"/>
+      <!-- column-name text -->
+      <column type="gchararray"/>
       <!-- column-name id -->
       <column type="gchararray"/>
     </columns>
commit 3aa48124342e737f2a11eef9473ebc33a3873820
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Dec 2 21:07:56 2018 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Dec 3 00:42:59 2018 +0100

    ofz#11679 avoid config using path
    
    Change-Id: I5629c4e0bbe29390db5350b05523409c48bbb84d
    Reviewed-on: https://gerrit.libreoffice.org/64434
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx
index e9dcf697e10d..615f79d85f9f 100644
--- a/sc/source/core/data/documen3.cxx
+++ b/sc/source/core/data/documen3.cxx
@@ -71,6 +71,7 @@
 #include <globalnames.hxx>
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
 #include <comphelper/lok.hxx>
+#include <config_fuzzers.h>
 #include <memory>
 
 using namespace com::sun::star;
@@ -558,6 +559,9 @@ bool ScDocument::LinkExternalTab( SCTAB& rTab, const OUString& aDocTab,
         return false;
     }
     rTab = 0;
+#if ENABLE_FUZZERS
+    return false;
+#endif
     OUString  aFilterName; // Is filled by the Loader
     OUString  aOptions; // Filter options
     sal_uInt32 nLinkCnt = pExtDocOptions ? pExtDocOptions->GetDocSettings().mnLinkCnt : 0;