[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - svx/source

[Lionel Elie Mamane]

 svx/source/fmcomp/gridctrl.cxx |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 1e1d5847102cc23f33649118637e1723155e4b1a
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Tue Jul 30 09:23:52 2013 +0200

    fdo#55955 select first column if possible
    
    Change-Id: I131cb0395c481d9cc1de210abc207221dab14bf4
    Reviewed-on: https://gerrit.libreoffice.org/5178
    Reviewed-by: Petr Mladek <pmladek at suse.cz>
    Tested-by: Petr Mladek <pmladek at suse.cz>

diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 83358a7..f3d875c 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -1604,6 +1604,12 @@ void DbGridControl::setDataSource(const Reference< XRowSet >& _xCursor, sal_uInt
     if (nCurPos == BROWSER_INVALIDID || nCurPos >= ColCount())
         nCurPos = 0;
 
+    // Column zero is a valid choice and guaranteed to exist,
+    // but invisible to the user; if we have at least one
+    // user-visible column, go to that one.
+    if (nCurPos == 0 && ColCount() > 1)
+        nCurPos = 1;
+
     // there are rows so go to the selected current column
     if (nRecordCount)
         GoToRowColumnId(0, GetColumnId(nCurPos));