SOME BROKEN FOO

Change-Id: I37b7dc860c7fd2272724eb58345a7ab4391fba34

sc/source/ui/dbgui/sortkeydlg.cxx

@@ -111,7 +111,7 @@ ScSortKeyCtrl::ScSortKeyCtrl(SfxTabPage* pParent, ScSortKeyItems& rItems)
     , m_rVertScroll(m_rScrolledWindow.getVertScrollBar())
 {
     m_rVertScroll.EnableDrag();
-    m_rVertScroll.Show();
+    m_rVertScroll.Show(m_rScrolledWindow.GetStyle() & WB_VSCROLL);
 
     m_rVertScroll.SetRangeMin( 0 );
     m_rVertScroll.SetVisibleSize( 0xFFFF );
@@ -120,6 +120,19 @@ ScSortKeyCtrl::ScSortKeyCtrl(SfxTabPage* pParent, ScSortKeyItems& rItems)
     m_rVertScroll.SetScrollHdl( aScrollLink );
 }
 
+void ScSortKeyCtrl::checkAutoVScroll()
+{
+    WinBits nBits = m_rScrolledWindow.GetStyle();
+    if (nBits & WB_VSCROLL)
+        return;
+    if (nBits & WB_AUTOVSCROLL)
+    {
+        bool bShow = m_rVertScroll.GetRangeMax() > m_rVertScroll.GetVisibleSize();
+        if (bShow != m_rVertScroll.IsVisible())
+            m_rVertScroll.Show(bShow);
+    }
+}
+
 void ScSortKeyCtrl::setScrollRange()
 {
     sal_Int32 nScrollOffset = m_aSortWin.GetItemHeight();
@@ -127,6 +140,7 @@ void ScSortKeyCtrl::setScrollRange()
     m_rVertScroll.SetPageSize( nVisibleItems - 1 );
     m_rVertScroll.SetVisibleSize( nVisibleItems );
     m_rVertScroll.Scroll();
+    checkAutoVScroll();
 }
 
 // -----------------------------------------------------------------------
@@ -146,6 +160,7 @@ void ScSortKeyCtrl::AddSortKey( sal_uInt16 nItem )
     m_rVertScroll.SetRangeMax( nItem );
     m_rVertScroll.DoScroll( nItem );
     m_aSortWin.AddSortKey( nItem );
+    checkAutoVScroll();
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

sc/source/ui/inc/sortkeydlg.hxx

@@ -94,6 +94,8 @@ private:
 
     DECL_LINK(ScrollHdl, ScrollBar*);
 
+    void checkAutoVScroll();
+
 public:
     ScSortKeyCtrl(SfxTabPage* pParent, ScSortKeyItems& mrSortKeyItems);
     void setScrollRange();