summaryrefslogtreecommitdiff
path: root/vcl/source/control
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/source/control')
-rw-r--r--vcl/source/control/button.cxx12
-rw-r--r--vcl/source/control/combobox.cxx3
-rw-r--r--vcl/source/control/ctrl.cxx3
-rw-r--r--vcl/source/control/edit.cxx7
-rw-r--r--vcl/source/control/field2.cxx2
-rw-r--r--vcl/source/control/fixed.cxx1
-rw-r--r--vcl/source/control/group.cxx1
-rw-r--r--vcl/source/control/ilstbox.cxx5
-rw-r--r--vcl/source/control/imgctrl.cxx1
-rw-r--r--vcl/source/control/longcurr.cxx8
-rw-r--r--vcl/source/control/lstbox.cxx13
-rw-r--r--vcl/source/control/menubtn.cxx7
-rw-r--r--vcl/source/control/prgsbar.cxx2
-rw-r--r--vcl/source/control/quickselectionengine.cxx1
-rw-r--r--vcl/source/control/scrbar.cxx2
-rw-r--r--vcl/source/control/slider.cxx5
-rw-r--r--vcl/source/control/spinbtn.cxx1
-rw-r--r--vcl/source/control/spinfld.cxx4
-rw-r--r--vcl/source/control/tabctrl.cxx6
19 files changed, 0 insertions, 84 deletions
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 3086de5cbb40..4638bd04a24e 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <tools/debug.hxx>
#include <tools/lineend.hxx>
#include <tools/poly.hxx>
@@ -42,8 +41,6 @@
#include <window.h>
#include <controldata.hxx>
-
-
#define PUSHBUTTON_VIEW_STYLE (WB_3DLOOK | \
WB_LEFT | WB_CENTER | WB_RIGHT | \
WB_TOP | WB_VCENTER | WB_BOTTOM | \
@@ -60,8 +57,6 @@
WB_TOP | WB_VCENTER | WB_BOTTOM | \
WB_WORDBREAK | WB_NOLABEL)
-
-
class ImplCommonButtonData
{
public:
@@ -79,7 +74,6 @@ public:
~ImplCommonButtonData();
};
-
ImplCommonButtonData::ImplCommonButtonData() : maFocusRect(), mnSeparatorX(0), mnButtonState(0),
mbSmallSymbol(false), maImage(), meImageAlign(IMAGEALIGN_TOP), meSymbolAlign(SYMBOLALIGN_LEFT)
{
@@ -95,7 +89,6 @@ Button::Button( WindowType nType ) :
mpButtonData = new ImplCommonButtonData;
}
-
Button::~Button()
{
delete mpButtonData;
@@ -149,7 +142,6 @@ OUString Button::GetStandardText( StandardButtonType eButton )
return ResId(nResId, *pResMgr).toString();
}
-
bool Button::SetModeImage( const Image& rImage )
{
if ( rImage != mpButtonData->maImage )
@@ -161,13 +153,11 @@ bool Button::SetModeImage( const Image& rImage )
return true;
}
-
const Image Button::GetModeImage( ) const
{
return mpButtonData->maImage;
}
-
bool Button::HasImage() const
{
return !!(mpButtonData->maImage);
@@ -1080,8 +1070,6 @@ void PushButton::ImplDrawPushButton( bool bLayout )
}
}
-
-
void PushButton::ImplSetDefButton( bool bSet )
{
Size aSize( GetSizePixel() );
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 8dd8022724c8..521d13ab1d97 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <set>
#include <comphelper/string.hxx>
#include <tools/debug.hxx>
@@ -1362,7 +1361,6 @@ Rectangle ComboBox::GetBoundingRectangle( sal_Int32 nItem ) const
return aRect;
}
-
void ComboBox::SetBorderStyle( sal_uInt16 nBorderStyle )
{
Window::SetBorderStyle( nBorderStyle );
@@ -1373,7 +1371,6 @@ void ComboBox::SetBorderStyle( sal_uInt16 nBorderStyle )
}
}
-
long ComboBox::GetIndexForPoint( const Point& rPoint, sal_Int32& rPos ) const
{
if( !HasLayoutData() )
diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx
index e1bfbca514f0..6c9c3bb489d4 100644
--- a/vcl/source/control/ctrl.cxx
+++ b/vcl/source/control/ctrl.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <comphelper/processfactory.hxx>
#include <tools/rc.h>
@@ -71,7 +70,6 @@ Control::~Control()
delete mpControlData, mpControlData = NULL;
}
-
void Control::EnableRTL( bool bEnable )
{
// convenience: for controls also switch layout mode
@@ -338,7 +336,6 @@ void Control::SetLayoutDataParent( const Control* pParent ) const
mpControlData->mpLayoutData->m_pParent = pParent;
}
-
void Control::ImplClearLayoutData() const
{
delete mpControlData->mpLayoutData, mpControlData->mpLayoutData = NULL;
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 080353239de7..66082155c108 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <tools/rc.h>
#include <vcl/decoview.hxx>
#include <vcl/event.hxx>
@@ -36,7 +35,6 @@
#include <osl/mutex.hxx>
-
#include <com/sun/star/i18n/BreakIterator.hpp>
#include <com/sun/star/i18n/CharacterIteratorMode.hpp>
#include <com/sun/star/i18n/WordType.hpp>
@@ -111,7 +109,6 @@ struct DDInfo
}
};
-
struct Impl_IMEInfos
{
OUString aOldTextAfterStartPos;
@@ -128,7 +125,6 @@ struct Impl_IMEInfos
void DestroyAttribs();
};
-
Impl_IMEInfos::Impl_IMEInfos(sal_Int32 nP, const OUString& rOldTextAfterStartPos)
: aOldTextAfterStartPos(rOldTextAfterStartPos)
{
@@ -842,7 +838,6 @@ void Edit::ImplInsertText( const OUString& rStr, const Selection* pNewSel, bool
aSelection.Min() > 0 && /* first char needs not to be checked */
xBI.is() && i18n::ScriptType::COMPLEX == xBI->getScriptType( rStr, 0 );
-
uno::Reference < i18n::XExtendedInputSequenceChecker > xISC;
if (bIsInputSequenceChecking && (xISC = ImplGetInputSequenceChecker()).is())
{
@@ -2124,7 +2119,6 @@ void Edit::Command( const CommandEvent& rCEvt )
}
}
-
if ( pData->GetTextAttr() )
{
mpIMEInfos->CopyAttribs( pData->GetTextAttr(), pData->GetText().getLength() );
@@ -2839,7 +2833,6 @@ void Edit::dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::Dra
mpDDInfo->bStarterOfDD = true;
mpDDInfo->aDndStartSel = aSel;
-
if ( IsTracking() )
EndTracking(); // Vor D&D Tracking ausschalten
diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx
index b0ae9bb898f8..c70bf09a1f4a 100644
--- a/vcl/source/control/field2.cxx
+++ b/vcl/source/control/field2.cxx
@@ -39,7 +39,6 @@
#include <com/sun/star/i18n/XCharacterClassification.hpp>
#include <com/sun/star/i18n/KCharacterType.hpp>
-
#include <unotools/localedatawrapper.hxx>
#include <unotools/calendarwrapper.hxx>
#include <unotools/charclass.hxx>
@@ -1362,7 +1361,6 @@ void DateField::ImplDateSpinArea( bool bUp )
}
}
-
switch( eFormat )
{
case XTDATEF_SHORT_MMDDYY:
diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx
index a336879f5d7e..7df62f8c606f 100644
--- a/vcl/source/control/fixed.cxx
+++ b/vcl/source/control/fixed.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "tools/rc.h"
#include "vcl/decoview.hxx"
diff --git a/vcl/source/control/group.cxx b/vcl/source/control/group.cxx
index d9fdb2d75c67..97142fb6077b 100644
--- a/vcl/source/control/group.cxx
+++ b/vcl/source/control/group.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <tools/rc.h>
#include <vcl/event.hxx>
diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index 4c0ba9dc4642..ee3d2a2733c3 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <tools/debug.hxx>
#include <vcl/svapp.hxx>
@@ -76,8 +75,6 @@ void ImplInitFieldSettings( Window* pWin, bool bFont, bool bForeground, bool bBa
}
}
-
-
void ImplInitDropDownButton( PushButton* pButton )
{
if ( pButton->GetSettings().GetStyleSettings().GetOptions() & STYLE_OPTION_SPINUPDOWN )
@@ -491,7 +488,6 @@ sal_Int32 ImplEntryList::FindFirstSelectable( sal_Int32 nPos, bool bForward /* =
return LISTBOX_ENTRY_NOTFOUND;
}
-
ImplListBoxWindow::ImplListBoxWindow( Window* pParent, WinBits nWinStyle ) :
Control( pParent, 0 ),
maQuickSelectionEngine( *this )
@@ -1635,7 +1631,6 @@ bool ImplListBoxWindow::ProcessKeyInput( const KeyEvent& rKEvt )
return bDone;
}
-
namespace
{
static ::vcl::StringEntryIdentifier lcl_getEntry( const ImplEntryList& _rList, sal_Int32 _nPos, OUString& _out_entryText )
diff --git a/vcl/source/control/imgctrl.cxx b/vcl/source/control/imgctrl.cxx
index f143ab13331d..e49af86885e6 100644
--- a/vcl/source/control/imgctrl.cxx
+++ b/vcl/source/control/imgctrl.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <vcl/event.hxx>
#include <vcl/imgctrl.hxx>
#include <tools/rcid.h>
diff --git a/vcl/source/control/longcurr.cxx b/vcl/source/control/longcurr.cxx
index 4bd5e43fba47..ed5558dd045f 100644
--- a/vcl/source/control/longcurr.cxx
+++ b/vcl/source/control/longcurr.cxx
@@ -470,12 +470,10 @@ LongCurrencyField::LongCurrencyField( Window* pParent, WinBits nWinStyle ) :
Reformat();
}
-
LongCurrencyField::~LongCurrencyField()
{
}
-
bool LongCurrencyField::PreNotify( NotifyEvent& rNEvt )
{
if( rNEvt.GetType() == EVENT_KEYINPUT )
@@ -486,7 +484,6 @@ bool LongCurrencyField::PreNotify( NotifyEvent& rNEvt )
return SpinField::PreNotify( rNEvt );
}
-
bool LongCurrencyField::Notify( NotifyEvent& rNEvt )
{
if( rNEvt.GetType() == EVENT_GETFOCUS )
@@ -504,14 +501,12 @@ bool LongCurrencyField::Notify( NotifyEvent& rNEvt )
return SpinField::Notify( rNEvt );
}
-
void LongCurrencyField::Modify()
{
MarkToBeReformatted( true );
SpinField::Modify();
}
-
void LongCurrencyField::Up()
{
BigInt nValue = GetValue();
@@ -534,14 +529,12 @@ void LongCurrencyField::Down()
SpinField::Down();
}
-
void LongCurrencyField::First()
{
ImplNewLongCurrencyFieldValue( this, mnFirst );
SpinField::First();
}
-
void LongCurrencyField::Last()
{
ImplNewLongCurrencyFieldValue( this, mnLast );
@@ -569,7 +562,6 @@ bool LongCurrencyBox::PreNotify( NotifyEvent& rNEvt )
return ComboBox::PreNotify( rNEvt );
}
-
bool LongCurrencyBox::Notify( NotifyEvent& rNEvt )
{
if( rNEvt.GetType() == EVENT_GETFOCUS )
diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx
index 6db3350c50a9..c978fe4d366f 100644
--- a/vcl/source/control/lstbox.cxx
+++ b/vcl/source/control/lstbox.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "tools/rc.h"
#include "tools/debug.hxx"
@@ -48,14 +47,12 @@ ListBox::ListBox( WindowType nType ) : Control( nType )
ImplInitListBoxData();
}
-
ListBox::ListBox( Window* pParent, WinBits nStyle ) : Control( WINDOW_LISTBOX )
{
ImplInitListBoxData();
ImplInit( pParent, nStyle );
}
-
ListBox::ListBox( Window* pParent, const ResId& rResId ) :
Control( WINDOW_LISTBOX )
{
@@ -69,7 +66,6 @@ ListBox::ListBox( Window* pParent, const ResId& rResId ) :
Show();
}
-
ListBox::~ListBox()
{
ImplCallEventListeners( VCLEVENT_OBJECT_DYING );
@@ -85,7 +81,6 @@ ListBox::~ListBox()
delete mpBtn;
}
-
void ListBox::ImplInitListBoxData()
{
mpFloatWin = NULL;
@@ -99,7 +94,6 @@ void ListBox::ImplInitListBoxData()
mbEdgeBlending = false;
}
-
void ListBox::ImplInit( Window* pParent, WinBits nStyle )
{
nStyle = ImplInitStyle( nStyle );
@@ -252,14 +246,12 @@ IMPL_LINK( ListBox, ImplListItemSelectHdl, void*, EMPTYARG )
return 1;
}
-
IMPL_LINK_NOARG(ListBox, ImplScrollHdl)
{
ImplCallEventListeners( VCLEVENT_LISTBOX_SCROLLED );
return 1;
}
-
IMPL_LINK_NOARG(ListBox, ImplCancelHdl)
{
if( IsInDropDown() )
@@ -268,7 +260,6 @@ IMPL_LINK_NOARG(ListBox, ImplCancelHdl)
return 1;
}
-
IMPL_LINK( ListBox, ImplSelectionChangedHdl, void*, n )
{
if ( !mpImplLB->IsTrackingSelect() )
@@ -300,14 +291,12 @@ IMPL_LINK( ListBox, ImplSelectionChangedHdl, void*, n )
return 1;
}
-
IMPL_LINK_NOARG(ListBox, ImplDoubleClickHdl)
{
DoubleClick();
return 1;
}
-
IMPL_LINK_NOARG(ListBox, ImplClickBtnHdl)
{
if( !mpFloatWin->IsInPopupMode() )
@@ -560,7 +549,6 @@ void ListBox::DataChanged( const DataChangedEvent& rDCEvt )
ImplInitDropDownButton( mpBtn );
}
-
if ( IsDropDownBox() )
Invalidate();
}
@@ -1506,7 +1494,6 @@ MultiListBox::MultiListBox( Window* pParent, WinBits nStyle ) :
EnableMultiSelection( true );
}
-
MultiListBox::MultiListBox( Window* pParent, const ResId& rResId ) :
ListBox( WINDOW_MULTILISTBOX )
{
diff --git a/vcl/source/control/menubtn.cxx b/vcl/source/control/menubtn.cxx
index 16955e89e5c0..7f263b685ae6 100644
--- a/vcl/source/control/menubtn.cxx
+++ b/vcl/source/control/menubtn.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <tools/rc.h>
#include <vcl/decoview.hxx>
#include <vcl/event.hxx>
@@ -74,7 +73,6 @@ OString MenuButton::GetCurItemIdent() const
mpMenu->GetItemIdent(mnCurItemId) : OString();
}
-
MenuButton::MenuButton( Window* pParent, WinBits nWinBits )
: PushButton( WINDOW_MENUBUTTON )
{
@@ -128,7 +126,6 @@ IMPL_LINK_NOARG(MenuButton, ImplMenuTimeoutHdl)
return 0;
}
-
void MenuButton::MouseButtonDown( const MouseEvent& rMEvt )
{
bool bExecute = true;
@@ -162,7 +159,6 @@ void MenuButton::MouseButtonDown( const MouseEvent& rMEvt )
}
}
-
void MenuButton::KeyInput( const KeyEvent& rKEvt )
{
KeyCode aKeyCode = rKEvt.GetKeyCode();
@@ -177,19 +173,16 @@ void MenuButton::KeyInput( const KeyEvent& rKEvt )
PushButton::KeyInput( rKEvt );
}
-
void MenuButton::Activate()
{
maActivateHdl.Call( this );
}
-
void MenuButton::Select()
{
maSelectHdl.Call( this );
}
-
void MenuButton::SetMenuMode( sal_uInt16 nMode )
{
// FIXME: It's better to not inline this for 5.1; in 6.0 we can make it inline, however
diff --git a/vcl/source/control/prgsbar.cxx b/vcl/source/control/prgsbar.cxx
index c14df7b195df..8bbaafcede8c 100644
--- a/vcl/source/control/prgsbar.cxx
+++ b/vcl/source/control/prgsbar.cxx
@@ -126,7 +126,6 @@ void ProgressBar::ImplInitSettings( bool bFont,
}
}
-
void ProgressBar::ImplDrawProgress( sal_uInt16 nOldPerc, sal_uInt16 nNewPerc )
{
if ( mbCalcNew )
@@ -161,7 +160,6 @@ void ProgressBar::Paint( const Rectangle& )
ImplDrawProgress( 0, mnPercent );
}
-
void ProgressBar::Resize()
{
mbCalcNew = true;
diff --git a/vcl/source/control/quickselectionengine.cxx b/vcl/source/control/quickselectionengine.cxx
index d0b72391261f..25d136a0218e 100644
--- a/vcl/source/control/quickselectionengine.cxx
+++ b/vcl/source/control/quickselectionengine.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "vcl/quickselectionengine.hxx"
#include "vcl/event.hxx"
#include "vcl/timer.hxx"
diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx
index fcd035cb27f8..32d977702fde 100644
--- a/vcl/source/control/scrbar.cxx
+++ b/vcl/source/control/scrbar.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "vcl/event.hxx"
#include "vcl/decoview.hxx"
#include "vcl/scrbar.hxx"
@@ -1368,7 +1367,6 @@ void ScrollBar::SetRangeMin( long nNewRange )
SetRange( Range( nNewRange, GetRangeMax() ) );
}
-
void ScrollBar::SetRangeMax( long nNewRange )
{
SetRange( Range( GetRangeMin(), nNewRange ) );
diff --git a/vcl/source/control/slider.cxx b/vcl/source/control/slider.cxx
index a52ede4551ce..f398d02a38e3 100644
--- a/vcl/source/control/slider.cxx
+++ b/vcl/source/control/slider.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <tools/rc.h>
#include <vcl/event.hxx>
#include <vcl/decoview.hxx>
@@ -26,8 +25,6 @@
#include "thumbpos.hxx"
-
-
#define SLIDER_DRAW_THUMB ((sal_uInt16)0x0001)
#define SLIDER_DRAW_CHANNEL1 ((sal_uInt16)0x0002)
#define SLIDER_DRAW_CHANNEL2 ((sal_uInt16)0x0004)
@@ -48,8 +45,6 @@
#define SLIDER_VIEW_STYLE (WB_3DLOOK | WB_HORZ | WB_VERT)
-
-
void Slider::ImplInit( Window* pParent, WinBits nStyle )
{
mnThumbPixOffset = 0;
diff --git a/vcl/source/control/spinbtn.cxx b/vcl/source/control/spinbtn.cxx
index 6ecc05d68671..d920737c3c01 100644
--- a/vcl/source/control/spinbtn.cxx
+++ b/vcl/source/control/spinbtn.cxx
@@ -169,7 +169,6 @@ void SpinButton::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
pDev->Pop();
}
-
void SpinButton::Paint( const Rectangle& )
{
HideFocus();
diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx
index 9091c1d93aa8..325e770e1060 100644
--- a/vcl/source/control/spinfld.cxx
+++ b/vcl/source/control/spinfld.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "tools/rc.h"
#include "vcl/event.hxx"
@@ -29,8 +28,6 @@
#include "controldata.hxx"
#include "svdata.hxx"
-
-
namespace {
void ImplGetSpinbuttonValue( Window *pWin, const Rectangle& rUpperRect,
@@ -74,7 +71,6 @@ void ImplGetSpinbuttonValue( Window *pWin, const Rectangle& rUpperRect,
rValue.mnLowerPart = bHorz ? PART_BUTTON_RIGHT : PART_BUTTON_DOWN;
}
-
bool ImplDrawNativeSpinfield( Window *pWin, const SpinbuttonValue& rSpinbuttonValue )
{
bool bNativeOK = false;
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index 3080f23edf24..1d736a7f3a7a 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "tools/debug.hxx"
#include "tools/rc.h"
@@ -40,8 +39,6 @@
#include <boost/unordered_map.hpp>
#include <vector>
-
-
struct ImplTabItem
{
sal_uInt16 mnId;
@@ -63,7 +60,6 @@ struct ImplTabItem
{}
};
-
struct ImplTabCtrlData
{
boost::unordered_map< int, int > maLayoutPageIdToLine;
@@ -74,7 +70,6 @@ struct ImplTabCtrlData
ListBox* mpListBox;
};
-
#define TAB_OFFSET 3
#define TAB_TABOFFSET_X 3
#define TAB_TABOFFSET_Y 3
@@ -137,7 +132,6 @@ const Font& TabControl::GetCanonicalFont( const StyleSettings& _rStyle ) const
return _rStyle.GetAppFont();
}
-
const Color& TabControl::GetCanonicalTextColor( const StyleSettings& _rStyle ) const
{
return _rStyle.GetButtonTextColor();
generated by cgit (git 2.34.1) at 2024-07-23 12:43:22 +0000