summaryrefslogtreecommitdiff
path: root/svtools
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2011-07-26 23:32:40 +0200
committerThomas Arnhold <thomas@arnhold.org>2011-07-26 23:39:04 +0200
commitbf2373daf50595c02741f63d941fda0462535d62 (patch)
tree8648bb9d6328a43d5c1e52ca2169097ada413251 /svtools
parentbb4b28f3642e6fd86881c0fd4c030b5872cde7fa (diff)
callcatcher: remove unused methods
Diffstat (limited to 'svtools')
-rw-r--r--svtools/inc/svtools/treelist.hxx3
-rw-r--r--svtools/source/contnr/imivctl.hxx10
-rw-r--r--svtools/source/contnr/imivctl1.cxx133
-rw-r--r--svtools/source/contnr/treelist.cxx25
-rw-r--r--svtools/source/dialogs/filedlg2.cxx25
-rw-r--r--svtools/source/dialogs/filedlg2.hxx2
6 files changed, 3 insertions, 195 deletions
diff --git a/svtools/inc/svtools/treelist.hxx b/svtools/inc/svtools/treelist.hxx
index 8c78c990f56a..63545ed30cc1 100644
--- a/svtools/inc/svtools/treelist.hxx
+++ b/svtools/inc/svtools/treelist.hxx
@@ -289,6 +289,7 @@ class SVT_DLLPUBLIC SvTreeList
SvListEntry* LastSelected( const SvListView*) const;
sal_Bool Select( SvListView*,SvListEntry* pEntry, sal_Bool bSelect=sal_True );
+ sal_uLong SelectChilds( SvListView*,SvListEntry* pParent, sal_Bool bSelect );
void SelectAll( SvListView*,sal_Bool bSelect ); // ruft nicht Select-Hdl
sal_uLong GetChildSelectionCount( const SvListView*,SvListEntry* pParent ) const;
@@ -354,6 +355,7 @@ public:
sal_uLong Insert( SvListEntry* pEntry,sal_uLong nRootPos = ULONG_MAX )
{ return Insert(pEntry, pRootItem, nRootPos ); }
+ void InsertTree( SvListEntry* pTree, SvListEntry* pTarget );
void InsertTree( SvListEntry* pTree, SvListEntry* pTargetParent, sal_uLong nListPos );
// Entries muessen im gleichen Model stehen!
@@ -361,6 +363,7 @@ public:
// erzeugt ggf. Child-List
sal_uLong Move( SvListEntry* pSource, SvListEntry* pTargetParent, sal_uLong nListPos);
+ void Copy( SvListEntry* pSource, SvListEntry* pTarget );
sal_uLong Copy( SvListEntry* pSource, SvListEntry* pTargetParent, sal_uLong nListPos);
sal_Bool Remove( SvListEntry* pEntry );
diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx
index 2d9f04241589..021f6577df17 100644
--- a/svtools/source/contnr/imivctl.hxx
+++ b/svtools/source/contnr/imivctl.hxx
@@ -483,7 +483,6 @@ public:
const Size& GetItemSize( SvxIconChoiceCtrlEntry*, IcnViewFieldType ) const;
void HideDDIcon();
- void ShowDDIcon( SvxIconChoiceCtrlEntry* pRefEntry, const Point& rPos );
sal_Bool IsOver(
SvPtrarr* pSelectedRectList,
@@ -496,14 +495,6 @@ public:
SvPtrarr* pOtherRects = 0
);
- void CalcScrollOffsets(
- const Point& rRefPosPixel,
- long& rX,
- long& rY,
- sal_Bool bDragDrop = sal_False,
- sal_uInt16 nBorderWidth = 10
- );
-
sal_Bool IsTextHit( SvxIconChoiceCtrlEntry* pEntry, const Point& rDocPos );
void MakeVisible(
const Rectangle& rDocPos,
@@ -531,7 +522,6 @@ public:
return aEntries[ nPos ];
}
SvxIconChoiceCtrlEntry* GetFirstSelectedEntry( sal_uLong& ) const;
- SvxIconChoiceCtrlEntry* GetNextSelectedEntry( sal_uLong& ) const;
SvxIconChoiceCtrlEntry* GetHdlEntry() const { return pHdlEntry; }
void SetHdlEntry( SvxIconChoiceCtrlEntry* pEntry ) { pHdlEntry = pEntry; }
diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx
index 625b04a0d7a2..56a15574e29b 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -2414,57 +2414,6 @@ void SvxIconChoiceCtrl_Impl::ImpHideDDIcon()
}
}
-
-void SvxIconChoiceCtrl_Impl::ShowDDIcon( SvxIconChoiceCtrlEntry* pRefEntry, const Point& rPosPix )
-{
- pView->Update();
- if( pRefEntry != pDDRefEntry )
- {
- DELETEZ(pDDDev);
- DELETEZ(pDDBufDev);
- }
- sal_Bool bSelected = pRefEntry->IsSelected();
- pRefEntry->ClearFlags( ICNVIEW_FLAG_SELECTED );
- if( !pDDDev )
- {
- if( pDDBufDev )
- {
- // nicht bei jedem Move ein Device anlegen, da dies besonders
- // auf Remote-Clients zu langsam ist
- pDDDev = pDDBufDev;
- pDDBufDev = 0;
- }
- else
- {
- pDDDev = new VirtualDevice( *pView );
- pDDDev->SetFont( pView->GetFont() );
- }
- }
- else
- {
- ImpHideDDIcon();
- }
- const Rectangle& rRect = GetEntryBoundRect( pRefEntry );
- pDDDev->SetOutputSizePixel( rRect.GetSize() );
-
- Point aPos( rPosPix );
- ToDocPos( aPos );
-
- Size aSize( pDDDev->GetOutputSizePixel() );
- pDDRefEntry = pRefEntry;
- aDDLastEntryPos = aPos;
- aDDLastRectPos = aPos;
-
- // Hintergrund sichern
- pDDDev->DrawOutDev( Point(), aSize, aPos, aSize, *pView );
- // Icon in pView malen
- pRefEntry->SetFlags( ICNVIEW_FLAG_BLOCK_EMPHASIS );
- PaintEntry( pRefEntry, aPos );
- pRefEntry->ClearFlags( ICNVIEW_FLAG_BLOCK_EMPHASIS );
- if( bSelected )
- pRefEntry->SetFlags( ICNVIEW_FLAG_SELECTED );
-}
-
sal_Bool SvxIconChoiceCtrl_Impl::HandleScrollCommand( const CommandEvent& rCmd )
{
Rectangle aDocRect( GetDocumentRect() );
@@ -3125,51 +3074,6 @@ void SvxIconChoiceCtrl_Impl::ClearSelectedRectList()
aSelectedRectList.Remove( 0, aSelectedRectList.Count() );
}
-void SvxIconChoiceCtrl_Impl::CalcScrollOffsets( const Point& rPosPixel,
- long& rX, long& rY, sal_Bool isInDragDrop, sal_uInt16 nBorderWidth)
-{
- // Scrolling der View, falls sich der Mauszeiger im Grenzbereich des
- // Fensters befindet
- long nPixelToScrollX = 0;
- long nPixelToScrollY = 0;
- Size aWndSize = aOutputSize;
-
- nBorderWidth = (sal_uInt16)(Min( (long)(aWndSize.Height()-1), (long)nBorderWidth ));
- nBorderWidth = (sal_uInt16)(Min( (long)(aWndSize.Width()-1), (long)nBorderWidth ));
-
- if ( rPosPixel.X() < nBorderWidth )
- {
- if( isInDragDrop )
- nPixelToScrollX = -DD_SCROLL_PIXEL;
- else
- nPixelToScrollX = rPosPixel.X()- nBorderWidth;
- }
- else if ( rPosPixel.X() > aWndSize.Width() - nBorderWidth )
- {
- if( isInDragDrop )
- nPixelToScrollX = DD_SCROLL_PIXEL;
- else
- nPixelToScrollX = rPosPixel.X() - (aWndSize.Width() - nBorderWidth);
- }
- if ( rPosPixel.Y() < nBorderWidth )
- {
- if( isInDragDrop )
- nPixelToScrollY = -DD_SCROLL_PIXEL;
- else
- nPixelToScrollY = rPosPixel.Y() - nBorderWidth;
- }
- else if ( rPosPixel.Y() > aWndSize.Height() - nBorderWidth )
- {
- if( isInDragDrop )
- nPixelToScrollY = DD_SCROLL_PIXEL;
- else
- nPixelToScrollY = rPosPixel.Y() - (aWndSize.Height() - nBorderWidth);
- }
-
- rX = nPixelToScrollX;
- rY = nPixelToScrollY;
-}
-
IMPL_LINK(SvxIconChoiceCtrl_Impl, AutoArrangeHdl, void*, EMPTYARG )
{
aAutoArrangeTimer.Stop();
@@ -3548,43 +3452,6 @@ SvxIconChoiceCtrlEntry* SvxIconChoiceCtrl_Impl::GetFirstSelectedEntry( sal_uLong
return 0;
}
-// kein Round Robin!
-SvxIconChoiceCtrlEntry* SvxIconChoiceCtrl_Impl::GetNextSelectedEntry( sal_uLong& rStartPos ) const
-{
- size_t nCount = aEntries.size();
- if( rStartPos > nCount || !GetSelectionCount() )
- return 0;
- if( !pHead )
- {
- for( size_t nCur = rStartPos+1; nCur < nCount; nCur++ )
- {
- SvxIconChoiceCtrlEntry* pEntry = aEntries[ nCur ];
- if( pEntry->IsSelected() )
- {
- rStartPos = nCur;
- return pEntry;
- }
- }
- }
- else
- {
- SvxIconChoiceCtrlEntry* pEntry = aEntries[ rStartPos ];
- pEntry = pEntry->pflink;
- while( pEntry != pHead )
- {
- if( pEntry->IsSelected() )
- {
- rStartPos = GetEntryListPos( pEntry );
- return pEntry;
- }
- pEntry = pEntry->pflink;
- }
- }
-
- rStartPos = 0xffffffff;
- return 0;
-}
-
void SvxIconChoiceCtrl_Impl::SelectAll( sal_Bool bSelect, sal_Bool bPaint )
{
bPaint = sal_True;
diff --git a/svtools/source/contnr/treelist.cxx b/svtools/source/contnr/treelist.cxx
index d1f2941a0de3..0b00dc3e15e9 100644
--- a/svtools/source/contnr/treelist.cxx
+++ b/svtools/source/contnr/treelist.cxx
@@ -1326,31 +1326,6 @@ sal_Bool SvTreeList::Remove( SvListEntry* pEntry )
|*
*************************************************************************/
-sal_uLong SvTreeList::SelectChilds(SvListView* pView, SvListEntry* pParent,sal_Bool bSelect )
-{
- DBG_ASSERT(pView&&pParent,"SelChilds:View/Parent?");
- if ( !pParent->pChilds )
- return 0;
- if ( pParent->pChilds->empty() )
- return 0;
-
- sal_uInt16 nRefDepth = GetDepth( pParent );
- sal_uInt16 nDepth = nRefDepth;
- sal_uLong nCount = 0;
- pParent = Next( pParent );
- do
- {
- if ( Select( pView, pParent, bSelect ) )
- nCount++; // nur die tatsaechlichen Selektierungen zaehlen
- pParent = Next( pParent, &nDepth );
- }
- while( pParent && nDepth > nRefDepth );
-#ifdef CHECK_INTEGRITY
- CheckIntegrity();
-#endif
- return nCount;
-}
-
void SvTreeList::SelectAll( SvListView* pView, sal_Bool bSelect )
{
DBG_ASSERT(pView,"SelectAll:NoView");
diff --git a/svtools/source/dialogs/filedlg2.cxx b/svtools/source/dialogs/filedlg2.cxx
index e7bf845a03ea..b8cf2d8a81bf 100644
--- a/svtools/source/dialogs/filedlg2.cxx
+++ b/svtools/source/dialogs/filedlg2.cxx
@@ -1184,31 +1184,6 @@ void ImpFileDialog::AddFilter( const UniString& rFilter, const UniString& rMask
SetCurFilter( rFilter );
}
-void ImpFileDialog::RemoveFilter( const UniString& rFilter )
-{
- for ( ImpFilterList::iterator it = aFilterList.begin(); it < aFilterList.end(); ++it ) {
- if ( (*it)->aName == rFilter ) {
- delete *it;
- aFilterList.erase( it );
- if ( pTypeList ) {
- pTypeList->RemoveEntry( rFilter );
- }
- break;
- }
- }
-}
-
-void ImpFileDialog::RemoveAllFilter()
-{
- for ( size_t i = 0, n = aFilterList.size(); i < n ; ++i ) {
- delete aFilterList[ i ];
- }
- aFilterList.clear();
-
- if( pTypeList )
- pTypeList->Clear();
-}
-
void ImpFileDialog::SetCurFilter( const UniString& rFilter )
{
if( !pTypeList )
diff --git a/svtools/source/dialogs/filedlg2.hxx b/svtools/source/dialogs/filedlg2.hxx
index e65bebe6f155..a7bba2013f55 100644
--- a/svtools/source/dialogs/filedlg2.hxx
+++ b/svtools/source/dialogs/filedlg2.hxx
@@ -159,8 +159,6 @@ public:
virtual ~ImpFileDialog();
void AddFilter( const String& rFilter, const String& rMask );
- void RemoveFilter( const String& rFilter );
- void RemoveAllFilter();
void SetCurFilter( const String& rFilter );
String GetCurFilter() const;