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

[Caolán McNamara]

 svtools/source/table/tablecontrol_impl.cxx |   11 +++++++++--
 svtools/source/table/tablecontrol_impl.hxx |    2 ++
 2 files changed, 11 insertions(+), 2 deletions(-)

New commits:
commit 0a40cec9fb760d6d66480d2ba41151d65cf8675b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Apr 1 14:08:50 2013 +0100

    Related: #i119403# take transparency into account in both Invalidates
    
    which would seem to be a good idea
    
    Change-Id: Id6981851f7ecacab60247af1ef38e06ebb9a7f82

diff --git a/svtools/source/table/tablecontrol_impl.cxx b/svtools/source/table/tablecontrol_impl.cxx
index d54cb3f..53258d2 100644
--- a/svtools/source/table/tablecontrol_impl.cxx
+++ b/svtools/source/table/tablecontrol_impl.cxx
@@ -2127,7 +2127,14 @@ namespace svt { namespace table
             impl_getCellRect( m_nCurColumn, _nPrevRow, aCellRect );
             aInvalidateRect.Bottom() = aCellRect.Bottom();
         }
-        m_pDataWindow->Invalidate( aInvalidateRect );
+
+        invalidateRect(aInvalidateRect);
+    }
+
+    void TableControl_Impl::invalidateRect(const Rectangle &rInvalidateRect)
+    {
+        m_pDataWindow->Invalidate( rInvalidateRect,
+            m_pDataWindow->GetControlBackground().GetTransparency() ? INVALIDATE_TRANSPARENT : 0 );
     }
 
     //------------------------------------------------------------------------------------------------------------------
@@ -2162,8 +2169,7 @@ namespace svt { namespace table
         if ( i_lastRow == ROW_INVALID )
             aInvalidateRect.Bottom() = m_pDataWindow->GetOutputSizePixel().Height();
 
-        m_pDataWindow->Invalidate( aInvalidateRect,
-            m_pDataWindow->GetControlBackground().GetTransparency() ? INVALIDATE_TRANSPARENT : 0 );
+        invalidateRect(aInvalidateRect);
     }
 
     //------------------------------------------------------------------------------
diff --git a/svtools/source/table/tablecontrol_impl.hxx b/svtools/source/table/tablecontrol_impl.hxx
index 21b43ae..d8bf51f 100644
--- a/svtools/source/table/tablecontrol_impl.hxx
+++ b/svtools/source/table/tablecontrol_impl.hxx
@@ -215,6 +215,8 @@ namespace svt { namespace table
         /** returns the position of the current row in the selection vector */
         int getRowSelectedNumber(const ::std::vector<RowPos>& selectedRows, RowPos current);
 
+        void invalidateRect(const Rectangle &rInvalidateRect);
+
         /** ??? */
         void    invalidateSelectedRegion( RowPos _nPrevRow, RowPos _nCurRow );
 
commit 0f22f933b940431c1ce5e55485ad3e11bca8d5a9
Author: Jürgen Schmidt <jsc at apache.org>
Date:   Mon Jun 11 07:45:42 2012 +0000

    Resolves: #i119403# GridControl not refreshing after deleting rows
    
    fix: take care of transparency attribute of the control
    
    Patch By: Tsutomu Uchino
    Found By: Wolfgang Becker
    Review By: jsc
    
    (cherry picked from commit 44f7914e0606caff822957b189a4459ccc5e2aad)
    
    Change-Id: I77c5339747aa5ad223b8c220f934627d0202d4cb

diff --git a/svtools/source/table/tablecontrol_impl.cxx b/svtools/source/table/tablecontrol_impl.cxx
index 5904805..d54cb3f 100644
--- a/svtools/source/table/tablecontrol_impl.cxx
+++ b/svtools/source/table/tablecontrol_impl.cxx
@@ -2162,7 +2162,8 @@ namespace svt { namespace table
         if ( i_lastRow == ROW_INVALID )
             aInvalidateRect.Bottom() = m_pDataWindow->GetOutputSizePixel().Height();
 
-        m_pDataWindow->Invalidate( aInvalidateRect );
+        m_pDataWindow->Invalidate( aInvalidateRect,
+            m_pDataWindow->GetControlBackground().GetTransparency() ? INVALIDATE_TRANSPARENT : 0 );
     }
 
     //------------------------------------------------------------------------------