compilerplugins/clang/unusedfields.only-used-in-constructor.results | 16 compilerplugins/clang/unusedfields.readonly.results | 46 - compilerplugins/clang/unusedfields.untouched.results | 14 compilerplugins/clang/unusedfields.writeonly.results | 26 compilerplugins/clang/unusedmethods.results | 264 +++------- compilerplugins/clang/unusedmethods.unused-returns.results | 16 dbaccess/source/ui/control/ColumnControlWindow.cxx | 2 dbaccess/source/ui/control/FieldDescControl.cxx | 1 dbaccess/source/ui/inc/FieldDescControl.hxx | 3 editeng/source/misc/splwrap.cxx | 2 include/editeng/splwrap.hxx | 2 include/vcl/edit.hxx | 1 include/vcl/tabctrl.hxx | 3 include/vcl/vclmedit.hxx | 1 sw/source/uibase/lingu/hyp.cxx | 1 vcl/inc/opengl/x11/gdiimpl.hxx | 3 vcl/inc/unx/gtk/gtksys.hxx | 1 vcl/inc/unx/salgdi.h | 13 vcl/inc/unx/x11/x11gdiimpl.h | 2 vcl/inc/wizdlg.hxx | 43 - vcl/opengl/x11/gdiimpl.cxx | 36 - vcl/source/control/edit.cxx | 1 vcl/source/control/roadmapwizard.cxx | 48 - vcl/source/control/tabctrl.cxx | 16 vcl/source/control/wizardmachine.cxx | 23 vcl/source/edit/vclmedit.cxx | 1 vcl/unx/generic/gdi/font.cxx | 27 - vcl/unx/generic/gdi/gdiimpl.cxx | 5 vcl/unx/generic/gdi/gdiimpl.hxx | 3 vcl/unx/generic/gdi/salgdi2.cxx | 37 - vcl/unx/gtk3/gtk3gtksys.cxx | 6 31 files changed, 128 insertions(+), 535 deletions(-)
New commits: commit 316557d6f4fe8a15112b39f3c808dda38cce018c Author: Noel Grandin <noel.gran...@collabora.co.uk> AuthorDate: Fri Oct 4 09:42:28 2019 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Fri Oct 4 14:22:55 2019 +0200 loplugin:unusedfields Change-Id: If0df5216dccd2c0a7aa790668471993f5d4d5d32 Reviewed-on: https://gerrit.libreoffice.org/80183 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/compilerplugins/clang/unusedfields.only-used-in-constructor.results b/compilerplugins/clang/unusedfields.only-used-in-constructor.results index 4b49911a92f9..63a578850f5c 100644 --- a/compilerplugins/clang/unusedfields.only-used-in-constructor.results +++ b/compilerplugins/clang/unusedfields.only-used-in-constructor.results @@ -146,7 +146,7 @@ cui/source/inc/tabstpge.hxx:87 SvxTabulatorTabPage m_aCenterWin class TabWin_Impl cui/source/inc/tabstpge.hxx:88 SvxTabulatorTabPage m_aDezWin class TabWin_Impl -cui/source/options/optcolor.cxx:237 +cui/source/options/optcolor.cxx:235 ColorConfigWindow_Impl::Entry m_aDefaultColor class Color dbaccess/source/core/api/RowSet.hxx:111 dbaccess::ORowSet m_aURL class rtl::OUString @@ -570,10 +570,6 @@ sc/source/ui/inc/msgpool.hxx:44 ScMessagePool aCondFormatDlgItem class ScCondFormatDlgItem sc/source/ui/inc/notemark.hxx:46 ScNoteMarker m_aTimer class Timer -sc/source/ui/inc/output.hxx:188 - ScOutputData nTilePosX long -sc/source/ui/inc/output.hxx:189 - ScOutputData nTilePosY long sc/source/ui/inc/PivotLayoutTreeListBase.hxx:48 ScPivotLayoutTreeListBase maDropTargetHelper class ScPivotLayoutTreeDropTarget sc/source/ui/inc/xmlsourcedlg.hxx:62 @@ -631,9 +627,9 @@ sdext/source/pdfimport/pdfparse/pdfparse.cxx:263 sdext/source/pdfimport/pdfparse/pdfparse.cxx:263 PDFGrammar::definition dict_begin rule<ScannerT> sdext/source/pdfimport/pdfparse/pdfparse.cxx:263 - PDFGrammar::definition value rule<ScannerT> -sdext/source/pdfimport/pdfparse/pdfparse.cxx:263 PDFGrammar::definition dict_end rule<ScannerT> +sdext/source/pdfimport/pdfparse/pdfparse.cxx:263 + PDFGrammar::definition value rule<ScannerT> sdext/source/pdfimport/pdfparse/pdfparse.cxx:264 PDFGrammar::definition object_end rule<ScannerT> sdext/source/pdfimport/pdfparse/pdfparse.cxx:264 @@ -806,8 +802,6 @@ vcl/inc/salmenu.hxx:43 SalMenuButtonItem maImage class Image vcl/inc/salmenu.hxx:44 SalMenuButtonItem maToolTipText class rtl::OUString -vcl/inc/unx/gtk/gtkframe.hxx:186 - GtkSalFrame m_nWorkArea int vcl/inc/unx/i18n_ic.hxx:40 SalI18N_InputContext maPreeditStartCallback XIMCallback vcl/inc/unx/i18n_ic.hxx:41 @@ -832,9 +826,9 @@ vcl/inc/WidgetThemeLibrary.hxx:90 vcl::ControlDrawParameters eState enum ControlState vcl/inc/WidgetThemeLibrary.hxx:106 vcl::WidgetThemeLibrary_t nSize uint32_t -vcl/source/app/salvtables.cxx:2870 +vcl/source/app/salvtables.cxx:2890 SalInstanceEntry m_aTextFilter class (anonymous namespace)::WeldTextFilter -vcl/source/app/salvtables.cxx:5358 +vcl/source/app/salvtables.cxx:5378 SalInstanceComboBoxWithEdit m_aTextFilter class (anonymous namespace)::WeldTextFilter vcl/source/gdi/jobset.cxx:35 ImplOldJobSetupData cDeviceName char [32] diff --git a/compilerplugins/clang/unusedfields.readonly.results b/compilerplugins/clang/unusedfields.readonly.results index ec0da36339e5..cbdc4f340d19 100644 --- a/compilerplugins/clang/unusedfields.readonly.results +++ b/compilerplugins/clang/unusedfields.readonly.results @@ -158,7 +158,7 @@ cppu/source/uno/check.cxx:134 (anonymous namespace)::Char3 c3 char cppu/source/uno/check.cxx:138 (anonymous namespace)::Char4 chars struct (anonymous namespace)::Char3 -cui/source/options/optcolor.cxx:255 +cui/source/options/optcolor.cxx:253 ColorConfigWindow_Impl aModuleOptions class SvtModuleOptions cui/source/options/optpath.cxx:67 OptPath_Impl m_aDefOpt class SvtDefaultOptions @@ -178,9 +178,7 @@ dbaccess/source/ui/inc/charsetlistbox.hxx:44 dbaui::CharSetListBox m_aCharSets class dbaui::OCharsetDisplay dbaccess/source/ui/inc/directsql.hxx:65 dbaui::DirectSQLDialog m_aColorConfig const svtools::ColorConfig -dbaccess/source/ui/inc/indexdialog.hxx:43 - dbaui::DbaIndexDialog m_bEditingActive _Bool -dbaccess/source/ui/inc/WCopyTable.hxx:263 +dbaccess/source/ui/inc/WCopyTable.hxx:261 dbaui::OCopyTableWizard m_aLocale css::lang::Locale drawinglayer/source/processor2d/vclprocessor2d.hxx:84 drawinglayer::processor2d::VclProcessor2D maDrawinglayerOpt const class SvtOptionsDrawinglayer @@ -374,22 +372,16 @@ include/unoidl/unoidl.hxx:453 unoidl::ConstantValue::(anonymous) doubleValue double include/unotest/bootstrapfixturebase.hxx:52 test::BootstrapFixtureBase m_directories class test::Directories +include/vcl/edit.hxx:88 + Edit maUpdateDataHdl Link<class Edit &, void> include/vcl/opengl/OpenGLContext.hxx:48 OpenGLCapabilitySwitch mbLimitedShaderRegisters _Bool include/vcl/opengl/OpenGLContext.hxx:167 OpenGLContext mpLastFramebuffer class OpenGLFramebuffer * include/vcl/ppdparser.hxx:127 psp::PPDParser::PPDConstraint m_pKey1 const class psp::PPDKey * -include/vcl/settings.hxx:149 - DialogStyle content_area_spacing int -include/vcl/settings.hxx:162 - FrameStyle left int -include/vcl/settings.hxx:163 - FrameStyle right int -include/vcl/settings.hxx:164 - FrameStyle top int -include/vcl/settings.hxx:165 - FrameStyle bottom int +include/vcl/vclmedit.hxx:85 + VclMultiLineEdit aUpdateDataHdlLink Link<class Edit &, void> io/source/stm/odata.cxx:571 io_stm::ODataOutputStream::writeDouble(double)::(anonymous union)::(anonymous) n2 sal_uInt32 io/source/stm/odata.cxx:571 @@ -536,7 +528,7 @@ sdext/source/pdfimport/inc/pdfihelper.hxx:102 pdfi::GraphicsContext BlendMode sal_Int8 sdext/source/pdfimport/tree/style.hxx:43 pdfi::StyleContainer::Style Contents const class rtl::OUString -sfx2/source/appl/lnkbase2.cxx:96 +sfx2/source/appl/lnkbase2.cxx:95 sfx2::ImplDdeItem pLink class sfx2::SvBaseLink * slideshow/source/engine/slideshowimpl.cxx:156 (anonymous namespace)::FrameSynchronization maTimer const canvas::tools::ElapsedTime @@ -546,14 +538,6 @@ starmath/source/view.cxx:862 SmViewShell_Impl aOpts class SvtMiscOptions store/source/storbios.cxx:57 OStoreSuperBlock m_aMarked OStoreSuperBlock::L -svgio/inc/svgstyleattributes.hxx:185 - svgio::svgreader::SvgStyleAttributes mpSvgGradientNodeFill const class svgio::svgreader::SvgGradientNode * -svgio/inc/svgstyleattributes.hxx:186 - svgio::svgreader::SvgStyleAttributes mpSvgGradientNodeStroke const class svgio::svgreader::SvgGradientNode * -svgio/inc/svgstyleattributes.hxx:187 - svgio::svgreader::SvgStyleAttributes mpSvgPatternNodeFill const class svgio::svgreader::SvgPatternNode * -svgio/inc/svgstyleattributes.hxx:188 - svgio::svgreader::SvgStyleAttributes mpSvgPatternNodeStroke const class svgio::svgreader::SvgPatternNode * svl/source/crypto/cryptosign.cxx:283 (anonymous namespace)::PKIStatusInfo status SECItem svl/source/crypto/cryptosign.cxx:303 @@ -726,6 +710,10 @@ unotools/source/config/saveopt.cxx:76 SvtSaveOptions_Impl bROUserAutoSave _Bool vcl/inc/BitmapFastScaleFilter.hxx:31 BitmapFastScaleFilter maSize const class Size +vcl/inc/openglgdiimpl.hxx:52 + TextureCombo mpTexture std::unique_ptr<OpenGLTexture> +vcl/inc/openglgdiimpl.hxx:53 + TextureCombo mpMask std::unique_ptr<OpenGLTexture> vcl/inc/printerinfomanager.hxx:74 psp::PrinterInfoManager::SystemPrintQueue m_aComment class rtl::OUString vcl/inc/salwtype.hxx:157 @@ -736,14 +724,8 @@ vcl/inc/salwtype.hxx:205 SalSurroundingTextSelectionChangeEvent mnEnd const sal_uLong vcl/inc/salwtype.hxx:211 SalQueryCharPositionEvent mnCharPos sal_uLong -vcl/inc/svdata.hxx:269 - ImplSVNWFData mnMenuSeparatorBorderX int -vcl/inc/svdata.hxx:272 +vcl/inc/svdata.hxx:271 ImplSVNWFData mbMenuBarDockingAreaCommonBG _Bool -vcl/inc/svdata.hxx:276 - ImplSVNWFData mbToolboxDropDownSeparate _Bool -vcl/inc/svdata.hxx:279 - ImplSVNWFData mbOpenMenuOnF10 _Bool vcl/inc/toolbox.h:108 vcl::ToolBoxLayoutData m_aLineItemIds std::vector<sal_uInt16> vcl/inc/unx/saldisp.hxx:282 @@ -898,6 +880,10 @@ vcl/inc/WidgetThemeLibrary.hxx:135 vcl::WidgetThemeLibrary_t drawListHeader _Bool (*)(const struct vcl::ControlDrawParameters &, long, long) vcl/inc/WidgetThemeLibrary.hxx:137 vcl::WidgetThemeLibrary_t updateSettings _Bool (*)(struct vcl::WidgetDrawStyle &) +vcl/inc/wizdlg.hxx:78 + vcl::RoadmapWizard maActivateHdl Link<class vcl::RoadmapWizard *, void> +vcl/source/app/settings.cxx:184 + ImplStyleData maDialogStyle struct DialogStyle vcl/source/control/roadmapwizard.cxx:62 vcl::RoadmapWizardImpl aStateDescriptors vcl::(anonymous namespace)::StateDescriptions vcl/source/control/tabctrl.cxx:79 diff --git a/compilerplugins/clang/unusedfields.untouched.results b/compilerplugins/clang/unusedfields.untouched.results index e8845e4890c0..53061e4385a8 100644 --- a/compilerplugins/clang/unusedfields.untouched.results +++ b/compilerplugins/clang/unusedfields.untouched.results @@ -119,10 +119,10 @@ include/sfx2/msg.hxx:138 include/sfx2/msg.hxx:138 SfxType7 pType const std::type_info * include/sfx2/msg.hxx:139 - SfxType8 nAttribs sal_uInt16 -include/sfx2/msg.hxx:139 SfxType8 pType const std::type_info * include/sfx2/msg.hxx:139 + SfxType8 nAttribs sal_uInt16 +include/sfx2/msg.hxx:139 SfxType8 createSfxPoolItemFunc std::function<SfxPoolItem *(void)> include/sfx2/msg.hxx:139 SfxType8 aAttrib struct SfxTypeAttrib [8] @@ -147,9 +147,9 @@ include/sfx2/msg.hxx:143 include/sfx2/msg.hxx:143 SfxType13 createSfxPoolItemFunc std::function<SfxPoolItem *(void)> include/sfx2/msg.hxx:143 - SfxType13 aAttrib struct SfxTypeAttrib [13] -include/sfx2/msg.hxx:143 SfxType13 nAttribs sal_uInt16 +include/sfx2/msg.hxx:143 + SfxType13 aAttrib struct SfxTypeAttrib [13] include/sfx2/msg.hxx:144 SfxType14 pType const std::type_info * include/sfx2/msg.hxx:144 @@ -326,10 +326,6 @@ sc/source/filter/inc/sheetdatacontext.hxx:62 oox::xls::SheetDataContext aReleaser const class SolarMutexReleaser sc/source/ui/inc/docsh.hxx:455 ScDocShellModificator mpProtector std::unique_ptr<ScRefreshTimerProtector> -sc/source/ui/inc/output.hxx:188 - ScOutputData nTilePosX long -sc/source/ui/inc/output.hxx:189 - ScOutputData nTilePosY long sc/source/ui/inc/PivotLayoutTreeListBase.hxx:48 ScPivotLayoutTreeListBase maDropTargetHelper class ScPivotLayoutTreeDropTarget sd/source/ui/remotecontrol/ZeroconfService.hxx:34 @@ -426,8 +422,6 @@ vcl/inc/qt5/Qt5Graphics.hxx:58 Qt5Graphics m_lastPopupRect class QRect vcl/inc/salprn.hxx:45 SalPrinterQueueInfo mpPortName std::unique_ptr<OUString> -vcl/inc/unx/gtk/gtkframe.hxx:186 - GtkSalFrame m_nWorkArea int vcl/inc/WidgetThemeLibrary.hxx:87 vcl::ControlDrawParameters nSize uint32_t vcl/inc/WidgetThemeLibrary.hxx:88 diff --git a/compilerplugins/clang/unusedfields.writeonly.results b/compilerplugins/clang/unusedfields.writeonly.results index 4681a68a201b..37e5d8dac37c 100644 --- a/compilerplugins/clang/unusedfields.writeonly.results +++ b/compilerplugins/clang/unusedfields.writeonly.results @@ -2,9 +2,9 @@ basctl/source/basicide/moduldlg.hxx:131 basctl::ObjectPage m_xDropTarget std::unique_ptr<SbTreeListBoxDropTarget> basctl/source/inc/basidesh.hxx:87 basctl::Shell m_aNotifier class basctl::DocumentEventNotifier -basctl/source/inc/bastype2.hxx:183 +basctl/source/inc/bastype2.hxx:182 basctl::TreeListBox m_aNotifier class basctl::DocumentEventNotifier -basctl/source/inc/bastype2.hxx:255 +basctl/source/inc/bastype2.hxx:251 basctl::SbTreeListBox m_aNotifier class basctl::DocumentEventNotifier basctl/source/inc/IDEComboBox.hxx:101 basctl::DocListenerBox maNotifier class basctl::DocumentEventNotifier @@ -230,10 +230,10 @@ dbaccess/source/filter/xml/dbloader2.cxx:227 dbaxml::DBContentLoader m_xMySelf Reference<class com::sun::star::frame::XFrameLoader> dbaccess/source/ui/browser/dbloader.cxx:69 DBContentLoader m_xListener Reference<class com::sun::star::frame::XLoadEventListener> +dbaccess/source/ui/inc/FieldDescControl.hxx:112 + dbaui::OFieldDescControl m_bRightAligned _Bool dbaccess/source/ui/inc/RelationController.hxx:33 dbaui::ORelationController m_pWaitObject std::unique_ptr<WaitObject> -dbaccess/source/ui/inc/WTypeSelect.hxx:74 - dbaui::OWizTypeSelectList m_pParentTabPage class dbaui::OWizTypeSelect * desktop/qa/desktop_lib/test_desktop_lib.cxx:223 DesktopLOKTest m_bModified _Bool desktop/source/app/app.cxx:1209 @@ -352,6 +352,8 @@ include/editeng/adjustitem.hxx:37 SvxAdjustItem bLeft _Bool include/editeng/outlobj.hxx:43 OutlinerParaObjData mbIsEditDoc _Bool +include/editeng/splwrap.hxx:59 + SvxSpellWrapper bHyphen _Bool include/editeng/unotext.hxx:415 SvxUnoTextBase xParentText css::uno::Reference<css::text::XText> include/editeng/unotext.hxx:584 @@ -409,10 +411,10 @@ include/svx/srchdlg.hxx:162 include/svx/srchdlg.hxx:163 SvxSearchDialog pOptionsController std::unique_ptr<SvxSearchController> include/svx/viewpt3d.hxx:62 - Viewport3D::(anonymous) X double -include/svx/viewpt3d.hxx:62 Viewport3D::(anonymous) H double include/svx/viewpt3d.hxx:62 + Viewport3D::(anonymous) X double +include/svx/viewpt3d.hxx:62 Viewport3D::(anonymous) Y double include/test/beans/xpropertyset.hxx:56 apitest::XPropertySet::PropsToTest constrained std::vector<OUString> @@ -784,10 +786,6 @@ sw/inc/unoframe.hxx:313 SwXOLEListener m_xOLEModel css::uno::Reference<css::frame::XModel> sw/inc/view.hxx:184 SwView m_xGlueDocShell std::unique_ptr<SwViewGlueDocShell> -sw/qa/api/SwXTextFrame.cxx:46 - (anonymous namespace)::SwXTextFrame mxTextRange uno::Reference<text::XTextRange> -sw/qa/api/SwXTextFrame.cxx:47 - (anonymous namespace)::SwXTextFrame mxTextContent uno::Reference<text::XTextContent> sw/source/core/inc/swfont.hxx:986 SvStatistics nGetTextSize sal_uInt16 sw/source/core/inc/swfont.hxx:987 @@ -950,7 +948,7 @@ vcl/inc/salwtype.hxx:250 SalSwipeEvent mnVelocityY double vcl/inc/sft.hxx:478 vcl::TrueTypeFont mapper sal_uInt32 (*)(const sal_uInt8 *, sal_uInt32, sal_uInt32) -vcl/inc/svdata.hxx:408 +vcl/inc/svdata.hxx:403 ImplSVEvent mpInstanceRef VclPtr<vcl::Window> vcl/inc/unx/gtk/gtkframe.hxx:80 GtkSalFrame::IMHandler::PreviousKeyPress window GdkWindow * @@ -958,12 +956,6 @@ vcl/inc/unx/gtk/gtkframe.hxx:81 GtkSalFrame::IMHandler::PreviousKeyPress send_event gint8 vcl/inc/unx/gtk/gtkframe.hxx:82 GtkSalFrame::IMHandler::PreviousKeyPress time guint32 -vcl/inc/unx/gtk/gtkframe.hxx:191 - GtkSalFrame m_bWindowIsGtkPlug _Bool -vcl/inc/unx/gtk/gtkframe.hxx:192 - GtkSalFrame m_aTitle class rtl::OUString -vcl/inc/unx/salframe.h:99 - X11SalFrame mbInShow _Bool vcl/inc/WidgetThemeLibrary.hxx:20 vcl::WidgetDrawStyle nSize uint32_t vcl/inc/WidgetThemeLibrary.hxx:91 diff --git a/dbaccess/source/ui/control/ColumnControlWindow.cxx b/dbaccess/source/ui/control/ColumnControlWindow.cxx index f1ec5954edce..d080fd875c9f 100644 --- a/dbaccess/source/ui/control/ColumnControlWindow.cxx +++ b/dbaccess/source/ui/control/ColumnControlWindow.cxx @@ -43,8 +43,6 @@ OColumnControlWindow::OColumnControlWindow(vcl::Window* pParent , m_sTypeNames(DBA_RES(STR_TABLEDESIGN_DBFIELDTYPES)) , m_bAutoIncrementEnabled(true) { - - setRightAligned(); m_aLocale = SvtSysLocale().GetLanguageTag().getLocale(); } diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx index 643c327b753d..b9e20c788516 100644 --- a/dbaccess/source/ui/control/FieldDescControl.cxx +++ b/dbaccess/source/ui/control/FieldDescControl.cxx @@ -88,7 +88,6 @@ OFieldDescControl::OFieldDescControl(weld::Container* pPage, vcl::Window* pParen ,aNo(DBA_RES(STR_VALUE_NO)) ,m_nEditWidth(50) ,m_bAdded(false) - ,m_bRightAligned(false) ,pActFieldDescr(nullptr) { } diff --git a/dbaccess/source/ui/inc/FieldDescControl.hxx b/dbaccess/source/ui/inc/FieldDescControl.hxx index 522debaad3a3..5c9e17215529 100644 --- a/dbaccess/source/ui/inc/FieldDescControl.hxx +++ b/dbaccess/source/ui/inc/FieldDescControl.hxx @@ -109,7 +109,6 @@ namespace dbaui sal_Int32 m_nEditWidth; bool m_bAdded; - bool m_bRightAligned; OFieldDescription* pActFieldDescr; @@ -130,8 +129,6 @@ namespace dbaui void InitializeControl(OPropListBoxCtrl* _pControl,const OString& _sHelpId,bool _bAddChangeHandler); protected: - void setRightAligned() { m_bRightAligned = true; } - void saveCurrentFieldDescData() { SaveData( pActFieldDescr ); } OFieldDescription* getCurrentFieldDescData() { return pActFieldDescr; } void setCurrentFieldDescData( OFieldDescription* _pDesc ) { pActFieldDescr = _pDesc; } diff --git a/editeng/source/misc/splwrap.cxx b/editeng/source/misc/splwrap.cxx index a7b582b66d6a..16224079547a 100644 --- a/editeng/source/misc/splwrap.cxx +++ b/editeng/source/misc/splwrap.cxx @@ -144,7 +144,6 @@ SvxSpellWrapper::SvxSpellWrapper( vcl::Window* pWn, pWin ( pWn ), bOtherCntnt ( false ), - bHyphen ( false ), bStartChk ( false ), bRevAllowed ( true ), bAllRight ( bIsAllRight ) @@ -163,7 +162,6 @@ SvxSpellWrapper::SvxSpellWrapper( vcl::Window* pWn, pWin ( pWn ), xHyph ( xHyphenator ), bOtherCntnt ( bOther ), - bHyphen ( false ), bReverse ( false ), bStartDone ( bOther || bStart ), bEndDone ( false ), diff --git a/include/editeng/splwrap.hxx b/include/editeng/splwrap.hxx index cb868401cdf2..dbb6576fbbfd 100644 --- a/include/editeng/splwrap.hxx +++ b/include/editeng/splwrap.hxx @@ -56,7 +56,6 @@ private: css::uno::Reference< css::linguistic2::XHyphenator > xHyph; bool bOtherCntnt : 1; // set => Check special sections initially - bool bHyphen : 1; // Split instead of spell checking bool bReverse : 1; // Reverse spell check bool bStartDone : 1; // Beginning already corrected bool bEndDone : 1; // End part already corrected @@ -92,7 +91,6 @@ public: void SpellDocument(); // Perform Spell Checking bool IsStartDone() const { return bStartDone; } bool IsEndDone() const { return bEndDone; } - void SetHyphen() { bHyphen = true; } bool IsAllRight() const { return bAllRight; } protected: diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx index 8c259750684e..f0f1ea1005b5 100644 --- a/include/vcl/edit.hxx +++ b/include/vcl/edit.hxx @@ -85,7 +85,6 @@ private: mbForceControlBackground:1, mbPassword; Link<Edit&,void> maModifyHdl; - Link<Edit&,void> maUpdateDataHdl; Link<Edit&,void> maAutocompleteHdl; Link<Edit&,bool> maActivateHdl; std::unique_ptr<VclBuilder> mpUIBuilder; diff --git a/include/vcl/vclmedit.hxx b/include/vcl/vclmedit.hxx index b95cf77a399b..13b035a383b9 100644 --- a/include/vcl/vclmedit.hxx +++ b/include/vcl/vclmedit.hxx @@ -82,7 +82,6 @@ private: Link<Edit&,void> aModifyHdlLink; std::unique_ptr<Timer> pUpdateDataTimer; - Link<Edit&,void> aUpdateDataHdlLink; protected: diff --git a/sw/source/uibase/lingu/hyp.cxx b/sw/source/uibase/lingu/hyp.cxx index fe99a1a2e8b2..77152cafd4e8 100644 --- a/sw/source/uibase/lingu/hyp.cxx +++ b/sw/source/uibase/lingu/hyp.cxx @@ -55,7 +55,6 @@ SwHyphWrapper::SwHyphWrapper( SwView* pVw, { uno::Reference< linguistic2::XLinguProperties > xProp( GetLinguPropertySet() ); bAutomatic = xProp.is() && xProp->getIsHyphAuto(); - SetHyphen(); } void SwHyphWrapper::SpellStart( SvxSpellArea eSpell ) diff --git a/vcl/inc/wizdlg.hxx b/vcl/inc/wizdlg.hxx index 21f9e1364364..911e572c3758 100644 --- a/vcl/inc/wizdlg.hxx +++ b/vcl/inc/wizdlg.hxx @@ -75,7 +75,6 @@ namespace vcl VclPtr<vcl::Window> mpViewWindow; sal_uInt16 mnCurLevel; WindowAlign meViewAlign; - Link<RoadmapWizard*,void> maActivateHdl; sal_Int16 mnLeftAlignCount; bool mbEmptyViewMargin; diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index d55d1cd24fa0..259c2374f011 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -2350,7 +2350,6 @@ void Edit::Modify() void Edit::UpdateData() { - maUpdateDataHdl.Call( *this ); } IMPL_LINK_NOARG(Edit, ImplUpdateDataHdl, Timer *, void) diff --git a/vcl/source/control/wizardmachine.cxx b/vcl/source/control/wizardmachine.cxx index 52d2df57b1e8..2f43c528b63b 100644 --- a/vcl/source/control/wizardmachine.cxx +++ b/vcl/source/control/wizardmachine.cxx @@ -562,8 +562,6 @@ namespace vcl void RoadmapWizard::ActivatePage() { - maActivateHdl.Call( this ); - WizardTypes::WizardState nCurrentLevel = GetCurLevel(); GetOrCreatePage( nCurrentLevel ); diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx index 9fa871612aa6..cc2b52e658b7 100644 --- a/vcl/source/edit/vclmedit.cxx +++ b/vcl/source/edit/vclmedit.cxx @@ -1007,7 +1007,6 @@ IMPL_LINK_NOARG(VclMultiLineEdit, ImpUpdateDataHdl, Timer *, void) void VclMultiLineEdit::UpdateData() { - aUpdateDataHdlLink.Call( *this ); } void VclMultiLineEdit::SetModifyFlag() commit ffa35b82ce845d82a5beae36eb57cec2b0c01233 Author: Noel Grandin <noel.gran...@collabora.co.uk> AuthorDate: Fri Oct 4 09:07:25 2019 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Fri Oct 4 14:22:40 2019 +0200 loplugin:unusedmethods Change-Id: Idd98dc9e1090a6b09124c80eed5a878e5e966cfc Reviewed-on: https://gerrit.libreoffice.org/80182 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/compilerplugins/clang/unusedmethods.results b/compilerplugins/clang/unusedmethods.results index 8e985abaf45a..165ed273978c 100644 --- a/compilerplugins/clang/unusedmethods.results +++ b/compilerplugins/clang/unusedmethods.results @@ -1,18 +1,18 @@ -basctl/source/inc/bastype2.hxx:337 +basctl/source/inc/bastype2.hxx:333 void basctl::SbTreeListBox::make_unsorted() -basctl/source/inc/bastype2.hxx:338 +basctl/source/inc/bastype2.hxx:334 _Bool basctl::SbTreeListBox::get_sort_order() const -basctl/source/inc/bastype2.hxx:339 +basctl/source/inc/bastype2.hxx:335 void basctl::SbTreeListBox::set_sort_order(_Bool) -basctl/source/inc/bastype2.hxx:341 +basctl/source/inc/bastype2.hxx:337 void basctl::SbTreeListBox::set_sort_indicator(enum TriState,int) -basctl/source/inc/bastype2.hxx:345 +basctl/source/inc/bastype2.hxx:341 enum TriState basctl::SbTreeListBox::get_sort_indicator(int) -basctl/source/inc/bastype2.hxx:350 +basctl/source/inc/bastype2.hxx:346 int basctl::SbTreeListBox::get_sort_column() const -basctl/source/inc/bastype2.hxx:351 +basctl/source/inc/bastype2.hxx:347 void basctl::SbTreeListBox::set_sort_column(int) -basctl/source/inc/bastype2.hxx:353 +basctl/source/inc/bastype2.hxx:349 void basctl::SbTreeListBox::set_sort_func(const class std::function<int (const class weld::TreeIter &, const class weld::TreeIter &)> &) basegfx/source/range/b2drangeclipper.cxx:687 type-parameter-?-? basegfx::(anonymous namespace)::eraseFromList(type-parameter-?-? &,const type-parameter-?-? &) @@ -90,14 +90,10 @@ dbaccess/source/ui/inc/dsmeta.hxx:88 class __gnu_debug::_Safe_iterator<struct std::_Rb_tree_const_iterator<int>, class std::__debug::set<int, struct std::less<int>, class std::allocator<int> >, struct std::bidirectional_iterator_tag> dbaui::FeatureSet::begin() const dbaccess/source/ui/inc/dsmeta.hxx:89 class __gnu_debug::_Safe_iterator<struct std::_Rb_tree_const_iterator<int>, class std::__debug::set<int, struct std::less<int>, class std::allocator<int> >, struct std::bidirectional_iterator_tag> dbaui::FeatureSet::end() const -dbaccess/source/ui/inc/FieldControls.hxx:71 +dbaccess/source/ui/inc/FieldControls.hxx:69 class rtl::OUString dbaui::OPropNumericEditCtrl::get_text() const -dbaccess/source/ui/inc/FieldControls.hxx:76 +dbaccess/source/ui/inc/FieldControls.hxx:74 void dbaui::OPropNumericEditCtrl::set_min(int) -dbaccess/source/ui/inc/FieldDescControl.hxx:134 - _Bool dbaui::OFieldDescControl::isRightAligned() const -dbaccess/source/ui/inc/FieldDescControl.hxx:140 - unsigned short dbaui::OFieldDescControl::CountActiveAggregates() const dbaccess/source/ui/inc/indexcollection.hxx:54 class __gnu_debug::_Safe_iterator<class __gnu_cxx::__normal_iterator<const struct dbaui::OIndex *, class std::__cxx1998::vector<struct dbaui::OIndex, class std::allocator<struct dbaui::OIndex> > >, class std::__debug::vector<struct dbaui::OIndex, class std::allocator<struct dbaui::OIndex> >, struct std::random_access_iterator_tag> dbaui::OIndexCollection::begin() const dbaccess/source/ui/inc/indexcollection.hxx:58 @@ -112,9 +108,9 @@ dbaccess/source/ui/inc/opendoccontrols.hxx:70 _Bool dbaui::OpenDocumentListBox::get_sensitive() const dbaccess/source/ui/inc/opendoccontrols.hxx:71 void dbaui::OpenDocumentListBox::grab_focus() -dbaccess/source/ui/inc/SqlNameEdit.hxx:106 +dbaccess/source/ui/inc/SqlNameEdit.hxx:105 void dbaui::OSQLNameEntry::set_sensitive(_Bool) -dbaccess/source/ui/inc/WTypeSelect.hxx:84 +dbaccess/source/ui/inc/WTypeSelect.hxx:76 void dbaui::OWizTypeSelectList::show() desktop/inc/lib/init.hxx:83 void desktop::CallbackFlushHandler::setEventLatch(const _Bool) @@ -148,8 +144,6 @@ editeng/inc/edtspell.hxx:112 class __gnu_debug::_Safe_iterator<class __gnu_cxx::__normal_iterator<const struct editeng::MisspellRange *, class std::__cxx1998::vector<struct editeng::MisspellRange, class std::allocator<struct editeng::MisspellRange> > >, class std::__debug::vector<struct editeng::MisspellRange, class std::allocator<struct editeng::MisspellRange> >, struct std::random_access_iterator_tag> WrongList::end() const extensions/source/scanner/scanner.hxx:86 void ScannerManager::SetData(void *) -framework/source/uiconfiguration/ImageList.hxx:73 - void ImageList::ImplLoad(struct ImageAryData &) const hwpfilter/source/mzstring.h:99 class MzString & MzString::operator<<(unsigned char) hwpfilter/source/mzstring.h:101 @@ -478,8 +472,6 @@ include/drawinglayer/tools/primitive2dxmldump.hxx:44 void drawinglayer::tools::Primitive2dXmlDump::dump(const class drawinglayer::primitive2d::Primitive2DContainer &,const class rtl::OUString &) include/editeng/hyphenzoneitem.hxx:63 _Bool SvxHyphenZoneItem::IsPageEnd() const -include/editeng/splwrap.hxx:95 - _Bool SvxSpellWrapper::IsHyphen() const include/filter/msfilter/mstoolbar.hxx:102 Indent::Indent(_Bool) include/formula/opcode.hxx:520 @@ -558,8 +550,6 @@ include/sfx2/lokcharthelper.hxx:42 void LokChartHelper::Invalidate() include/sfx2/msg.hxx:120 const class std::type_info * SfxType0::Type() const -include/sfx2/viewsh.hxx:169 - unsigned long SfxViewShell::GetActiveShells(_Bool) include/svl/itempool.hxx:171 const type-parameter-?-? * SfxItemPool::GetItem2Default(TypedWhichId<type-parameter-?-?>) const include/svl/itempool.hxx:207 @@ -568,10 +558,6 @@ include/svl/lockfilecommon.hxx:58 void svt::LockFileCommon::SetURL(const class rtl::OUString &) include/svtools/DocumentToGraphicRenderer.hxx:106 _Bool DocumentToGraphicRenderer::isImpress() const -include/svtools/simptabl.hxx:92 - void SvSimpleTable::InsertHeaderEntry(const class rtl::OUString &,unsigned short,enum HeaderBarItemBits) -include/svtools/simptabl.hxx:99 - unsigned short SvSimpleTable::GetSortedCol() const include/svx/autoformathelper.hxx:145 _Bool AutoFormatBase::operator==(const class AutoFormatBase &) include/svx/ClassificationEditView.hxx:38 @@ -582,8 +568,6 @@ include/svx/ClassificationField.hxx:47 const class rtl::OUString & svx::ClassificationResult::getDisplayText() const include/svx/ClassificationField.hxx:52 _Bool svx::ClassificationResult::operator==(const class svx::ClassificationResult &) const -include/svx/colorbox.hxx:70 - void SvxColorListBox::SetAutoDisplayColor(const class Color &) include/svx/DiagramDataInterface.hxx:33 class rtl::OUString DiagramDataInterface::getString() const include/svx/dlgctrl.hxx:256 @@ -694,8 +678,6 @@ include/vcl/animate/AnimationBitmap.hxx:69 _Bool AnimationBitmap::operator!=(const struct AnimationBitmap &) const include/vcl/BitmapColor.hxx:39 void BitmapColor::SetAlpha(unsigned char) -include/vcl/builderpage.hxx:38 - class weld::DialogController * BuilderPage::GetController() const include/vcl/ColorMask.hxx:113 void ColorMask::GetColorFor16BitMSB(class BitmapColor &,const unsigned char *) const include/vcl/ColorMask.hxx:114 @@ -722,8 +704,6 @@ include/vcl/edit.hxx:193 _Bool Edit::IsSelectAllSingleClick() const include/vcl/edit.hxx:225 class rtl::OUString Edit::GetPlaceholderText() const -include/vcl/edit.hxx:233 - void Edit::SetUpdateDataHdl(const class Link<class Edit &, void> &) include/vcl/errcode.hxx:86 _Bool ErrCode::operator<(const class ErrCode &) const include/vcl/errcode.hxx:87 @@ -762,21 +742,17 @@ include/vcl/salnativewidgets.hxx:410 _Bool TabitemValue::isBothAligned() const include/vcl/salnativewidgets.hxx:411 _Bool TabitemValue::isNotAligned() const -include/vcl/settings.hxx:413 +include/vcl/settings.hxx:396 void StyleSettings::SetUseFlatBorders(_Bool) -include/vcl/settings.hxx:416 +include/vcl/settings.hxx:399 void StyleSettings::SetUseFlatMenus(_Bool) -include/vcl/settings.hxx:428 +include/vcl/settings.hxx:411 void StyleSettings::SetHideDisabledMenuItems(_Bool) -include/vcl/settings.hxx:493 +include/vcl/settings.hxx:476 void StyleSettings::SetSpinSize(long) -include/vcl/settings.hxx:558 - void StyleSettings::SetDialogStyle(const struct DialogStyle &) -include/vcl/settings.hxx:561 - void StyleSettings::SetFrameStyle(const struct FrameStyle &) -include/vcl/settings.hxx:652 +include/vcl/settings.hxx:631 _Bool HelpSettings::operator!=(const class HelpSettings &) const -include/vcl/settings.hxx:707 +include/vcl/settings.hxx:686 _Bool AllSettings::operator!=(const class AllSettings &) const include/vcl/svapp.hxx:170 ApplicationEvent::ApplicationEvent(enum ApplicationEvent::Type,const class std::__debug::vector<class rtl::OUString, class std::allocator<class rtl::OUString> > &) @@ -784,6 +760,10 @@ include/vcl/svapp.hxx:801 void Application::AppEvent(const class ApplicationEvent &) include/vcl/syswin.hxx:173 void SystemWindow::SetIdleDebugName(const char *) +include/vcl/tabctrl.hxx:136 + unsigned short TabControl::GetPageId(const class TabPage &) const +include/vcl/tabctrl.hxx:153 + void TabControl::SetHelpId(unsigned short,const class rtl::OString &) const include/vcl/TaskStopwatch.hxx:97 void TaskStopwatch::reset() include/vcl/TaskStopwatch.hxx:108 @@ -796,14 +776,10 @@ include/vcl/TaskStopwatch.hxx:118 void TaskStopwatch::setTimeSlice(unsigned int) include/vcl/textrectinfo.hxx:45 _Bool TextRectInfo::operator!=(const class TextRectInfo &) const -include/vcl/treelistbox.hxx:354 +include/vcl/treelistbox.hxx:353 void SvTreeListBox::RemoveSelection() -include/vcl/treelistbox.hxx:371 +include/vcl/treelistbox.hxx:370 const class SvTreeListEntry * SvTreeListBox::GetParent(const class SvTreeListEntry *) const -include/vcl/treelistbox.hxx:658 - short SvTreeListBox::GetSpaceBetweenEntries() const -include/vcl/treelistbox.hxx:720 - void SvTreeListBox::InitStartEntry() include/vcl/txtattr.hxx:56 _Bool TextAttrib::operator!=(const class TextAttrib &) const include/vcl/uitest/uiobject.hxx:274 @@ -842,69 +818,67 @@ include/vcl/weld.hxx:291 enum VclPolicyType weld::ScrolledWindow::get_hpolicy() const include/vcl/weld.hxx:296 int weld::ScrolledWindow::get_hscroll_height() const -include/vcl/weld.hxx:342 - class rtl::OUString weld::Notebook::get_tab_label_text(const class rtl::OString &) const -include/vcl/weld.hxx:394 +include/vcl/weld.hxx:396 struct SystemEnvData weld::Window::get_system_data() const -include/vcl/weld.hxx:484 +include/vcl/weld.hxx:486 class rtl::OString weld::Assistant::get_current_page_ident() const -include/vcl/weld.hxx:490 +include/vcl/weld.hxx:492 class rtl::OUString weld::Assistant::get_page_title(const class rtl::OString &) const -include/vcl/weld.hxx:711 +include/vcl/weld.hxx:713 void weld::TreeView::append(const class weld::TreeIter *,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &) -include/vcl/weld.hxx:720 +include/vcl/weld.hxx:722 void weld::TreeView::append(const class rtl::OUString &,const class rtl::OUString &,class VirtualDevice &) -include/vcl/weld.hxx:759 +include/vcl/weld.hxx:761 void weld::TreeView::set_top_entry(int) -include/vcl/weld.hxx:898 +include/vcl/weld.hxx:900 void weld::TreeView::select_all() -include/vcl/weld.hxx:942 +include/vcl/weld.hxx:944 const class rtl::OUString & weld::TreeView::get_saved_value() const -include/vcl/weld.hxx:1047 +include/vcl/weld.hxx:1049 void weld::MenuButton::append_item(const class rtl::OUString &,const class rtl::OUString &) -include/vcl/weld.hxx:1059 +include/vcl/weld.hxx:1061 void weld::MenuButton::append_item(const class rtl::OUString &,const class rtl::OUString &,class VirtualDevice &) -include/vcl/weld.hxx:1064 +include/vcl/weld.hxx:1066 void weld::MenuButton::append_separator(const class rtl::OUString &) -include/vcl/weld.hxx:1095 +include/vcl/weld.hxx:1097 class rtl::OUString weld::LinkButton::get_label() const -include/vcl/weld.hxx:1099 +include/vcl/weld.hxx:1101 void weld::LinkButton::clicked() -include/vcl/weld.hxx:1130 +include/vcl/weld.hxx:1132 class rtl::OUString weld::ProgressBar::get_text() const -include/vcl/weld.hxx:1147 +include/vcl/weld.hxx:1149 void weld::Entry::signal_insert_text(class rtl::OUString &) -include/vcl/weld.hxx:1162 +include/vcl/weld.hxx:1164 int weld::Entry::get_position() const -include/vcl/weld.hxx:1271 +include/vcl/weld.hxx:1273 void weld::FormattedSpinButton::set_max(double) -include/vcl/weld.hxx:1320 +include/vcl/weld.hxx:1322 void weld::EntryTreeView::EntryModifyHdl(const class weld::Entry &) -include/vcl/weld.hxx:1557 +include/vcl/weld.hxx:1559 class Size weld::MetricSpinButton::get_size_request() const -include/vcl/weld.hxx:1568 +include/vcl/weld.hxx:1570 void weld::MetricSpinButton::set_position(int) -include/vcl/weld.hxx:1615 - _Bool weld::TimeSpinButton::get_sensitive() const include/vcl/weld.hxx:1617 + _Bool weld::TimeSpinButton::get_sensitive() const +include/vcl/weld.hxx:1619 _Bool weld::TimeSpinButton::get_visible() const -include/vcl/weld.hxx:1618 +include/vcl/weld.hxx:1620 void weld::TimeSpinButton::grab_focus() -include/vcl/weld.hxx:1619 +include/vcl/weld.hxx:1621 _Bool weld::TimeSpinButton::has_focus() const -include/vcl/weld.hxx:1622 +include/vcl/weld.hxx:1624 void weld::TimeSpinButton::save_value() -include/vcl/weld.hxx:1623 +include/vcl/weld.hxx:1625 _Bool weld::TimeSpinButton::get_value_changed_from_saved() const -include/vcl/weld.hxx:1683 +include/vcl/weld.hxx:1685 int weld::TextView::vadjustment_get_lower() const -include/vcl/weld.hxx:1769 +include/vcl/weld.hxx:1771 void weld::Menu::append_check(const class rtl::OUString &,const class rtl::OUString &) -include/vcl/weld.hxx:1799 +include/vcl/weld.hxx:1801 void weld::Toolbar::append_separator(const class rtl::OUString &) -include/vcl/weld.hxx:1808 +include/vcl/weld.hxx:1810 void weld::SizeGroup::set_mode(enum VclSizeGroupMode) -include/vcl/weld.hxx:1835 +include/vcl/weld.hxx:1837 class std::unique_ptr<class weld::Window, struct std::default_delete<class weld::Window> > weld::Builder::weld_window(const class rtl::OString &,_Bool) include/vcl/window.hxx:410 const char * ImplDbgCheckWindow(const void *) @@ -972,8 +946,6 @@ sc/inc/userlist.hxx:88 class __gnu_debug::_Safe_iterator<class __gnu_cxx::__normal_iterator<const class std::unique_ptr<class ScUserListData, struct std::default_delete<class ScUserListData> > *, class std::__cxx1998::vector<class std::unique_ptr<class ScUserListData, struct std::default_delete<class ScUserListData> >, class std::allocator<class std::unique_ptr<class ScUserListData, struct std::default_delete<class ScUserListData> > > > >, class std::__debug::vector<class std::unique_ptr<class ScUserListData, struct std::default_delete<class ScUserListData> >, class std::allocator<class std::unique_ptr<class ScUserListData, struct std::default_delete<class ScUserListData> > > >, struct std::random_access_iterator_tag> ScUserList::begin() const sc/qa/unit/helper/qahelper.hxx:160 class std::__cxx11::basic_string<char, struct std::char_traits<char>, class std::allocator<char> > print(const class ScAddress &) -sc/qa/unit/screenshots/screenshots.cxx:326 - int main() sc/qa/unit/ucalc.hxx:143 void Test::testFormulaHashAndTag() sc/qa/unit/ucalc.hxx:181 @@ -1144,9 +1116,9 @@ slideshow/source/engine/opengl/TransitionImpl.hxx:180 void OGLTransitionImpl::finish(double,double,double,double,double) starmath/inc/format.hxx:138 _Bool SmFormat::operator!=(const class SmFormat &) const -svgio/inc/svgstyleattributes.hxx:352 +svgio/inc/svgstyleattributes.hxx:348 class svgio::svgreader::SvgNumber svgio::svgreader::SvgStyleAttributes::getStrokeDashOffset() const -svgio/inc/svgstyleattributes.hxx:376 +svgio/inc/svgstyleattributes.hxx:372 enum svgio::svgreader::FontStretch svgio::svgreader::SvgStyleAttributes::getFontStretch() const svx/inc/sdr/contact/viewcontactofgraphic.hxx:56 class SdrGrafObj & sdr::contact::ViewContactOfGraphic::GetGrafObject() @@ -1162,8 +1134,6 @@ svx/source/svdraw/svdpdf.hxx:96 double ImpSdrPdfImport::Matrix::f() const svx/source/svdraw/svdpdf.hxx:149 class std::__cxx11::basic_string<char, struct std::char_traits<char>, class std::allocator<char> > ImpSdrPdfImport::Matrix::toString() const -svx/source/table/tablerow.hxx:54 - int sdr::table::TableRow::getHeight() const sw/inc/dbgoutsw.hxx:53 const char * dbg_out(const void *) sw/inc/dbgoutsw.hxx:55 @@ -1336,31 +1306,17 @@ sw/source/uibase/inc/bookmark.hxx:45 void BookmarkTable::remove(const class weld::TreeIter &) sw/source/uibase/inc/condedit.hxx:53 _Bool ConditionEdit::get_sensitive() const -sw/source/uibase/inc/numfmtlb.hxx:52 - void NumFormatListBox::SetOneArea(_Bool) -sw/source/uibase/inc/numfmtlb.hxx:55 - enum SvNumFormatType NumFormatListBox::GetFormatType() const -sw/source/uibase/inc/numfmtlb.hxx:59 - struct o3tl::strong_int<unsigned short, struct LanguageTypeTag> NumFormatListBox::GetCurLanguage() const -sw/source/uibase/inc/numfmtlb.hxx:60 - void NumFormatListBox::SetLanguage(struct o3tl::strong_int<unsigned short, struct LanguageTypeTag>) -sw/source/uibase/inc/numfmtlb.hxx:62 - void NumFormatListBox::SetAutomaticLanguage(_Bool) -sw/source/uibase/inc/numfmtlb.hxx:63 - _Bool NumFormatListBox::IsAutomaticLanguage() const -sw/source/uibase/inc/numfmtlb.hxx:65 - void NumFormatListBox::SetShowLanguageControl(_Bool) -sw/source/uibase/inc/numfmtlb.hxx:171 +sw/source/uibase/inc/numfmtlb.hxx:130 _Bool SwNumFormatTreeView::get_value_changed_from_saved() const -sw/source/uibase/inc/numfmtlb.hxx:172 +sw/source/uibase/inc/numfmtlb.hxx:131 void SwNumFormatTreeView::save_value() -sw/source/uibase/inc/numfmtlb.hxx:173 +sw/source/uibase/inc/numfmtlb.hxx:132 void SwNumFormatTreeView::show() -sw/source/uibase/inc/numfmtlb.hxx:174 +sw/source/uibase/inc/numfmtlb.hxx:133 void SwNumFormatTreeView::hide() -sw/source/uibase/inc/numfmtlb.hxx:180 +sw/source/uibase/inc/numfmtlb.hxx:139 void SwNumFormatTreeView::set_sensitive(_Bool) -sw/source/uibase/inc/numfmtlb.hxx:181 +sw/source/uibase/inc/numfmtlb.hxx:140 void SwNumFormatTreeView::connect_changed(const class Link<class weld::TreeView &, void> &) sw/source/uibase/inc/swcont.hxx:85 _Bool SwContent::operator==(const class SwContent &) const @@ -1384,6 +1340,8 @@ vcl/inc/bitmapwriteaccess.hxx:75 void BitmapWriteAccess::SetFillColor() vcl/inc/ControlCacheKey.hxx:34 ControlCacheKey::ControlCacheKey(enum ControlType,enum ControlPart,enum ControlState,const class Size &) +vcl/inc/ControlCacheKey.hxx:50 + _Bool ControlCacheKey::canCacheControl() const vcl/inc/fontinstance.hxx:67 void LogicalFontInstance::SetAverageWidthFactor(double) vcl/inc/fontinstance.hxx:68 @@ -1476,72 +1434,28 @@ vcl/inc/schedulerimpl.hxx:38 const char * ImplSchedulerData::GetDebugName() const vcl/inc/unx/glyphcache.hxx:68 void GlyphCache::ClearFontOptions() -vcl/inc/unx/gtk/gtkdata.hxx:121 - struct _GdkCursor * GtkSalDisplay::getFromXBM(const unsigned char *,const unsigned char *,int,int,int,int) -vcl/inc/unx/gtk/gtkdata.hxx:142 - int GtkSalDisplay::GetXScreenCount() -vcl/inc/unx/gtk/gtkdata.hxx:153 - void GtkSalDisplay::RefreshMenusUnity() -vcl/inc/unx/gtk/gtkframe.hxx:217 +vcl/inc/unx/gtk/gtkframe.hxx:214 void ensure_dbus_setup(struct _GdkWindow *,class GtkSalFrame *) -vcl/inc/unx/gtk/gtkframe.hxx:311 - void GtkSalFrame::createNewWindow(unsigned long,_Bool,class SalX11Screen) -vcl/inc/unx/gtk/gtkframe.hxx:341 - _Bool GtkSalFrame::Dispatch(const union _XEvent *) -vcl/inc/unx/gtk/gtkframe.hxx:351 - struct _GdkWindow * GtkSalFrame::getForeignParent() const -vcl/inc/unx/gtk/gtkframe.hxx:352 - unsigned long GtkSalFrame::getForeignParentWindow() const -vcl/inc/unx/gtk/gtkframe.hxx:353 - struct _GdkWindow * GtkSalFrame::getForeignTopLevel() const -vcl/inc/unx/gtk/gtkframe.hxx:354 - unsigned long GtkSalFrame::getForeignTopLevelWindow() const -vcl/inc/unx/gtk/gtkgdi.hxx:132 - void GtkSalGraphics::refreshFontconfig(struct _GtkSettings *) -vcl/inc/unx/gtk/gtkgdi.hxx:133 - void GtkSalGraphics::signalSettingsNotify(struct _GObject *,struct _GParamSpec *,void *) -vcl/inc/unx/pixmap.hxx:21 - X11Pixmap::X11Pixmap(int,int) -vcl/inc/unx/saldisp.hxx:380 +vcl/inc/unx/gtk/gtksys.hxx:38 + int GtkSalSystem::GetDisplayXScreenCount() +vcl/inc/unx/saldisp.hxx:378 class SalXLib * SalDisplay::GetXLib() const -vcl/inc/unx/saldisp.hxx:394 - _Bool SalDisplay::IsNumLockFromXS() const -vcl/inc/unx/salframe.h:185 +vcl/inc/unx/salframe.h:184 enum SalFrameStyleFlags X11SalFrame::GetStyle() const -vcl/inc/unx/salgdi.h:266 - _Bool X11SalGraphics::TryRenderCachedNativeControl(class ControlCacheKey &,int,int) -vcl/inc/unx/salgdi.h:269 - _Bool X11SalGraphics::RenderAndCacheNativeControl(class X11Pixmap *,class X11Pixmap *,int,int,class ControlCacheKey &) -vcl/inc/unx/salgdi.h:273 - void X11SalGraphics::FillPixmapFromScreen(class X11Pixmap *,int,int) -vcl/inc/unx/salgdi.h:276 - _Bool X11SalGraphics::RenderPixmapToScreen(class X11Pixmap *,class X11Pixmap *,int,int) -vcl/inc/unx/salgdi.h:303 - void X11SalGraphics::releaseGlyphPeer() -vcl/inc/wizdlg.hxx:130 - _Bool vcl::RoadmapWizard::ShowPrevPage() -vcl/inc/wizdlg.hxx:131 - _Bool vcl::RoadmapWizard::ShowNextPage() -vcl/inc/wizdlg.hxx:153 - void vcl::RoadmapWizard::SetActivatePageHdl(const class Link<class vcl::RoadmapWizard *, void> &) -vcl/inc/wizdlg.hxx:158 - void vcl::RoadmapWizard::defaultButton(enum WizardButtonFlags) -vcl/inc/wizdlg.hxx:163 - void vcl::RoadmapWizard::setTitleBase(const class rtl::OUString &) -vcl/inc/wizdlg.hxx:174 - void vcl::RoadmapWizard::updateTravelUI() -vcl/inc/wizdlg.hxx:178 - void vcl::RoadmapWizard::SetRoadmapInteractive(_Bool) -vcl/inc/wizdlg.hxx:236 - void vcl::RoadmapWizard::enableAutomaticNextButtonState() -vcl/inc/wizdlg.hxx:257 - void vcl::RoadmapWizard::skip() -vcl/inc/wizdlg.hxx:322 - void vcl::RoadmapWizard::declarePath(short,const class std::__debug::vector<short, class std::allocator<short> > &) -vcl/inc/wizdlg.hxx:377 - void vcl::RoadmapWizard::enableState(short,_Bool) -vcl/inc/wizdlg.hxx:381 - _Bool vcl::RoadmapWizard::knowsState(short) const +vcl/inc/unx/salgdi.h:281 + void X11SalGraphics::CopyScreenArea(struct _XDisplay *,unsigned long,class SalX11Screen,int,unsigned long,class SalX11Screen,int,struct _XGC *,int,int,unsigned int,unsigned int,int,int) +vcl/inc/unx/salgdi.h:297 + struct _XGC * X11SalGraphics::GetFontGC() +vcl/inc/unx/x11/x11gdiimpl.h:22 + _Bool X11GraphicsImpl::TryRenderCachedNativeControl(class ControlCacheKey &,int,int) +vcl/inc/wizdlg.hxx:154 + void vcl::RoadmapWizard::defaultButton(class PushButton *) +vcl/inc/wizdlg.hxx:169 + _Bool vcl::RoadmapWizard::isStateEnabled(short) const +vcl/inc/wizdlg.hxx:267 + void vcl::RoadmapWizard::getStateHistory(class std::__debug::vector<short, class std::allocator<short> > &) +vcl/inc/wizdlg.hxx:300 + void vcl::RoadmapWizard::activatePath(short,_Bool) vcl/source/app/scheduler.cxx:83 basic_ostream<type-parameter-?-?, type-parameter-?-?> & (anonymous namespace)::operator<<(basic_ostream<type-parameter-?-?, type-parameter-?-?> &,const class Idle &) vcl/source/edit/textdat2.hxx:85 @@ -1560,20 +1474,14 @@ vcl/source/fontsubset/xlat.hxx:34 unsigned short vcl::TranslateChar15(unsigned short) vcl/source/fontsubset/xlat.hxx:35 unsigned short vcl::TranslateChar16(unsigned short) -vcl/unx/gtk3/a11y/atkutil.hxx:25 - unsigned long ooo_atk_util_get_type() -vcl/unx/gtk3/a11y/atkwindow.hxx:25 - unsigned long ooo_window_wrapper_get_type() -vcl/unx/gtk3/a11y/atkwindow.hxx:26 - void restore_gail_window_vtable() -writerfilter/source/dmapper/DomainMapper_Impl.hxx:737 - _Bool writerfilter::dmapper::DomainMapper_Impl::IsInFooter() const writerfilter/source/ooxml/OOXMLPropertySet.hxx:176 class __gnu_debug::_Safe_iterator<class __gnu_cxx::__normal_iterator<const class tools::SvRef<class writerfilter::ooxml::OOXMLProperty> *, class std::__cxx1998::vector<class tools::SvRef<class writerfilter::ooxml::OOXMLProperty>, class std::allocator<class tools::SvRef<class writerfilter::ooxml::OOXMLProperty> > > >, class std::__debug::vector<class tools::SvRef<class writerfilter::ooxml::OOXMLProperty>, class std::allocator<class tools::SvRef<class writerfilter::ooxml::OOXMLProperty> > >, struct std::random_access_iterator_tag> writerfilter::ooxml::OOXMLPropertySet::begin() const writerfilter/source/ooxml/OOXMLPropertySet.hxx:177 class __gnu_debug::_Safe_iterator<class __gnu_cxx::__normal_iterator<const class tools::SvRef<class writerfilter::ooxml::OOXMLProperty> *, class std::__cxx1998::vector<class tools::SvRef<class writerfilter::ooxml::OOXMLProperty>, class std::allocator<class tools::SvRef<class writerfilter::ooxml::OOXMLProperty> > > >, class std::__debug::vector<class tools::SvRef<class writerfilter::ooxml::OOXMLProperty>, class std::allocator<class tools::SvRef<class writerfilter::ooxml::OOXMLProperty> > >, struct std::random_access_iterator_tag> writerfilter::ooxml::OOXMLPropertySet::end() const writerfilter/source/ooxml/OOXMLPropertySet.hxx:180 class std::__cxx11::basic_string<char, struct std::char_traits<char>, class std::allocator<char> > writerfilter::ooxml::OOXMLPropertySet::toString() +xmlsecurity/qa/unit/xmlsecurity-dialogs-test.cxx:61 + int main() xmlsecurity/source/gpg/XMLEncryption.hxx:25 XMLEncryptionGpg::XMLEncryptionGpg() xmlsecurity/source/xmlsec/nss/nssinitializer.hxx:45 diff --git a/compilerplugins/clang/unusedmethods.unused-returns.results b/compilerplugins/clang/unusedmethods.unused-returns.results index f97ac259ac69..d3bc2c969beb 100644 --- a/compilerplugins/clang/unusedmethods.unused-returns.results +++ b/compilerplugins/clang/unusedmethods.unused-returns.results @@ -232,9 +232,9 @@ include/vcl/texteng.hxx:276 _Bool TextEngine::Read(class SvStream &,const class TextSelection *) include/vcl/toolbox.hxx:515 _Bool ToolBox::ChangeHighlightUpDn(_Bool) -include/vcl/weld.hxx:807 +include/vcl/weld.hxx:809 _Bool weld::TreeView::iter_nth_child(class weld::TreeIter &,int) const -include/vcl/weld.hxx:1662 +include/vcl/weld.hxx:1664 _Bool weld::TextView::get_selection_bounds(int &,int &) include/vcl/window.hxx:1515 _Bool vcl::Window::set_font_attribute(const class rtl::OString &,const class rtl::OUString &) @@ -372,17 +372,17 @@ vcl/inc/salgdi.hxx:387 _Bool SalGraphics::BlendBitmap(const struct SalTwoRect &,const class SalBitmap &,const class OutputDevice *) vcl/inc/salinst.hxx:177 _Bool SalInstance::CallEventCallback(const void *,int) -vcl/inc/unx/gtk/gtkdata.hxx:138 +vcl/inc/unx/gtk/gtkdata.hxx:136 int GtkSalDisplay::CaptureMouse(class SalFrame *) -vcl/inc/unx/saldisp.hxx:310 +vcl/inc/unx/saldisp.hxx:308 _Bool SalDisplay::Dispatch(union _XEvent *) -vcl/inc/wizdlg.hxx:223 +vcl/inc/wizdlg.hxx:204 _Bool vcl::RoadmapWizard::onFinish() -vcl/inc/wizdlg.hxx:226 +vcl/inc/wizdlg.hxx:207 _Bool vcl::RoadmapWizard::travelNext() -vcl/inc/wizdlg.hxx:229 +vcl/inc/wizdlg.hxx:210 _Bool vcl::RoadmapWizard::travelPrevious() -vcl/inc/wizdlg.hxx:415 +vcl/inc/wizdlg.hxx:334 class TabPage * vcl::RoadmapWizard::GetOrCreatePage(const short) vcl/source/gdi/pdfwriter_impl.hxx:1233 _Bool vcl::PDFWriterImpl::setCurrentStructureElement(int) diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx index bbbc3842463b..789c200b159d 100644 --- a/include/vcl/tabctrl.hxx +++ b/include/vcl/tabctrl.hxx @@ -133,7 +133,6 @@ public: sal_uInt16 GetPageCount() const; sal_uInt16 GetPageId( sal_uInt16 nPos ) const; sal_uInt16 GetPageId(const Point& rPos) const; - sal_uInt16 GetPageId( const TabPage& rPage ) const; sal_uInt16 GetPageId( const OString& rName ) const; void SetCurPageId(sal_uInt16 nPageId); @@ -150,8 +149,6 @@ public: void SetHelpText( sal_uInt16 nPageId, const OUString& rText ); const OUString& GetHelpText( sal_uInt16 nPageId ) const; - void SetHelpId( sal_uInt16 nPageId, const OString& rId ) const; - void SetPageName( sal_uInt16 nPageId, const OString& rName ) const; OString GetPageName( sal_uInt16 nPageId ) const; diff --git a/vcl/inc/opengl/x11/gdiimpl.hxx b/vcl/inc/opengl/x11/gdiimpl.hxx index 5d57605bf64d..6ecaf3f62f05 100644 --- a/vcl/inc/opengl/x11/gdiimpl.hxx +++ b/vcl/inc/opengl/x11/gdiimpl.hxx @@ -37,9 +37,6 @@ public: virtual void copyBits( const SalTwoRect& rPosAry, SalGraphics* pSrcGraphics ) override; virtual void Init() override; - - bool TryRenderCachedNativeControl(ControlCacheKey& rControlCacheKey, - int nX, int nY) override; }; #endif // INCLUDED_VCL_INC_OPENGL_X11_GDIIMPL_HXX diff --git a/vcl/inc/unx/gtk/gtksys.hxx b/vcl/inc/unx/gtk/gtksys.hxx index 8c07ad623f53..1a888f970b27 100644 --- a/vcl/inc/unx/gtk/gtksys.hxx +++ b/vcl/inc/unx/gtk/gtksys.hxx @@ -35,7 +35,6 @@ public: const std::vector< OUString >& rButtons) override; SalX11Screen GetDisplayDefaultXScreen() { return getXScreenFromDisplayScreen( GetDisplayBuiltInScreen() ); } - int GetDisplayXScreenCount(); SalX11Screen getXScreenFromDisplayScreen(unsigned int nDisplayScreen); void countScreenMonitors(); // We have a 'screen' number that is combined from screen-idx + monitor-idx diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h index dd75c47dee9f..adb7969434fb 100644 --- a/vcl/inc/unx/salgdi.h +++ b/vcl/inc/unx/salgdi.h @@ -276,17 +276,6 @@ public: static void releaseCairoContext(cairo_t* cr); - // do XCopyArea or XGet/PutImage depending on screen numbers - // signature is like XCopyArea with screen numbers added - static void CopyScreenArea( - Display* pDisplay, - Drawable aSrc, SalX11Screen nXScreenSrc, int nSrcDepth, - Drawable aDest, SalX11Screen nXScreenDest, int nDestDepth, - GC aDestGC, - int src_x, int src_y, - unsigned int w, unsigned int h, - int dest_x, int dest_y ); - protected: using SalGraphics::SetClipRegion; void SetClipRegion( GC pGC, Region pXReg = nullptr ) const; @@ -294,8 +283,6 @@ protected: using SalGraphics::DrawBitmap; - GC GetFontGC(); - void freeResources(); protected: diff --git a/vcl/inc/unx/x11/x11gdiimpl.h b/vcl/inc/unx/x11/x11gdiimpl.h index 6c2e8be7fb86..2e41e87c860d 100644 --- a/vcl/inc/unx/x11/x11gdiimpl.h +++ b/vcl/inc/unx/x11/x11gdiimpl.h @@ -18,8 +18,6 @@ class X11GraphicsImpl { public: virtual ~X11GraphicsImpl() {}; - - virtual bool TryRenderCachedNativeControl(ControlCacheKey& rControlCacheKey, int nX, int nY) = 0; }; #endif // INCLUDED_VCL_INC_UNX_X11_X11GDIIMPL_HXX diff --git a/vcl/inc/wizdlg.hxx b/vcl/inc/wizdlg.hxx index aa181a6c0912..21f9e1364364 100644 --- a/vcl/inc/wizdlg.hxx +++ b/vcl/inc/wizdlg.hxx @@ -150,8 +150,6 @@ namespace vcl /// enable (or disable) buttons void enableButtons(WizardButtonFlags _nWizardButtonFlags, bool _bEnable); - /// set the default style for a button - void defaultButton(PushButton* _pNewDefButton); /// determines whether there is a next state to which we can advance bool canAdvance() const; @@ -165,9 +163,6 @@ namespace vcl void SetItemSelectHdl( const Link<LinkParamNone*,void>& _rHdl ); void ShowRoadmap(bool bShow); - // returns whether a given state is enabled - bool isStateEnabled( WizardTypes::WizardState _nState ) const; - protected: /// to override to create new pages @@ -262,43 +257,6 @@ namespace vcl static IWizardPageController* getPageController( TabPage* _pCurrentPage ); - /** retrieves a copy of the state history, i.e. all states we already visited - */ - void getStateHistory(std::vector<WizardTypes::WizardState>& out_rHistory); - - /** activates a path which has previously been declared with <member>declarePath</member> - - You can only activate paths which share the first <code>k</code> states with the path - which is previously active (if any), where <code>k</code> is the index of the - current state within the current path. - - <example> - Say you have paths, <code>(0,1,2,5)</code> and <code>(0,1,4,5)</code>. This means that after - step <code>1</code>, you either continue with state <code>2</code> or state <code>4</code>, - and after this, you finish in state <code>5</code>.<br/> - Now if the first path is active, and your current state is <code>1</code>, then you can - easily switch to the second path, since both paths start with <code>(0,1)</code>.<br/> - However, if your current state is <code>2</code>, then you can not switch to the second - path anymore. - </example> - - @param _nPathId - the id of the path. The path must have been declared (under this id) with - <member>declarePath</member> before it can be activated. - - @param _bDecideForIt - If <TRUE/>, the path will be completely activated, even if it is a conflicting path - (i.e. there is another path which shares the first <code>k</code> states with - the to-be-activated path.)<br/> - If <FALSE/>, then the new path is checked for conflicts with other paths. If such - conflicts exists, the path is not completely activated, but only up to the point - where it does <em>not</em> conflict.<br/> - With the paths in the example above, if you activate the second path (when both are - already declared), then only steps <code>0</code> and <code>1</code> are activated, - since they are common to both paths. - */ - void activatePath( RoadmapWizardTypes::PathId _nPathId, bool _bDecideForIt = false ); - /** returns a human readable name for a given state There is a default implementation for this method, which returns the display name diff --git a/vcl/opengl/x11/gdiimpl.cxx b/vcl/opengl/x11/gdiimpl.cxx index c9ae89b04d1f..f238422ff441 100644 --- a/vcl/opengl/x11/gdiimpl.cxx +++ b/vcl/opengl/x11/gdiimpl.cxx @@ -595,40 +595,4 @@ void X11OpenGLSalGraphicsImpl::copyBits( const SalTwoRect& rPosAry, SalGraphics* OpenGLSalGraphicsImpl::DoCopyBits( rPosAry, *pImpl ); } -typedef typename std::pair<ControlCacheKey, std::unique_ptr<TextureCombo>> ControlCachePair; -typedef o3tl::lru_map<ControlCacheKey, std::unique_ptr<TextureCombo>, ControlCacheHashFunction> ControlCacheType; - -static vcl::DeleteOnDeinit<ControlCacheType> gTextureCache(new ControlCacheType(200)); - -bool X11OpenGLSalGraphicsImpl::TryRenderCachedNativeControl(ControlCacheKey& rControlCacheKey, int nX, int nY) -{ - static bool gbCacheEnabled = !getenv("SAL_WITHOUT_WIDGET_CACHE"); - - if (!gbCacheEnabled || !gTextureCache.get()) - return false; - - ControlCacheType::const_iterator iterator = gTextureCache.get()->find(rControlCacheKey); - - if (iterator == gTextureCache.get()->end()) - return false; - - const std::unique_ptr<TextureCombo>& pCombo = iterator->second; - - PreDraw(); - - OpenGLTexture& rTexture = *pCombo->mpTexture; - - SalTwoRect aPosAry(0, 0, rTexture.GetWidth(), rTexture.GetHeight(), - nX, nY, rTexture.GetWidth(), rTexture.GetHeight()); - - if (pCombo->mpMask) - DrawTextureDiff(rTexture, *pCombo->mpMask, aPosAry, true); - else - DrawTexture(rTexture, aPosAry, true); - - PostDraw(); - - return true; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/control/roadmapwizard.cxx b/vcl/source/control/roadmapwizard.cxx index 513f319cbf45..160724c78ab3 100644 --- a/vcl/source/control/roadmapwizard.cxx +++ b/vcl/source/control/roadmapwizard.cxx @@ -237,49 +237,6 @@ namespace vcl implUpdateRoadmap( ); } - void RoadmapWizard::activatePath( PathId _nPathId, bool _bDecideForIt ) - { - - if ( ( _nPathId == m_xRoadmapImpl->nActivePath ) && ( _bDecideForIt == m_xRoadmapImpl->bActivePathIsDefinite ) ) - // nothing to do - return; - - // does the given path exist? - Paths::const_iterator aNewPathPos = m_xRoadmapImpl->aPaths.find( _nPathId ); - DBG_ASSERT( aNewPathPos != m_xRoadmapImpl->aPaths.end(), "RoadmapWizard::activate: there is no such path!" ); - if ( aNewPathPos == m_xRoadmapImpl->aPaths.end() ) - return; - - // determine the index of the current state in the current path - sal_Int32 nCurrentStatePathIndex = -1; - if ( m_xRoadmapImpl->nActivePath != -1 ) - nCurrentStatePathIndex = m_xRoadmapImpl->getStateIndexInPath( getCurrentState(), m_xRoadmapImpl->nActivePath ); - - DBG_ASSERT( static_cast<sal_Int32>(aNewPathPos->second.size()) > nCurrentStatePathIndex, - "RoadmapWizard::activate: you cannot activate a path which has less states than we've already advanced!" ); - // If this asserts, this for instance means that we are already in state number, say, 5 - // of our current path, and the caller tries to activate a path which has less than 5 - // states - if ( static_cast<sal_Int32>(aNewPathPos->second.size()) <= nCurrentStatePathIndex ) - return; - - // assert that the current and the new path are equal, up to nCurrentStatePathIndex - Paths::const_iterator aActivePathPos = m_xRoadmapImpl->aPaths.find( m_xRoadmapImpl->nActivePath ); - if ( aActivePathPos != m_xRoadmapImpl->aPaths.end() ) - { - if ( RoadmapWizardImpl::getFirstDifferentIndex( aActivePathPos->second, aNewPathPos->second ) <= nCurrentStatePathIndex ) - { - OSL_FAIL( "RoadmapWizard::activate: you cannot activate a path which conflicts with the current one *before* the current state!" ); - return; - } - } - - m_xRoadmapImpl->nActivePath = _nPathId; - m_xRoadmapImpl->bActivePathIsDefinite = _bDecideForIt; - - implUpdateRoadmap( ); - } - void RoadmapWizardMachine::activatePath( PathId _nPathId, bool _bDecideForIt ) { if ( ( _nPathId == m_pImpl->nActivePath ) && ( _bDecideForIt == m_pImpl->bActivePathIsDefinite ) ) @@ -849,11 +806,6 @@ namespace vcl return false; } - bool RoadmapWizard::isStateEnabled( WizardTypes::WizardState _nState ) const - { - return m_xRoadmapImpl->aDisabledStates.find( _nState ) == m_xRoadmapImpl->aDisabledStates.end(); - } - bool RoadmapWizardMachine::isStateEnabled( WizardTypes::WizardState _nState ) const { return m_pImpl->aDisabledStates.find( _nState ) == m_pImpl->aDisabledStates.end(); diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx index 736579277bbe..a3de38da26a7 100644 --- a/vcl/source/control/tabctrl.cxx +++ b/vcl/source/control/tabctrl.cxx @@ -1819,14 +1819,6 @@ sal_uInt16 TabControl::GetPageId( const Point& rPos ) const return (it != rList.end()) ? it->id() : 0; } -sal_uInt16 TabControl::GetPageId( const TabPage& rPage ) const -{ - const auto &rList = mpTabCtrlData->maItemList; - const auto it = std::find_if(rList.begin(), rList.end(), [&rPage](const auto &item) { - return item.mpTabPage == &rPage; }); - return (it != rList.end()) ? it->id() : 0; -} - sal_uInt16 TabControl::GetPageId( const OString& rName ) const { const auto &rList = mpTabCtrlData->maItemList; @@ -1989,14 +1981,6 @@ const OUString& TabControl::GetHelpText( sal_uInt16 nPageId ) const return pItem->maHelpText; } -void TabControl::SetHelpId( sal_uInt16 nPageId, const OString& rId ) const -{ - ImplTabItem* pItem = ImplGetItem( nPageId ); - - if ( pItem ) - pItem->maHelpId = rId; -} - void TabControl::SetPageName( sal_uInt16 nPageId, const OString& rName ) const { ImplTabItem* pItem = ImplGetItem( nPageId ); diff --git a/vcl/source/control/wizardmachine.cxx b/vcl/source/control/wizardmachine.cxx index b5f1afd5b0c8..52d2df57b1e8 100644 --- a/vcl/source/control/wizardmachine.cxx +++ b/vcl/source/control/wizardmachine.cxx @@ -734,17 +734,6 @@ namespace vcl } } - void RoadmapWizard::defaultButton(PushButton* _pNewDefButton) - { - // loop through all (direct and indirect) descendants which participate in our tabbing order, and - // reset the WB_DEFBUTTON for every window which is a button - implResetDefault(this); - - // set its new style - if (_pNewDefButton) - _pNewDefButton->SetStyle(_pNewDefButton->GetStyle() | WB_DEFBUTTON); - } - void RoadmapWizard::enableButtons(WizardButtonFlags _nWizardButtonFlags, bool _bEnable) { if (m_pFinish && (_nWizardButtonFlags & WizardButtonFlags::FINISH)) @@ -943,16 +932,6 @@ namespace vcl return pController; } - void RoadmapWizard::getStateHistory( std::vector< WizardTypes::WizardState >& _out_rHistory ) - { - std::stack< WizardTypes::WizardState > aHistoryCopy( m_xWizardImpl->aStateHistory ); - while ( !aHistoryCopy.empty() ) - { - _out_rHistory.push_back( aHistoryCopy.top() ); - aHistoryCopy.pop(); - } - } - bool RoadmapWizard::isTravelingSuspended() const { return m_xWizardImpl->m_bTravelingSuspended; diff --git a/vcl/unx/generic/gdi/font.cxx b/vcl/unx/generic/gdi/font.cxx index 2efac7717edf..a9bfa743923e 100644 --- a/vcl/unx/generic/gdi/font.cxx +++ b/vcl/unx/generic/gdi/font.cxx @@ -24,33 +24,6 @@ #include <textrender.hxx> #include <sallayout.hxx> -GC -X11SalGraphics::GetFontGC() -{ - Display *pDisplay = GetXDisplay(); - - if( !pFontGC_ ) - { - XGCValues values; - values.subwindow_mode = ClipByChildren; - values.fill_rule = EvenOddRule; // Pict import/ Gradient - values.graphics_exposures = False; - values.foreground = nTextPixel_; - pFontGC_ = XCreateGC( pDisplay, hDrawable_, - GCSubwindowMode | GCFillRule - | GCGraphicsExposures | GCForeground, - &values ); - } - if( !bFontGC_ ) - { - XSetForeground( pDisplay, pFontGC_, nTextPixel_ ); - SetClipRegion( pFontGC_ ); - bFontGC_ = true; - } - - return pFontGC_; -} - void X11SalGraphics::DrawTextLayout(const GenericSalLayout& rLayout) { mxTextRenderImpl->DrawTextLayout(rLayout, *this); diff --git a/vcl/unx/generic/gdi/gdiimpl.cxx b/vcl/unx/generic/gdi/gdiimpl.cxx index de51359b6e6e..39154e85ee91 100644 --- a/vcl/unx/generic/gdi/gdiimpl.cxx +++ b/vcl/unx/generic/gdi/gdiimpl.cxx @@ -154,11 +154,6 @@ void X11SalGraphicsImpl::Init() mnBrushPixel = mrParent.GetPixel( mnBrushColor ); } -bool X11SalGraphicsImpl::TryRenderCachedNativeControl(ControlCacheKey& /*rControlCacheKey*/, int /*nX*/, int /*nY*/) -{ - return false; -} - XID X11SalGraphicsImpl::GetXRenderPicture() { XRenderPeer& rRenderPeer = XRenderPeer::GetInstance(); diff --git a/vcl/unx/generic/gdi/gdiimpl.hxx b/vcl/unx/generic/gdi/gdiimpl.hxx index 0b4861896b5e..315ed4094f8b 100644 --- a/vcl/unx/generic/gdi/gdiimpl.hxx +++ b/vcl/unx/generic/gdi/gdiimpl.hxx @@ -286,9 +286,6 @@ public: // implementation of X11GraphicsImpl void Init() override; - - virtual bool TryRenderCachedNativeControl(ControlCacheKey& rControlCacheKey, - int nX, int nY) override; }; #endif diff --git a/vcl/unx/generic/gdi/salgdi2.cxx b/vcl/unx/generic/gdi/salgdi2.cxx index 7f470488bdd0..2e10ac7b0bed 100644 --- a/vcl/unx/generic/gdi/salgdi2.cxx +++ b/vcl/unx/generic/gdi/salgdi2.cxx @@ -31,43 +31,6 @@ #include <ControlCacheKey.hxx> -void X11SalGraphics::CopyScreenArea( Display* pDisplay, - Drawable aSrc, SalX11Screen nXScreenSrc, int nSrcDepth, - Drawable aDest, SalX11Screen nXScreenDest, int nDestDepth, - GC aDestGC, - int src_x, int src_y, - unsigned int w, unsigned int h, - int dest_x, int dest_y ) -{ - if( nSrcDepth == nDestDepth ) - { - if( nXScreenSrc == nXScreenDest ) - XCopyArea( pDisplay, aSrc, aDest, aDestGC, - src_x, src_y, w, h, dest_x, dest_y ); - else - { - GetGenericUnixSalData()->ErrorTrapPush(); - XImage* pImage = XGetImage( pDisplay, aSrc, src_x, src_y, w, h, - AllPlanes, ZPixmap ); - if( pImage ) - { - if( pImage->data ) - XPutImage( pDisplay, aDest, aDestGC, pImage, - 0, 0, dest_x, dest_y, w, h ); - XDestroyImage( pImage ); - } - GetGenericUnixSalData()->ErrorTrapPop(); - } - } - else - { - X11SalBitmap aBM; - aBM.ImplCreateFromDrawable( aSrc, nXScreenSrc, nSrcDepth, src_x, src_y, w, h ); - SalTwoRect aTwoRect(0, 0, w, h, dest_x, dest_y, w, h); - aBM.ImplDraw(aDest, nXScreenDest, nDestDepth, aTwoRect,aDestGC); - } -} - extern "C" { static Bool GraphicsExposePredicate( Display*, XEvent* pEvent, const XPointer pFrameWindow ) diff --git a/vcl/unx/gtk3/gtk3gtksys.cxx b/vcl/unx/gtk3/gtk3gtksys.cxx index 229a718c75a7..daf332b29d30 100644 --- a/vcl/unx/gtk3/gtk3gtksys.cxx +++ b/vcl/unx/gtk3/gtk3gtksys.cxx @@ -51,12 +51,6 @@ GtkSalSystem::~GtkSalSystem() { } -int -GtkSalSystem::GetDisplayXScreenCount() -{ - return gdk_display_get_n_screens (mpDisplay); -} - namespace { _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits