1 files changed, 20 insertions, 20 deletions

diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx
index 2b2afb754054..d931547c13c0 100644
--- a/svtools/source/brwbox/brwbox2.cxx
+++ b/svtools/source/brwbox/brwbox2.cxx
@@ -139,7 +139,7 @@ void BrowseBox::StateChanged( StateChangedType nStateChange )
         HeaderBar* pHeaderBar = getDataWindow()->pHeaderBar;
         if ( pHeaderBar )
             pHeaderBar->EnableRTL( IsRTLEnabled() );
-        aHScroll.EnableRTL( IsRTLEnabled() );
+        aHScroll->EnableRTL( IsRTLEnabled() );
         if( pVScroll )
             pVScroll->EnableRTL( IsRTLEnabled() );
         Resize();
@@ -561,13 +561,13 @@ void BrowseBox::Resize()
     // did we need a horizontal scroll bar or is there a Control Area?
     if ( !getDataWindow()->bNoHScroll &&
          ( ( pCols->size() - FrozenColCount() ) > 1 ) )
-        aHScroll.Show();
+        aHScroll->Show();
     else
-        aHScroll.Hide();
+        aHScroll->Hide();
 
     // calculate the size of the data window
     long nDataHeight = GetOutputSizePixel().Height() - GetTitleHeight();
-    if ( aHScroll.IsVisible() || ( nControlAreaWidth != USHRT_MAX ) )
+    if ( aHScroll->IsVisible() || ( nControlAreaWidth != USHRT_MAX ) )
         nDataHeight -= nSBSize;
 
     long nDataWidth = GetOutputSizePixel().Width();
@@ -627,9 +627,9 @@ void BrowseBox::Paint( const Rectangle& rRect )
 
     // draw delimitational lines
     if ( !getDataWindow()->bNoHScroll )
-        DrawLine( Point( 0, aHScroll.GetPosPixel().Y() ),
+        DrawLine( Point( 0, aHScroll->GetPosPixel().Y() ),
                   Point( GetOutputSizePixel().Width(),
-                         aHScroll.GetPosPixel().Y() ) );
+                         aHScroll->GetPosPixel().Y() ) );
 
     if ( nTitleLines )
     {
@@ -1169,15 +1169,15 @@ void BrowseBox::UpdateScrollbars()
                         :   !getDataWindow()->bNoHScroll;
     if ( !bNeedsHScroll )
     {
-        if ( aHScroll.IsVisible() )
+        if ( aHScroll->IsVisible() )
         {
-            aHScroll.Hide();
+            aHScroll->Hide();
         }
         aDataWinSize.Height() = GetOutputSizePixel().Height() - GetTitleHeight();
         if ( nControlAreaWidth != USHRT_MAX )
             aDataWinSize.Height() -= nCornerSize;
     }
-    else if ( !aHScroll.IsVisible() )
+    else if ( !aHScroll->IsVisible() )
     {
         Size aNewSize( aDataWinSize );
         aNewSize.Height() = GetOutputSizePixel().Height() - GetTitleHeight() - nCornerSize;
@@ -1189,7 +1189,7 @@ void BrowseBox::UpdateScrollbars()
         ? 0
         : nControlAreaWidth;
 
-    aHScroll.SetPosSizePixel(
+    aHScroll->SetPosSizePixel(
         Point( nHScrX, GetOutputSizePixel().Height() - nCornerSize ),
         Size( aDataWinSize.Width() - nHScrX, nCornerSize ) );
 
@@ -1202,10 +1202,10 @@ void BrowseBox::UpdateScrollbars()
         : (short)( nLastCol - nFirstCol );
 
     short nRange = std::max( nScrollCols, (short)0 );
-    aHScroll.SetVisibleSize( nVisibleHSize );
-    aHScroll.SetRange( Range( 0, nRange ));
-    if ( bNeedsHScroll && !aHScroll.IsVisible() )
-        aHScroll.Show();
+    aHScroll->SetVisibleSize( nVisibleHSize );
+    aHScroll->SetRange( Range( 0, nRange ));
+    if ( bNeedsHScroll && !aHScroll->IsVisible() )
+        aHScroll->Show();
 
     // adjust position and height of vertical scrollbar
     pVScroll->SetPageSize( nMaxRows );
@@ -1237,12 +1237,12 @@ void BrowseBox::UpdateScrollbars()
     // needs corner-window?
     // (do that AFTER positioning BOTH scrollbars)
     sal_uLong nActualCorderWidth = 0;
-    if (aHScroll.IsVisible() && pVScroll && pVScroll->IsVisible() )
+    if (aHScroll->IsVisible() && pVScroll && pVScroll->IsVisible() )
     {
         // if we have both scrollbars, the corner window fills the point of intersection of these two
         nActualCorderWidth = nCornerSize;
     }
-    else if ( !aHScroll.IsVisible() && ( nControlAreaWidth != USHRT_MAX ) )
+    else if ( !aHScroll->IsVisible() && ( nControlAreaWidth != USHRT_MAX ) )
     {
         // if we have no horizontal scrollbar, but a control area, we need the corner window to
         // fill the space between the control are and the right border
@@ -1253,7 +1253,7 @@ void BrowseBox::UpdateScrollbars()
         if ( !getDataWindow()->pCornerWin )
             getDataWindow()->pCornerWin = new ScrollBarBox( this, 0 );
         getDataWindow()->pCornerWin->SetPosSizePixel(
-            Point( GetOutputSizePixel().Width() - nActualCorderWidth, aHScroll.GetPosPixel().Y() ),
+            Point( GetOutputSizePixel().Width() - nActualCorderWidth, aHScroll->GetPosPixel().Y() ),
             Size( nActualCorderWidth, nCornerSize ) );
         getDataWindow()->pCornerWin->Show();
     }
@@ -1371,8 +1371,8 @@ IMPL_LINK(BrowseBox,ScrollHdl,ScrollBar*,pBar)
         return 0;
     }
 
-    if ( pBar == &aHScroll )
-        ScrollColumns( aHScroll.GetDelta() );
+    if ( pBar == aHScroll.get() )
+        ScrollColumns( aHScroll->GetDelta() );
     if ( pBar == pVScroll )
         ScrollRows( pVScroll->GetDelta() );
 
@@ -2050,7 +2050,7 @@ Rectangle BrowseBox::calcTableRect(bool _bOnScreen)
     long nY = aRowBar.Top() - aRect.Top();
     Size aSize(aRect.GetSize());
 
-    return Rectangle(aRowBar.TopRight(), Size(aSize.A() - nX, aSize.B() - nY - aHScroll.GetSizePixel().Height()) );
+    return Rectangle(aRowBar.TopRight(), Size(aSize.A() - nX, aSize.B() - nY - aHScroll->GetSizePixel().Height()) );
 }
 
 Rectangle BrowseBox::GetFieldRectPixelAbs( sal_Int32 _nRowId, sal_uInt16 _nColId, bool /*_bIsHeader*/, bool _bOnScreen )