[Libreoffice-commits] core.git: basctl/source compilerplugins/clang cui/source editeng/source include/editeng include/sfx2 include/svtools include/svx include/vcl sfx2/source slideshow/test svtools/source svx/source vcl/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Fri Nov 30 11:58:33 UTC 2018


 basctl/source/basicide/bastype3.cxx                        |   93 ------------
 basctl/source/inc/bastype2.hxx                             |    1 
 compilerplugins/clang/unusedmethods.results                |   98 +++++--------
 compilerplugins/clang/unusedmethods.unused-returns.results |   24 +--
 cui/source/customize/cfgutil.cxx                           |   64 --------
 cui/source/inc/cfgutil.hxx                                 |    1 
 editeng/source/editeng/editeng.cxx                         |    5 
 include/editeng/editeng.hxx                                |    1 
 include/sfx2/objsh.hxx                                     |    2 
 include/svtools/tabbar.hxx                                 |    1 
 include/svx/galctrl.hxx                                    |    2 
 include/svx/sdr/contact/objectcontact.hxx                  |    8 -
 include/vcl/headbar.hxx                                    |    1 
 include/vcl/status.hxx                                     |    1 
 include/vcl/tabctrl.hxx                                    |    1 
 include/vcl/toolbox.hxx                                    |    1 
 sfx2/source/doc/objmisc.cxx                                |    7 
 slideshow/test/tests.hxx                                   |    7 
 slideshow/test/testshape.cxx                               |    4 
 slideshow/test/testview.cxx                                |   21 --
 svtools/source/control/tabbar.cxx                          |    8 -
 svx/source/gallery2/galctrl.cxx                            |   23 ---
 svx/source/sdr/contact/objectcontact.cxx                   |   20 --
 vcl/source/control/tabctrl.cxx                             |   10 -
 vcl/source/treelist/headbar.cxx                            |    8 -
 vcl/source/window/status.cxx                               |   17 --
 vcl/source/window/toolbox2.cxx                             |   17 --
 27 files changed, 57 insertions(+), 389 deletions(-)

New commits:
commit 437adaac0af448ef1ffe48a7f59f1770d2dd2458
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Fri Nov 30 09:43:40 2018 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Fri Nov 30 12:57:58 2018 +0100

    loplugin:unusedmethods
    
    Change-Id: Id0d68d659fa06a8230ed0d927b85b6b504525d1e
    Reviewed-on: https://gerrit.libreoffice.org/64328
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/basctl/source/basicide/bastype3.cxx b/basctl/source/basicide/bastype3.cxx
index c8f9506014ad..6d3a70cff637 100644
--- a/basctl/source/basicide/bastype3.cxx
+++ b/basctl/source/basicide/bastype3.cxx
@@ -257,99 +257,6 @@ void SbTreeListBox::ScanAllEntries()
     }
 }
 
