diff options
author | Jan Holesovsky <kendy@suse.cz> | 2011-08-15 08:53:48 +0200 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2011-08-15 13:11:52 +0200 |
commit | 0110b80eefd560de13bac34a3bcae838aaf1cba2 (patch) | |
tree | e55d78d9f166ed81865ac74d5e9ac781a06e9d02 | |
parent | callcatcher: Remove unused CalendarField and CalendarWrapper methods. (diff) | |
download | core-0110b80eefd560de13bac34a3bcae838aaf1cba2.tar.gz core-0110b80eefd560de13bac34a3bcae838aaf1cba2.zip |
callcatcher: Remove unused ValueSet methods.
-rw-r--r-- | svtools/inc/svtools/valueset.hxx | 26 | ||||
-rw-r--r-- | svtools/source/control/valueacc.cxx | 17 | ||||
-rw-r--r-- | svtools/source/control/valueimp.hxx | 9 | ||||
-rw-r--r-- | svtools/source/control/valueset.cxx | 162 | ||||
-rw-r--r-- | unusedcode.easy | 11 |
5 files changed, 0 insertions, 225 deletions
diff --git a/svtools/inc/svtools/valueset.hxx b/svtools/inc/svtools/valueset.hxx index 8c61d8517210..8bd5cd9171f2 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 ced04f665fcc..5abc5043a532 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 57bb5fae0650..3e638ca365b2 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 c3be233cb917..2304fa821781 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 dc46f75177fb..83cfbc605f38 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>&) |