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

Lionel Elie Mamane lionel at mamane.lu
Wed Jan 21 21:56:43 PST 2015


 include/svx/gridctrl.hxx       |    1 -
 svx/source/fmcomp/gridctrl.cxx |    8 --------
 2 files changed, 9 deletions(-)

New commits:
commit 08bdb40656898fc484f5200b63610a31369ddd87
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Thu Jan 22 06:50:18 2015 +0100

    fdo#88551 no need to update content from field when activating grid cell
    
    It is already loaded correctly, and reloading leads to bogus TextChanged event.
    
    Change-Id: I9ad384ce60bbfd477199a1c9fb81e8e201a5162b
    Reviewed-on: https://gerrit.libreoffice.org/14096
    Reviewed-by: Lionel Elie Mamane <lionel at mamane.lu>
    Tested-by: Lionel Elie Mamane <lionel at mamane.lu>

diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx
index 3aaecfe..e50c6e5 100644
--- a/include/svx/gridctrl.hxx
+++ b/include/svx/gridctrl.hxx
@@ -585,7 +585,6 @@ protected:
         // calls AdjustRows or AdjustDataSource, synchron if the caller is running in the solar thread, else asynchron
 
 protected:
-    virtual void InitController(::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol) SAL_OVERRIDE;
     void Construct();
     void ImplInitWindow( const InitWindowFacet _eInitWhat );
     DECL_LINK(OnDelete, void*);
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 777045d..4eeb547 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -2872,14 +2872,6 @@ CellController* DbGridControl::GetController(long /*nRow*/, sal_uInt16 nColumnId
     return pReturn;
 }
 
-void DbGridControl::InitController(CellControllerRef& /*rController*/, long /*nRow*/, sal_uInt16 nColumnId)
-{
-    size_t Location = GetModelColumnPos(nColumnId);
-    DbGridColumn* pColumn = ( Location < m_aColumns.size() ) ? m_aColumns[ Location ] : NULL;
-    if (pColumn)
-        pColumn->UpdateFromField(m_xCurrentRow, m_xFormatter);
-}
-
 void DbGridControl::CellModified()
 {
     SAL_INFO("svx.fmcomp", "DbGridControl::CellModified");


More information about the Libreoffice-commits mailing list