[Libreoffice-commits] core.git: 2 commits - svx/source

[Lionel Elie Mamane]

 svx/source/fmcomp/gridctrl.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 31d81f87dd8f6aef1eceac4989e77a7cc6a1bc57
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Sun Apr 14 09:37:00 2013 +0200

    fdo#52179 on copy kb-shortcut, from *current* row, not last painted row (!)
    
    Change-Id: I39be862abb7c72234adad9c517d4a0570a1d71ae

diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 33a464e..aff76d1 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -3394,7 +3394,7 @@ void DbGridControl::KeyInput( const KeyEvent& rEvt )
         {
             size_t Location = GetModelColumnPos( nColId );
             DbGridColumn* pColumn = ( Location < m_aColumns.size() ) ? m_aColumns[ Location ] : NULL;
-            OStringTransfer::CopyString( GetCurrentRowCellText( pColumn,m_xPaintRow ), this );
+            OStringTransfer::CopyString( GetCurrentRowCellText( pColumn, m_xCurrentRow ), this );
             return;
         }
     }
commit 460ad501c8b640f52aef2fc0dd5034b41651a9f5
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Sun Apr 14 08:58:18 2013 +0200

    act if the row we act on is valid, not some other one
    
    Change-Id: I8bcdff69bf19f5425eab86de5f99bd2a903fe267

diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 7dac3c2..33a464e 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -2703,7 +2703,7 @@ XubString DbGridControl::GetCurrentRowCellText(DbGridColumn* pColumn,const DbGri
 {
     // Ausgabe des Textes fuer eine Zelle
     XubString aText;
-    if ( pColumn && IsValid(m_xPaintRow) )
+    if ( pColumn && IsValid(_rRow) )
         aText = pColumn->GetCellText(_rRow, m_xFormatter);
     return aText;
 }