summaryrefslogtreecommitdiff
path: root/vcl/source/control
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2014-02-26 18:29:17 +1100
committerCaolán McNamara <caolanm@redhat.com>2014-02-26 05:48:00 -0600
commit81afed113d2f49c600eb2c8d3827ff8cbd83139f (patch)
tree822c6131a00a0facbe417ecba52fd075bb32e2a1 /vcl/source/control
parent3edcdd43f94e605c08314ab61f64c418b01f8dde (diff)
Removed unnecessary comment decorations from VCL sources
Conflicts: vcl/headless/svpgdi.cxx vcl/source/app/dbggui.cxx vcl/source/app/help.cxx vcl/source/app/idlemgr.cxx vcl/source/app/settings.cxx vcl/source/app/stdtext.cxx vcl/source/app/svdata.cxx vcl/source/app/svmain.cxx vcl/source/control/fixed.cxx vcl/source/control/ilstbox.cxx vcl/source/control/spinbtn.cxx vcl/source/filter/sgfbram.cxx vcl/source/filter/sgvmain.cxx vcl/source/filter/sgvtext.cxx vcl/source/filter/wmf/emfwr.hxx vcl/source/filter/wmf/winmtf.hxx vcl/source/filter/wmf/wmfwr.hxx vcl/source/fontsubset/cff.cxx vcl/source/fontsubset/fontsubset.cxx vcl/source/fontsubset/xlat.cxx Change-Id: Ifc4fa21e552a8b031645eb883bdc23563eebb602 Reviewed-on: https://gerrit.libreoffice.org/8357 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/source/control')
-rw-r--r--vcl/source/control/fixed.cxx133
-rw-r--r--vcl/source/control/ilstbox.cxx229
-rw-r--r--vcl/source/control/imgctrl.cxx18
-rw-r--r--vcl/source/control/spinbtn.cxx46
4 files changed, 0 insertions, 426 deletions
diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx
index db1806eaeeb4..a336879f5d7e 100644
--- a/vcl/source/control/fixed.cxx
+++ b/vcl/source/control/fixed.cxx
@@ -32,8 +32,6 @@
#include "impimagetree.hxx"
#include "window.h"
-
-
#define FIXEDLINE_TEXT_BORDER 4
#define FIXEDTEXT_VIEW_STYLE (WB_3DLOOK | \
@@ -51,8 +49,6 @@
WB_TOP | WB_VCENTER | WB_BOTTOM | \
WB_SCALE)
-
-
static Point ImplCalcPos( WinBits nStyle, const Point& rPos,
const Size& rObjSize, const Size& rWinSize )
{
@@ -85,8 +81,6 @@ static Point ImplCalcPos( WinBits nStyle, const Point& rPos,
return aPos;
}
-
-
void FixedText::ImplInit( Window* pParent, WinBits nStyle )
{
nStyle = ImplInitStyle( nStyle );
@@ -94,8 +88,6 @@ void FixedText::ImplInit( Window* pParent, WinBits nStyle )
ImplInitSettings( true, true, true );
}
-
-
WinBits FixedText::ImplInitStyle( WinBits nStyle )
{
if ( !(nStyle & WB_NOGROUP) )
@@ -103,21 +95,16 @@ WinBits FixedText::ImplInitStyle( WinBits nStyle )
return nStyle;
}
-
-
const Font& FixedText::GetCanonicalFont( const StyleSettings& _rStyle ) const
{
return ( GetStyle() & WB_INFO ) ? _rStyle.GetInfoFont() : _rStyle.GetLabelFont();
}
-
const Color& FixedText::GetCanonicalTextColor( const StyleSettings& _rStyle ) const
{
return ( GetStyle() & WB_INFO ) ? _rStyle.GetInfoTextColor() : _rStyle.GetLabelTextColor();
}
-
-
void FixedText::ImplInitSettings( bool bFont,
bool bForeground, bool bBackground )
{
@@ -147,8 +134,6 @@ void FixedText::ImplInitSettings( bool bFont,
}
}
-
-
FixedText::FixedText( Window* pParent, WinBits nStyle )
: Control(WINDOW_FIXEDTEXT)
, m_nMaxWidthChars(-1)
@@ -158,8 +143,6 @@ FixedText::FixedText( Window* pParent, WinBits nStyle )
ImplInit( pParent, nStyle );
}
-
-
FixedText::FixedText( Window* pParent, const ResId& rResId )
: Control(WINDOW_FIXEDTEXT)
, m_nMaxWidthChars(-1)
@@ -175,8 +158,6 @@ FixedText::FixedText( Window* pParent, const ResId& rResId )
Show();
}
-
-
sal_uInt16 FixedText::ImplGetTextStyle( WinBits nWinStyle )
{
sal_uInt16 nTextStyle = TEXT_DRAW_MNEMONIC | TEXT_DRAW_ENDELLIPSIS;
@@ -208,8 +189,6 @@ sal_uInt16 FixedText::ImplGetTextStyle( WinBits nWinStyle )
return nTextStyle;
}
-
-
void FixedText::ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags,
const Point& rPos, const Size& rSize,
bool bFillLayout
@@ -256,15 +235,11 @@ void FixedText::ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags,
);
}
-
-
void FixedText::Paint( const Rectangle& )
{
ImplDraw( this, 0, Point(), GetOutputSizePixel() );
}
-
-
void FixedText::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
sal_uLong nFlags )
{
@@ -303,16 +278,12 @@ void FixedText::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
pDev->Pop();
}
-
-
void FixedText::Resize()
{
Control::Resize();
Invalidate();
}
-
-
void FixedText::StateChanged( StateChangedType nType )
{
Control::StateChanged( nType );
@@ -352,8 +323,6 @@ void FixedText::StateChanged( StateChangedType nType )
}
}
-
-
void FixedText::DataChanged( const DataChangedEvent& rDCEvt )
{
Control::DataChanged( rDCEvt );
@@ -368,8 +337,6 @@ void FixedText::DataChanged( const DataChangedEvent& rDCEvt )
}
}
-
-
Size FixedText::getTextDimensions(Control const *pControl, const OUString &rTxt, long nMaxWidth)
{
sal_uInt16 nStyle = ImplGetTextStyle( pControl->GetStyle() );
@@ -380,7 +347,6 @@ Size FixedText::getTextDimensions(Control const *pControl, const OUString &rTxt,
rTxt, nStyle).GetSize();
}
-
Size FixedText::CalcMinimumTextSize( Control const *pControl, long nMaxWidth )
{
Size aSize = getTextDimensions(pControl, pControl->GetText(), nMaxWidth);
@@ -402,7 +368,6 @@ Size FixedText::CalcMinimumSize( long nMaxWidth ) const
return CalcWindowSize( CalcMinimumTextSize ( this, nMaxWidth ) );
}
-
Size FixedText::GetOptimalSize() const
{
sal_Int32 nMaxAvailWidth = 0x7fffffff;
@@ -425,8 +390,6 @@ Size FixedText::GetOptimalSize() const
return aRet;
}
-
-
void FixedText::FillLayoutData() const
{
mpControlData->mpLayoutData = new vcl::ControlLayoutData();
@@ -514,8 +477,6 @@ SelectableFixedText::SelectableFixedText(Window* pParent, WinBits nStyle)
SetPaintTransparent( true );
}
-
-
void SelectableFixedText::LoseFocus()
{
Edit::LoseFocus();
@@ -523,8 +484,6 @@ void SelectableFixedText::LoseFocus()
Invalidate();
}
-
-
void FixedLine::ImplInit( Window* pParent, WinBits nStyle )
{
nStyle = ImplInitStyle( nStyle );
@@ -532,8 +491,6 @@ void FixedLine::ImplInit( Window* pParent, WinBits nStyle )
ImplInitSettings( true, true, true );
}
-
-
WinBits FixedLine::ImplInitStyle( WinBits nStyle )
{
if ( !(nStyle & WB_NOGROUP) )
@@ -541,21 +498,16 @@ WinBits FixedLine::ImplInitStyle( WinBits nStyle )
return nStyle;
}
-
-
const Font& FixedLine::GetCanonicalFont( const StyleSettings& _rStyle ) const
{
return _rStyle.GetGroupFont();
}
-
const Color& FixedLine::GetCanonicalTextColor( const StyleSettings& _rStyle ) const
{
return _rStyle.GetGroupTextColor();
}
-
-
void FixedLine::ImplInitSettings( bool bFont,
bool bForeground, bool bBackground )
{
@@ -585,8 +537,6 @@ void FixedLine::ImplInitSettings( bool bFont,
}
}
-
-
void FixedLine::ImplDraw( bool bLayout )
{
Size aOutSize = GetOutputSizePixel();
@@ -660,8 +610,6 @@ void FixedLine::ImplDraw( bool bLayout )
}
}
-
-
FixedLine::FixedLine( Window* pParent, WinBits nStyle ) :
Control( WINDOW_FIXEDLINE )
{
@@ -669,8 +617,6 @@ FixedLine::FixedLine( Window* pParent, WinBits nStyle ) :
SetSizePixel( Size( 2, 2 ) );
}
-
-
FixedLine::FixedLine( Window* pParent, const ResId& rResId ) :
Control( WINDOW_FIXEDLINE )
{
@@ -683,38 +629,27 @@ FixedLine::FixedLine( Window* pParent, const ResId& rResId ) :
Show();
}
-
-
void FixedLine::FillLayoutData() const
{
mpControlData->mpLayoutData = new vcl::ControlLayoutData();
const_cast<FixedLine*>(this)->ImplDraw( true );
}
-
-
-
void FixedLine::Paint( const Rectangle& )
{
ImplDraw();
}
-
-
void FixedLine::Draw( OutputDevice*, const Point&, const Size&, sal_uLong )
{
}
-
-
void FixedLine::Resize()
{
Control::Resize();
Invalidate();
}
-
-
void FixedLine::StateChanged( StateChangedType nType )
{
Control::StateChanged( nType );
@@ -752,8 +687,6 @@ void FixedLine::StateChanged( StateChangedType nType )
}
}
-
-
void FixedLine::DataChanged( const DataChangedEvent& rDCEvt )
{
Control::DataChanged( rDCEvt );
@@ -768,15 +701,11 @@ void FixedLine::DataChanged( const DataChangedEvent& rDCEvt )
}
}
-
-
Size FixedLine::GetOptimalSize() const
{
return CalcWindowSize( FixedText::CalcMinimumTextSize ( this, 0x7fffffff ) );
}
-
-
void FixedBitmap::ImplInit( Window* pParent, WinBits nStyle )
{
nStyle = ImplInitStyle( nStyle );
@@ -784,8 +713,6 @@ void FixedBitmap::ImplInit( Window* pParent, WinBits nStyle )
ImplInitSettings();
}
-
-
WinBits FixedBitmap::ImplInitStyle( WinBits nStyle )
{
if ( !(nStyle & WB_NOGROUP) )
@@ -793,8 +720,6 @@ WinBits FixedBitmap::ImplInitStyle( WinBits nStyle )
return nStyle;
}
-
-
void FixedBitmap::ImplInitSettings()
{
Window* pParent = GetParent();
@@ -818,8 +743,6 @@ void FixedBitmap::ImplInitSettings()
}
}
-
-
void FixedBitmap::ImplLoadRes( const ResId& rResId )
{
Control::ImplLoadRes( rResId );
@@ -833,16 +756,12 @@ void FixedBitmap::ImplLoadRes( const ResId& rResId )
}
}
-
-
FixedBitmap::FixedBitmap( Window* pParent, WinBits nStyle ) :
Control( WINDOW_FIXEDBITMAP )
{
ImplInit( pParent, nStyle );
}
-
-
FixedBitmap::FixedBitmap( Window* pParent, const ResId& rResId ) :
Control( WINDOW_FIXEDBITMAP )
{
@@ -855,14 +774,10 @@ FixedBitmap::FixedBitmap( Window* pParent, const ResId& rResId ) :
Show();
}
-
-
FixedBitmap::~FixedBitmap()
{
}
-
-
void FixedBitmap::ImplDraw( OutputDevice* pDev, sal_uLong /* nDrawFlags */,
const Point& rPos, const Size& rSize )
{
@@ -881,15 +796,11 @@ void FixedBitmap::ImplDraw( OutputDevice* pDev, sal_uLong /* nDrawFlags */,
}
}
-
-
void FixedBitmap::Paint( const Rectangle& )
{
ImplDraw( this, 0, Point(), GetOutputSizePixel() );
}
-
-
void FixedBitmap::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
sal_uLong nFlags )
{
@@ -912,16 +823,12 @@ void FixedBitmap::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize
pDev->Pop();
}
-
-
void FixedBitmap::Resize()
{
Control::Resize();
Invalidate();
}
-
-
void FixedBitmap::StateChanged( StateChangedType nType )
{
Control::StateChanged( nType );
@@ -946,8 +853,6 @@ void FixedBitmap::StateChanged( StateChangedType nType )
}
}
-
-
void FixedBitmap::DataChanged( const DataChangedEvent& rDCEvt )
{
Control::DataChanged( rDCEvt );
@@ -960,8 +865,6 @@ void FixedBitmap::DataChanged( const DataChangedEvent& rDCEvt )
}
}
-
-
void FixedBitmap::SetBitmap( const Bitmap& rBitmap )
{
maBitmap = rBitmap;
@@ -969,8 +872,6 @@ void FixedBitmap::SetBitmap( const Bitmap& rBitmap )
queue_resize();
}
-
-
void FixedImage::ImplInit( Window* pParent, WinBits nStyle )
{
nStyle = ImplInitStyle( nStyle );
@@ -979,8 +880,6 @@ void FixedImage::ImplInit( Window* pParent, WinBits nStyle )
ImplInitSettings();
}
-
-
WinBits FixedImage::ImplInitStyle( WinBits nStyle )
{
if ( !(nStyle & WB_NOGROUP) )
@@ -988,8 +887,6 @@ WinBits FixedImage::ImplInitStyle( WinBits nStyle )
return nStyle;
}
-
-
void FixedImage::ImplInitSettings()
{
Window* pParent = GetParent();
@@ -1013,8 +910,6 @@ void FixedImage::ImplInitSettings()
}
}
-
-
void FixedImage::ImplLoadRes( const ResId& rResId )
{
Control::ImplLoadRes( rResId );
@@ -1028,16 +923,12 @@ void FixedImage::ImplLoadRes( const ResId& rResId )
}
}
-
-
FixedImage::FixedImage( Window* pParent, WinBits nStyle ) :
Control( WINDOW_FIXEDIMAGE )
{
ImplInit( pParent, nStyle );
}
-
-
FixedImage::FixedImage( Window* pParent, const ResId& rResId ) :
Control( WINDOW_FIXEDIMAGE )
{
@@ -1050,14 +941,10 @@ FixedImage::FixedImage( Window* pParent, const ResId& rResId ) :
Show();
}
-
-
FixedImage::~FixedImage()
{
}
-
-
void FixedImage::ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags,
const Point& rPos, const Size& rSize )
{
@@ -1088,28 +975,20 @@ void FixedImage::ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags,
mbInUserDraw = false;
}
-
-
void FixedImage::Paint( const Rectangle& )
{
ImplDraw( this, 0, Point(), GetOutputSizePixel() );
}
-
-
Size FixedImage::GetOptimalSize() const
{
return maImage.GetSizePixel();
}
-
-
void FixedImage::UserDraw( const UserDrawEvent& )
{
}
-
-
void FixedImage::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
sal_uLong nFlags )
{
@@ -1131,16 +1010,12 @@ void FixedImage::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
pDev->Pop();
}
-
-
void FixedImage::Resize()
{
Control::Resize();
Invalidate();
}
-
-
void FixedImage::StateChanged( StateChangedType nType )
{
Control::StateChanged( nType );
@@ -1166,8 +1041,6 @@ void FixedImage::StateChanged( StateChangedType nType )
}
}
-
-
void FixedImage::DataChanged( const DataChangedEvent& rDCEvt )
{
Control::DataChanged( rDCEvt );
@@ -1180,8 +1053,6 @@ void FixedImage::DataChanged( const DataChangedEvent& rDCEvt )
}
}
-
-
void FixedImage::SetImage( const Image& rImage )
{
if ( rImage != maImage )
@@ -1192,16 +1063,12 @@ void FixedImage::SetImage( const Image& rImage )
}
}
-
-
bool FixedImage::SetModeImage( const Image& rImage )
{
SetImage( rImage );
return true;
}
-
-
const Image& FixedImage::GetModeImage( ) const
{
return maImage;
diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index 107cd75b1856..db96da42b1be 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -45,8 +45,6 @@
using namespace ::com::sun::star;
-
-
void ImplInitFieldSettings( Window* pWin, bool bFont, bool bForeground, bool bBackground )
{
const StyleSettings& rStyleSettings = pWin->GetSettings().GetStyleSettings();
@@ -90,8 +88,6 @@ void ImplInitDropDownButton( PushButton* pButton )
pButton->SetBackground();
}
-
-
ImplEntryList::ImplEntryList( Window* pWindow )
{
mpWindow = pWindow;
@@ -104,23 +100,17 @@ ImplEntryList::ImplEntryList( Window* pWindow )
mnMaxMRUCount = 0;
}
-
-
ImplEntryList::~ImplEntryList()
{
Clear();
}
-
-
void ImplEntryList::Clear()
{
mnImages = 0;
maEntries.clear();
}
-
-
void ImplEntryList::SelectEntry( sal_uInt16 nPos, bool bSelect )
{
if (nPos < maEntries.size())
@@ -249,8 +239,6 @@ sal_uInt16 ImplEntryList::InsertEntry( sal_uInt16 nPos, ImplEntryType* pNewEntry
return insPos;
}
-
-
void ImplEntryList::RemoveEntry( sal_uInt16 nPos )
{
if (nPos < maEntries.size())
@@ -264,8 +252,6 @@ void ImplEntryList::RemoveEntry( sal_uInt16 nPos )
}
}
-
-
sal_uInt16 ImplEntryList::FindEntry( const OUString& rString, bool bSearchMRUArea ) const
{
sal_uInt16 nEntries = maEntries.size();
@@ -278,8 +264,6 @@ sal_uInt16 ImplEntryList::FindEntry( const OUString& rString, bool bSearchMRUAre
return LISTBOX_ENTRY_NOTFOUND;
}
-
-
sal_uInt16 ImplEntryList::FindMatchingEntry( const OUString& rStr, sal_uInt16 nStart, bool bForward, bool bLazy ) const
{
sal_uInt16 nPos = LISTBOX_ENTRY_NOTFOUND;
@@ -316,8 +300,6 @@ sal_uInt16 ImplEntryList::FindMatchingEntry( const OUString& rStr, sal_uInt16 nS
return nPos;
}
-
-
sal_uInt16 ImplEntryList::FindEntry( const void* pData ) const
{
sal_uInt16 nPos = LISTBOX_ENTRY_NOTFOUND;
@@ -333,8 +315,6 @@ sal_uInt16 ImplEntryList::FindEntry( const void* pData ) const
return nPos;
}
-
-
long ImplEntryList::GetAddedHeight( sal_uInt16 i_nEndIndex, sal_uInt16 i_nBeginIndex, long i_nBeginHeight ) const
{
long nHeight = i_nBeginHeight;
@@ -361,16 +341,12 @@ long ImplEntryList::GetAddedHeight( sal_uInt16 i_nEndIndex, sal_uInt16 i_nBeginI
return i_nEndIndex > i_nBeginIndex ? nHeight : -nHeight;
}
-
-
long ImplEntryList::GetEntryHeight( sal_uInt16 nPos ) const
{
ImplEntryType* pImplEntry = GetEntry( nPos );
return pImplEntry ? pImplEntry->mnHeight : 0;
}
-
-
OUString ImplEntryList::GetEntryText( sal_uInt16 nPos ) const
{
OUString aEntryText;
@@ -380,8 +356,6 @@ OUString ImplEntryList::GetEntryText( sal_uInt16 nPos ) const
return aEntryText;
}
-
-
bool ImplEntryList::HasEntryImage( sal_uInt16 nPos ) const
{
bool bImage = false;
@@ -391,8 +365,6 @@ bool ImplEntryList::HasEntryImage( sal_uInt16 nPos ) const
return bImage;
}
-
-
Image ImplEntryList::GetEntryImage( sal_uInt16 nPos ) const
{
Image aImage;
@@ -402,8 +374,6 @@ Image ImplEntryList::GetEntryImage( sal_uInt16 nPos ) const
return aImage;
}
-
-
void ImplEntryList::SetEntryData( sal_uInt16 nPos, void* pNewData )
{
ImplEntryType* pImplEntry = GetEntry( nPos );
@@ -411,16 +381,12 @@ void ImplEntryList::SetEntryData( sal_uInt16 nPos, void* pNewData )
pImplEntry->mpUserData = pNewData;
}
-
-
void* ImplEntryList::GetEntryData( sal_uInt16 nPos ) const
{
ImplEntryType* pImplEntry = GetEntry( nPos );
return pImplEntry ? pImplEntry->mpUserData : NULL;
}
-
-
void ImplEntryList::SetEntryFlags( sal_uInt16 nPos, long nFlags )
{
ImplEntryType* pImplEntry = GetEntry( nPos );
@@ -428,16 +394,12 @@ void ImplEntryList::SetEntryFlags( sal_uInt16 nPos, long nFlags )
pImplEntry->mnFlags = nFlags;
}
-
-
long ImplEntryList::GetEntryFlags( sal_uInt16 nPos ) const
{
ImplEntryType* pImplEntry = GetEntry( nPos );
return pImplEntry ? pImplEntry->mnFlags : 0;
}
-
-
sal_uInt16 ImplEntryList::GetSelectEntryCount() const
{
sal_uInt16 nSelCount = 0;
@@ -450,15 +412,11 @@ sal_uInt16 ImplEntryList::GetSelectEntryCount() const
return nSelCount;
}
-
-
OUString ImplEntryList::GetSelectEntry( sal_uInt16 nIndex ) const
{
return GetEntryText( GetSelectEntryPos( nIndex ) );
}
-
-
sal_uInt16 ImplEntryList::GetSelectEntryPos( sal_uInt16 nIndex ) const
{
sal_uInt16 nSelEntryPos = LISTBOX_ENTRY_NOTFOUND;
@@ -482,24 +440,18 @@ sal_uInt16 ImplEntryList::GetSelectEntryPos( sal_uInt16 nIndex ) const
return nSelEntryPos;
}
-
-
bool ImplEntryList::IsEntryPosSelected( sal_uInt16 nIndex ) const
{
ImplEntryType* pImplEntry = GetEntry( nIndex );
return pImplEntry ? pImplEntry->mbIsSelected : sal_False;
}
-
-
bool ImplEntryList::IsEntrySelectable( sal_uInt16 nPos ) const
{
ImplEntryType* pImplEntry = GetEntry( nPos );
return pImplEntry ? ((pImplEntry->mnFlags & LISTBOX_ENTRY_FLAG_DISABLE_SELECTION) == 0) : true;
}
-
-
sal_uInt16 ImplEntryList::FindFirstSelectable( sal_uInt16 nPos, bool bForward /* = true */ )
{
if( IsEntrySelectable( nPos ) )
@@ -526,8 +478,6 @@ sal_uInt16 ImplEntryList::FindFirstSelectable( sal_uInt16 nPos, bool bForward /*
return LISTBOX_ENTRY_NOTFOUND;
}
-
-
ImplListBoxWindow::ImplListBoxWindow( Window* pParent, WinBits nWinStyle ) :
Control( pParent, 0 ),
maQuickSelectionEngine( *this )
@@ -574,22 +524,16 @@ ImplListBoxWindow::ImplListBoxWindow( Window* pParent, WinBits nWinStyle ) :
ImplCalcMetrics();
}
-
-
ImplListBoxWindow::~ImplListBoxWindow()
{
delete mpEntryList;
}
-
-
void ImplListBoxWindow::ImplInitSettings( bool bFont, bool bForeground, bool bBackground )
{
ImplInitFieldSettings( this, bFont, bForeground, bBackground );
}
-
-
void ImplListBoxWindow::ImplCalcMetrics()
{
mnMaxWidth = 0;
@@ -620,8 +564,6 @@ void ImplListBoxWindow::ImplCalcMetrics()
}
}
-
-
void ImplListBoxWindow::Clear()
{
mpEntryList->Clear();
@@ -650,8 +592,6 @@ void ImplListBoxWindow::SetUserItemSize( const Size& rSz )
ImplCalcMetrics();
}
-
-
struct ImplEntryMetrics
{
bool bText;
@@ -663,7 +603,6 @@ struct ImplEntryMetrics
long nImgHeight;
};
-
void ImplListBoxWindow::EnableQuickSelection( const bool& b )
{
maQuickSelectionEngine.SetEnabled( b );
@@ -751,8 +690,6 @@ void ImplListBoxWindow::ImplUpdateEntryMetrics( ImplEntryType& rEntry )
rEntry.mnHeight = aMetrics.nEntryHeight;
}
-
-
void ImplListBoxWindow::ImplCallSelect()
{
if ( !IsTravelSelect() && GetEntryList()->GetMaxMRUCount() )
@@ -794,8 +731,6 @@ void ImplListBoxWindow::ImplCallSelect()
mbSelectionChanged = false;
}
-
-
sal_uInt16 ImplListBoxWindow::InsertEntry( sal_uInt16 nPos, ImplEntryType* pNewEntry )
{
ImplClearLayoutData();
@@ -808,8 +743,6 @@ sal_uInt16 ImplListBoxWindow::InsertEntry( sal_uInt16 nPos, ImplEntryType* pNewE
return nNewPos;
}
-
-
void ImplListBoxWindow::RemoveEntry( sal_uInt16 nPos )
{
ImplClearLayoutData();
@@ -819,8 +752,6 @@ void ImplListBoxWindow::RemoveEntry( sal_uInt16 nPos )
ImplCalcMetrics();
}
-
-
void ImplListBoxWindow::SetEntryFlags( sal_uInt16 nPos, long nFlags )
{
mpEntryList->SetEntryFlags( nPos, nFlags );
@@ -829,8 +760,6 @@ void ImplListBoxWindow::SetEntryFlags( sal_uInt16 nPos, long nFlags )
ImplUpdateEntryMetrics( *pEntry );
}
-
-
void ImplListBoxWindow::ImplShowFocusRect()
{
if ( mbHasFocusRect )
@@ -839,8 +768,6 @@ void ImplListBoxWindow::ImplShowFocusRect()
mbHasFocusRect = true;
}
-
-
void ImplListBoxWindow::ImplHideFocusRect()
{
if ( mbHasFocusRect )
@@ -850,9 +777,6 @@ void ImplListBoxWindow::ImplHideFocusRect()
}
}
-
-
-
sal_uInt16 ImplListBoxWindow::GetEntryPosForPoint( const Point& rPoint ) const
{
long nY = mnBorder;
@@ -870,8 +794,6 @@ sal_uInt16 ImplListBoxWindow::GetEntryPosForPoint( const Point& rPoint ) const
return nSelect;
}
-
-
bool ImplListBoxWindow::IsVisible( sal_uInt16 i_nEntry ) const
{
bool bRet = false;
@@ -888,8 +810,6 @@ bool ImplListBoxWindow::IsVisible( sal_uInt16 i_nEntry ) const
return bRet;
}
-
-
sal_uInt16 ImplListBoxWindow::GetLastVisibleEntry() const
{
sal_uInt16 nPos = mnTop;
@@ -908,8 +828,6 @@ sal_uInt16 ImplListBoxWindow::GetLastVisibleEntry() const
return nPos;
}
-
-
void ImplListBoxWindow::MouseButtonDown( const MouseEvent& rMEvt )
{
mbMouseMoveSelect = false; // only till the first MouseButtonDown
@@ -949,8 +867,6 @@ void ImplListBoxWindow::MouseButtonDown( const MouseEvent& rMEvt )
}
}
-
-
void ImplListBoxWindow::MouseMove( const MouseEvent& rMEvt )
{
if ( rMEvt.IsLeaveWindow() )
@@ -1030,8 +946,6 @@ void ImplListBoxWindow::MouseMove( const MouseEvent& rMEvt )
}
}
-
-
void ImplListBoxWindow::DeselectAll()
{
while ( GetEntryList()->GetSelectEntryCount() )
@@ -1041,8 +955,6 @@ void ImplListBoxWindow::DeselectAll()
}
}
-
-
void ImplListBoxWindow::SelectEntry( sal_uInt16 nPos, bool bSelect )
{
if( (mpEntryList->IsEntryPosSelected( nPos ) != bSelect) && mpEntryList->IsEntrySelectable( nPos ) )
@@ -1092,8 +1004,6 @@ void ImplListBoxWindow::SelectEntry( sal_uInt16 nPos, bool bSelect )
}
}
-
-
bool ImplListBoxWindow::SelectEntries( sal_uInt16 nSelect, LB_EVENT_TYPE eLET, bool bShift, bool bCtrl, bool bSelectPosChange /*=FALSE*/ )
{
bool bFocusChanged = false;
@@ -1249,8 +1159,6 @@ bool ImplListBoxWindow::SelectEntries( sal_uInt16 nSelect, LB_EVENT_TYPE eLET, b
return bSelectionChanged;
}
-
-
void ImplListBoxWindow::Tracking( const TrackingEvent& rTEvt )
{
Point aPoint;
@@ -1417,17 +1325,12 @@ void ImplListBoxWindow::Tracking( const TrackingEvent& rTEvt )
}
}
-
-
-
void ImplListBoxWindow::KeyInput( const KeyEvent& rKEvt )
{
if( !ProcessKeyInput( rKEvt ) )
Control::KeyInput( rKEvt );
}
-
-
bool ImplListBoxWindow::ProcessKeyInput( const KeyEvent& rKEvt )
{
// entry to be selected
@@ -1738,20 +1641,17 @@ namespace
}
}
-
::vcl::StringEntryIdentifier ImplListBoxWindow::CurrentEntry( OUString& _out_entryText ) const
{
return lcl_getEntry( *GetEntryList(), ( mnCurrentPos == LISTBOX_ENTRY_NOTFOUND ) ? 0 : mnCurrentPos + 1, _out_entryText );
}
-
::vcl::StringEntryIdentifier ImplListBoxWindow::NextEntry( ::vcl::StringEntryIdentifier _currentEntry, OUString& _out_entryText ) const
{
sal_uInt16 nNextPos = lcl_getEntryPos( _currentEntry ) + 1;
return lcl_getEntry( *GetEntryList(), nNextPos, _out_entryText );
}
-
void ImplListBoxWindow::SelectEntry( ::vcl::StringEntryIdentifier _entry )
{
sal_uInt16 nSelect = lcl_getEntryPos( _entry );
@@ -1781,8 +1681,6 @@ void ImplListBoxWindow::SelectEntry( ::vcl::StringEntryIdentifier _entry )
}
}
-
-
void ImplListBoxWindow::ImplPaint( sal_uInt16 nPos, bool bErase, bool bLayout )
{
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
@@ -1838,8 +1736,6 @@ void ImplListBoxWindow::ImplPaint( sal_uInt16 nPos, bool bErase, bool bLayout )
}
}
-
-
void ImplListBoxWindow::DrawEntry( sal_uInt16 nPos, bool bDrawImage, bool bDrawText, bool bDrawTextAtImagePos, bool bLayout )
{
const ImplEntryType* pEntry = mpEntryList->GetEntryPtr( nPos );
@@ -1958,8 +1854,6 @@ void ImplListBoxWindow::DrawEntry( sal_uInt16 nPos, bool bDrawImage, bool bDrawT
}
}
-
-
void ImplListBoxWindow::FillLayoutData() const
{
mpControlData->mpLayoutData = new vcl::ControlLayoutData();
@@ -1967,8 +1861,6 @@ void ImplListBoxWindow::FillLayoutData() const
ImplDoPaint( Rectangle( Point( 0, 0 ), GetOutputSize() ), true );
}
-
-
void ImplListBoxWindow::ImplDoPaint( const Rectangle& rRect, bool bLayout )
{
sal_uInt16 nCount = mpEntryList->GetEntryCount();
@@ -1999,15 +1891,11 @@ void ImplListBoxWindow::ImplDoPaint( const Rectangle& rRect, bool bLayout )
ImplShowFocusRect();
}
-
-
void ImplListBoxWindow::Paint( const Rectangle& rRect )
{
ImplDoPaint( rRect );
}
-
-
sal_uInt16 ImplListBoxWindow::GetDisplayLineCount() const
{
// FIXME: LISTBOX_ENTRY_FLAG_MULTILINE
@@ -2021,8 +1909,6 @@ sal_uInt16 ImplListBoxWindow::GetDisplayLineCount() const
return nEntries;
}
-
-
void ImplListBoxWindow::Resize()
{
Control::Resize();
@@ -2043,8 +1929,6 @@ void ImplListBoxWindow::Resize()
ImplClearLayoutData();
}
-
-
void ImplListBoxWindow::GetFocus()
{
sal_uInt16 nPos = mnCurrentPos;
@@ -2058,16 +1942,12 @@ void ImplListBoxWindow::GetFocus()
Control::GetFocus();
}
-
-
void ImplListBoxWindow::LoseFocus()
{
ImplHideFocusRect();
Control::LoseFocus();
}
-
-
void ImplListBoxWindow::SetTopEntry( sal_uInt16 nTop )
{
if( mpEntryList->GetEntryCount() == 0 )
@@ -2097,8 +1977,6 @@ void ImplListBoxWindow::SetTopEntry( sal_uInt16 nTop )
}
}
-
-
void ImplListBoxWindow::ShowProminentEntry( sal_uInt16 nEntryPos )
{
if( meProminentType == PROMINENT_MIDDLE )
@@ -2111,15 +1989,11 @@ void ImplListBoxWindow::ShowProminentEntry( sal_uInt16 nEntryPos )
SetTopEntry( nEntryPos );
}
-
-
void ImplListBoxWindow::SetLeftIndent( long n )
{
ScrollHorz( n - mnLeft );
}
-
-
void ImplListBoxWindow::ScrollHorz( long n )
{
long nDiff = 0;
@@ -2152,8 +2026,6 @@ void ImplListBoxWindow::ScrollHorz( long n )
}
}
-
-
Size ImplListBoxWindow::CalcSize(sal_Int32 nMaxLines) const
{
// FIXME: LISTBOX_ENTRY_FLAG_MULTILINE
@@ -2164,8 +2036,6 @@ Size ImplListBoxWindow::CalcSize(sal_Int32 nMaxLines) const
return aSz;
}
-
-
Rectangle ImplListBoxWindow::GetBoundingRectangle( sal_uInt16 nItem ) const
{
const ImplEntryType* pEntry = mpEntryList->GetEntryPtr( nItem );
@@ -2175,8 +2045,6 @@ Rectangle ImplListBoxWindow::GetBoundingRectangle( sal_uInt16 nItem ) const
return aRect;
}
-
-
void ImplListBoxWindow::StateChanged( StateChangedType nType )
{
Control::StateChanged( nType );
@@ -2211,8 +2079,6 @@ void ImplListBoxWindow::StateChanged( StateChangedType nType )
ImplClearLayoutData();
}
-
-
void ImplListBoxWindow::DataChanged( const DataChangedEvent& rDCEvt )
{
Control::DataChanged( rDCEvt );
@@ -2229,8 +2095,6 @@ void ImplListBoxWindow::DataChanged( const DataChangedEvent& rDCEvt )
}
}
-
-
sal_uInt16 ImplListBoxWindow::ImplGetTextStyle() const
{
sal_uInt16 nTextStyle = TEXT_DRAW_VCENTER;
@@ -2247,8 +2111,6 @@ sal_uInt16 ImplListBoxWindow::ImplGetTextStyle() const
return nTextStyle;
}
-
-
ImplListBox::ImplListBox( Window* pParent, WinBits nWinStyle ) :
Control( pParent, nWinStyle ),
maLBWindow( this, nWinStyle&(~WB_BORDER) )
@@ -2275,8 +2137,6 @@ ImplListBox::ImplListBox( Window* pParent, WinBits nWinStyle ) :
maLBWindow.Show();
}
-
-
ImplListBox::~ImplListBox()
{
delete mpHScrollBar;
@@ -2284,8 +2144,6 @@ ImplListBox::~ImplListBox()
delete mpScrollBarBox;
}
-
-
void ImplListBox::Clear()
{
maLBWindow.Clear();
@@ -2299,8 +2157,6 @@ void ImplListBox::Clear()
StateChanged( STATE_CHANGE_DATA );
}
-
-
sal_uInt16 ImplListBox::InsertEntry( sal_uInt16 nPos, const OUString& rStr )
{
ImplEntryType* pNewEntry = new ImplEntryType( rStr );
@@ -2309,8 +2165,6 @@ sal_uInt16 ImplListBox::InsertEntry( sal_uInt16 nPos, const OUString& rStr )
return nNewPos;
}
-
-
sal_uInt16 ImplListBox::InsertEntry( sal_uInt16 nPos, const OUString& rStr, const Image& rImage )
{
ImplEntryType* pNewEntry = new ImplEntryType( rStr, rImage );
@@ -2319,51 +2173,37 @@ sal_uInt16 ImplListBox::InsertEntry( sal_uInt16 nPos, const OUString& rStr, cons
return nNewPos;
}
-
-
void ImplListBox::RemoveEntry( sal_uInt16 nPos )
{
maLBWindow.RemoveEntry( nPos );
StateChanged( STATE_CHANGE_DATA );
}
-
-
void ImplListBox::SetEntryFlags( sal_uInt16 nPos, long nFlags )
{
maLBWindow.SetEntryFlags( nPos, nFlags );
}
-
-
void ImplListBox::SelectEntry( sal_uInt16 nPos, bool bSelect )
{
maLBWindow.SelectEntry( nPos, bSelect );
}
-
-
void ImplListBox::SetNoSelection()
{
maLBWindow.DeselectAll();
}
-
-
void ImplListBox::GetFocus()
{
maLBWindow.GrabFocus();
}
-
-
Window* ImplListBox::GetPreferredKeyInputWindow()
{
return &maLBWindow;
}
-
-
void ImplListBox::Resize()
{
Control::Resize();
@@ -2371,17 +2211,12 @@ void ImplListBox::Resize()
ImplCheckScrollBars();
}
-
-
-
IMPL_LINK_NOARG(ImplListBox, MRUChanged)
{
StateChanged( STATE_CHANGE_DATA );
return 1;
}
-
-
IMPL_LINK_NOARG(ImplListBox, LBWindowScrolled)
{
long nSet = GetTopEntry();
@@ -2396,8 +2231,6 @@ IMPL_LINK_NOARG(ImplListBox, LBWindowScrolled)
return 1;
}
-
-
IMPL_LINK( ImplListBox, ScrollBarHdl, ScrollBar*, pSB )
{
sal_uInt16 nPos = (sal_uInt16) pSB->GetThumbPos();
@@ -2409,8 +2242,6 @@ IMPL_LINK( ImplListBox, ScrollBarHdl, ScrollBar*, pSB )
return 1;
}
-
-
void ImplListBox::ImplCheckScrollBars()
{
bool bArrange = false;
@@ -2492,8 +2323,6 @@ void ImplListBox::ImplCheckScrollBars()
ImplInitScrollBars();
}
-
-
void ImplListBox::ImplInitScrollBars()
{
Size aOutSz = maLBWindow.GetOutputSizePixel();
@@ -2516,8 +2345,6 @@ void ImplListBox::ImplInitScrollBars()
}
}
-
-
void ImplListBox::ImplResizeControls()
{
// Here we only position the Controls; if the Scrollbars are to be
@@ -2580,8 +2407,6 @@ void ImplListBox::ImplResizeControls()
}
}
-
-
void ImplListBox::StateChanged( StateChangedType nType )
{
if ( nType == STATE_CHANGE_INITSHOW )
@@ -2630,15 +2455,11 @@ void ImplListBox::StateChanged( StateChangedType nType )
Control::StateChanged( nType );
}
-
-
void ImplListBox::DataChanged( const DataChangedEvent& rDCEvt )
{
Control::DataChanged( rDCEvt );
}
-
-
bool ImplListBox::Notify( NotifyEvent& rNEvt )
{
bool nDone = false;
@@ -2658,15 +2479,11 @@ bool ImplListBox::Notify( NotifyEvent& rNEvt )
return nDone || Window::Notify( rNEvt );
}
-
-
const Wallpaper& ImplListBox::GetDisplayBackground() const
{
return maLBWindow.GetDisplayBackground();
}
-
-
bool ImplListBox::HandleWheelAsCursorTravel( const CommandEvent& rCEvt )
{
bool bDone = false;
@@ -2683,8 +2500,6 @@ bool ImplListBox::HandleWheelAsCursorTravel( const CommandEvent& rCEvt )
return bDone;
}
-
-
void ImplListBox::SetMRUEntries( const OUString& rEntries, sal_Unicode cSep )
{
bool bChanges = GetEntryList()->GetMRUCount() ? true : false;
@@ -2716,8 +2531,6 @@ void ImplListBox::SetMRUEntries( const OUString& rEntries, sal_Unicode cSep )
}
}
-
-
OUString ImplListBox::GetMRUEntries( sal_Unicode cSep ) const
{
OUStringBuffer aEntries;
@@ -2730,8 +2543,6 @@ OUString ImplListBox::GetMRUEntries( sal_Unicode cSep ) const
return aEntries.makeStringAndClear();
}
-
-
void ImplListBox::SetEdgeBlending(bool bNew)
{
if(mbEdgeBlending != bNew)
@@ -2741,8 +2552,6 @@ void ImplListBox::SetEdgeBlending(bool bNew)
}
}
-
-
ImplWin::ImplWin( Window* pParent, WinBits nWinStyle ) :
Control ( pParent, nWinStyle )
{
@@ -2758,16 +2567,12 @@ ImplWin::ImplWin( Window* pParent, WinBits nWinStyle ) :
mnItemPos = LISTBOX_ENTRY_NOTFOUND;
}
-
-
void ImplWin::MBDown()
{
if( IsEnabled() )
maMBDownHdl.Call( this );
}
-
-
void ImplWin::MouseButtonDown( const MouseEvent& )
{
if( IsEnabled() )
@@ -2776,16 +2581,12 @@ void ImplWin::MouseButtonDown( const MouseEvent& )
}
}
-
-
void ImplWin::FillLayoutData() const
{
mpControlData->mpLayoutData = new vcl::ControlLayoutData();
const_cast<ImplWin*>(this)->ImplDraw( true );
}
-
-
bool ImplWin::PreNotify( NotifyEvent& rNEvt )
{
const MouseEvent* pMouseEvt = NULL;
@@ -2807,8 +2608,6 @@ bool ImplWin::PreNotify( NotifyEvent& rNEvt )
return Control::PreNotify(rNEvt);
}
-
-
void ImplWin::ImplDraw( bool bLayout )
{
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
@@ -2918,15 +2717,11 @@ void ImplWin::ImplDraw( bool bLayout )
}
}
-
-
void ImplWin::Paint( const Rectangle& )
{
ImplDraw();
}
-
-
void ImplWin::DrawEntry( bool bDrawImage, bool bDrawText, bool bDrawTextAtImagePos, bool bLayout )
{
long nBorder = 1;
@@ -3000,8 +2795,6 @@ void ImplWin::DrawEntry( bool bDrawImage, bool bDrawText, bool bDrawTextAtImageP
ShowFocus( maFocusRect );
}
-
-
void ImplWin::Resize()
{
Control::Resize();
@@ -3009,8 +2802,6 @@ void ImplWin::Resize()
Invalidate();
}
-
-
void ImplWin::GetFocus()
{
ShowFocus( maFocusRect );
@@ -3028,8 +2819,6 @@ void ImplWin::GetFocus()
Control::GetFocus();
}
-
-
void ImplWin::LoseFocus()
{
HideFocus();
@@ -3047,24 +2836,18 @@ void ImplWin::LoseFocus()
Control::LoseFocus();
}
-
-
ImplBtn::ImplBtn( Window* pParent, WinBits nWinStyle ) :
PushButton( pParent, nWinStyle ),
mbDown ( false )
{
}
-
-
void ImplBtn::MBDown()
{
if( IsEnabled() )
maMBDownHdl.Call( this );
}
-
-
void ImplBtn::MouseButtonDown( const MouseEvent& )
{
//PushButton::MouseButtonDown( rMEvt );
@@ -3075,8 +2858,6 @@ void ImplBtn::MouseButtonDown( const MouseEvent& )
}
}
-
-
ImplListBoxFloatingWindow::ImplListBoxFloatingWindow( Window* pParent ) :
FloatingWindow( pParent, WB_BORDER | WB_SYSTEMWINDOW | WB_NOSHADOW ) // no drop shadow for list boxes
{
@@ -3101,8 +2882,6 @@ ImplListBoxFloatingWindow::ImplListBoxFloatingWindow( Window* pParent ) :
}
-
-
bool ImplListBoxFloatingWindow::PreNotify( NotifyEvent& rNEvt )
{
if( rNEvt.GetType() == EVENT_LOSEFOCUS )
@@ -3114,8 +2893,6 @@ bool ImplListBoxFloatingWindow::PreNotify( NotifyEvent& rNEvt )
return FloatingWindow::PreNotify( rNEvt );
}
-
-
void ImplListBoxFloatingWindow::setPosSizePixel( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags )
{
FloatingWindow::setPosSizePixel( nX, nY, nWidth, nHeight, nFlags );
@@ -3150,16 +2927,12 @@ void ImplListBoxFloatingWindow::setPosSizePixel( long nX, long nY, long nWidth,
}
}
-
-
void ImplListBoxFloatingWindow::Resize()
{
mpImplLB->GetMainWindow()->ImplClearLayoutData();
FloatingWindow::Resize();
}
-
-
Size ImplListBoxFloatingWindow::CalcFloatSize()
{
Size aFloatSz( maPrefSz );
@@ -3232,8 +3005,6 @@ Size ImplListBoxFloatingWindow::CalcFloatSize()
return aFloatSz;
}
-
-
void ImplListBoxFloatingWindow::StartFloat( bool bStartTracking )
{
if( !IsInPopupMode() )
diff --git a/vcl/source/control/imgctrl.cxx b/vcl/source/control/imgctrl.cxx
index 1e3441a01705..f143ab13331d 100644
--- a/vcl/source/control/imgctrl.cxx
+++ b/vcl/source/control/imgctrl.cxx
@@ -26,24 +26,18 @@
namespace ImageScaleMode = ::com::sun::star::awt::ImageScaleMode;
-
-
ImageControl::ImageControl( Window* pParent, WinBits nStyle )
:FixedImage( pParent, nStyle )
,mnScaleMode( ImageScaleMode::ANISOTROPIC )
{
}
-
-
ImageControl::ImageControl( Window* pParent, const ResId& rResId )
:FixedImage( pParent, rResId )
,mnScaleMode( ImageScaleMode::ANISOTROPIC )
{
}
-
-
void ImageControl::SetScaleMode( const ::sal_Int16 _nMode )
{
if ( _nMode != mnScaleMode )
@@ -53,14 +47,11 @@ void ImageControl::SetScaleMode( const ::sal_Int16 _nMode )
}
}
-
-
void ImageControl::Resize()
{
Invalidate();
}
-
namespace
{
static Size lcl_calcPaintSize( const Rectangle& _rPaintRect, const Size& _rBitmapSize )
@@ -83,8 +74,6 @@ namespace
}
}
-
-
void ImageControl::ImplDraw( OutputDevice& rDev, sal_uLong nDrawFlags, const Point& rPos, const Size& rSize ) const
{
sal_uInt16 nStyle = 0;
@@ -149,8 +138,6 @@ void ImageControl::ImplDraw( OutputDevice& rDev, sal_uLong nDrawFlags, const Poi
} // switch ( mnScaleMode )
}
-
-
void ImageControl::Paint( const Rectangle& /*rRect*/ )
{
ImplDraw( *this, 0, Point(), GetOutputSizePixel() );
@@ -177,7 +164,6 @@ void ImageControl::Paint( const Rectangle& /*rRect*/ )
}
}
-
void ImageControl::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags )
{
const Point aPos = pDev->LogicToPixel( rPos );
@@ -198,16 +184,12 @@ void ImageControl::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSiz
pDev->Pop();
}
-
-
void ImageControl::GetFocus()
{
FixedImage::GetFocus();
GetWindow( WINDOW_BORDER )->Invalidate();
}
-
-
void ImageControl::LoseFocus()
{
FixedImage::GetFocus();
diff --git a/vcl/source/control/spinbtn.cxx b/vcl/source/control/spinbtn.cxx
index 905348116f14..6ecc05d68671 100644
--- a/vcl/source/control/spinbtn.cxx
+++ b/vcl/source/control/spinbtn.cxx
@@ -23,8 +23,6 @@
#include <vcl/spin.hxx>
#include <vcl/settings.hxx>
-
-
void SpinButton::ImplInit( Window* pParent, WinBits nStyle )
{
mbUpperIn = false;
@@ -50,8 +48,6 @@ void SpinButton::ImplInit( Window* pParent, WinBits nStyle )
Control::ImplInit( pParent, nStyle, NULL );
}
-
-
SpinButton::SpinButton( Window* pParent, WinBits nStyle )
:Control( WINDOW_SPINBUTTON )
,mbUpperIsFocused( false )
@@ -59,14 +55,10 @@ SpinButton::SpinButton( Window* pParent, WinBits nStyle )
ImplInit( pParent, nStyle );
}
-
-
SpinButton::~SpinButton()
{
}
-
-
IMPL_LINK( SpinButton, ImplTimeout, Timer*, pTimer )
{
if ( pTimer->GetTimeout() == GetSettings().GetMouseSettings().GetButtonStartRepeat() )
@@ -85,8 +77,6 @@ IMPL_LINK( SpinButton, ImplTimeout, Timer*, pTimer )
return 0;
}
-
-
void SpinButton::Up()
{
if ( ImplIsUpperEnabled() )
@@ -100,8 +90,6 @@ void SpinButton::Up()
ImplCallEventListenersAndHandler( VCLEVENT_SPINBUTTON_UP, maUpHdlLink, this );
}
-
-
void SpinButton::Down()
{
if ( ImplIsLowerEnabled() )
@@ -115,8 +103,6 @@ void SpinButton::Down()
ImplCallEventListenersAndHandler( VCLEVENT_SPINBUTTON_DOWN, maDownHdlLink, this );
}
-
-
void SpinButton::Resize()
{
Control::Resize();
@@ -140,8 +126,6 @@ void SpinButton::Resize()
Invalidate();
}
-
-
void SpinButton::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags )
{
Point aPos = pDev->LogicToPixel( rPos );
@@ -199,8 +183,6 @@ void SpinButton::Paint( const Rectangle& )
ShowFocus( maFocusRect );
}
-
-
void SpinButton::MouseButtonDown( const MouseEvent& rMEvt )
{
if ( maUpperRect.IsInside( rMEvt.GetPosPixel() ) && ( ImplIsUpperEnabled() ) )
@@ -225,8 +207,6 @@ void SpinButton::MouseButtonDown( const MouseEvent& rMEvt )
}
}
-
-
void SpinButton::MouseButtonUp( const MouseEvent& )
{
ReleaseMouse();
@@ -254,8 +234,6 @@ void SpinButton::MouseButtonUp( const MouseEvent& )
mbInitialUp = mbInitialDown = false;
}
-
-
void SpinButton::MouseMove( const MouseEvent& rMEvt )
{
if ( !rMEvt.IsLeft() || (!mbInitialUp && !mbInitialDown) )
@@ -297,8 +275,6 @@ void SpinButton::MouseMove( const MouseEvent& rMEvt )
}
}
-
-
void SpinButton::KeyInput( const KeyEvent& rKEvt )
{
if ( !rKEvt.GetKeyCode().GetModifier() )
@@ -336,8 +312,6 @@ void SpinButton::KeyInput( const KeyEvent& rKEvt )
Control::KeyInput( rKEvt );
}
-
-
void SpinButton::StateChanged( StateChangedType nType )
{
switch ( nType )
@@ -373,22 +347,16 @@ void SpinButton::StateChanged( StateChangedType nType )
Control::StateChanged( nType );
}
-
-
void SpinButton::SetRangeMin( long nNewRange )
{
SetRange( Range( nNewRange, GetRangeMax() ) );
}
-
-
void SpinButton::SetRangeMax( long nNewRange )
{
SetRange( Range( GetRangeMin(), nNewRange ) );
}
-
-
void SpinButton::SetRange( const Range& rRange )
{
// adjust rage
@@ -414,8 +382,6 @@ void SpinButton::SetRange( const Range& rRange )
}
}
-
-
void SpinButton::SetValue( long nValue )
{
// adjust, if necessary
@@ -431,24 +397,18 @@ void SpinButton::SetValue( long nValue )
}
}
-
-
void SpinButton::GetFocus()
{
ShowFocus( maFocusRect );
Control::GetFocus();
}
-
-
void SpinButton::LoseFocus()
{
HideFocus();
Control::LoseFocus();
}
-
-
bool SpinButton::ImplMoveFocus( bool _bUpper )
{
if ( _bUpper == mbUpperIsFocused )
@@ -461,8 +421,6 @@ bool SpinButton::ImplMoveFocus( bool _bUpper )
return true;
}
-
-
void SpinButton::ImplCalcFocusRect( bool _bUpper )
{
maFocusRect = _bUpper ? maUpperRect : maLowerRect;
@@ -474,8 +432,6 @@ void SpinButton::ImplCalcFocusRect( bool _bUpper )
mbUpperIsFocused = _bUpper;
}
-
-
Rectangle* SpinButton::ImplFindPartRect( const Point& rPt )
{
if( maUpperRect.IsInside( rPt ) )
@@ -523,6 +479,4 @@ bool SpinButton::PreNotify( NotifyEvent& rNEvt )
return Control::PreNotify(rNEvt);
}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */