summaryrefslogtreecommitdiff
path: root/svtools
diff options
context:
space:
mode:
authorElton Chung <elton@layerjet.com>2012-02-05 15:58:18 +0800
committerIvan Timofeev <timofeev.i.s@gmail.com>2012-02-05 18:21:07 +0400
commite99c70d2687ec6768070bc3ed7ee73ed9bbad196 (patch)
tree2e9114612a3cd4f10a13f51189c538c9e9b81391 /svtools
parentba5a460bc15393cc64522f288b7b2b678d6fcc99 (diff)
Remove unused code
Diffstat (limited to 'svtools')
-rw-r--r--svtools/inc/svtools/scrwin.hxx9
-rw-r--r--svtools/source/control/scrwin.cxx72
2 files changed, 1 insertions, 80 deletions
diff --git a/svtools/inc/svtools/scrwin.hxx b/svtools/inc/svtools/scrwin.hxx
index f81b60d446de..f38ec0161464 100644
--- a/svtools/inc/svtools/scrwin.hxx
+++ b/svtools/inc/svtools/scrwin.hxx
@@ -75,8 +75,6 @@ private:
public:
ScrollableWindow( Window* pParent, WinBits nBits = 0,
ScrollableWindowFlags = SCRWIN_DEFAULT );
- ScrollableWindow( Window* pParent, const ResId& rId,
- ScrollableWindowFlags = SCRWIN_DEFAULT );
virtual void Resize();
virtual void Command( const CommandEvent& rCEvt );
@@ -92,16 +90,11 @@ public:
void SetTotalSize( const Size& rNewSize );
Size GetTotalSize() { return PixelToLogic( aTotPixSz ); }
- void SetVisibleSize( const Size& rNewSize );
- sal_Bool MakeVisible( const Rectangle& rTarget, sal_Bool bSloppy = sal_False );
+ sal_Bool MakeVisible( const Rectangle& rTarget, sal_Bool bSloppy = sal_False );
Rectangle GetVisibleArea() const;
- void SetLineSize( sal_uLong nHorz, sal_uLong nVert );
using Window::Scroll;
virtual void Scroll( long nDeltaX, long nDeltaY, sal_uInt16 nFlags = 0 );
- void ScrollLines( long nLinesX, long nLinesY );
- void ScrollPages( long nPagesX, sal_uLong nOverlapX,
- long nPagesY, sal_uLong nOverlapY );
private:
SVT_DLLPRIVATE Size GetOutputSizePixel() const;
diff --git a/svtools/source/control/scrwin.cxx b/svtools/source/control/scrwin.cxx
index e14e0670a437..a60833b5a2fb 100644
--- a/svtools/source/control/scrwin.cxx
+++ b/svtools/source/control/scrwin.cxx
@@ -60,18 +60,6 @@ ScrollableWindow::ScrollableWindow( Window* pParent, WinBits nBits,
ImpInitialize( nFlags );
}
-//-------------------------------------------------------------------
-
-ScrollableWindow::ScrollableWindow( Window* pParent, const ResId& rId,
- ScrollableWindowFlags nFlags ) :
- Window( pParent, rId ),
- aVScroll( this, WinBits(WB_VSCROLL | WB_DRAG) ),
- aHScroll( this, WinBits(WB_HSCROLL | WB_DRAG) ),
- aCornerWin( this )
-{
- ImpInitialize( nFlags );
-}
-
// -----------------------------------------------------------------------
void ScrollableWindow::Command( const CommandEvent& rCEvt )
@@ -341,37 +329,6 @@ void ScrollableWindow::SetTotalSize( const Size& rNewSize )
//-------------------------------------------------------------------
-void ScrollableWindow::SetVisibleSize( const Size& rNewSize )
-{
- // get the rectangle, we wish to view
- Rectangle aWish( Point(0, 0), LogicToPixel(rNewSize) );
-
- // get maximum rectangle for us from our parent-window (subst our border!)
- Rectangle aMax( Point(0, 0), GetParent()->GetOutputSizePixel() );
- aMax.Left() -= ( Window::GetSizePixel().Width() -
- Window::GetOutputSizePixel().Width() );
- aMax.Bottom() -= (Window::GetSizePixel().Height() -
- Window::GetOutputSizePixel().Height());
-
- Size aWill( aWish.GetIntersection(aMax).GetSize() );
- sal_Bool bHScroll = sal_False;
- const long nScrSize = GetSettings().GetStyleSettings().GetScrollBarSize();
- if ( aWill.Width() < aWish.GetSize().Width() )
- { bHScroll = sal_True;
- aWill.Height() =
- Min( aWill.Height()+nScrSize, aMax.GetSize().Height() );
- }
- if ( aWill.Height() < aWish.GetSize().Height() )
- aWill.Width() =
- Min( aWill.Width()+nScrSize, aMax.GetSize().Width() );
- if ( !bHScroll && (aWill.Width() < aWish.GetSize().Width()) )
- aWill.Height() =
- Min( aWill.Height()+nScrSize, aMax.GetSize().Height() );
- Window::SetOutputSizePixel( aWill );
-}
-
-//-------------------------------------------------------------------
-
sal_Bool ScrollableWindow::MakeVisible( const Rectangle& rTarget, sal_Bool bSloppy )
{
Rectangle aTarget;
@@ -464,17 +421,6 @@ Rectangle ScrollableWindow::GetVisibleArea() const
//-------------------------------------------------------------------
-void ScrollableWindow::SetLineSize( sal_uLong nHorz, sal_uLong nVert )
-{
- Size aPixSz( LogicToPixel( Size(nHorz, nVert) ) );
- nColumnPixW = aPixSz.Width();
- nLinePixH = aPixSz.Height();
- aVScroll.SetLineSize( nLinePixH );
- aHScroll.SetLineSize( nColumnPixW );
-}
-
-//-------------------------------------------------------------------
-
void ScrollableWindow::Scroll( long nDeltaX, long nDeltaY, sal_uInt16 )
{
if ( !bScrolling )
@@ -550,23 +496,5 @@ void ScrollableWindow::Scroll( long nDeltaX, long nDeltaY, sal_uInt16 )
}
}
-//-------------------------------------------------------------------
-
-void ScrollableWindow::ScrollLines( long nLinesX, long nLinesY )
-{
- Size aDelta( PixelToLogic( Size( nColumnPixW, nLinePixH ) ) );
- Scroll( aDelta.Width()*nLinesX, aDelta.Height()*nLinesY );
-}
-
-//-------------------------------------------------------------------
-
-void ScrollableWindow::ScrollPages( long nPagesX, sal_uLong nOverlapX,
- long nPagesY, sal_uLong nOverlapY )
-{
- Size aOutSz( GetVisibleArea().GetSize() );
- Scroll( nPagesX * aOutSz.Width() + (nPagesX>0 ? 1 : -1) * nOverlapX,
- nPagesY * aOutSz.Height() + (nPagesY>0 ? 1 : -1) * nOverlapY );
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */