summaryrefslogtreecommitdiff
path: root/include/svtools
diff options
context:
space:
mode:
Diffstat (limited to 'include/svtools')
-rw-r--r--include/svtools/ctrlbox.hxx52
-rw-r--r--include/svtools/ivctrl.hxx2
-rw-r--r--include/svtools/svtabbx.hxx16
-rw-r--r--include/svtools/treelist.hxx5
-rw-r--r--include/svtools/treelistbox.hxx8
-rw-r--r--include/svtools/valueset.hxx4
6 files changed, 44 insertions, 43 deletions
diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx
index 2d0f4abacce5..7b3e38d1fbce 100644
--- a/include/svtools/ctrlbox.hxx
+++ b/include/svtools/ctrlbox.hxx
@@ -169,26 +169,26 @@ public:
virtual void UserDraw( const UserDrawEvent& rUDEvt );
using ListBox::InsertEntry;
- virtual sal_uInt16 InsertEntry( const OUString& rStr,
- sal_uInt16 nPos = LISTBOX_APPEND );
- virtual sal_uInt16 InsertEntry( const Color& rColor, const OUString& rStr,
- sal_uInt16 nPos = LISTBOX_APPEND );
+ virtual sal_Int32 InsertEntry( const OUString& rStr,
+ sal_Int32 nPos = LISTBOX_APPEND );
+ virtual sal_Int32 InsertEntry( const Color& rColor, const OUString& rStr,
+ sal_Int32 nPos = LISTBOX_APPEND );
void InsertAutomaticEntryColor(const Color &rAutoColorValue);
bool IsAutomaticSelected() { return !GetSelectEntryPos(); }
using ListBox::RemoveEntry;
- virtual void RemoveEntry( sal_uInt16 nPos );
+ virtual void RemoveEntry( sal_Int32 nPos );
virtual void Clear();
void CopyEntries( const ColorListBox& rBox );
using ListBox::GetEntryPos;
- virtual sal_uInt16 GetEntryPos( const Color& rColor ) const;
- virtual Color GetEntryColor( sal_uInt16 nPos ) const;
+ virtual sal_Int32 GetEntryPos( const Color& rColor ) const;
+ virtual Color GetEntryColor( sal_Int32 nPos ) const;
Size GetImageSize() const { return aImageSize; }
void SelectEntry( const OUString& rStr, sal_Bool bSelect = sal_True )
{ ListBox::SelectEntry( rStr, bSelect ); }
void SelectEntry( const Color& rColor, sal_Bool bSelect = sal_True );
- Color GetSelectEntryColor( sal_uInt16 nSelIndex = 0 ) const;
+ Color GetSelectEntryColor( sal_Int32 nSelIndex = 0 ) const;
bool IsEntrySelected(const OUString& rStr ) const
{
return ListBox::IsEntrySelected(rStr);
@@ -196,7 +196,7 @@ public:
bool IsEntrySelected(const Color& rColor) const
{
- sal_uInt16 nPos = GetEntryPos( rColor );
+ sal_Int32 nPos = GetEntryPos( rColor );
if ( nPos != LISTBOX_ENTRY_NOTFOUND )
return IsEntryPosSelected( nPos );
else
@@ -208,20 +208,20 @@ private:
ColorListBox( const ColorListBox& );
ColorListBox& operator =( const ColorListBox& );
- void SetEntryData( sal_uInt16 nPos, void* pNewData );
- void* GetEntryData( sal_uInt16 nPos ) const;
+ void SetEntryData( sal_Int32 nPos, void* pNewData );
+ void* GetEntryData( sal_Int32 nPos ) const;
};
inline void ColorListBox::SelectEntry( const Color& rColor, sal_Bool bSelect )
{
- sal_uInt16 nPos = GetEntryPos( rColor );
+ sal_Int32 nPos = GetEntryPos( rColor );
if ( nPos != LISTBOX_ENTRY_NOTFOUND )
ListBox::SelectEntryPos( nPos, bSelect );
}
-inline Color ColorListBox::GetSelectEntryColor( sal_uInt16 nSelIndex ) const
+inline Color ColorListBox::GetSelectEntryColor( sal_Int32 nSelIndex ) const
{
- sal_uInt16 nPos = GetSelectEntryPos( nSelIndex );
+ sal_Int32 nPos = GetSelectEntryPos( nSelIndex );
Color aColor;
if ( nPos != LISTBOX_ENTRY_NOTFOUND )
aColor = GetEntryColor( nPos );
@@ -307,7 +307,7 @@ class SVT_DLLPUBLIC LineListBox : public ListBox
virtual void DataChanged( const DataChangedEvent& rDCEvt );
void UpdateEntries( long nOldWidth );
- sal_uInt16 GetStylePos( sal_uInt16 nListPos, long nWidth );
+ sal_Int32 GetStylePos( sal_Int32 nListPos, long nWidth );
public:
typedef Color (*ColorFunc)(Color);
@@ -322,7 +322,7 @@ public:
void SetNone( const OUString& sNone );
using ListBox::InsertEntry;
- virtual sal_uInt16 InsertEntry( const OUString& rStr, sal_uInt16 nPos = LISTBOX_APPEND );
+ virtual sal_Int32 InsertEntry( const OUString& rStr, sal_Int32 nPos = LISTBOX_APPEND );
/** Insert a listbox entry with all widths in Twips. */
void InsertEntry( BorderWidthImpl aWidthImpl,
sal_uInt16 nStyle, long nMinWidth = 0,
@@ -331,23 +331,23 @@ public:
ColorDistFunc pColorDistFn = &sameDistColor );
using ListBox::RemoveEntry;
- virtual void RemoveEntry( sal_uInt16 nPos );
+ virtual void RemoveEntry( sal_Int32 nPos );
virtual void Clear();
using ListBox::GetEntryPos;
- virtual sal_uInt16 GetEntryPos( sal_uInt16 nStyle = com::sun::star::table::BorderLineStyle::SOLID ) const;
- sal_uInt16 GetEntryStyle( sal_uInt16 nPos ) const;
+ virtual sal_Int32 GetEntryPos( sal_uInt16 nStyle = com::sun::star::table::BorderLineStyle::SOLID ) const;
+ sal_uInt16 GetEntryStyle( sal_Int32 nPos ) const;
void SelectEntry( const OUString& rStr, sal_Bool bSelect = sal_True ) { ListBox::SelectEntry( rStr, bSelect ); }
void SelectEntry( sal_uInt16 nStyle = com::sun::star::table::BorderLineStyle::SOLID, sal_Bool bSelect = sal_True );
- sal_uInt16 GetSelectEntryStyle( sal_uInt16 nSelIndex = 0 ) const;
+ sal_uInt16 GetSelectEntryStyle( sal_Int32 nSelIndex = 0 ) const;
bool IsEntrySelected(const OUString& rStr) const
{
return ListBox::IsEntrySelected(rStr);
}
bool IsEntrySelected( sal_uInt16 nStyle = com::sun::star::table::BorderLineStyle::SOLID ) const
{
- sal_uInt16 nPos = GetEntryPos( nStyle );
+ sal_Int32 nPos = GetEntryPos( nStyle );
if ( nPos != LISTBOX_ENTRY_NOTFOUND )
return IsEntryPosSelected( nPos );
else
@@ -365,16 +365,16 @@ public:
protected:
inline const Color& GetPaintColor( void ) const;
- Color GetColorLine1( sal_uInt16 nPos = 0 );
- Color GetColorLine2( sal_uInt16 nPos = 0 );
- Color GetColorDist( sal_uInt16 nPos = 0 );
+ Color GetColorLine1( sal_Int32 nPos = 0 );
+ Color GetColorLine2( sal_Int32 nPos = 0 );
+ Color GetColorDist( sal_Int32 nPos = 0 );
private:
// declared as private because some compilers would generate the default methods
LineListBox( const LineListBox& );
LineListBox& operator =( const LineListBox& );
- void SetEntryData( sal_uInt16 nPos, void* pNewData );
- void* GetEntryData( sal_uInt16 nPos ) const;
+ void SetEntryData( sal_Int32 nPos, void* pNewData );
+ void* GetEntryData( sal_Int32 nPos ) const;
};
inline void LineListBox::SetColor( const Color& rColor )
diff --git a/include/svtools/ivctrl.hxx b/include/svtools/ivctrl.hxx
index 37df1b01c639..e2b2c9717471 100644
--- a/include/svtools/ivctrl.hxx
+++ b/include/svtools/ivctrl.hxx
@@ -283,7 +283,7 @@ public:
SvxIconChoiceCtrlEntry* InsertEntry( const OUString& rText,
const Image& rImage,
- sal_uLong nPos = LIST_APPEND,
+ sal_uLong nPos = CONTAINER_APPEND,
const Point* pPos = 0,
sal_uInt16 nFlags = 0
);
diff --git a/include/svtools/svtabbx.hxx b/include/svtools/svtabbx.hxx
index 8e29e30bfb38..c321e6d35ab3 100644
--- a/include/svtools/svtabbx.hxx
+++ b/include/svtools/svtabbx.hxx
@@ -75,7 +75,7 @@ public:
virtual SvTreeListEntry* InsertEntry( const OUString& rText, SvTreeListEntry* pParent = 0,
sal_Bool bChildrenOnDemand = sal_False,
- sal_uLong nPos=LIST_APPEND, void* pUserData = 0,
+ sal_uLong nPos=TREELIST_APPEND, void* pUserData = 0,
SvLBoxButtonKind eButtonKind = SvLBoxButtonKind_enabledCheckbox );
virtual SvTreeListEntry* InsertEntry( const OUString& rText,
@@ -83,16 +83,16 @@ public:
const Image& rCollapsedEntryBmp,
SvTreeListEntry* pParent = 0,
sal_Bool bChildrenOnDemand = sal_False,
- sal_uLong nPos = LIST_APPEND, void* pUserData = 0,
+ sal_uLong nPos = TREELIST_APPEND, void* pUserData = 0,
SvLBoxButtonKind eButtonKind = SvLBoxButtonKind_enabledCheckbox );
- virtual SvTreeListEntry* InsertEntryToColumn( const OUString&, sal_uLong nPos = LIST_APPEND,
+ virtual SvTreeListEntry* InsertEntryToColumn( const OUString&, sal_uLong nPos = TREELIST_APPEND,
sal_uInt16 nCol = 0xffff, void* pUserData = NULL );
virtual SvTreeListEntry* InsertEntryToColumn( const OUString&, SvTreeListEntry* pParent,
sal_uLong nPos, sal_uInt16 nCol, void* pUserData = NULL );
virtual SvTreeListEntry* InsertEntryToColumn( const OUString&, const Image& rExpandedEntryBmp,
const Image& rCollapsedEntryBmp, SvTreeListEntry* pParent = NULL,
- sal_uLong nPos = LIST_APPEND, sal_uInt16 nCol = 0xffff, void* pUserData = NULL );
+ sal_uLong nPos = TREELIST_APPEND, sal_uInt16 nCol = 0xffff, void* pUserData = NULL );
virtual OUString GetEntryText( SvTreeListEntry* pEntry ) const;
OUString GetEntryText( SvTreeListEntry*, sal_uInt16 nCol ) const;
@@ -147,15 +147,15 @@ public:
void InitHeaderBar( HeaderBar* pHeaderBar );
sal_Bool IsItemChecked( SvTreeListEntry* pEntry, sal_uInt16 nCol ) const;
- virtual SvTreeListEntry* InsertEntryToColumn( const OUString&, sal_uLong nPos = LIST_APPEND,
+ virtual SvTreeListEntry* InsertEntryToColumn( const OUString&, sal_uLong nPos = TREELIST_APPEND,
sal_uInt16 nCol = 0xffff, void* pUserData = NULL );
virtual SvTreeListEntry* InsertEntryToColumn( const OUString&, SvTreeListEntry* pParent,
sal_uLong nPos, sal_uInt16 nCol, void* pUserData = NULL );
virtual SvTreeListEntry* InsertEntryToColumn( const OUString&, const Image& rExpandedEntryBmp,
const Image& rCollapsedEntryBmp, SvTreeListEntry* pParent = NULL,
- sal_uLong nPos = LIST_APPEND, sal_uInt16 nCol = 0xffff, void* pUserData = NULL );
- virtual sal_uLong Insert( SvTreeListEntry* pEnt,SvTreeListEntry* pPar,sal_uLong nPos=LIST_APPEND);
- virtual sal_uLong Insert( SvTreeListEntry* pEntry, sal_uLong nRootPos = LIST_APPEND );
+ sal_uLong nPos = TREELIST_APPEND, sal_uInt16 nCol = 0xffff, void* pUserData = NULL );
+ virtual sal_uLong Insert( SvTreeListEntry* pEnt,SvTreeListEntry* pPar,sal_uLong nPos=TREELIST_APPEND);
+ virtual sal_uLong Insert( SvTreeListEntry* pEntry, sal_uLong nRootPos = TREELIST_APPEND );
void RemoveEntry( SvTreeListEntry* _pEntry );
void Clear();
diff --git a/include/svtools/treelist.hxx b/include/svtools/treelist.hxx
index 049224d83839..d8cf1ae4e8f4 100644
--- a/include/svtools/treelist.hxx
+++ b/include/svtools/treelist.hxx
@@ -27,6 +27,7 @@
#include <tools/solar.h>
#include <tools/link.hxx>
#include <tools/debug.hxx>
+#include <tools/contnr.hxx>
#include <limits.h>
#include <vector>
@@ -160,8 +161,8 @@ public:
SvTreeListEntry* PrevSibling( SvTreeListEntry* pEntry ) const;
SvTreeListEntry* LastSibling( SvTreeListEntry* pEntry ) const;
- sal_uLong Insert( SvTreeListEntry* pEntry,SvTreeListEntry* pPar,sal_uLong nPos=ULONG_MAX);
- sal_uLong Insert( SvTreeListEntry* pEntry,sal_uLong nRootPos = ULONG_MAX )
+ sal_uLong Insert( SvTreeListEntry* pEntry,SvTreeListEntry* pPar,sal_uLong nPos = TREELIST_APPEND);
+ sal_uLong Insert( SvTreeListEntry* pEntry,sal_uLong nRootPos = TREELIST_APPEND )
{ return Insert(pEntry, pRootItem, nRootPos ); }
void InsertTree( SvTreeListEntry* pTree, SvTreeListEntry* pTargetParent, sal_uLong nListPos );
diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx
index a5877d0cca60..bac80fcf59a1 100644
--- a/include/svtools/treelistbox.hxx
+++ b/include/svtools/treelistbox.hxx
@@ -296,8 +296,8 @@ protected:
// Invalidate children on enable/disable
virtual void StateChanged( StateChangedType eType );
- virtual sal_uLong Insert( SvTreeListEntry* pEnt,SvTreeListEntry* pPar,sal_uLong nPos=LIST_APPEND);
- virtual sal_uLong Insert( SvTreeListEntry* pEntry,sal_uLong nRootPos = LIST_APPEND );
+ virtual sal_uLong Insert( SvTreeListEntry* pEnt,SvTreeListEntry* pPar,sal_uLong nPos=TREELIST_APPEND);
+ virtual sal_uLong Insert( SvTreeListEntry* pEntry,sal_uLong nRootPos = TREELIST_APPEND );
// In-place editing
SvInplaceEdit2* pEdCtrl;
@@ -629,7 +629,7 @@ public:
virtual SvTreeListEntry* InsertEntry( const OUString& rText, SvTreeListEntry* pParent = 0,
sal_Bool bChildrenOnDemand = sal_False,
- sal_uLong nPos=LIST_APPEND, void* pUserData = 0,
+ sal_uLong nPos=TREELIST_APPEND, void* pUserData = 0,
SvLBoxButtonKind eButtonKind = SvLBoxButtonKind_enabledCheckbox );
virtual SvTreeListEntry* InsertEntry( const OUString& rText,
@@ -637,7 +637,7 @@ public:
const Image& rCollapsedEntryBmp,
SvTreeListEntry* pParent = 0,
sal_Bool bChildrenOnDemand = sal_False,
- sal_uLong nPos = LIST_APPEND, void* pUserData = 0,
+ sal_uLong nPos = TREELIST_APPEND, void* pUserData = 0,
SvLBoxButtonKind eButtonKind = SvLBoxButtonKind_enabledCheckbox );
const Image& GetDefaultExpandedEntryBmp( ) const;
diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx
index f128884d08c2..e3d9207a0902 100644
--- a/include/svtools/valueset.hxx
+++ b/include/svtools/valueset.hxx
@@ -193,8 +193,8 @@ to be set (before Show) with SetStyle().
// - ValueSet -
-#define VALUESET_APPEND ((sal_uInt16)-1)
-#define VALUESET_ITEM_NOTFOUND ((sal_uInt16)-1)
+#define VALUESET_APPEND ((size_t)-1)
+#define VALUESET_ITEM_NOTFOUND ((size_t)-1)
class SVT_DLLPUBLIC ValueSet : public Control
{
generated by cgit (git 2.34.1) at 2025-02-07 12:50:29 +0000