[Libreoffice-commits] .: sfx2/inc sfx2/source

[Libreoffice Gerrit user]

 sfx2/inc/sfx2/thumbnailview.hxx       |   10 ----------
 sfx2/source/control/thumbnailview.cxx |   13 -------------
 2 files changed, 23 deletions(-)

New commits:
commit 21a4d3cafa0f959613991b0b6777c58557ec56c1
Author: Rafael Dominguez <venccsralph at gmail.com>
Date:   Tue Aug 21 00:10:09 2012 -0430

    Remove unused attributes from ThumbnailView class.
    
    Change-Id: I4cb95d4f2f11eed332067e332bd9dfd95d119ce9

diff --git a/sfx2/inc/sfx2/thumbnailview.hxx b/sfx2/inc/sfx2/thumbnailview.hxx
index 6f0978d..a42b805 100644
--- a/sfx2/inc/sfx2/thumbnailview.hxx
+++ b/sfx2/inc/sfx2/thumbnailview.hxx
@@ -195,10 +195,6 @@ public:
 
     sal_uInt16 GetItemId( const Point& rPos ) const;
 
-    sal_uInt16 GetColCount() const { return mnUserCols; }
-
-    sal_uInt16 GetLineCount() const { return mnUserVisLines; }
-
     long GetItemWidth() const { return mnItemWidth; }
 
     long GetItemHeight() const { return mnItemHeight; }
@@ -319,7 +315,6 @@ protected:
 
 protected:
 
-    Timer maTimer;
     ValueItemList mItemList;
     ScrollBar* mpScrBar;
     Rectangle maItemListRect;
@@ -331,15 +326,10 @@ protected:
     long mnDisplayHeight;       // Height of the data display box (name, etc)
     long mnVisLines;
     long mnLines;
-    long mnUserItemWidth;
-    long mnUserItemHeight;
     sal_uInt16 mnScrBarOffset;
     sal_uInt16 mnSelItemId;
     sal_uInt16 mnHighItemId;
     sal_uInt16 mnCols;
-    sal_uInt16 mnCurCol;
-    sal_uInt16 mnUserCols;
-    sal_uInt16 mnUserVisLines;
     sal_uInt16 mnFirstLine;
     sal_uInt16 mnSpacing;
     bool mbScroll : 1;
diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx
index ff1b61e..6e221bb 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -89,16 +89,11 @@ void ThumbnailView::ImplInit()
     mnItemPadding = 0;
     mnVisLines          = 0;
     mnLines             = 0;
-    mnUserItemWidth     = 0;
-    mnUserItemHeight    = 0;
     mnFirstLine         = 0;
     mnScrBarOffset = 1;
     mnSelItemId         = 0;
     mnHighItemId        = 0;
     mnCols              = 0;
-    mnCurCol            = 0;
-    mnUserCols          = 0;
-    mnUserVisLines      = 0;
     mnSpacing           = 0;
     mbScroll            = false;
     mbHasVisibleItems   = false;
@@ -258,15 +253,9 @@ void ThumbnailView::CalculateItemPositions ()
     if (!mnCols)
         mnCols = 1;
 
-    if ( mnUserCols && mnUserCols < mnCols )
-        mnCols = mnUserCols;
-
     // calculate maximum number of visible rows
     mnVisLines = (sal_uInt16)((aWinSize.Height()-mnHeaderHeight) / (mnItemHeight));
 
-    if ( mnUserVisLines && mnUserVisLines < mnVisLines )
-        mnVisLines = mnUserVisLines;
-
     // calculate empty space
     long nHSpace = aWinSize.Width()-nScrBarWidth - mnCols*mnItemWidth;
     long nVSpace = aWinSize.Height()-mnHeaderHeight - mnVisLines*mnItemHeight;
@@ -848,7 +837,6 @@ void ThumbnailView::RemoveItem( sal_uInt16 nItemId )
     // reset variables
     if ( (mnHighItemId == nItemId) || (mnSelItemId == nItemId) )
     {
-        mnCurCol        = 0;
         mnHighItemId    = 0;
         mnSelItemId     = 0;
     }
@@ -865,7 +853,6 @@ void ThumbnailView::Clear()
 
     // reset variables
     mnFirstLine     = 0;
-    mnCurCol        = 0;
     mnHighItemId    = 0;
     mnSelItemId     = 0;