-SbxVariable* TreeListBox::FindVariable( SvTreeListEntry* pEntry )
-{
-    if ( !pEntry )
-        return nullptr;
-
-    ScriptDocument aDocument( ScriptDocument::getApplicationScriptDocument() );
-    EntryArray aEntries;
-
-    while ( pEntry )
-    {
-        sal_uInt16 nDepth = GetModel()->GetDepth( pEntry );
-        switch ( nDepth )
-        {
-            case 4:
-            case 3:
-            case 2:
-            case 1:
-            {
-                aEntries.push_front( pEntry );
-            }
-            break;
-            case 0:
-            {
-                aDocument = static_cast<DocumentEntry*>(pEntry->GetUserData())->GetDocument();
-            }
-            break;
-        }
-        pEntry = GetParent( pEntry );
-    }
-
-    SbxVariable* pVar = nullptr;
-    if ( !aEntries.empty() )
-    {
-        bool bDocumentObjects = false;
-        for (SvTreeListEntry* pLE : aEntries)
-        {
-            assert(pLE && "Can not find entry in array");
-            Entry* pBE = static_cast<Entry*>(pLE->GetUserData());
-            assert(pBE && "The data in the entry not found!");
-            OUString aName( GetEntryText( pLE ) );
-
-            switch ( pBE->GetType() )
-            {
-            case OBJ_TYPE_LIBRARY:
-                if (BasicManager* pBasMgr = aDocument.getBasicManager())
-                    pVar = pBasMgr->GetLib( aName );
-                break;
-            case OBJ_TYPE_MODULE:
-                DBG_ASSERT(dynamic_cast<StarBASIC*>(pVar), "FindVariable: invalid Basic");
-                if(!pVar)
-                {
-                    break;
-                }
-                // extract the module name from the string like "Sheet1 (Example1)"
-                if( bDocumentObjects )
-                {
-                    sal_Int32 nIndex = 0;
-                    aName = aName.getToken( 0, ' ', nIndex );
-                }
-                pVar = static_cast<StarBASIC*>(pVar)->FindModule( aName );
-                break;
-            case OBJ_TYPE_METHOD:
-                DBG_ASSERT(dynamic_cast<SbxObject*>(pVar), "FindVariable: invalid module/object");
-                if(!pVar)
-                {
-                    break;
-                }
-                pVar = static_cast<SbxObject*>(pVar)->GetMethods()->Find(aName, SbxClassType::Method);
-                break;
-            case OBJ_TYPE_DIALOG:
-                // sbx dialogs removed
-                break;
-            case OBJ_TYPE_DOCUMENT_OBJECTS:
-                bDocumentObjects = true;
-                SAL_FALLTHROUGH;
-            case OBJ_TYPE_USERFORMS:
-            case OBJ_TYPE_NORMAL_MODULES:
-            case OBJ_TYPE_CLASS_MODULES:
-                // skip, to find the child entry.
-                continue;
-            default:
-                OSL_FAIL( "FindVariable: unknown type" );
-                pVar = nullptr;
-                break;
-            }
-            if ( !pVar )
-                break;
-        }
-    }
-
-    return pVar;
-}
-
 SbxVariable* SbTreeListBox::FindVariable(weld::TreeIter* pEntry)
 {
     if ( !pEntry )
diff --git a/basctl/source/inc/bastype2.hxx b/basctl/source/inc/bastype2.hxx
index 9f6e1c4753c4..923e722d4bb8 100644
--- a/basctl/source/inc/bastype2.hxx
+++ b/basctl/source/inc/bastype2.hxx
@@ -221,7 +221,6 @@ public:
     void            SetMode( BrowseMode nM ) { nMode = nM; }
     BrowseMode      GetMode() const { return nMode; }
 
-    SbxVariable*    FindVariable( SvTreeListEntry* pEntry );
     SvTreeListEntry*    FindRootEntry( const ScriptDocument& rDocument, LibraryLocation eLocation );
     SvTreeListEntry*    FindEntry( SvTreeListEntry* pParent, const OUString& rText, EntryType eType );
 
diff --git a/compilerplugins/clang/unusedmethods.results b/compilerplugins/clang/unusedmethods.results
index a540c181742d..e6a994b0931d 100644
--- a/compilerplugins/clang/unusedmethods.results
+++ b/compilerplugins/clang/unusedmethods.results
@@ -1,11 +1,7 @@
 basctl/source/basicide/moduldlg.hxx:256
     void basctl::createLibImpl(class weld::Window *,const class basctl::ScriptDocument &,class basctl::CheckBox *,class basctl::TreeListBox *)
-basctl/source/inc/bastype2.hxx:221
-    _Bool basctl::TreeListBox::IsEntryProtected(class SvTreeListEntry *)
-basctl/source/inc/bastype2.hxx:226
-    class SbModule * basctl::TreeListBox::FindModule(class SvTreeListEntry *)
-basctl/source/inc/bastype2.hxx:321
-    class rtl::OUString basctl::SbTreeListBox::get_text(const class weld::TreeIter &) const
+basctl/source/inc/bastype2.hxx:224
+    class SbxVariable * basctl::TreeListBox::FindVariable(class SvTreeListEntry *)
 basegfx/source/range/b2drangeclipper.cxx:691
     type-parameter-?-? basegfx::(anonymous namespace)::eraseFromList(type-parameter-?-? &,const type-parameter-?-? &)
 basic/source/inc/buffer.hxx:41
@@ -54,20 +50,8 @@ connectivity/source/inc/OTypeInfo.hxx:46
     _Bool connectivity::OTypeInfo::operator==(const struct connectivity::OTypeInfo &) const
 connectivity/source/inc/OTypeInfo.hxx:47
     _Bool connectivity::OTypeInfo::operator!=(const struct connectivity::OTypeInfo &) const
-cui/source/inc/cfgutil.hxx:123
-    class rtl::OUString SfxConfigFunctionListBox::GetSelectedScriptURI()
-cui/source/inc/cfgutil.hxx:151
-    _Bool CuiConfigFunctionListBox::iter_next_sibling(class weld::TreeIter &) const
-cui/source/inc/cfgutil.hxx:161
-    class rtl::OUString CuiConfigFunctionListBox::GetCurCommand()
-cui/source/inc/cfgutil.hxx:162
-    class rtl::OUString CuiConfigFunctionListBox::GetCurLabel()
-cui/source/inc/cfgutil.hxx:164
-    class rtl::OUString CuiConfigFunctionListBox::GetHelpText(_Bool)
-cui/source/inc/cfgutil.hxx:269
-    void CuiConfigGroupListBox::SelectMacro(const class SfxMacroInfoItem *)
-cui/source/inc/cfgutil.hxx:271
-    void CuiConfigGroupListBox::SetStylesInfo(struct SfxStylesInfo_Impl *)
+cui/source/inc/cfgutil.hxx:263
+    void CuiConfigGroupListBox::SelectMacro(const class rtl::OUString &,const class rtl::OUString &)
 dbaccess/source/filter/hsqldb/fbalterparser.hxx:20
     void dbahsql::FbAlterStmtParser::ensureProperTableLengths() const
 dbaccess/source/filter/hsqldb/parseschema.hxx:82
@@ -118,8 +102,6 @@ editeng/inc/edtspell.hxx:112
     class __gnu_debug::_Safe_iterator<class __gnu_cxx::__normal_iterator<const struct editeng::MisspellRange *, class std::__cxx1998::vector<struct editeng::MisspellRange, class std::allocator<struct editeng::MisspellRange> > >, class std::__debug::vector<struct editeng::MisspellRange, class std::allocator<struct editeng::MisspellRange> > > WrongList::begin() const
 editeng/inc/edtspell.hxx:113
     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> > > WrongList::end() const
-editeng/source/editeng/impedit.hxx:865
-    void ImpEditEngine::IndentBlock(class EditView *,_Bool)
 extensions/source/scanner/scanner.hxx:81
     void ScannerManager::SetData(void *)
 framework/source/uiconfiguration/ImageList.hxx:51
@@ -436,6 +418,10 @@ include/drawinglayer/primitive3d/baseprimitive3d.hxx:113
     _Bool drawinglayer::primitive3d::BasePrimitive3D::operator!=(const class drawinglayer::primitive3d::BasePrimitive3D &) const
 include/drawinglayer/texture/texture.hxx:44
     _Bool drawinglayer::texture::GeoTexSvx::operator!=(const class drawinglayer::texture::GeoTexSvx &) const
+include/editeng/editeng.hxx:193
+    unsigned short EditEngine::GetOnePixelInRef() const
+include/editeng/editstat.hxx:122
+    int & EditStatus::GetPrevParagraph()
 include/editeng/hyphenzoneitem.hxx:65
     _Bool SvxHyphenZoneItem::IsPageEnd() const
 include/filter/msfilter/mstoolbar.hxx:103
@@ -582,24 +568,18 @@ include/sfx2/lokcharthelper.hxx:41
     void LokChartHelper::Invalidate()
 include/sfx2/msg.hxx:120
     const class std::type_info * SfxType0::Type() const
+include/sfx2/objsh.hxx:263
+    enum SfxObjectShellFlags SfxObjectShell::GetFlags() const
 include/sfx2/sidebar/Context.hxx:55
     _Bool sfx2::sidebar::Context::operator==(const class sfx2::sidebar::Context &) const
-include/sfx2/tabdlg.hxx:136
-    unsigned short SfxTabDialog::AddTabPage(const class rtl::OString &,unsigned short)
-include/sfx2/tabdlg.hxx:184
-    void SfxTabDialog::RemoveStandardButton()
-include/sfx2/tabdlg.hxx:192
-    void SfxTabDialog::SetApplyHandler(const class Link<class Button *, void> &)
-include/sfx2/tabdlg.hxx:197
-    _Bool SfxTabDialog::Apply()
 include/svl/itempool.hxx:162
     const type-parameter-?-? * SfxItemPool::GetItem2Default(TypedWhichId<type-parameter-?-?>) const
 include/svl/itempool.hxx:191
     void SfxItemPool::dumpAsXml(struct _xmlTextWriter *) const
 include/svtools/ctrlbox.hxx:156
     long LineListBox::GetWidth() const
-include/svtools/ivctrl.hxx:277
-    class Point SvtIconChoiceCtrl::GetPixelPos(const class Point &) const
+include/svtools/tabbar.hxx:482
+    class rtl::OString TabBar::GetHelpId(unsigned short) const
 include/svx/ClassificationEditView.hxx:41
     void svx::ClassificationEditView::SetCharAttributes()
 include/svx/ClassificationEditView.hxx:47
@@ -616,6 +596,12 @@ include/svx/dlgctrl.hxx:290
     void SvxLineEndLB::set_active_text(const class rtl::OUString &)
 include/svx/framelink.hxx:201
     _Bool svx::frame::operator>(const class svx::frame::Style &,const class svx::frame::Style &)
+include/svx/galctrl.hxx:75
+    _Bool GalleryPreview::SetGraphic(const class INetURLObject &)
+include/svx/galctrl.hxx:86
+    void SvxGalleryPreview::InitSettings()
+include/svx/sdr/contact/objectcontact.hxx:165
+    void sdr::contact::ObjectContact::resetViewPort()
 include/svx/svdlayer.hxx:75
     _Bool SdrLayer::operator==(const class SdrLayer &) const
 include/svx/svdpntv.hxx:462
@@ -664,9 +650,9 @@ include/tools/gen.hxx:251
     class Pair & Range::toPair()
 include/tools/gen.hxx:318
     class Pair & Selection::toPair()
-include/tools/poly.hxx:162
+include/tools/poly.hxx:160
     _Bool tools::Polygon::operator!=(const class tools::Polygon &) const
-include/tools/poly.hxx:249
+include/tools/poly.hxx:247
     _Bool tools::PolyPolygon::operator!=(const class tools::PolyPolygon &) const
 include/tools/stream.hxx:508
     class rtl::OString read_uInt32_lenPrefixed_uInt8s_ToOString(class SvStream &)
@@ -716,12 +702,14 @@ include/vcl/errcode.hxx:89
     _Bool ErrCode::operator>=(const class ErrCode &) const
 include/vcl/field.hxx:218
     void MetricFormatter::SetBaseValue(long,enum FieldUnit)
-include/vcl/gdimtf.hxx:111
+include/vcl/gdimtf.hxx:110
     _Bool GDIMetaFile::operator!=(const class GDIMetaFile &) const
 include/vcl/gradient.hxx:104
     _Bool Gradient::operator!=(const class Gradient &) const
 include/vcl/hatch.hxx:55
     _Bool Hatch::operator!=(const class Hatch &) const
+include/vcl/headbar.hxx:311
+    class rtl::OString HeaderBar::GetHelpId(unsigned short) const
 include/vcl/inputctx.hxx:63
     _Bool InputContext::operator!=(const class InputContext &) const
 include/vcl/ITiledRenderable.hxx:289
@@ -754,6 +742,8 @@ include/vcl/settings.hxx:653
     _Bool HelpSettings::operator!=(const class HelpSettings &) const
 include/vcl/settings.hxx:708
     _Bool AllSettings::operator!=(const class AllSettings &) const
+include/vcl/status.hxx:166
+    class rtl::OString StatusBar::GetHelpId(unsigned short) const
 include/vcl/svapp.hxx:174
      ApplicationEvent::ApplicationEvent(enum ApplicationEvent::Type,const class std::__debug::vector<class rtl::OUString, class std::allocator<class rtl::OUString> > &)
 include/vcl/svapp.hxx:803
@@ -762,12 +752,16 @@ include/vcl/svmain.hxx:27
     _Bool ImplSVMainHook(int *)
 include/vcl/syswin.hxx:173
     void SystemWindow::SetIdleDebugName(const char *)
+include/vcl/tabctrl.hxx:152
+    class rtl::OString TabControl::GetHelpId(unsigned short) const
 include/vcl/tabdlg.hxx:50
     class vcl::Window * TabDialog::GetViewWindow() const
 include/vcl/textrectinfo.hxx:44
     _Bool TextRectInfo::operator!=(const class TextRectInfo &) const
 include/vcl/threadex.hxx:98
      vcl::solarthread::detail::GenericSolarThreadExecutor::GenericSolarThreadExecutor<type-parameter-?-?, void>(const type-parameter-?-? &)
+include/vcl/toolbox.hxx:425
+    class rtl::OString ToolBox::GetHelpId(unsigned short) const
 include/vcl/txtattr.hxx:57
     _Bool TextAttrib::operator!=(const class TextAttrib &) const
 include/vcl/uitest/uiobject.hxx:273
@@ -778,8 +772,6 @@ include/vcl/uitest/uiobject.hxx:344
      SpinUIObject::SpinUIObject(const class VclPtr<class SpinButton> &)
 include/vcl/uitest/uiobject.hxx:352
     class std::unique_ptr<class UIObject, struct std::default_delete<class UIObject> > SpinUIObject::create(class vcl::Window *)
-include/vcl/vclmedit.hxx:155
-    const class rtl::OUString & VclMultiLineEdit::GetSavedValue() const
 include/vcl/wall.hxx:98
     _Bool Wallpaper::operator!=(const class Wallpaper &) const
 include/vcl/weld.hxx:74
@@ -956,7 +948,7 @@ sc/source/filter/inc/xestream.hxx:103
     class XclExpStream & XclExpStream::operator<<(float)
 sc/source/filter/inc/xiescher.hxx:154
     class Color XclImpDrawObjBase::GetSolidLineColor(const struct XclObjLineData &) const
-sc/source/filter/xml/xmltransformationi.hxx:161
+sc/source/filter/xml/xmltransformationi.hxx:160
      ScXMLDateTimeContext::ScXMLDateTimeContext(class ScXMLImport &,const class rtl::Reference<class sax_fastparser::FastAttributeList> &)
 sc/source/ui/inc/dataprovider.hxx:56
     _Bool sc::CSVFetchThread::IsRequestedTerminate()
@@ -1046,16 +1038,20 @@ slideshow/source/engine/animationfactory.cxx:548
     typename type-parameter-?-?::ValueType slideshow::internal::(anonymous namespace)::GenericAnimation::getUnderlyingValue() const
 slideshow/source/engine/opengl/TransitionImpl.hxx:180
     void OGLTransitionImpl::finish(double,double,double,double,double)
+slideshow/test/tests.hxx:33
+    _Bool TestView::isClearCalled() const
+slideshow/test/tests.hxx:34
+    class std::__debug::vector<struct std::pair<class basegfx::B2DVector, double>, class std::allocator<struct std::pair<class basegfx::B2DVector, double> > > TestView::getCreatedSprites() const
+slideshow/test/tests.hxx:35
+    class basegfx::B1DRange TestView::getPriority() const
+slideshow/test/tests.hxx:37
+    _Bool TestView::wasClipSet() const
+slideshow/test/tests.hxx:54
+    int TestShape::getAnimationCount() const
 svgio/inc/svgstyleattributes.hxx:346
     class svgio::svgreader::SvgNumber svgio::svgreader::SvgStyleAttributes::getStrokeDashOffset() const
 svgio/inc/svgstyleattributes.hxx:370
     enum svgio::svgreader::FontStretch svgio::svgreader::SvgStyleAttributes::getFontStretch() const
-svtools/source/contnr/contentenumeration.hxx:65
-    void svt::SortingData_Impl::ChangeTitle(const class rtl::OUString &)
-svtools/source/contnr/contentenumeration.hxx:121
-    _Bool svt::IContentTitleTranslation::GetTranslation(const class rtl::OUString &,class rtl::OUString &) const
-svtools/source/contnr/contentenumeration.hxx:255
-    _Bool svt::FileViewContentEnumerator::implGetDocTitle(const class rtl::OUString &,class rtl::OUString &) const
 svx/inc/sdr/contact/viewcontactofgraphic.hxx:56
     class SdrGrafObj & sdr::contact::ViewContactOfGraphic::GetGrafObject()
 svx/source/svdraw/svdpdf.hxx:92
@@ -1200,8 +1196,6 @@ sw/source/core/access/accportions.cxx:69
     unsigned long FindBreak(const vector<type-parameter-?-?, allocator<type-parameter-?-?> > &,type-parameter-?-?)
 sw/source/core/access/accportions.cxx:73
     unsigned long FindLastBreak(const vector<type-parameter-?-?, allocator<type-parameter-?-?> > &,type-parameter-?-?)
-sw/source/core/inc/doctxm.hxx:79
-    const class std::__debug::vector<class std::unique_ptr<struct SwTOXSortTabBase, struct std::default_delete<struct SwTOXSortTabBase> >, class std::allocator<class std::unique_ptr<struct SwTOXSortTabBase, struct std::default_delete<struct SwTOXSortTabBase> > > > & SwTOXBaseSection::GetTOXSortTabBases() const
 sw/source/core/inc/frame.hxx:908
     void SwFrame::dumpTopMostAsXml(struct _xmlTextWriter *) const
 sw/source/core/inc/frame.hxx:1341
@@ -1214,18 +1208,12 @@ sw/source/core/inc/frame.hxx:1381
     long SwRectFnSet::XInc(long,long) const
 sw/source/core/inc/mvsave.hxx:170
     _Bool ZSortFly::operator==(const class ZSortFly &) const
-sw/source/core/inc/UndoTable.hxx:198
-     SwUndoTableNdsChg::SwUndoTableNdsChg(enum SwUndoId,const class SwSelBoxes &,const class SwTableNode &)
 sw/source/core/text/porlin.hxx:120
     _Bool SwLinePortion::IsTabRightPortion() const
 sw/source/core/text/txtpaint.hxx:73
      DbgRect::DbgRect(class OutputDevice *,const class tools::Rectangle &,const _Bool,class Color)
 sw/source/filter/ww8/ww8struc.hxx:244
      WW8_BRCVer6::WW8_BRCVer6()
-sw/source/ui/dialog/swdlgfact.hxx:239
-     AbstractTabDialog_Impl::AbstractTabDialog_Impl(class SfxTabDialog *)
-sw/source/uibase/inc/prcntfld.hxx:74
-    int SwPercentField::normalize(int) const
 sw/source/uibase/inc/swcont.hxx:85
     _Bool SwContent::operator==(const class SwContent &) const
 test/source/sheet/xsubtotalfield.cxx:28
@@ -1284,7 +1272,7 @@ vcl/inc/PhysicalFontFace.hxx:60
     int PhysicalFontFace::GetWidth() const
 vcl/inc/PhysicalFontFace.hxx:69
     void PhysicalFontFace::SetBitmapSize(int,int)
-vcl/inc/PhysicalFontFamily.hxx:58
+vcl/inc/PhysicalFontFamily.hxx:59
     const class rtl::OUString & PhysicalFontFamily::GetAliasNames() const
 vcl/inc/regionband.hxx:27
     const char * ImplDbgTestRegionBand(const void *)
@@ -1338,10 +1326,10 @@ vcl/source/fontsubset/xlat.hxx:34
     unsigned short vcl::TranslateChar15(unsigned short)
 vcl/source/fontsubset/xlat.hxx:35
     unsigned short vcl::TranslateChar16(unsigned short)
+workdir/LexTarget/l10ntools/source/cfglex.cxx:3721
+    void YYWarning(const char *)
 workdir/LexTarget/l10ntools/source/xrmlex.cxx:715
     void YYWarning()
-workdir/LexTarget/l10ntools/source/xrmlex.cxx:2211
-    void YYWarning(const char *)
 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> > > > writerfilter::ooxml::OOXMLPropertySet::begin() const
 writerfilter/source/ooxml/OOXMLPropertySet.hxx:177
diff --git a/compilerplugins/clang/unusedmethods.unused-returns.results b/compilerplugins/clang/unusedmethods.unused-returns.results
index 23e996d6840e..adfbde858de3 100644
--- a/compilerplugins/clang/unusedmethods.unused-returns.results
+++ b/compilerplugins/clang/unusedmethods.unused-returns.results
@@ -1,4 +1,4 @@
-basctl/source/inc/bastype2.hxx:312
+basctl/source/inc/bastype2.hxx:309
     _Bool basctl::SbTreeListBox::get_selected(class weld::TreeIter *) const
 connectivity/source/inc/java/lang/Object.hxx:117
     int connectivity::java_lang_Object::callIntMethodWithIntArg_ThrowRuntime(const char *,struct _jmethodID *&,int) const
@@ -184,23 +184,23 @@ include/tools/config.hxx:38
     _Bool Config::ImplUpdateConfig() const
 include/tools/multisel.hxx:93
     _Bool StringRangeEnumerator::insertRange(int,int,_Bool)
-include/vcl/bitmap.hxx:186
+include/vcl/bitmap.hxx:184
     _Bool Bitmap::Dither(enum BmpDitherFlags)
 include/vcl/bitmapex.hxx:241
     _Bool BitmapEx::Rotate(long,const class Color &)
-include/vcl/fontcharmap.hxx:48
+include/vcl/fontcharmap.hxx:49
     class tools::SvRef<class FontCharMap> FontCharMap::GetDefaultMap(_Bool)
-include/vcl/gdimtf.hxx:186
+include/vcl/gdimtf.hxx:185
     class SvStream & GDIMetaFile::Read(class SvStream &)
-include/vcl/graphicfilter.hxx:260
+include/vcl/graphicfilter.hxx:261
     class ErrCode GraphicFilter::ExportGraphic(const class Graphic &,const class INetURLObject &,unsigned short,const class com::sun::star::uno::Sequence<struct com::sun::star::beans::PropertyValue> *)
-include/vcl/GraphicNativeTransform.hxx:29
+include/vcl/GraphicNativeTransform.hxx:32
     _Bool GraphicNativeTransform::rotateBitmapOnly(unsigned short)
 include/vcl/menu.hxx:389
     _Bool Menu::HandleMenuActivateEvent(class Menu *) const
 include/vcl/menu.hxx:390
     _Bool Menu::HandleMenuDeActivateEvent(class Menu *) const
-include/vcl/texteng.hxx:279
+include/vcl/texteng.hxx:280
     _Bool TextEngine::Read(class SvStream &,const class TextSelection *)
 include/vcl/toolbox.hxx:514
     _Bool ToolBox::ChangeHighlightUpDn(_Bool)
@@ -226,6 +226,10 @@ sc/source/filter/inc/workbookhelper.hxx:259
     _Bool oox::xls::WorkbookHelper::importOoxFragment(const class rtl::Reference<class oox::core::FragmentHandler> &,class oox::core::FastParser &)
 sc/source/filter/xml/XMLStylesExportHelper.hxx:178
     _Bool ScFormatRangeStyles::AddStyleName(const class rtl::OUString &,int &,const _Bool)
+sc/source/ui/inc/drawview.hxx:161
+    _Bool ScDrawView::calculateGridOffsetForSdrObject(class SdrObject &,class basegfx::B2DVector &) const
+sc/source/ui/inc/drawview.hxx:164
+    _Bool ScDrawView::calculateGridOffsetForB2DRange(const class basegfx::B2DRange &,class basegfx::B2DVector &) const
 sc/source/ui/inc/select.hxx:72
     _Bool ScViewFunctionSet::SetCursorAtCell(short,int,_Bool)
 sc/source/ui/vba/vbaformat.hxx:69
@@ -320,9 +324,9 @@ vcl/inc/unx/saldisp.hxx:313
     _Bool SalDisplay::Dispatch(union _XEvent *)
 vcl/inc/WidgetDrawInterface.hxx:97
     _Bool vcl::WidgetDrawInterface::updateSettings(class AllSettings &)
-vcl/source/gdi/pdfwriter_impl.hxx:1230
+vcl/source/gdi/pdfwriter_impl.hxx:1225
     _Bool vcl::PDFWriterImpl::setCurrentStructureElement(int)
-vcl/source/gdi/pdfwriter_impl.hxx:1231
+vcl/source/gdi/pdfwriter_impl.hxx:1226
     _Bool vcl::PDFWriterImpl::setStructureAttribute(enum vcl::PDFWriter::StructAttribute,enum vcl::PDFWriter::StructAttributeValue)
-vcl/source/gdi/pdfwriter_impl.hxx:1232
+vcl/source/gdi/pdfwriter_impl.hxx:1227
     _Bool vcl::PDFWriterImpl::setStructureAttributeNumerical(enum vcl::PDFWriter::StructAttribute,int)
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 92bc0590f7e7..3214e2dad021 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -1772,70 +1772,6 @@ IMPL_LINK(CuiConfigGroupListBox, ExpandingHdl, weld::TreeIter&, rIter, bool)
     return true;
 }
 
