summaryrefslogtreecommitdiff
path: root/svtools
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-03-03 09:30:05 +0200
committerNoel Grandin <noel@peralex.com>2015-03-19 10:45:00 +0200
commit6bf3b6d420873e236b2805a42a95ce33e614ad98 (patch)
treefc582e0a8af0ae1979891bb9e2bb6d49696d34d7 /svtools
parent5133b27e638140ba574016b33dae70ca92edc323 (diff)
loplugin:constantfunction: svtools
Change-Id: I42479fb10878a0a1c2071f7b35ae375061781d40
Diffstat (limited to 'svtools')
-rw-r--r--svtools/source/brwbox/brwbox2.cxx13
-rw-r--r--svtools/source/config/accessibilityoptions.cxx6
-rw-r--r--svtools/source/contnr/imivctl.hxx2
-rw-r--r--svtools/source/contnr/imivctl1.cxx97
-rw-r--r--svtools/source/contnr/ivctrl.cxx25
-rw-r--r--svtools/source/contnr/svimpbox.cxx11
-rw-r--r--svtools/source/contnr/svtabbx.cxx1
-rw-r--r--svtools/source/contnr/treelist.cxx5
-rw-r--r--svtools/source/contnr/treelistbox.cxx44
-rw-r--r--svtools/source/control/accessibleruler.cxx8
-rw-r--r--svtools/source/control/ctrltool.cxx7
-rw-r--r--svtools/source/control/headbar.cxx18
-rw-r--r--svtools/source/control/scrwin.cxx21
-rw-r--r--svtools/source/graphic/grfmgr.cxx6
-rw-r--r--svtools/source/graphic/grfmgr2.cxx5
-rw-r--r--svtools/source/inc/svimpbox.hxx1
-rw-r--r--svtools/source/misc/imap.cxx23
17 files changed, 26 insertions, 267 deletions
diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx
index 5eb10d95e61f..2b2afb754054 100644
--- a/svtools/source/brwbox/brwbox2.cxx
+++ b/svtools/source/brwbox/brwbox2.cxx
@@ -706,12 +706,6 @@ void BrowseBox::Paint( const Rectangle& rRect )
-void BrowseBox::PaintRow( OutputDevice&, const Rectangle& )
-{
-}
-
-
-
void BrowseBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags )
{
bool bDrawSelection = (nFlags & WINDOW_DRAW_NOSELECTION) == 0;
@@ -911,7 +905,6 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, bool
// prepare auto-highlight
Rectangle aRowRect( Point( _rRect.TopLeft().X(), aPos.Y() ),
Size( _rRect.GetSize().Width(), nDataRowHeigt ) );
- PaintRow( _rOut, aRowRect );
bool bRowSelected = _bDrawSelections
&& !bHideSelect
@@ -1705,12 +1698,6 @@ void BrowseBox::MouseButtonDown( const BrowserMouseEvent& rEvt )
-void BrowseBox::MouseMove( const BrowserMouseEvent& )
-{
-}
-
-
-
void BrowseBox::MouseButtonUp( const BrowserMouseEvent &rEvt )
{
diff --git a/svtools/source/config/accessibilityoptions.cxx b/svtools/source/config/accessibilityoptions.cxx
index e177a15cdeb2..de2eb97a2e0b 100644
--- a/svtools/source/config/accessibilityoptions.cxx
+++ b/svtools/source/config/accessibilityoptions.cxx
@@ -619,12 +619,6 @@ bool SvtAccessibilityOptions::IsModified() const
{
return sm_pSingleImplConfig->IsModified();
}
-void SvtAccessibilityOptions::Commit()
-{
- //sm_pSingleImplConfig->Commit();
-}
-
-
bool SvtAccessibilityOptions::GetAutoDetectSystemHC() const
{
diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx
index a5027d3829ac..9e6b3bfcdae4 100644
--- a/svtools/source/contnr/imivctl.hxx
+++ b/svtools/source/contnr/imivctl.hxx
@@ -311,7 +311,7 @@ class SvxIconChoiceCtrl_Impl
}
void DocRectChanged() { aDocRectChangedIdle.Start(); }
void VisRectChanged() { aVisRectChangedIdle.Start(); }
- void SetOrigin( const Point&, bool bDoNotUpdateWallpaper = false );
+ void SetOrigin( const Point& );
DECL_LINK(TextEditEndedHdl, void *);
diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx
index bcdc09d3bbb5..7e2c61033d1a 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -251,11 +251,6 @@ IMPL_LINK( SvxIconChoiceCtrl_Impl, ScrollLeftRightHdl, ScrollBar*, pScrollBar )
IMPL_LINK_NOARG(SvxIconChoiceCtrl_Impl, EndScrollHdl)
{
- if( pView->HasBackground() && !pView->GetBackground().IsScrollable() &&
- bEndScrollInvalidate )
- {
- pView->Invalidate(INVALIDATE_NOCHILDREN);
- }
return 0;
}
@@ -424,7 +419,7 @@ void SvxIconChoiceCtrl_Impl::EntrySelected( SvxIconChoiceCtrlEntry* pEntry, bool
{
if( pEntry == pCursor )
ShowCursor( false );
- if( pView->IsTracking() && (bSelect || !pView->HasBackground()) ) // always synchronous when tracking
+ if( pView->IsTracking() ) // always synchronous when tracking
PaintEntry( pEntry );
else if( bSyncPaint ) // synchronous & with a virtual OutDev!
PaintEntryVirtOutDev( pEntry );
@@ -855,8 +850,7 @@ bool SvxIconChoiceCtrl_Impl::MouseButtonDown( const MouseEvent& rMEvt)
if( bEntryEditingEnabled && pEntry &&
pEntry->IsSelected())
{
- if( pView->EditingEntry( pEntry ))
- EditEntry( pEntry );
+ EditEntry( pEntry );
}
}
else if( eSelectionMode == SINGLE_SELECTION )
@@ -1272,7 +1266,6 @@ void SvxIconChoiceCtrl_Impl::PositionScrollBars( long nRealWidth, long nRealHeig
void SvxIconChoiceCtrl_Impl::AdjustScrollBars( bool )
{
- Rectangle aOldOutRect( GetOutputRect() );
long nVirtHeight = aVirtOutputSize.Height();
long nVirtWidth = aVirtOutputSize.Width();
@@ -1396,14 +1389,6 @@ void SvxIconChoiceCtrl_Impl::AdjustScrollBars( bool )
nRealHeight++; // because lower border is clipped
aOutputSize.Height() = nRealHeight;
- Rectangle aNewOutRect( GetOutputRect() );
- if( aNewOutRect != aOldOutRect && pView->HasBackground() )
- {
- Wallpaper aPaper( pView->GetBackground() );
- aPaper.SetRect( aNewOutRect );
- pView->SetBackground( aPaper );
- }
-
if( (nResult & (0x0001|0x0002)) == (0x0001|0x0002) )
aScrBarBox.Show();
else
@@ -1430,13 +1415,6 @@ void SvxIconChoiceCtrl_Impl::Resize()
Application::PostUserEvent( LINK( this, SvxIconChoiceCtrl_Impl, UserEventHdl),
EVENTID_ADJUST_SCROLLBARS);
- if( pView->HasBackground() && !pView->GetBackground().IsScrollable() )
- {
- Rectangle aRect( GetOutputRect());
- Wallpaper aPaper( pView->GetBackground() );
- aPaper.SetRect( aRect );
- pView->SetBackground( aPaper );
- }
VisRectChanged();
}
@@ -1601,15 +1579,10 @@ void SvxIconChoiceCtrl_Impl::PaintEmphasis(
{
if ( !bSelected || bCursored )
{
- if( !pView->HasFontFillColor() )
- pOut->SetFillColor( pOut->GetBackground().GetColor() );
- else
- {
- const Color& rFillColor = pView->GetFont().GetFillColor();
- pOut->SetFillColor( rFillColor );
- if( rFillColor != aTransparent )
- bSolidTextRect = true;
- }
+ const Color& rFillColor = pView->GetFont().GetFillColor();
+ pOut->SetFillColor( rFillColor );
+ if( rFillColor != aTransparent )
+ bSolidTextRect = true;
}
}
@@ -1787,13 +1760,10 @@ void SvxIconChoiceCtrl_Impl::PaintEntry( SvxIconChoiceCtrlEntry* pEntry, const P
// font fill colors that are attributed "hard" need corresponding "hard"
// attributed highlight colors
- if( pView->HasFontFillColor() )
- {
- if( (nWinBits & WB_NOHIDESELECTION) || pView->HasFocus() )
- aNewFont.SetFillColor( rSettings.GetHighlightColor() );
- else
- aNewFont.SetFillColor( rSettings.GetDeactiveColor() );
- }
+ if( (nWinBits & WB_NOHIDESELECTION) || pView->HasFocus() )
+ aNewFont.SetFillColor( rSettings.GetHighlightColor() );
+ else
+ aNewFont.SetFillColor( rSettings.GetDeactiveColor() );
Color aWinCol = rSettings.GetWindowTextColor();
if ( !bActiveSelection && rSettings.GetFaceColor().IsBright() == aWinCol.IsBright() )
@@ -2441,13 +2411,6 @@ void SvxIconChoiceCtrl_Impl::MakeVisible( const Rectangle& rRect, bool bScrBar,
SetOrigin( aOrigin );
bool bScrollable = pView->GetBackground().IsScrollable();
- if( pView->HasBackground() && !bScrollable )
- {
- Rectangle aRect( GetOutputRect());
- Wallpaper aPaper( pView->GetBackground() );
- aPaper.SetRect( aRect );
- pView->SetBackground( aPaper );
- }
if( bScrollable && GetUpdateMode() )
{
@@ -2922,8 +2885,7 @@ IMPL_LINK_NOARG(SvxIconChoiceCtrl_Impl, EditTimeoutHdl)
if( bEntryEditingEnabled && pEntry &&
pEntry->IsSelected())
{
- if( pView->EditingEntry( pEntry ))
- EditEntry( pEntry );
+ EditEntry( pEntry );
}
return 0;
}
@@ -3204,8 +3166,7 @@ IMPL_LINK_NOARG(SvxIconChoiceCtrl_Impl, TextEditEndedHdl)
else
aText = pEdit->GetSavedValue();
- if( pView->EditedEntry( pCurEditedEntry, aText, pEdit->EditingCanceled() ) )
- InvalidateEntry( pCurEditedEntry );
+ InvalidateEntry( pCurEditedEntry );
if( !GetSelectionCount() )
SelectEntry( pCurEditedEntry, true );
@@ -3294,13 +3255,7 @@ IcnViewEdit_Impl::IcnViewEdit_Impl( SvtIconChoiceCtrl* pParent, const Point& rPo
vcl::Font aFont( pParent->GetPointFont() );
aFont.SetTransparent( false );
SetControlFont( aFont );
- if( !pParent->HasFontFillColor() )
- {
- Color aColor( pParent->GetBackground().GetColor() );
- SetControlBackground( aColor );
- }
- else
- SetControlBackground( aFont.GetFillColor() );
+ SetControlBackground( aFont.GetFillColor() );
SetControlForeground( aFont.GetColor() );
SetPosPixel( rPos );
SetSizePixel( CalcAdjustedSize(rSize) );
@@ -3422,14 +3377,11 @@ void SvxIconChoiceCtrl_Impl::InitSettings()
{
const StyleSettings& rStyleSettings = pView->GetSettings().GetStyleSettings();
- if( !pView->HasFont() )
- {
- // unit (from settings) is Point
- vcl::Font aFont( rStyleSettings.GetFieldFont() );
- aFont.SetColor( rStyleSettings.GetWindowTextColor() );
- pView->SetPointFont( aFont );
- SetDefaultTextSize();
- }
+ // unit (from settings) is Point
+ vcl::Font aFont( rStyleSettings.GetFieldFont() );
+ aFont.SetColor( rStyleSettings.GetWindowTextColor() );
+ pView->SetPointFont( aFont );
+ SetDefaultTextSize();
pView->SetTextColor( rStyleSettings.GetFieldTextColor() );
pView->SetTextFillColor();
@@ -3783,22 +3735,11 @@ IMPL_LINK_NOARG(SvxIconChoiceCtrl_Impl, CallSelectHdlHdl)
return 0;
}
-void SvxIconChoiceCtrl_Impl::SetOrigin( const Point& rPos, bool bDoNotUpdateWallpaper )
+void SvxIconChoiceCtrl_Impl::SetOrigin( const Point& rPos )
{
MapMode aMapMode( pView->GetMapMode() );
aMapMode.SetOrigin( rPos );
pView->SetMapMode( aMapMode );
- if( !bDoNotUpdateWallpaper )
- {
- bool bScrollable = pView->GetBackground().IsScrollable();
- if( pView->HasBackground() && !bScrollable )
- {
- Rectangle aRect( GetOutputRect());
- Wallpaper aPaper( pView->GetBackground() );
- aPaper.SetRect( aRect );
- pView->SetBackground( aPaper );
- }
- }
}
void SvxIconChoiceCtrl_Impl::CallEventListeners( sal_uLong nEvent, void* pData )
diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx
index 6531f877736f..0ced60f2dfd3 100644
--- a/svtools/source/contnr/ivctrl.cxx
+++ b/svtools/source/contnr/ivctrl.cxx
@@ -101,16 +101,6 @@ SvxIconChoiceCtrlEntry* SvtIconChoiceCtrl::InsertEntry( const OUString& rText, c
return pEntry;
}
-bool SvtIconChoiceCtrl::EditedEntry( SvxIconChoiceCtrlEntry*, const OUString&, bool )
-{
- return true;
-}
-
-bool SvtIconChoiceCtrl::EditingEntry( SvxIconChoiceCtrlEntry* )
-{
- return true;
-}
-
void SvtIconChoiceCtrl::DrawEntryImage( SvxIconChoiceCtrlEntry* pEntry, const Point& rPos, OutputDevice& rDev )
{
rDev.DrawImage( rPos, pEntry->GetImage() );
@@ -121,21 +111,6 @@ OUString SvtIconChoiceCtrl::GetEntryText( SvxIconChoiceCtrlEntry* pEntry, bool )
return pEntry->GetText();
}
-bool SvtIconChoiceCtrl::HasBackground() const
-{
- return false;
-}
-
-bool SvtIconChoiceCtrl::HasFont() const
-{
- return false;
-}
-
-bool SvtIconChoiceCtrl::HasFontFillColor() const
-{
- return true;
-}
-
void SvtIconChoiceCtrl::Paint( const Rectangle& rRect )
{
_pImp->Paint( rRect );
diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx
index fd2b5b4939a5..e16f38ec44ed 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -359,7 +359,6 @@ void SvImpLBox::CursorDown()
if( pNextFirstToDraw )
{
nFlags &= (~F_FILLING);
- pView->NotifyScrolling( -1 );
ShowCursor( false );
pView->Update();
pStartEntry = pNextFirstToDraw;
@@ -381,7 +380,6 @@ void SvImpLBox::CursorUp()
{
nFlags &= (~F_FILLING);
long nEntryHeight = pView->GetEntryHeight();
- pView->NotifyScrolling( 1 );
ShowCursor( false );
pView->Update();
pStartEntry = pPrevFirstToDraw;
@@ -422,7 +420,6 @@ void SvImpLBox::PageDown( sal_uInt16 nDelta )
else
{
long nScroll = nRealDelta * (-1);
- pView->NotifyScrolling( nScroll );
Rectangle aArea( GetVisibleArea() );
nScroll = pView->GetEntryHeight() * static_cast<long>(nRealDelta);
nScroll = -nScroll;
@@ -461,7 +458,6 @@ void SvImpLBox::PageUp( sal_uInt16 nDelta )
else
{
long nEntryHeight = pView->GetEntryHeight();
- pView->NotifyScrolling( (long)nRealDelta );
Rectangle aArea( GetVisibleArea() );
pView->Update();
pView->Scroll( 0, nEntryHeight*nRealDelta, aArea, SCROLL_NOCHILDREN );
@@ -749,7 +745,6 @@ void SvImpLBox::KeyLeftRight( long nDelta )
pView->Update();
BeginScroll();
nFlags &= (~F_FILLING);
- pView->NotifyScrolling( 0 ); // 0 == horizontal scrolling
ShowCursor( false );
// neuen Origin berechnen
@@ -966,7 +961,6 @@ void SvImpLBox::Paint( const Rectangle& rRect )
if( !(nFlags & F_PAINTED) )
{
nFlags |= F_PAINTED;
- RepaintScrollBars();
}
nFlags &= (~F_IN_PAINT);
}
@@ -3111,7 +3105,6 @@ void SvImpLBox::BeginScroll()
{
if( !(nFlags & F_IN_SCROLLING))
{
- pView->NotifyBeginScroll();
nFlags |= F_IN_SCROLLING;
}
}
@@ -3252,10 +3245,6 @@ void SvImpLBox::EndSelection()
nFlags &= ~F_START_EDITTIMER;
}
-void SvImpLBox::RepaintScrollBars()
-{
-}
-
void SvImpLBox::SetUpdateMode( bool bMode )
{
if( bUpdateMode != bMode )
diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx
index d19082ccb466..bf59a71722e4 100644
--- a/svtools/source/contnr/svtabbx.cxx
+++ b/svtools/source/contnr/svtabbx.cxx
@@ -530,7 +530,6 @@ void SvHeaderTabListBox::Paint( const Rectangle& rRect )
if ( m_bFirstPaint )
{
m_bFirstPaint = false;
- RepaintScrollBars();
}
SvTabListBox::Paint( rRect );
}
diff --git a/svtools/source/contnr/treelist.cxx b/svtools/source/contnr/treelist.cxx
index 1da2c9856d52..1a9bc8d858b4 100644
--- a/svtools/source/contnr/treelist.cxx
+++ b/svtools/source/contnr/treelist.cxx
@@ -1385,10 +1385,6 @@ void SvListView::ActionRemoving( SvTreeListEntry* pEntry )
}
}
-void SvListView::ActionRemoved( SvTreeListEntry* /* pEntry */ )
-{
-}
-
void SvListView::ActionClear()
{
Clear();
@@ -1412,7 +1408,6 @@ void SvListView::ModelNotification( SvListAction nActionId, SvTreeListEntry* pEn
ActionRemoving( pEntry1 );
break;
case SvListAction::REMOVED:
- ActionRemoved( pEntry1 );
ModelHasRemoved( pEntry1 );
break;
case SvListAction::MOVING:
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index 581485ab6789..3cce392c8ba5 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -566,10 +566,6 @@ bool SvTreeListBox::CheckDragAndDropMode( SvTreeListBox* pSource, sal_Int8 nActi
-void SvTreeListBox::NotifyRemoving( SvTreeListEntry* )
-{
-}
-
/*
NotifyMoving/Copying
====================
@@ -808,15 +804,10 @@ void SvTreeListBox::RecalcViewData()
pItem->InitViewData( this, pEntry );
nCurPos++;
}
- ViewDataInitialized( pEntry );
pEntry = Next( pEntry );
}
}
-void SvTreeListBox::ViewDataInitialized( SvTreeListEntry* )
-{
-}
-
void SvTreeListBox::ImplShowTargetEmphasis( SvTreeListEntry* pEntry, bool bShow)
{
if ( bShow && (nImpFlags & SVLBOX_TARGEMPH_VIS) )
@@ -1191,14 +1182,6 @@ bool SvTreeListBox::HandleKeyInput( const KeyEvent& _rKEvt )
return false;
}
-void SvTreeListBox::WriteDragServerInfo( const Point&, SvLBoxDDInfo* )
-{
-}
-
-void SvTreeListBox::ReadDragServerInfo(const Point&, SvLBoxDDInfo* )
-{
-}
-
bool SvTreeListBox::EditingCanceled() const
{
if( pEdCtrl && pEdCtrl->EditingCanceled() )
@@ -1279,10 +1262,10 @@ sal_Int8 SvTreeListBox::ExecuteDrop( const ExecuteDropEvent& rEvt, SvTreeListBox
{
nRet = DND_ACTION_NONE;
- ReadDragServerInfo( rEvt.maPosPixel, &aDDInfo );
-
SvTreeListEntry* pTarget = pTargetEntry; // may be 0!
+ memset( &aDDInfo, 0, sizeof(SvLBoxDDInfo) );
+
if( DND_ACTION_COPY == rEvt.mnAction )
{
if ( CopySelection( aDDInfo.pSource, pTarget ) )
@@ -1344,8 +1327,6 @@ void SvTreeListBox::StartDrag( sal_Int8, const Point& rPosPixel )
aDDInfo.pApp = GetpApp();
aDDInfo.pSource = this;
aDDInfo.pDDStartEntry = pEntry;
- // let derived views do their thing
- WriteDragServerInfo( rPosPixel, &aDDInfo );
pContainer->CopyAnyData( SotClipboardFormatId::TREELISTBOX,
reinterpret_cast<char*>(&aDDInfo), sizeof(SvLBoxDDInfo) );
@@ -2263,7 +2244,6 @@ void SvTreeListBox::ScrollOutputArea( short nDeltaEntries )
long nThumb = pImp->aVerSBar.GetThumbPos();
long nMax = pImp->aVerSBar.GetRange().Max();
- NotifyBeginScroll();
if( nDeltaEntries < 0 )
{
// move window up
@@ -2526,7 +2506,6 @@ void SvTreeListBox::ModelIsRemoving( SvTreeListEntry* pEntry )
pEdEntry = NULL;
pImp->RemovingEntry( (SvTreeListEntry*)pEntry );
- NotifyRemoving( (SvTreeListEntry*)pEntry );
}
void SvTreeListBox::ModelHasRemoved( SvTreeListEntry* pEntry )
@@ -3510,34 +3489,21 @@ Size SvTreeListBox::GetOutputSizePixel() const
return aSize;
}
-void SvTreeListBox::NotifyBeginScroll()
-{
-}
-
void SvTreeListBox::NotifyEndScroll()
{
}
-void SvTreeListBox::NotifyScrolling( long )
-{
-}
-
void SvTreeListBox::NotifyScrolled()
{
aScrolledHdl.Call( this );
}
-void SvTreeListBox::NotifyInvalidating()
-{
-}
-
void SvTreeListBox::Invalidate( sal_uInt16 nInvalidateFlags )
{
if( nFocusWidth == -1 )
// to make sure that the control doesn't show the wrong focus rectangle
// after painting
pImp->RecalcFocusRect();
- NotifyInvalidating();
Control::Invalidate( nInvalidateFlags );
pImp->Invalidate();
}
@@ -3548,7 +3514,6 @@ void SvTreeListBox::Invalidate( const Rectangle& rRect, sal_uInt16 nInvalidateFl
// to make sure that the control doesn't show the wrong focus rectangle
// after painting
pImp->RecalcFocusRect();
- NotifyInvalidating();
Control::Invalidate( rRect, nInvalidateFlags );
}
@@ -3704,11 +3669,6 @@ void SvTreeListBox::EndSelection()
pImp->EndSelection();
}
-void SvTreeListBox::RepaintScrollBars() const
-{
- ((SvTreeListBox*)this)->pImp->RepaintScrollBars();
-}
-
ScrollBar *SvTreeListBox::GetVScroll()
{
return &((SvTreeListBox*)this)->pImp->aVerSBar;
diff --git a/svtools/source/control/accessibleruler.cxx b/svtools/source/control/accessibleruler.cxx
index fe7e43c6634f..179d7cea5a5b 100644
--- a/svtools/source/control/accessibleruler.cxx
+++ b/svtools/source/control/accessibleruler.cxx
@@ -118,11 +118,6 @@ awt::Size SAL_CALL SvtRulerAccessible::getSize() throw( RuntimeException, std::e
return AWTSize( GetBoundingBox().GetSize() );
}
-bool SAL_CALL SvtRulerAccessible::isShowing() throw( RuntimeException )
-{
- return true;
-}
-
bool SAL_CALL SvtRulerAccessible::isVisible() throw( RuntimeException )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -216,8 +211,7 @@ uno::Reference< XAccessibleStateSet > SAL_CALL SvtRulerAccessible::getAccessible
{
pStateSetHelper->AddState( AccessibleStateType::ENABLED );
- if( isShowing() )
- pStateSetHelper->AddState( AccessibleStateType::SHOWING );
+ pStateSetHelper->AddState( AccessibleStateType::SHOWING );
if( isVisible() )
pStateSetHelper->AddState( AccessibleStateType::VISIBLE );
diff --git a/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx
index 0c6f7904f09f..92dbaf63f64f 100644
--- a/svtools/source/control/ctrltool.cxx
+++ b/svtools/source/control/ctrltool.cxx
@@ -33,7 +33,7 @@
#include <svtools/ctrltool.hxx>
// Standard Fontgroessen fuer scalierbare Fonts
-static const sal_IntPtr aStdSizeAry[] =
+const sal_IntPtr FontList::aStdSizeAry[] =
{
60,
70,
@@ -761,11 +761,6 @@ const sal_IntPtr* FontList::GetSizeAry( const vcl::FontInfo& rInfo ) const
return mpSizeAry;
}
-const sal_IntPtr* FontList::GetStdSizeAry()
-{
- return aStdSizeAry;
-}
-
struct ImplFSNameItem
{
long mnSize;
diff --git a/svtools/source/control/headbar.cxx b/svtools/source/control/headbar.cxx
index ba4431ab06c5..1f58281bcc45 100644
--- a/svtools/source/control/headbar.cxx
+++ b/svtools/source/control/headbar.cxx
@@ -642,18 +642,6 @@ void HeaderBar::ImplDrawItem( OutputDevice* pDev,
}
}
}
-
- // all UserDraw if required
- if ( nBits & HIB_USERDRAW )
- {
- vcl::Region aRegion( aRect );
- if ( pRect )
- aRegion.Intersect( *pRect );
- pDev->SetClipRegion( aRegion );
- UserDrawEvent aODEvt( pDev, aRect, pItem->mnId );
- UserDraw( aODEvt );
- pDev->SetClipRegion();
- }
}
@@ -1205,12 +1193,6 @@ void HeaderBar::DataChanged( const DataChangedEvent& rDCEvt )
-void HeaderBar::UserDraw( const UserDrawEvent& )
-{
-}
-
-
-
void HeaderBar::StartDrag()
{
maStartDragHdl.Call( this );
diff --git a/svtools/source/control/scrwin.cxx b/svtools/source/control/scrwin.cxx
index 7f5941ee41d1..09d32acecfc6 100644
--- a/svtools/source/control/scrwin.cxx
+++ b/svtools/source/control/scrwin.cxx
@@ -109,7 +109,7 @@ IMPL_LINK( ScrollableWindow, EndScrollHdl, ScrollBar *, pScroll )
{
// notify the start of scrolling, if not already scrolling
if ( !bScrolling )
- StartScroll(), bScrolling = true;
+ bScrolling = true;
// get the delta in logic coordinates
Size aDelta( PixelToLogic( Size( aHScroll.GetDelta(), aVScroll.GetDelta() ) ) );
@@ -125,7 +125,6 @@ IMPL_LINK( ScrollableWindow, EndScrollHdl, ScrollBar *, pScroll )
// notify the end of scrolling
bScrolling = false;
- EndScroll( aDelta.Width(), aDelta.Height() );
return 0;
}
@@ -135,7 +134,7 @@ IMPL_LINK( ScrollableWindow, ScrollHdl, ScrollBar *, pScroll )
{
// notify the start of scrolling, if not already scrolling
if ( !bScrolling )
- StartScroll(), bScrolling = true;
+ bScrolling = true;
if ( bHandleDragging )
{
@@ -276,18 +275,6 @@ void ScrollableWindow::Resize()
-void ScrollableWindow::StartScroll()
-{
-}
-
-
-
-void ScrollableWindow::EndScroll( long, long )
-{
-}
-
-
-
void ScrollableWindow::SetMapMode( const MapMode& rNewMapMode )
{
MapMode aMap( rNewMapMode );
@@ -316,9 +303,6 @@ void ScrollableWindow::SetTotalSize( const Size& rNewSize )
void ScrollableWindow::Scroll( long nDeltaX, long nDeltaY, sal_uInt16 )
{
- if ( !bScrolling )
- StartScroll();
-
// get the delta in pixel
Size aDeltaPix( LogicToPixel( Size(nDeltaX, nDeltaY) ) );
Size aOutPixSz( GetOutputSizePixel() );
@@ -381,7 +365,6 @@ void ScrollableWindow::Scroll( long nDeltaX, long nDeltaY, sal_uInt16 )
if ( !bScrolling )
{
- EndScroll( nDeltaX, nDeltaY );
if ( nDeltaX )
aHScroll.SetThumbPos( -aPixOffset.X() );
if ( nDeltaY )
diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx
index de571bf77e59..30758854e030 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -509,12 +509,6 @@ bool GraphicObject::IsCached( OutputDevice* pOut, const Point& rPt, const Size&
return bRet;
}
-void GraphicObject::ReleaseFromCache()
-{
-
- mpMgr->ReleaseFromCache( *this );
-}
-
bool GraphicObject::Draw( OutputDevice* pOut, const Point& rPt, const Size& rSz,
const GraphicAttr* pAttr, sal_uLong nFlags )
{
diff --git a/svtools/source/graphic/grfmgr2.cxx b/svtools/source/graphic/grfmgr2.cxx
index 0c4e17b66b30..f82fc9fea513 100644
--- a/svtools/source/graphic/grfmgr2.cxx
+++ b/svtools/source/graphic/grfmgr2.cxx
@@ -80,11 +80,6 @@ void GraphicManager::SetCacheTimeout( sal_uLong nTimeoutSeconds )
mpCache->SetCacheTimeout( nTimeoutSeconds );
}
-void GraphicManager::ReleaseFromCache( const GraphicObject& /*rObj*/ )
-{
- // !!!
-}
-
bool GraphicManager::IsInCache( OutputDevice* pOut, const Point& rPt,
const Size& rSz, const GraphicObject& rObj,
const GraphicAttr& rAttr ) const
diff --git a/svtools/source/inc/svimpbox.hxx b/svtools/source/inc/svimpbox.hxx
index 84a5235d9758..b2802168ba29 100644
--- a/svtools/source/inc/svimpbox.hxx
+++ b/svtools/source/inc/svimpbox.hxx
@@ -325,7 +325,6 @@ public:
bool RequestHelp( const HelpEvent& rHEvt );
void EndSelection();
bool IsNodeButton( const Point& rPosPixel, SvTreeListEntry* pEntry ) const;
- void RepaintScrollBars();
void EnableAsyncDrag( bool b ) { bAsyncBeginDrag = b; }
void SetUpdateMode( bool bMode );
bool GetUpdateMode() const { return bUpdateMode; }
diff --git a/svtools/source/misc/imap.cxx b/svtools/source/misc/imap.cxx
index 61db904d9a19..3df94ab93e7f 100644
--- a/svtools/source/misc/imap.cxx
+++ b/svtools/source/misc/imap.cxx
@@ -66,17 +66,6 @@ IMapObject::IMapObject( const OUString& rURL, const OUString& rAltText, const OU
}
-/******************************************************************************
-|*
-|* release internal memory
-|*
-\******************************************************************************/
-
-sal_uInt16 IMapObject::GetVersion() const
-{
- return IMAP_OBJ_VERSION;
-}
-
void IMapObject::Write( SvStream& rOStm, const OUString& rBaseURL ) const
{
const rtl_TextEncoding eEncoding = osl_getThreadTextEncoding();
@@ -755,18 +744,6 @@ bool ImageMap::operator!=( const ImageMap& rImageMap )
/******************************************************************************
|*
-|* release internal memory
-|*
-\******************************************************************************/
-
-sal_uInt16 ImageMap::GetVersion() const
-{
- return IMAGE_MAP_VERSION;
-}
-
-
-/******************************************************************************
-|*
|* insert new object
|*
\******************************************************************************/