[Libreoffice-commits] .: 3 commits - toolkit/inc toolkit/source

[Libreoffice Gerrit user]

 toolkit/inc/toolkit/awt/scrollabledialog.hxx |    1 +
 toolkit/source/awt/scrollabledialog.cxx      |    3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 65d4139d14ebe9e05b0eb02cb278906e24f6cf20
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Sep 11 17:21:52 2012 +0200

    Missing "this->" qualification
    
    Change-Id: I341e73bd2d8a240c4e31916393729efba8d9a4e2

diff --git a/toolkit/source/awt/scrollabledialog.cxx b/toolkit/source/awt/scrollabledialog.cxx
index 012f4a2..88b0d7d 100644
--- a/toolkit/source/awt/scrollabledialog.cxx
+++ b/toolkit/source/awt/scrollabledialog.cxx
@@ -51,7 +51,7 @@ void ScrollableWrapper<T>::setScrollVisibility( ScrollBarVisibility rVisState )
         maVScrollBar.Show();
     }
     if ( mbHasHoriBar || mbHasVertBar )
-        SetStyle( T::GetStyle() | WB_CLIPCHILDREN | SCROLL_UPDATE );
+        this->SetStyle( T::GetStyle() | WB_CLIPCHILDREN | SCROLL_UPDATE );
 }
 
 template< class T>
commit fc2d90bf8d359367a6b2ecb3409f3b80e212c46a
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Sep 11 17:20:25 2012 +0200

    -Werror=unused-but-set-variable
    
    Change-Id: I66c577b3d22a64a09412bd18a46d8d45eb6d1142

diff --git a/toolkit/source/awt/scrollabledialog.cxx b/toolkit/source/awt/scrollabledialog.cxx
index 1b35e8e..012f4a2 100644
--- a/toolkit/source/awt/scrollabledialog.cxx
+++ b/toolkit/source/awt/scrollabledialog.cxx
@@ -18,7 +18,6 @@ ScrollableWrapper<T>::ScrollableWrapper( Window* pParent, WinBits nStyle ) : T(
     maVScrollBar.SetScrollHdl( aLink );
     maHScrollBar.SetScrollHdl( aLink );
 
-    Size aOutSz = T::GetOutputSizePixel();
     ScrollBarVisibility aVis = None;
 
     if ( nStyle & ( WB_AUTOHSCROLL | WB_AUTOVSCROLL ) )
commit 01c8bdf8b1193eade521ff3991b6af310ffda8b7
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Sep 11 17:19:26 2012 +0200

    -Werror=non-virtual-dtor
    
    Change-Id: Icf2b94ba307c1e355ef035dbe9a70c9a650f75c9

diff --git a/toolkit/inc/toolkit/awt/scrollabledialog.hxx b/toolkit/inc/toolkit/awt/scrollabledialog.hxx
index 19b0ab0..5044344 100644
--- a/toolkit/inc/toolkit/awt/scrollabledialog.hxx
+++ b/toolkit/inc/toolkit/awt/scrollabledialog.hxx
@@ -37,6 +37,7 @@ namespace toolkit
     class ScrollableInterface
     {
     public:
+        virtual ~ScrollableInterface() {}
         virtual void    SetScrollWidth( long nWidth ) = 0;
         virtual long    GetScrollWidth() = 0;
         virtual void    SetScrollHeight( long nHeight ) = 0;