basic/inc/sbstdobj.hxx | 1 basic/source/runtime/stdobj1.cxx | 2 chart2/source/controller/dialogs/dlg_DataEditor.cxx | 7 chart2/source/controller/dialogs/dlg_DataSource.cxx | 14 chart2/source/controller/inc/dlg_DataEditor.hxx | 1 chart2/source/controller/inc/dlg_DataSource.hxx | 3 compilerplugins/clang/unusedmethods.results | 358 ++++++----- cui/source/dialogs/cuihyperdlg.cxx | 2 cui/source/dialogs/iconcdlg.cxx | 7 cui/source/inc/cuihyperdlg.hxx | 3 cui/source/options/optjava.cxx | 8 cui/source/options/optjava.hxx | 1 cui/source/tabpages/backgrnd.cxx | 3 dbaccess/source/ui/inc/RTableConnectionData.hxx | 2 dbaccess/source/ui/relationdesign/RTableConnectionData.cxx | 7 drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx | 3 extensions/source/propctrlr/browserline.cxx | 5 extensions/source/propctrlr/browserline.hxx | 1 extensions/source/propctrlr/browserlistbox.cxx | 25 extensions/source/propctrlr/browserlistbox.hxx | 9 extensions/source/propctrlr/browserpage.hxx | 2 extensions/source/propctrlr/commoncontrol.cxx | 13 extensions/source/propctrlr/commoncontrol.hxx | 5 extensions/source/propctrlr/propertyeditor.cxx | 13 extensions/source/propctrlr/propertyeditor.hxx | 3 extensions/source/propctrlr/standardcontrol.hxx | 32 extensions/source/propctrlr/usercontrol.hxx | 2 forms/source/component/clickableimage.cxx | 8 forms/source/component/clickableimage.hxx | 1 include/connectivity/sqlerror.hxx | 19 include/svl/rngitem.hxx | 1 include/svtools/fileurlbox.hxx | 67 -- include/svtools/inettbc.hxx | 3 include/svx/sxfiitm.hxx | 1 include/vcl/edit.hxx | 2 include/vcl/field.hxx | 4 include/vcl/lstbox.hxx | 1 include/vcl/tabctrl.hxx | 2 lingucomponent/source/languageguessing/guesslang.cxx | 6 lingucomponent/source/numbertext/numbertext.cxx | 8 linguistic/source/convdicxml.cxx | 5 oox/source/drawingml/diagram/datamodel.cxx | 2 oox/source/drawingml/diagram/datamodel.hxx | 2 reportdesign/source/ui/inc/ReportController.hxx | 1 reportdesign/source/ui/report/ReportController.cxx | 10 solenv/clang-format/blacklist | 2 svtools/Library_svt.mk | 1 svtools/source/control/fileurlbox.cxx | 99 --- sw/inc/unoframe.hxx | 1 sw/source/filter/html/htmlftn.cxx | 5 sw/source/filter/html/htmltab.cxx | 4 sw/source/filter/html/swhtml.cxx | 2 sw/source/filter/html/swhtml.hxx | 1 sw/source/filter/ww8/wrtww8.hxx | 1 sw/source/filter/ww8/wrtww8gr.cxx | 2 sw/source/ui/index/multmrk.cxx | 7 sw/source/uibase/docvw/SidebarTxtControlAcc.cxx | 9 sw/source/uibase/inc/multmrk.hxx | 9 sw/source/uibase/inc/unotools.hxx | 1 sw/source/uibase/utlui/unotools.cxx | 2 ucb/source/cacher/cachedcontentresultset.cxx | 8 ucb/source/cacher/cachedcontentresultset.hxx | 1 vcl/inc/wizdlg.hxx | 17 vcl/source/app/salvtables.cxx | 7 vcl/source/control/edit.cxx | 5 vcl/source/control/field.cxx | 6 vcl/source/control/imivctl.hxx | 1 vcl/source/control/imivctl1.cxx | 7 vcl/source/control/listbox.cxx | 5 vcl/source/control/roadmapwizard.cxx | 6 vcl/source/control/tabctrl.cxx | 23 vcl/source/control/wizardmachine.cxx | 16 vcl/source/filter/png/pngread.cxx | 10 vcl/source/fontsubset/cff.cxx | 12 vcl/unx/generic/gdi/cairo_xlib_cairo.cxx | 2 vcl/unx/generic/gdi/cairo_xlib_cairo.hxx | 1 writerfilter/source/dmapper/DomainMapperTableManager.cxx | 9 writerfilter/source/dmapper/DomainMapperTableManager.hxx | 1 writerperfect/source/writer/exp/xmlimp.cxx | 2 writerperfect/source/writer/exp/xmlimp.hxx | 1 xmlhelp/Library_ucpchelp1.mk | 1 xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx | 40 - xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx | 2 xmlhelp/source/cxxhelp/qe/DocGenerator.cxx | 39 - xmloff/source/chart/SchXMLExport.cxx | 5 xmloff/source/xforms/XFormsModelContext.cxx | 2 xmloff/source/xforms/XFormsModelContext.hxx | 2 87 files changed, 264 insertions(+), 788 deletions(-)
New commits: commit d59987b164bc32efe8f99ad49c139b4fc7ca3c2f Author: Noel Grandin <noel.gran...@collabora.co.uk> AuthorDate: Thu Dec 12 16:57:30 2019 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Fri Dec 13 08:12:45 2019 +0100 loplugin:expandablemethods Change-Id: I333d91ea5ce78c82e9bb107f934614efc7bfb8f7 Reviewed-on: https://gerrit.libreoffice.org/85078 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/basic/inc/sbstdobj.hxx b/basic/inc/sbstdobj.hxx index 5edb092a1b77..456c6809a07a 100644 --- a/basic/inc/sbstdobj.hxx +++ b/basic/inc/sbstdobj.hxx @@ -85,7 +85,6 @@ public: bool IsUnderline() const { return bUnderline; } void SetSize( sal_uInt16 nS ) { nSize = nS; } sal_uInt16 GetSize() const { return nSize; } - const OUString& GetFontName() const { return aName; } }; class SbStdClipboard final : public SbxObject diff --git a/basic/source/runtime/stdobj1.cxx b/basic/source/runtime/stdobj1.cxx index c65f7fc9f190..1943bdb6fcf9 100644 --- a/basic/source/runtime/stdobj1.cxx +++ b/basic/source/runtime/stdobj1.cxx @@ -205,7 +205,7 @@ void SbStdFont::PropName( SbxVariable* pVar, bool bWrite ) } else { - pVar->PutString( GetFontName() ); + pVar->PutString( aName ); } } diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.cxx b/chart2/source/controller/dialogs/dlg_DataEditor.cxx index a9fdf71a96e0..5e7c939a2262 100644 --- a/chart2/source/controller/dialogs/dlg_DataEditor.cxx +++ b/chart2/source/controller/dialogs/dlg_DataEditor.cxx @@ -139,16 +139,11 @@ void DataEditor::SetReadOnly( bool bReadOnly ) IMPL_LINK_NOARG(DataEditor, CloseHdl, weld::Button&, void) { - bool bApplied = ApplyChangesToModel(); + bool bApplied = m_xBrwData->EndEditing(); // apply changes to model if (bApplied) m_xDialog->response(RET_CLOSE); } -bool DataEditor::ApplyChangesToModel() -{ - return m_xBrwData->EndEditing(); -} - } // namespace chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/dlg_DataSource.cxx b/chart2/source/controller/dialogs/dlg_DataSource.cxx index 7d5c4670b81c..46faf3b8774b 100644 --- a/chart2/source/controller/dialogs/dlg_DataSource.cxx +++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx @@ -142,16 +142,6 @@ IMPL_LINK_NOARG(DataSourceDialog, DeactivatePageHdl, const OString&, bool) return m_bTogglingEnabled; } -void DataSourceDialog::DisableTabToggling() -{ - m_bTogglingEnabled = false; -} - -void DataSourceDialog::EnableTabToggling() -{ - m_bTogglingEnabled = true; -} - void DataSourceDialog::setInvalidPage(BuilderPage* pTabPage) { if (pTabPage == m_xRangeChooserTabPage.get()) @@ -169,7 +159,7 @@ void DataSourceDialog::setInvalidPage(BuilderPage* pTabPage) m_xTabControl->set_current_page(1); else if( m_bDataSourceTabIsValid ) m_xTabControl->set_current_page(0); - DisableTabToggling(); + m_bTogglingEnabled = false; } } @@ -183,7 +173,7 @@ void DataSourceDialog::setValidPage(BuilderPage* pTabPage) if (m_bRangeChooserTabIsValid && m_bDataSourceTabIsValid) { m_xBtnOK->set_sensitive(true); - EnableTabToggling(); + m_bTogglingEnabled = true; } } diff --git a/chart2/source/controller/inc/dlg_DataEditor.hxx b/chart2/source/controller/inc/dlg_DataEditor.hxx index f4682ab43212..2d36f38df7bf 100644 --- a/chart2/source/controller/inc/dlg_DataEditor.hxx +++ b/chart2/source/controller/inc/dlg_DataEditor.hxx @@ -47,7 +47,6 @@ public: DECL_LINK(CloseHdl, weld::Button&, void); void SetReadOnly( bool bReadOnly ); - bool ApplyChangesToModel(); private: bool m_bReadOnly; diff --git a/chart2/source/controller/inc/dlg_DataSource.hxx b/chart2/source/controller/inc/dlg_DataSource.hxx index 58965cb967f0..ca8777568826 100644 --- a/chart2/source/controller/inc/dlg_DataSource.hxx +++ b/chart2/source/controller/inc/dlg_DataSource.hxx @@ -57,9 +57,6 @@ public: virtual void setValidPage( BuilderPage * pTabPage ) override; private: - void DisableTabToggling(); - void EnableTabToggling(); - DECL_LINK(ActivatePageHdl, const OString&, void); DECL_LINK(DeactivatePageHdl, const OString&, bool); diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx index b5fb3757c336..1a3a7b520501 100644 --- a/cui/source/dialogs/cuihyperdlg.cxx +++ b/cui/source/dialogs/cuihyperdlg.cxx @@ -274,7 +274,7 @@ void SvxHpLinkDlg::SetPage ( SvxHyperlinkItem const * pItem ) |************************************************************************/ void SvxHpLinkDlg::SetReadOnlyMode( bool bRdOnly ) { - GetOKButton().set_sensitive(!bRdOnly); + m_xOKBtn->set_sensitive(!bRdOnly); } /************************************************************************* diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx index 39864c3a3d3b..7f36bd8ddc85 100644 --- a/cui/source/dialogs/iconcdlg.cxx +++ b/cui/source/dialogs/iconcdlg.cxx @@ -258,11 +258,6 @@ void SvxHpLinkDlg::SetInputSet( const SfxItemSet* pInSet ) } } -void SvxHpLinkDlg::Start() -{ - Start_Impl(); -} - bool SvxHpLinkDlg::QueryClose() { bool bRet = true; @@ -277,7 +272,7 @@ bool SvxHpLinkDlg::QueryClose() return bRet; } -void SvxHpLinkDlg::Start_Impl() +void SvxHpLinkDlg::Start() { SwitchPage(msCurrentPageId); ActivatePageImpl(); diff --git a/cui/source/inc/cuihyperdlg.hxx b/cui/source/inc/cuihyperdlg.hxx index b7f88ef013f5..702cf6396304 100644 --- a/cui/source/inc/cuihyperdlg.hxx +++ b/cui/source/inc/cuihyperdlg.hxx @@ -90,7 +90,6 @@ private: DECL_LINK( ChosePageHdl_Impl, const OString&, void ); IconChoicePageData* GetPageData ( const OString& rId ); - void Start_Impl(); void SwitchPage( const OString& rId ); @@ -123,8 +122,6 @@ public: const sal_uInt16* GetInputRanges( const SfxItemPool& ); void SetInputSet( const SfxItemSet* pInSet ); - weld::Button& GetOKButton() { return *m_xOKBtn; } - void Start(); bool QueryClose(); diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index 947d7e25e12c..b27d3a33a51f 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -311,12 +311,6 @@ void SvxJavaOptionsPage::ClearJavaInfo() #endif } -void SvxJavaOptionsPage::ClearJavaList() -{ - m_xJavaList->clear(); -} - - void SvxJavaOptionsPage::LoadJREs() { #if HAVE_FEATURE_JAVA @@ -561,7 +555,7 @@ bool SvxJavaOptionsPage::FillItemSet( SfxItemSet* /*rCoreSet*/ ) void SvxJavaOptionsPage::Reset( const SfxItemSet* /*rSet*/ ) { ClearJavaInfo(); - ClearJavaList(); + m_xJavaList->clear(); SvtMiscOptions aMiscOpt; diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx index e5537f1e1ff7..ffefecce2d47 100644 --- a/cui/source/options/optjava.hxx +++ b/cui/source/options/optjava.hxx @@ -98,7 +98,6 @@ private: DECL_LINK(ExpertConfigHdl_Impl, weld::Button&, void); void ClearJavaInfo(); - void ClearJavaList(); void LoadJREs(); void AddJRE( JavaInfo const * _pInfo ); void HandleCheckEntry(int nCheckedRow); diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index 18bcfc734689..811fc0cfacb7 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -119,7 +119,6 @@ public: void NotifyChange(const Color& rColor); void NotifyChange(const BitmapEx* pBitmap); - void SetFillColor(const Color& rColor) { aColor = rColor; } protected: virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const ::tools::Rectangle& rRect ) override; @@ -164,7 +163,7 @@ void BackgroundPreviewImpl::NotifyChange( const Color& rColor ) if ( !bIsBmp ) { const static Color aTranspCol(COL_TRANSPARENT); - SetFillColor(rColor == aTranspCol ? Application::GetSettings().GetStyleSettings().GetFieldColor() : rColor.GetRGBColor()); + aColor = rColor == aTranspCol ? Application::GetSettings().GetStyleSettings().GetFieldColor() : rColor.GetRGBColor(); Invalidate(aDrawRect); } } diff --git a/dbaccess/source/ui/inc/RTableConnectionData.hxx b/dbaccess/source/ui/inc/RTableConnectionData.hxx index 61299f336cdf..6995275ee8ff 100644 --- a/dbaccess/source/ui/inc/RTableConnectionData.hxx +++ b/dbaccess/source/ui/inc/RTableConnectionData.hxx @@ -46,8 +46,6 @@ namespace dbaui bool IsSourcePrimKey() const { return checkPrimaryKey(getReferencingTable()->getTable(),JTCS_FROM); } bool IsDestPrimKey() const { return checkPrimaryKey(getReferencedTable()->getTable(),JTCS_TO); } - static OConnectionLineDataRef CreateLineDataObj(); - ORelationTableConnectionData& operator=( const ORelationTableConnectionData& rConnData ); public: ORelationTableConnectionData(); diff --git a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx index 53c47487d128..80c2faef464f 100644 --- a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx +++ b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx @@ -181,11 +181,6 @@ void ORelationTableConnectionData::IsConnectionPossible() ChangeOrientation(); } -OConnectionLineDataRef ORelationTableConnectionData::CreateLineDataObj() -{ - return new OConnectionLineData(); -} - void ORelationTableConnectionData::CopyFrom(const OTableConnectionData& rSource) { // retract to the (non-virtual) operator= like in the base class @@ -385,7 +380,7 @@ bool ORelationTableConnectionData::Update() xColumns->getByName(*pIter) >>= xColumn; if ( xColumn.is() ) { - OConnectionLineDataRef pNewData = CreateLineDataObj(); + OConnectionLineDataRef pNewData = new OConnectionLineData(); xColumn->getPropertyValue(PROPERTY_NAME) >>= sName; xColumn->getPropertyValue(PROPERTY_RELATEDCOLUMN) >>= sRelatedColumn; diff --git a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx index 75de37a701c6..6fca733a9e40 100644 --- a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx +++ b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx @@ -331,7 +331,6 @@ namespace drawinglayer const basegfx::B2DHomMatrix& rTransform); /// data read access - const Graphic& getGraphic() const { return maGraphic; } const basegfx::B2DHomMatrix& getTransform() const { return maTransform; } /// compare operator @@ -406,7 +405,7 @@ namespace drawinglayer // use operator== of Graphic - if that is equal, the basic definition is equal return (nullptr != pCompare && getTransform() == pCompare->getTransform() - && getGraphic() == pCompare->getGraphic()); + && maGraphic == pCompare->maGraphic); } void AnimatedGraphicPrimitive2D::get2DDecomposition(Primitive2DDecompositionVisitor& rVisitor, const geometry::ViewInformation2D& rViewInformation) const diff --git a/forms/source/component/clickableimage.cxx b/forms/source/component/clickableimage.cxx index f3803d275bb7..4fc7087cd25d 100644 --- a/forms/source/component/clickableimage.cxx +++ b/forms/source/component/clickableimage.cxx @@ -791,16 +791,10 @@ namespace frm } - void OClickableImageBaseModel::DownloadDone() - { - DataAvailable(); - } - - IMPL_LINK_NOARG( OClickableImageBaseModel, DownloadDoneLink, void*, void ) { ::osl::MutexGuard aGuard( m_aMutex ); - DownloadDone(); + DataAvailable(); } diff --git a/forms/source/component/clickableimage.hxx b/forms/source/component/clickableimage.hxx index 01ec960600c4..30342d060601 100644 --- a/forms/source/component/clickableimage.hxx +++ b/forms/source/component/clickableimage.hxx @@ -82,7 +82,6 @@ namespace frm void StartProduction(); void SetURL(const OUString& rURL); void DataAvailable(); - void DownloadDone(); css::uno::Sequence< css::uno::Type> _getTypes() override; bool isDispatchUrlInternal() const { return m_bDispatchUrlInternal; } diff --git a/lingucomponent/source/languageguessing/guesslang.cxx b/lingucomponent/source/languageguessing/guesslang.cxx index a5695bb8dd69..254abc882e8e 100644 --- a/lingucomponent/source/languageguessing/guesslang.cxx +++ b/lingucomponent/source/languageguessing/guesslang.cxx @@ -94,7 +94,6 @@ public: virtual OUString SAL_CALL getImplementationName( ) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; - static Sequence< OUString > getSupportedServiceNames_Static( ); // XLanguageGuessing implementation virtual css::lang::Locale SAL_CALL guessPrimaryLanguage( const OUString& aText, ::sal_Int32 nStartPos, ::sal_Int32 nLen ) override; @@ -319,11 +318,6 @@ sal_Bool SAL_CALL LangGuess_Impl::supportsService( const OUString& ServiceName ) } Sequence<OUString> SAL_CALL LangGuess_Impl::getSupportedServiceNames( ) -{ - return getSupportedServiceNames_Static(); -} - -Sequence<OUString> LangGuess_Impl::getSupportedServiceNames_Static( ) { return { SERVICENAME }; } diff --git a/lingucomponent/source/numbertext/numbertext.cxx b/lingucomponent/source/numbertext/numbertext.cxx index 7ea2db473b04..8c388e6adb92 100644 --- a/lingucomponent/source/numbertext/numbertext.cxx +++ b/lingucomponent/source/numbertext/numbertext.cxx @@ -87,7 +87,6 @@ public: virtual OUString SAL_CALL getImplementationName() override; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; virtual Sequence<OUString> SAL_CALL getSupportedServiceNames() override; - static Sequence<OUString> getSupportedServiceNames_Static(); // XNumberText implementation virtual OUString SAL_CALL getNumberText(const OUString& aText, @@ -168,12 +167,7 @@ sal_Bool SAL_CALL NumberText_Impl::supportsService(const OUString& ServiceName) return cppu::supportsService(this, ServiceName); } -Sequence<OUString> SAL_CALL NumberText_Impl::getSupportedServiceNames() -{ - return getSupportedServiceNames_Static(); -} - -Sequence<OUString> NumberText_Impl::getSupportedServiceNames_Static() { return { SERVICENAME }; } +Sequence<OUString> SAL_CALL NumberText_Impl::getSupportedServiceNames() { return { SERVICENAME }; } /** * Function to create a new component instance; is needed by factory helper implementation. diff --git a/linguistic/source/convdicxml.cxx b/linguistic/source/convdicxml.cxx index c66ed32a9264..07ce5258e3ad 100644 --- a/linguistic/source/convdicxml.cxx +++ b/linguistic/source/convdicxml.cxx @@ -149,9 +149,6 @@ public: // SvXMLImportContext virtual void SAL_CALL endFastElement( sal_Int32 nElement ) override; virtual void SAL_CALL characters( const OUString &rChars ) override; - - const OUString & GetRightText() const { return aRightText; } - const OUString & GetLeftText() const { return rEntryContext.GetLeftText(); } }; } @@ -260,7 +257,7 @@ void ConvDicXMLRightTextContext_Impl::endFastElement( sal_Int32 /*nElement*/ ) { ConvDic *pDic = GetConvDicImport().GetDic(); if (pDic) - pDic->AddEntry( GetLeftText(), GetRightText() ); + pDic->AddEntry( rEntryContext.GetLeftText(), aRightText ); } diff --git a/oox/source/drawingml/diagram/datamodel.cxx b/oox/source/drawingml/diagram/datamodel.cxx index fcad85bd3d6a..afffab1685af 100644 --- a/oox/source/drawingml/diagram/datamodel.cxx +++ b/oox/source/drawingml/diagram/datamodel.cxx @@ -446,7 +446,7 @@ void DiagramData::build() << ";" << std::endl; #endif - const bool bInserted1 = getConnectionNameMap().insert( + const bool bInserted1 = maConnectionNameMap.insert( std::make_pair(connection.msModelId,&connection)).second; SAL_WARN_IF(!bInserted1, "oox.drawingml", "DiagramData::build(): non-unique connection model id"); diff --git a/oox/source/drawingml/diagram/datamodel.hxx b/oox/source/drawingml/diagram/datamodel.hxx index 7f7f0f4910c5..afaabd961adb 100644 --- a/oox/source/drawingml/diagram/datamodel.hxx +++ b/oox/source/drawingml/diagram/datamodel.hxx @@ -168,8 +168,6 @@ public: { return maConnections; } dgm::Points & getPoints() { return maPoints; } - ConnectionNameMap & getConnectionNameMap() - { return maConnectionNameMap; } StringMap & getPresOfNameMap() { return maPresOfNameMap; } PointNameMap & getPointNameMap() diff --git a/sw/source/filter/html/htmlftn.cxx b/sw/source/filter/html/htmlftn.cxx index 4e58dc4a3e27..79c61648ab98 100644 --- a/sw/source/filter/html/htmlftn.cxx +++ b/sw/source/filter/html/htmlftn.cxx @@ -212,11 +212,6 @@ void SwHTMLParser::InsertFootEndNoteText() m_pFootEndNoteImpl->sContent += aToken; } -void SwHTMLParser::DeleteFootEndNoteImpl() -{ - m_pFootEndNoteImpl.reset(); -} - SwNodeIndex *SwHTMLParser::GetFootEndNoteSection( const OUString& rName ) { SwNodeIndex *pStartNodeIdx = nullptr; diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx index 56c3457b7fb2..75aaadd620a8 100644 --- a/sw/source/filter/html/htmltab.cxx +++ b/sw/source/filter/html/htmltab.cxx @@ -608,8 +608,6 @@ public: void MakeParentContents(); - bool GetIsParentHeader() const { return m_bIsParentHead; } - bool HasToFly() const { return m_bHasToFly; } void SetTable( const SwStartNode *pStNd, std::unique_ptr<HTMLTableContext> pCntxt, @@ -2508,7 +2506,7 @@ void HTMLTable::MakeParentContents() if( !GetContext() && !HasParentSection() ) { SetParentContents( - m_pParser->InsertTableContents( GetIsParentHeader() ) ); + m_pParser->InsertTableContents( m_bIsParentHead ) ); SetHasParentSection( true ); } diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index 7cc45bbe1a04..b2e0f520b961 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -486,7 +486,7 @@ SwHTMLParser::~SwHTMLParser() m_pCSS1Parser.reset(); m_pNumRuleInfo.reset(); DeleteFormImpl(); - DeleteFootEndNoteImpl(); + m_pFootEndNoteImpl.reset(); OSL_ENSURE(!m_xTable.get(), "It exists still an open table"); m_pImageMaps.reset(); diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx index 5aab2fe5d43e..dc31880f3ec0 100644 --- a/sw/source/filter/html/swhtml.hxx +++ b/sw/source/filter/html/swhtml.hxx @@ -840,7 +840,6 @@ private: void FinishFootEndNote(); void InsertFootEndNoteText(); SwNodeIndex *GetFootEndNoteSection( const OUString& rName ); - void DeleteFootEndNoteImpl(); sal_Int32 StripTrailingLF(); diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx index 44bf1870f2c1..248f3c238148 100644 --- a/sw/source/filter/ww8/wrtww8.hxx +++ b/sw/source/filter/ww8/wrtww8.hxx @@ -1048,7 +1048,6 @@ public: bool MiserableFormFieldExportHack(const SwFrameFormat& rFrameFormat); - SvxMSExportOLEObjects& GetOLEExp() { return *m_pOLEExp; } SwMSConvertControls& GetOCXExp() { return *m_pOCXExp; } void ExportDopTypography(WW8DopTypography &rTypo); diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx index bb0ff68e4d96..0751ce007087 100644 --- a/sw/source/filter/ww8/wrtww8gr.cxx +++ b/sw/source/filter/ww8/wrtww8gr.cxx @@ -250,7 +250,7 @@ void WW8Export::OutputOLENode( const SwOLENode& rOLENode ) { sal_Int64 nAspect = rOLENode.GetAspect(); svt::EmbeddedObjectRef aObjRef( xObj, nAspect ); - GetOLEExp().ExportOLEObject( aObjRef, *xOleStg ); + m_pOLEExp->ExportOLEObject( aObjRef, *xOleStg ); if ( nAspect == embed::Aspects::MSOLE_ICON ) { OUString aObjInfo( "\3ObjInfo" ); diff --git a/sw/source/ui/index/multmrk.cxx b/sw/source/ui/index/multmrk.cxx index 7cc876e1f004..64e2b5c9f451 100644 --- a/sw/source/ui/index/multmrk.cxx +++ b/sw/source/ui/index/multmrk.cxx @@ -52,9 +52,12 @@ IMPL_LINK( SwMultiTOXMarkDlg, SelectHdl, weld::TreeView&, rBox, void ) } } -void SwMultiTOXMarkDlg::Apply() +short SwMultiTOXMarkDlg::run() { - m_rMgr.SetCurTOXMark(m_nPos); + short nRet = GenericDialogController::run(); + if (nRet == RET_OK) + m_rMgr.SetCurTOXMark(m_nPos); + return nRet; } SwMultiTOXMarkDlg::~SwMultiTOXMarkDlg() diff --git a/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx b/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx index e20fbc4f2a4e..afbd7b16c438 100644 --- a/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx +++ b/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx @@ -154,8 +154,6 @@ class SidebarTextControlAccessibleContext : public VCLXAccessibleComponent std::unique_ptr<::accessibility::AccessibleTextHelper> mpAccessibleTextHelper; ::osl::Mutex maMutex; - - void defunc(); }; } @@ -168,11 +166,6 @@ SidebarTextControlAccessibleContext::SidebarTextControlAccessibleContext( Sideba mpAccessibleTextHelper->SetEventSource( rSidebarTextControl.GetWindowPeer() ); } -void SidebarTextControlAccessibleContext::defunc() -{ - mpAccessibleTextHelper.reset(); -} - sal_Int32 SAL_CALL SidebarTextControlAccessibleContext::getAccessibleChildCount() { osl::MutexGuard aGuard( maMutex ); @@ -231,7 +224,7 @@ void SidebarTextControlAccessibleContext::ProcessWindowEvent( const VclWindowEve { case VclEventId::ObjectDying: { - defunc(); + mpAccessibleTextHelper.reset(); } break; case VclEventId::WindowGetFocus: diff --git a/sw/source/uibase/inc/multmrk.hxx b/sw/source/uibase/inc/multmrk.hxx index 0549d09b9ecf..6edca05cebc2 100644 --- a/sw/source/uibase/inc/multmrk.hxx +++ b/sw/source/uibase/inc/multmrk.hxx @@ -34,17 +34,10 @@ class SwMultiTOXMarkDlg : public weld::GenericDialogController std::unique_ptr<weld::Label> m_xTextFT; std::unique_ptr<weld::TreeView> m_xTOXLB; - void Apply(); public: SwMultiTOXMarkDlg(weld::Window* pParent, SwTOXMgr &rTOXMgr); virtual ~SwMultiTOXMarkDlg() override; - virtual short run() override - { - short nRet = GenericDialogController::run(); - if (nRet == RET_OK) - Apply(); - return nRet; - } + virtual short run() override; }; #endif // INCLUDED_SW_SOURCE_UIBASE_INC_MULTMRK_HXX diff --git a/sw/source/uibase/inc/unotools.hxx b/sw/source/uibase/inc/unotools.hxx index 830e39085a52..76a371740916 100644 --- a/sw/source/uibase/inc/unotools.hxx +++ b/sw/source/uibase/inc/unotools.hxx @@ -69,7 +69,6 @@ public: virtual ~SwOneExampleFrame() override; css::uno::Reference< css::frame::XModel > & GetModel() {return m_xModel;} - css::uno::Reference< css::frame::XController > & GetController() {return m_xController;} css::uno::Reference< css::text::XTextCursor > & GetTextCursor() {return m_xCursor;} void ClearDocument(); diff --git a/sw/source/uibase/utlui/unotools.cxx b/sw/source/uibase/utlui/unotools.cxx index 24c7069b95c3..f6ad9b7ce0c9 100644 --- a/sw/source/uibase/utlui/unotools.cxx +++ b/sw/source/uibase/utlui/unotools.cxx @@ -134,7 +134,7 @@ bool SwOneExampleFrame::Command(const CommandEvent& rCEvt) case CommandEventId::ContextMenu: { //#125881# quickly clicking crashes because the control is not fully initialized - if (GetController().is()) + if (m_xController.is()) return CreatePopup(rCEvt.GetMousePosPixel()); } break; diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx index 2d3e0cfc592e..833af4daf9f3 100644 --- a/ucb/source/cacher/cachedcontentresultset.cxx +++ b/ucb/source/cacher/cachedcontentresultset.cxx @@ -135,7 +135,7 @@ void CachedContentResultSet::CCRS_Cache ::clear() { m_pResult.reset(); - clearMappedReminder(); + m_pMappedReminder.reset(); } void CachedContentResultSet::CCRS_Cache @@ -242,12 +242,6 @@ bool CachedContentResultSet::CCRS_Cache return false; } -void CachedContentResultSet::CCRS_Cache - ::clearMappedReminder() -{ - m_pMappedReminder.reset(); -} - Sequence< sal_Bool >* CachedContentResultSet::CCRS_Cache ::getMappedReminder() { diff --git a/ucb/source/cacher/cachedcontentresultset.hxx b/ucb/source/cacher/cachedcontentresultset.hxx index e2e6ec2c4d26..d21b74d5fb61 100644 --- a/ucb/source/cacher/cachedcontentresultset.hxx +++ b/ucb/source/cacher/cachedcontentresultset.hxx @@ -72,7 +72,6 @@ class CachedContentResultSet void remindMapped( sal_Int32 nRow ); bool isRowMapped( sal_Int32 nRow ); - void clearMappedReminder(); css::uno::Sequence< sal_Bool >* getMappedReminder(); public: diff --git a/vcl/inc/wizdlg.hxx b/vcl/inc/wizdlg.hxx index 5b25eab29671..eeb17934d617 100644 --- a/vcl/inc/wizdlg.hxx +++ b/vcl/inc/wizdlg.hxx @@ -92,12 +92,6 @@ namespace vcl only to be used during construction, before any layouting happened */ void SetLeftAlignedButtonCount( sal_Int16 _nCount ); - /** declares the view area to have an empty margin - - Normally, the view area has a certain margin to the top/left/bottom/right of the - dialog. By calling this method, you can reduce this margin to 0. - */ - void SetEmptyViewMargin(); void CalcAndSetSize(); @@ -138,12 +132,6 @@ namespace vcl void AddButton( Button* pButton, long nOffset = 0 ); void RemoveButton( Button* pButton ); - void SetPrevButton( PushButton* pButton ) { mpPrevBtn = pButton; } - void SetNextButton( PushButton* pButton ) { mpNextBtn = pButton; } - - void SetViewWindow( vcl::Window* pWindow ) { mpViewWindow = pWindow; } - void SetViewAlign( WindowAlign eAlign ) { meViewAlign = eAlign; } - void SetPageSizePixel( const Size& rSize ) { maPageSize = rSize; } const Size& GetPageSizePixel() const { return maPageSize; } @@ -192,11 +180,6 @@ namespace vcl */ WizardTypes::WizardState determineNextState(WizardTypes::WizardState nCurrentState) const; - /** called when the finish button is pressed - <p>By default, only the base class' Finish method (which is not virtual) is called</p> - */ - bool onFinish(); - /// travel to the next state bool travelNext(); diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index 8237dbae57e3..920e8e7765e9 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -6264,11 +6264,6 @@ public: { } - VclBuilder& get_builder() const - { - return *m_xBuilder; - } - virtual std::unique_ptr<weld::MessageDialog> weld_message_dialog(const OString &id, bool bTakeOwnership) override { MessageDialog* pMessageDialog = m_xBuilder->get<MessageDialog>(id); @@ -6585,7 +6580,7 @@ public: OString get_current_page_help_id() const { - TabControl *pCtrl = get_builder().get<TabControl>("tabcontrol"); + TabControl *pCtrl = m_xBuilder->get<TabControl>("tabcontrol"); TabPage* pTabPage = pCtrl ? pCtrl->GetTabPage(pCtrl->GetCurPageId()) : nullptr; vcl::Window *pTabChild = pTabPage ? pTabPage->GetWindow(GetWindowType::FirstChild) : nullptr; pTabChild = pTabChild ? pTabChild->GetWindow(GetWindowType::FirstChild) : nullptr; diff --git a/vcl/source/control/imivctl.hxx b/vcl/source/control/imivctl.hxx index ce53dcc6a2f1..be3a6ea287c2 100644 --- a/vcl/source/control/imivctl.hxx +++ b/vcl/source/control/imivctl.hxx @@ -206,7 +206,6 @@ class SvxIconChoiceCtrl_Impl ); void ClearSelectedRectList(); - void ClearColumnList(); tools::Rectangle CalcMaxTextRect( const SvxIconChoiceCtrlEntry* pEntry ) const; void ClipAtVirtOutRect( tools::Rectangle& rRect ) const; diff --git a/vcl/source/control/imivctl1.cxx b/vcl/source/control/imivctl1.cxx index 353a92902aba..e268d15cf633 100644 --- a/vcl/source/control/imivctl1.cxx +++ b/vcl/source/control/imivctl1.cxx @@ -112,7 +112,7 @@ SvxIconChoiceCtrl_Impl::~SvxIconChoiceCtrl_Impl() pGridMap.reset(); pDDBufDev.disposeAndClear(); ClearSelectedRectList(); - ClearColumnList(); + m_pColumns.reset(); aVerSBar.disposeAndClear(); aHorSBar.disposeAndClear(); aScrBarBox.disposeAndClear(); @@ -2867,11 +2867,6 @@ bool SvxIconChoiceCtrl_Impl::RequestHelp( const HelpEvent& rHEvt ) return true; } -void SvxIconChoiceCtrl_Impl::ClearColumnList() -{ - m_pColumns.reset(); -} - void SvxIconChoiceCtrl_Impl::SetColumn( sal_uInt16 nIndex, const SvxIconChoiceCtrlColumnInfo& rInfo) { if (!m_pColumns) diff --git a/vcl/source/control/roadmapwizard.cxx b/vcl/source/control/roadmapwizard.cxx index 160724c78ab3..a6c718039b22 100644 --- a/vcl/source/control/roadmapwizard.cxx +++ b/vcl/source/control/roadmapwizard.cxx @@ -147,7 +147,7 @@ namespace vcl void RoadmapWizard::impl_construct() { SetLeftAlignedButtonCount( 1 ); - SetEmptyViewMargin(); + mbEmptyViewMargin = true; m_xRoadmapImpl->pRoadmap.disposeAndReset( VclPtr<ORoadmap>::Create( this, WB_TABSTOP ) ); m_xRoadmapImpl->pRoadmap->SetText( VclResId( STR_WIZDLG_ROADMAP_TITLE ) ); @@ -158,8 +158,8 @@ namespace vcl aRoadmapSize.setHeight( GetSizePixel().Height() ); m_xRoadmapImpl->pRoadmap->SetSizePixel( aRoadmapSize ); - SetViewWindow( m_xRoadmapImpl->pRoadmap ); - SetViewAlign( WindowAlign::Left ); + mpViewWindow = m_xRoadmapImpl->pRoadmap; + meViewAlign = WindowAlign::Left; m_xRoadmapImpl->pRoadmap->Show(); } diff --git a/vcl/source/control/wizardmachine.cxx b/vcl/source/control/wizardmachine.cxx index 2fced940867e..a92c4c4b68cb 100644 --- a/vcl/source/control/wizardmachine.cxx +++ b/vcl/source/control/wizardmachine.cxx @@ -97,11 +97,6 @@ namespace vcl mnLeftAlignCount = _nCount; } - void RoadmapWizard::SetEmptyViewMargin() - { - mbEmptyViewMargin = true; - } - void RoadmapWizard::ImplCalcSize( Size& rSize ) { // calculate ButtonBar height and width @@ -391,7 +386,7 @@ namespace vcl AddButton( m_pPrevPage, ( WIZARDDIALOG_BUTTON_SMALLSTDOFFSET_X) ); // half x-offset to the next button else AddButton( m_pPrevPage, WIZARDDIALOG_BUTTON_STDOFFSET_X ); - SetPrevButton( m_pPrevPage ); + mpPrevBtn = m_pPrevPage; m_pPrevPage->SetClickHdl( LINK( this, RoadmapWizard, OnPrevPage ) ); } @@ -406,7 +401,7 @@ namespace vcl m_pNextPage->set_id("next"); AddButton( m_pNextPage, WIZARDDIALOG_BUTTON_STDOFFSET_X ); - SetNextButton( m_pNextPage ); + mpNextBtn = m_pNextPage; m_pNextPage->SetClickHdl( LINK( this, RoadmapWizard, OnNextPage ) ); } @@ -730,11 +725,6 @@ namespace vcl m_pCancel->Enable(_bEnable); } - bool RoadmapWizard::onFinish() - { - return Finish( RET_OK ); - } - IMPL_LINK_NOARG(RoadmapWizard, OnFinish, Button*, void) { if ( isTravelingSuspended() ) @@ -744,7 +734,7 @@ namespace vcl { return; } - onFinish(); + Finish( RET_OK ); } bool RoadmapWizard::prepareLeaveCurrentState( WizardTypes::CommitPageReason _eReason ) diff --git a/vcl/source/filter/png/pngread.cxx b/vcl/source/filter/png/pngread.cxx index aa452bf51a01..1e89657cb807 100644 --- a/vcl/source/filter/png/pngread.cxx +++ b/vcl/source/filter/png/pngread.cxx @@ -147,7 +147,6 @@ private: mpScanlineAlpha; bool ReadNextChunk(); - void ReadRemainingChunks(); void ImplSetPixel( sal_uInt32 y, sal_uInt32 x, const BitmapColor & ); void ImplSetPixel( sal_uInt32 y, sal_uInt32 x, sal_uInt8 nPalIndex ); @@ -318,15 +317,10 @@ bool PNGReaderImpl::ReadNextChunk() return mnChunkType != PNGCHUNK_IEND; } -// read the remaining chunks from mrPNGStream -void PNGReaderImpl::ReadRemainingChunks() -{ - while( ReadNextChunk() ) ; -} - const std::vector< vcl::PNGReader::ChunkData >& PNGReaderImpl::GetAllChunks() { - ReadRemainingChunks(); + // read the remaining chunks from mrPNGStream + while( ReadNextChunk() ) ; return maChunkSeq; } diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx index 2db45ab57701..2698b22b54bc 100644 --- a/vcl/source/fontsubset/cff.cxx +++ b/vcl/source/fontsubset/cff.cxx @@ -328,10 +328,6 @@ public: // TODO: is public really needed? void addHints( bool bVerticalHints); // accessing other charstring specifics - bool hasCharWidth() const { return (maCharWidth > 0);} - ValType getCharWidth() const { return maCharWidth;} - void setNominalWidth( ValType aWidth) { mpCffLocal->maNominalWidth = aWidth;} - void setDefaultWidth( ValType aWidth) { mpCffLocal->maDefaultWidth = aWidth;} void updateWidth( bool bUseFirstVal); private: @@ -382,7 +378,7 @@ inline int CffSubsetterContext::popInt() inline void CffSubsetterContext::updateWidth( bool bUseFirstVal) { // the first value is not a hint but the charwidth - if( hasCharWidth()) + if( maCharWidth>0 ) return; if( bUseFirstVal) { @@ -463,8 +459,8 @@ void CffSubsetterContext::readDictOp() case 16: break; // "nEncoding" case 17: mnCharStrBase = nInt; break; // "nCharStrings" case 19: mpCffLocal->mnLocalSubrOffs = nInt; break;// "nSubrs" - case 20: setDefaultWidth( nVal ); break; // "defaultWidthX" - case 21: setNominalWidth( nVal ); break; // "nominalWidthX" + case 20: mpCffLocal->maDefaultWidth = nVal; break; // "defaultWidthX" + case 21: mpCffLocal->maNominalWidth = nVal; break; // "nominalWidthX" case 909: mpCffLocal->mfBlueScale = nVal; break; // "BlueScale" case 910: mpCffLocal->mfBlueShift = nVal; break; // "BlueShift" case 911: mpCffLocal->mfBlueFuzz = nVal; break; // "BlueFuzz" @@ -1986,7 +1982,7 @@ void CffSubsetterContext::emitAsType1( Type1Emitter& rEmitter, rEmitter.emitAllCrypted(); // provide individual glyphwidths if requested if( pGlyphWidths ) { - ValType aCharWidth = getCharWidth(); + ValType aCharWidth = maCharWidth; if( maFontMatrix.size() >= 4) aCharWidth *= 1000.0F * maFontMatrix[0]; pGlyphWidths[i] = static_cast<sal_Int32>(aCharWidth); diff --git a/vcl/unx/generic/gdi/cairo_xlib_cairo.cxx b/vcl/unx/generic/gdi/cairo_xlib_cairo.cxx index 760a8d595903..3a825052189a 100644 --- a/vcl/unx/generic/gdi/cairo_xlib_cairo.cxx +++ b/vcl/unx/generic/gdi/cairo_xlib_cairo.cxx @@ -250,7 +250,7 @@ namespace cairo aSystemGraphicsData.nSize = sizeof(SystemGraphicsData); aSystemGraphicsData.hDrawable = mpPixmap ? mpPixmap->mhDrawable : maSysData.hDrawable; - aSystemGraphicsData.pXRenderFormat = getRenderFormat(); + aSystemGraphicsData.pXRenderFormat = maSysData.pRenderFormat; int width = cairo_xlib_surface_get_width(mpSurface.get()); int height = cairo_xlib_surface_get_height(mpSurface.get()); diff --git a/vcl/unx/generic/gdi/cairo_xlib_cairo.hxx b/vcl/unx/generic/gdi/cairo_xlib_cairo.hxx index 60300ba634ce..0f280e6b764e 100644 --- a/vcl/unx/generic/gdi/cairo_xlib_cairo.hxx +++ b/vcl/unx/generic/gdi/cairo_xlib_cairo.hxx @@ -90,7 +90,6 @@ namespace cairo { int getDepth() const; DeviceFormat getFormat() const; const X11PixmapSharedPtr& getPixmap() const { return mpPixmap; } - void* getRenderFormat() const { return maSysData.pRenderFormat; } }; } diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx index ef26bd6f288d..e288a1e803a3 100644 --- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx @@ -404,11 +404,6 @@ sal_uInt32 DomainMapperTableManager::getCurrentGridAfter( ) return m_aGridAfter.back( ); } -bool DomainMapperTableManager::hasCurrentSpans() const -{ - return !m_aGridSpans.empty(); -} - DomainMapperTableManager::IntVectorPtr const & DomainMapperTableManager::getCurrentSpans( ) { return m_aGridSpans.back( ); @@ -526,9 +521,9 @@ void DomainMapperTableManager::endOfCellAction() TagLogger::getInstance().element("endOFCellAction"); #endif - if (!hasCurrentSpans()) + if (m_aGridSpans.empty()) throw std::out_of_range("empty spans"); - getCurrentSpans()->push_back(m_nGridSpan); + m_aGridSpans.back()->push_back(m_nGridSpan); m_nGridSpan = 1; ++m_nCell.back( ); } diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.hxx b/writerfilter/source/dmapper/DomainMapperTableManager.hxx index a0b386657feb..6f248d1d0192 100644 --- a/writerfilter/source/dmapper/DomainMapperTableManager.hxx +++ b/writerfilter/source/dmapper/DomainMapperTableManager.hxx @@ -90,7 +90,6 @@ public: virtual void endOfRowAction() override; IntVectorPtr const & getCurrentGrid( ); - bool hasCurrentSpans() const; IntVectorPtr const & getCurrentSpans( ); IntVectorPtr const & getCurrentCellWidths( ); sal_uInt32 getCurrentGridBefore( ); diff --git a/writerperfect/source/writer/exp/xmlimp.cxx b/writerperfect/source/writer/exp/xmlimp.cxx index 2f95f2dde4bc..09692ccc9308 100644 --- a/writerperfect/source/writer/exp/xmlimp.cxx +++ b/writerperfect/source/writer/exp/xmlimp.cxx @@ -610,7 +610,7 @@ void XMLImport::HandlePageSpan(const librevenge::RVNGPropertyList& rPropertyList GetGenerator().closePageSpan(); GetGenerator().openPageSpan(rPageLayout); - SetIsInPageSpan(true); + mbIsInPageSpan = true; } } diff --git a/writerperfect/source/writer/exp/xmlimp.hxx b/writerperfect/source/writer/exp/xmlimp.hxx index 2797168f4609..59219ecd25ea 100644 --- a/writerperfect/source/writer/exp/xmlimp.hxx +++ b/writerperfect/source/writer/exp/xmlimp.hxx @@ -135,7 +135,6 @@ public: const css::uno::Reference<css::uno::XComponentContext>& GetComponentContext() const; bool GetIsInPageSpan() const { return mbIsInPageSpan; } - void SetIsInPageSpan(bool bSet) { mbIsInPageSpan = bSet; } void HandlePageSpan(const librevenge::RVNGPropertyList& rPropertyList); // XDocumentHandler diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx index a25f51edaec7..25ec8022bf70 100644 --- a/xmloff/source/chart/SchXMLExport.cxx +++ b/xmloff/source/chart/SchXMLExport.cxx @@ -180,9 +180,6 @@ public: void AddAutoStyleAttribute( const std::vector< XMLPropertyState >& aStates ); - SvXMLAutoStylePoolP& GetAutoStylePoolP() - { return mrAutoStylePool; } - /// if bExportContent is false the auto-styles are collected void parseDocument( css::uno::Reference< css::chart::XChartDocument > const & rChartDoc, bool bExportContent, @@ -3460,7 +3457,7 @@ awt::Size SchXMLExportHelper_Impl::getPageSize( const Reference< chart2::XChartD void SchXMLExportHelper_Impl::CollectAutoStyle( const std::vector< XMLPropertyState >& aStates ) { if( !aStates.empty() ) - maAutoStyleNameQueue.push( GetAutoStylePoolP().Add( XML_STYLE_FAMILY_SCH_CHART_ID, aStates )); + maAutoStyleNameQueue.push( mrAutoStylePool.Add( XML_STYLE_FAMILY_SCH_CHART_ID, aStates )); } void SchXMLExportHelper_Impl::AddAutoStyleAttribute( const std::vector< XMLPropertyState >& aStates ) diff --git a/xmloff/source/xforms/XFormsModelContext.cxx b/xmloff/source/xforms/XFormsModelContext.cxx index beee7e080bd0..e846e54b5866 100644 --- a/xmloff/source/xforms/XFormsModelContext.cxx +++ b/xmloff/source/xforms/XFormsModelContext.cxx @@ -129,7 +129,7 @@ void XFormsModelContext::EndElement() xUpdate->update(); GetImport().initXForms(); - xforms_addXFormsModel( GetImport().GetModel(), getModel() ); + xforms_addXFormsModel( GetImport().GetModel(), mxModel ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/xforms/XFormsModelContext.hxx b/xmloff/source/xforms/XFormsModelContext.hxx index 2129ed53b0d4..d80b33088a7d 100644 --- a/xmloff/source/xforms/XFormsModelContext.hxx +++ b/xmloff/source/xforms/XFormsModelContext.hxx @@ -42,8 +42,6 @@ public: sal_uInt16 nPrfx, const OUString& rLName ); - const css::uno::Reference<css::xforms::XModel2>& getModel() const { return mxModel;} - // implement SvXMLImportContext & TokenContext methods: virtual void EndElement() override; commit b4641df5de7842d6a8fc2c4f839214bf01160c8c Author: Noel Grandin <noel.gran...@collabora.co.uk> AuthorDate: Thu Dec 12 10:45:44 2019 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Fri Dec 13 08:12:34 2019 +0100 loplugin:unusedmethods Change-Id: I8ad75d1251df4d6f8097aaa68e4ec92331e38ad4 Reviewed-on: https://gerrit.libreoffice.org/85077 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 9b83e3676a05..6f1bbdc9307e 100644 --- a/compilerplugins/clang/unusedmethods.results +++ b/compilerplugins/clang/unusedmethods.results @@ -132,26 +132,54 @@ desktop/source/lib/lokclipboard.hxx:96 LOKClipboardFactory::LOKClipboardFactory() drawinglayer/source/tools/emfpcustomlinecap.hxx:38 void emfplushelper::EMFPCustomLineCap::SetAttributes(struct com::sun::star::rendering::StrokeAttributes &) -drawinglayer/source/tools/emfpstringformat.hxx:51 +drawinglayer/source/tools/emfpstringformat.hxx:94 _Bool emfplushelper::EMFPStringFormat::NoFitBlackBox() const -drawinglayer/source/tools/emfpstringformat.hxx:52 +drawinglayer/source/tools/emfpstringformat.hxx:95 _Bool emfplushelper::EMFPStringFormat::DisplayFormatControl() const -drawinglayer/source/tools/emfpstringformat.hxx:53 +drawinglayer/source/tools/emfpstringformat.hxx:96 _Bool emfplushelper::EMFPStringFormat::NoFontFallback() const -drawinglayer/source/tools/emfpstringformat.hxx:54 +drawinglayer/source/tools/emfpstringformat.hxx:97 _Bool emfplushelper::EMFPStringFormat::MeasureTrailingSpaces() const -drawinglayer/source/tools/emfpstringformat.hxx:55 +drawinglayer/source/tools/emfpstringformat.hxx:98 _Bool emfplushelper::EMFPStringFormat::NoWrap() const -drawinglayer/source/tools/emfpstringformat.hxx:56 +drawinglayer/source/tools/emfpstringformat.hxx:99 _Bool emfplushelper::EMFPStringFormat::LineLimit() const -drawinglayer/source/tools/emfpstringformat.hxx:57 +drawinglayer/source/tools/emfpstringformat.hxx:100 _Bool emfplushelper::EMFPStringFormat::NoClip() const -drawinglayer/source/tools/emfpstringformat.hxx:58 +drawinglayer/source/tools/emfpstringformat.hxx:101 _Bool emfplushelper::EMFPStringFormat::BypassGDI() const editeng/inc/edtspell.hxx:108 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::begin() const editeng/inc/edtspell.hxx:109 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/propctrlr/browserline.hxx:98 + _Bool pcr::OBrowserLine::IsVisible() const +extensions/source/propctrlr/browserlistbox.hxx:119 + int pcr::OBrowserListBox::GetMinimumWidth() const +extensions/source/propctrlr/browserlistbox.hxx:120 + int pcr::OBrowserListBox::GetMinimumHeight() +extensions/source/propctrlr/browserlistbox.hxx:173 + long pcr::OBrowserListBox::impl_getPrefererredHelpHeight() +extensions/source/propctrlr/browserpage.hxx:44 + const class rtl::OUString & pcr::OBrowserPage::GetPageTitle() const +extensions/source/propctrlr/browserpage.hxx:47 + class rtl::OString pcr::OBrowserPage::GetHelpId() const +extensions/source/propctrlr/commoncontrol.hxx:89 + void pcr::CommonBehaviourControlHelper::activateNextControl() const +extensions/source/propctrlr/commoncontrol.hxx:97 + void pcr::CommonBehaviourControlHelper::LinkStubTextViewModifiedHdl(void *,class weld::TextView &) +extensions/source/propctrlr/commoncontrol.hxx:97 + void pcr::CommonBehaviourControlHelper::TextViewModifiedHdl(class weld::TextView &) +extensions/source/propctrlr/propertyeditor.hxx:107 + class weld::Container * pcr::OPropertyEditor::getControlHoldingParent() const +extensions/source/propctrlr/propertyeditor.hxx:122 + void pcr::OPropertyEditor::Update(const class std::function<void (class pcr::OBrowserListBox *)> &) +extensions/source/propctrlr/standardcontrol.hxx:49 + pcr::ListLikeControlWithModifyHandler::ListLikeControlWithModifyHandler<TListboxWindow>(class vcl::Window *,long) +extensions/source/propctrlr/standardcontrol.hxx:55 + void pcr::ListLikeControlWithModifyHandler::SetModifyHdl(const Link<type-parameter-?-? &, void> &) +extensions/source/propctrlr/standardcontrol.hxx:57 + void pcr::ListLikeControlWithModifyHandler::OnSelect(type-parameter-?-? &) extensions/source/scanner/scanner.hxx:86 void ScannerManager::SetData(void *) framework/inc/tabwin/tabwindow.hxx:64 @@ -162,6 +190,16 @@ hwpfilter/source/mzstring.h:101 class MzString & MzString::operator<<(long) hwpfilter/source/mzstring.h:102 class MzString & MzString::operator<<(short) +hwpfilter/source/mzstring.h:124 + int MzString::rfind(char,int) +hwpfilter/source/mzstring.h:129 + void MzString::append(const class MzString &) +hwpfilter/source/mzstring.h:130 + void MzString::append(const char *) +hwpfilter/source/mzstring.h:131 + void MzString::append(const char *,int) +hwpfilter/source/mzstring.h:140 + _Bool MzString::allocate(int) include/basegfx/color/bcolormodifier.hxx:76 _Bool basegfx::BColorModifier::operator!=(const class basegfx::BColorModifier &) const include/basegfx/curve/b2dcubicbezier.hxx:52 @@ -478,7 +516,7 @@ include/comphelper/servicedecl.hxx:324 comphelper::service_decl::inheritingClass_::inheritingClass_(const type-parameter-?-? &) include/comphelper/unique_disposing_ptr.hxx:46 type-parameter-?-? & comphelper::unique_disposing_ptr::operator*() const -include/comphelper/unwrapargs.hxx:50 +include/comphelper/unwrapargs.hxx:52 void comphelper::detail::unwrapArgs(const class com::sun::star::uno::Sequence<class com::sun::star::uno::Any> &,int,const class com::sun::star::uno::Reference<class com::sun::star::uno::XInterface> &) include/connectivity/dbcharset.hxx:138 const class dbtools::OCharsetMap::CharsetIterator & dbtools::OCharsetMap::CharsetIterator::operator--() @@ -490,6 +528,12 @@ include/connectivity/sdbcx/VGroup.hxx:64 connectivity::sdbcx::OGroup::OGroup(_Bool) include/connectivity/sdbcx/VGroup.hxx:65 connectivity::sdbcx::OGroup::OGroup(const class rtl::OUString &,_Bool) +include/connectivity/sqlerror.hxx:71 + connectivity::SQLError::ParamValue::ParamValue() +include/connectivity/sqlerror.hxx:72 + connectivity::SQLError::ParamValue::ParamValue(const class rtl::OUString &) +include/connectivity/sqlerror.hxx:75 + _Bool connectivity::SQLError::ParamValue::is() const include/connectivity/sqlparse.hxx:191 class rtl::OUString connectivity::OSQLParser::RuleIDToStr(unsigned int) include/drawinglayer/geometry/viewinformation2d.hxx:129 @@ -502,13 +546,13 @@ include/drawinglayer/texture/texture.hxx:44 _Bool drawinglayer::texture::GeoTexSvx::operator!=(const class drawinglayer::texture::GeoTexSvx &) const include/drawinglayer/tools/primitive2dxmldump.hxx:44 void drawinglayer::tools::Primitive2dXmlDump::dump(const class drawinglayer::primitive2d::Primitive2DContainer &,const class rtl::OUString &) -include/editeng/editeng.hxx:235 - _Bool EditEngine::GetDirectVertical() const include/editeng/editeng.hxx:237 + _Bool EditEngine::GetDirectVertical() const +include/editeng/editeng.hxx:239 enum TextRotation EditEngine::GetRotation() const -include/editeng/editeng.hxx:462 +include/editeng/editeng.hxx:464 _Bool EditEngine::(anonymous)::__invoke(const class SvxFieldData *) -include/editeng/hyphenzoneitem.hxx:63 +include/editeng/hyphenzoneitem.hxx:64 _Bool SvxHyphenZoneItem::IsPageEnd() const include/editeng/outliner.hxx:881 _Bool Outliner::(anonymous)::__invoke(const class SvxFieldData *) @@ -524,29 +568,39 @@ include/framework/addonsoptions.hxx:194 class rtl::OUString framework::AddonsOptions::GetAddonsNotebookBarResourceName(unsigned int) const include/framework/addonsoptions.hxx:219 _Bool framework::AddonsOptions::GetMergeNotebookBarInstructions(const class rtl::OUString &,class std::__debug::vector<struct framework::MergeNotebookBarInstruction, class std::allocator<struct framework::MergeNotebookBarInstruction> > &) const -include/i18nlangtag/languagetag.hxx:263 +include/i18nlangtag/languagetag.hxx:268 enum LanguageTag::ScriptType LanguageTag::getScriptType() const include/o3tl/any.hxx:155 - class o3tl::optional<const struct o3tl::detail::Void> o3tl::tryAccess(const class com::sun::star::uno::Any &) + class std::optional<const struct o3tl::detail::Void> o3tl::tryAccess(const class com::sun::star::uno::Any &) include/o3tl/cow_wrapper.hxx:323 type-parameter-?-? * o3tl::cow_wrapper::get() +include/o3tl/enumarray.hxx:76 + enumarray_const_iterator<enumarray<E, V> > o3tl::enumarray::begin() const +include/o3tl/enumarray.hxx:77 + enumarray_const_iterator<enumarray<E, V> > o3tl::enumarray::end() const include/o3tl/enumarray.hxx:105 typename type-parameter-?-?::value_type * o3tl::enumarray_iterator::operator->() const +include/o3tl/enumarray.hxx:127 + o3tl::enumarray_const_iterator::enumarray_const_iterator<EA>(const type-parameter-?-? &,unsigned long) include/o3tl/enumarray.hxx:130 const typename type-parameter-?-?::value_type * o3tl::enumarray_const_iterator::operator->() const +include/o3tl/enumarray.hxx:131 + enumarray_const_iterator<EA> & o3tl::enumarray_const_iterator::operator++() +include/o3tl/enumarray.hxx:132 + _Bool o3tl::enumarray_const_iterator::operator!=(const enumarray_const_iterator<EA> &) const include/o3tl/enumarray.hxx:133 _Bool o3tl::enumarray_const_iterator::operator==(const enumarray_const_iterator<EA> &) const include/o3tl/safeint.hxx:79 typename enable_if<std::is_unsigned<T>::value, type-parameter-?-?>::type o3tl::saturating_sub(type-parameter-?-?,type-parameter-?-?) include/o3tl/sorted_vector.hxx:206 _Bool o3tl::sorted_vector::operator!=(const sorted_vector<Value, Compare, Find, > &) const -include/o3tl/span.hxx:49 - o3tl::span::span(int const (&)[N]) -include/o3tl/span.hxx:49 - o3tl::span::span(unsigned short const (&)[N]) -include/o3tl/span.hxx:49 +include/o3tl/span.hxx:51 o3tl::span::span(int (&)[N]) include/o3tl/span.hxx:51 + o3tl::span::span(unsigned short const (&)[N]) +include/o3tl/span.hxx:51 + o3tl::span::span(int const (&)[N]) +include/o3tl/span.hxx:53 o3tl::span::span<T>(type-parameter-?-? *,unsigned long) include/o3tl/strong_int.hxx:86 o3tl::strong_int::strong_int(type-parameter-?-?,typename enable_if<std::is_integral<T>::value, int>::type) @@ -616,10 +670,18 @@ include/svl/itempool.hxx:207 void SfxItemPool::dumpAsXml(struct _xmlTextWriter *) const include/svl/lockfilecommon.hxx:58 void svt::LockFileCommon::SetURL(const class rtl::OUString &) +include/svl/rngitem.hxx:43 + unsigned short & SfxRangeItem::From() include/svtools/asynclink.hxx:44 void svtools::AsynchronLink::LinkStubHandleCall_Idle(void *,class Timer *) include/svtools/DocumentToGraphicRenderer.hxx:106 _Bool DocumentToGraphicRenderer::isImpress() const +include/svtools/fileurlbox.hxx:39 + svt::FileURLBox::FileURLBox(class vcl::Window *,long) +include/svtools/inettbc.hxx:74 + void SvtURLBox::SetPlaceHolder(const class rtl::OUString &) +include/svtools/inettbc.hxx:76 + const class rtl::OUString & SvtURLBox::GetPlaceHolder() const include/svx/autoformathelper.hxx:145 _Bool AutoFormatBase::operator==(const class AutoFormatBase &) include/svx/ClassificationDialog.hxx:77 @@ -644,18 +706,12 @@ include/svx/framelink.hxx:194 _Bool svx::frame::operator>(const class svx::frame::Style &,const class svx::frame::Style &) include/svx/langbox.hxx:94 void SvxLanguageBox::show() -include/svx/ParaSpacingControl.hxx:35 - class SfxToolBoxControl * svx::ParaULSpacingControl::CreateImpl(unsigned short,unsigned short,class ToolBox &) -include/svx/ParaSpacingControl.hxx:35 - void svx::ParaULSpacingControl::RegisterControl(unsigned short,class SfxModule *) -include/svx/ParaSpacingControl.hxx:67 - class SfxToolBoxControl * svx::ParaLRSpacingControl::CreateImpl(unsigned short,unsigned short,class ToolBox &) -include/svx/ParaSpacingControl.hxx:67 - void svx::ParaLRSpacingControl::RegisterControl(unsigned short,class SfxModule *) include/svx/svdlayer.hxx:74 _Bool SdrLayer::operator==(const class SdrLayer &) const -include/svx/svdpntv.hxx:462 +include/svx/svdpntv.hxx:455 _Bool SdrPaintView::IsSwapAsynchron() const +include/svx/sxfiitm.hxx:37 + void SdrFractionItem::SetValue(const class Fraction &) include/svx/txencbox.hxx:92 void SvxTextEncodingBox::grab_focus() include/svx/txencbox.hxx:146 @@ -710,11 +766,11 @@ include/tools/gen.hxx:255 class Pair & Range::toPair() include/tools/gen.hxx:322 class Pair & Selection::toPair() -include/tools/link.hxx:135 +include/tools/link.hxx:134 const char * Link::getSourceFilename() const -include/tools/link.hxx:136 +include/tools/link.hxx:135 int Link::getSourceLineNumber() const -include/tools/link.hxx:137 +include/tools/link.hxx:136 const char * Link::getTargetName() const include/tools/poly.hxx:160 _Bool tools::Polygon::operator!=(const class tools::Polygon &) const @@ -754,6 +810,8 @@ 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:36 + void BuilderPage::SetHelpId(const class rtl::OString &) include/vcl/ColorMask.hxx:113 void ColorMask::GetColorFor16BitMSB(class BitmapColor &,const unsigned char *) const include/vcl/ColorMask.hxx:114 @@ -776,6 +834,8 @@ include/vcl/customweld.hxx:74 void weld::CustomWidgetController::SetAccessibleName(const class rtl::OUString &) include/vcl/customweld.hxx:115 void weld::CustomWeld::queue_draw_area(int,int,int,int) +include/vcl/edit.hxx:238 + int Edit::GetCharPos(const class Point &) const include/vcl/errcode.hxx:86 _Bool ErrCode::operator<(const class ErrCode &) const include/vcl/errcode.hxx:87 @@ -784,8 +844,12 @@ include/vcl/errcode.hxx:88 _Bool ErrCode::operator>(const class ErrCode &) const include/vcl/errcode.hxx:89 _Bool ErrCode::operator>=(const class ErrCode &) const -include/vcl/field.hxx:217 +include/vcl/field.hxx:205 + const class rtl::OUString & MetricFormatter::GetCurUnitText() const +include/vcl/field.hxx:215 void MetricFormatter::SetBaseValue(long,enum FieldUnit) +include/vcl/field.hxx:227 + void MetricFormatter::SetCustomConvertHdl(const class Link<class MetricFormatter &, void> &) include/vcl/gdimtf.hxx:110 _Bool GDIMetaFile::operator!=(const class GDIMetaFile &) const include/vcl/gdimtf.hxx:202 @@ -796,10 +860,12 @@ include/vcl/hatch.hxx:55 _Bool Hatch::operator!=(const class Hatch &) const include/vcl/inputctx.hxx:62 _Bool InputContext::operator!=(const class InputContext &) const -include/vcl/ITiledRenderable.hxx:193 +include/vcl/ITiledRenderable.hxx:187 enum PointerStyle vcl::ITiledRenderable::getPointer() include/vcl/lok.hxx:24 void vcl::lok::unregisterPollCallbacks() +include/vcl/lstbox.hxx:173 + _Bool ListBox::IsEntrySelected(const class rtl::OUString &) const include/vcl/menu.hxx:460 unsigned short MenuBar::AddMenuBarButton(const class Image &,const class Link<struct MenuBar::MenuBarButtonCallbackArg &, _Bool> &,const class rtl::OUString &) include/vcl/menu.hxx:464 @@ -824,17 +890,17 @@ include/vcl/salnativewidgets.hxx:408 _Bool TabitemValue::isBothAligned() const include/vcl/salnativewidgets.hxx:409 _Bool TabitemValue::isNotAligned() const -include/vcl/settings.hxx:405 +include/vcl/settings.hxx:402 void StyleSettings::SetUseFlatBorders(_Bool) -include/vcl/settings.hxx:408 +include/vcl/settings.hxx:405 void StyleSettings::SetUseFlatMenus(_Bool) -include/vcl/settings.hxx:420 +include/vcl/settings.hxx:417 void StyleSettings::SetHideDisabledMenuItems(_Bool) -include/vcl/settings.hxx:485 +include/vcl/settings.hxx:482 void StyleSettings::SetSpinSize(long) -include/vcl/settings.hxx:640 +include/vcl/settings.hxx:637 _Bool HelpSettings::operator!=(const class HelpSettings &) const -include/vcl/settings.hxx:695 +include/vcl/settings.hxx:692 _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> > &) @@ -842,6 +908,10 @@ include/vcl/svapp.hxx:801 void Application::AppEvent(const class ApplicationEvent &) include/vcl/syswin.hxx:117 void SystemWindow::SetIdleDebugName(const char *) +include/vcl/tabctrl.hxx:118 + class Size TabControl::GetTabPageSizePixel() const +include/vcl/tabctrl.hxx:127 + void TabControl::Clear() include/vcl/TaskStopwatch.hxx:97 void TaskStopwatch::reset() include/vcl/TaskStopwatch.hxx:108 @@ -854,9 +924,9 @@ 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:359 void SvTreeListBox::RemoveSelection() -include/vcl/treelistbox.hxx:371 +include/vcl/treelistbox.hxx:376 const class SvTreeListEntry * SvTreeListBox::GetParent(const class SvTreeListEntry *) const include/vcl/txtattr.hxx:56 _Bool TextAttrib::operator!=(const class TextAttrib &) const @@ -868,95 +938,97 @@ include/vcl/uitest/uiobject.hxx:345 SpinUIObject::SpinUIObject(const class VclPtr<class SpinButton> &) include/vcl/uitest/uiobject.hxx:353 class std::unique_ptr<class UIObject, struct std::default_delete<class UIObject> > SpinUIObject::create(class vcl::Window *) -include/vcl/weld.hxx:132 +include/vcl/weld.hxx:133 _Bool weld::Widget::get_hexpand() const -include/vcl/weld.hxx:134 +include/vcl/weld.hxx:135 _Bool weld::Widget::get_vexpand() const -include/vcl/weld.hxx:141 +include/vcl/weld.hxx:142 void weld::Widget::set_margin_right(int) -include/vcl/weld.hxx:143 - int weld::Widget::get_margin_top() const include/vcl/weld.hxx:144 + int weld::Widget::get_margin_top() const +include/vcl/weld.hxx:145 int weld::Widget::get_margin_bottom() const -include/vcl/weld.hxx:146 +include/vcl/weld.hxx:147 int weld::Widget::get_margin_right() const -include/vcl/weld.hxx:296 +include/vcl/weld.hxx:306 void weld::ScrolledWindow::hadjustment_set_upper(int) -include/vcl/weld.hxx:298 +include/vcl/weld.hxx:308 void weld::ScrolledWindow::hadjustment_set_page_size(int) -include/vcl/weld.hxx:299 +include/vcl/weld.hxx:309 void weld::ScrolledWindow::hadjustment_set_page_increment(int) -include/vcl/weld.hxx:300 +include/vcl/weld.hxx:310 + void weld::ScrolledWindow::hadjustment_set_step_increment(int) +include/vcl/weld.hxx:311 void weld::ScrolledWindow::set_hpolicy(enum VclPolicyType) -include/vcl/weld.hxx:301 +include/vcl/weld.hxx:312 enum VclPolicyType weld::ScrolledWindow::get_hpolicy() const -include/vcl/weld.hxx:306 +include/vcl/weld.hxx:317 int weld::ScrolledWindow::get_hscroll_height() const -include/vcl/weld.hxx:426 +include/vcl/weld.hxx:442 struct SystemEnvData weld::Window::get_system_data() const -include/vcl/weld.hxx:521 +include/vcl/weld.hxx:537 class rtl::OString weld::Assistant::get_current_page_ident() const -include/vcl/weld.hxx:527 +include/vcl/weld.hxx:543 class rtl::OUString weld::Assistant::get_page_title(const class rtl::OString &) const -include/vcl/weld.hxx:748 +include/vcl/weld.hxx:776 void weld::TreeView::append(const class weld::TreeIter *,const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &) -include/vcl/weld.hxx:757 +include/vcl/weld.hxx:785 void weld::TreeView::append(const class rtl::OUString &,const class rtl::OUString &,class VirtualDevice &) -include/vcl/weld.hxx:941 +include/vcl/weld.hxx:977 void weld::TreeView::select_all() -include/vcl/weld.hxx:985 +include/vcl/weld.hxx:1022 const class rtl::OUString & weld::TreeView::get_saved_value() const -include/vcl/weld.hxx:1031 +include/vcl/weld.hxx:1068 class rtl::OUString weld::IconView::get_selected_id() const -include/vcl/weld.hxx:1046 +include/vcl/weld.hxx:1083 _Bool weld::IconView::get_cursor(class weld::TreeIter *) const -include/vcl/weld.hxx:1056 +include/vcl/weld.hxx:1093 void weld::IconView::select_all() -include/vcl/weld.hxx:1062 +include/vcl/weld.hxx:1099 void weld::IconView::save_value() -include/vcl/weld.hxx:1063 +include/vcl/weld.hxx:1100 const class rtl::OUString & weld::IconView::get_saved_value() const -include/vcl/weld.hxx:1064 +include/vcl/weld.hxx:1101 _Bool weld::IconView::get_value_changed_from_saved() const -include/vcl/weld.hxx:1161 +include/vcl/weld.hxx:1198 void weld::MenuButton::append_item(const class rtl::OUString &,const class rtl::OUString &) -include/vcl/weld.hxx:1173 +include/vcl/weld.hxx:1210 void weld::MenuButton::append_item(const class rtl::OUString &,const class rtl::OUString &,class VirtualDevice &) -include/vcl/weld.hxx:1178 +include/vcl/weld.hxx:1215 void weld::MenuButton::append_separator(const class rtl::OUString &) -include/vcl/weld.hxx:1242 +include/vcl/weld.hxx:1279 class rtl::OUString weld::ProgressBar::get_text() const -include/vcl/weld.hxx:1259 +include/vcl/weld.hxx:1296 void weld::Entry::signal_insert_text(class rtl::OUString &) -include/vcl/weld.hxx:1275 +include/vcl/weld.hxx:1312 int weld::Entry::get_position() const -include/vcl/weld.hxx:1384 +include/vcl/weld.hxx:1421 void weld::FormattedSpinButton::set_max(double) -include/vcl/weld.hxx:1434 +include/vcl/weld.hxx:1476 void weld::EntryTreeView::EntryModifyHdl(const class weld::Entry &) -include/vcl/weld.hxx:1670 +include/vcl/weld.hxx:1712 class Size weld::MetricSpinButton::get_size_request() const -include/vcl/weld.hxx:1681 +include/vcl/weld.hxx:1723 void weld::MetricSpinButton::set_position(int) -include/vcl/weld.hxx:1727 +include/vcl/weld.hxx:1769 _Bool weld::TimeSpinButton::get_sensitive() const -include/vcl/weld.hxx:1729 +include/vcl/weld.hxx:1771 _Bool weld::TimeSpinButton::get_visible() const -include/vcl/weld.hxx:1730 +include/vcl/weld.hxx:1772 void weld::TimeSpinButton::grab_focus() -include/vcl/weld.hxx:1731 +include/vcl/weld.hxx:1773 _Bool weld::TimeSpinButton::has_focus() const -include/vcl/weld.hxx:1734 +include/vcl/weld.hxx:1776 void weld::TimeSpinButton::save_value() -include/vcl/weld.hxx:1735 +include/vcl/weld.hxx:1777 _Bool weld::TimeSpinButton::get_value_changed_from_saved() const -include/vcl/weld.hxx:1795 +include/vcl/weld.hxx:1845 int weld::TextView::vadjustment_get_lower() const -include/vcl/weld.hxx:1889 +include/vcl/weld.hxx:1939 void weld::Menu::append_check(const class rtl::OUString &,const class rtl::OUString &) -include/vcl/weld.hxx:1921 +include/vcl/weld.hxx:1971 void weld::Toolbar::append_separator(const class rtl::OUString &) -include/vcl/weld.hxx:1967 +include/vcl/weld.hxx:2017 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 *) @@ -968,20 +1040,22 @@ include/xmloff/txtimp.hxx:566 class rtl::OUString XMLTextImportHelper::FindActiveBookmarkName() libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx:73 void ::operator()(struct _GtkBuilder *) const -libreofficekit/qa/gtktiledviewer/gtv-comments-sidebar.cxx:32 - void * gtv_comments_sidebar_get_instance_private(struct GtvCommentsSidebar *) -libreofficekit/qa/gtktiledviewer/gtv-comments-sidebar.cxx:50 +libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.cxx:183 void ::operator()(struct _GList *) const -libreofficekit/qa/gtktiledviewer/gtv-helpers.cxx:77 - void ::operator()(struct _GtkTargetList *) const libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.hxx:35 void openLokDialog(struct _GtkWidget *,void *) +libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.hxx:58 + void editButtonClicked(struct _GtkWidget *,void *) +libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.hxx:60 + void replyButtonClicked(struct _GtkWidget *,void *) +libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.hxx:62 + void deleteCommentButtonClicked(struct _GtkWidget *,void *) lotuswordpro/source/filter/clone.hxx:28 detail::has_clone<class LwpBorderStuff>::no & detail::has_clone::check_sig() -lotuswordpro/source/filter/clone.hxx:28 - detail::has_clone<class LwpShadow>::no & detail::has_clone::check_sig() lotuswordpro/source/filter/clone.hxx:28 detail::has_clone<class LwpSpacingCommonOverride>::no & detail::has_clone::check_sig() +lotuswordpro/source/filter/clone.hxx:28 + detail::has_clone<class LwpShadow>::no & detail::has_clone::check_sig() lotuswordpro/source/filter/clone.hxx:28 detail::has_clone<class LwpBackgroundStuff>::no & detail::has_clone::check_sig() lotuswordpro/source/filter/clone.hxx:28 @@ -1004,6 +1078,8 @@ oox/source/drawingml/diagram/diagramlayoutatoms.hxx:257 const class std::__debug::vector<class std::shared_ptr<class oox::drawingml::Shape>, class std::allocator<class std::shared_ptr<class oox::drawingml::Shape> > > & oox::drawingml::LayoutNode::getNodeShapes() const oox/source/drawingml/diagram/diagramlayoutatoms.hxx:265 const class oox::drawingml::LayoutNode * oox::drawingml::LayoutNode::getParentLayoutNode() const +reportdesign/source/ui/inc/ReportController.hxx:326 + void rptui::OReportController::LinkStubEventLstHdl(void *,class VclWindowEvent &) sal/osl/unx/uunxapi.hxx:35 int mkdir_c(const class rtl::OString &,unsigned int) sal/osl/unx/uunxapi.hxx:70 @@ -1058,12 +1134,12 @@ sc/inc/mtvelements.hxx:79 void mdds_mtv_get_empty_value(class ScFormulaCell *&) sc/inc/mtvelements.hxx:79 void mdds_mtv_get_value(const struct mdds::mtv::base_element_block &,unsigned long,class ScFormulaCell *&) -sc/inc/mtvelements.hxx:80 - void mdds_mtv_get_value(const struct mdds::mtv::base_element_block &,unsigned long,class EditTextObject *&) sc/inc/mtvelements.hxx:80 void mdds_mtv_get_empty_value(class EditTextObject *&) sc/inc/mtvelements.hxx:80 struct mdds::mtv::base_element_block * mdds_mtv_create_new_block(const class EditTextObject *,const type-parameter-?-? &,const type-parameter-?-? &) +sc/inc/mtvelements.hxx:80 + void mdds_mtv_get_value(const struct mdds::mtv::base_element_block &,unsigned long,class EditTextObject *&) sc/inc/mtvelements.hxx:80 void mdds_mtv_insert_values(struct mdds::mtv::base_element_block &,unsigned long,const class EditTextObject *,const type-parameter-?-? &,const type-parameter-?-? &) sc/inc/mtvelements.hxx:84 @@ -1090,7 +1166,7 @@ sc/inc/table.hxx:320 _Bool ScTable::IsColRowTabValid(const short,const int,const short) const 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:162 +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() @@ -1116,23 +1192,23 @@ sc/qa/unit/ucalc.hxx:535 void Test::testCondFormatListenToOwnRange() sc/source/core/inc/interpre.hxx:73 basic_ostream<type-parameter-?-?, type-parameter-?-?> & sc::operator<<(basic_ostream<type-parameter-?-?, type-parameter-?-?> &,const struct sc::ParamIfsResult &) -sc/source/core/opencl/formulagroupcl.cxx:1057 +sc/source/core/opencl/formulagroupcl.cxx:1054 _Bool sc::opencl::(anonymous namespace)::DynamicKernelSlidingArgument::NeedParallelReduction() const -sc/source/core/opencl/formulagroupcl.cxx:1065 +sc/source/core/opencl/formulagroupcl.cxx:1062 void sc::opencl::(anonymous namespace)::DynamicKernelSlidingArgument::GenSlidingWindowFunction(class std::__cxx11::basic_stringstream<char> &) -sc/source/core/opencl/formulagroupcl.cxx:1348 +sc/source/core/opencl/formulagroupcl.cxx:1345 void sc::opencl::(anonymous namespace)::ParallelReductionVectorRef::GenSlidingWindowFunction(class std::__cxx11::basic_stringstream<char> &) -sc/source/core/opencl/formulagroupcl.cxx:1528 +sc/source/core/opencl/formulagroupcl.cxx:1347 class std::__cxx11::basic_string<char, struct std::char_traits<char>, class std::allocator<char> > sc::opencl::(anonymous namespace)::ParallelReductionVectorRef::GenSlidingWindowDeclRef(_Bool) const -sc/source/core/opencl/formulagroupcl.cxx:1563 +sc/source/core/opencl/formulagroupcl.cxx:1361 unsigned long sc::opencl::(anonymous namespace)::ParallelReductionVectorRef::Marshal(struct _cl_kernel *,int,int,struct _cl_program *) -sc/source/core/opencl/formulagroupcl.cxx:1740 +sc/source/core/opencl/formulagroupcl.cxx:1374 unsigned long sc::opencl::(anonymous namespace)::ParallelReductionVectorRef::GetArrayLength() const -sc/source/core/opencl/formulagroupcl.cxx:1742 +sc/source/core/opencl/formulagroupcl.cxx:1376 unsigned long sc::opencl::(anonymous namespace)::ParallelReductionVectorRef::GetWindowSize() const -sc/source/core/opencl/formulagroupcl.cxx:1744 +sc/source/core/opencl/formulagroupcl.cxx:1378 _Bool sc::opencl::(anonymous namespace)::ParallelReductionVectorRef::GetStartFixed() const -sc/source/core/opencl/formulagroupcl.cxx:1746 +sc/source/core/opencl/formulagroupcl.cxx:1380 _Bool sc::opencl::(anonymous namespace)::ParallelReductionVectorRef::GetEndFixed() const sc/source/core/opencl/op_statistical.hxx:206 sc::opencl::OpGeoMean::OpGeoMean() @@ -1178,15 +1254,15 @@ sc/source/ui/inc/datatableview.hxx:114 void ScDataTableView::getRowRange(int &,int &) const sc/source/ui/inc/impex.hxx:93 ScImportExport::ScImportExport(class ScDocument *,const class rtl::OUString &) -sc/source/ui/inc/RandomNumberGeneratorDialog.hxx:64 - void ScRandomNumberGeneratorDialog::GenerateNumbers(type-parameter-?-? &,const char *,const class o3tl::optional<signed char>) +sc/source/ui/inc/RandomNumberGeneratorDialog.hxx:66 + void ScRandomNumberGeneratorDialog::GenerateNumbers(type-parameter-?-? &,const char *,const class std::optional<signed char>) sc/source/ui/inc/TableFillingAndNavigationTools.hxx:121 unsigned long DataRangeIterator::size() -sc/source/ui/inc/viewdata.hxx:410 +sc/source/ui/inc/viewdata.hxx:406 long ScViewData::GetLOKDocWidthPixel() const -sc/source/ui/inc/viewdata.hxx:411 +sc/source/ui/inc/viewdata.hxx:407 long ScViewData::GetLOKDocHeightPixel() const -sc/source/ui/inc/viewdata.hxx:544 +sc/source/ui/inc/viewdata.hxx:538 _Bool ScViewData::IsGridMode() const scaddins/source/analysis/analysishelper.hxx:802 _Bool sca::analysis::ScaDate::operator>=(const class sca::analysis::ScaDate &) const @@ -1228,27 +1304,27 @@ sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx:200 _Bool sd::slidesorter::view::InsertPosition::operator!=(const class sd::slidesorter::view::InsertPosition &) const sdext/source/pdfimport/pdfparse/pdfparse.cxx:110 long (anonymous namespace)::PDFGrammar<boost::spirit::file_iterator<char, boost::spirit::fileiter_impl::mmap_file_iterator<char> > >::pdf_string_parser::operator()(const type-parameter-?-? &,struct boost::spirit::nil_t &) const -sfx2/inc/autoredactdialog.hxx:71 +sfx2/inc/autoredactdialog.hxx:67 void TargetsTable::SelectByName(const class rtl::OUString &) -sfx2/inc/autoredactdialog.hxx:75 +sfx2/inc/autoredactdialog.hxx:71 void TargetsTable::unselect_all() -sfx2/inc/autoredactdialog.hxx:76 +sfx2/inc/autoredactdialog.hxx:72 _Bool TargetsTable::has_focus() const -sfx2/inc/autoredactdialog.hxx:77 +sfx2/inc/autoredactdialog.hxx:73 int TargetsTable::n_children() const -sfx2/source/appl/shutdownicon.hxx:83 +sfx2/source/appl/shutdownicon.hxx:79 class rtl::OUString ShutdownIcon::getShortcutName() -sfx2/source/appl/shutdownicon.hxx:99 +sfx2/source/appl/shutdownicon.hxx:95 class ShutdownIcon * ShutdownIcon::createInstance() -sfx2/source/appl/shutdownicon.hxx:101 +sfx2/source/appl/shutdownicon.hxx:97 void ShutdownIcon::terminateDesktop() -sfx2/source/appl/shutdownicon.hxx:104 +sfx2/source/appl/shutdownicon.hxx:100 void ShutdownIcon::FileOpen() -sfx2/source/appl/shutdownicon.hxx:107 +sfx2/source/appl/shutdownicon.hxx:103 void ShutdownIcon::FromTemplate() -sfx2/source/appl/shutdownicon.hxx:116 +sfx2/source/appl/shutdownicon.hxx:112 class rtl::OUString ShutdownIcon::GetUrlDescription(const class rtl::OUString &) -sfx2/source/appl/shutdownicon.hxx:118 +sfx2/source/appl/shutdownicon.hxx:114 void ShutdownIcon::SetVeto(_Bool) shell/inc/xml_parser.hxx:48 xml_parser::xml_parser() @@ -1290,18 +1366,18 @@ slideshow/source/engine/animationfactory.cxx:545 typename type-parameter-?-?::ValueType slideshow::internal::(anonymous namespace)::GenericAnimation::getUnderlyingValue() const slideshow/source/engine/opengl/TransitionImpl.hxx:180 void OGLTransitionImpl::cleanup() +slideshow/source/inc/listenercontainer.hxx:45 + _Bool slideshow::internal::FunctionApply::apply(type-parameter-?-?,const class std::shared_ptr<class slideshow::internal::PauseEventHandler> &) +slideshow/source/inc/listenercontainer.hxx:45 + _Bool slideshow::internal::FunctionApply::apply(type-parameter-?-?,const class std::shared_ptr<class slideshow::internal::AnimationEventHandler> &) slideshow/source/inc/listenercontainer.hxx:45 _Bool slideshow::internal::FunctionApply::apply(type-parameter-?-?,const class std::shared_ptr<class slideshow::internal::EventHandler> &) slideshow/source/inc/listenercontainer.hxx:45 _Bool slideshow::internal::FunctionApply::apply(type-parameter-?-?,const class std::shared_ptr<class slideshow::internal::IntrinsicAnimationEventHandler> &) -slideshow/source/inc/listenercontainer.hxx:45 - _Bool slideshow::internal::FunctionApply::apply(type-parameter-?-?,const class std::shared_ptr<class slideshow::internal::ViewUpdate> &) slideshow/source/inc/listenercontainer.hxx:45 _Bool slideshow::internal::FunctionApply::apply(type-parameter-?-?,const class std::shared_ptr<class slideshow::internal::UserPaintEventHandler> &) slideshow/source/inc/listenercontainer.hxx:45 - _Bool slideshow::internal::FunctionApply::apply(type-parameter-?-?,const class std::shared_ptr<class slideshow::internal::PauseEventHandler> &) -slideshow/source/inc/listenercontainer.hxx:45 - _Bool slideshow::internal::FunctionApply::apply(type-parameter-?-?,const class std::shared_ptr<class slideshow::internal::AnimationEventHandler> &) + _Bool slideshow::internal::FunctionApply::apply(type-parameter-?-?,const class std::shared_ptr<class slideshow::internal::ViewUpdate> &) slideshow/source/inc/listenercontainer.hxx:45 _Bool slideshow::internal::FunctionApply::apply(type-parameter-?-?,const class std::shared_ptr<class slideshow::internal::ShapeListenerEventHandler> &) slideshow/source/inc/listenercontainer.hxx:55 @@ -1318,10 +1394,10 @@ svl/source/misc/gridprinter.cxx:47 void rtl::mdds_mtv_prepend_values(struct mdds::mtv::base_element_block &,const class rtl::OUString &,const type-parameter-?-? &,const type-parameter-?-? &) svl/source/misc/gridprinter.cxx:47 void rtl::mdds_mtv_get_empty_value(class rtl::OUString &) -svl/source/misc/gridprinter.cxx:47 - void rtl::mdds_mtv_assign_values(struct mdds::mtv::base_element_block &,const class rtl::OUString &,const type-parameter-?-? &,const type-parameter-?-? &) svl/source/misc/gridprinter.cxx:47 struct mdds::mtv::base_element_block * rtl::mdds_mtv_create_new_block(const class rtl::OUString &,const type-parameter-?-? &,const type-parameter-?-? &) +svl/source/misc/gridprinter.cxx:47 + void rtl::mdds_mtv_assign_values(struct mdds::mtv::base_element_block &,const class rtl::OUString &,const type-parameter-?-? &,const type-parameter-?-? &) svl/source/misc/gridprinter.cxx:47 void rtl::mdds_mtv_get_value(const struct mdds::mtv::base_element_block &,unsigned long,class rtl::OUString &) svl/source/misc/gridprinter.cxx:47 @@ -1486,6 +1562,8 @@ sw/inc/swrect.hxx:106 class SvStream & WriteSwRect(class SvStream &,const class SwRect &) sw/inc/swrect.hxx:148 _Bool SwRect::OverStepTop(long) const +sw/inc/unoframe.hxx:162 + void SwXFrame::SetSelection(class SwPaM &) sw/inc/viscrs.hxx:204 class SwShellTableCursor * SwShellTableCursor::GetNext() sw/inc/viscrs.hxx:205 @@ -1610,8 +1688,6 @@ vcl/inc/qt5/Qt5DragAndDrop.hxx:49 void Qt5DragSource::deinitialize() vcl/inc/qt5/Qt5DragAndDrop.hxx:80 void Qt5DropTarget::deinitialize() -vcl/inc/qt5/Qt5FilePicker.hxx:145 - void Qt5FilePicker::disposing(const struct com::sun::star::lang::EventObject &) vcl/inc/qt5/Qt5FontFace.hxx:37 class Qt5FontFace * Qt5FontFace::fromQFont(const class QFont &) vcl/inc/qt5/Qt5FontFace.hxx:43 @@ -1622,11 +1698,11 @@ vcl/inc/qt5/Qt5Frame.hxx:135 void Qt5Frame::TriggerPaintEvent() vcl/inc/qt5/Qt5Frame.hxx:136 void Qt5Frame::TriggerPaintEvent(class QRect) -vcl/inc/qt5/Qt5Frame.hxx:161 +vcl/inc/qt5/Qt5Frame.hxx:162 void Qt5Frame::deregisterDragSource(const class Qt5DragSource *) -vcl/inc/qt5/Qt5Frame.hxx:163 +vcl/inc/qt5/Qt5Frame.hxx:164 void Qt5Frame::deregisterDropTarget(const class Qt5DropTarget *) -vcl/inc/qt5/Qt5Frame.hxx:216 +vcl/inc/qt5/Qt5Frame.hxx:217 struct _cairo * Qt5Frame::getCairoContext() const vcl/inc/qt5/Qt5Painter.hxx:56 void Qt5Painter::update() @@ -1650,12 +1726,12 @@ vcl/inc/salwtype.hxx:118 SalMenuEvent::SalMenuEvent() vcl/inc/schedulerimpl.hxx:38 const char * ImplSchedulerData::GetDebugName() const -vcl/inc/skia/gdiimpl.hxx:192 +vcl/inc/skia/gdiimpl.hxx:195 void SkiaSalGraphicsImpl::dump(const char *) const -vcl/inc/skia/gdiimpl.hxx:193 - void SkiaSalGraphicsImpl::dump(const class SkBitmap &,const char *) -vcl/inc/skia/salbmp.hxx:70 +vcl/inc/skia/salbmp.hxx:67 void SkiaSalBitmap::dump(const char *) const +vcl/inc/skia/utils.hxx:47 + void SkiaHelper::dump(const class SkBitmap &,const char *) vcl/inc/unx/glyphcache.hxx:108 void FreetypeManager::ClearFontOptions() vcl/inc/unx/gtk/gtkframe.hxx:214 @@ -1666,7 +1742,7 @@ vcl/inc/unx/salframe.h:184 enum SalFrameStyleFlags X11SalFrame::GetStyle() const vcl/qa/cppunit/lifecycle.cxx:234 (anonymous namespace)::LeakTestClass::LeakTestClass(_Bool &,type-parameter-?-? &&...) -vcl/skia/salbmp.cxx:317 +vcl/skia/salbmp.cxx:326 void ::operator()(void *,void *) const vcl/source/app/scheduler.cxx:83 basic_ostream<type-parameter-?-?, type-parameter-?-?> & (anonymous namespace)::operator<<(basic_ostream<type-parameter-?-?, type-parameter-?-?> &,const class Idle &) @@ -1690,14 +1766,14 @@ vcl/source/fontsubset/xlat.hxx:35 unsigned short vcl::TranslateChar16(unsigned short) vcl/unx/gtk3/gtk3gloactiongroup.cxx:51 void * g_lo_action_get_instance_private(struct (anonymous namespace)::GLOAction *) -vcl/unx/gtk3/gtk3glomenu.cxx:30 - void * g_lo_menu_get_instance_private(struct GLOMenu *) 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() +xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx:29 + xmlsearch::qe::RoleFiller::RoleFiller() xmlsecurity/source/gpg/XMLEncryption.hxx:25 XMLEncryptionGpg::XMLEncryptionGpg() xmlsecurity/source/xmlsec/nss/nssinitializer.hxx:45 diff --git a/extensions/source/propctrlr/browserline.cxx b/extensions/source/propctrlr/browserline.cxx index 9d8d0360ba8e..10beadbc3ba7 100644 --- a/extensions/source/propctrlr/browserline.cxx +++ b/extensions/source/propctrlr/browserline.cxx @@ -163,11 +163,6 @@ namespace pcr Show(false); } - bool OBrowserLine::IsVisible() const - { - return m_xFtTitle->get_visible(); - } - void OBrowserLine::SetTitle(const OUString& rNewTitle ) { if ( GetTitle() == rNewTitle ) diff --git a/extensions/source/propctrlr/browserline.hxx b/extensions/source/propctrlr/browserline.hxx index 0610f8220faa..e3e668a26bb7 100644 --- a/extensions/source/propctrlr/browserline.hxx +++ b/extensions/source/propctrlr/browserline.hxx @@ -95,7 +95,6 @@ namespace pcr int GetRowHeight() const { return m_xContainer->get_preferred_size().Height(); } void Show(bool bFlag=true); void Hide(); - bool IsVisible() const; bool GrabFocus(); void ShowBrowseButton( const OUString& rImageURL, bool bPrimary ); diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx index e2b5f82999f6..b626731b3c4c 100644 --- a/extensions/source/propctrlr/browserlistbox.cxx +++ b/extensions/source/propctrlr/browserlistbox.cxx @@ -40,8 +40,6 @@ namespace pcr { - #define FRAME_OFFSET 4 - using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Exception; using ::com::sun::star::inspection::XPropertyControlContext; @@ -358,11 +356,6 @@ namespace pcr } } - long OBrowserListBox::impl_getPrefererredHelpHeight() - { - return HasHelpSection() ? m_xHelpWindow->GetOptimalHeightPixel() : 0; - } - void OBrowserListBox::SetListener( IPropertyLineListener* _pListener ) { m_pLineListener = _pListener; @@ -504,24 +497,6 @@ namespace pcr m_xScrolledWindow->vadjustment_set_step_increment(m_nRowHeight); } - sal_Int32 OBrowserListBox::GetMinimumWidth() const - { - return m_nTheNameSize + 2 * FRAME_OFFSET + (m_nRowHeight - 4) * 8; - } - - sal_Int32 OBrowserListBox::GetMinimumHeight() - { - // assume that we want to display 5 rows, at least - sal_Int32 nMinHeight = m_nRowHeight * 5; - - if ( HasHelpSection() ) - { - nMinHeight += m_xHelpWindow->GetMinimalHeightPixel(); - } - - return nMinHeight; - } - void OBrowserListBox::ShowEntry(sal_uInt16 nPos) { if (nPos == 0) diff --git a/extensions/source/propctrlr/browserlistbox.hxx b/extensions/source/propctrlr/browserlistbox.hxx index a250816dd7fb..1a1b63aaf2ef 100644 --- a/extensions/source/propctrlr/browserlistbox.hxx +++ b/extensions/source/propctrlr/browserlistbox.hxx @@ -116,10 +116,6 @@ namespace pcr void EnablePropertyControls( const OUString& _rEntryName, sal_Int16 _nControls, bool _bEnable ); void EnablePropertyLine( const OUString& _rEntryName, bool _bEnable ); - sal_Int32 GetMinimumWidth() const; - sal_Int32 GetMinimumHeight(); - - bool IsModified( ) const; void CommitModified( ); @@ -166,11 +162,6 @@ namespace pcr found. */ bool impl_getBrowserLineForName( const OUString& _rEntryName, BrowserLinePointer& _out_rpLine ) const; - - /** returns the preferred height (in pixels) of the help section, or 0 if we - currently don't have a help section - */ - long impl_getPrefererredHelpHeight(); }; diff --git a/extensions/source/propctrlr/browserpage.hxx b/extensions/source/propctrlr/browserpage.hxx index 14999217431e..4018a6b6c3e6 100644 --- a/extensions/source/propctrlr/browserpage.hxx +++ b/extensions/source/propctrlr/browserpage.hxx @@ -41,10 +41,8 @@ namespace pcr ~OBrowserPage(); void SetPageTitle(const OUString& rPageTitle) { m_aPageTitle = rPageTitle; } - const OUString& GetPageTitle() const { return m_aPageTitle; } void SetHelpId(const OString& rHelpId) { m_xContainer->set_help_id(rHelpId); } - OString GetHelpId() const { return m_xContainer->get_help_id(); } OBrowserListBox& getListBox() { return *m_xListBox; } const OBrowserListBox& getListBox() const { return *m_xListBox; } diff --git a/extensions/source/propctrlr/commoncontrol.cxx b/extensions/source/propctrlr/commoncontrol.cxx index b60ecdc8763f..e4c9eac2cd85 100644 --- a/extensions/source/propctrlr/commoncontrol.cxx +++ b/extensions/source/propctrlr/commoncontrol.cxx @@ -65,19 +65,6 @@ namespace pcr } } - void CommonBehaviourControlHelper::activateNextControl() const - { - try - { - if ( m_xContext.is() ) - m_xContext->activateNextControl( &m_rAntiImpl ); - } - catch( const Exception& ) - { - DBG_UNHANDLED_EXCEPTION("extensions.propctrlr"); - } - } - IMPL_LINK_NOARG( CommonBehaviourControlHelper, EditModifiedHdl, weld::Entry&, void ) { setModified(); diff --git a/extensions/source/propctrlr/commoncontrol.hxx b/extensions/source/propctrlr/commoncontrol.hxx index 5550435ff963..fc77505352f5 100644 --- a/extensions/source/propctrlr/commoncontrol.hxx +++ b/extensions/source/propctrlr/commoncontrol.hxx @@ -84,17 +84,12 @@ namespace pcr /// @throws css::uno::RuntimeException void notifyModifiedValue( ); - /** (fail-safe) wrapper around calling our context's activateNextControl - */ - void activateNextControl() const; - virtual weld::Widget* getWidget() = 0; /// may be used by derived classes, they forward the event to the PropCtrListener DECL_LINK( ModifiedHdl, weld::ComboBox&, void ); DECL_LINK( ColorModifiedHdl, ColorListBox&, void ); DECL_LINK( EditModifiedHdl, weld::Entry&, void ); - DECL_LINK( TextViewModifiedHdl, weld::TextView&, void ); DECL_LINK( MetricModifiedHdl, weld::MetricSpinButton&, void ); DECL_LINK( FormattedModifiedHdl, weld::FormattedSpinButton&, void ); DECL_LINK( TimeModifiedHdl, weld::TimeSpinButton&, void ); diff --git a/extensions/source/propctrlr/propertyeditor.cxx b/extensions/source/propctrlr/propertyeditor.cxx index 0b0de48a2b12..41a7be1d3547 100644 --- a/extensions/source/propctrlr/propertyeditor.cxx +++ b/extensions/source/propctrlr/propertyeditor.cxx @@ -170,19 +170,6 @@ namespace pcr return m_xTabControl->get_current_page_ident().toUInt32(); } - void OPropertyEditor::Update(const std::function<void(OBrowserListBox *)>& _aUpdateFunction) - { - // forward this to all our pages - int nCount = m_xTabControl->get_n_pages(); - for (int i = 0; i < nCount; ++i) - { - sal_uInt16 nID = m_xTabControl->get_page_ident(i).toUInt32(); - OBrowserPage* pPage = getPage(nID); - if (pPage) - _aUpdateFunction(&pPage->getListBox()); - } - } - void OPropertyEditor::forEachPage( PageOperation _pOperation ) { int nCount = m_xTabControl->get_n_pages(); diff --git a/extensions/source/propctrlr/propertyeditor.hxx b/extensions/source/propctrlr/propertyeditor.hxx index 3d9265c67cb8..d04ab25fc9c0 100644 --- a/extensions/source/propctrlr/propertyeditor.hxx +++ b/extensions/source/propctrlr/propertyeditor.hxx @@ -104,7 +104,6 @@ namespace pcr Size get_preferred_size() const; weld::Container* getWidget() const { return m_xTabControl.get(); } - weld::Container* getControlHoldingParent() const { return m_xControlHoldingParent.get(); } void Show() { m_xTabControl->show(); } void Hide() { m_xTabControl->hide(); } @@ -119,8 +118,6 @@ namespace pcr OBrowserPage* getPage( const OUString& _rPropertyName ); const OBrowserPage* getPage( const OUString& _rPropertyName ) const; - void Update(const std::function<void(OBrowserListBox *)>& _aUpdateFunction); - typedef void (OPropertyEditor::*PageOperation)( OBrowserPage&, const void* ); void forEachPage( PageOperation _pOperation ); diff --git a/extensions/source/propctrlr/standardcontrol.hxx b/extensions/source/propctrlr/standardcontrol.hxx index 27f09e99ae62..3eaf71f5a1f7 100644 --- a/extensions/source/propctrlr/standardcontrol.hxx +++ b/extensions/source/propctrlr/standardcontrol.hxx @@ -36,38 +36,6 @@ namespace pcr { - //= ListLikeControlWithModifyHandler - - /** Very small helper class which adds a SetModifyHdl to a ListBox-derived class, - thus giving this class the same API (as far as the CommonBehaviourControl is concerned) - as all other windows. - */ - template< class TListboxWindow > - class ListLikeControlWithModifyHandler : public TListboxWindow - { - public: - ListLikeControlWithModifyHandler( vcl::Window* pParent, WinBits _nStyle ) - : TListboxWindow( pParent, _nStyle ) - { - TListboxWindow::SetSelectHdl( LINK(this, ListLikeControlWithModifyHandler, OnSelect) ); - } - - void SetModifyHdl( const Link<TListboxWindow&,void>& _rLink ) { aModifyHdl = _rLink; } - private: - DECL_LINK(OnSelect, TListboxWindow&, void); - Link<TListboxWindow&,void> aModifyHdl; - }; - - template< class LISTBOX_WINDOW > - void ListLikeControlWithModifyHandler< LISTBOX_WINDOW >::LinkStubOnSelect(void * instance, LISTBOX_WINDOW& data) { - return static_cast<ListLikeControlWithModifyHandler< LISTBOX_WINDOW > *>(instance)->OnSelect(data); - } - template< class LISTBOX_WINDOW > - void ListLikeControlWithModifyHandler< LISTBOX_WINDOW >::OnSelect(LISTBOX_WINDOW& rListBox) - { - aModifyHdl.Call(rListBox); - } - //= OTimeControl typedef CommonBehaviourControl<css::inspection::XPropertyControl, weld::TimeSpinButton> OTimeControl_Base; class OTimeControl : public OTimeControl_Base diff --git a/extensions/source/propctrlr/usercontrol.hxx b/extensions/source/propctrlr/usercontrol.hxx index b13766c1bc82..3283a6f56f96 100644 --- a/extensions/source/propctrlr/usercontrol.hxx +++ b/extensions/source/propctrlr/usercontrol.hxx @@ -21,7 +21,7 @@ #define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_USERCONTROL_HXX #include "commoncontrol.hxx" -#include <svtools/fileurlbox.hxx> +#include <svtools/inettbc.hxx> #include <svl/zforlist.hxx> #include "standardcontrol.hxx" diff --git a/include/connectivity/sqlerror.hxx b/include/connectivity/sqlerror.hxx index db0f3824ab77..b10d8ae570b6 100644 --- a/include/connectivity/sqlerror.hxx +++ b/include/connectivity/sqlerror.hxx @@ -57,25 +57,6 @@ namespace connectivity */ class OOO_DLLPUBLIC_DBTOOLS SQLError { - public: - - // - optional - - /** convenience wrapper around o3tl::optional, allowing implicit construction - */ - class ParamValue : public ::o3tl::optional< OUString > - { - typedef ::o3tl::optional< OUString > base_type; - - public: - ParamValue( ) : base_type( ) { } - ParamValue( OUString const& val ) : base_type( val ) { } - ParamValue( ParamValue const& rhs ) : base_type( static_cast<base_type const&>( rhs ) ) { } - - bool is() const { return bool(*this); } - }; - - public: SQLError(); ~SQLError(); diff --git a/include/svl/rngitem.hxx b/include/svl/rngitem.hxx index 08404d83e6ef..7e8caf93742f 100644 --- a/include/svl/rngitem.hxx +++ b/include/svl/rngitem.hxx @@ -40,7 +40,6 @@ public: OUString &rText, const IntlWrapper& ) const override; virtual SfxRangeItem* Clone( SfxItemPool *pPool = nullptr ) const override; - sal_uInt16& From() { return nFrom; } }; diff --git a/include/svtools/fileurlbox.hxx b/include/svtools/fileurlbox.hxx deleted file mode 100644 index c2f4451db6d0..000000000000 --- a/include/svtools/fileurlbox.hxx +++ /dev/null @@ -1,67 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_SVTOOLS_FILEURLBOX_HXX -#define INCLUDED_SVTOOLS_FILEURLBOX_HXX - -#include <svtools/svtdllapi.h> -#include <svtools/inettbc.hxx> - - -namespace svt -{ - - - //= FileURLBox - - class SVT_DLLPUBLIC FileURLBox final : public SvtURLBox - { - private: - OUString m_sPreservedText; - - public: - FileURLBox( vcl::Window* _pParent, WinBits _nStyle ); - - private: - virtual bool PreNotify( NotifyEvent& rNEvt ) override; - virtual bool EventNotify( NotifyEvent& rNEvt ) override; - - public: - /** transforms the given URL content into a system-dependent notation, if possible, and - sets it as current display text - - <p>If the user enters a URL such as "file:///c:/some%20directory", then this will be converted - to "c:\some directory" for better readability.</p> - - @param _rURL - denotes the URL to set. Note that no check is made whether it is a valid URL - this - is the responsibility of the caller. - - @see SvtURLBox::GetURL - */ - void DisplayURL( const OUString& _rURL ); - }; - - -} // namespace svt - - -#endif // INCLUDED_SVTOOLS_FILEURLBOX_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/inettbc.hxx b/include/svtools/inettbc.hxx index 37f18b53d95a..71638b8d315c 100644 --- a/include/svtools/inettbc.hxx +++ b/include/svtools/inettbc.hxx @@ -71,9 +71,6 @@ public: static OUString ParseSmart( const OUString& aText, const OUString& aBaseURL ); - void SetPlaceHolder( const OUString& sPlaceHolder ) - { aPlaceHolder = sPlaceHolder; } - const OUString& GetPlaceHolder() const { return aPlaceHolder; } bool MatchesPlaceHolder( const OUString& sToMatch ) const ... etc. - the rest is truncated _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits