[Libreoffice-commits] .: 10 commits - sfx2/inc sfx2/source svtools/inc svtools/source unotools/inc unotools/source unusedcode.easy vcl/inc vcl/source
Jan Holesovsky
kendy at kemper.freedesktop.org
Mon Aug 15 04:11:25 PDT 2011
sfx2/inc/sfx2/minarray.hxx | 130 --------
sfx2/inc/sfx2/msgpool.hxx | 5
sfx2/source/bastyp/minarray.cxx | 465 ------------------------------
sfx2/source/control/msgpool.cxx | 26 -
svtools/inc/svtools/calendar.hxx | 24 -
svtools/inc/svtools/valueset.hxx | 41 --
svtools/source/control/calendar.cxx | 305 -------------------
svtools/source/control/valueacc.cxx | 18 -
svtools/source/control/valueimp.hxx | 10
svtools/source/control/valueset.cxx | 164 ----------
unotools/inc/unotools/calendarwrapper.hxx | 1
unotools/source/i18n/calendarwrapper.cxx | 21 -
unusedcode.easy | 67 ----
vcl/inc/vcl/btndlg.hxx | 6
vcl/inc/vcl/button.hxx | 8
vcl/inc/vcl/combobox.hxx | 11
vcl/inc/vcl/lstbox.hxx | 16 -
vcl/source/control/button.cxx | 95 ------
vcl/source/control/combobox.cxx | 60 ---
vcl/source/control/lstbox.cxx | 82 -----
vcl/source/window/btndlg.cxx | 62 ----
21 files changed, 20 insertions(+), 1597 deletions(-)
New commits:
commit 433ae0f62df90e6158571c2c3dbed05c14bfa900
Author: Jan Holesovsky <kendy at suse.cz>
Date: Mon Aug 15 13:08:50 2011 +0200
Remove WordArr and DECL_2BYTEARRAY, used only once.
Instead that, use std::basic_string.
diff --git a/sfx2/inc/sfx2/minarray.hxx b/sfx2/inc/sfx2/minarray.hxx
index 37c82cf..d17151d 100644
--- a/sfx2/inc/sfx2/minarray.hxx
+++ b/sfx2/inc/sfx2/minarray.hxx
@@ -390,71 +390,6 @@ public:\
void Clear() { Remove( 0, Count() ); }\
};
-class WordArr
-{
-private:
- short* pData;
- sal_uInt16 nUsed;
- sal_uInt8 nGrow;
- sal_uInt8 nUnused;
-public:
- WordArr( sal_uInt8 nInitSize = 0, sal_uInt8 nGrowSize = 8 );
- WordArr( const WordArr& rOrig );
- ~WordArr();
- WordArr& operator= ( const WordArr& rOrig );
- short GetObject( sal_uInt16 nPos ) const { return operator[](nPos); }
- short& GetObject( sal_uInt16 nPos ) { return operator[](nPos); }
- void Insert( sal_uInt16 nPos, short rElem );
- void Append( short rElem );
- sal_Bool Remove( short rElem );
- sal_uInt16 Remove( sal_uInt16 nPos, sal_uInt16 nLen );
- sal_uInt16 Count() const { return nUsed; }
- short* operator*();
- short operator[]( sal_uInt16 nPos ) const;
- short& operator[]( sal_uInt16 nPos );
- sal_Bool Contains( const short rItem ) const;
- void Clear() { Remove( 0, Count() ); }
-};
-
-inline short* WordArr::operator*()
-{
- return ( nUsed==0 ? 0 : pData );
-}
-
-#define DECL_2BYTEARRAY(ARR, T, nI, nG)\
-class ARR: public WordArr\
-{\
-public:\
- ARR( sal_uInt8 nIni=nI, sal_uInt8 nGrowValue=nG ):\
- WordArr(nIni,nGrowValue) \
- {}\
- ARR( const ARR& rOrig ):\
- WordArr(rOrig) \
- {}\
- T GetObject( sal_uInt16 nPos ) const { return operator[](nPos); } \
- T& GetObject( sal_uInt16 nPos ) { return operator[](nPos); } \
- void Insert( sal_uInt16 nPos, T aElement ) {\
- WordArr::Insert(nPos,(short)aElement);\
- }\
- void Append( T aElement ) {\
- WordArr::Append((short)aElement);\
- }\
- void Remove( T aElement ) {\
- WordArr::Remove((short)aElement);\
- }\
- void Remove( sal_uInt16 nPos, sal_uInt16 nLen = 1 ) {\
- WordArr::Remove( nPos, nLen ); \
- }\
- T* operator *() {\
- return (T*) WordArr::operator*();\
- }\
- T operator[]( sal_uInt16 nPos ) const { \
- return (T) WordArr::operator[](nPos); } \
- T& operator[]( sal_uInt16 nPos ) { \
- return (T&) WordArr::operator[](nPos); } \
- void Clear() { Remove( 0, Count() ); }\
-};
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/msgpool.hxx b/sfx2/inc/sfx2/msgpool.hxx
index 05854ed..41de485 100644
--- a/sfx2/inc/sfx2/msgpool.hxx
+++ b/sfx2/inc/sfx2/msgpool.hxx
@@ -36,13 +36,16 @@
#include <tools/string.hxx>
#include <svl/svarray.hxx>
+#include <string>
+
class SfxInterface;
class SfxSlot;
class SfxInterfaceArr_Impl;
-class SfxSlotGroupArr_Impl;
class SfxSlotTypeArr_Impl;
class SfxSlotArr_Impl;
+typedef std::basic_string< sal_uInt16 > SfxSlotGroupArr_Impl;
+
//=========================================================================
class SFX2_DLLPUBLIC SfxSlotPool
diff --git a/sfx2/source/bastyp/minarray.cxx b/sfx2/source/bastyp/minarray.cxx
index 2137c62..70e4bfb 100644
--- a/sfx2/source/bastyp/minarray.cxx
+++ b/sfx2/source/bastyp/minarray.cxx
@@ -267,237 +267,4 @@ void SfxPtrArr::Insert( sal_uInt16 nPos, void* rElem )
nUnused -= 1;
}
-// class WordArr ---------------------------------------------------------
-
-WordArr::WordArr( sal_uInt8 nInitSize, sal_uInt8 nGrowSize ):
- nUsed( 0 ),
- nGrow( nGrowSize ? nGrowSize : 1 ),
- nUnused( nInitSize )
-{
- DBG_MEMTEST();
- sal_uInt16 nMSCBug = nInitSize;
-
- if ( nInitSize > 0 )
- pData = new short[nMSCBug];
- else
- pData = 0;
-}
-
-// -----------------------------------------------------------------------
-
-WordArr::WordArr( const WordArr& rOrig )
-{
- DBG_MEMTEST();
- nUsed = rOrig.nUsed;
- nGrow = rOrig.nGrow;
- nUnused = rOrig.nUnused;
-
- if ( rOrig.pData != 0 )
- {
- pData = new short[nUsed+nUnused];
- memcpy( pData, rOrig.pData, nUsed*sizeof(short) );
- }
- else
- pData = 0;
-}
-
-// -----------------------------------------------------------------------
-
-WordArr::~WordArr()
-{
- DBG_MEMTEST();
- delete [] pData;
-}
-
-// -----------------------------------------------------------------------
-
-WordArr& WordArr::operator=( const WordArr& rOrig )
-{
- DBG_MEMTEST();
-
- delete [] pData;
-
- nUsed = rOrig.nUsed;
- nGrow = rOrig.nGrow;
- nUnused = rOrig.nUnused;
-
- if ( rOrig.pData != 0 )
- {
- pData = new short[nUsed+nUnused];
- memcpy( pData, rOrig.pData, nUsed*sizeof(short) );
- }
- else
- pData = 0;
- return *this;
-}
-
-// -----------------------------------------------------------------------
-
-void WordArr::Append( short aElem )
-{
- DBG_MEMTEST();
- // Does the Array need to be copied?
- if ( nUnused == 0 )
- {
- sal_uInt16 nNewSize = (nUsed == 1) ? (nGrow==1 ? 2 : nGrow) : nUsed+nGrow;
- short* pNewData = new short[nNewSize];
- if ( pData )
- {
- DBG_ASSERT( nUsed <= nNewSize, " " );
- memmove( pNewData, pData, sizeof(short)*nUsed );
- delete [] pData;
- }
- nUnused = sal::static_int_cast< sal_uInt8 >(nNewSize-nUsed);
- pData = pNewData;
- }
-
- // now write at the back in the open space
- pData[nUsed] = aElem;
- ++nUsed;
- --nUnused;
-}
-
-// -----------------------------------------------------------------------
-
-sal_uInt16 WordArr::Remove( sal_uInt16 nPos, sal_uInt16 nLen )
-{
- DBG_MEMTEST();
- // Adjust nLen, thus to avoid deleting beyond the end
- nLen = Min( (sal_uInt16)(nUsed-nPos), nLen );
-
- // simple problems require simple solutions!
- if ( nLen == 0 )
- return 0;
-
- // Maybe no one will remain
- if ( (nUsed-nLen) == 0 )
- {
- delete [] pData;
- pData = 0;
- nUsed = 0;
- nUnused = 0;
- return nLen;
- }
-
- // Determine whether the array has physically shrunk...
- if ( (nUnused+nLen) >= nGrow )
- {
- // reduce (rounded up) to the next Grow-border
- sal_uInt16 nNewUsed = nUsed-nLen;
- sal_uInt16 nNewSize = ((nNewUsed+nGrow-1)/nGrow) * nGrow;
- DBG_ASSERT( nNewUsed <= nNewSize && nNewUsed+nGrow > nNewSize,
- "shrink size computation failed" );
- short* pNewData = new short[nNewSize];
- if ( nPos > 0 )
- {
- DBG_ASSERT( nPos <= nNewSize, "" );
- memmove( pNewData, pData, sizeof(short)*nPos );
- }
- if ( nNewUsed != nPos )
- memmove( pNewData+nPos, pData+nPos+nLen,
- sizeof(short)*(nNewUsed-nPos) );
- delete [] pData;
- pData = pNewData;
- nUsed = nNewUsed;
- nUnused = sal::static_int_cast< sal_uInt8 >(nNewSize - nNewUsed);
- return nLen;
- }
-
- // in all other cases, only push together
- if ( nUsed-nPos-nLen > 0 )
- memmove( pData+nPos, pData+nPos+nLen, (nUsed-nPos-nLen)*sizeof(short) );
- nUsed = nUsed - nLen;
- nUnused = sal::static_int_cast< sal_uInt8 >(nUnused + nLen);
- return nLen;
-}
-
-// -----------------------------------------------------------------------
-
-sal_Bool WordArr::Remove( short aElem )
-{
- DBG_MEMTEST();
- // simple tasks ...
- if ( nUsed == 0 )
- return sal_False;
-
- // backwards, since most of the last is first removed
- short *pIter = pData + nUsed - 1;
- for ( sal_uInt16 n = 0; n < nUsed; ++n, --pIter )
- if ( *pIter == aElem )
- {
- Remove(nUsed-n-1, 1);
- return sal_True;
- }
- return sal_False;
-}
-
-// -----------------------------------------------------------------------
-
-sal_Bool WordArr::Contains( const short rItem ) const
-{
- DBG_MEMTEST();
- if ( !nUsed )
- return sal_False;
-
- for ( sal_uInt16 n = 0; n < nUsed; ++n )
- {
- short p = GetObject(n);
- if ( p == rItem )
- return sal_True;
- }
-
- return sal_False;
-}
-
-// -----------------------------------------------------------------------
-
-void WordArr::Insert( sal_uInt16 nPos, short rElem )
-{
- DBG_MEMTEST();
- // Does the Array need to be copied?
- if ( nUnused == 0 )
- {
- // increase (rounded up) to the next Grow-border
- sal_uInt16 nNewSize = nUsed+nGrow;
- short* pNewData = new short[nNewSize];
-
- if ( pData )
- {
- DBG_ASSERT( nUsed < nNewSize, "" );
- memmove( pNewData, pData, sizeof(short)*nUsed );
- delete [] pData;
- }
- nUnused = sal::static_int_cast< sal_uInt8 >(nNewSize-nUsed);
- pData = pNewData;
- }
-
- // Now move the rear part
- if ( nPos < nUsed )
- memmove( pData+nPos+1, pData+nPos, (nUsed-nPos)*sizeof(short) );
-
- // now write at the back in the open space
- memmove( pData+nPos, &rElem, sizeof(short) );
- nUsed += 1;
- nUnused -= 1;
-}
-
-// -----------------------------------------------------------------------
-
-short WordArr::operator[]( sal_uInt16 nPos ) const
-{
- DBG_MEMTEST();
- DBG_ASSERT( nPos < nUsed, "" );
- return *(pData+nPos);
-}
-
-// -----------------------------------------------------------------------
-
-short& WordArr::operator [] (sal_uInt16 nPos)
-{
- DBG_MEMTEST();
- DBG_ASSERT( nPos < nUsed, "" );
- return *(pData+nPos);
-}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/control/msgpool.cxx b/sfx2/source/control/msgpool.cxx
index b2afa3d..7a44410 100644
--- a/sfx2/source/control/msgpool.cxx
+++ b/sfx2/source/control/msgpool.cxx
@@ -57,11 +57,9 @@ struct SfxSlotType_Impl
{}
};
-DECL_2BYTEARRAY(SfxSlotGroupArr_Impl, sal_uInt16, 6, 4)
DECL_PTRARRAY(SfxInterfaceArr_Impl, SfxInterface*, 6, 3)
DECL_PTRARRAY(SfxSlotTypeArr_Impl, SfxSlotType_Impl*, 8, 8)
-
//====================================================================
SfxSlotPool::SfxSlotPool( SfxSlotPool *pParent, ResMgr* pResManager )
@@ -121,9 +119,7 @@ void SfxSlotPool::RegisterInterface( SfxInterface& rInterface )
if ( _pParentPool )
{
// The Groups in parent Slotpool are also known here
- SfxSlotGroupArr_Impl& rGroups = *_pParentPool->_pGroups;
- for ( sal_uInt16 n=0; n<rGroups.Count(); n++ )
- _pGroups->Append( rGroups[n] );
+ _pGroups->append( *_pParentPool->_pGroups );
}
}
@@ -133,12 +129,12 @@ void SfxSlotPool::RegisterInterface( SfxInterface& rInterface )
{
SfxSlot *pDef = rInterface[nFunc];
if ( pDef->GetGroupId() && /* pDef->GetGroupId() != GID_INTERN && */
- !_pGroups->Contains(pDef->GetGroupId()) )
+ _pGroups->find(pDef->GetGroupId()) == SfxSlotGroupArr_Impl::npos )
{
if (pDef->GetGroupId() == GID_INTERN)
- _pGroups->Insert(0, pDef->GetGroupId());
+ _pGroups->insert(_pGroups->begin(), pDef->GetGroupId());
else
- _pGroups->Append(pDef->GetGroupId());
+ _pGroups->push_back(pDef->GetGroupId());
}
}
}
@@ -193,13 +189,13 @@ String SfxSlotPool::SeekGroup( sal_uInt16 nNo )
DBG_ASSERT( _pInterfaces != 0, "no Interfaces registered" );
// if the group exists, use it
- if ( _pGroups && nNo < _pGroups->Count() )
+ if ( _pGroups && nNo < _pGroups->size() )
{
_nCurGroup = nNo;
if ( _pParentPool )
{
// In most cases, the order of the IDs agree
- sal_uInt16 nParentCount = _pParentPool->_pGroups->Count();
+ sal_uInt16 nParentCount = _pParentPool->_pGroups->size();
if ( nNo < nParentCount && (*_pGroups)[nNo] == (*_pParentPool->_pGroups)[nNo] )
_pParentPool->_nCurGroup = nNo;
else
@@ -233,7 +229,7 @@ String SfxSlotPool::SeekGroup( sal_uInt16 nNo )
sal_uInt16 SfxSlotPool::GetGroupCount()
{
- return _pGroups->Count();
+ return _pGroups->size();
}
@@ -251,7 +247,7 @@ const SfxSlot* SfxSlotPool::SeekSlot( sal_uInt16 nStartInterface )
// have reached the end of the Parent-Pools?
if ( nStartInterface < nFirstInterface &&
- _pParentPool->_nCurGroup >= _pParentPool->_pGroups->Count() )
+ _pParentPool->_nCurGroup >= _pParentPool->_pGroups->size() )
nStartInterface = nFirstInterface;
// Is the Interface still in the Parent-Pool?
@@ -274,7 +270,7 @@ const SfxSlot* SfxSlotPool::SeekSlot( sal_uInt16 nStartInterface )
++_nCurMsg )
{
const SfxSlot* pMsg = (*pInterface)[_nCurMsg];
- if ( pMsg->GetGroupId() == _pGroups->GetObject(_nCurGroup) )
+ if ( pMsg->GetGroupId() == _pGroups->at(_nCurGroup) )
return pMsg;
}
}
@@ -293,7 +289,7 @@ const SfxSlot* SfxSlotPool::NextSlot()
// The numbering starts at the interfaces of the parent pool
sal_uInt16 nFirstInterface = _pParentPool ? _pParentPool->_pInterfaces->Count() : 0;
- if ( _nCurInterface < nFirstInterface && _nCurGroup >= _pParentPool->_pGroups->Count() )
+ if ( _nCurInterface < nFirstInterface && _nCurGroup >= _pParentPool->_pGroups->size() )
_nCurInterface = nFirstInterface;
if ( _nCurInterface < nFirstInterface )
@@ -318,7 +314,7 @@ const SfxSlot* SfxSlotPool::NextSlot()
while ( ++_nCurMsg < pInterface->Count() )
{
SfxSlot* pMsg = (*pInterface)[_nCurMsg];
- if ( pMsg->GetGroupId() == _pGroups->GetObject(_nCurGroup) )
+ if ( pMsg->GetGroupId() == _pGroups->at(_nCurGroup) )
return pMsg;
}
diff --git a/unusedcode.easy b/unusedcode.easy
index 5dc021f..5b4e319 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1790,7 +1790,6 @@ WindowArrange::Arrange(unsigned short, Rectangle const&)
WindowArrange::WindowArrange()
WindowArrange::~WindowArrange()
WizardDialog::IsButtonFixedLineVisible()
-WordArr::Remove(short)
WrongRanges::Insert(WrongRanges const*, unsigned short, unsigned short, unsigned short)
WrongRanges::Replace(WrongRange const&, unsigned short)
WrongRanges::Replace(WrongRange const*, unsigned short, unsigned short)
commit fa77c78adaf0035000a0c107379ccd5abd348c91
Author: Jan Holesovsky <kendy at suse.cz>
Date: Mon Aug 15 09:44:09 2011 +0200
callcatcher: Remove unused ByteArr class, and DECL_1BYTEARRAY define.
diff --git a/sfx2/inc/sfx2/minarray.hxx b/sfx2/inc/sfx2/minarray.hxx
index 9ed76ed..37c82cf 100644
--- a/sfx2/inc/sfx2/minarray.hxx
+++ b/sfx2/inc/sfx2/minarray.hxx
@@ -390,71 +390,6 @@ public:\
void Clear() { Remove( 0, Count() ); }\
};
-class ByteArr
-{
-private:
- char* pData;
- sal_uInt16 nUsed;
- sal_uInt8 nGrow;
- sal_uInt8 nUnused;
-public:
- ByteArr( sal_uInt8 nInitSize = 0, sal_uInt8 nGrowSize = 8 );
- ByteArr( const ByteArr& rOrig );
- ~ByteArr();
- ByteArr& operator= ( const ByteArr& rOrig );
- char GetObject( sal_uInt16 nPos ) const { return operator[](nPos); }
- char& GetObject( sal_uInt16 nPos ) { return operator[](nPos); }
- void Insert( sal_uInt16 nPos, char rElem );
- void Append( char rElem );
- sal_Bool Remove( char rElem );
- sal_uInt16 Remove( sal_uInt16 nPos, sal_uInt16 nLen );
- sal_uInt16 Count() const { return nUsed; }
- char* operator*();
- char operator[]( sal_uInt16 nPos ) const;
- char& operator[]( sal_uInt16 nPos );
- sal_Bool Contains( const char rItem ) const;
- void Clear() { Remove( 0, Count() ); }
-};
-
-inline char* ByteArr::operator*()
-{
- return ( nUsed==0 ? 0 : pData );
-}
-
-#define DECL_1BYTEARRAY(ARR, T, nI, nG)\
-class ARR: public ByteArr\
-{\
-public:\
- ARR( sal_uInt8 nIni=nI, sal_uInt8 nGrow=nG ):\
- ByteArr(nIni,nGrow) \
- {}\
- ARR( const ARR& rOrig ):\
- ByteArr(rOrig) \
- {}\
- T GetObject( sal_uInt16 nPos ) const { return operator[](nPos); } \
- T& GetObject( sal_uInt16 nPos ) { return operator[](nPos); } \
- void Insert( sal_uInt16 nPos, T aElement ) {\
- ByteArr::Insert(nPos,(char)aElement);\
- }\
- void Append( T aElement ) {\
- ByteArr::Append((char)aElement);\
- }\
- void Remove( T aElement ) {\
- ByteArr::Remove((char)aElement);\
- }\
- void Remove( sal_uInt16 nPos, sal_uInt16 nLen = 1 ) {\
- ByteArr::Remove( nPos, nLen ); \
- }\
- T* operator *() {\
- return (T*) ByteArr::operator*();\
- }\
- T operator[]( sal_uInt16 nPos ) const { \
- return (T) ByteArr::operator[](nPos); } \
- T& operator[]( sal_uInt16 nPos ) { \
- return (T&) ByteArr::operator[](nPos); } \
- void Clear() { Remove( 0, Count() ); }\
-};
-
class WordArr
{
private:
diff --git a/sfx2/source/bastyp/minarray.cxx b/sfx2/source/bastyp/minarray.cxx
index 4deae25..2137c62 100644
--- a/sfx2/source/bastyp/minarray.cxx
+++ b/sfx2/source/bastyp/minarray.cxx
@@ -267,238 +267,6 @@ void SfxPtrArr::Insert( sal_uInt16 nPos, void* rElem )
nUnused -= 1;
}
-// class ByteArr ---------------------------------------------------------
-
-ByteArr::ByteArr( sal_uInt8 nInitSize, sal_uInt8 nGrowSize ):
- nUsed( 0 ),
- nGrow( nGrowSize ? nGrowSize : 1 ),
- nUnused( nInitSize )
-{
- DBG_MEMTEST();
- sal_uInt16 nMSCBug = nInitSize;
-
- if ( nInitSize > 0 )
- pData = new char[nMSCBug];
- else
- pData = 0;
-}
-
-// -----------------------------------------------------------------------
-
-ByteArr::ByteArr( const ByteArr& rOrig )
-{
- DBG_MEMTEST();
- nUsed = rOrig.nUsed;
- nGrow = rOrig.nGrow;
- nUnused = rOrig.nUnused;
-
- if ( rOrig.pData != 0 )
- {
- pData = new char[nUsed+nUnused];
- memcpy( pData, rOrig.pData, nUsed*sizeof(char) );
- }
- else
- pData = 0;
-}
-
-// -----------------------------------------------------------------------
-
-ByteArr::~ByteArr()
-{
- DBG_MEMTEST();
- delete [] pData;
-}
-
-// -----------------------------------------------------------------------
-
-ByteArr& ByteArr::operator=( const ByteArr& rOrig )
-{
- DBG_MEMTEST();
-
- delete [] pData;
-
- nUsed = rOrig.nUsed;
- nGrow = rOrig.nGrow;
- nUnused = rOrig.nUnused;
-
- if ( rOrig.pData != 0 )
- {
- pData = new char[nUsed+nUnused];
- memcpy( pData, rOrig.pData, nUsed*sizeof(char) );
- }
- else
- pData = 0;
- return *this;
-}
-
-// -----------------------------------------------------------------------
-
-void ByteArr::Append( char aElem )
-{
- DBG_MEMTEST();
- // Does the Array have o be copied?
- if ( nUnused == 0 )
- {
- sal_uInt16 nNewSize = (nUsed == 1) ? (nGrow==1 ? 2 : nGrow) : nUsed+nGrow;
- char* pNewData = new char[nNewSize];
- if ( pData )
- {
- DBG_ASSERT( nUsed <= nNewSize, "" );
- memmove( pNewData, pData, sizeof(char)*nUsed );
- delete [] pData;
- }
- nUnused = sal::static_int_cast< sal_uInt8 >(nNewSize-nUsed);
- pData = pNewData;
- }
-
- // now write at the back in the open space
- pData[nUsed] = aElem;
- ++nUsed;
- --nUnused;
-}
-
-// -----------------------------------------------------------------------
-
-sal_uInt16 ByteArr::Remove( sal_uInt16 nPos, sal_uInt16 nLen )
-{
- DBG_MEMTEST();
- // Adjust nLen, thus to avoid deleting beyond the end
- nLen = Min( (sal_uInt16)(nUsed-nPos), nLen );
-
- // simple problems require simple solutions!
- if ( nLen == 0 )
- return 0;
-
- // Maybe no one will remain
- if ( (nUsed-nLen) == 0 )
- {
- delete [] pData;
- pData = 0;
- nUsed = 0;
- nUnused = 0;
- return nLen;
- }
-
- // Determine whether the array has physically shrunk...
- if ( (nUnused+nLen) >= nGrow )
- {
- // reduce (rounded up) to the next Grow-border
- sal_uInt16 nNewUsed = nUsed-nLen;
- sal_uInt16 nNewSize = ((nNewUsed+nGrow-1)/nGrow) * nGrow;
- DBG_ASSERT( nNewUsed <= nNewSize && nNewUsed+nGrow > nNewSize,
- "shrink size computation failed" );
- char* pNewData = new char[nNewSize];
- if ( nPos > 0 )
- {
- DBG_ASSERT( nPos <= nNewSize, "" );
- memmove( pNewData, pData, sizeof(char)*nPos );
- }
- if ( nNewUsed != nPos )
- memmove( pNewData+nPos, pData+nPos+nLen,
- sizeof(char)*(nNewUsed-nPos) );
- delete [] pData;
- pData = pNewData;
- nUsed = nNewUsed;
- nUnused = sal::static_int_cast< sal_uInt8 >(nNewSize - nNewUsed);
- return nLen;
- }
-
- // in all other cases, only push together
- if ( nUsed-nPos-nLen > 0 )
- memmove( pData+nPos, pData+nPos+nLen, (nUsed-nPos-nLen)*sizeof(char) );
- nUsed = nUsed - nLen;
- nUnused = sal::static_int_cast< sal_uInt8 >(nUnused + nLen);
- return nLen;
-}
-
-// -----------------------------------------------------------------------
-
-sal_Bool ByteArr::Remove( char aElem )
-{
- DBG_MEMTEST();
- // simple tasks ...
- if ( nUsed == 0 )
- return sal_False;
-
- // backwards, since most of the last is first removed
- char *pIter = pData + nUsed - 1;
- for ( sal_uInt16 n = 0; n < nUsed; ++n, --pIter )
- if ( *pIter == aElem )
- {
- Remove(nUsed-n-1, 1);
- return sal_True;
- }
- return sal_False;
-}
-
-// -----------------------------------------------------------------------
-
-sal_Bool ByteArr::Contains( const char rItem ) const
-{
- DBG_MEMTEST();
- if ( !nUsed )
- return sal_False;
-
- for ( sal_uInt16 n = 0; n < nUsed; ++n )
- {
- char p = GetObject(n);
- if ( p == rItem )
- return sal_True;
- }
-
- return sal_False;
-}
-
-// -----------------------------------------------------------------------
-
-void ByteArr::Insert( sal_uInt16 nPos, char rElem )
-{
- DBG_MEMTEST();
- // Does the Array need to be copied?
- if ( nUnused == 0 )
- {
- // increase (rounded up) to the next Grow-border
- sal_uInt16 nNewSize = nUsed+nGrow;
- char* pNewData = new char[nNewSize];
-
- if ( pData )
- {
- DBG_ASSERT( nUsed < nNewSize, "" );
- memmove( pNewData, pData, sizeof(char)*nUsed );
- delete [] pData;
- }
- nUnused = sal::static_int_cast< sal_uInt8 >(nNewSize-nUsed);
- pData = pNewData;
- }
-
- // Now move the rear part
- if ( nPos < nUsed )
- memmove( pData+nPos+1, pData+nPos, (nUsed-nPos)*sizeof(char) );
-
- // now write at the back in the open space
- memmove( pData+nPos, &rElem, sizeof(char) );
- nUsed += 1;
- nUnused -= 1;
-}
-
-// -----------------------------------------------------------------------
-
-char ByteArr::operator[]( sal_uInt16 nPos ) const
-{
- DBG_MEMTEST();
- DBG_ASSERT( nPos < nUsed, "" );
- return *(pData+nPos);
-}
-
-// -----------------------------------------------------------------------
-
-char& ByteArr::operator [] (sal_uInt16 nPos)
-{
- DBG_MEMTEST();
- DBG_ASSERT( nPos < nUsed, "" );
- return *(pData+nPos);
-}
-
// class WordArr ---------------------------------------------------------
WordArr::WordArr( sal_uInt8 nInitSize, sal_uInt8 nGrowSize ):
diff --git a/unusedcode.easy b/unusedcode.easy
index 48917dd..5dc021f 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -14,12 +14,6 @@ BitmapPalette::IsGreyPalette() const
BreakPointList::clear()
BreakPointList::push_back(BreakPoint*)
BufferNode::childAt(int) const
-ByteArr::Append(char)
-ByteArr::ByteArr(unsigned char, unsigned char)
-ByteArr::Contains(char) const
-ByteArr::Insert(unsigned short, char)
-ByteArr::Remove(char)
-ByteArr::~ByteArr()
CAT::Inverse() const
CAT::makeChromaticAdaptationTag() const
CIccCmm::FromInternalEncoding(icColorSpaceSignature, unsigned char*, float const*)
commit 099c219cf67e469c4177d41bfcdbfb70a9988931
Author: Jan Holesovsky <kendy at suse.cz>
Date: Mon Aug 15 09:18:29 2011 +0200
callcatcher: Remove unused ButtonDialog methods.
diff --git a/unusedcode.easy b/unusedcode.easy
index d4d8353..48917dd 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -14,12 +14,6 @@ BitmapPalette::IsGreyPalette() const
BreakPointList::clear()
BreakPointList::push_back(BreakPoint*)
BufferNode::childAt(int) const
-ButtonDialog::AddButton(PushButton*, unsigned short, unsigned short, long)
-ButtonDialog::ButtonDialog(Window*, ResId const&)
-ButtonDialog::GetButtonHelpId(unsigned short) const
-ButtonDialog::GetButtonHelpText(unsigned short) const
-ButtonDialog::GetButtonText(unsigned short) const
-ButtonDialog::SetButtonHelpId(unsigned short, rtl::OString const&)
ByteArr::Append(char)
ByteArr::ByteArr(unsigned char, unsigned char)
ByteArr::Contains(char) const
diff --git a/vcl/inc/vcl/btndlg.hxx b/vcl/inc/vcl/btndlg.hxx
index ec537f5..5c0348c 100644
--- a/vcl/inc/vcl/btndlg.hxx
+++ b/vcl/inc/vcl/btndlg.hxx
@@ -81,7 +81,6 @@ protected:
public:
ButtonDialog( Window* pParent, WinBits nStyle = WB_STDDIALOG );
- ButtonDialog( Window* pParent, const ResId& rResId );
~ButtonDialog();
virtual void Resize();
@@ -96,18 +95,13 @@ public:
void AddButton( const XubString& rText, sal_uInt16 nId, sal_uInt16 nBtnFlags, long nSepPixel = 0 );
void AddButton( StandardButtonType eType, sal_uInt16 nId, sal_uInt16 nBtnFlags, long nSepPixel = 0 );
- void AddButton( PushButton* pBtn, sal_uInt16 nId, sal_uInt16 nBtnFlags, long nSepPixel = 0 );
void RemoveButton( sal_uInt16 nId );
void Clear();
sal_uInt16 GetButtonCount() const;
sal_uInt16 GetButtonId( sal_uInt16 nButton ) const;
PushButton* GetPushButton( sal_uInt16 nId ) const;
void SetButtonText( sal_uInt16 nId, const XubString& rText );
- XubString GetButtonText( sal_uInt16 nId ) const;
void SetButtonHelpText( sal_uInt16 nId, const XubString& rText );
- XubString GetButtonHelpText( sal_uInt16 nId ) const;
- void SetButtonHelpId( sal_uInt16 nId, const rtl::OString& rHelpId );
- rtl::OString GetButtonHelpId( sal_uInt16 nId ) const;
void SetFocusButton( sal_uInt16 nId = BUTTONDIALOG_BUTTON_NOTFOUND ) { mnFocusButtonId = nId; }
sal_uInt16 GetFocusButton() const { return mnFocusButtonId; }
diff --git a/vcl/source/window/btndlg.cxx b/vcl/source/window/btndlg.cxx
index add12e4..702f28c 100644
--- a/vcl/source/window/btndlg.cxx
+++ b/vcl/source/window/btndlg.cxx
@@ -70,15 +70,6 @@ ButtonDialog::ButtonDialog( Window* pParent, WinBits nStyle ) :
ImplInit( pParent, nStyle );
}
-ButtonDialog::ButtonDialog( Window* pParent, const ResId& rResId ) :
- Dialog( WINDOW_BUTTONDIALOG )
-{
- ImplInitButtonDialogData();
- rResId.SetRT( RSC_DIALOG ); // !!!!!!!!!! RSC_BUTTONDIALOG !!!!!!!!
- ImplInit( pParent, ImplInitRes( rResId ) );
- ImplLoadRes( rResId );
-}
-
ButtonDialog::~ButtonDialog()
{
for ( btn_iterator it = maItemList.begin(); it != maItemList.end(); ++it)
@@ -338,24 +329,6 @@ void ButtonDialog::AddButton( StandardButtonType eType, sal_uInt16 nId,
mbFormat = sal_True;
}
-void ButtonDialog::AddButton( PushButton* pBtn, sal_uInt16 nId,
- sal_uInt16 nBtnFlags, long nSepPixel )
-{
- // PageItem anlegen
- ImplBtnDlgItem* pItem = new ImplBtnDlgItem;
- pItem->mnId = nId;
- pItem->mbOwnButton = sal_False;
- pItem->mnSepSize = nSepPixel;
- pItem->mpPushButton = pBtn;
-
- if ( nBtnFlags & BUTTONDIALOG_FOCUSBUTTON )
- mnFocusButtonId = nId;
-
- maItemList.push_back(pItem);
-
- mbFormat = sal_True;
-}
-
void ButtonDialog::RemoveButton( sal_uInt16 nId )
{
btn_iterator it;
@@ -425,16 +398,6 @@ void ButtonDialog::SetButtonText( sal_uInt16 nId, const XubString& rText )
}
}
-XubString ButtonDialog::GetButtonText( sal_uInt16 nId ) const
-{
- ImplBtnDlgItem* pItem = ImplGetItem( nId );
-
- if ( pItem )
- return pItem->mpPushButton->GetText();
- else
- return ImplGetSVEmptyStr();
-}
-
void ButtonDialog::SetButtonHelpText( sal_uInt16 nId, const XubString& rText )
{
ImplBtnDlgItem* pItem = ImplGetItem( nId );
@@ -443,29 +406,4 @@ void ButtonDialog::SetButtonHelpText( sal_uInt16 nId, const XubString& rText )
pItem->mpPushButton->SetHelpText( rText );
}
-XubString ButtonDialog::GetButtonHelpText( sal_uInt16 nId ) const
-{
- ImplBtnDlgItem* pItem = ImplGetItem( nId );
-
- if ( pItem )
- return pItem->mpPushButton->GetHelpText();
- else
- return ImplGetSVEmptyStr();
-}
-
-void ButtonDialog::SetButtonHelpId( sal_uInt16 nId, const rtl::OString& rHelpId )
-{
- ImplBtnDlgItem* pItem = ImplGetItem( nId );
-
- if ( pItem )
- pItem->mpPushButton->SetHelpId( rHelpId );
-}
-
-rtl::OString ButtonDialog::GetButtonHelpId( sal_uInt16 nId ) const
-{
- ImplBtnDlgItem* pItem = ImplGetItem( nId );
-
- return pItem ? rtl::OString( pItem->mpPushButton->GetHelpId() ) : rtl::OString();
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit fc3d82ad7acaa63e852d1d4ee39324e96ecd8810
Author: Jan Holesovsky <kendy at suse.cz>
Date: Mon Aug 15 09:12:17 2011 +0200
callcatcher: Remove unused Button methods.
mpBitmapEx member is unused after this too, remove.
diff --git a/unusedcode.easy b/unusedcode.easy
index 83cfbc6..d4d8353 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -14,13 +14,6 @@ BitmapPalette::IsGreyPalette() const
BreakPointList::clear()
BreakPointList::push_back(BreakPoint*)
BufferNode::childAt(int) const
-Button::Button(Window*, ResId const&)
-Button::Button(Window*, long)
-Button::GetFocusRect() const
-Button::GetModeBitmap() const
-Button::IsImageDisplayEnabled()
-Button::IsTextDisplayEnabled()
-Button::SetModeBitmap(BitmapEx const&)
ButtonDialog::AddButton(PushButton*, unsigned short, unsigned short, long)
ButtonDialog::ButtonDialog(Window*, ResId const&)
ButtonDialog::GetButtonHelpId(unsigned short) const
diff --git a/vcl/inc/vcl/button.hxx b/vcl/inc/vcl/button.hxx
index 9bf72f8..3222734 100644
--- a/vcl/inc/vcl/button.hxx
+++ b/vcl/inc/vcl/button.hxx
@@ -74,8 +74,6 @@ protected:
Button( WindowType nType );
public:
- Button( Window* pParent, WinBits nStyle = 0 );
- Button( Window* pParent, const ResId& rResId );
~Button();
virtual void Click();
@@ -92,16 +90,10 @@ public:
void SetImageAlign( ImageAlign eAlign );
ImageAlign GetImageAlign() const;
- sal_Bool SetModeBitmap( const BitmapEx& rBitmap );
- BitmapEx GetModeBitmap( ) const;
-
void EnableImageDisplay( sal_Bool bEnable );
- sal_Bool IsImageDisplayEnabled();
void EnableTextDisplay( sal_Bool bEnable );
- sal_Bool IsTextDisplayEnabled();
void SetFocusRect( const Rectangle& rFocusRect );
- const Rectangle& GetFocusRect() const;
void SetSmallSymbol (bool bSmall=true);
bool IsSmallSymbol () const;
};
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index c65758b..103c9a5 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -79,7 +79,6 @@ public:
sal_Bool mbSmallSymbol;
Image maImage;
- BitmapEx* mpBitmapEx;
ImageAlign meImageAlign;
SymbolAlign meSymbolAlign;
@@ -94,7 +93,6 @@ ImplCommonButtonData::ImplCommonButtonData()
mnButtonState = 0;
mbSmallSymbol = sal_False;
- mpBitmapEx = NULL;
meImageAlign = IMAGEALIGN_TOP;
meSymbolAlign = SYMBOLALIGN_LEFT;
}
@@ -102,7 +100,6 @@ ImplCommonButtonData::ImplCommonButtonData()
// -----------------------------------------------------------------------
ImplCommonButtonData::~ImplCommonButtonData()
{
- delete mpBitmapEx;
}
// =======================================================================
@@ -115,30 +112,6 @@ Button::Button( WindowType nType ) :
// -----------------------------------------------------------------------
-Button::Button( Window* pParent, WinBits nStyle ) :
- Control( WINDOW_BUTTON )
-{
- mpButtonData = new ImplCommonButtonData;
- ImplInit( pParent, nStyle, NULL );
-}
-
-// -----------------------------------------------------------------------
-
-Button::Button( Window* pParent, const ResId& rResId ) :
- Control( WINDOW_BUTTON )
-{
- rResId.SetRT( RSC_BUTTON );
- mpButtonData = new ImplCommonButtonData;
- WinBits nStyle = ImplInitRes( rResId );
- ImplInit( pParent, nStyle, NULL );
- ImplLoadRes( rResId );
-
- if ( !(nStyle & WB_HIDE) )
- Show();
-}
-
-// -----------------------------------------------------------------------
-
Button::~Button()
{
delete mpButtonData;
@@ -209,9 +182,6 @@ sal_Bool Button::SetModeImage( const Image& rImage )
{
if ( rImage != mpButtonData->maImage )
{
- delete mpButtonData->mpBitmapEx;
-
- mpButtonData->mpBitmapEx = NULL;
mpButtonData->maImage = rImage;
StateChanged( STATE_CHANGE_DATA );
@@ -248,41 +218,13 @@ ImageAlign Button::GetImageAlign() const
}
// -----------------------------------------------------------------------
-sal_Bool Button::SetModeBitmap( const BitmapEx& rBitmap )
-{
- if ( SetModeImage( rBitmap ) )
- {
- if ( !mpButtonData->mpBitmapEx )
- mpButtonData->mpBitmapEx = new BitmapEx( rBitmap );
- return sal_True;
- }
- return sal_False;
-}
-
-// -----------------------------------------------------------------------
-BitmapEx Button::GetModeBitmap( ) const
-{
- BitmapEx aBmp;
- if ( mpButtonData->mpBitmapEx )
- aBmp = *( mpButtonData->mpBitmapEx );
-
- return aBmp;
-}
-
-// -----------------------------------------------------------------------
void Button::SetFocusRect( const Rectangle& rFocusRect )
{
ImplSetFocusRect( rFocusRect );
}
// -----------------------------------------------------------------------
-const Rectangle& Button::GetFocusRect() const
-{
- return ImplGetFocusRect();
-}
-
-// -----------------------------------------------------------------------
const Rectangle& Button::ImplGetSymbolRect() const
{
@@ -377,16 +319,6 @@ void Button::ImplDrawAlignedImage( OutputDevice* pDev, Point& rPos,
// check for HC mode ( image only! )
Image *pImage = &(mpButtonData->maImage);
- BitmapEx *pBitmapEx = mpButtonData->mpBitmapEx;
-
- if ( pBitmapEx && ( pDev->GetOutDevType() == OUTDEV_PRINTER ) )
- {
- // Die Groesse richtet sich nach dem Bildschirm, soll auf
- // dem Drucker genau so aussehen...
- MapMode aMap100thMM( MAP_100TH_MM );
- aImageSize = PixelToLogic( aImageSize, aMap100thMM );
- aImageSize = pDev->LogicToPixel( aImageSize, aMap100thMM );
- }
Size aTextSize;
Size aSymbolSize;
@@ -592,19 +524,10 @@ void Button::ImplDrawAlignedImage( OutputDevice* pDev, Point& rPos,
! IsEnabled() )
nStyle |= IMAGE_DRAW_DISABLE;
- if ( pBitmapEx && ( pDev->GetOutDevType() == OUTDEV_PRINTER ) )
- {
- // Fuer die BitmapEx ueberlegt sich KA noch, wie man die disablete
- // Darstellung hinbekommt...
- pBitmapEx->Draw( pDev, aImagePos, aImageSize /*, nStyle*/ );
- }
+ if ( IsZoom() )
+ pDev->DrawImage( aImagePos, aImageSize, *pImage, nStyle );
else
- {
- if ( IsZoom() )
- pDev->DrawImage( aImagePos, aImageSize, *pImage, nStyle );
- else
- pDev->DrawImage( aImagePos, *pImage, nStyle );
- }
+ pDev->DrawImage( aImagePos, *pImage, nStyle );
if ( bDrawText )
{
@@ -689,12 +612,6 @@ void Button::EnableImageDisplay( sal_Bool bEnable )
}
// -----------------------------------------------------------------------
-sal_Bool Button::IsImageDisplayEnabled()
-{
- return (mpButtonData->mnButtonState & BUTTON_DRAW_NOIMAGE) == 0;
-}
-
-// -----------------------------------------------------------------------
void Button::EnableTextDisplay( sal_Bool bEnable )
{
if( bEnable )
@@ -704,12 +621,6 @@ void Button::EnableTextDisplay( sal_Bool bEnable )
}
// -----------------------------------------------------------------------
-sal_Bool Button::IsTextDisplayEnabled()
-{
- return (mpButtonData->mnButtonState & BUTTON_DRAW_NOTEXT) == 0;
-}
-
-// -----------------------------------------------------------------------
void Button::SetSmallSymbol (bool small)
{
ImplSetSmallSymbol (small);
commit d17cc35e06832db12049ac2e7f66888d659fada7
Author: Jan Holesovsky <kendy at suse.cz>
Date: Mon Aug 15 08:58:00 2011 +0200
Remove unused mnBits from ValueSetItem.
diff --git a/svtools/inc/svtools/valueset.hxx b/svtools/inc/svtools/valueset.hxx
index 8bd5cd9..70f640d 100644
--- a/svtools/inc/svtools/valueset.hxx
+++ b/svtools/inc/svtools/valueset.hxx
@@ -194,27 +194,12 @@ wird, sollte in jedem Fall HideDropPos() gerufen werden.
--------------------------------------------------------------------------
-Mit SetItemBits() koennen Flags an einem Item gesetzt werden. Folgende
-Flags sind zur Zeit vorgesehen:
-
-VIB_NODOUBLECLICK Jeder Klick fuehrt zu einer Select-Aktion. Der
- Doppelklick-Handler wird in diesem Fall nie
- gerufen.
-
---------------------------------------------------------------------------
-
Diese Klasse befindet sich zur Zeit noch in den SV-Tools. Deshalb muss das
ValueSet zur Zeit als Control aus der Resource geladen werden und die
gewuenschten WinBits (vor Show) mit SetStyle() gesetzt werden.
*************************************************************************/
-// -----------------------
-// - ValueSet-Item-Typen -
-// -----------------------
-
-#define VIB_NODOUBLECLICK ((sal_uInt16)0x0080)
-
// ------------------
// - ValueSet-Typen -
// ------------------
diff --git a/svtools/source/control/valueacc.cxx b/svtools/source/control/valueacc.cxx
index 5abc504..646f88b 100644
--- a/svtools/source/control/valueacc.cxx
+++ b/svtools/source/control/valueacc.cxx
@@ -49,7 +49,6 @@ using namespace ::com::sun::star;
ValueSetItem::ValueSetItem( ValueSet& rParent )
: mrParent(rParent)
, mnId(0)
- , mnBits(0)
, meType(VALUESETITEM_NONE)
, mpData(NULL)
, mpxAcc(NULL)
diff --git a/svtools/source/control/valueimp.hxx b/svtools/source/control/valueimp.hxx
index 3e638ca..0a5398d 100644
--- a/svtools/source/control/valueimp.hxx
+++ b/svtools/source/control/valueimp.hxx
@@ -81,7 +81,6 @@ struct ValueSetItem
{
ValueSet& mrParent;
sal_uInt16 mnId;
- sal_uInt16 mnBits;
ValueSetItemType meType;
Image maImage;
Color maColor;
diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx
index 2304fa8..07e24b7 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -1353,7 +1353,7 @@ void ValueSet::MouseButtonDown( const MouseEvent& rMEvt )
{
if ( pItem && (pItem->meType != VALUESETITEM_SPACE) && !rMEvt.IsMod2() )
{
- if ( (pItem->mnBits & VIB_NODOUBLECLICK) || (rMEvt.GetClicks() == 1) )
+ if ( rMEvt.GetClicks() == 1 )
{
mnOldItemId = mnSelItemId;
mbHighlight = sal_True;
commit 0110b80eefd560de13bac34a3bcae838aaf1cba2
Author: Jan Holesovsky <kendy at suse.cz>
Date: Mon Aug 15 08:53:48 2011 +0200
callcatcher: Remove unused ValueSet methods.
diff --git a/svtools/inc/svtools/valueset.hxx b/svtools/inc/svtools/valueset.hxx
index 8c61d85..8bd5cd9 100644
--- a/svtools/inc/svtools/valueset.hxx
+++ b/svtools/inc/svtools/valueset.hxx
@@ -138,8 +138,6 @@ SetLineCount() oder mit SetItemHeight() die Anzahl der sichtbaren
Zeilen gesetzt wird, scrollt das ValueSet automatisch, wenn mehr Zeilen
vorhanden sind, als sichtbar sind. Wenn scrollen auch ueber einen
ScrollBar moeglich sein soll muss WB_VSCROLL gesetzt werden.
-Mit SetFirstLine() kann die erste sichtbare Zeile eingestellt werden, wenn
-mehr Zeilen vorhanden sind als sichtbar sind.
Mit SetExtraSpacing() kann der Abstand zwischen den Items vergroessert
werden. Der Abstand wird in Pixeln angegeben der zusaetzlich zwischen 2 Items
@@ -160,9 +158,6 @@ oder UserDraw-Items hinterlegt werden. Wenn keine Farbe eingestellt wird,
wird der Hintergrund in der gleichen Farbe hinterlegt wie andere
Fenster (WindowColor).
-Mit InsertSpace() kann man ein leeres Feld einfuegen, welches weder
-dargestellt noch selektierbar ist.
-
--------------------------------------------------------------------------
Da die Ausgabeflaeche vorberechnet wird, sollten erst alle Items eingefuegt
@@ -317,8 +312,6 @@ private:
protected:
sal_Bool StartDrag( const CommandEvent& rCEvt, Region& rRegion );
- sal_uInt16 ShowDropPos( const Point& rPos );
- void HideDropPos();
protected:
@@ -359,11 +352,8 @@ public:
size_t nPos = VALUESET_APPEND );
void InsertItem( sal_uInt16 nItemId,
size_t nPos = VALUESET_APPEND );
- void InsertSpace( sal_uInt16 nItemId,
- size_t nPos = VALUESET_APPEND );
void RemoveItem( sal_uInt16 nItemId );
- void CopyItems( const ValueSet& rValueSet );
void Clear();
size_t GetItemCount() const;
@@ -382,7 +372,6 @@ public:
long GetItemWidth() const { return mnUserItemWidth; }
void SetItemHeight( long nLineHeight = 0 );
long GetItemHeight() const { return mnUserItemHeight; }
- void SetFirstLine( sal_uInt16 nNewLine = 0 );
sal_uInt16 GetFirstLine() const { return mnFirstLine; }
void SelectItem( sal_uInt16 nItemId );
@@ -392,8 +381,6 @@ public:
void SetNoSelection();
sal_Bool IsNoSelection() const { return mbNoSelection; }
- void SetItemBits( sal_uInt16 nItemId, sal_uInt16 nBits );
- sal_uInt16 GetItemBits( sal_uInt16 nItemId ) const;
void SetItemImage( sal_uInt16 nItemId, const Image& rImage );
Image GetItemImage( sal_uInt16 nItemId ) const;
void SetItemColor( sal_uInt16 nItemId, const Color& rColor );
@@ -427,19 +414,6 @@ public:
const Link& GetDoubleClickHdl() const { return maDoubleClickHdl; }
void SetHighlightHdl( const Link& rLink );
- const Link& GetHighlightHdl() const;
-
-private:
- /** Determine whether RTL (right to left writing) is active. For this
- method to return <true/> two conditions have to be fullfilled:
- <ol><li>RTL is active for the whole application.</li>
- <li>RTL is enabled for the control.</li></ol>
- @return
- The method returns <true/> when RTL is active for the control
- and <false/> when RTL is not active. Note then just enabling
- RTL for the control is not enough.
- */
- SVT_DLLPRIVATE bool IsRTLActive (void);
};
#endif // _VALUESET_HXX
diff --git a/svtools/source/control/valueacc.cxx b/svtools/source/control/valueacc.cxx
index ced04f6..5abc504 100644
--- a/svtools/source/control/valueacc.cxx
+++ b/svtools/source/control/valueacc.cxx
@@ -77,15 +77,6 @@ uno::Reference< accessibility::XAccessible > ValueSetItem::GetAccessible( bool b
return *mpxAcc;
}
-// -----------------------------------------------------------------------
-
-void ValueSetItem::ClearAccessible()
-{
- if( mpxAcc )
- delete mpxAcc, mpxAcc = NULL;
-}
-
-
// ---------------
// - ValueSetAcc -
// ---------------
@@ -780,14 +771,6 @@ void ValueSetAcc::ThrowIfDisposed (void)
-sal_Bool ValueSetAcc::IsDisposed (void)
-{
- return (rBHelper.bDisposed || rBHelper.bInDispose);
-}
-
-
-
-
bool ValueSetAcc::HasNoneField (void) const
{
DBG_ASSERT (mpParent!=NULL, "ValueSetAcc::HasNoneField called with mpParent==NULL");
diff --git a/svtools/source/control/valueimp.hxx b/svtools/source/control/valueimp.hxx
index 57bb5fa..3e638ca 100644
--- a/svtools/source/control/valueimp.hxx
+++ b/svtools/source/control/valueimp.hxx
@@ -95,7 +95,6 @@ struct ValueSetItem
::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
GetAccessible( bool bIsTransientChildrenDisabled );
- void ClearAccessible();
};
typedef ::std::vector< ValueSetItem* > ValueItemList;
@@ -242,14 +241,6 @@ private:
void ThrowIfDisposed (void)
throw (::com::sun::star::lang::DisposedException);
- /** Check whether or not the object has been disposed (or is in the
- state of beeing disposed).
-
- @return sal_True, if the object is disposed or in the course
- of being disposed. Otherwise, sal_False is returned.
- */
- sal_Bool IsDisposed (void);
-
/** Check whether the value set has a 'none' field, i.e. a field (button)
that deselects any items (selects none of them).
@return
diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx
index c3be233..2304fa8 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -1928,30 +1928,6 @@ void ValueSet::InsertItem( sal_uInt16 nItemId, size_t nPos )
// -----------------------------------------------------------------------
-void ValueSet::InsertSpace( sal_uInt16 nItemId, size_t nPos )
-{
- DBG_ASSERT( nItemId, "ValueSet::InsertSpace(): ItemId == 0" );
- DBG_ASSERT( GetItemPos( nItemId ) == VALUESET_ITEM_NOTFOUND,
- "ValueSet::InsertSpace(): ItemId already exists" );
-
- ValueSetItem* pItem = new ValueSetItem( *this );
- pItem->mnId = nItemId;
- pItem->meType = VALUESETITEM_SPACE;
- if ( nPos < mpImpl->mpItemList->size() ) {
- ValueItemList::iterator it = mpImpl->mpItemList->begin();
- ::std::advance( it, nPos );
- mpImpl->mpItemList->insert( it, pItem );
- } else {
- mpImpl->mpItemList->push_back( pItem );
- }
-
- mbFormat = sal_True;
- if ( IsReallyVisible() && IsUpdateMode() )
- Invalidate();
-}
-
-// -----------------------------------------------------------------------
-
void ValueSet::RemoveItem( sal_uInt16 nItemId )
{
size_t nPos = GetItemPos( nItemId );
@@ -1983,42 +1959,6 @@ void ValueSet::RemoveItem( sal_uInt16 nItemId )
// -----------------------------------------------------------------------
-void ValueSet::CopyItems( const ValueSet& rValueSet )
-{
- ImplDeleteItems();
-
- for ( size_t i = 0, n = rValueSet.mpImpl->mpItemList->size(); i < n; ++i )
- {
- ValueSetItem* pItem = (*rValueSet.mpImpl->mpItemList)[ i ];
- ValueSetItem* pNewItem = new ValueSetItem( *this );
-
- pNewItem->mnId = pItem->mnId;
- pNewItem->mnBits = pItem->mnBits;
- pNewItem->meType = pItem->meType;
- pNewItem->maImage = pItem->maImage;
- pNewItem->maColor = pItem->maColor;
- pNewItem->maText = pItem->maText;
- pNewItem->mpData = pItem->mpData;
- pNewItem->maRect = pItem->maRect;
- pNewItem->mpxAcc = NULL;
- mpImpl->mpItemList->push_back( pNewItem );
- }
-
- // Variablen zuruecksetzen
- mnFirstLine = 0;
- mnCurCol = 0;
- mnOldItemId = 0;
- mnHighItemId = 0;
- mnSelItemId = 0;
- mbNoSelection = sal_True;
-
- mbFormat = sal_True;
- if ( IsReallyVisible() && IsUpdateMode() )
- Invalidate();
-}
-
-// -----------------------------------------------------------------------
-
void ValueSet::Clear()
{
ImplDeleteItems();
@@ -2147,19 +2087,6 @@ void ValueSet::SetItemHeight( long nNewItemHeight )
// -----------------------------------------------------------------------
-void ValueSet::SetFirstLine( sal_uInt16 nNewLine )
-{
- if ( mnFirstLine != nNewLine )
- {
- mnFirstLine = nNewLine;
- mbFormat = sal_True;
- if ( IsReallyVisible() && IsUpdateMode() )
- Invalidate();
- }
-}
-
-// -----------------------------------------------------------------------
-
void ValueSet::SelectItem( sal_uInt16 nItemId )
{
size_t nItemPos = 0;
@@ -2301,28 +2228,6 @@ void ValueSet::SetNoSelection()
// -----------------------------------------------------------------------
-void ValueSet::SetItemBits( sal_uInt16 nItemId, sal_uInt16 nItemBits )
-{
- size_t nPos = GetItemPos( nItemId );
-
- if ( nPos != VALUESET_ITEM_NOTFOUND )
- (*mpImpl->mpItemList)[ nPos ]->mnBits = nItemBits;
-}
-
-// -----------------------------------------------------------------------
-
-sal_uInt16 ValueSet::GetItemBits( sal_uInt16 nItemId ) const
-{
- size_t nPos = GetItemPos( nItemId );
-
- if ( nPos != VALUESET_ITEM_NOTFOUND )
- return (*mpImpl->mpItemList)[ nPos ]->mnBits;
- else
- return 0;
-}
-
-// -----------------------------------------------------------------------
-
void ValueSet::SetItemImage( sal_uInt16 nItemId, const Image& rImage )
{
size_t nPos = GetItemPos( nItemId );
@@ -2699,76 +2604,9 @@ long ValueSet::GetScrollWidth() const
// -----------------------------------------------------------------------
-sal_uInt16 ValueSet::ShowDropPos( const Point& rPos )
-{
- mbDropPos = sal_True;
-
- // Gegebenenfalls scrollen
- ImplScroll( rPos );
-
- // DropPosition ermitteln
- size_t nPos = ImplGetItem( rPos, sal_True );
- if ( nPos == VALUESET_ITEM_NONEITEM )
- nPos = 0;
- else if ( nPos == VALUESET_ITEM_NOTFOUND )
- {
- Size aOutSize = GetOutputSizePixel();
- if ( GetStyle() & WB_NAMEFIELD )
- aOutSize.Height() = mnTextOffset;
- if ( (rPos.X() >= 0) && (rPos.X() < aOutSize.Width()) &&
- (rPos.Y() >= 0) && (rPos.Y() < aOutSize.Height()) )
- nPos = mpImpl->mpItemList->size();
- }
- else
- {
- // Im letzten viertel, dann wird ein Item spaeter eingefuegt
- Rectangle aRect = (*mpImpl->mpItemList)[ nPos ]->maRect;
- if ( rPos.X() > aRect.Left()+aRect.GetWidth()-(aRect.GetWidth()/4) )
- nPos++;
- }
-
- if ( nPos != mnDropPos )
- {
- ImplDrawDropPos( sal_False );
- mnDropPos = nPos;
- ImplDrawDropPos( sal_True );
- }
-
- return mnDropPos;
-}
-
-// -----------------------------------------------------------------------
-
-void ValueSet::HideDropPos()
-{
- if ( mbDropPos )
- {
- ImplDrawDropPos( sal_False );
- mbDropPos = sal_False;
- }
-}
-
-// -----------------------------------------------------------------------
-
-bool ValueSet::IsRTLActive (void)
-{
- return Application::GetSettings().GetLayoutRTL() && IsRTLEnabled();
-}
-
-// -----------------------------------------------------------------------
-
void ValueSet::SetHighlightHdl( const Link& rLink )
{
mpImpl->maHighlightHdl = rLink;
}
-// -----------------------------------------------------------------------
-
-const Link& ValueSet::GetHighlightHdl() const
-{
- return mpImpl->maHighlightHdl;
-}
-
-// -----------------------------------------------------------------------
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unusedcode.easy b/unusedcode.easy
index dc46f75..83cfbc6 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1773,17 +1773,6 @@ VCLUnoHelper::CreatePointer()
VCLXDevice::IsCreatedWithToolkit() const
VCLXPrinterServer::getImplementationId()
VCLXPrinterServer::getTypes()
-ValueSet::CopyItems(ValueSet const&)
-ValueSet::GetHighlightHdl() const
-ValueSet::GetItemBits(unsigned short) const
-ValueSet::HideDropPos()
-ValueSet::InsertSpace(unsigned short, unsigned long)
-ValueSet::IsRTLActive()
-ValueSet::SetFirstLine(unsigned short)
-ValueSet::SetItemBits(unsigned short, unsigned short)
-ValueSet::ShowDropPos(Point const&)
-ValueSetAcc::IsDisposed()
-ValueSetItem::ClearAccessible()
VbaFontBase::getUnderline()
VbaFontBase::setUnderline(com::sun::star::uno::Any const&)
VbaFoundFilesEnum::SetFileList(com::sun::star::uno::Sequence<rtl::OUString>&)
commit a371fd4d725b11a67cc3e2cc528c3633549f79a3
Author: Jan Holesovsky <kendy at suse.cz>
Date: Mon Aug 15 08:27:33 2011 +0200
callcatcher: Remove unused CalendarField and CalendarWrapper methods.
diff --git a/svtools/inc/svtools/calendar.hxx b/svtools/inc/svtools/calendar.hxx
index 1b32a73..9d8a8f3 100644
--- a/svtools/inc/svtools/calendar.hxx
+++ b/svtools/inc/svtools/calendar.hxx
@@ -443,7 +443,6 @@ private:
public:
CalendarField( Window* pParent, WinBits nWinStyle );
- CalendarField( Window* pParent, const ResId& rResId );
~CalendarField();
virtual void Select();
diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx
index f1153a8..a260c04 100644
--- a/svtools/source/control/calendar.cxx
+++ b/svtools/source/control/calendar.cxx
@@ -2563,19 +2563,6 @@ CalendarField::CalendarField( Window* pParent, WinBits nWinStyle ) :
// -----------------------------------------------------------------------
-CalendarField::CalendarField( Window* pParent, const ResId& rResId ) :
- DateField( pParent, rResId ),
- maDefaultDate( 0, 0, 0 )
-{
- mpFloatWin = NULL;
- mpCalendar = NULL;
- mnCalendarStyle = 0;
- mbToday = sal_False;
- mbNone = sal_False;
-}
-
-// -----------------------------------------------------------------------
-
CalendarField::~CalendarField()
{
if ( mpFloatWin )
diff --git a/unotools/inc/unotools/calendarwrapper.hxx b/unotools/inc/unotools/calendarwrapper.hxx
index ee240d0..7d0ffd3 100644
--- a/unotools/inc/unotools/calendarwrapper.hxx
+++ b/unotools/inc/unotools/calendarwrapper.hxx
@@ -89,7 +89,6 @@ public:
sal_Int16 getFirstDayOfWeek() const;
void setFirstDayOfWeek( sal_Int16 nDay );
void setMinimumNumberOfDaysForFirstWeek( sal_Int16 nDays );
- sal_Int16 getMinimumNumberOfDaysForFirstWeek() const;
sal_Int16 getNumberOfMonthsInYear() const;
sal_Int16 getNumberOfDaysInWeek() const;
::com::sun::star::uno::Sequence< ::com::sun::star::i18n::CalendarItem > getMonths() const;
diff --git a/unotools/source/i18n/calendarwrapper.cxx b/unotools/source/i18n/calendarwrapper.cxx
index add5d67..4510981 100644
--- a/unotools/source/i18n/calendarwrapper.cxx
+++ b/unotools/source/i18n/calendarwrapper.cxx
@@ -529,27 +529,6 @@ void CalendarWrapper::setMinimumNumberOfDaysForFirstWeek( sal_Int16 nDays )
}
-sal_Int16 CalendarWrapper::getMinimumNumberOfDaysForFirstWeek() const
-{
- try
- {
- if ( xC.is() )
- return xC->getMinimumNumberOfDaysForFirstWeek();
- }
- catch ( Exception& e )
- {
-#ifdef DBG_UTIL
- ByteString aMsg( "getMinimumNumberOfDaysForFirstWeek: Exception caught\n" );
- aMsg += ByteString( String( e.Message ), RTL_TEXTENCODING_UTF8 );
- DBG_ERRORFILE( aMsg.GetBuffer() );
-#else
- (void)e;
-#endif
- }
- return 0;
-}
-
-
sal_Int16 CalendarWrapper::getNumberOfMonthsInYear() const
{
try
diff --git a/unusedcode.easy b/unusedcode.easy
index a275d31..dc46f75 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -88,8 +88,6 @@ CNames::Insert(ControlItem const*&, unsigned short&)
CNames::Insert(ControlItem const**, unsigned short)
CNames::Remove(ControlItem const*&, unsigned short)
CNames::Remove(unsigned short, unsigned short)
-CalendarField::CalendarField(Window*, ResId const&)
-CalendarWrapper::getMinimumNumberOfDaysForFirstWeek() const
CertificateContainer::impl_createFactory(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
CertificateExtension_XmlSecImpl::setCertExtn(com::sun::star::uno::Sequence<signed char>, com::sun::star::uno::Sequence<signed char>, unsigned char)
CfgStack::Push(CfgStackData*)
commit 653464f8f835f31d1f1b6b75fe4e6cb98ca30d5c
Author: Jan Holesovsky <kendy at suse.cz>
Date: Mon Aug 15 08:23:41 2011 +0200
callcatcher: Remove unused Calendar-related methods.
diff --git a/svtools/inc/svtools/calendar.hxx b/svtools/inc/svtools/calendar.hxx
index f07b100..1b32a73 100644
--- a/svtools/inc/svtools/calendar.hxx
+++ b/svtools/inc/svtools/calendar.hxx
@@ -273,14 +273,12 @@ private:
#endif
protected:
- sal_Bool ShowDropPos( const Point& rPos, Date& rDate );
void HideDropPos();
DECL_STATIC_LINK( Calendar, ScrollHdl, Timer *);
public:
Calendar( Window* pParent, WinBits nWinStyle = 0 );
- Calendar( Window* pParent, const ResId& rResId );
~Calendar();
virtual void MouseButtonDown( const MouseEvent& rMEvt );
@@ -305,18 +303,9 @@ public:
const CalendarWrapper& GetCalendarWrapper() const { return maCalendarWrapper; }
- /// Set one of ::com::sun::star::i18n::Weekdays.
- void SetWeekStart( sal_Int16 nDay );
-
- /// Set how many days of a week must reside in the first week of a year.
- void SetMinimumNumberOfDaysInWeek( sal_Int16 nDays );
-
void SelectDate( const Date& rDate, sal_Bool bSelect = sal_True );
- void SelectDateRange( const Date& rStartDate, const Date& rEndDate,
- sal_Bool bSelect = sal_True );
void SetNoSelection();
sal_Bool IsDateSelected( const Date& rDate ) const;
- sal_uLong GetSelectDateCount() const;
Date GetSelectDate( sal_uLong nIndex = 0 ) const;
void EnableCallEverySelect( sal_Bool bEvery = sal_True ) { mbAllSel = bEvery; }
sal_Bool IsCallEverySelectEnabled() const { return mbAllSel; }
@@ -333,26 +322,14 @@ public:
sal_uInt16 GetMonthCount() const;
sal_Bool GetDate( const Point& rPos, Date& rDate ) const;
Rectangle GetDateRect( const Date& rDate ) const;
- sal_Bool GetDropDate( Date& rDate ) const;
long GetCurMonthPerLine() const { return mnMonthPerLine; }
long GetCurLines() const { return mnLines; }
- void SetStandardColor( const Color& rColor );
const Color& GetStandardColor() const;
- void SetSaturdayColor( const Color& rColor );
const Color& GetSaturdayColor() const;
- void SetSundayColor( const Color& rColor );
const Color& GetSundayColor() const;
- void AddDateInfo( const Date& rDate, const XubString& rText,
- const Color* pTextColor = NULL,
- const Color* pFrameColor = NULL,
- sal_uInt16 nFlags = 0 );
- void RemoveDateInfo( const Date& rDate );
- void ClearDateInfo();
- XubString GetDateInfoText( const Date& rDate );
-
void StartSelection();
void EndSelection();
diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx
index 4a0bc41..f1153a8 100644
--- a/svtools/source/control/calendar.cxx
+++ b/svtools/source/control/calendar.cxx
@@ -299,22 +299,6 @@ Calendar::Calendar( Window* pParent, WinBits nWinStyle ) :
// -----------------------------------------------------------------------
-Calendar::Calendar( Window* pParent, const ResId& rResId ) :
- Control( pParent, rResId ),
- maCalendarWrapper( Application::GetAppLocaleDataWrapper().getServiceFactory() ),
- maOldFormatFirstDate( 0, 0, 1900 ),
- maOldFormatLastDate( 0, 0, 1900 ),
- maFirstDate( 0, 0, 1900 ),
- maOldFirstDate( 0, 0, 1900 ),
- maOldCurDate( 0, 0, 1900 ),
- maAnchorDate( maCurDate ),
- maDropDate( 0, 0, 1900 )
-{
- ImplInit( rResId.GetWinBits() );
-}
-
-// -----------------------------------------------------------------------
-
Calendar::~Calendar()
{
delete mpStandardColor;
@@ -345,36 +329,6 @@ Calendar::~Calendar()
// -----------------------------------------------------------------------
-void Calendar::SetMinimumNumberOfDaysInWeek( sal_Int16 nDays )
-{
- ImplUpdate( sal_True );
- maCalendarWrapper.setMinimumNumberOfDaysForFirstWeek( nDays);
-}
-
-// -----------------------------------------------------------------------
-
-void Calendar::SetWeekStart( sal_Int16 nDay )
-{
- ImplUpdate( sal_True );
- switch (nDay)
- {
- case i18n::Weekdays::SUNDAY :
- case i18n::Weekdays::MONDAY :
- case i18n::Weekdays::TUESDAY :
- case i18n::Weekdays::WEDNESDAY :
- case i18n::Weekdays::THURSDAY :
- case i18n::Weekdays::FRIDAY :
- case i18n::Weekdays::SATURDAY :
- ; // nothing
- default:
- DBG_ERRORFILE("Calendar::SetWeekStart: unknown value for setFirstDayOfWeek() of a Gregorian calendar");
- nDay = i18n::Weekdays::SUNDAY;
- }
- maCalendarWrapper.setFirstDayOfWeek( nDay);
-}
-
-// -----------------------------------------------------------------------
-
DayOfWeek Calendar::ImplGetWeekStart() const
{
// Map i18n::Weekdays to Date DayOfWeek
@@ -2043,30 +1997,6 @@ void Calendar::SelectDate( const Date& rDate, sal_Bool bSelect )
// -----------------------------------------------------------------------
-void Calendar::SelectDateRange( const Date& rStartDate, const Date& rEndDate,
- sal_Bool bSelect )
-{
- if ( !rStartDate.IsValid() || !rEndDate.IsValid() )
- return;
-
- Table* pOldSel;
-
- if ( !mbInSelChange )
- pOldSel = new Table( *mpSelectTable );
- else
- pOldSel = NULL;
-
- ImplCalendarSelectDateRange( mpSelectTable, rStartDate, rEndDate, bSelect );
-
- if ( pOldSel )
- {
- ImplUpdateSelection( pOldSel );
- delete pOldSel;
- }
-}
-
-// -----------------------------------------------------------------------
-
void Calendar::SetNoSelection()
{
Table* pOldSel;
@@ -2094,13 +2024,6 @@ sal_Bool Calendar::IsDateSelected( const Date& rDate ) const
// -----------------------------------------------------------------------
-sal_uLong Calendar::GetSelectDateCount() const
-{
- return mpSelectTable->Count();
-}
-
-// -----------------------------------------------------------------------
-
Date Calendar::GetSelectDate( sal_uLong nIndex ) const
{
if ( nIndex < mpSelectTable->Count() )
@@ -2221,18 +2144,6 @@ sal_uInt16 Calendar::GetMonthCount() const
// -----------------------------------------------------------------------
-sal_Bool Calendar::GetDropDate( Date& rDate ) const
-{
- if( mbDropPos )
- {
- rDate = maDropDate;
- return sal_True;
- }
- return sal_False;
-}
-
-// -----------------------------------------------------------------------
-
sal_Bool Calendar::GetDate( const Point& rPos, Date& rDate ) const
{
Date aDate = maCurDate;
@@ -2350,209 +2261,6 @@ Rectangle Calendar::GetDateRect( const Date& rDate ) const
// -----------------------------------------------------------------------
-void Calendar::SetStandardColor( const Color& rColor )
-{
- if ( mpStandardColor )
- *mpStandardColor = rColor;
- else
- mpStandardColor = new Color( rColor );
- ImplUpdate();
-}
-
-// -----------------------------------------------------------------------
-
-void Calendar::SetSaturdayColor( const Color& rColor )
-{
- if ( mpSaturdayColor )
- *mpSaturdayColor = rColor;
- else
- mpSaturdayColor = new Color( rColor );
- ImplUpdate();
-}
-
-// -----------------------------------------------------------------------
-
-void Calendar::SetSundayColor( const Color& rColor )
-{
- if ( mpSundayColor )
- *mpSundayColor = rColor;
- else
- mpSundayColor = new Color( rColor );
- ImplUpdate();
-}
-
-// -----------------------------------------------------------------------
-
-void Calendar::AddDateInfo( const Date& rDate, const String& rText,
- const Color* pTextColor, const Color* pFrameColor,
- sal_uInt16 nFlags )
-{
- if ( !mpDateTable )
- mpDateTable = new ImplDateTable( 256, 256 );
-
- sal_Bool bChanged = sal_False;
- sal_uLong nKey = rDate.GetDate();
- ImplDateInfo* pDateInfo = mpDateTable->Get( nKey );
- if ( pDateInfo )
- pDateInfo->maText = rText;
- else
- {
- pDateInfo = new ImplDateInfo( rText );
- mpDateTable->Insert( nKey, pDateInfo );
- }
- if ( pTextColor )
- {
- if ( pDateInfo->mpTextColor )
- {
- if ( *(pDateInfo->mpTextColor) != *pTextColor )
- {
- *(pDateInfo->mpTextColor) = *pTextColor;
- bChanged = sal_True;
- }
- }
- else
- {
- pDateInfo->mpTextColor = new Color( *pTextColor );
- bChanged = sal_True;
- }
- }
- else
- {
- if ( pDateInfo->mpTextColor )
- {
- delete pDateInfo->mpTextColor;
- pDateInfo->mpTextColor = NULL;
- bChanged = sal_True;
- }
- }
- if ( pFrameColor )
- {
- if ( pDateInfo->mpFrameColor )
- {
- if ( *(pDateInfo->mpFrameColor) != *pFrameColor )
- {
- *(pDateInfo->mpFrameColor) = *pFrameColor;
- bChanged = sal_True;
- }
- }
- else
- {
- pDateInfo->mpFrameColor = new Color( *pFrameColor );
- bChanged = sal_True;
- }
- }
- else
- {
- if ( pDateInfo->mpFrameColor )
- {
- delete pDateInfo->mpFrameColor;
- pDateInfo->mpFrameColor = NULL;
- bChanged = sal_True;
- }
- }
- if ( pDateInfo->mnFlags != nFlags )
- {
- pDateInfo->mnFlags = nFlags;
- bChanged = sal_True;
- }
-
- if ( bChanged )
- ImplUpdateDate( rDate );
-}
-
-// -----------------------------------------------------------------------
-
-void Calendar::RemoveDateInfo( const Date& rDate )
-{
- if ( mpDateTable )
- {
- ImplDateInfo* pDateInfo = mpDateTable->Remove( rDate.GetDate() );
- if ( pDateInfo )
- {
- delete pDateInfo;
- ImplUpdateDate( rDate );
- }
- }
-}
-
-// -----------------------------------------------------------------------
-
-void Calendar::ClearDateInfo()
-{
- if ( mpDateTable )
- {
- ImplDateInfo* pDateInfo = mpDateTable->First();
- while ( pDateInfo )
- {
- sal_uLong nKey = mpDateTable->GetCurKey();
- mpDateTable->Remove( nKey );
- Date aDate( nKey );
- ImplUpdateDate( aDate );
- delete pDateInfo;
- pDateInfo = mpDateTable->First();
- }
- delete mpDateTable;
- mpDateTable = NULL;
- }
-}
-
-// -----------------------------------------------------------------------
-
-XubString Calendar::GetDateInfoText( const Date& rDate )
-{
- XubString aRet;
- if ( mpDateTable )
- {
- sal_uLong nKey = rDate.GetDate();
- ImplDateInfo* pDateInfo = mpDateTable->Get( nKey );
- if ( pDateInfo )
- aRet = pDateInfo->maText;
- }
- return aRet;
-}
-
-// -----------------------------------------------------------------------
-
-sal_Bool Calendar::ShowDropPos( const Point& rPos, Date& rDate )
-{
- Date aTempDate = maCurDate;
- mnDragScrollHitTest = ImplHitTest( rPos, aTempDate );
-
- if ( mnDragScrollHitTest )
- {
- if ( mnDragScrollHitTest & (CALENDAR_HITTEST_PREV | CALENDAR_HITTEST_NEXT) )
- {
- if ( !maDragScrollTimer.IsActive() )
- maDragScrollTimer.Start();
- }
- else
- {
- maDragScrollTimer.Stop();
- if ( mnDragScrollHitTest & CALENDAR_HITTEST_DAY )
- {
- if ( !mbDropPos || (aTempDate != maDropDate) )
- {
- if( mbDropPos )
- ImplInvertDropPos();
- maDropDate = aTempDate;
- mbDropPos = sal_True;
- ImplInvertDropPos();
- }
-
- rDate = maDropDate;
- return sal_True;
- }
- }
- }
- else
- maDragScrollTimer.Stop();
-
- HideDropPos();
- return sal_False;
-}
-
-// -----------------------------------------------------------------------
-
void Calendar::HideDropPos()
{
if ( mbDropPos )
diff --git a/unusedcode.easy b/unusedcode.easy
index 5738ef9..a275d31 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -88,20 +88,6 @@ CNames::Insert(ControlItem const*&, unsigned short&)
CNames::Insert(ControlItem const**, unsigned short)
CNames::Remove(ControlItem const*&, unsigned short)
CNames::Remove(unsigned short, unsigned short)
-Calendar::AddDateInfo(Date const&, String const&, Color const*, Color const*, unsigned short)
-Calendar::Calendar(Window*, ResId const&)
-Calendar::ClearDateInfo()
-Calendar::GetDateInfoText(Date const&)
-Calendar::GetDropDate(Date&) const
-Calendar::GetSelectDateCount() const
-Calendar::RemoveDateInfo(Date const&)
-Calendar::SelectDateRange(Date const&, Date const&, unsigned char)
-Calendar::SetMinimumNumberOfDaysInWeek(short)
-Calendar::SetSaturdayColor(Color const&)
-Calendar::SetStandardColor(Color const&)
-Calendar::SetSundayColor(Color const&)
-Calendar::SetWeekStart(short)
-Calendar::ShowDropPos(Point const&, Date&)
CalendarField::CalendarField(Window*, ResId const&)
CalendarWrapper::getMinimumNumberOfDaysForFirstWeek() const
CertificateContainer::impl_createFactory(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
commit 5c9dea496b656d81c07290e82bbc36a3f8c55801
Author: Jan Holesovsky <kendy at suse.cz>
Date: Mon Aug 15 08:06:32 2011 +0200
callcatcher: Remove unused ComboBox-related methods.
diff --git a/unusedcode.easy b/unusedcode.easy
index e90e24c..5738ef9 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -121,14 +121,6 @@ CollatorWrapper::compareSubstring(rtl::OUString const&, int, int, rtl::OUString
CollatorWrapper::listCollatorOptions(rtl::OUString const&) const
CollatorWrapper::loadCollatorAlgorithmWithEndUserOption(rtl::OUString const&, com::sun::star::lang::Locale const&, com::sun::star::uno::Sequence<int> const&)
Color::IncreaseContrast(unsigned char)
-ComboBox::GetEntryPos(void const*) const
-ComboBox::GetListPosSizePixel() const
-ComboBox::GetProminentEntryType() const
-ComboBox::GetSeparatorPos() const
-ComboBox::GetUserItemSize() const
-ComboBox::IsDDAutoWidthEnabled() const
-ComboBox::IsUserDrawEnabled() const
-ComboBox::ShowProminentEntry(unsigned short)
CommandExtTextInputData::CommandExtTextInputData()
CommunicationLinkList::DeleteAndDestroy(unsigned short, unsigned short)
CommunicationLinkList::Insert(CommunicationLink const*&, unsigned short&)
diff --git a/vcl/inc/vcl/combobox.hxx b/vcl/inc/vcl/combobox.hxx
index 7e1ea38..98f9ea3 100644
--- a/vcl/inc/vcl/combobox.hxx
+++ b/vcl/inc/vcl/combobox.hxx
@@ -111,9 +111,6 @@ public:
{ if( IsDropDownBox() ) SetPosSizePixel( 0, 0, rNewSize.Width(), rNewSize.Height(), WINDOW_POSSIZE_SIZE | WINDOW_POSSIZE_DROPDOWN ); }
Rectangle GetDropDownPosSizePixel() const;
- Rectangle GetListPosSizePixel() const;
- // returns empty rectangle in DropDown mode,
- // else it returns the PosSize of the ListBox
void SetDropDownLineCount( sal_uInt16 nLines );
sal_uInt16 GetDropDownLineCount() const;
@@ -122,7 +119,6 @@ public:
sal_Bool IsAutoSizeEnabled() const { return mbDDAutoSize; }
void EnableDDAutoWidth( sal_Bool b );
- sal_Bool IsDDAutoWidthEnabled() const;
void SetText( const XubString& rStr );
void SetText( const XubString& rStr, const Selection& rNewSelection );
@@ -136,7 +132,6 @@ public:
void Clear();
sal_uInt16 GetEntryPos( const XubString& rStr ) const;
- sal_uInt16 GetEntryPos( const void* pData ) const;
Image GetEntryImage( sal_uInt16 nPos ) const;
XubString GetEntry( sal_uInt16 nPos ) const;
sal_uInt16 GetEntryCount() const;
@@ -148,16 +143,12 @@ public:
long CalcWindowSizePixel( sal_uInt16 nLines ) const;
void SetUserItemSize( const Size& rSz );
- const Size& GetUserItemSize() const;
-
void EnableUserDraw( sal_Bool bUserDraw );
- sal_Bool IsUserDrawEnabled() const;
void DrawEntry( const UserDrawEvent& rEvt, sal_Bool bDrawImage, sal_Bool bDrawText, sal_Bool bDrawTextAtImagePos = sal_False );
void SetBorderStyle( sal_uInt16 nBorderStyle );
void SetSeparatorPos( sal_uInt16 n = LISTBOX_ENTRY_NOTFOUND );
- sal_uInt16 GetSeparatorPos() const;
void EnableAutocomplete( sal_Bool bEnable, sal_Bool bMatchCase = sal_False );
sal_Bool IsAutocompleteEnabled() const;
@@ -188,11 +179,9 @@ public:
void* GetEntryData( sal_uInt16 nPos ) const;
void SetTopEntry( sal_uInt16 nPos );
- void ShowProminentEntry( sal_uInt16 nPos );
sal_uInt16 GetTopEntry() const;
void SetProminentEntryType( ProminentEntry eType );
- ProminentEntry GetProminentEntryType() const;
sal_uInt16 GetDisplayLineCount() const;
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index a4a9523..0f551bf 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -569,14 +569,6 @@ void ComboBox::EnableDDAutoWidth( sal_Bool b )
// -----------------------------------------------------------------------
-sal_Bool ComboBox::IsDDAutoWidthEnabled() const
-{
- return mpFloatWin ? mpFloatWin->IsAutoWidth() : sal_False;
-}
-
-
-// -----------------------------------------------------------------------
-
void ComboBox::SetDropDownLineCount( sal_uInt16 nLines )
{
if ( mpFloatWin )
@@ -1032,16 +1024,6 @@ sal_uInt16 ComboBox::GetEntryPos( const XubString& rStr ) const
// -----------------------------------------------------------------------
-sal_uInt16 ComboBox::GetEntryPos( const void* pData ) const
-{
- sal_uInt16 nPos = mpImplLB->GetEntryList()->FindEntry( pData );
- if ( nPos != LISTBOX_ENTRY_NOTFOUND )
- nPos = sal::static_int_cast<sal_uInt16>(nPos - mpImplLB->GetEntryList()->GetMRUCount());
- return nPos;
-}
-
-// -----------------------------------------------------------------------
-
XubString ComboBox::GetEntry( sal_uInt16 nPos ) const
{
return mpImplLB->GetEntryList()->GetEntryText( nPos + mpImplLB->GetEntryList()->GetMRUCount() );
@@ -1338,13 +1320,6 @@ void ComboBox::SetUserItemSize( const Size& rSz )
// -----------------------------------------------------------------------
-const Size& ComboBox::GetUserItemSize() const
-{
- return mpImplLB->GetMainWindow()->GetUserItemSize();
-}
-
-// -----------------------------------------------------------------------
-
void ComboBox::EnableUserDraw( sal_Bool bUserDraw )
{
mpImplLB->GetMainWindow()->EnableUserDraw( bUserDraw );
@@ -1352,13 +1327,6 @@ void ComboBox::EnableUserDraw( sal_Bool bUserDraw )
// -----------------------------------------------------------------------
-sal_Bool ComboBox::IsUserDrawEnabled() const
-{
- return mpImplLB->GetMainWindow()->IsUserDrawEnabled();
-}
-
-// -----------------------------------------------------------------------
-
void ComboBox::DrawEntry( const UserDrawEvent& rEvt, sal_Bool bDrawImage, sal_Bool bDrawText, sal_Bool bDrawTextAtImagePos )
{
DBG_ASSERT( rEvt.GetDevice() == mpImplLB->GetMainWindow(), "DrawEntry?!" );
@@ -1374,13 +1342,6 @@ void ComboBox::SetSeparatorPos( sal_uInt16 n )
// -----------------------------------------------------------------------
-sal_uInt16 ComboBox::GetSeparatorPos() const
-{
- return mpImplLB->GetSeparatorPos();
-}
-
-// -----------------------------------------------------------------------
-
void ComboBox::SetMRUEntries( const XubString& rEntries, xub_Unicode cSep )
{
mpImplLB->SetMRUEntries( rEntries, cSep );
@@ -1437,13 +1398,6 @@ void ComboBox::SetTopEntry( sal_uInt16 nPos )
// -----------------------------------------------------------------------
-void ComboBox::ShowProminentEntry( sal_uInt16 nPos )
-{
- mpImplLB->ShowProminentEntry( nPos + mpImplLB->GetEntryList()->GetMRUCount() );
-}
-
-// -----------------------------------------------------------------------
-
sal_uInt16 ComboBox::GetTopEntry() const
{
sal_uInt16 nPos = GetEntryCount() ? mpImplLB->GetTopEntry() : LISTBOX_ENTRY_NOTFOUND;
@@ -1461,13 +1415,6 @@ void ComboBox::SetProminentEntryType( ProminentEntry eType )
// -----------------------------------------------------------------------
-ProminentEntry ComboBox::GetProminentEntryType() const
-{
- return mpImplLB->GetProminentEntryType();
-}
-
-// -----------------------------------------------------------------------
-
Rectangle ComboBox::GetDropDownPosSizePixel() const
{
return mpFloatWin ? mpFloatWin->GetWindowExtentsRelative( const_cast<ComboBox*>(this) ) : Rectangle();
@@ -1475,13 +1422,6 @@ Rectangle ComboBox::GetDropDownPosSizePixel() const
// -----------------------------------------------------------------------
-Rectangle ComboBox::GetListPosSizePixel() const
-{
- return mpFloatWin ? Rectangle() : mpImplLB->GetMainWindow()->GetWindowExtentsRelative( const_cast<ComboBox*>(this) );
-}
-
-// -----------------------------------------------------------------------
-
const Wallpaper& ComboBox::GetDisplayBackground() const
{
if( ! mpSubEdit->IsBackground() )
commit 3caac78af2a56db5156b9075b5bdd1f3c00c5d65
Author: Jan Holesovsky <kendy at suse.cz>
Date: Mon Aug 15 08:00:07 2011 +0200
callcatcher: Remove unused ListBox-related methods.
diff --git a/unusedcode.easy b/unusedcode.easy
index 9a28303..e90e24c 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -379,18 +379,6 @@ LinguMgr::UpdateAll()
LinguOptions::GetValue(com::sun::star::uno::Any&, int) const
LinguOptions::SetValue(com::sun::star::uno::Any&, com::sun::star::uno::Any const&, int)
LinkStructArr::DeleteAndDestroy(unsigned short, unsigned short)
-ListBox::CalcWindowSizePixel(unsigned short) const
-ListBox::GetMRUEntries(unsigned short) const
-ListBox::GetMaxMRUCount() const
-ListBox::GetProminentEntryType() const
-ListBox::GetUserItemSize() const
-ListBox::IsDDAutoWidthEnabled() const
-ListBox::IsUserDrawEnabled() const
-ListBox::SetMRUEntries(String const&, unsigned short)
-ListBox::SetMaxMRUCount(unsigned short)
-ListBox::SetProminentEntryType(ProminentEntry)
-ListBox::SetSeparatorPos()
-ListBox::ShowProminentEntry(unsigned short)
LngSvcMgr::RemoveLngSvcEvtBroadcaster(com::sun::star::uno::Reference<com::sun::star::linguistic2::XLinguServiceEventBroadcaster> const&)
LocaleDataWrapper::getCollatorImplementations() const
LocaleDataWrapper::getTransliterations() const
diff --git a/vcl/inc/vcl/lstbox.hxx b/vcl/inc/vcl/lstbox.hxx
index cc1d061..526cbf4 100644
--- a/vcl/inc/vcl/lstbox.hxx
+++ b/vcl/inc/vcl/lstbox.hxx
@@ -117,7 +117,6 @@ public:
sal_Bool IsAutoSizeEnabled() const { return mbDDAutoSize; }
void EnableDDAutoWidth( sal_Bool b );
- sal_Bool IsDDAutoWidthEnabled() const;
virtual sal_uInt16 InsertEntry( const XubString& rStr, sal_uInt16 nPos = LISTBOX_APPEND );
virtual sal_uInt16 InsertEntry( const Image& rImage, sal_uInt16 nPos = LISTBOX_APPEND );
@@ -165,18 +164,13 @@ public:
long GetEntryFlags( sal_uInt16 nPos ) const;
void SetTopEntry( sal_uInt16 nPos );
- void ShowProminentEntry( sal_uInt16 nPos );
void SetTopEntryStr( const XubString& rStr );
sal_uInt16 GetTopEntry() const;
- void SetProminentEntryType( ProminentEntry eType );
- ProminentEntry GetProminentEntryType() const;
-
void SaveValue() { mnSaveValue = GetSelectEntryPos(); }
sal_uInt16 GetSavedValue() const { return mnSaveValue; }
- void SetSeparatorPos( sal_uInt16 n );
- void SetSeparatorPos();
+ void SetSeparatorPos( sal_uInt16 n = LISTBOX_ENTRY_NOTFOUND );
sal_uInt16 GetSeparatorPos() const;
sal_Bool IsTravelSelect() const;
@@ -190,14 +184,11 @@ public:
void SetReadOnly( sal_Bool bReadOnly = sal_True );
sal_Bool IsReadOnly() const;
- long CalcWindowSizePixel( sal_uInt16 nLines ) const;
Rectangle GetBoundingRectangle( sal_uInt16 nItem ) const;
void SetUserItemSize( const Size& rSz );
- const Size& GetUserItemSize() const;
void EnableUserDraw( sal_Bool bUserDraw );
- sal_Bool IsUserDrawEnabled() const;
void DrawEntry( const UserDrawEvent& rEvt, sal_Bool bDrawImage, sal_Bool bDrawText, sal_Bool bDrawTextAtImagePos = sal_False );
@@ -212,11 +203,6 @@ public:
Size CalcSize( sal_uInt16 nColumns, sal_uInt16 nLines ) const;
void GetMaxVisColumnsAndLines( sal_uInt16& rnCols, sal_uInt16& rnLines ) const;
- void SetMRUEntries( const XubString& rEntries, xub_Unicode cSep = ';' );
- XubString GetMRUEntries( xub_Unicode cSep = ';' ) const;
- void SetMaxMRUCount( sal_uInt16 n );
- sal_uInt16 GetMaxMRUCount() const;
-
sal_uInt16 GetDisplayLineCount() const;
void EnableMirroring();
diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx
index 9b31913..59dddad 100644
--- a/vcl/source/control/lstbox.cxx
+++ b/vcl/source/control/lstbox.cxx
@@ -611,13 +611,6 @@ void ListBox::EnableDDAutoWidth( sal_Bool b )
// -----------------------------------------------------------------------
-sal_Bool ListBox::IsDDAutoWidthEnabled() const
-{
- return mpFloatWin ? mpFloatWin->IsAutoWidth() : sal_False;
-}
-
-// -----------------------------------------------------------------------
-
void ListBox::SetDropDownLineCount( sal_uInt16 nLines )
{
mnLineCount = nLines;
@@ -1235,13 +1228,6 @@ void ListBox::SetTopEntry( sal_uInt16 nPos )
// -----------------------------------------------------------------------
-void ListBox::ShowProminentEntry( sal_uInt16 nPos )
-{
- mpImplLB->ShowProminentEntry( nPos + mpImplLB->GetEntryList()->GetMRUCount() );
-}
-
-// -----------------------------------------------------------------------
-
sal_uInt16 ListBox::GetTopEntry() const
{
sal_uInt16 nPos = GetEntryCount() ? mpImplLB->GetTopEntry() : LISTBOX_ENTRY_NOTFOUND;
@@ -1252,20 +1238,6 @@ sal_uInt16 ListBox::GetTopEntry() const
// -----------------------------------------------------------------------
-void ListBox::SetProminentEntryType( ProminentEntry eType )
-{
- mpImplLB->SetProminentEntryType( eType );
-}
-
-// -----------------------------------------------------------------------
-
-ProminentEntry ListBox::GetProminentEntryType() const
-{
- return mpImplLB->GetProminentEntryType();
-}
-
-// -----------------------------------------------------------------------
-
sal_Bool ListBox::IsTravelSelect() const
{
return mpImplLB->IsTravelSelect();
@@ -1280,11 +1252,6 @@ sal_Bool ListBox::IsInDropDown() const
// -----------------------------------------------------------------------
-long ListBox::CalcWindowSizePixel( sal_uInt16 nLines ) const
-{
- return mpImplLB->GetEntryHeight() * nLines;
-}
-
Rectangle ListBox::GetBoundingRectangle( sal_uInt16 nItem ) const
{
Rectangle aRect = mpImplLB->GetMainWindow()->GetBoundingRectangle( nItem );
@@ -1509,13 +1476,6 @@ void ListBox::SetUserItemSize( const Size& rSz )
// -----------------------------------------------------------------------
-const Size& ListBox::GetUserItemSize() const
-{
- return mpImplLB->GetMainWindow()->GetUserItemSize();
-}
-
-// -----------------------------------------------------------------------
-
void ListBox::EnableUserDraw( sal_Bool bUserDraw )
{
mpImplLB->GetMainWindow()->EnableUserDraw( bUserDraw );
@@ -1525,13 +1485,6 @@ void ListBox::EnableUserDraw( sal_Bool bUserDraw )
// -----------------------------------------------------------------------
-sal_Bool ListBox::IsUserDrawEnabled() const
-{
- return mpImplLB->GetMainWindow()->IsUserDrawEnabled();
-}
-
-// -----------------------------------------------------------------------
-
void ListBox::SetReadOnly( sal_Bool bReadOnly )
{
if ( mpImplLB->IsReadOnly() != bReadOnly )
@@ -1557,13 +1510,6 @@ void ListBox::SetSeparatorPos( sal_uInt16 n )
// -----------------------------------------------------------------------
-void ListBox::SetSeparatorPos()
-{
- mpImplLB->SetSeparatorPos( LISTBOX_ENTRY_NOTFOUND );
-}
-
-// -----------------------------------------------------------------------
-
sal_uInt16 ListBox::GetSeparatorPos() const
{
return mpImplLB->GetSeparatorPos();
@@ -1571,34 +1517,6 @@ sal_uInt16 ListBox::GetSeparatorPos() const
// -----------------------------------------------------------------------
-void ListBox::SetMRUEntries( const XubString& rEntries, xub_Unicode cSep )
-{
- mpImplLB->SetMRUEntries( rEntries, cSep );
-}
-
-// -----------------------------------------------------------------------
-
-XubString ListBox::GetMRUEntries( xub_Unicode cSep ) const
-{
- return mpImplLB->GetMRUEntries( cSep );
-}
-
-// -----------------------------------------------------------------------
-
-void ListBox::SetMaxMRUCount( sal_uInt16 n )
-{
- mpImplLB->SetMaxMRUCount( n );
-}
-
-// -----------------------------------------------------------------------
-
-sal_uInt16 ListBox::GetMaxMRUCount() const
-{
- return mpImplLB->GetMaxMRUCount();
-}
-
-// -----------------------------------------------------------------------
-
sal_uInt16 ListBox::GetDisplayLineCount() const
{
return mpImplLB->GetDisplayLineCount();
More information about the Libreoffice-commits
mailing list