summaryrefslogtreecommitdiff
path: root/svtools
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-11-16 21:26:21 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-11-17 07:31:54 +0100
commit70a60cece0666b226c4f36d87d85ec9841bfb67c (patch)
tree5fc6fedac37709b623126e62c96b22bb64084c2b /svtools
parent3b7faa73420550d508d480ed70146468dfadb268 (diff)
loplugin:unusedmethods
most of the removal is ripple effect from removing SvxIconChoiceCtrl_Impl::EditEntry which became dead after commit 630b5db9a10cd49d24d5e563374bd68f1fe670f5 Date: Tue Nov 13 08:40:07 2018 +0200 loplugin:singlevalfields in svtools Change-Id: Ibfaa7c925cc5549a4858cc62c59d848aab72f460 Reviewed-on: https://gerrit.libreoffice.org/63481 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svtools')
-rw-r--r--svtools/source/contnr/imivctl.hxx4
-rw-r--r--svtools/source/contnr/imivctl1.cxx241
-rw-r--r--svtools/source/control/calendar.cxx8
3 files changed, 0 insertions, 253 deletions
diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx
index c6749bc3886f..b3d9f4361a3b 100644
--- a/svtools/source/contnr/imivctl.hxx
+++ b/svtools/source/contnr/imivctl.hxx
@@ -171,7 +171,6 @@ class SvxIconChoiceCtrl_Impl
long nMaxVirtHeight; // max. height aVirtOutputSize for ALIGN_LEFT
std::vector< SvxIconChoiceCtrlEntry* > maZOrderList;
std::unique_ptr<SvxIconChoiceCtrlColumnInfoMap> m_pColumns;
- VclPtr<IcnViewEdit_Impl> pEdit;
WinBits nWinBits;
long nMaxBoundHeight; // height of highest BoundRects
IconChoiceFlags nFlags;
@@ -413,7 +412,6 @@ public:
std::vector<tools::Rectangle>* pOtherRects
);
- bool IsTextHit( SvxIconChoiceCtrlEntry* pEntry, const Point& rDocPos );
void MakeVisible(
const tools::Rectangle& rDocPos,
bool bInScrollBarEvent=false
@@ -426,8 +424,6 @@ public:
);
#endif
bool IsEntryEditing() const { return (pCurEditedEntry!=nullptr); }
- void EditEntry( SvxIconChoiceCtrlEntry* pEntry );
- void StopEntryEditing();
size_t GetEntryCount() const { return aEntries.size(); }
SvxIconChoiceCtrlEntry* GetEntry( size_t nPos )
{
diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx
index b9f5f5276e0a..7c9f9cf333ad 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -39,9 +39,6 @@
#include <memory>
#include <vcl/idle.hxx>
-#define IMPICNVIEW_ACC_RETURN 1
-#define IMPICNVIEW_ACC_ESCAPE 2
-
static constexpr auto DRAWTEXT_FLAGS_ICON =
DrawTextFlags::Center | DrawTextFlags::Top | DrawTextFlags::EndEllipsis |
DrawTextFlags::Clip | DrawTextFlags::MultiLine | DrawTextFlags::WordBreak | DrawTextFlags::Mnemonic;
@@ -53,39 +50,6 @@ static constexpr auto DRAWTEXT_FLAGS_ICON =
static bool bEndScrollInvalidate = true;
-class IcnViewEdit_Impl : public MultiLineEdit
-{
- Link<LinkParamNone*,void> const aCallBackHdl;
- Accelerator aAccReturn;
- Accelerator aAccEscape;
- Idle maLoseFocusIdle;
- bool bCanceled;
- bool bAlreadyInCallback;
- bool bGrabFocus;
-
- void CallCallBackHdl_Impl();
- DECL_LINK(Timeout_Impl, Timer *, void);
- DECL_LINK( ReturnHdl_Impl, Accelerator&, void );
- DECL_LINK( EscapeHdl_Impl, Accelerator&, void );
-
-public:
-
- IcnViewEdit_Impl(
- SvtIconChoiceCtrl* pParent,
- const Point& rPos,
- const Size& rSize,
- const OUString& rData,
- const Link<LinkParamNone*,void>& rNotifyEditEnd );
-
- virtual ~IcnViewEdit_Impl() override;
- virtual void dispose() override;
- virtual void KeyInput( const KeyEvent& rKEvt ) override;
- virtual bool PreNotify( NotifyEvent& rNEvt ) override;
- bool EditingCanceled() const { return bCanceled; }
- void StopEditing();
- bool IsGrabFocus() const { return bGrabFocus; }
-};
-
SvxIconChoiceCtrl_Impl::SvxIconChoiceCtrl_Impl(
SvtIconChoiceCtrl* pCurView,
WinBits nWinStyle
@@ -104,7 +68,6 @@ SvxIconChoiceCtrl_Impl::SvxIconChoiceCtrl_Impl(
pEntryPaintDev = nullptr;
pCurEditedEntry = nullptr;
pCurHighlightFrame = nullptr;
- pEdit = nullptr;
pAnchor = nullptr;
pHdlEntry = nullptr;
pHead = nullptr;
@@ -160,7 +123,6 @@ SvxIconChoiceCtrl_Impl::SvxIconChoiceCtrl_Impl(
SvxIconChoiceCtrl_Impl::~SvxIconChoiceCtrl_Impl()
{
pCurEditedEntry = nullptr;
- pEdit.disposeAndClear();
Clear(false);
CancelUserEvents();
pImpCursor.reset();
@@ -178,7 +140,6 @@ SvxIconChoiceCtrl_Impl::~SvxIconChoiceCtrl_Impl()
void SvxIconChoiceCtrl_Impl::Clear( bool bInCtor )
{
- StopEntryEditing();
nSelectionCount = 0;
pCurHighlightFrame = nullptr;
CancelUserEvents();
@@ -236,7 +197,6 @@ void SvxIconChoiceCtrl_Impl::SetStyle( WinBits nWinStyle )
IMPL_LINK( SvxIconChoiceCtrl_Impl, ScrollUpDownHdl, ScrollBar*, pScrollBar, void )
{
- StopEntryEditing();
// arrow up: delta=-1; arrow down: delta=+1
Scroll( 0, pScrollBar->GetDelta() );
bEndScrollInvalidate = true;
@@ -244,7 +204,6 @@ IMPL_LINK( SvxIconChoiceCtrl_Impl, ScrollUpDownHdl, ScrollBar*, pScrollBar, void
IMPL_LINK( SvxIconChoiceCtrl_Impl, ScrollLeftRightHdl, ScrollBar*, pScrollBar, void )
{
- StopEntryEditing();
// arrow left: delta=-1; arrow right: delta=+1
Scroll( pScrollBar->GetDelta(), 0 );
bEndScrollInvalidate = true;
@@ -2603,12 +2562,6 @@ IMPL_LINK_NOARG(SvxIconChoiceCtrl_Impl, DocRectChangedHdl, Timer *, void)
aDocRectChangedIdle.Stop();
}
-bool SvxIconChoiceCtrl_Impl::IsTextHit( SvxIconChoiceCtrlEntry* pEntry, const Point& rDocPos )
-{
- tools::Rectangle aRect( CalcTextRect( pEntry ));
- return aRect.IsInside( rDocPos );
-}
-
#ifdef DBG_UTIL
void SvxIconChoiceCtrl_Impl::SetEntryTextMode( SvxIconChoiceCtrlTextMode eMode, SvxIconChoiceCtrlEntry* pEntry )
{
@@ -2719,75 +2672,6 @@ void SvxIconChoiceCtrl_Impl::InvalidateEntry( SvxIconChoiceCtrlEntry* pEntry )
ShowCursor( true );
}
-void SvxIconChoiceCtrl_Impl::EditEntry( SvxIconChoiceCtrlEntry* pEntry )
-{
- DBG_ASSERT(pEntry,"EditEntry: Entry not set");
- if( !pEntry )
- return;
-
- StopEntryEditing();
- pEdit.disposeAndClear();
- SetNoSelection();
-
- pCurEditedEntry = pEntry;
- OUString aEntryText( SvtIconChoiceCtrl::GetEntryText( pEntry ) );
- tools::Rectangle aRect( CalcTextRect( pEntry, nullptr, true, &aEntryText ) );
- MakeVisible( aRect );
- Point aPos( aRect.TopLeft() );
- aPos = pView->GetPixelPos( aPos );
- aRect.SetPos( aPos );
- pView->HideFocus();
- pEdit = VclPtr<IcnViewEdit_Impl>::Create(
-
- pView,
- aRect.TopLeft(),
- aRect.GetSize(),
- aEntryText,
- LINK( this, SvxIconChoiceCtrl_Impl, TextEditEndedHdl ) );
-}
-
-IMPL_LINK_NOARG(SvxIconChoiceCtrl_Impl, TextEditEndedHdl, LinkParamNone*, void)
-{
- DBG_ASSERT(pEdit,"TextEditEnded: pEdit not set");
- if( !pEdit )
- {
- pCurEditedEntry = nullptr;
- return;
- }
- DBG_ASSERT(pCurEditedEntry,"TextEditEnded: pCurEditedEntry not set");
-
- if( !pCurEditedEntry )
- {
- pEdit->Hide();
- if( pEdit->IsGrabFocus() )
- pView->GrabFocus();
- return;
- }
-
- OUString aText;
- if ( !pEdit->EditingCanceled() )
- aText = pEdit->GetText();
- else
- aText = pEdit->GetSavedValue();
-
- InvalidateEntry( pCurEditedEntry );
- if( !GetSelectionCount() )
- SelectEntry( pCurEditedEntry, true );
-
- pEdit->Hide();
- if( pEdit->IsGrabFocus() )
- pView->GrabFocus();
- // The edit can not be deleted here, because it is not within a handler. It
- // will be deleted in the dtor or in the next EditEntry.
- pCurEditedEntry = nullptr;
-}
-
-void SvxIconChoiceCtrl_Impl::StopEntryEditing()
-{
- if( pEdit )
- pEdit->StopEditing();
-}
-
SvxIconChoiceCtrlEntry* SvxIconChoiceCtrl_Impl::GetFirstSelectedEntry() const
{
if( !GetSelectionCount() )
@@ -2842,133 +2726,8 @@ void SvxIconChoiceCtrl_Impl::SelectAll()
pAnchor = nullptr;
}
-IcnViewEdit_Impl::IcnViewEdit_Impl( SvtIconChoiceCtrl* pParent, const Point& rPos,
- const Size& rSize, const OUString& rData, const Link<LinkParamNone*,void>& rNotifyEditEnd ) :
- MultiLineEdit( pParent, (pParent->GetStyle() & WB_ICON) ? WB_CENTER : WB_LEFT),
- aCallBackHdl( rNotifyEditEnd ),
- bCanceled( false ),
- bAlreadyInCallback( false ),
- bGrabFocus( false )
-{
- maLoseFocusIdle.SetPriority(TaskPriority::REPAINT);
- maLoseFocusIdle.SetInvokeHandler(LINK(this,IcnViewEdit_Impl,Timeout_Impl));
- maLoseFocusIdle.SetDebugName( "svx::IcnViewEdit_Impl maLoseFocusIdle" );
-
- // FIXME: Outside of Paint Hierarchy
- vcl::Font aFont(pParent->GetPointFont(*this));
- aFont.SetTransparent( false );
- SetControlFont(aFont);
- SetControlBackground(aFont.GetFillColor());
- SetControlForeground(aFont.GetColor());
- SetPosPixel(rPos);
- SetSizePixel(CalcAdjustedSize(rSize));
- SetText(rData);
- SaveValue();
-
- aAccReturn.InsertItem( IMPICNVIEW_ACC_RETURN, vcl::KeyCode(KEY_RETURN) );
- aAccEscape.InsertItem( IMPICNVIEW_ACC_ESCAPE, vcl::KeyCode(KEY_ESCAPE) );
-
- aAccReturn.SetActivateHdl( LINK( this, IcnViewEdit_Impl, ReturnHdl_Impl) );
- aAccEscape.SetActivateHdl( LINK( this, IcnViewEdit_Impl, EscapeHdl_Impl) );
- Application::InsertAccel( &aAccReturn);//, ACCEL_ALWAYS );
- Application::InsertAccel( &aAccEscape);//, ACCEL_ALWAYS );
- Show();
- GrabFocus();
-}
-
-IcnViewEdit_Impl::~IcnViewEdit_Impl()
-{
- disposeOnce();
-}
-
-void IcnViewEdit_Impl::dispose()
-{
- if( !bAlreadyInCallback )
- {
- Application::RemoveAccel( &aAccReturn );
- Application::RemoveAccel( &aAccEscape );
- }
- MultiLineEdit::dispose();
-}
-
-void IcnViewEdit_Impl::CallCallBackHdl_Impl()
-{
- maLoseFocusIdle.Stop();
- if ( !bAlreadyInCallback )
- {
- bAlreadyInCallback = true;
- Application::RemoveAccel( &aAccReturn );
- Application::RemoveAccel( &aAccEscape );
- Hide();
- aCallBackHdl.Call( nullptr );
- }
-}
-
-IMPL_LINK_NOARG(IcnViewEdit_Impl, Timeout_Impl, Timer *, void)
-{
- CallCallBackHdl_Impl();
-}
-
-IMPL_LINK_NOARG( IcnViewEdit_Impl, ReturnHdl_Impl, Accelerator&, void )
-{
- bCanceled = false;
- bGrabFocus = true;
- CallCallBackHdl_Impl();
-}
-
-IMPL_LINK_NOARG( IcnViewEdit_Impl, EscapeHdl_Impl, Accelerator&, void )
-{
- bCanceled = true;
- bGrabFocus = true;
- CallCallBackHdl_Impl();
-}
-
-void IcnViewEdit_Impl::KeyInput( const KeyEvent& rKEvt )
-{
- vcl::KeyCode aCode = rKEvt.GetKeyCode();
- sal_uInt16 nCode = aCode.GetCode();
-
- switch ( nCode )
- {
- case KEY_ESCAPE:
- bCanceled = true;
- bGrabFocus = true;
- CallCallBackHdl_Impl();
- break;
- case KEY_RETURN:
- bCanceled = false;
- bGrabFocus = true;
- CallCallBackHdl_Impl();
- break;
- default:
- MultiLineEdit::KeyInput( rKEvt );
- }
-}
-
-bool IcnViewEdit_Impl::PreNotify( NotifyEvent& rNEvt )
-{
- if( rNEvt.GetType() == MouseNotifyEvent::LOSEFOCUS )
- {
- if ( !bAlreadyInCallback &&
- ((!Application::GetFocusWindow()) || !IsChild(Application::GetFocusWindow())))
- {
- bCanceled = false;
- maLoseFocusIdle.Start();
- }
- }
- return false;
-}
-
-void IcnViewEdit_Impl::StopEditing()
-{
- if ( !bAlreadyInCallback )
- {
- bCanceled = true;
- CallCallBackHdl_Impl();
- }
-}
sal_Int32 SvxIconChoiceCtrl_Impl::GetEntryListPos( SvxIconChoiceCtrlEntry const * pEntry ) const
{
diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx
index 6581f26be17f..b7de9d8ecd6a 100644
--- a/svtools/source/control/calendar.cxx
+++ b/svtools/source/control/calendar.cxx
@@ -871,14 +871,6 @@ void Calendar::ImplUpdate( bool bCalcNew )
mbFormat = true;
}
-void Calendar::ImplInvertDropPos()
-{
- tools::Rectangle aRect = GetDateRect( maDropDate );//this is one Pixel to width and one to height
- aRect.SetBottom( aRect.Top()+mnDayHeight-1 );
- aRect.SetRight( aRect.Left()+mnDayWidth-1 );
- Invert( aRect );
-}
-
void Calendar::ImplScroll( bool bPrev )
{
Date aNewFirstMonth = GetFirstMonth();