[Libreoffice-commits] .: Branch 'libreoffice-3-5' - svtools/source

Michael Meeks michael at kemper.freedesktop.org
Wed May 9 04:07:32 PDT 2012


 svtools/source/contnr/svimpbox.cxx |   10 ----------
 1 file changed, 10 deletions(-)

New commits:
commit f78b1646551543202a11a1e758f6c00a04ecdbdc
Author: Ivan Timofeev <timofeev.i.s at gmail.com>
Date:   Mon May 7 22:31:34 2012 +0400

    Revert "Set the listbox height to an integer multiple of the listbox entry...
    
    This reverts commit 16c9d63da67897e51960f3684d8d05b06f2c8f81.
    
    Conflicts:
    
    	svtools/source/contnr/svimpbox.cxx
    
    Change-Id: I8e030e3b85fbf31d8369646e55048b830a83486e
    Signed-off-by: Michael Meeks <michael.meeks at suse.com>

diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx
index 603730f..2c9066d 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -1355,18 +1355,8 @@ void SvImpLBox::InitScrollBarBox()
 void SvImpLBox::Resize()
 {
     Size aSize( pView->Control::GetOutputSizePixel());
-    long nEntryHeight = pView->GetEntryHeight();
-
     if( aSize.Width() <= 0 || aSize.Height() <= 0 )
         return;
-    if( nEntryHeight )
-    {
-      // Set the view height to an integer multiple of the entry height.
-      int nEntryCount = (int) aSize.Height() / nEntryHeight;
-      aSize.Height() = pView->GetEntryHeight() * nEntryCount;
-      pView->Control::SetOutputSizePixel( aSize );
-    }
-
     nFlags |= F_IN_RESIZE;
     InitScrollBarBox();
 


More information about the Libreoffice-commits mailing list