diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-06-04 13:13:37 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-06-04 19:18:30 +0200 |
commit | 752e23f3cfb161f3eed72f3cd1104310b1b1ddba (patch) | |
tree | 9cde098fa04ecfdceb2f9bc5056f6c22a2b78766 | |
parent | d0b2e85e87ea47ba80f11a1b3d26a9f8d16f9579 (diff) |
loplugin:virtualdead
Change-Id: Ic2e18f9088e7427f0679dab27f0d3acb6f2bb240
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116716
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
-rwxr-xr-x | compilerplugins/clang/virtualdead.py | 12 | ||||
-rw-r--r-- | compilerplugins/clang/virtualdead.results | 46 | ||||
-rw-r--r-- | compilerplugins/clang/virtualdead.unusedparams.results | 133 | ||||
-rw-r--r-- | editeng/source/editeng/editeng.cxx | 2 | ||||
-rw-r--r-- | editeng/source/editeng/impedit3.cxx | 2 | ||||
-rw-r--r-- | editeng/source/outliner/outleeng.cxx | 2 | ||||
-rw-r--r-- | editeng/source/outliner/outleeng.hxx | 2 | ||||
-rw-r--r-- | include/editeng/editeng.hxx | 2 |
8 files changed, 82 insertions, 119 deletions
diff --git a/compilerplugins/clang/virtualdead.py b/compilerplugins/clang/virtualdead.py index e481127af75b..4584345da7a0 100755 --- a/compilerplugins/clang/virtualdead.py +++ b/compilerplugins/clang/virtualdead.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 import sys import re @@ -15,7 +15,7 @@ def normalizeTypeParams( line ): return normalizeTypeParamsRegex.sub("type-parameter-?-?", line) # reading as binary (since we known it is pure ascii) is much faster than reading as unicode -with io.open("workdir/loplugin.virtualdead.log", "rb", buffering=1024*1024) as txt: +with io.open("workdir/loplugin.virtualdead.log", "r", encoding="ascii", errors="ignore", buffering=1024*1024) as txt: for line in txt: try: tokens = line.strip().split("\t") @@ -36,11 +36,11 @@ with io.open("workdir/loplugin.virtualdead.log", "rb", buffering=1024*1024) as t else: print( "unknown line: " + line) except IndexError: - print "problem with line " + line.strip() + print("problem with line " + line.strip()) raise tmp1list = list() -for callInfo, callValues in callDict.iteritems(): +for callInfo, callValues in iter(callDict.items()): nameAndParams = callInfo[1] if len(callValues) != 1: continue @@ -63,6 +63,7 @@ for callInfo, callValues in callDict.iteritems(): if srcloc.startswith("Core/"): continue if srcloc.startswith("/Qt"): continue if srcloc.startswith("Qt"): continue + if srcloc.startswith("64-"): continue functionSig = callInfo[0] tmp1list.append((srcloc, functionSig, callValue)) @@ -88,7 +89,7 @@ for paramInfo in paramSet: tmp2dict[name] = bitfield else: tmp2dict[name] = merge_bitfield(tmp2dict[name], bitfield) -for name, bitfield in tmp2dict.iteritems(): +for name, bitfield in iter(tmp2dict.items()): srcloc = definitionToSourceLocationMap[name] # ignore Qt stuff if srcloc.startswith("Gui/"): continue @@ -96,6 +97,7 @@ for name, bitfield in tmp2dict.iteritems(): if srcloc.startswith("Core/"): continue if srcloc.startswith("/Qt"): continue if srcloc.startswith("Qt"): continue + if srcloc.startswith("64-"): 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 8e2aa00ce120..533a0f6edf11 100644 --- a/compilerplugins/clang/virtualdead.results +++ b/compilerplugins/clang/virtualdead.results @@ -34,25 +34,25 @@ include/basegfx/utils/unopolypolygon.hxx:94 include/connectivity/sdbcx/IRefreshable.hxx:29 void connectivity::sdbcx::IRefreshableGroups::refreshGroups() empty -include/filter/msfilter/msdffimp.hxx:545 +include/filter/msfilter/msdffimp.hxx:546 _Bool SvxMSDffManager::ShapeHasText(unsigned long,unsigned long,)const 1 -include/svl/svdde.hxx:235 +include/svl/svdde.hxx:236 class DdeData * DdeTopic::Get(enum SotClipboardFormatId,) 0 -include/svl/svdde.hxx:236 +include/svl/svdde.hxx:237 _Bool DdeTopic::Put(const class DdeData *,) 0 -include/svl/svdde.hxx:237 +include/svl/svdde.hxx:238 _Bool DdeTopic::Execute(const class rtl::OUString *,) 0 -include/svl/svdde.hxx:239 +include/svl/svdde.hxx:240 _Bool DdeTopic::MakeItem(const class rtl::OUString &,) 0 -include/svl/svdde.hxx:242 +include/svl/svdde.hxx:243 _Bool DdeTopic::StartAdviseLoop() 0 -include/svtools/unoevent.hxx:199 +include/svtools/unoevent.hxx:198 unsigned short SvEventDescriptor::getMacroItemWhich()const 108 include/ucbhelper/resultset.hxx:410 @@ -64,22 +64,19 @@ include/unotools/desktopterminationobserver.hxx:36 include/vbahelper/vbahelperinterface.hxx:74 int InheritedHelperInterfaceImpl::getCreator() 1400204879 -include/vcl/toolkit/vclmedit.hxx:118 - void VclMultiLineEdit::UpdateData() - empty sc/source/core/opencl/formulagroupcl.cxx:1069 void sc::opencl::(anonymous namespace)::DynamicKernelSlidingArgument::GenSlidingWindowFunction(class std::__cxx11::basic_stringstream<char> &,) empty -sc/source/core/opencl/opbase.hxx:203 +sc/source/core/opencl/opbase.hxx:202 _Bool sc::opencl::OpBase::takeNumeric()const 1 -sc/source/ui/vba/vbasheetobject.hxx:117 +sc/source/ui/vba/vbasheetobject.hxx:116 class rtl::OUString ScVbaSheetObjectBase::implGetBaseName()const "Button" sc/source/ui/vba/vbasheetobjects.cxx:142 class rtl::OUString ScVbaObjectContainer::implGetShapeServiceName()const "com.sun.star.drawing.ControlShape" -slideshow/source/engine/animationfactory.cxx:593 +slideshow/source/engine/animationfactory.cxx:616 void slideshow::internal::(anonymous namespace)::GenericAnimation::prefetch() empty vcl/inc/qt5/Qt5FilePicker.hxx:172 @@ -94,33 +91,18 @@ vcl/inc/salframe.hxx:147 vcl/inc/salframe.hxx:204 _Bool SalFrame::MapUnicodeToKeyCode(char16_t,struct o3tl::strong_int<unsigned short, struct LanguageTypeTag>,class vcl::KeyCode &,) 0 -vcl/inc/salgdiimpl.hxx:119 - _Bool SalGraphicsImpl::drawPolyLineBezier(unsigned int,const struct SalPoint *,const enum PolyFlags *,) - 0 -vcl/inc/salgdiimpl.hxx:124 - _Bool SalGraphicsImpl::drawPolygonBezier(unsigned int,const struct SalPoint *,const enum PolyFlags *,) - 0 -vcl/inc/salgdiimpl.hxx:129 - _Bool SalGraphicsImpl::drawPolyPolygonBezier(unsigned int,const unsigned int *,const struct SalPoint *const *,const enum PolyFlags *const *,) - 0 -vcl/inc/salgdiimpl.hxx:170 - _Bool SalGraphicsImpl::drawEPS(long,long,long,long,void *,unsigned int,) - 0 vcl/inc/salinst.hxx:89 _Bool SalInstance::SVMainHook(int *,) 0 -vcl/inc/salinst.hxx:199 +vcl/inc/salinst.hxx:200 void SalInstance::releaseMainThread() empty +vcl/inc/salinst.hxx:209 + void SalInstance::BeforeAbort(const class rtl::OUString &,_Bool,) + empty vcl/inc/salmenu.hxx:77 void SalMenu::GetSystemMenuData(struct SystemMenuData *,) empty -vcl/inc/salmenu.hxx:80 - _Bool SalMenu::AddMenuBarButton(const struct SalMenuButtonItem &,) - 0 -vcl/inc/salmenu.hxx:81 - void SalMenu::RemoveMenuBarButton(unsigned short,) - empty vcl/inc/salobj.hxx:49 void SalObject::Enable(_Bool,) empty diff --git a/compilerplugins/clang/virtualdead.unusedparams.results b/compilerplugins/clang/virtualdead.unusedparams.results index fe2036720143..2e11394bed89 100644 --- a/compilerplugins/clang/virtualdead.unusedparams.results +++ b/compilerplugins/clang/virtualdead.unusedparams.results @@ -1,22 +1,22 @@ -basctl/source/inc/doceventnotifier.hxx:42 +basctl/source/inc/doceventnotifier.hxx:41 void basctl::DocumentEventListener::onDocumentCreated(const class basctl::ScriptDocument &,) 0 -basctl/source/inc/doceventnotifier.hxx:43 +basctl/source/inc/doceventnotifier.hxx:42 void basctl::DocumentEventListener::onDocumentOpened(const class basctl::ScriptDocument &,) 0 -basctl/source/inc/doceventnotifier.hxx:44 +basctl/source/inc/doceventnotifier.hxx:43 void basctl::DocumentEventListener::onDocumentSave(const class basctl::ScriptDocument &,) 0 -basctl/source/inc/doceventnotifier.hxx:45 +basctl/source/inc/doceventnotifier.hxx:44 void basctl::DocumentEventListener::onDocumentSaveDone(const class basctl::ScriptDocument &,) 0 -basctl/source/inc/doceventnotifier.hxx:46 +basctl/source/inc/doceventnotifier.hxx:45 void basctl::DocumentEventListener::onDocumentSaveAs(const class basctl::ScriptDocument &,) 0 -basctl/source/inc/doceventnotifier.hxx:47 +basctl/source/inc/doceventnotifier.hxx:46 void basctl::DocumentEventListener::onDocumentSaveAsDone(const class basctl::ScriptDocument &,) 0 -basctl/source/inc/doceventnotifier.hxx:49 +basctl/source/inc/doceventnotifier.hxx:48 void basctl::DocumentEventListener::onDocumentTitleChanged(const class basctl::ScriptDocument &,) 0 basic/source/comp/codegen.cxx:478 @@ -46,40 +46,40 @@ 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> &,) 00 -canvas/inc/base/integerbitmapbase.hxx:58 +canvas/inc/base/integerbitmapbase.hxx:57 void canvas::IntegerBitmapBase::setData(const class com::sun::star::uno::Sequence<signed char> &,const struct com::sun::star::rendering::IntegerBitmapLayout &,const struct com::sun::star::geometry::IntegerRectangle2D &,) 011 -canvas/inc/base/integerbitmapbase.hxx:72 +canvas/inc/base/integerbitmapbase.hxx:71 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:79 +desktop/source/deployment/registry/inc/dp_backend.h:78 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 +extensions/source/bibliography/loadlisteneradapter.hxx:109 void bib::OLoadListener::_unloading(const struct com::sun::star::lang::EventObject &,) 0 -extensions/source/bibliography/loadlisteneradapter.hxx:111 +extensions/source/bibliography/loadlisteneradapter.hxx:110 void bib::OLoadListener::_reloading(const struct com::sun::star::lang::EventObject &,) 0 -include/cppuhelper/propshlp.hxx:326 +include/cppuhelper/propshlp.hxx:330 void cppu::IEventNotificationHook::fireEvents(int *,int,unsigned char,_Bool,) 0111 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:483 - void EditEngine::PaintingFirstLine(int,const class Point &,long,const class Point &,short,class OutputDevice *,) +include/editeng/editeng.hxx:484 + void EditEngine::PaintingFirstLine(int,const class Point &,long,const class Point &,struct o3tl::strong_int<short, struct Degree10Tag>,class OutputDevice &,) 110111 -include/editeng/editeng.hxx:486 +include/editeng/editeng.hxx:487 void EditEngine::ParagraphConnected(int,int,) 01 -include/filter/msfilter/msdffimp.hxx:545 +include/filter/msfilter/msdffimp.hxx:546 _Bool SvxMSDffManager::ShapeHasText(unsigned long,unsigned long,)const 00 -include/oox/dump/dumperbase.hxx:472 +include/oox/dump/dumperbase.hxx:473 void oox::dump::ConfigItemBase::implProcessConfigItemInt(class oox::TextInputStream &,long,const class rtl::OUString &,) 011 -include/oox/dump/dumperbase.hxx:563 +include/oox/dump/dumperbase.hxx:564 class rtl::OUString oox::dump::NameListBase::implGetNameDbl(const class oox::dump::Config &,double,)const 01 include/oox/dump/oledumper.hxx:165 @@ -88,28 +88,28 @@ include/oox/dump/oledumper.hxx:165 include/oox/export/shapes.hxx:136 class oox::drawingml::ShapeExport & oox::drawingml::ShapeExport::WriteNonVisualProperties(const class com::sun::star::uno::Reference<class com::sun::star::drawing::XShape> &,) 0 -include/sfx2/stbitem.hxx:100 +include/sfx2/stbitem.hxx:101 _Bool SfxStatusBarControl::MouseButtonUp(const class MouseEvent &,) 0 -include/svl/svdde.hxx:226 +include/svl/svdde.hxx:227 _Bool DdeGetPutItem::Put(const class DdeData *,) 0 -include/svl/svdde.hxx:235 +include/svl/svdde.hxx:236 class DdeData * DdeTopic::Get(enum SotClipboardFormatId,) 0 -include/svl/svdde.hxx:236 +include/svl/svdde.hxx:237 _Bool DdeTopic::Put(const class DdeData *,) 0 -include/svl/svdde.hxx:237 +include/svl/svdde.hxx:238 _Bool DdeTopic::Execute(const class rtl::OUString *,) 0 -include/svl/svdde.hxx:239 +include/svl/svdde.hxx:240 _Bool DdeTopic::MakeItem(const class rtl::OUString &,) 0 -include/svtools/editbrowsebox.hxx:102 +include/svtools/editbrowsebox.hxx:101 void svt::CellController::ActivatingMouseEvent(const class BrowserMouseEvent &,_Bool,) 10 -include/svx/IAccessibleParent.hxx:80 +include/svx/IAccessibleParent.hxx:81 _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:47 @@ -127,22 +127,19 @@ include/vcl/accessibletable.hxx:93 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 +include/vcl/opengl/OpenGLContext.hxx:88 struct SystemWindowData OpenGLContext::generateWinData(class vcl::Window *,_Bool,) 10 -include/vcl/toolkit/treelistbox.hxx:430 - enum DragDropMode SvTreeListBox::NotifyStartDrag(class TransferDataContainer &,class SvTreeListEntry *,) - 00 -include/vcl/toolkit/treelistbox.hxx:589 - _Bool SvTreeListBox::EditingEntry(class SvTreeListEntry *,class Selection &,) - 10 -sc/inc/filter.hxx:82 +include/xmloff/txtimp.hxx:108 + class SvXMLImportContext * XMLTextImportHelper::CreateTableChildContext(class SvXMLImport &,int,const class com::sun::star::uno::Reference<class com::sun::star::xml::sax::XFastAttributeList> &,) + 101 +sc/inc/filter.hxx:81 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 -sc/inc/filter.hxx:84 +sc/inc/filter.hxx:83 void ScFormatFilterPlugin::ScExportRTF(class SvStream &,class ScDocument *,const class ScRange &,const unsigned short,) 1110 -sc/inc/formulagroup.hxx:145 +sc/inc/formulagroup.hxx:144 class boost::intrusive_ptr<class ScMatrix> sc::FormulaGroupInterpreter::inverseMatrix(const class ScMatrix &,) 0 sc/source/core/opencl/formulagroupcl.cxx:1069 @@ -181,30 +178,30 @@ sdext/source/presenter/PresenterScrollBar.hxx:177 sdext/source/presenter/PresenterScrollBar.hxx:179 double sdext::presenter::PresenterScrollBar::GetMinor(const double,const double,)const 10 -starmath/source/wordexportbase.hxx:38 +starmath/source/wordexportbase.hxx:28 void SmWordExportBase::HandleText(const class SmNode *,int,) 10 -sw/inc/calbck.hxx:144 - void SwClient::Modify(const class SfxPoolItem *const,const class SfxPoolItem *const,) - 10 -sw/inc/swcrsr.hxx:161 - _Bool SwCursor::LeftRight(_Bool,unsigned short,unsigned short,_Bool,_Bool,_Bool,const class SwRootFrame *,) - 1100000 +sw/inc/swcrsr.hxx:163 + _Bool SwCursor::LeftRight(_Bool,unsigned short,unsigned short,_Bool,_Bool,_Bool,const class SwRootFrame *,_Bool,) + 11000000 sw/source/core/access/acccontext.hxx:352 _Bool SwAccessibleContext::SetSelectedState(_Bool,) 0 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:793 +sw/source/filter/ww8/wrtww8.hxx:797 void MSWordExportBase::WriteHyperlinkData(const class sw::mark::IFieldmark &,) 0 -sw/source/filter/ww8/wrtww8.hxx:858 +sw/source/filter/ww8/wrtww8.hxx:863 void MSWordExportBase::OutputGrfNode(const class SwGrfNode &,) 0 vcl/inc/outdev.h:122 _Bool ImplGlyphFallbackFontSubstitution::FindFontSubstitute(class FontSelectPattern &,class LogicalFontInstance *,class rtl::OUString &,)const 101 +vcl/inc/salbmp.hxx:79 + _Bool SalBitmap::Replace(const class Color &,const class Color &,unsigned char,) + 000 vcl/inc/salframe.hxx:145 void SalFrame::SetRepresentedURL(const class rtl::OUString &,) 0 @@ -214,27 +211,15 @@ vcl/inc/salframe.hxx:194 vcl/inc/salframe.hxx:204 _Bool SalFrame::MapUnicodeToKeyCode(char16_t,struct o3tl::strong_int<unsigned short, struct LanguageTypeTag>,class vcl::KeyCode &,) 000 -vcl/inc/salframe.hxx:247 +vcl/inc/salframe.hxx:251 void SalFrame::BeginSetClipRegion(unsigned int,) 0 -vcl/inc/salgdiimpl.hxx:81 +vcl/inc/salgdiimpl.hxx:96 void SalGraphicsImpl::SetXORMode(_Bool,_Bool,) 10 -vcl/inc/salgdiimpl.hxx:119 - _Bool SalGraphicsImpl::drawPolyLineBezier(unsigned int,const struct SalPoint *,const enum PolyFlags *,) - 000 -vcl/inc/salgdiimpl.hxx:124 - _Bool SalGraphicsImpl::drawPolygonBezier(unsigned int,const struct SalPoint *,const enum PolyFlags *,) - 000 -vcl/inc/salgdiimpl.hxx:129 - _Bool SalGraphicsImpl::drawPolyPolygonBezier(unsigned int,const unsigned int *,const struct SalPoint *const *,const enum PolyFlags *const *,) - 0000 -vcl/inc/salgdiimpl.hxx:136 +vcl/inc/salgdiimpl.hxx:151 void SalGraphicsImpl::copyArea(long,long,long,long,long,long,_Bool,) 1111110 -vcl/inc/salgdiimpl.hxx:170 - _Bool SalGraphicsImpl::drawEPS(long,long,long,long,void *,unsigned int,) - 000000 vcl/inc/salinst.hxx:89 _Bool SalInstance::SVMainHook(int *,) 0 @@ -242,11 +227,14 @@ vcl/inc/salinst.hxx:122 void SalInstance::GetPrinterQueueState(struct SalPrinterQueueInfo *,) 0 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 + class weld::Builder * SalInstance::CreateInterimBuilder(class vcl::Window *,const class rtl::OUString &,const class rtl::OUString &,_Bool,unsigned long,) + 11110 +vcl/inc/salinst.hxx:183 void SalInstance::AddToRecentDocumentList(const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,) 100 +vcl/inc/salinst.hxx:209 + void SalInstance::BeforeAbort(const class rtl::OUString &,_Bool,) + 00 vcl/inc/salmenu.hxx:71 void SalMenu::SetItemBits(unsigned int,enum MenuItemBits,) 10 @@ -259,15 +247,6 @@ vcl/inc/salmenu.hxx:76 vcl/inc/salmenu.hxx:77 void SalMenu::GetSystemMenuData(struct SystemMenuData *,) 0 -vcl/inc/salmenu.hxx:80 - _Bool SalMenu::AddMenuBarButton(const struct SalMenuButtonItem &,) - 0 -vcl/inc/salmenu.hxx:81 - void SalMenu::RemoveMenuBarButton(unsigned short,) - 0 -vcl/inc/salmenu.hxx:93 - class tools::Rectangle SalMenu::GetMenuBarButtonRectPixel(unsigned short,class SalFrame *,) - 00 vcl/inc/salobj.hxx:49 void SalObject::Enable(_Bool,) 0 @@ -280,9 +259,9 @@ vcl/inc/salprn.hxx:85 vcl/inc/salprn.hxx:114 class SalGraphics * SalPrinter::StartPage(class ImplJobSetup *,_Bool,) 10 -vcl/inc/WidgetDrawInterface.hxx:63 - _Bool vcl::WidgetDrawInterface::drawNativeControl(enum ControlType,enum ControlPart,const class tools::Rectangle &,enum ControlState,const class ImplControlValue &,const class rtl::OUString &,) - 111110 -vcl/inc/WidgetDrawInterface.hxx:87 +vcl/inc/WidgetDrawInterface.hxx:64 + _Bool vcl::WidgetDrawInterface::drawNativeControl(enum ControlType,enum ControlPart,const class tools::Rectangle &,enum ControlState,const class ImplControlValue &,const class rtl::OUString &,const class Color &,) + 1111101 +vcl/inc/WidgetDrawInterface.hxx:88 _Bool vcl::WidgetDrawInterface::getNativeControlRegion(enum ControlType,enum ControlPart,const class tools::Rectangle &,enum ControlState,const class ImplControlValue &,const class rtl::OUString &,class tools::Rectangle &,class tools::Rectangle &,) 11111011 diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx index f34c4c2f6637..7000403ff2b4 100644 --- a/editeng/source/editeng/editeng.cxx +++ b/editeng/source/editeng/editeng.cxx @@ -2475,7 +2475,7 @@ void EditEngine::DrawingTab( const Point& /*rStartPos*/, tools::Long /*nWidth*/, { } -void EditEngine::PaintingFirstLine(sal_Int32, const Point&, tools::Long, const Point&, Degree10, OutputDevice&) +void EditEngine::PaintingFirstLine(sal_Int32, const Point&, const Point&, Degree10, OutputDevice&) { } diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index 9576d079574f..fff957f46f14 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -3126,7 +3126,7 @@ void ImpEditEngine::Paint( OutputDevice& rOutDev, tools::Rectangle aClipRect, Po // does, too. No change for not-layouting (painting). if(0 == nLine) // && !bStripOnly) { - GetEditEnginePtr()->PaintingFirstLine(n, aParaStart, aTmpPos.Y(), aOrigin, nOrientation, rOutDev); + GetEditEnginePtr()->PaintingFirstLine(n, aParaStart, aOrigin, nOrientation, rOutDev); // Remember whether a bullet was painted. const SfxBoolItem& rBulletState = pEditEngine->GetParaAttrib(n, EE_PARA_BULLETSTATE); diff --git a/editeng/source/outliner/outleeng.cxx b/editeng/source/outliner/outleeng.cxx index b166c71831ba..d9e1d0595a11 100644 --- a/editeng/source/outliner/outleeng.cxx +++ b/editeng/source/outliner/outleeng.cxx @@ -38,7 +38,7 @@ OutlinerEditEng::~OutlinerEditEng() { } -void OutlinerEditEng::PaintingFirstLine(sal_Int32 nPara, const Point& rStartPos, tools::Long /*nBaseLineY*/, const Point& rOrigin, Degree10 nOrientation, OutputDevice& rOutDev) +void OutlinerEditEng::PaintingFirstLine(sal_Int32 nPara, const Point& rStartPos, const Point& rOrigin, Degree10 nOrientation, OutputDevice& rOutDev) { if( GetControlWord() & EEControlBits::OUTLINER ) { diff --git a/editeng/source/outliner/outleeng.hxx b/editeng/source/outliner/outleeng.hxx index 9759ce851f12..dcff4b9f8be0 100644 --- a/editeng/source/outliner/outleeng.hxx +++ b/editeng/source/outliner/outleeng.hxx @@ -37,7 +37,7 @@ public: OutlinerEditEng( Outliner* pOwner, SfxItemPool* pPool ); virtual ~OutlinerEditEng() override; - virtual void PaintingFirstLine(sal_Int32 nPara, const Point& rStartPos, tools::Long nBaseLineY, const Point& rOrigin, Degree10 nOrientation, OutputDevice& rOutDev) override; + virtual void PaintingFirstLine(sal_Int32 nPara, const Point& rStartPos, const Point& rOrigin, Degree10 nOrientation, OutputDevice& rOutDev) override; virtual void ParagraphInserted( sal_Int32 nNewParagraph ) override; virtual void ParagraphDeleted( sal_Int32 nDeletedParagraph ) override; diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx index 02bc57484083..be5262a41d23 100644 --- a/include/editeng/editeng.hxx +++ b/include/editeng/editeng.hxx @@ -481,7 +481,7 @@ public: void SetBeginPasteOrDropHdl( const Link<PasteOrDropInfos&,void>& rLink ); void SetEndPasteOrDropHdl( const Link<PasteOrDropInfos&,void>& rLink ); - virtual void PaintingFirstLine(sal_Int32 nPara, const Point& rStartPos, tools::Long nBaseLineY, const Point& rOrigin, Degree10 nOrientation, OutputDevice& rOutDev); + virtual void PaintingFirstLine(sal_Int32 nPara, const Point& rStartPos, const Point& rOrigin, Degree10 nOrientation, OutputDevice& rOutDev); virtual void ParagraphInserted( sal_Int32 nNewParagraph ); virtual void ParagraphDeleted( sal_Int32 nDeletedParagraph ); virtual void ParagraphConnected( sal_Int32 nLeftParagraph, sal_Int32 nRightParagraph ); |