From efa55cfd745843990503dea40995e78907611c6e Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Sat, 23 Jun 2012 22:40:33 +0100 Subject: callcatcher: update unused code Change-Id: I65c19a21ae9b6deb1601adf2f3fe8fe8faa7e9ed --- vcl/inc/vcl/syschild.hxx | 1 - vcl/inc/vcl/toolbox.hxx | 3 -- vcl/source/window/syschild.cxx | 14 ------- vcl/source/window/toolbox.cxx | 95 ------------------------------------------ 4 files changed, 113 deletions(-) (limited to 'vcl') diff --git a/vcl/inc/vcl/syschild.hxx b/vcl/inc/vcl/syschild.hxx index 6dacf76c10a1..6cbc417a0180 100644 --- a/vcl/inc/vcl/syschild.hxx +++ b/vcl/inc/vcl/syschild.hxx @@ -55,7 +55,6 @@ public: SystemChildWindow( Window* pParent, WinBits nStyle = 0 ); // create a SystemChildWindow using the given SystemWindowData SystemChildWindow( Window* pParent, WinBits nStyle, SystemWindowData *pData, sal_Bool bShow = sal_True ); - SystemChildWindow( Window* pParent, const ResId& rResId ); ~SystemChildWindow(); const SystemEnvData* GetSystemData() const; diff --git a/vcl/inc/vcl/toolbox.hxx b/vcl/inc/vcl/toolbox.hxx index d812dfc9ac6d..c35c6a968f86 100644 --- a/vcl/inc/vcl/toolbox.hxx +++ b/vcl/inc/vcl/toolbox.hxx @@ -331,9 +331,6 @@ public: static SAL_DLLPRIVATE void ImplLineSizing( ToolBox* pThis, const Point& rPos, Rectangle& rRect, sal_uInt16 nLineMode ); static SAL_DLLPRIVATE sal_uInt16 ImplFindItemPos( ToolBox* pBox, const Point& rPos ); static SAL_DLLPRIVATE sal_uInt16 ImplFindItemPos( const ImplToolItem* pItem, const std::vector< ImplToolItem >& rList ); - static SAL_DLLPRIVATE void ImplDrawToolArrow( ToolBox* pBox, long nX, long nY, sal_Bool bBlack, sal_Bool bColTransform, - sal_Bool bLeft = sal_False, sal_Bool bTop = sal_False, - long nSize = 6 ); static SAL_DLLPRIVATE void ImplDrawMenubutton( ToolBox *pThis, sal_Bool bHighlight ); static SAL_DLLPRIVATE sal_uInt16 ImplCountLineBreaks( const ToolBox *pThis ); SAL_DLLPRIVATE ImplToolBoxPrivateData* ImplGetToolBoxPrivateData() const { return mpData; } diff --git a/vcl/source/window/syschild.cxx b/vcl/source/window/syschild.cxx index 752bf43009bc..4022f2cefd7f 100644 --- a/vcl/source/window/syschild.cxx +++ b/vcl/source/window/syschild.cxx @@ -152,20 +152,6 @@ SystemChildWindow::SystemChildWindow( Window* pParent, WinBits nStyle, SystemWin // ----------------------------------------------------------------------- -SystemChildWindow::SystemChildWindow( Window* pParent, const ResId& rResId ) : - Window( WINDOW_SYSTEMCHILDWINDOW ) -{ - rResId.SetRT( RSC_WINDOW ); - WinBits nStyle = ImplInitRes( rResId ); - ImplInitSysChild( pParent, nStyle, NULL ); - ImplLoadRes( rResId ); - - if ( !(nStyle & WB_HIDE) ) - Show(); -} - -// ----------------------------------------------------------------------- - SystemChildWindow::~SystemChildWindow() { Hide(); diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index 5ddafaf769dd..be3ddb296207 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -2924,101 +2924,6 @@ static void ImplDrawDropdownArrow( ToolBox *pBox, const Rectangle& rDropDownRect pBox->SetLineColor( ); } -void ToolBox::ImplDrawToolArrow( ToolBox* pBox, long nX, long nY, sal_Bool bBlack, sal_Bool bColTransform, - sal_Bool bLeft, sal_Bool bTop, long nSize ) -{ - Color aOldFillColor = pBox->GetFillColor(); - WindowAlign eAlign = pBox->meAlign; - long n = 0; - long nHalfSize; - if ( bLeft ) - eAlign = WINDOWALIGN_RIGHT; - else if ( bTop ) - eAlign = WINDOWALIGN_BOTTOM; - - nHalfSize = nSize/2; - - switch ( eAlign ) - { - case WINDOWALIGN_LEFT: - if ( bBlack ) - pBox->SetFillColor( Color( bColTransform ? COL_WHITE : COL_BLACK ) ); - while ( n <= nHalfSize ) - { - pBox->DrawRect( Rectangle( nX+n, nY+n, nX+n, nY+nSize-n ) ); - n++; - } - if ( bBlack ) - { - pBox->SetFillColor( aOldFillColor ); - n = 1; - while ( n < nHalfSize ) - { - pBox->DrawRect( Rectangle( nX+n, nY+1+n, nX+n, nY+nSize-1-n ) ); - n++; - } - } - break; - case WINDOWALIGN_TOP: - if ( bBlack ) - pBox->SetFillColor( Color( bColTransform ? COL_WHITE : COL_BLACK ) ); - while ( n <= nHalfSize ) - { - pBox->DrawRect( Rectangle( nX+n, nY+n, nX+nSize-n, nY+n ) ); - n++; - } - if ( bBlack ) - { - pBox->SetFillColor( aOldFillColor ); - n = 1; - while ( n < nHalfSize ) - { - pBox->DrawRect( Rectangle( nX+1+n, nY+n, nX+nSize-1-n, nY+n ) ); - n++; - } - } - break; - case WINDOWALIGN_RIGHT: - if ( bBlack ) - pBox->SetFillColor( Color( bColTransform ? COL_WHITE : COL_BLACK ) ); - while ( n <= nHalfSize ) - { - pBox->DrawRect( Rectangle( nX+nHalfSize-n, nY+n, nX+nHalfSize-n, nY+nSize-n ) ); - n++; - } - if ( bBlack ) - { - pBox->SetFillColor( aOldFillColor ); - n = 1; - while ( n < nHalfSize ) - { - pBox->DrawRect( Rectangle( nX+nHalfSize-n, nY+1+n, nX+nHalfSize-n, nY+nSize-1-n ) ); - n++; - } - } - break; - case WINDOWALIGN_BOTTOM: - if ( bBlack ) - pBox->SetFillColor( Color( bColTransform ? COL_WHITE : COL_BLACK ) ); - while ( n <= nHalfSize ) - { - pBox->DrawRect( Rectangle( nX+n, nY+nHalfSize-n, nX+nSize-n, nY+nHalfSize-n ) ); - n++; - } - if ( bBlack ) - { - pBox->SetFillColor( aOldFillColor ); - n = 1; - while ( n < nHalfSize ) - { - pBox->DrawRect( Rectangle( nX+1+n, nY+nHalfSize-n, nX+nSize-1-n, nY+nHalfSize-n ) ); - n++; - } - } - break; - } -} - // ----------------------------------------------------------------------- void ToolBox::ImplDrawMenubutton( ToolBox *pThis, sal_Bool bHighlight ) -- cgit