summaryrefslogtreecommitdiff
path: root/include/svtools
diff options
context:
space:
mode:
authorNoel Grandin <noelgrandin@gmail.com>2015-06-16 14:36:06 +0200
committerNoel Grandin <noelgrandin@gmail.com>2015-06-29 07:25:44 +0000
commit497c589802a788de78af28ea88cec947b25355b3 (patch)
tree00d08d81fa59230420618164315302762fdbf85e /include/svtools
parente57314f61f67b093510c5a8a8f34a62126ba8734 (diff)
sal_uLong->sal_Int32 in SvtIconChoiceCtrl
and drop the pass-by-reference param from GetSelected, nothing uses it Change-Id: I6d616a2b147912af9305410625af6e7afae34e59 Reviewed-on: https://gerrit.libreoffice.org/16312 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'include/svtools')
-rw-r--r--include/svtools/ivctrl.hxx14
1 files changed, 6 insertions, 8 deletions
diff --git a/include/svtools/ivctrl.hxx b/include/svtools/ivctrl.hxx
index ad8b30a5c278..baa02a0198d1 100644
--- a/include/svtools/ivctrl.hxx
+++ b/include/svtools/ivctrl.hxx
@@ -82,7 +82,7 @@ class SvxIconChoiceCtrlEntry
Rectangle aRect; // Bounding-Rect of the entry
Rectangle aGridRect; // Only valid in Grid-mode
- sal_uLong nPos;
+ sal_Int32 nPos;
/*
The insert position in the Insertlist is equal to the (sort) order stated at the Insert
@@ -148,8 +148,6 @@ public:
// Only set at AutoArrange. The head of the list is accessible via SvxIconChoiceCtrl::GetPredecessorHead
SvxIconChoiceCtrlEntry* GetSuccessor() const { return pflink; }
SvxIconChoiceCtrlEntry* GetPredecessor() const { return pblink; }
-
-// sal_Unicode GetMnemonicChar() const;
};
enum SvxIconChoiceCtrlColumnAlign
@@ -307,9 +305,9 @@ public:
bool IsEntryEditing() const;
- sal_uLong GetEntryCount() const;
- SvxIconChoiceCtrlEntry* GetEntry( sal_uLong nPos ) const;
- sal_uLong GetEntryListPos( SvxIconChoiceCtrlEntry* pEntry ) const;
+ sal_Int32 GetEntryCount() const;
+ SvxIconChoiceCtrlEntry* GetEntry( sal_Int32 nPos ) const;
+ sal_Int32 GetEntryListPos( SvxIconChoiceCtrlEntry* pEntry ) const;
using Window::SetCursor;
void SetCursor( SvxIconChoiceCtrlEntry* pEntry );
SvxIconChoiceCtrlEntry* GetCursor() const;
@@ -322,10 +320,10 @@ public:
SvxIconChoiceCtrlEntry* GetEntry( const Point& rPosPixel, bool bHit = false ) const;
// sal_uLong is the position of the selected element in the list
- SvxIconChoiceCtrlEntry* GetSelectedEntry( sal_uLong& rPos ) const;
+ SvxIconChoiceCtrlEntry* GetSelectedEntry() const;
#ifdef DBG_UTIL
- void SetEntryTextMode( SvxIconChoiceCtrlTextMode eMode, SvxIconChoiceCtrlEntry* pEntry = 0 );
+ void SetEntryTextMode( SvxIconChoiceCtrlTextMode eMode, SvxIconChoiceCtrlEntry* pEntry = 0 );
#endif
void SetFontColorToBackground ( bool bDo = true ) { _bAutoFontColor = bDo; }