From 0c181a33c9bdcaad9ee2d354ebed9c780120851d Mon Sep 17 00:00:00 2001 From: August Sodora Date: Thu, 22 Dec 2011 15:47:08 -0500 Subject: callcatcher: Remove unused code --- vcl/source/control/combobox.cxx | 7 --- vcl/source/control/ctrl.cxx | 9 --- vcl/source/control/field.cxx | 41 +------------ vcl/source/control/field2.cxx | 63 -------------------- vcl/source/control/fixbrd.cxx | 43 +------------- vcl/source/control/ilstbox.cxx | 7 --- vcl/source/control/longcurr.cxx | 129 +--------------------------------------- vcl/source/gdi/animate.cxx | 18 +----- vcl/source/gdi/bmpacc3.cxx | 19 ------ vcl/source/gdi/image.cxx | 44 -------------- vcl/source/gdi/regband.cxx | 32 ---------- vcl/source/window/brdwin.cxx | 18 ------ vcl/source/window/introwin.cxx | 9 --- 13 files changed, 5 insertions(+), 434 deletions(-) (limited to 'vcl/source') diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx index 721b96d8603d..1333c1aaa45d 100644 --- a/vcl/source/control/combobox.cxx +++ b/vcl/source/control/combobox.cxx @@ -1390,13 +1390,6 @@ void* ComboBox::GetEntryData( sal_uInt16 nPos ) const // ----------------------------------------------------------------------- -void ComboBox::SetTopEntry( sal_uInt16 nPos ) -{ - mpImplLB->SetTopEntry( nPos + mpImplLB->GetEntryList()->GetMRUCount() ); -} - -// ----------------------------------------------------------------------- - sal_uInt16 ComboBox::GetTopEntry() const { sal_uInt16 nPos = GetEntryCount() ? mpImplLB->GetTopEntry() : LISTBOX_ENTRY_NOTFOUND; diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx index 1b2a6d5c855e..3b9c524c6f1b 100644 --- a/vcl/source/control/ctrl.cxx +++ b/vcl/source/control/ctrl.cxx @@ -202,15 +202,6 @@ long ControlLayoutData::GetLineCount() const // ----------------------------------------------------------------------- -long Control::GetLineCount() const -{ - if( !HasLayoutData() ) - FillLayoutData(); - return mpControlData->mpLayoutData ? mpControlData->mpLayoutData->GetLineCount() : 0; -} - -// ----------------------------------------------------------------------- - Pair ControlLayoutData::GetLineStartEnd( long nLine ) const { Pair aPair( -1, -1 ); diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx index b943938813fd..49bd3d92f1e2 100644 --- a/vcl/source/control/field.cxx +++ b/vcl/source/control/field.cxx @@ -2160,17 +2160,9 @@ CurrencyFormatter::~CurrencyFormatter() // ----------------------------------------------------------------------- -void CurrencyFormatter::SetCurrencySymbol( const String& rStr ) -{ - maCurrencySymbol= rStr; - ReformatAll(); -} - -// ----------------------------------------------------------------------- - String CurrencyFormatter::GetCurrencySymbol() const { - return maCurrencySymbol.Len() ? maCurrencySymbol : ImplGetLocaleDataWrapper().getCurrSymbol(); + return ImplGetLocaleDataWrapper().getCurrSymbol(); } // ----------------------------------------------------------------------- @@ -2245,21 +2237,6 @@ CurrencyField::CurrencyField( Window* pParent, WinBits nWinStyle ) : // ----------------------------------------------------------------------- -CurrencyField::CurrencyField( Window* pParent, const ResId& rResId ) : - SpinField( WINDOW_CURRENCYFIELD ) -{ - rResId.SetRT( RSC_CURRENCYFIELD ); - WinBits nStyle = ImplInitRes( rResId ); - SpinField::ImplInit( pParent, nStyle); - SetField( this ); - ImplLoadRes( rResId ); - - if ( !(nStyle & WB_HIDE ) ) - Show(); -} - -// ----------------------------------------------------------------------- - void CurrencyField::ImplLoadRes( const ResId& rResId ) { SpinField::ImplLoadRes( rResId ); @@ -2461,22 +2438,6 @@ void CurrencyBox::ReformatAll() // ----------------------------------------------------------------------- -sal_Int64 CurrencyBox::GetValue( sal_uInt16 nPos ) const -{ - double nValue = 0; - ImplCurrencyGetValue( ComboBox::GetEntry( nPos ), nValue, GetDecimalDigits(), ImplGetLocaleDataWrapper() ); - return (sal_Int64)nValue; -} - -// ----------------------------------------------------------------------- - -sal_uInt16 CurrencyBox::GetValuePos( sal_Int64 nValue ) const -{ - return ComboBox::GetEntryPos( CreateFieldText( nValue ) ); -} - -// ----------------------------------------------------------------------- - sal_Int64 CurrencyBox::GetValue() const { // Implementation not inline, because it is a virtual Function diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx index 59e0dbd956ef..b1c701ab5bf1 100644 --- a/vcl/source/control/field2.cxx +++ b/vcl/source/control/field2.cxx @@ -927,23 +927,6 @@ PatternField::PatternField( Window* pParent, WinBits nWinStyle ) : // ----------------------------------------------------------------------- -PatternField::PatternField( Window* pParent, const ResId& rResId ) : - SpinField( WINDOW_PATTERNFIELD ) -{ - rResId.SetRT( RSC_PATTERNFIELD ); - WinBits nStyle = ImplInitRes( rResId ); - ImplInit( pParent, nStyle ); - SetField( this ); - SpinField::ImplLoadRes( rResId ); - PatternFormatter::ImplLoadRes( ResId( (RSHEADER_TYPE *)GetClassRes(), *rResId.GetResMgr() ) ); - Reformat(); - - if ( !(nStyle & WB_HIDE ) ) - Show(); -} - -// ----------------------------------------------------------------------- - PatternField::~PatternField() { } @@ -1004,24 +987,6 @@ PatternBox::PatternBox( Window* pParent, WinBits nWinStyle ) : // ----------------------------------------------------------------------- -PatternBox::PatternBox( Window* pParent, const ResId& rResId ) : - ComboBox( WINDOW_PATTERNBOX ) -{ - rResId.SetRT( RSC_PATTERNBOX ); - WinBits nStyle = ImplInitRes( rResId ); - ImplInit( pParent, nStyle ); - - SetField( this ); - ComboBox::ImplLoadRes( rResId ); - PatternFormatter::ImplLoadRes( ResId( (RSHEADER_TYPE *)GetClassRes(), *rResId.GetResMgr() ) ); - Reformat(); - - if ( !(nStyle & WB_HIDE ) ) - Show(); -} - -// ----------------------------------------------------------------------- - PatternBox::~PatternBox() { } @@ -1088,34 +1053,6 @@ void PatternBox::ReformatAll() SetUpdateMode( sal_True ); } -// ----------------------------------------------------------------------- - -void PatternBox::InsertString( const XubString& rStr, sal_uInt16 nPos ) -{ - ComboBox::InsertEntry( ImplPatternReformat( rStr, GetEditMask(), GetLiteralMask(), GetFormatFlags() ), nPos ); -} - -// ----------------------------------------------------------------------- - -void PatternBox::RemoveString( const XubString& rStr ) -{ - ComboBox::RemoveEntry( ImplPatternReformat( rStr, GetEditMask(), GetLiteralMask(), GetFormatFlags() ) ); -} - -// ----------------------------------------------------------------------- - -XubString PatternBox::GetString( sal_uInt16 nPos ) const -{ - return ImplPatternReformat( ComboBox::GetEntry( nPos ), GetEditMask(), GetLiteralMask(), GetFormatFlags() ); -} - -// ----------------------------------------------------------------------- - -sal_uInt16 PatternBox::GetStringPos( const XubString& rStr ) const -{ - return ComboBox::GetEntryPos( ImplPatternReformat( rStr, GetEditMask(), GetLiteralMask(), GetFormatFlags() ) ); -} - // ======================================================================= static ExtDateFieldFormat ImplGetExtFormat( DateFormat eOld ) diff --git a/vcl/source/control/fixbrd.cxx b/vcl/source/control/fixbrd.cxx index 522ebdef8a78..fdf31f46467b 100644 --- a/vcl/source/control/fixbrd.cxx +++ b/vcl/source/control/fixbrd.cxx @@ -26,20 +26,12 @@ * ************************************************************************/ - #include #include #include - - -// ======================================================================= - void FixedBorder::ImplInit( Window* pParent, WinBits nStyle ) { - mnType = FIXEDBORDER_TYPE_DOUBLEOUT; - mbTransparent = sal_True; - nStyle = ImplInitStyle( nStyle ); Control::ImplInit( pParent, nStyle, NULL ); ImplInitSettings(); @@ -61,7 +53,7 @@ void FixedBorder::ImplInitSettings() Window* pParent = GetParent(); if ( (pParent->IsChildTransparentModeEnabled() || !(pParent->GetStyle() & WB_CLIPCHILDREN) ) && - !IsControlBackground() && mbTransparent ) + !IsControlBackground() ) { SetMouseTransparent( sal_True ); EnableChildTransparentMode( sal_True ); @@ -85,14 +77,6 @@ void FixedBorder::ImplInitSettings() // ----------------------------------------------------------------------- -FixedBorder::FixedBorder( Window* pParent, WinBits nStyle ) : - Control( WINDOW_FIXEDBORDER ) -{ - ImplInit( pParent, nStyle ); -} - -// ----------------------------------------------------------------------- - FixedBorder::FixedBorder( Window* pParent, const ResId& rResId ) : Control( WINDOW_FIXEDBORDER ) { @@ -118,7 +102,7 @@ void FixedBorder::ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, { const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); Rectangle aRect( rPos, rSize ); - sal_uInt16 nBorderStyle = mnType; + sal_uInt16 nBorderStyle = FIXEDBORDER_TYPE_DOUBLEOUT; if ( (nDrawFlags & WINDOW_DRAW_MONO) || (rStyleSettings.GetOptions() & STYLE_OPTION_MONO) ) @@ -209,27 +193,4 @@ void FixedBorder::DataChanged( const DataChangedEvent& rDCEvt ) } } -// ----------------------------------------------------------------------- - -void FixedBorder::SetTransparent( sal_Bool bTransparent ) -{ - if ( mbTransparent != bTransparent ) - { - mbTransparent = bTransparent; - ImplInitSettings(); - Invalidate(); - } -} - -// ----------------------------------------------------------------------- - -void FixedBorder::SetBorderType( sal_uInt16 nType ) -{ - if ( mnType != nType ) - { - mnType = nType; - Invalidate(); - } -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx index 01524fef6ad1..b5396e2ff5b2 100644 --- a/vcl/source/control/ilstbox.cxx +++ b/vcl/source/control/ilstbox.cxx @@ -2345,13 +2345,6 @@ void ImplListBox::SetEntryFlags( sal_uInt16 nPos, long nFlags ) // ----------------------------------------------------------------------- -long ImplListBox::GetEntryFlags( sal_uInt16 nPos ) const -{ - return maLBWindow.GetEntryList()->GetEntryFlags( nPos ); -} - -// ----------------------------------------------------------------------- - void ImplListBox::SelectEntry( sal_uInt16 nPos, sal_Bool bSelect ) { maLBWindow.SelectEntry( nPos, bSelect ); diff --git a/vcl/source/control/longcurr.cxx b/vcl/source/control/longcurr.cxx index b7f88160c14d..6407f480f913 100644 --- a/vcl/source/control/longcurr.cxx +++ b/vcl/source/control/longcurr.cxx @@ -530,45 +530,6 @@ sal_uInt16 LongCurrencyFormatter::GetDecimalDigits() const return mnDecimalDigits; } -// ----------------------------------------------------------------------- - -sal_Bool LongCurrencyFormatter::IsValueModified() const -{ - if ( ImplGetEmptyFieldValue() ) - return !IsEmptyValue(); - else if ( GetValue() != mnFieldValue ) - return sal_True; - else - return sal_False; -} - -// ----------------------------------------------------------------------- - -void LongCurrencyFormatter::SetEmptyValue() -{ - GetField()->SetText( ImplGetSVEmptyStr() ); - SetEmptyFieldValueData( sal_True ); -} - -// ----------------------------------------------------------------------- - -BigInt LongCurrencyFormatter::Normalize( BigInt nValue ) const -{ - return (nValue * ImplPower10( GetDecimalDigits() ) ); -} - -// ----------------------------------------------------------------------- - -BigInt LongCurrencyFormatter::Denormalize( BigInt nValue ) const -{ - BigInt nFactor = ImplPower10( GetDecimalDigits() ); - BigInt nTmp = nFactor; - nTmp /= 2; - nTmp += nValue; - nTmp /= nFactor; - return nTmp; -} - // ======================================================================= void ImplNewLongCurrencyFieldValue( LongCurrencyField* pField, BigInt nNewValue ) @@ -608,44 +569,6 @@ LongCurrencyField::LongCurrencyField( Window* pParent, WinBits nWinStyle ) : // ----------------------------------------------------------------------- -LongCurrencyField::LongCurrencyField( Window* pParent, const ResId& rResId ) : - SpinField( WINDOW_NUMERICFIELD ) -{ - rResId.SetRT( RSC_NUMERICFIELD ); - WinBits nStyle = ImplInitRes( rResId ) ; - SpinField::ImplInit( pParent, nStyle ); - - SetField( this ); - mnSpinSize = 1; - mnFirst = mnMin; - mnLast = mnMax; - - Reformat(); - - if ( !(nStyle & WB_HIDE) ) - Show(); -} - -// ----------------------------------------------------------------------- - -void LongCurrencyField::ImplLoadRes( const ResId& rResId ) -{ - SpinField::ImplLoadRes( rResId ); - LongCurrencyFormatter::ImplLoadRes( ResId( (RSHEADER_TYPE *)GetClassRes(), *rResId.GetResMgr() ) ); - - sal_uLong nMask = ReadLongRes(); - if ( CURRENCYFIELD_FIRST & nMask ) - mnFirst = ReadLongRes(); - - if ( CURRENCYFIELD_LAST & nMask ) - mnLast = ReadLongRes(); - - if ( CURRENCYFIELD_SPINSIZE & nMask ) - mnSpinSize = ReadLongRes(); -} - -// ----------------------------------------------------------------------- - LongCurrencyField::~LongCurrencyField() { } @@ -732,7 +655,7 @@ void LongCurrencyField::Last() } // ======================================================================= - + LongCurrencyBox::LongCurrencyBox( Window* pParent, WinBits nWinStyle ) : ComboBox( pParent, nWinStyle ) { @@ -742,22 +665,6 @@ LongCurrencyBox::LongCurrencyBox( Window* pParent, WinBits nWinStyle ) : // ----------------------------------------------------------------------- -LongCurrencyBox::LongCurrencyBox( Window* pParent, const ResId& rResId ) : - ComboBox( WINDOW_NUMERICFIELD ) -{ - SetField( this ); - WinBits nStyle = ImplInitRes( rResId ) ; - ComboBox::ImplLoadRes( rResId ); - ImplInit( pParent, nStyle ); - LongCurrencyFormatter::ImplLoadRes( rResId ); - Reformat(); - - if ( !(nStyle & WB_HIDE) ) - Show(); -} - -// ----------------------------------------------------------------------- - LongCurrencyBox::~LongCurrencyBox() { } @@ -820,40 +727,6 @@ void LongCurrencyBox::ReformatAll() SetUpdateMode( sal_True ); } -// ----------------------------------------------------------------------- - -void LongCurrencyBox::InsertValue( BigInt nValue, sal_uInt16 nPos ) -{ - XubString aStr = ImplGetCurr( GetLocaleDataWrapper(), nValue, GetDecimalDigits(), GetCurrencySymbol(), IsUseThousandSep() ); - ComboBox::InsertEntry( aStr, nPos ); -} - -// ----------------------------------------------------------------------- - -void LongCurrencyBox::RemoveValue( BigInt nValue ) -{ - XubString aStr = ImplGetCurr( GetLocaleDataWrapper(), nValue, GetDecimalDigits(), GetCurrencySymbol(), IsUseThousandSep() ); - ComboBox::RemoveEntry( aStr ); -} - -// ----------------------------------------------------------------------- - -BigInt LongCurrencyBox::GetValue( sal_uInt16 nPos ) const -{ - BigInt nValue = 0; - ImplLongCurrencyGetValue( ComboBox::GetEntry( nPos ), nValue, - GetDecimalDigits(), GetLocaleDataWrapper() ); - return nValue; -} - -// ----------------------------------------------------------------------- - -sal_uInt16 LongCurrencyBox::GetValuePos( BigInt nValue ) const -{ - XubString aStr = ImplGetCurr( GetLocaleDataWrapper(), nValue, GetDecimalDigits(), GetCurrencySymbol(), IsUseThousandSep() ); - return ComboBox::GetEntryPos( aStr ); -} - // ======================================================================= /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/gdi/animate.cxx b/vcl/source/gdi/animate.cxx index 28eca90b9d59..90acdcf12706 100644 --- a/vcl/source/gdi/animate.cxx +++ b/vcl/source/gdi/animate.cxx @@ -185,16 +185,7 @@ sal_Bool Animation::operator==( const Animation& rAnimation ) const return bRet; } -// ------------------------------------------------------------------ - -sal_Bool Animation::IsEmpty() const -{ - return( maBitmapEx.IsEmpty() && maList.empty() ); -} - -// ------------------------------------------------------------------ - -void Animation::SetEmpty() +void Animation::Clear() { maTimer.Stop(); mbIsInAnimation = sal_False; @@ -212,13 +203,6 @@ void Animation::SetEmpty() // ----------------------------------------------------------------------- -void Animation::Clear() -{ - SetEmpty(); -} - -// ----------------------------------------------------------------------- - sal_Bool Animation::IsTransparent() const { Point aPoint; diff --git a/vcl/source/gdi/bmpacc3.cxx b/vcl/source/gdi/bmpacc3.cxx index b83479ed3151..17b8db33c085 100644 --- a/vcl/source/gdi/bmpacc3.cxx +++ b/vcl/source/gdi/bmpacc3.cxx @@ -294,23 +294,4 @@ void BitmapWriteAccess::FillPolygon( const Polygon& rPoly ) } } -// ------------------------------------------------------------------ - -void BitmapWriteAccess::DrawPolygon( const Polygon& rPoly ) -{ - if( mpFillColor ) - FillPolygon( rPoly ); - - if( mpLineColor && ( !mpFillColor || ( *mpFillColor != *mpLineColor ) ) ) - { - const sal_uInt16 nSize = rPoly.GetSize(); - - for( sal_uInt16 i = 0, nSize1 = nSize - 1; i < nSize1; i++ ) - DrawLine( rPoly[ i ], rPoly[ i + 1 ] ); - - if( rPoly[ nSize - 1 ] != rPoly[ 0 ] ) - DrawLine( rPoly[ nSize - 1 ], rPoly[ 0 ] ); - } -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/gdi/image.cxx b/vcl/source/gdi/image.cxx index 688436b2d3ba..cff57b850bd8 100644 --- a/vcl/source/gdi/image.cxx +++ b/vcl/source/gdi/image.cxx @@ -612,18 +612,6 @@ void ImageList::AddImage( const ::rtl::OUString& rImageName, const Image& rImage // ----------------------------------------------------------------------- -void ImageList::ReplaceImage( sal_uInt16 nId, const Image& rImage ) -{ - DBG_CHKTHIS( ImageList, NULL ); - DBG_CHKOBJ( &rImage, Image, NULL ); - DBG_ASSERT( GetImagePos( nId ) != IMAGELIST_IMAGE_NOTFOUND, "ImageList::ReplaceImage(): Unknown nId" ); - - RemoveImage( nId ); - AddImage( nId, rImage ); -} - -// ----------------------------------------------------------------------- - void ImageList::ReplaceImage( const ::rtl::OUString& rImageName, const Image& rImage ) { const sal_uInt16 nId = ImplGetImageId( rImageName ); @@ -658,16 +646,6 @@ void ImageList::ReplaceImage( sal_uInt16 nId, sal_uInt16 nReplaceId ) // ----------------------------------------------------------------------- -void ImageList::ReplaceImage( const ::rtl::OUString& rImageName, const ::rtl::OUString& rReplaceName ) -{ - const sal_uInt16 nId1 = ImplGetImageId( rImageName ), nId2 = ImplGetImageId( rReplaceName ); - - if( nId1 && nId2 ) - ReplaceImage( nId1, nId2 ); -} - -// ----------------------------------------------------------------------- - void ImageList::RemoveImage( sal_uInt16 nId ) { DBG_CHKTHIS( ImageList, NULL ); @@ -684,16 +662,6 @@ void ImageList::RemoveImage( sal_uInt16 nId ) // ----------------------------------------------------------------------- -void ImageList::RemoveImage( const ::rtl::OUString& rImageName ) -{ - const sal_uInt16 nId = ImplGetImageId( rImageName ); - - if( nId ) - RemoveImage( nId ); -} - -// ----------------------------------------------------------------------- - Image ImageList::GetImage( sal_uInt16 nId ) const { DBG_CHKTHIS( ImageList, NULL ); @@ -748,18 +716,6 @@ Image ImageList::GetImage( const ::rtl::OUString& rImageName ) const // ----------------------------------------------------------------------- -void ImageList::Clear() -{ - DBG_CHKTHIS( ImageList, NULL ); - - if( mpImplData && ( 0 == --mpImplData->mnRefCount ) ) - delete mpImplData; - - mpImplData = NULL; -} - -// ----------------------------------------------------------------------- - sal_uInt16 ImageList::GetImageCount() const { DBG_CHKTHIS( ImageList, NULL ); diff --git a/vcl/source/gdi/regband.cxx b/vcl/source/gdi/regband.cxx index 4734d8314849..146c38a77488 100644 --- a/vcl/source/gdi/regband.cxx +++ b/vcl/source/gdi/regband.cxx @@ -856,38 +856,6 @@ sal_Bool ImplRegionBand::IsInside( long nX ) // ----------------------------------------------------------------------- -sal_Bool ImplRegionBand::IsOver( long nLeft, long nRight ) -{ - ImplRegionBandSep* pSep = mpFirstSep; - while ( pSep ) - { - if ( (pSep->mnXLeft < nRight) && (pSep->mnXRight > nLeft) ) - return sal_True; - - pSep = pSep->mpNextSep; - } - - return sal_False; -} - -// ----------------------------------------------------------------------- - -sal_Bool ImplRegionBand::IsInside( long nLeft, long nRight ) -{ - ImplRegionBandSep* pSep = mpFirstSep; - while ( pSep ) - { - if ( (pSep->mnXLeft >= nLeft) && (nRight <= pSep->mnXRight) ) - return sal_True; - - pSep = pSep->mpNextSep; - } - - return sal_False; -} - -// ----------------------------------------------------------------------- - long ImplRegionBand::GetXLeftBoundary() const { DBG_ASSERT( mpFirstSep != NULL, "ImplRegionBand::XLeftBoundary -> no separation in band!" ); diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx index 3ac90daf7a36..8e487e9f20cd 100644 --- a/vcl/source/window/brdwin.cxx +++ b/vcl/source/window/brdwin.cxx @@ -1954,14 +1954,6 @@ ImplBorderWindow::ImplBorderWindow( Window* pParent, WinBits nStyle , ImplInit( pParent, nStyle, nTypeStyle, ::com::sun::star::uno::Any() ); } -ImplBorderWindow::ImplBorderWindow( Window* pParent, - WinBits nStyle, sal_uInt16 nTypeStyle, - const ::com::sun::star::uno::Any& aSystemToken ) : - Window( WINDOW_BORDERWINDOW ) -{ - ImplInit( pParent, nStyle, nTypeStyle, aSystemToken ); -} - // ----------------------------------------------------------------------- ImplBorderWindow::~ImplBorderWindow() @@ -2314,16 +2306,6 @@ void ImplBorderWindow::SetHideButton( sal_Bool bHideButton ) // ----------------------------------------------------------------------- -void ImplBorderWindow::SetHelpButton( sal_Bool bHelpButton ) -{ - mbHelpBtn = bHelpButton; - Size aSize = GetOutputSizePixel(); - mpBorderView->Init( this, aSize.Width(), aSize.Height() ); - InvalidateBorder(); -} - -// ----------------------------------------------------------------------- - void ImplBorderWindow::SetMenuButton( sal_Bool bMenuButton ) { mbMenuBtn = bMenuButton; diff --git a/vcl/source/window/introwin.cxx b/vcl/source/window/introwin.cxx index a1271bff8fcf..f1e22d8d6ce4 100644 --- a/vcl/source/window/introwin.cxx +++ b/vcl/source/window/introwin.cxx @@ -65,15 +65,6 @@ IntroWindow::~IntroWindow() pSVData->mpIntroWindow = NULL; } -void IntroWindow::SetBackgroundBitmap( const Bitmap& rBitmap ) -{ - if( ! rBitmap.IsEmpty() ) - { - SalBitmap* pBmp = rBitmap.ImplGetImpBitmap()->ImplGetSalBitmap(); - ImplGetFrame()->SetBackgroundBitmap( pBmp ); - } -} - void IntroWindow::SetBackgroundBitmap( const BitmapEx& rBitmapEx ) { if( ! rBitmapEx.IsEmpty() ) -- cgit