-void CuiConfigGroupListBox::SelectMacro( const OUString& rBasic,
-         const OUString& rMacro )
-{
-    const OUString aBasicName(rBasic + " " + xImp->m_sMacros);
-    const sal_Int32 nCount = comphelper::string::getTokenCount(rMacro, '.');
-    const OUString aMethod( rMacro.copy(rMacro.lastIndexOf('.')+1) );
-    OUString aLib;
-    OUString aModule;
-    if ( nCount > 2 )
-    {
-        aLib = rMacro.getToken( 0, '.' );
-        aModule = rMacro.getToken( nCount-2, '.' );
-    }
-
-    std::unique_ptr<weld::TreeIter> xIter(m_xTreeView->make_iterator());
-    bool bValidIter = m_xTreeView->get_iter_first(*xIter);
-    while (bValidIter)
-    {
-        OUString aEntryBas = m_xTreeView->get_text(*xIter);
-        if (aEntryBas == aBasicName)
-        {
-            m_xTreeView->expand_row(*xIter);
-            std::unique_ptr<weld::TreeIter> xLibIter(m_xTreeView->make_iterator(xIter.get()));
-            bool bValidLibIter = m_xTreeView->iter_children(*xLibIter);
-            while (bValidLibIter)
-            {
-                OUString aEntryLib = m_xTreeView->get_text(*xLibIter);
-                if (aEntryLib == aLib)
-                {
-                    m_xTreeView->expand_row(*xLibIter);
-                    std::unique_ptr<weld::TreeIter> xModIter(m_xTreeView->make_iterator(xLibIter.get()));
-                    bool bValidModIter = m_xTreeView->iter_children(*xModIter);
-                    while (bValidModIter)
-                    {
-                        OUString aEntryMod = m_xTreeView->get_text(*xModIter);
-                        if (aEntryMod == aModule)
-                        {
-                            m_xTreeView->expand_row(*xModIter);
-                            m_xTreeView->scroll_to_row(*xModIter);
-                            m_xTreeView->select(*xModIter);
-                            std::unique_ptr<weld::TreeIter> xMethodIter(m_pFunctionListBox->make_iterator());
-                            bool bValidMethodIter = m_pFunctionListBox->get_iter_first(*xMethodIter);
-                            while (bValidMethodIter)
-                            {
-                                OUString aEntryMethod = m_pFunctionListBox->get_text(*xMethodIter);
-                                if (aEntryMethod == aMethod)
-                                {
-                                    m_pFunctionListBox->scroll_to_row(*xMethodIter);
-                                    m_pFunctionListBox->select(*xMethodIter);
-                                    return;
-                                }
-                                bValidMethodIter = m_pFunctionListBox->iter_next(*xMethodIter);
-                            }
-                        }
-                        bValidModIter = m_xTreeView->iter_next_sibling(*xModIter);
-                    }
-                }
-                bValidLibIter = m_xTreeView->iter_next_sibling(*xLibIter);
-            }
-        }
-        bValidIter = m_xTreeView->iter_next_sibling(*xIter);
-    }
-}
-
 /*
  * Implementation of SvxScriptSelectorDialog
  *
diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx
index 49f0c7ae060f..3161768a32d1 100644
--- a/cui/source/inc/cfgutil.hxx
+++ b/cui/source/inc/cfgutil.hxx
@@ -260,7 +260,6 @@ public:
     void                SetFunctionListBox( CuiConfigFunctionListBox *pBox )
                         { m_pFunctionListBox = pBox; }
     void                GroupSelected();
-    void                SelectMacro( const OUString&, const OUString& );
 };
 
 class SvxScriptSelectorDialog : public ModalDialog
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 32918b296b4a..89ee759b63f8 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -872,11 +872,6 @@ EditPaM EditEngine::CursorRight(const EditPaM& rPaM, sal_uInt16 nCharacterIterat
     return pImpEditEngine->CursorRight(rPaM, nCharacterIteratorMode);
 }
 
-sal_uInt16 EditEngine::GetOnePixelInRef() const
-{
-    return pImpEditEngine->nOnePixelInRef;
-}
-
 InternalEditStatus& EditEngine::GetInternalEditStatus()
 {
     return pImpEditEngine->GetStatus();
diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx
index 9ef500818133..d8144cb41928 100644
--- a/include/editeng/editeng.hxx
+++ b/include/editeng/editeng.hxx
@@ -190,7 +190,6 @@ private:
     EDITENG_DLLPRIVATE Range GetLineXPosStartEnd(
         const ParaPortion* pParaPortion, const EditLine* pLine) const;
 
-    EDITENG_DLLPRIVATE sal_uInt16 GetOnePixelInRef() const;
     EDITENG_DLLPRIVATE InternalEditStatus& GetInternalEditStatus();
 
     EDITENG_DLLPRIVATE void HandleBeginPasteOrDrop(PasteOrDropInfos& rInfos);
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index 4b59cc043cd6..9d6428680804 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -260,8 +260,6 @@ public:
 
     virtual void                Invalidate(sal_uInt16 nId = 0) override;
 
-    SfxObjectShellFlags         GetFlags( ) const;
-
     SfxModule*                  GetModule() const;
 
     virtual SfxObjectFactory&   GetFactory() const=0;
diff --git a/include/svtools/tabbar.hxx b/include/svtools/tabbar.hxx
index 94b3b029062f..7b63f60ce44a 100644
--- a/include/svtools/tabbar.hxx
+++ b/include/svtools/tabbar.hxx
@@ -479,7 +479,6 @@ public:
     virtual void    SetPageText( sal_uInt16 nPageId, const OUString& rText );
     OUString        GetPageText( sal_uInt16 nPageId ) const;
     OUString        GetHelpText( sal_uInt16 nPageId ) const;
-    OString         GetHelpId( sal_uInt16 nPageId ) const;
 
     long            GetSplitSize() const { return mnSplitSize; }
 
diff --git a/include/svx/galctrl.hxx b/include/svx/galctrl.hxx
index c2109ee521ce..575db968193b 100644
--- a/include/svx/galctrl.hxx
+++ b/include/svx/galctrl.hxx
@@ -72,7 +72,6 @@ public:
         GalleryTheme* pTheme = nullptr);
 
     void                SetGraphic( const Graphic& rGraphic ) { aGraphicObj.SetGraphic( rGraphic ); }
-    bool                SetGraphic( const INetURLObject& );
     static void         PreviewMedia( const INetURLObject& rURL );
 };
 
@@ -83,7 +82,6 @@ private:
     tools::Rectangle aPreviewRect;
 
     SVX_DLLPRIVATE bool             ImplGetGraphicCenterRect( const Graphic& rGraphic, tools::Rectangle& rResultRect ) const;
-    SVX_DLLPRIVATE void             InitSettings();
 
     SVX_DLLPRIVATE virtual void     Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override;
 
diff --git a/include/svx/sdr/contact/objectcontact.hxx b/include/svx/sdr/contact/objectcontact.hxx
index dd1606e380fd..ca24cbc79633 100644
--- a/include/svx/sdr/contact/objectcontact.hxx
+++ b/include/svx/sdr/contact/objectcontact.hxx
@@ -156,14 +156,6 @@ public:
     /// access to OutputDevice. May return 0L like the default implementations do. Override as needed.
     virtual OutputDevice* TryToGetOutputDevice() const;
 
-    // reset ViewPort at internal ViewInformation2D. This is needed when the OC is used
-    // not for ProcessDisplay() but to get a VOC associated with it. When trying to get
-    // a sequence of primitives from the VOC then, the last initialized ViewPort from
-    // the last ProcessDisplay() is used for geometric visibility testing. If this is not
-    // wanted (like in such cases) this method is used. It will reuse the current
-    // ViewInformation2D, but clear the ViewPort (no ViewPort means all is visible)
-    void resetViewPort();
-
     // interface to support GridOffset for non-linear ViewToDevice transformation (calc)
     virtual bool supportsGridOffsets() const;
     virtual void calculateGridOffsetForViewOjectContact(
diff --git a/include/vcl/headbar.hxx b/include/vcl/headbar.hxx
index 71cf7fcd5fc2..77d47616883f 100644
--- a/include/vcl/headbar.hxx
+++ b/include/vcl/headbar.hxx
@@ -305,7 +305,6 @@ public:
     OUString            GetItemText( sal_uInt16 nItemId ) const;
 
     OUString            GetHelpText( sal_uInt16 nItemId ) const;
-    OString             GetHelpId( sal_uInt16 nItemId ) const;
 
     Size                CalcWindowSizePixel() const;
 
diff --git a/include/vcl/status.hxx b/include/vcl/status.hxx
index bbd270cc4f88..da7740af2ba6 100644
--- a/include/vcl/status.hxx
+++ b/include/vcl/status.hxx
@@ -163,7 +163,6 @@ public:
     const OUString&     GetQuickHelpText( sal_uInt16 nItemId ) const;
 
     void                SetHelpId( sal_uInt16 nItemId, const OString& rHelpId );
-    OString             GetHelpId( sal_uInt16 nItemId ) const;
 
     void                StartProgressMode( const OUString& rText );
     void                SetProgressValue( sal_uInt16 nPercent );
diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx
index 39b45b1b423b..6a7b3d13e17a 100644
--- a/include/vcl/tabctrl.hxx
+++ b/include/vcl/tabctrl.hxx
@@ -149,7 +149,6 @@ public:
     const OUString&     GetHelpText( sal_uInt16 nPageId ) const;
 
     void                SetHelpId( sal_uInt16 nPageId, const OString& rId ) const;
-    OString             GetHelpId( sal_uInt16 nPageId ) const;
 
     void                SetPageName( sal_uInt16 nPageId, const OString& rName ) const;
     OString             GetPageName( sal_uInt16 nPageId ) const;
diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index 58bf32bb0e26..6e2c7e4b6325 100644
--- a/include/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
@@ -422,7 +422,6 @@ public:
     const OUString&     GetHelpText( sal_uInt16 nItemId ) const;
 
     void                SetHelpId( sal_uInt16 nItemId, const OString& rHelpId );
-    OString             GetHelpId( sal_uInt16 nItemId ) const;
 
     //  window size according to current alignment, floating state and number of lines
     Size                CalcWindowSizePixel();
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 62027f98cec8..a199f99cb4d9 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -1419,13 +1419,6 @@ ErrCode SfxObjectShell::CallXScript( const OUString& rScriptURL,
     return CallXScript( GetModel(), rScriptURL, aParams, aRet, aOutParamIndex, aOutParam, bRaiseError, pCaller );
 }
 
-SfxObjectShellFlags SfxObjectShell::GetFlags() const
-{
-    if( pImpl->eFlags == SfxObjectShellFlags::UNDEFINED )
-        pImpl->eFlags = GetFactory().GetFlags();
-    return pImpl->eFlags;
-}
-
 void SfxHeaderAttributes_Impl::SetAttributes()
 {
     bAlert = true;
diff --git a/slideshow/test/tests.hxx b/slideshow/test/tests.hxx
index 8b511cf0ff6b..36d80607c25f 100644
--- a/slideshow/test/tests.hxx
+++ b/slideshow/test/tests.hxx
@@ -29,12 +29,6 @@ namespace basegfx{ class B1DRange; class B2DRange; class B2DVector; }
 class TestView : public slideshow::internal::UnoView
 {
 public:
-    /// true iff clear() has been called
-    virtual bool isClearCalled() const = 0;
-    virtual std::vector<std::pair<basegfx::B2DVector,double> > getCreatedSprites() const = 0;
-    virtual basegfx::B1DRange getPriority() const = 0;
-    /// true iff setClip was called (on and off)
-    virtual bool wasClipSet() const = 0;
     virtual basegfx::B2DRange getBounds() const = 0;
 
     virtual std::vector<std::shared_ptr<TestView> > getViewLayers() const = 0;
@@ -51,7 +45,6 @@ public:
     std::pair<slideshow::internal::ViewLayerSharedPtr,bool> > getViewLayers() const = 0;
     virtual sal_Int32 getNumUpdates() const = 0;
     virtual sal_Int32 getNumRenders() const = 0;
-    virtual sal_Int32 getAnimationCount() const = 0;
 };
 
 typedef std::shared_ptr<TestShape> TestShapeSharedPtr;
diff --git a/slideshow/test/testshape.cxx b/slideshow/test/testshape.cxx
index fd2d23d7a360..e9926218d283 100644
--- a/slideshow/test/testshape.cxx
+++ b/slideshow/test/testshape.cxx
@@ -191,10 +191,6 @@ private:
     {
         --mnAnimated;
     }
-    virtual sal_Int32 getAnimationCount() const override
-    {
-        return mnAnimated;
-    }
 };
 
 
diff --git a/slideshow/test/testview.cxx b/slideshow/test/testview.cxx
index 48c73e9ef451..f391059722e2 100644
--- a/slideshow/test/testview.cxx
+++ b/slideshow/test/testview.cxx
@@ -138,27 +138,6 @@ public:
         return awt::Rectangle(0,0,100,100);
     }
 
-    // TestView
-    virtual bool isClearCalled() const override
-    {
-        return false;
-    }
-
-    virtual std::vector<std::pair<basegfx::B2DVector,double> > getCreatedSprites() const override
-    {
-        return maCreatedSprites;
-    }
-
-    virtual basegfx::B1DRange getPriority() const override
-    {
-        return maPriority;
-    }
-
-    virtual bool wasClipSet() const override
-    {
-        return mbIsClipEmptied;
-    }
-
     virtual basegfx::B2DRange getBounds() const override
     {
         return maBounds;
diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx
index 884323216aaf..15416b88a880 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -2260,14 +2260,6 @@ OUString TabBar::GetHelpText(sal_uInt16 nPageId) const
     return OUString();
 }
 
-OString TabBar::GetHelpId(sal_uInt16 nPageId) const
-{
-    sal_uInt16 nPos = GetPagePos(nPageId);
-    if (nPos != PAGE_NOT_FOUND)
-        return mpImpl->mpItemList[nPos]->maHelpId;
-    return OString();
-}
-
 bool TabBar::StartDrag(const CommandEvent& rCEvt, vcl::Region& rRegion)
 {
     if (!(mnWinStyle & WB_DRAG) || (rCEvt.GetCommand() != CommandEventId::StartDrag))
diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx
index 6e68f49cb644..73d15e089512 100644
--- a/svx/source/gallery2/galctrl.cxx
+++ b/svx/source/gallery2/galctrl.cxx
@@ -56,29 +56,6 @@ Size GalleryPreview::GetOptimalSize() const
     return LogicToPixel(Size(70, 88), MapMode(MapUnit::MapAppFont));
 }
 
-bool GalleryPreview::SetGraphic( const INetURLObject& _aURL )
-{
-    bool bRet = true;
-    Graphic aGraphic;
-#if HAVE_FEATURE_AVMEDIA
-    if( ::avmedia::MediaWindow::isMediaURL( _aURL.GetMainURL( INetURLObject::DecodeMechanism::Unambiguous ), "" ) )
-    {
-        aGraphic = BitmapEx(RID_SVXBMP_GALLERY_MEDIA);
-    }
-    else
-#endif
-    {
-        GraphicFilter& rFilter = GraphicFilter::GetGraphicFilter();
-        GalleryProgress aProgress( &rFilter );
-        if( rFilter.ImportGraphic( aGraphic, _aURL ) )
-            bRet = false;
-    }
-
-    SetGraphic( aGraphic );
-    Invalidate();
-    return bRet;
-}
-
 void GalleryPreview::InitSettings()
 {
     SetBackground( Wallpaper( GALLERY_BG_COLOR ) );
diff --git a/svx/source/sdr/contact/objectcontact.cxx b/svx/source/sdr/contact/objectcontact.cxx
index 33839d8c83f0..058c5ddce7d6 100644
--- a/svx/source/sdr/contact/objectcontact.cxx
+++ b/svx/source/sdr/contact/objectcontact.cxx
@@ -209,26 +209,6 @@ OutputDevice* ObjectContact::TryToGetOutputDevice() const
     return nullptr;
 }
 
-void ObjectContact::resetViewPort()
-{
-    const drawinglayer::geometry::ViewInformation2D& rCurrentVI2D = getViewInformation2D();
-
-    if(!rCurrentVI2D.getViewport().isEmpty())
-    {
-        const basegfx::B2DRange aEmptyRange;
-
-        drawinglayer::geometry::ViewInformation2D aNewVI2D(
-            rCurrentVI2D.getObjectTransformation(),
-            rCurrentVI2D.getViewTransformation(),
-            aEmptyRange,
-            rCurrentVI2D.getVisualizedPage(),
-            rCurrentVI2D.getViewTime(),
-            rCurrentVI2D.getExtendedInformationSequence());
-
-        updateViewInformation2D(aNewVI2D);
-    }
-}
-
 void ObjectContact::resetAllGridOffsets()
 {
     const sal_uInt32 nVOCCount(getViewObjectContactCount());
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index 5e1d5f97707a..82401c5c06a4 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -1958,16 +1958,6 @@ void TabControl::SetHelpId( sal_uInt16 nPageId, const OString& rId ) const
         pItem->maHelpId = rId;
 }
 
-OString TabControl::GetHelpId( sal_uInt16 nPageId ) const
-{
-    ImplTabItem* pItem = ImplGetItem( nPageId );
-
-    if (pItem)
-        return pItem->maHelpId;
-
-    return OString();
-}
-
 void TabControl::SetPageName( sal_uInt16 nPageId, const OString& rName ) const
 {
     ImplTabItem* pItem = ImplGetItem( nPageId );
diff --git a/vcl/source/treelist/headbar.cxx b/vcl/source/treelist/headbar.cxx
index aefedb609505..36905ae6f992 100644
--- a/vcl/source/treelist/headbar.cxx
+++ b/vcl/source/treelist/headbar.cxx
@@ -1259,14 +1259,6 @@ OUString HeaderBar::GetHelpText( sal_uInt16 nItemId ) const
     return OUString();
 }
 
-OString HeaderBar::GetHelpId( sal_uInt16 nItemId ) const
-{
-    sal_uInt16 nPos = GetItemPos( nItemId );
-    if ( nPos != HEADERBAR_ITEM_NOTFOUND )
-        return mvItemList[ nPos ]->maHelpId;
-    return OString();
-}
-
 Size HeaderBar::CalcWindowSizePixel() const
 {
     long nMaxImageSize = 0;
diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx
index 12bc7cbc3039..ce605fa4d4b1 100644
--- a/vcl/source/window/status.cxx
+++ b/vcl/source/window/status.cxx
@@ -1309,23 +1309,6 @@ void StatusBar::SetHelpId( sal_uInt16 nItemId, const OString& rHelpId )
         mvItemList[ nPos ]->maHelpId = rHelpId;
 }
 
-OString StatusBar::GetHelpId( sal_uInt16 nItemId ) const
-{
-    sal_uInt16 nPos = GetItemPos( nItemId );
-
-    OString aRet;
-    if ( nPos != STATUSBAR_ITEM_NOTFOUND )
-    {
-        ImplStatusItem* pItem = mvItemList[ nPos ].get();
-        if ( !pItem->maHelpId.isEmpty() )
-            aRet = pItem->maHelpId;
-        else
-            aRet = OUStringToOString( pItem->maCommand, RTL_TEXTENCODING_UTF8 );
-    }
-
-    return aRet;
-}
-
 void StatusBar::StartProgressMode( const OUString& rText )
 {
     SAL_WARN_IF( mbProgressMode, "vcl", "StatusBar::StartProgressMode(): progress mode is active" );
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index 082cab508b82..316c4acbde54 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -1399,23 +1399,6 @@ void ToolBox::SetHelpId( sal_uInt16 nItemId, const OString& rHelpId )
         pItem->maHelpId = rHelpId;
 }
 
-OString ToolBox::GetHelpId( sal_uInt16 nItemId ) const
-{
-    OString aRet;
-
-    ImplToolItem* pItem = ImplGetItem( nItemId );
-
-    if ( pItem )
-    {
-        if ( !pItem->maHelpId.isEmpty() )
-            aRet = pItem->maHelpId;
-        else
-            aRet = OUStringToOString( pItem->maCommandStr, RTL_TEXTENCODING_UTF8 );
-    }
-
-    return aRet;
-}
-
 void ToolBox::SetOutStyle( sal_uInt16 nNewStyle )
 {
     // always force flat looking toolbars since NWF


More information about the Libreoffice-commits mailing list