[Libreoffice-commits] core.git: compilerplugins/clang include/vcl vcl/inc vcl/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Sat Aug 8 10:59:32 UTC 2020
compilerplugins/clang/virtualdead.py | 2
compilerplugins/clang/virtualdead.results | 50 ++------
compilerplugins/clang/virtualdead.unusedparams.results | 102 ++++-------------
include/vcl/treelistbox.hxx | 1
vcl/inc/svimpbox.hxx | 5
vcl/source/treelist/iconviewimpl.cxx | 6 -
vcl/source/treelist/svimpbox.cxx | 35 -----
vcl/source/treelist/treelistbox.cxx | 5
8 files changed, 46 insertions(+), 160 deletions(-)
New commits:
commit 5a79c78338b0f6a568947d5623a0c93a5e9b2aa3
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Fri Aug 7 21:44:38 2020 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sat Aug 8 12:58:58 2020 +0200
loplugin:virtualdead
Change-Id: Ib2a4ebad50e9c6f0d71a9ac3a1bc8ac11e775496
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100378
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/compilerplugins/clang/virtualdead.py b/compilerplugins/clang/virtualdead.py
index 142743685bf4..ed43d1a6d20d 100755
--- a/compilerplugins/clang/virtualdead.py
+++ b/compilerplugins/clang/virtualdead.py
@@ -61,6 +61,7 @@ for callInfo, callValues in callDict.iteritems():
if srcloc.startswith("Gui/"): continue
if srcloc.startswith("Widgets/"): continue
if srcloc.startswith("Core/"): continue
+ if srcloc.startswith("/Qt"): continue
functionSig = callInfo[0]
tmp1list.append((srcloc, functionSig, callValue))
@@ -92,6 +93,7 @@ for name, bitfield in tmp2dict.iteritems():
if srcloc.startswith("Gui/"): continue
if srcloc.startswith("Widgets/"): continue
if srcloc.startswith("Core/"): continue
+ if srcloc.startswith("/Qt"): continue
# ignore external stuff
if srcloc.startswith("workdir/"): continue
# referenced by generated code in workdir/
diff --git a/compilerplugins/clang/virtualdead.results b/compilerplugins/clang/virtualdead.results
index 831d23c4d24f..604c5ac664fb 100644
--- a/compilerplugins/clang/virtualdead.results
+++ b/compilerplugins/clang/virtualdead.results
@@ -25,37 +25,37 @@ canvas/inc/base/graphicdevicebase.hxx:305
canvas/inc/base/graphicdevicebase.hxx:318
void canvas::GraphicDeviceBase::removeVetoableChangeListener(const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::beans::XVetoableChangeListener> &,)
empty
-desktop/source/deployment/registry/inc/dp_backenddb.hxx:120
+desktop/source/deployment/registry/inc/dp_backenddb.hxx:119
class rtl::OUString dp_registry::backend::BackendDb::getDbNSName()
"http://openoffi
include/basegfx/utils/unopolypolygon.hxx:94
void basegfx::unotools::UnoPolyPolygon::modifying()const
empty
-include/connectivity/sdbcx/IRefreshable.hxx:31
+include/connectivity/sdbcx/IRefreshable.hxx:29
void connectivity::sdbcx::IRefreshableGroups::refreshGroups()
empty
include/filter/msfilter/msdffimp.hxx:545
_Bool SvxMSDffManager::ShapeHasText(unsigned long,unsigned long,)const
1
-include/svl/svdde.hxx:237
+include/svl/svdde.hxx:235
class DdeData * DdeTopic::Get(enum SotClipboardFormatId,)
0
-include/svl/svdde.hxx:238
+include/svl/svdde.hxx:236
_Bool DdeTopic::Put(const class DdeData *,)
0
-include/svl/svdde.hxx:239
+include/svl/svdde.hxx:237
_Bool DdeTopic::Execute(const class rtl::OUString *,)
0
-include/svl/svdde.hxx:241
+include/svl/svdde.hxx:239
_Bool DdeTopic::MakeItem(const class rtl::OUString &,)
0
-include/svl/svdde.hxx:244
+include/svl/svdde.hxx:242
_Bool DdeTopic::StartAdviseLoop()
0
include/svtools/unoevent.hxx:199
unsigned short SvEventDescriptor::getMacroItemWhich()const
108
-include/ucbhelper/resultset.hxx:411
+include/ucbhelper/resultset.hxx:410
void ucbhelper::ResultSetDataSupplier::close()
empty
include/unotools/desktopterminationobserver.hxx:36
@@ -64,26 +64,8 @@ include/unotools/desktopterminationobserver.hxx:36
include/vbahelper/vbahelperinterface.hxx:74
int InheritedHelperInterfaceImpl::getCreator()
1400204879
-QtGui/qaccessible.h:466
- class QObject * QAccessibleInterface::object()const
- 0
-QtGui/qaccessible.h:467
- class QWindow * QAccessibleInterface::window()const
- 0
-QtGui/qaccessible.h:479
- int QAccessibleInterface::indexOfChild(const class QAccessibleInterface *,)const
- 0
-QtGui/qaccessible.h:483
- void QAccessibleInterface::setText(enum QAccessible::Text,const class QString &,)
- empty
-QtGui/qaccessible.h:613
- _Bool QAccessibleTableInterface::isColumnSelected(int,)const
- 1
-QtGui/qaccessible.h:614
- _Bool QAccessibleTableInterface::isRowSelected(int,)const
- 1
-QtGui/qaccessible.h:620
- void QAccessibleTableInterface::modelChange(class QAccessibleTableModelChangeEvent *,)
+include/vcl/treelistbox.hxx:502
+ void SvTreeListBox::NotifyEndScroll()
empty
sc/source/core/opencl/formulagroupcl.cxx:1069
void sc::opencl::(anonymous namespace)::DynamicKernelSlidingArgument::GenSlidingWindowFunction(class std::__cxx11::basic_stringstream<char> &,)
@@ -124,10 +106,10 @@ vcl/inc/salgdiimpl.hxx:129
vcl/inc/salgdiimpl.hxx:170
_Bool SalGraphicsImpl::drawEPS(long,long,long,long,void *,unsigned int,)
0
-vcl/inc/salinst.hxx:93
+vcl/inc/salinst.hxx:89
_Bool SalInstance::SVMainHook(int *,)
0
-vcl/inc/salinst.hxx:203
+vcl/inc/salinst.hxx:199
void SalInstance::releaseMainThread()
empty
vcl/inc/salmenu.hxx:77
@@ -148,15 +130,15 @@ vcl/inc/salprn.hxx:85
vcl/inc/salprn.hxx:116
enum SalPrinterError SalPrinter::GetErrorCode()
0
-writerfilter/source/ooxml/OOXMLFactory.hxx:67
+writerfilter/source/ooxml/OOXMLFactory.hxx:66
void writerfilter::ooxml::OOXMLFactory_ns::startAction(class writerfilter::ooxml::OOXMLFastContextHandler *,)
empty
-writerfilter/source/ooxml/OOXMLFactory.hxx:68
+writerfilter/source/ooxml/OOXMLFactory.hxx:67
void writerfilter::ooxml::OOXMLFactory_ns::charactersAction(class writerfilter::ooxml::OOXMLFastContextHandler *,const class rtl::OUString &,)
empty
-writerfilter/source/ooxml/OOXMLFactory.hxx:69
+writerfilter/source/ooxml/OOXMLFactory.hxx:68
void writerfilter::ooxml::OOXMLFactory_ns::endAction(class writerfilter::ooxml::OOXMLFastContextHandler *,)
empty
-writerfilter/source/ooxml/OOXMLFactory.hxx:70
+writerfilter/source/ooxml/OOXMLFactory.hxx:69
void writerfilter::ooxml::OOXMLFactory_ns::attributeAction(class writerfilter::ooxml::OOXMLFastContextHandler *,int,const class tools::SvRef<class writerfilter::ooxml::OOXMLValue> &,)
empty
diff --git a/compilerplugins/clang/virtualdead.unusedparams.results b/compilerplugins/clang/virtualdead.unusedparams.results
index a4e3bbc5ff5d..5cb5f8923929 100644
--- a/compilerplugins/clang/virtualdead.unusedparams.results
+++ b/compilerplugins/clang/virtualdead.unusedparams.results
@@ -52,7 +52,7 @@ canvas/inc/base/integerbitmapbase.hxx:58
canvas/inc/base/integerbitmapbase.hxx:72
void canvas::IntegerBitmapBase::setPixel(const class com::sun::star::uno::Sequence<signed char> &,const struct com::sun::star::rendering::IntegerBitmapLayout &,const struct com::sun::star::geometry::IntegerPoint2D &,)
011
-desktop/source/deployment/registry/inc/dp_backend.h:80
+desktop/source/deployment/registry/inc/dp_backend.h:79
void dp_registry::backend::Package::processPackage_(class osl::ResettableGuard<class osl::Mutex> &,_Bool,_Bool,const class rtl::Reference<class dp_misc::AbortChannel> &,const class com::sun::star::uno::Reference<class com::sun::star::ucb::XCommandEnvironment> &,)
01111
extensions/source/bibliography/loadlisteneradapter.hxx:110
@@ -67,22 +67,22 @@ include/cppuhelper/propshlp.hxx:326
include/drawinglayer/primitive2d/textbreakuphelper.hxx:58
_Bool drawinglayer::primitive2d::TextBreakupHelper::allowChange(unsigned int,class basegfx::B2DHomMatrix &,unsigned int,unsigned int,)
0111
-include/editeng/editeng.hxx:484
+include/editeng/editeng.hxx:483
void EditEngine::PaintingFirstLine(int,const class Point &,long,const class Point &,short,class OutputDevice *,)
110111
-include/editeng/editeng.hxx:487
+include/editeng/editeng.hxx:486
void EditEngine::ParagraphConnected(int,int,)
01
include/filter/msfilter/msdffimp.hxx:545
_Bool SvxMSDffManager::ShapeHasText(unsigned long,unsigned long,)const
00
-include/oox/dump/dumperbase.hxx:473
+include/oox/dump/dumperbase.hxx:472
void oox::dump::ConfigItemBase::implProcessConfigItemInt(class oox::TextInputStream &,long,const class rtl::OUString &,)
011
-include/oox/dump/dumperbase.hxx:564
+include/oox/dump/dumperbase.hxx:563
class rtl::OUString oox::dump::NameListBase::implGetNameDbl(const class oox::dump::Config &,double,)const
01
-include/oox/dump/oledumper.hxx:166
+include/oox/dump/oledumper.hxx:165
void oox::dump::ComCtlObjectBase::implDumpCommonExtra(long,)
0
include/oox/export/shapes.hxx:136
@@ -91,25 +91,28 @@ include/oox/export/shapes.hxx:136
include/sfx2/stbitem.hxx:100
_Bool SfxStatusBarControl::MouseButtonUp(const class MouseEvent &,)
0
-include/svl/svdde.hxx:228
+include/svl/svdde.hxx:226
_Bool DdeGetPutItem::Put(const class DdeData *,)
0
-include/svl/svdde.hxx:237
+include/svl/svdde.hxx:235
class DdeData * DdeTopic::Get(enum SotClipboardFormatId,)
0
-include/svl/svdde.hxx:238
+include/svl/svdde.hxx:236
_Bool DdeTopic::Put(const class DdeData *,)
0
-include/svl/svdde.hxx:239
+include/svl/svdde.hxx:237
_Bool DdeTopic::Execute(const class rtl::OUString *,)
0
-include/svl/svdde.hxx:241
+include/svl/svdde.hxx:239
_Bool DdeTopic::MakeItem(const class rtl::OUString &,)
0
+include/svtools/editbrowsebox.hxx:102
+ void svt::CellController::ActivatingMouseEvent(const class BrowserMouseEvent &,_Bool,)
+ 10
include/svx/IAccessibleParent.hxx:80
_Bool accessibility::IAccessibleParent::ReplaceChild(class accessibility::AccessibleShape *,const class com::sun::star::uno::Reference<class com::sun::star::drawing::XShape> &,const long,const class accessibility::AccessibleShapeTreeInfo &,)
1101
-include/svx/selectioncontroller.hxx:48
+include/svx/selectioncontroller.hxx:47
_Bool sdr::SelectionController::onMouseButtonUp(const class MouseEvent &,class vcl::Window *,)
10
include/vcl/accessibletable.hxx:91
@@ -121,72 +124,18 @@ include/vcl/accessibletable.hxx:92
include/vcl/accessibletable.hxx:93
void vcl::table::IAccessibleTable::FillAccessibleStateSetForCell(class utl::AccessibleStateSetHelper &,int,unsigned short,)const
110
-include/vcl/dndhelp.hxx:72
+include/vcl/dndhelp.hxx:62
void vcl::unohelper::DragAndDropClient::dragExit(const struct com::sun::star::datatransfer::dnd::DropTargetEvent &,)
0
include/vcl/opengl/OpenGLContext.hxx:141
struct SystemWindowData OpenGLContext::generateWinData(class vcl::Window *,_Bool,)
10
-include/vcl/treelistbox.hxx:466
+include/vcl/treelistbox.hxx:428
enum DragDropMode SvTreeListBox::NotifyStartDrag(class TransferDataContainer &,class SvTreeListEntry *,)
00
-include/vcl/treelistbox.hxx:715
- void SvTreeListBox::ExecuteContextMenuAction(unsigned short,)
- 0
-QtCore/qmimedata.h:88
- class QVariant QMimeData::retrieveData(const class QString &,enum QVariant::Type,)const
+include/vcl/treelistbox.hxx:589
+ _Bool SvTreeListBox::EditingEntry(class SvTreeListEntry *,class Selection &,)
10
-QtGui/qaccessible.h:479
- int QAccessibleInterface::indexOfChild(const class QAccessibleInterface *,)const
- 0
-QtGui/qaccessible.h:483
- void QAccessibleInterface::setText(enum QAccessible::Text,const class QString &,)
- 00
-QtGui/qaccessible.h:528
- void QAccessibleTextInterface::addSelection(int,int,)
- 00
-QtGui/qaccessible.h:529
- void QAccessibleTextInterface::removeSelection(int,)
- 0
-QtGui/qaccessible.h:530
- void QAccessibleTextInterface::setSelection(int,int,int,)
- 011
-QtGui/qaccessible.h:538
- class QString QAccessibleTextInterface::textBeforeOffset(int,enum QAccessible::TextBoundaryType,int *,int *,)const
- 0000
-QtGui/qaccessible.h:540
- class QString QAccessibleTextInterface::textAfterOffset(int,enum QAccessible::TextBoundaryType,int *,int *,)const
- 0000
-QtGui/qaccessible.h:542
- class QString QAccessibleTextInterface::textAtOffset(int,enum QAccessible::TextBoundaryType,int *,int *,)const
- 0000
-QtGui/qaccessible.h:547
- class QRect QAccessibleTextInterface::characterRect(int,)const
- 0
-QtGui/qaccessible.h:548
- int QAccessibleTextInterface::offsetAtPoint(const class QPoint &,)const
- 0
-QtGui/qaccessible.h:613
- _Bool QAccessibleTableInterface::isColumnSelected(int,)const
- 0
-QtGui/qaccessible.h:614
- _Bool QAccessibleTableInterface::isRowSelected(int,)const
- 0
-QtGui/qaccessible.h:620
- void QAccessibleTableInterface::modelChange(class QAccessibleTableModelChangeEvent *,)
- 0
-QtWidgets/qwidget.h:629
- void QWidget::focusInEvent(class QFocusEvent *,)
- 0
-QtWidgets/qwidget.h:630
- void QWidget::focusOutEvent(class QFocusEvent *,)
- 0
-QtWidgets/qwidget.h:650
- void QWidget::dragLeaveEvent(class QDragLeaveEvent *,)
- 0
-QtWidgets/qwidget.h:654
- void QWidget::showEvent(class QShowEvent *,)
- 0
sc/inc/filter.hxx:82
void ScFormatFilterPlugin::ScExportHTML(class SvStream &,const class rtl::OUString &,class ScDocument *,const class ScRange &,const unsigned short,_Bool,const class rtl::OUString &,class rtl::OUString &,const class rtl::OUString &,)
111101111
@@ -247,10 +196,10 @@ sw/source/core/access/acccontext.hxx:352
sw/source/core/inc/txmsrt.hxx:145
void SwTOXSortTabBase::FillText(class SwTextNode &,const class SwIndex &,unsigned short,const class SwRootFrame *const,)const
1100
-sw/source/filter/ww8/wrtww8.hxx:797
+sw/source/filter/ww8/wrtww8.hxx:796
void MSWordExportBase::WriteHyperlinkData(const class sw::mark::IFieldmark &,)
0
-sw/source/filter/ww8/wrtww8.hxx:862
+sw/source/filter/ww8/wrtww8.hxx:861
void MSWordExportBase::OutputGrfNode(const class SwGrfNode &,)
0
vcl/inc/outdev.h:122
@@ -286,13 +235,16 @@ vcl/inc/salgdiimpl.hxx:136
vcl/inc/salgdiimpl.hxx:170
_Bool SalGraphicsImpl::drawEPS(long,long,long,long,void *,unsigned int,)
000000
-vcl/inc/salinst.hxx:93
+vcl/inc/salinst.hxx:89
_Bool SalInstance::SVMainHook(int *,)
0
-vcl/inc/salinst.hxx:126
+vcl/inc/salinst.hxx:122
void SalInstance::GetPrinterQueueState(struct SalPrinterQueueInfo *,)
0
-vcl/inc/salinst.hxx:186
+vcl/inc/salinst.hxx:164
+ class weld::Builder * SalInstance::CreateInterimBuilder(class vcl::Window *,const class rtl::OUString &,const class rtl::OUString &,unsigned long,)
+ 1110
+vcl/inc/salinst.hxx:182
void SalInstance::AddToRecentDocumentList(const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,)
100
vcl/inc/salmenu.hxx:71
diff --git a/include/vcl/treelistbox.hxx b/include/vcl/treelistbox.hxx
index cd6a5abf262d..448cf34264e6 100644
--- a/include/vcl/treelistbox.hxx
+++ b/include/vcl/treelistbox.hxx
@@ -499,7 +499,6 @@ protected:
virtual void InitEntry(SvTreeListEntry*, const OUString&, const Image&, const Image&);
- virtual void NotifyEndScroll();
virtual void NotifyScrolled();
void SetScrolledHdl( const Link<SvTreeListBox*,void>& rLink ) { aScrolledHdl = rLink; }
long GetXOffset() const { return GetMapMode().GetOrigin().X(); }
diff --git a/vcl/inc/svimpbox.hxx b/vcl/inc/svimpbox.hxx
index fb88701de835..cb52069ca41b 100644
--- a/vcl/inc/svimpbox.hxx
+++ b/vcl/inc/svimpbox.hxx
@@ -59,7 +59,6 @@ public:
// Flags for nFlag
enum class LBoxFlags {
NONE = 0x0000,
- InScrolling = 0x0001,
DeselectAll = 0x0002,
StartEditTimer = 0x0004, // MAC only
IgnoreSelect = 0x0008,
@@ -73,7 +72,7 @@ enum class LBoxFlags {
};
namespace o3tl
{
- template<> struct typed_flags<LBoxFlags> : is_typed_flags<LBoxFlags, 0x07ff> {};
+ template<> struct typed_flags<LBoxFlags> : is_typed_flags<LBoxFlags, 0x07fe> {};
}
#define NODE_BMP_TABDIST_NOTVALID -2000000
@@ -215,8 +214,6 @@ protected:
tools::Rectangle GetVisibleArea() const;
void SetCursor( SvTreeListEntry* pEntry, bool bForceNoSelect = false );
- void BeginScroll();
- void EndScroll();
void PositionScrollBars( Size& rOSize, sal_uInt16 nMask );
void FindMostRight();
void FillView();
diff --git a/vcl/source/treelist/iconviewimpl.cxx b/vcl/source/treelist/iconviewimpl.cxx
index b0818e94eea1..024ee93fca65 100644
--- a/vcl/source/treelist/iconviewimpl.cxx
+++ b/vcl/source/treelist/iconviewimpl.cxx
@@ -165,15 +165,12 @@ void IconViewImpl::KeyDown( bool bPageDown )
return;
m_nFlags &= ~LBoxFlags::Filling;
- BeginScroll();
m_aVerSBar->SetThumbPos( nThumbPos+nDelta );
if( bPageDown )
PageDown( static_cast<short>(nDelta) );
else
CursorDown();
-
- EndScroll();
}
void IconViewImpl::KeyUp( bool bPageUp )
@@ -196,15 +193,12 @@ void IconViewImpl::KeyUp( bool bPageUp )
return;
m_nFlags &= ~LBoxFlags::Filling;
- BeginScroll();
m_aVerSBar->SetThumbPos( nThumbPos - nDelta );
if( bPageUp )
PageUp( static_cast<short>(nDelta) );
else
CursorUp();
-
- EndScroll();
}
long IconViewImpl::GetEntryLine(const SvTreeListEntry* pEntry) const
diff --git a/vcl/source/treelist/svimpbox.cxx b/vcl/source/treelist/svimpbox.cxx
index 6e782614a105..22a03342e153 100644
--- a/vcl/source/treelist/svimpbox.cxx
+++ b/vcl/source/treelist/svimpbox.cxx
@@ -278,7 +278,6 @@ IMPL_LINK_NOARG(SvImpLBox, EndScrollHdl, ScrollBar*, void)
m_aVerSBar->SetVisibleSize( m_nNextVerVisSize );
m_nFlags &= ~LBoxFlags::EndScrollSetVisSize;
}
- EndScroll();
}
// handler for vertical scrollbar
@@ -299,7 +298,6 @@ IMPL_LINK( SvImpLBox, ScrollUpDownHdl, ScrollBar *, pScrollBar, void )
m_pView->EndEditing( true ); // Cancel
m_pView->PaintImmediately();
}
- BeginScroll();
if( nDelta > 0 )
{
@@ -455,15 +453,12 @@ void SvImpLBox::KeyUp( bool bPageUp )
return;
m_nFlags &= ~LBoxFlags::Filling;
- BeginScroll();
m_aVerSBar->SetThumbPos( nThumbPos - nDelta );
if( bPageUp )
PageUp( static_cast<short>(nDelta) );
else
CursorUp();
-
- EndScroll();
}
@@ -490,15 +485,12 @@ void SvImpLBox::KeyDown( bool bPageDown )
return;
m_nFlags &= ~LBoxFlags::Filling;
- BeginScroll();
m_aVerSBar->SetThumbPos( nThumbPos+nDelta );
if( bPageDown )
PageDown( static_cast<short>(nDelta) );
else
CursorDown();
-
- EndScroll();
}
@@ -700,7 +692,6 @@ void SvImpLBox::KeyLeftRight( long nDelta )
{
if( !(m_nFlags & LBoxFlags::InResize) )
m_pView->PaintImmediately();
- BeginScroll();
m_nFlags &= ~LBoxFlags::Filling;
ShowCursor( false );
@@ -2045,7 +2036,6 @@ void SvImpLBox::MouseButtonUp( const MouseEvent& rMEvt)
{
if ( !ButtonUpCheckCtrl( rMEvt ) && ( m_aSelEng.GetSelectionMode() != SelectionMode::NONE ) )
m_aSelEng.SelMouseButtonUp( rMEvt );
- EndScroll();
if( m_nFlags & LBoxFlags::StartEditTimer )
{
m_nFlags &= ~LBoxFlags::StartEditTimer;
@@ -2228,7 +2218,6 @@ bool SvImpLBox::KeyInput( const KeyEvent& rKEvt)
if( nThumb )
{
KeyLeftRight( nThumb );
- EndScroll();
}
}
else
@@ -2249,7 +2238,6 @@ bool SvImpLBox::KeyInput( const KeyEvent& rKEvt)
if( nThumb )
{
KeyLeftRight( -nThumb );
- EndScroll();
}
else if( m_bSubLstOpLR )
{
@@ -2590,9 +2578,6 @@ void ImpLBSelEng::DestroyAnchor()
void ImpLBSelEng::SetCursorAtPoint(const Point& rPoint, bool bDontSelectAtCursor)
{
SvTreeListEntry* pNewCursor = pImp->MakePointVisible( rPoint );
- if( pNewCursor != pImp->m_pCursor )
- pImp->BeginScroll();
-
if( pNewCursor )
{
// at SimpleTravel, the SetCursor is selected and the select handler is
@@ -2833,9 +2818,7 @@ void SvImpLBox::SetDragDropMode( DragDropMode eDDMode )
void SvImpLBox::BeginDrag()
{
m_nFlags &= ~LBoxFlags::Filling;
- BeginScroll();
m_pView->StartDrag( 0, m_aSelEng.GetMousePosPixel() );
- EndScroll();
}
void SvImpLBox::PaintDDCursor(SvTreeListEntry* pEntry, bool bShow)
@@ -2986,24 +2969,6 @@ void SvImpLBox::Command( const CommandEvent& rCEvt )
}
}
-void SvImpLBox::BeginScroll()
-{
- if( !(m_nFlags & LBoxFlags::InScrolling))
- {
- m_nFlags |= LBoxFlags::InScrolling;
- }
-}
-
-void SvImpLBox::EndScroll()
-{
- if( m_nFlags & LBoxFlags::InScrolling)
- {
- m_pView->NotifyEndScroll();
- m_nFlags &= ~LBoxFlags::InScrolling;
- }
-}
-
-
tools::Rectangle SvImpLBox::GetVisibleArea() const
{
Point aPos( m_pView->GetMapMode().GetOrigin() );
diff --git a/vcl/source/treelist/treelistbox.cxx b/vcl/source/treelist/treelistbox.cxx
index cd0729c23350..8a4cfe56454b 100644
--- a/vcl/source/treelist/treelistbox.cxx
+++ b/vcl/source/treelist/treelistbox.cxx
@@ -1985,7 +1985,6 @@ void SvTreeListBox::ScrollOutputArea( short nDeltaEntries )
pImpl->PageUp( static_cast<sal_uInt16>(nDeltaEntries) );
}
pImpl->SyncVerThumb();
- NotifyEndScroll();
}
void SvTreeListBox::ScrollToAbsPos( long nPos )
@@ -3184,10 +3183,6 @@ Size SvTreeListBox::GetOutputSizePixel() const
return aSize;
}
-void SvTreeListBox::NotifyEndScroll()
-{
-}
-
void SvTreeListBox::NotifyScrolled()
{
aScrolledHdl.Call( this );
More information about the Libreoffice-commits
mailing list