summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-05-16 10:11:04 +0200
committerNoel Grandin <noelgrandin@gmail.com>2016-05-18 10:03:44 +0000
commit2c8fe2e737b84ecd3dbac36a4fe6bd061bbd3bae (patch)
tree66ba7ff0b95cf5ceeda5e53294a71c6786460eb3
parent4e59eecc077d27dd9762e7c890b2aaf92a212959 (diff)
update unusedmethods plugin to deal with constructors
and fix the operator< implementations in some of the other plugins too. Change-Id: Ie5631e0cdc8d2a994ad2af2533cdb558a6cfc035 Reviewed-on: https://gerrit.libreoffice.org/25057 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
-rw-r--r--accessibility/inc/accessibility/helper/accresmgr.hxx2
-rw-r--r--basctl/source/inc/baside3.hxx1
-rw-r--r--basctl/source/inc/docsignature.hxx2
-rw-r--r--basic/source/sbx/sbxbase.cxx13
-rw-r--r--chart2/Library_chartcore.mk1
-rw-r--r--chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx1
-rw-r--r--chart2/source/inc/LifeTime.hxx5
-rw-r--r--chart2/source/inc/ModifyListenerCallBack.hxx57
-rw-r--r--chart2/source/tools/ModifyListenerCallBack.cxx105
-rw-r--r--chart2/source/view/axes/VAxisProperties.hxx2
-rw-r--r--chart2/source/view/charttypes/VSeriesPlotter.cxx8
-rw-r--r--chart2/source/view/inc/VSeriesPlotter.hxx2
-rw-r--r--comphelper/source/container/embeddedobjectcontainer.cxx6
-rw-r--r--comphelper/source/inc/comphelper_module.hxx12
-rw-r--r--compilerplugins/clang/constantparam.cxx11
-rw-r--r--compilerplugins/clang/unuseddefaultparams.cxx3
-rw-r--r--compilerplugins/clang/unusedfields.cxx8
-rw-r--r--compilerplugins/clang/unusedmethods.cxx33
-rw-r--r--configmgr/source/nodemap.hxx3
-rw-r--r--connectivity/source/drivers/mork/MQueryHelper.hxx1
-rw-r--r--connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx8
-rw-r--r--connectivity/source/inc/RowFunctionParser.hxx4
-rw-r--r--connectivity/source/inc/TSortIndex.hxx3
-rw-r--r--connectivity/source/inc/file/fcode.hxx2
-rw-r--r--connectivity/source/inc/file/quotedstring.hxx1
-rw-r--r--connectivity/source/inc/java/math/BigDecimal.hxx2
-rw-r--r--connectivity/source/inc/java/sql/DriverPropertyInfo.hxx2
-rw-r--r--connectivity/source/inc/java/sql/SQLException.hxx1
-rw-r--r--connectivity/source/inc/java/util/Property.hxx2
-rw-r--r--cui/source/dialogs/SpellAttrib.hxx12
-rw-r--r--cui/source/inc/autocdlg.hxx7
-rw-r--r--cui/source/inc/cuihyperdlg.hxx1
-rw-r--r--cui/source/inc/insdlg.hxx13
-rw-r--r--cui/source/inc/macropg.hxx1
-rw-r--r--cui/source/inc/optdict.hxx2
-rw-r--r--cui/source/inc/scriptdlg.hxx2
-rw-r--r--cui/source/options/optinet2.cxx34
-rw-r--r--cui/source/options/optinet2.hxx13
-rw-r--r--cui/source/options/optjava.hxx3
-rw-r--r--dbaccess/source/core/api/RowSetRow.hxx1
-rw-r--r--dbaccess/source/core/api/datasettings.cxx15
-rw-r--r--dbaccess/source/core/inc/core_resource.hxx2
-rw-r--r--dbaccess/source/core/inc/datasettings.hxx2
-rw-r--r--dbaccess/source/core/recovery/subcomponents.hxx6
-rw-r--r--dbaccess/source/ext/macromigration/migrationerror.hxx6
-rw-r--r--dbaccess/source/filter/xml/xmlExport.hxx3
-rw-r--r--dbaccess/source/ui/dlg/TextConnectionHelper.hxx2
-rw-r--r--dbaccess/source/ui/dlg/dbfindex.hxx1
-rw-r--r--dbaccess/source/ui/dlg/detailpages.hxx7
-rw-r--r--dbaccess/source/ui/inc/SqlNameEdit.hxx10
-rw-r--r--dbaccess/source/ui/inc/TokenWriter.hxx6
-rw-r--r--dbaccess/source/ui/inc/defaultobjectnamecheck.hxx6
-rw-r--r--dbaccess/source/ui/inc/indexes.hxx3
-rw-r--r--dbaccess/source/ui/misc/UpdateHelperImpl.hxx49
-rw-r--r--desktop/source/deployment/manager/dp_commandenvironments.hxx2
-rw-r--r--drawinglayer/source/attribute/fillgraphicattribute.cxx5
-rw-r--r--drawinglayer/source/attribute/fontattribute.cxx5
-rw-r--r--drawinglayer/source/attribute/materialattribute3d.cxx5
-rw-r--r--drawinglayer/source/attribute/sdrlightattribute3d.cxx17
-rw-r--r--drawinglayer/source/attribute/sdrobjectattribute3d.cxx25
-rw-r--r--editeng/source/editeng/editdoc.hxx10
-rw-r--r--editeng/source/editeng/editundo.hxx3
-rw-r--r--editeng/source/editeng/impedit.hxx1
-rw-r--r--editeng/source/outliner/overflowingtxt.cxx6
-rw-r--r--extensions/source/abpilot/datasourcehandling.hxx3
-rw-r--r--extensions/source/propctrlr/pcrcommon.hxx1
-rw-r--r--extensions/source/propctrlr/unourl.hxx3
-rw-r--r--filter/Library_xmlfa.mk1
-rw-r--r--filter/source/flash/swfwriter.hxx1
-rw-r--r--filter/source/flash/swfwriter2.cxx12
-rw-r--r--filter/source/graphicfilter/icgm/cgmtypes.hxx8
-rw-r--r--filter/source/svg/gfxtypes.hxx12
-rw-r--r--filter/source/svg/svgfilter.hxx4
-rw-r--r--filter/source/svg/svgwriter.hxx3
-rw-r--r--filter/source/xmlfilteradaptor/streamwrap.cxx59
-rw-r--r--filter/source/xmlfilteradaptor/streamwrap.hxx58
-rw-r--r--forms/source/component/DatabaseForm.hxx4
-rw-r--r--forms/source/component/FormComponent.cxx12
-rw-r--r--forms/source/inc/FormComponent.hxx6
-rw-r--r--forms/source/inc/frm_resource.hxx2
-rw-r--r--forms/source/inc/property.hxx2
-rw-r--r--formula/source/core/api/token.cxx17
-rw-r--r--formula/source/core/inc/core_resource.hxx2
-rw-r--r--framework/inc/classes/filtercache.hxx92
-rw-r--r--framework/inc/classes/filtercachedata.hxx330
-rw-r--r--framework/inc/classes/wildcard.hxx65
-rw-r--r--framework/inc/helper/mischelper.hxx27
-rw-r--r--framework/inc/queries.h301
-rw-r--r--framework/inc/uielement/itemcontainer.hxx1
-rw-r--r--framework/inc/uielement/statusindicatorinterfacewrapper.hxx2
-rw-r--r--framework/source/inc/loadenv/actionlockguard.hxx11
-rw-r--r--framework/source/services/sessionlistener.cxx1
-rw-r--r--hwpfilter/source/mzstring.h1
-rw-r--r--idl/inc/bastype.hxx1
-rw-r--r--idl/inc/lex.hxx14
-rw-r--r--include/basic/sbxcore.hxx1
-rw-r--r--include/basic/sbxvar.hxx14
-rw-r--r--include/comphelper/anycompare.hxx3
-rw-r--r--include/comphelper/componentmodule.hxx8
-rw-r--r--include/comphelper/embeddedobjectcontainer.hxx1
-rw-r--r--include/comphelper/interaction.hxx4
-rw-r--r--include/comphelper/servicedecl.hxx4
-rw-r--r--include/connectivity/FValue.hxx1
-rw-r--r--include/connectivity/TTableHelper.hxx1
-rw-r--r--include/connectivity/parameters.hxx6
-rw-r--r--include/dbaccess/genericcontroller.hxx1
-rw-r--r--include/drawinglayer/attribute/fillgraphicattribute.hxx1
-rw-r--r--include/drawinglayer/attribute/fontattribute.hxx3
-rw-r--r--include/drawinglayer/attribute/materialattribute3d.hxx3
-rw-r--r--include/drawinglayer/attribute/sdrlightattribute3d.hxx5
-rw-r--r--include/drawinglayer/attribute/sdrobjectattribute3d.hxx4
-rw-r--r--include/drawinglayer/primitive3d/baseprimitive3d.hxx1
-rw-r--r--include/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx8
-rw-r--r--include/editeng/AccessibleParaManager.hxx5
-rw-r--r--include/editeng/overflowingtxt.hxx1
-rw-r--r--include/editeng/txtrange.hxx1
-rw-r--r--include/editeng/unoedhlp.hxx2
-rw-r--r--include/filter/msfilter/escherex.hxx1
-rw-r--r--include/filter/msfilter/msdffimp.hxx2
-rw-r--r--include/filter/msfilter/mstoolbar.hxx1
-rw-r--r--include/filter/msfilter/svdfppt.hxx1
-rw-r--r--include/formula/token.hxx16
-rw-r--r--include/linguistic/lngprophelp.hxx12
-rw-r--r--include/linguistic/spelldta.hxx4
-rw-r--r--include/oox/crypto/CryptTools.hxx2
-rw-r--r--include/oox/drawingml/drawingmltypes.hxx1
-rw-r--r--include/registry/reader.hxx5
-rw-r--r--include/sax/tools/documenthandleradapter.hxx6
-rw-r--r--include/sfx2/app.hxx1
-rw-r--r--include/sfx2/bindings.hxx1
-rw-r--r--include/sfx2/ctrlitem.hxx8
-rw-r--r--include/sfx2/dinfedt.hxx40
-rw-r--r--include/sfx2/dockwin.hxx4
-rw-r--r--include/sfx2/fcontnr.hxx12
-rw-r--r--include/sfx2/frmdescr.hxx28
-rw-r--r--include/sfx2/module.hxx1
-rw-r--r--include/sfx2/objface.hxx2
-rw-r--r--include/sfx2/objsh.hxx4
-rw-r--r--include/sfx2/sidebar/ControllerItem.hxx6
-rw-r--r--include/sfx2/tbxctrl.hxx47
-rw-r--r--include/sfx2/unoctitm.hxx1
-rw-r--r--include/sot/storage.hxx2
-rw-r--r--include/sot/storinfo.hxx1
-rw-r--r--include/store/store.hxx27
-rw-r--r--include/svl/ctypeitm.hxx1
-rw-r--r--include/svl/nranges.hxx2
-rw-r--r--include/svl/ondemand.hxx39
-rw-r--r--include/svl/ownlist.hxx1
-rw-r--r--include/svl/poolitem.hxx1
-rw-r--r--include/svl/rngitem.hxx2
-rw-r--r--include/svl/svdde.hxx11
-rw-r--r--include/svl/szitem.hxx1
-rw-r--r--include/svtools/ServerDetailsControls.hxx2
-rw-r--r--include/svtools/accessibilityoptions.hxx8
-rw-r--r--include/svtools/brwbox.hxx4
-rw-r--r--include/svtools/imap.hxx3
-rw-r--r--include/svtools/inettbc.hxx1
-rw-r--r--include/svtools/menuoptions.hxx3
-rw-r--r--include/svtools/stdmenu.hxx145
-rw-r--r--include/svtools/table/tablesort.hxx5
-rw-r--r--include/svtools/transfer.hxx4
-rw-r--r--sfx2/Library_sfx.mk1
-rw-r--r--sfx2/source/control/bindings.cxx47
-rw-r--r--sfx2/source/control/ctrlitem.cxx20
-rw-r--r--sfx2/source/control/unoctitm.cxx8
-rw-r--r--sfx2/source/dialog/dinfdlg.cxx1
-rw-r--r--sfx2/source/dialog/dinfedt.cxx34
-rw-r--r--sfx2/source/dialog/dockwin.cxx46
-rw-r--r--sfx2/source/doc/frmdescr.cxx30
-rw-r--r--sfx2/source/sidebar/ControllerItem.cxx7
-rw-r--r--sot/source/sdstor/storage.cxx13
-rw-r--r--store/source/lockbyte.cxx4
-rw-r--r--svl/source/items/ctypeitm.cxx6
-rw-r--r--svl/source/items/nranges.cxx9
-rw-r--r--svl/source/items/rngitem.cxx12
-rw-r--r--svl/source/items/szitem.cxx5
-rw-r--r--svl/source/svdde/ddecli.cxx22
-rw-r--r--svtools/Library_svt.mk1
-rw-r--r--svtools/source/config/accessibilityoptions.cxx175
-rw-r--r--svtools/source/config/menuoptions.cxx31
-rw-r--r--svtools/source/control/inettbc.cxx14
-rw-r--r--svtools/source/control/stdmenu.cxx219
-rw-r--r--svtools/source/dialogs/ServerDetailsControls.cxx5
-rw-r--r--svx/inc/pch/precompiled_svx.hxx1
-rw-r--r--sw/inc/SwAppletImpl.hxx16
185 files changed, 60 insertions, 2857 deletions
diff --git a/accessibility/inc/accessibility/helper/accresmgr.hxx b/accessibility/inc/accessibility/helper/accresmgr.hxx
index 9e27881884c3..fe8ae624843e 100644
--- a/accessibility/inc/accessibility/helper/accresmgr.hxx
+++ b/accessibility/inc/accessibility/helper/accresmgr.hxx
@@ -38,7 +38,7 @@ class TkResMgr
private:
// no instantiation allowed
- TkResMgr() { }
+ TkResMgr() = delete;
~TkResMgr() { }
// we'll instantiate one static member of the following class,
diff --git a/basctl/source/inc/baside3.hxx b/basctl/source/inc/baside3.hxx
index 4d6a1f1edac9..a7cd5585739c 100644
--- a/basctl/source/inc/baside3.hxx
+++ b/basctl/source/inc/baside3.hxx
@@ -81,7 +81,6 @@ protected:
public:
DialogWindow (DialogWindowLayout* pParent, ScriptDocument const& rDocument, const OUString& aLibName, const OUString& aName, css::uno::Reference<css::container::XNameContainer> const& xDialogModel);
- DialogWindow( DialogWindow* pCurView ); // never implemented
virtual void ExecuteCommand( SfxRequest& rReq ) override;
virtual void GetState( SfxItemSet& ) override;
diff --git a/basctl/source/inc/docsignature.hxx b/basctl/source/inc/docsignature.hxx
index 546b1fb46d4f..b5c49dd6d311 100644
--- a/basctl/source/inc/docsignature.hxx
+++ b/basctl/source/inc/docsignature.hxx
@@ -63,7 +63,7 @@ namespace basctl
SignatureState getScriptingSignatureState() const;
private:
- DocumentSignature(); // not implemented
+ DocumentSignature() = delete;
private:
struct Impl;
diff --git a/basic/source/sbx/sbxbase.cxx b/basic/source/sbx/sbxbase.cxx
index 2e7532916891..3eb9e6f4fb72 100644
--- a/basic/source/sbx/sbxbase.cxx
+++ b/basic/source/sbx/sbxbase.cxx
@@ -242,19 +242,6 @@ SbxBase* SbxBase::Load( SvStream& rStrm )
return p;
}
-// Skip the Sbx-Object inside the stream
-void SbxBase::Skip( SvStream& rStrm )
-{
- sal_uInt16 nSbxId, nFlags, nVer;
- sal_uInt32 nCreator, nSize;
- rStrm.ReadUInt32( nCreator ).ReadUInt16( nSbxId ).ReadUInt16( nFlags ).ReadUInt16( nVer );
-
- sal_Size nStartPos = rStrm.Tell();
- rStrm.ReadUInt32( nSize );
-
- rStrm.Seek( nStartPos + nSize );
-}
-
bool SbxBase::Store( SvStream& rStrm )
{
if( ( nFlags & SbxFlagBits::DontStore ) == SbxFlagBits::NONE )
diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk
index 99d3c3328776..7040ade3298b 100644
--- a/chart2/Library_chartcore.mk
+++ b/chart2/Library_chartcore.mk
@@ -215,7 +215,6 @@ $(eval $(call gb_Library_add_exception_objects,chartcore,\
chart2/source/tools/LogarithmicRegressionCurveCalculator \
chart2/source/tools/MeanValueRegressionCurveCalculator \
chart2/source/tools/MediaDescriptorHelper \
- chart2/source/tools/ModifyListenerCallBack \
chart2/source/tools/ModifyListenerHelper \
chart2/source/tools/MovingAverageRegressionCurveCalculator \
chart2/source/tools/MutexContainer \
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx
index 900a1f6306d6..7d8834aac1df 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx
@@ -19,7 +19,6 @@
#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_TP_3D_SCENEILLUMINATION_HXX
#define INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_TP_3D_SCENEILLUMINATION_HXX
-#include "ModifyListenerCallBack.hxx"
#include "TimerTriggeredControllerLock.hxx"
#include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/chart2/source/inc/LifeTime.hxx b/chart2/source/inc/LifeTime.hxx
index 6552d2abbc86..e1e3ac6cdfdc 100644
--- a/chart2/source/inc/LifeTime.hxx
+++ b/chart2/source/inc/LifeTime.hxx
@@ -211,11 +211,6 @@ protected:
T * m_pT;
public:
- NegativeGuard(T * pT) : m_pT(pT)
- {
- m_pT->release();
- }
-
NegativeGuard(T & t) : m_pT(&t)
{
m_pT->release();
diff --git a/chart2/source/inc/ModifyListenerCallBack.hxx b/chart2/source/inc/ModifyListenerCallBack.hxx
deleted file mode 100644
index 99c075a68289..000000000000
--- a/chart2/source/inc/ModifyListenerCallBack.hxx
+++ /dev/null
@@ -1,57 +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_CHART2_SOURCE_INC_MODIFYLISTENERCALLBACK_HXX
-#define INCLUDED_CHART2_SOURCE_INC_MODIFYLISTENERCALLBACK_HXX
-
-#include <tools/link.hxx>
-#include <com/sun/star/util/XModifyBroadcaster.hpp>
-#include <com/sun/star/util/XModifyListener.hpp>
-#include "charttoolsdllapi.hxx"
-
-namespace chart {
-
-/** Use this class as a member if you want to listen on a XModifyBroadcaster
-without becoming a XModifyListener yourself
- */
-
-class ModifyListenerCallBack_impl;
-
-class OOO_DLLPUBLIC_CHARTTOOLS ModifyListenerCallBack
-{
-public:
- explicit ModifyListenerCallBack( const Link<void*,void>& rCallBack );
-
- virtual ~ModifyListenerCallBack();
-
- SAL_DLLPRIVATE void stopListening();
-
-private: //methods
- ModifyListenerCallBack( const ModifyListenerCallBack& ) = delete;
-
-private: //member
- ModifyListenerCallBack_impl* pModifyListener_impl;
- css::uno::Reference< css::util::XModifyListener > m_xModifyListener;
-};
-
-} // namespace chart
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/ModifyListenerCallBack.cxx b/chart2/source/tools/ModifyListenerCallBack.cxx
deleted file mode 100644
index 0ac16b840aca..000000000000
--- a/chart2/source/tools/ModifyListenerCallBack.cxx
+++ /dev/null
@@ -1,105 +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 .
- */
-
-#include "ModifyListenerCallBack.hxx"
-#include "MutexContainer.hxx"
-#include <cppuhelper/compbase.hxx>
-
-using namespace ::com::sun::star;
-using ::com::sun::star::uno::Reference;
-
-namespace chart {
-
-typedef ::cppu::WeakComponentImplHelper< css::util::XModifyListener >
- ModifyListenerCallBack_Base;
-
-class ModifyListenerCallBack_impl
- : public ::chart::MutexContainer
- , public ModifyListenerCallBack_Base
-{
-public:
- explicit ModifyListenerCallBack_impl( const Link<void*,void>& rCallBack );
- virtual ~ModifyListenerCallBack_impl();
-
- void stopListening();
-
- //XModifyListener
- virtual void SAL_CALL modified( const lang::EventObject& aEvent ) throw (uno::RuntimeException, std::exception) override;
-
- //XEventListener
- virtual void SAL_CALL disposing( const lang::EventObject& Source ) throw (uno::RuntimeException, std::exception) override;
-
- using ::cppu::WeakComponentImplHelperBase::disposing;
-
-private:
- Link<void*,void> m_aLink;//will be called on modify
- Reference< util::XModifyBroadcaster > m_xBroadcaster;//broadcaster to listen at
-};
-
-ModifyListenerCallBack_impl::ModifyListenerCallBack_impl( const Link<void*,void>& rCallBack )
- : ModifyListenerCallBack_Base( m_aMutex )
- , m_aLink( rCallBack )
- , m_xBroadcaster(nullptr)
-{
-}
-
-ModifyListenerCallBack_impl::~ModifyListenerCallBack_impl()
-{
-}
-
-//XModifyListener
-void SAL_CALL ModifyListenerCallBack_impl::modified( const lang::EventObject& /*aEvent*/ ) throw (uno::RuntimeException, std::exception)
-{
- m_aLink.Call(nullptr);
-}
-
-//XEventListener
-void SAL_CALL ModifyListenerCallBack_impl::disposing( const lang::EventObject& /*Source*/ ) throw (uno::RuntimeException, std::exception)
-{
- m_xBroadcaster.clear();
-}
-
-void ModifyListenerCallBack_impl::stopListening()
-{
- if( m_xBroadcaster.is() )
- {
- m_xBroadcaster->removeModifyListener( this );
- m_xBroadcaster.clear();
- }
-}
-
-ModifyListenerCallBack::ModifyListenerCallBack( const Link<void*,void>& rCallBack )
- : pModifyListener_impl( new ModifyListenerCallBack_impl(rCallBack) )
- , m_xModifyListener( pModifyListener_impl )
-{
-}
-
-ModifyListenerCallBack::~ModifyListenerCallBack()
-{
- stopListening();
-}
-
-void ModifyListenerCallBack::stopListening()
-{
- pModifyListener_impl->stopListening();
-}
-
-} // namespace chart
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/axes/VAxisProperties.hxx b/chart2/source/view/axes/VAxisProperties.hxx
index 53d78c4c6a60..e6ecc72061a9 100644
--- a/chart2/source/view/axes/VAxisProperties.hxx
+++ b/chart2/source/view/axes/VAxisProperties.hxx
@@ -155,7 +155,7 @@ struct AxisProperties final
TickmarkProperties makeTickmarkPropertiesForComplexCategories( sal_Int32 nTickLength, sal_Int32 nTickStartDistanceToAxis, sal_Int32 nTextLevel ) const;
private:
- AxisProperties();
+ AxisProperties() = delete;
TickmarkProperties makeTickmarkProperties( sal_Int32 nDepth ) const;
//@todo get this from somewhere; maybe for each subincrement
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index 8af02b0c1762..62966d3e790f 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -102,14 +102,6 @@ VDataSeriesGroup::CachedYValues::CachedYValues()
{
}
-VDataSeriesGroup::VDataSeriesGroup()
- : m_aSeriesVector()
- , m_bMaxPointCountDirty(true)
- , m_nMaxPointCount(0)
- , m_aListOfCachedYValues()
-{
-}
-
VDataSeriesGroup::VDataSeriesGroup( VDataSeries* pSeries )
: m_aSeriesVector(1,pSeries)
, m_bMaxPointCountDirty(true)
diff --git a/chart2/source/view/inc/VSeriesPlotter.hxx b/chart2/source/view/inc/VSeriesPlotter.hxx
index 2eeeb1af14ae..fb4ffbb8c6af 100644
--- a/chart2/source/view/inc/VSeriesPlotter.hxx
+++ b/chart2/source/view/inc/VSeriesPlotter.hxx
@@ -76,7 +76,7 @@ private:
class VDataSeriesGroup final
{
public:
- VDataSeriesGroup();
+ VDataSeriesGroup() = delete;
VDataSeriesGroup( VDataSeries* pSeries );
~VDataSeriesGroup();
diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx b/comphelper/source/container/embeddedobjectcontainer.cxx
index 169f37516bcb..1850c76eec45 100644
--- a/comphelper/source/container/embeddedobjectcontainer.cxx
+++ b/comphelper/source/container/embeddedobjectcontainer.cxx
@@ -1172,12 +1172,6 @@ uno::Reference < io::XInputStream > EmbeddedObjectContainer::GetObjectStream( co
return xInputStream;
}
-uno::Reference < io::XInputStream > EmbeddedObjectContainer::GetObjectStream( const uno::Reference < embed::XEmbeddedObject >& xObj )
-{
- // try to load it from the container storage
- return GetObjectStream( GetEmbeddedObjectName( xObj ), nullptr );
-}
-
bool EmbeddedObjectContainer::InsertGraphicStream( const css::uno::Reference < css::io::XInputStream >& rStream, const OUString& rObjectName, const OUString& rMediaType )
{
try
diff --git a/comphelper/source/inc/comphelper_module.hxx b/comphelper/source/inc/comphelper_module.hxx
index 8c587f033a1b..7569eb7ff050 100644
--- a/comphelper/source/inc/comphelper_module.hxx
+++ b/comphelper/source/inc/comphelper_module.hxx
@@ -40,18 +40,6 @@ namespace comphelper { namespace module
};
/* -------------------------------------------------------------------- */
- class ComphelperModuleClient : public ::comphelper::OModuleClient
- {
- private:
- typedef ::comphelper::OModuleClient BaseClass;
-
- public:
- ComphelperModuleClient() : BaseClass( ComphelperModule::getInstance() )
- {
- }
- };
-
- /* -------------------------------------------------------------------- */
template < class TYPE >
class OAutoRegistration : public ::comphelper::OAutoRegistration< TYPE >
{
diff --git a/compilerplugins/clang/constantparam.cxx b/compilerplugins/clang/constantparam.cxx
index 570cb96ca9f5..99db54554dbd 100644
--- a/compilerplugins/clang/constantparam.cxx
+++ b/compilerplugins/clang/constantparam.cxx
@@ -38,15 +38,8 @@ struct MyCallSiteInfo
};
bool operator < (const MyCallSiteInfo &lhs, const MyCallSiteInfo &rhs)
{
- if (lhs.sourceLocation < rhs.sourceLocation)
- return true;
- else if (lhs.sourceLocation > rhs.sourceLocation)
- return false;
- else if (lhs.paramIndex < rhs.paramIndex)
- return true;
- else if (lhs.paramIndex > rhs.paramIndex)
- return false;
- else return lhs.callValue < rhs.callValue;
+ return std::tie(lhs.sourceLocation, lhs.paramIndex, lhs.callValue)
+ < std::tie(rhs.sourceLocation, rhs.paramIndex, rhs.callValue);
}
diff --git a/compilerplugins/clang/unuseddefaultparams.cxx b/compilerplugins/clang/unuseddefaultparams.cxx
index 21979eaa780c..0a3ce28cc761 100644
--- a/compilerplugins/clang/unuseddefaultparams.cxx
+++ b/compilerplugins/clang/unuseddefaultparams.cxx
@@ -36,7 +36,8 @@ struct MyFuncInfo
};
bool operator < (const MyFuncInfo &lhs, const MyFuncInfo &rhs)
{
- return lhs.sourceLocation < rhs.sourceLocation;
+ return std::tie(lhs.returnType, lhs.nameAndParams)
+ < std::tie(rhs.returnType, rhs.nameAndParams);
}
diff --git a/compilerplugins/clang/unusedfields.cxx b/compilerplugins/clang/unusedfields.cxx
index dd928d302772..a370cb37c449 100644
--- a/compilerplugins/clang/unusedfields.cxx
+++ b/compilerplugins/clang/unusedfields.cxx
@@ -50,12 +50,8 @@ struct MyFieldInfo
};
bool operator < (const MyFieldInfo &lhs, const MyFieldInfo &rhs)
{
- if (lhs.parentClass < rhs.parentClass)
- return true;
- else if (lhs.parentClass == rhs.parentClass)
- return lhs.fieldName < rhs.fieldName;
- else
- return false;
+ return std::tie(lhs.parentClass, lhs.fieldName)
+ < std::tie(rhs.parentClass, rhs.fieldName);
}
diff --git a/compilerplugins/clang/unusedmethods.cxx b/compilerplugins/clang/unusedmethods.cxx
index e0b971882a51..fe5825fbfd4f 100644
--- a/compilerplugins/clang/unusedmethods.cxx
+++ b/compilerplugins/clang/unusedmethods.cxx
@@ -25,12 +25,12 @@ This plugin performs 3 different analyses:
It does so, by dumping various call/definition/use info to a log file.
Then we will post-process the various lists and find the set of unused methods.
-Be warned that it produces around 5G of log file.
+Be warned that it produces around 15G of log file.
The process goes something like this:
$ make check
$ make FORCE_COMPILE_ALL=1 COMPILER_PLUGIN_TOOL='unusedmethods' check
- $ ./compilerplugins/clang/unusedmethods.py unusedmethods.log > result.txt
+ $ ./compilerplugins/clang/unusedmethods.py unusedmethods.log
and then
$ for dir in *; do make FORCE_COMPILE_ALL=1 UPDATE_FILES=$dir COMPILER_PLUGIN_TOOL='unusedmethodsremove' $dir; done
@@ -55,7 +55,8 @@ struct MyFuncInfo
};
bool operator < (const MyFuncInfo &lhs, const MyFuncInfo &rhs)
{
- return lhs.sourceLocation < rhs.sourceLocation;
+ return std::tie(lhs.returnType, lhs.nameAndParams)
+ < std::tie(rhs.returnType, rhs.nameAndParams);
}
// try to limit the voluminous output a little
@@ -102,10 +103,12 @@ public:
}
bool shouldVisitTemplateInstantiations () const { return true; }
+ bool shouldVisitImplicitCode() const { return true; }
bool VisitCallExpr(CallExpr* );
bool VisitFunctionDecl( const FunctionDecl* decl );
bool VisitDeclRefExpr( const DeclRefExpr* );
+ bool VisitCXXConstructExpr( const CXXConstructExpr* );
private:
void logCallToRootMethods(const FunctionDecl* functionDecl, std::set<MyFuncInfo>& funcSet);
MyFuncInfo niceName(const FunctionDecl* functionDecl);
@@ -132,7 +135,11 @@ MyFuncInfo UnusedMethods::niceName(const FunctionDecl* functionDecl)
case AS_protected: aInfo.access = "protected"; break;
default: aInfo.access = "unknown"; break;
}
- aInfo.returnType = compat::getReturnType(*functionDecl).getCanonicalType().getAsString();
+ if (!isa<CXXConstructorDecl>(functionDecl)) {
+ aInfo.returnType = compat::getReturnType(*functionDecl).getCanonicalType().getAsString();
+ } else {
+ aInfo.returnType = "";
+ }
if (isa<CXXMethodDecl>(functionDecl)) {
const CXXRecordDecl* recordDecl = dyn_cast<CXXMethodDecl>(functionDecl)->getParent();
@@ -308,6 +315,19 @@ gotfunc:
return true;
}
+bool UnusedMethods::VisitCXXConstructExpr( const CXXConstructExpr* constructExpr )
+{
+ // Note that I don't ignore ANYTHING here, because I want to get calls to my code that result
+ // from template instantiation deep inside the STL and other external code
+
+ const CXXConstructorDecl* constructorDecl = constructExpr->getConstructor();
+ constructorDecl = constructorDecl->getCanonicalDecl();
+
+ logCallToRootMethods(constructorDecl, callSet);
+
+ return true;
+}
+
bool UnusedMethods::VisitFunctionDecl( const FunctionDecl* functionDecl )
{
functionDecl = functionDecl->getCanonicalDecl();
@@ -325,10 +345,7 @@ bool UnusedMethods::VisitFunctionDecl( const FunctionDecl* functionDecl )
if (isa<CXXDestructorDecl>(functionDecl)) {
return true;
}
- if (isa<CXXConstructorDecl>(functionDecl)) {
- return true;
- }
- if (functionDecl && functionDecl->isDeleted()) {
+ if (functionDecl->isDeleted() || functionDecl->isDefaulted()) {
return true;
}
diff --git a/configmgr/source/nodemap.hxx b/configmgr/source/nodemap.hxx
index 77c9dd050db4..1fcfed87f81e 100644
--- a/configmgr/source/nodemap.hxx
+++ b/configmgr/source/nodemap.hxx
@@ -32,8 +32,7 @@ class NodeMap
{
NodeMapImpl maImpl;
- NodeMap(const NodeMap &rMap) :
- maImpl(rMap.maImpl) { clearCache(); }
+ NodeMap(const NodeMap &rMap) = delete;
public:
typedef NodeMapImpl::iterator iterator;
diff --git a/connectivity/source/drivers/mork/MQueryHelper.hxx b/connectivity/source/drivers/mork/MQueryHelper.hxx
index f8621bcf00e9..1081f75ccd0d 100644
--- a/connectivity/source/drivers/mork/MQueryHelper.hxx
+++ b/connectivity/source/drivers/mork/MQueryHelper.hxx
@@ -56,7 +56,6 @@ namespace connectivity
protected:
node_type m_eNodeType;
- MQueryExpressionBase() : m_eNodeType( Unknown ) {}
explicit MQueryExpressionBase( node_type _eNodeType ) : m_eNodeType( _eNodeType ) {}
public:
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx
index 61c76c1c74dc..25874dfe5c0b 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx
@@ -30,14 +30,6 @@ struct ini_NameValue
{
OUString sName;
OUString sValue;
-
- inline ini_NameValue()
- {}
- inline ini_NameValue(
- OUString const & name, OUString const & value )
- : sName( name ),
- sValue( value )
- {}
};
typedef std::list<
diff --git a/connectivity/source/inc/RowFunctionParser.hxx b/connectivity/source/inc/RowFunctionParser.hxx
index 49dad8774e85..a0a8849463a0 100644
--- a/connectivity/source/inc/RowFunctionParser.hxx
+++ b/connectivity/source/inc/RowFunctionParser.hxx
@@ -62,7 +62,6 @@ typedef std::shared_ptr< ExpressionNode > ExpressionNodeSharedPtr;
*/
struct OOO_DLLPUBLIC_DBTOOLS ParseError
{
- ParseError() {}
ParseError( const char* ) {}
};
@@ -108,8 +107,7 @@ public:
private:
// disabled constructor/destructor, since this is
// supposed to be a singleton
- FunctionParser();
-
+ FunctionParser() = delete;
FunctionParser(const FunctionParser&) = delete;
FunctionParser& operator=( const FunctionParser& ) = delete;
};
diff --git a/connectivity/source/inc/TSortIndex.hxx b/connectivity/source/inc/TSortIndex.hxx
index c633526cc830..07442209b809 100644
--- a/connectivity/source/inc/TSortIndex.hxx
+++ b/connectivity/source/inc/TSortIndex.hxx
@@ -108,9 +108,6 @@ namespace connectivity
OKeySet()
: ORefVector<sal_Int32>()
, m_bFrozen(false){}
- OKeySet(Vector::size_type _nSize)
- : ORefVector<sal_Int32>(_nSize)
- , m_bFrozen(false){}
bool isFrozen() const { return m_bFrozen; }
void setFrozen() { m_bFrozen = true; }
diff --git a/connectivity/source/inc/file/fcode.hxx b/connectivity/source/inc/file/fcode.hxx
index a4f2d659f628..c5deb00a810e 100644
--- a/connectivity/source/inc/file/fcode.hxx
+++ b/connectivity/source/inc/file/fcode.hxx
@@ -141,8 +141,6 @@ namespace connectivity
class OOperandResult : public OOperandValue
{
protected:
- OOperandResult(const ORowSetValue& _rVar, sal_Int32 eDbType)
- :OOperandValue(_rVar, eDbType) {}
OOperandResult(sal_Int32 eDbType)
:OOperandValue(eDbType) {}
public:
diff --git a/connectivity/source/inc/file/quotedstring.hxx b/connectivity/source/inc/file/quotedstring.hxx
index 05246ea7676c..ead25981627e 100644
--- a/connectivity/source/inc/file/quotedstring.hxx
+++ b/connectivity/source/inc/file/quotedstring.hxx
@@ -34,7 +34,6 @@ namespace connectivity
OUString m_sString;
public:
QuotedTokenizedString() {}
- QuotedTokenizedString(const OUString& _sString) : m_sString(_sString){}
sal_Int32 GetTokenCount( sal_Unicode cTok , sal_Unicode cStrDel ) const;
OUString GetTokenSpecial(sal_Int32& nStartPos, sal_Unicode cTok = ';', sal_Unicode cStrDel = '\0') const;
diff --git a/connectivity/source/inc/java/math/BigDecimal.hxx b/connectivity/source/inc/java/math/BigDecimal.hxx
index cea8f0cd35f7..e3033c88f339 100644
--- a/connectivity/source/inc/java/math/BigDecimal.hxx
+++ b/connectivity/source/inc/java/math/BigDecimal.hxx
@@ -32,8 +32,6 @@ namespace connectivity
public:
virtual jclass getMyClass() const override;
virtual ~java_math_BigDecimal();
- // a Constructor, that is needed for when Returning the Object is needed:
- java_math_BigDecimal( JNIEnv * pEnv, jobject myObj ) : java_lang_Object( pEnv, myObj ){}
java_math_BigDecimal( const OUString& _par0 );
java_math_BigDecimal( const double& _par0 );
diff --git a/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx b/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx
index 1db9dae973e2..a745fefb62c1 100644
--- a/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx
+++ b/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx
@@ -37,8 +37,6 @@ namespace connectivity
public:
virtual jclass getMyClass() const override;
virtual ~java_sql_DriverPropertyInfo();
- // A ctor that is needed for returning the object
- java_sql_DriverPropertyInfo( JNIEnv * pEnv, jobject myObj ) : java_lang_Object( pEnv, myObj ){}
};
}
diff --git a/connectivity/source/inc/java/sql/SQLException.hxx b/connectivity/source/inc/java/sql/SQLException.hxx
index 7efedfa1d2f7..b8794e9502e4 100644
--- a/connectivity/source/inc/java/sql/SQLException.hxx
+++ b/connectivity/source/inc/java/sql/SQLException.hxx
@@ -31,7 +31,6 @@ namespace connectivity
{
public:
// A ctor that is needed for returning the object
- java_sql_SQLException(){}
java_sql_SQLException( const java_sql_SQLException_BASE& _rException,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> & _rContext);
};
diff --git a/connectivity/source/inc/java/util/Property.hxx b/connectivity/source/inc/java/util/Property.hxx
index e9dd3d1c8a53..bb9c01bfc6f2 100644
--- a/connectivity/source/inc/java/util/Property.hxx
+++ b/connectivity/source/inc/java/util/Property.hxx
@@ -31,8 +31,6 @@ namespace connectivity
public:
virtual jclass getMyClass() const override;
virtual ~java_util_Properties();
- // A ctor that is needed for returning the object
- java_util_Properties( JNIEnv * pEnv, jobject myObj ) : java_lang_Object( pEnv, myObj ){}
java_util_Properties( );
void setProperty(const OUString& key, const OUString& value);
};
diff --git a/cui/source/dialogs/SpellAttrib.hxx b/cui/source/dialogs/SpellAttrib.hxx
index 4069af899875..8578914890d0 100644
--- a/cui/source/dialogs/SpellAttrib.hxx
+++ b/cui/source/dialogs/SpellAttrib.hxx
@@ -44,9 +44,6 @@ struct SpellErrorDescription
css::uno::Sequence< OUString > aSuggestions;
OUString sRuleId;
- SpellErrorDescription() :
- bIsGrammarError( false ){}
-
SpellErrorDescription( bool bGrammar,
const OUString& rText,
const css::lang::Locale& rLocale,
@@ -99,8 +96,7 @@ public:
private:
SpellErrorDescription m_aSpellErrorDescription;
- //not accessible
- SpellErrorAttrib();
+ SpellErrorAttrib() = delete;
public:
SpellErrorAttrib( const SpellErrorDescription& );
SpellErrorAttrib( const SpellErrorAttrib& rAttr );
@@ -119,8 +115,7 @@ class SpellLanguageAttrib : public TextAttrib
{
LanguageType m_eLanguage;
- //not accessible
- SpellLanguageAttrib();
+ SpellLanguageAttrib() = delete;
public:
SpellLanguageAttrib(LanguageType eLanguage);
@@ -139,8 +134,7 @@ class SpellBackgroundAttrib : public TextAttrib
{
Color m_aBackgroundColor;
- //not accessible
- SpellBackgroundAttrib();
+ SpellBackgroundAttrib() = delete;
public:
SpellBackgroundAttrib(const Color& rCol);
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index 8ea2d9a5ce74..1d3fae0f1cf5 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -191,13 +191,6 @@ class AutoCorrEdit : public Edit
void dispose() override;
public:
- AutoCorrEdit(vcl::Window* pParent, const ResId& rResId)
- : Edit(pParent, rResId)
- , m_nCol(0)
- , bSpaces(false)
- {
- }
-
AutoCorrEdit(vcl::Window* pParent)
: Edit(pParent)
, m_nCol(0)
diff --git a/cui/source/inc/cuihyperdlg.hxx b/cui/source/inc/cuihyperdlg.hxx
index 2c56294ab676..41dcd1bd769e 100644
--- a/cui/source/inc/cuihyperdlg.hxx
+++ b/cui/source/inc/cuihyperdlg.hxx
@@ -88,7 +88,6 @@ public:
void SetReadOnlyMode( bool bReadOnly );
inline bool IsHTMLDoc() const { return mbIsHTMLDoc; }
- inline SfxBindings* GetBindings() const { return mpBindings; };
inline SfxDispatcher* GetDispatcher() const { return mpBindings->GetDispatcher(); }
};
diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx
index c4624a6f70be..58e79ad7fe10 100644
--- a/cui/source/inc/insdlg.hxx
+++ b/cui/source/inc/insdlg.hxx
@@ -94,19 +94,6 @@ public:
css::uno::Reference< css::io::XInputStream > GetIconIfIconified( OUString* pGraphicMediaType ) override;
};
-class SvInsertPlugInDialog : public InsertObjectDialog_Impl
-{
-private:
- DECL_LINK_TYPED(BrowseHdl, Button*, void);
-
-public:
- SvInsertPlugInDialog(vcl::Window* pParent,
- const css::uno::Reference < css::embed::XStorage >& xStorage);
- virtual ~SvInsertPlugInDialog();
- virtual void dispose() override;
- virtual short Execute() override;
-};
-
class SfxInsertFloatingFrameDialog : public InsertObjectDialog_Impl
{
private:
diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx
index 2d3d11985f79..e78045bca74a 100644
--- a/cui/source/inc/macropg.hxx
+++ b/cui/source/inc/macropg.hxx
@@ -42,7 +42,6 @@ struct EventDisplayName
{
const sal_Char* pAsciiEventName;
sal_uInt16 nEventResourceID;
- EventDisplayName() : pAsciiEventName( nullptr ), nEventResourceID(0) { }
EventDisplayName( const sal_Char* _pAsciiName, const sal_uInt16 _nResId )
: pAsciiEventName( _pAsciiName )
, nEventResourceID( _nResId )
diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx
index ad46c19a9b32..670d3b4342e8 100644
--- a/cui/source/inc/optdict.hxx
+++ b/cui/source/inc/optdict.hxx
@@ -78,8 +78,6 @@ class SvxDictEdit : public Edit
bool bSpaces;
public:
- SvxDictEdit(vcl::Window* pParent, const ResId& rResId) :
- Edit(pParent, rResId), bSpaces(false){}
SvxDictEdit(vcl::Window* pParent, WinBits aWB) :
Edit(pParent, aWB), bSpaces(false){}
diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx
index 54b659e9b81b..dd588601a33f 100644
--- a/cui/source/inc/scriptdlg.hxx
+++ b/cui/source/inc/scriptdlg.hxx
@@ -117,9 +117,7 @@ private:
bool loaded;
css::uno::Reference< css::script::browse::XBrowseNode > nodes;
css::uno::Reference< css::frame::XModel > model;
- SFEntry(){}
public:
- SFEntry( sal_uInt8 nT ) { nType = nT; loaded=false; }
SFEntry( sal_uInt8 nT,
const css::uno::Reference< css::script::browse::XBrowseNode >& entryNodes ,
const css::uno::Reference< css::frame::XModel >& entryModel) { nType = nT; nodes = entryNodes; loaded=false; model = entryModel; }
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 9ca93fca9231..2dc815a8d8a7 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -551,40 +551,6 @@ IMPL_STATIC_LINK_TYPED( SvxProxyTabPage, LoseFocusHdl_Impl, Control&, rControl,
}
-void SvxScriptExecListBox::RequestHelp( const HelpEvent& rHEvt )
-{ // try to show tips just like as on toolbars
- sal_Int32 nPos=LISTBOX_ENTRY_NOTFOUND;
- sal_Int32 nTop = GetTopEntry();
- sal_uInt16 nCount = GetDisplayLineCount(); // Attention: Not GetLineCount()
- Point aPt = ScreenToOutputPixel( rHEvt.GetMousePosPixel() );
- Rectangle aItemRect;
- if( nCount > 0 ) // if there're some entries, find it.
- for( nPos = nTop ; nPos <= nTop+nCount-1 ; nPos++ ) {
- aItemRect = GetBoundingRectangle(nPos);
- if( aPt.Y() < aItemRect.Top() || aPt.Y() > aItemRect.Bottom() )
- continue;
- else
- break;
- }
- else // if not, nothing happens.
- return;
- OUString aHelpText;
- if( nPos <= nTop+nCount-1 ) // if find the matching entry, get its content.
- aHelpText = GetEntry(nPos);
- if( aHelpText.getLength() && GetTextWidth(aHelpText)<GetOutputSizePixel().Width() )
- aHelpText.clear(); // if the entry is quite short, clear the helping tip content.
- aItemRect = Rectangle(Point(0,0),GetSizePixel());
- aPt = Point(OutputToScreenPixel( aItemRect.TopLeft() ));
- aItemRect.Left() = aPt.X();
- aItemRect.Top() = aPt.Y();
- aPt = OutputToScreenPixel( aItemRect.BottomRight() );
- aItemRect.Right() = aPt.X();
- aItemRect.Bottom() = aPt.Y();
- if( rHEvt.GetMode() == HelpEventMode::BALLOON )
- Help::ShowBalloon( this, aItemRect.Center(), aItemRect, aHelpText);
- else
- Help::ShowQuickHelp( this, aItemRect, aHelpText );
-}
/********************************************************************/
/* */
diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx
index 16fc4c94aaf6..a34eccce80eb 100644
--- a/cui/source/options/optinet2.hxx
+++ b/cui/source/options/optinet2.hxx
@@ -98,19 +98,6 @@ public:
virtual void Reset( const SfxItemSet* rSet ) override;
};
-// #98647# class SvxScriptExecListBox ------------------------------------
-class SvxScriptExecListBox : public ListBox
-{ // for adding tooltips to ListBox
-public:
- SvxScriptExecListBox( vcl::Window* pParent, WinBits nStyle = WB_BORDER )
- :ListBox(pParent, nStyle) {}
- SvxScriptExecListBox( vcl::Window* pParent, const ResId& rResId )
- :ListBox(pParent, rResId) {}
-
-protected:
- virtual void RequestHelp( const HelpEvent& rHEvt ) override;
-};
-
// class SvxSecurityTabPage ---------------------------------------------
class SvtSecurityOptions;
diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx
index 85905df10641..bee68940ce50 100644
--- a/cui/source/options/optjava.hxx
+++ b/cui/source/options/optjava.hxx
@@ -148,9 +148,6 @@ private:
m_pAssignedList->GetSelectEntryPos()
!= LISTBOX_ENTRY_NOTFOUND ); }
- inline void EnableAssignButton()
- { m_pAssignBtn->Enable(); }
-
inline void DisableAssignButton()
{ m_pAssignBtn->Disable(); }
diff --git a/dbaccess/source/core/api/RowSetRow.hxx b/dbaccess/source/core/api/RowSetRow.hxx
index ece120f3ebd0..93368e089cea 100644
--- a/dbaccess/source/core/api/RowSetRow.hxx
+++ b/dbaccess/source/core/api/RowSetRow.hxx
@@ -38,7 +38,6 @@ namespace dbaccess
ORowSetOldRowHelper& operator=(const ORowSetOldRowHelper& _rRH) = delete;
ORowSetOldRowHelper(const ORowSetOldRowHelper& _rRh) = delete;
public:
- ORowSetOldRowHelper(){}
explicit ORowSetOldRowHelper(const ORowSetRow& _rRow)
: m_aRow(_rRow)
{}
diff --git a/dbaccess/source/core/api/datasettings.cxx b/dbaccess/source/core/api/datasettings.cxx
index 61c4f7a5ed9d..b5403eb9c537 100644
--- a/dbaccess/source/core/api/datasettings.cxx
+++ b/dbaccess/source/core/api/datasettings.cxx
@@ -111,21 +111,6 @@ ODataSettings_Base::ODataSettings_Base()
{
}
-ODataSettings_Base::ODataSettings_Base(const ODataSettings_Base& _rSource)
- :m_sFilter( _rSource.m_sFilter )
- ,m_sHavingClause( _rSource.m_sHavingClause )
- ,m_sGroupBy( _rSource.m_sGroupBy )
- ,m_sOrder( _rSource.m_sOrder )
- ,m_bApplyFilter( _rSource.m_bApplyFilter )
- ,m_aFont( _rSource.m_aFont )
- ,m_aRowHeight( _rSource.m_aRowHeight )
- ,m_aTextColor( _rSource.m_aTextColor )
- ,m_aTextLineColor( _rSource.m_aTextLineColor )
- ,m_nFontEmphasis( _rSource.m_nFontEmphasis )
- ,m_nFontRelief( _rSource.m_nFontRelief )
-{
-}
-
ODataSettings_Base::~ODataSettings_Base()
{
}
diff --git a/dbaccess/source/core/inc/core_resource.hxx b/dbaccess/source/core/inc/core_resource.hxx
index 4db3848417fe..e09f96847050 100644
--- a/dbaccess/source/core/inc/core_resource.hxx
+++ b/dbaccess/source/core/inc/core_resource.hxx
@@ -44,7 +44,7 @@ namespace dbaccess
private:
// no instantiation allowed
- ResourceManager() { }
+ ResourceManager() = delete;
~ResourceManager() { }
protected:
diff --git a/dbaccess/source/core/inc/datasettings.hxx b/dbaccess/source/core/inc/datasettings.hxx
index 01e966691b56..1ca0c693cc50 100644
--- a/dbaccess/source/core/inc/datasettings.hxx
+++ b/dbaccess/source/core/inc/datasettings.hxx
@@ -52,7 +52,7 @@ public:
protected:
ODataSettings_Base();
- ODataSettings_Base(const ODataSettings_Base& _rSource);
+ ODataSettings_Base(const ODataSettings_Base& _rSource) = delete;
~ODataSettings_Base();
};
// ODataSettings - a base class which implements the property handling
diff --git a/dbaccess/source/core/recovery/subcomponents.hxx b/dbaccess/source/core/recovery/subcomponents.hxx
index e48d32be6392..763b23f396fa 100644
--- a/dbaccess/source/core/recovery/subcomponents.hxx
+++ b/dbaccess/source/core/recovery/subcomponents.hxx
@@ -54,12 +54,6 @@ namespace dbaccess
,bForEditing( false )
{
}
-
- SubComponentDescriptor( const OUString& i_rName, const bool i_bForEditing )
- :sName( i_rName )
- ,bForEditing( i_bForEditing )
- {
- }
};
typedef std::unordered_map< OUString, SubComponentDescriptor, OUStringHash > MapStringToCompDesc;
diff --git a/dbaccess/source/ext/macromigration/migrationerror.hxx b/dbaccess/source/ext/macromigration/migrationerror.hxx
index a714388b72b3..00be94df94be 100644
--- a/dbaccess/source/ext/macromigration/migrationerror.hxx
+++ b/dbaccess/source/ext/macromigration/migrationerror.hxx
@@ -65,12 +65,6 @@ namespace dbmm
::std::vector< OUString > aErrorDetails;
const css::uno::Any aCaughtException;
- explicit MigrationError(
- const MigrationErrorType _eType )
- :eType( _eType )
- {
- }
-
MigrationError(
const MigrationErrorType _eType,
const css::uno::Any& _rCaughtException )
diff --git a/dbaccess/source/filter/xml/xmlExport.hxx b/dbaccess/source/filter/xml/xmlExport.hxx
index 237d0467792d..4a9c6a141a09 100644
--- a/dbaccess/source/filter/xml/xmlExport.hxx
+++ b/dbaccess/source/filter/xml/xmlExport.hxx
@@ -156,8 +156,7 @@ class ODBExport : public SvXMLExport
rtl::Reference < XMLPropertySetMapper > GetTableStylesPropertySetMapper() const;
-private:
- ODBExport();
+ ODBExport() = delete;
protected:
virtual void ExportStyles_( bool bUsed ) override;
diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.hxx b/dbaccess/source/ui/dlg/TextConnectionHelper.hxx
index c07f669d2d27..294ed1eeb8c9 100644
--- a/dbaccess/source/ui/dlg/TextConnectionHelper.hxx
+++ b/dbaccess/source/ui/dlg/TextConnectionHelper.hxx
@@ -42,8 +42,6 @@ namespace dbaui
// OTextConnectionPage
class OTextConnectionHelper : public TabPage
{
- OTextConnectionHelper();
-
public:
OTextConnectionHelper( vcl::Window* pParent, const short _nAvailableSections );
virtual ~OTextConnectionHelper();
diff --git a/dbaccess/source/ui/dlg/dbfindex.hxx b/dbaccess/source/ui/dlg/dbfindex.hxx
index 385c939d4ab7..53358165c356 100644
--- a/dbaccess/source/ui/dlg/dbfindex.hxx
+++ b/dbaccess/source/ui/dlg/dbfindex.hxx
@@ -60,7 +60,6 @@ private:
TableIndexList aIndexList;
public:
- OTableInfo() { }
explicit OTableInfo( const OUString& rName ) : aTableName(rName) { }
void WriteInfFile( const OUString& rDSN ) const;
diff --git a/dbaccess/source/ui/dlg/detailpages.hxx b/dbaccess/source/ui/dlg/detailpages.hxx
index c6a6eb874956..5ce4eabf3e51 100644
--- a/dbaccess/source/ui/dlg/detailpages.hxx
+++ b/dbaccess/source/ui/dlg/detailpages.hxx
@@ -240,13 +240,6 @@ namespace dbaui
DECL_LINK_TYPED( OnCheckBoxClick, Button*, void );
};
- // OMozillaDetailsPage Detail page for Mozilla and Thunderbird addressbook
- class OMozillaDetailsPage : public OCommonBehaviourTabPage
- {
- public:
- OMozillaDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs );
- };
-
// OTextDetailsPage
class OTextDetailsPage : public OCommonBehaviourTabPage
{
diff --git a/dbaccess/source/ui/inc/SqlNameEdit.hxx b/dbaccess/source/ui/inc/SqlNameEdit.hxx
index ee5fb14d401e..9889c9815d48 100644
--- a/dbaccess/source/ui/inc/SqlNameEdit.hxx
+++ b/dbaccess/source/ui/inc/SqlNameEdit.hxx
@@ -56,11 +56,6 @@ namespace dbaui
,OSQLNameChecker(_rAllowedChars)
{
}
- OSQLNameEdit(vcl::Window* _pParent,const ResId& _rRes,const OUString& _rAllowedChars = OUString())
- : Edit(_pParent,_rRes)
- ,OSQLNameChecker(_rAllowedChars)
- {
- }
// Window overrides
// virtual bool PreNotify( NotifyEvent& rNEvt );
@@ -77,11 +72,6 @@ namespace dbaui
, OSQLNameChecker(_rAllowedChars)
{
}
- OSQLNameComboBox(vcl::Window* _pParent,const ResId& _rRes,const OUString& _rAllowedChars = OUString())
- : ComboBox(_pParent,_rRes)
- , OSQLNameChecker(_rAllowedChars)
- {
- }
// Window overrides
// Edit
diff --git a/dbaccess/source/ui/inc/TokenWriter.hxx b/dbaccess/source/ui/inc/TokenWriter.hxx
index edee89a421c8..db45468ffc88 100644
--- a/dbaccess/source/ui/inc/TokenWriter.hxx
+++ b/dbaccess/source/ui/inc/TokenWriter.hxx
@@ -212,12 +212,6 @@ namespace dbaui
const css::uno::Reference< css::uno::XComponentContext >& _rM,
const OUString& rExchange = OUString());
- // import data
- ORowSetImportExport(const SharedConnection& _rxConnection,
- const css::uno::Reference< css::uno::XComponentContext >& _rM)
- : ODatabaseImportExport(_rxConnection,nullptr,_rM)
- {}
-
virtual bool Write() override;
virtual bool Read() override;
diff --git a/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx b/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx
index 7087d7f87deb..6db7319fd6b5 100644
--- a/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx
+++ b/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx
@@ -66,9 +66,6 @@ namespace dbaui
const OUString& _rObjectName,
::dbtools::SQLExceptionInfo& _out_rErrorToDisplay
) const override;
-
- private:
- HierarchicalNameCheck(); // never implemented
};
// DynamicTableOrQueryNameCheck
@@ -118,9 +115,6 @@ namespace dbaui
const OUString& _rObjectName,
::dbtools::SQLExceptionInfo& _out_rErrorToDisplay
) const override;
-
- private:
- DynamicTableOrQueryNameCheck(); // never implemented
};
} // namespace dbaui
diff --git a/dbaccess/source/ui/inc/indexes.hxx b/dbaccess/source/ui/inc/indexes.hxx
index 91f5d40fa0c8..b7c765ffc99c 100644
--- a/dbaccess/source/ui/inc/indexes.hxx
+++ b/dbaccess/source/ui/inc/indexes.hxx
@@ -73,9 +73,6 @@ namespace dbaui
bool isNew() const { return getOriginalName().isEmpty(); }
void flagAsNew(const GrantIndexAccess&) { sOriginalName.clear(); }
void flagAsCommitted(const GrantIndexAccess&) { sOriginalName = sName; }
-
- private:
- OIndex(); // not implemented
};
typedef std::vector<OIndex> Indexes;
diff --git a/dbaccess/source/ui/misc/UpdateHelperImpl.hxx b/dbaccess/source/ui/misc/UpdateHelperImpl.hxx
index 4d3d8271da1c..d41aec19e284 100644
--- a/dbaccess/source/ui/misc/UpdateHelperImpl.hxx
+++ b/dbaccess/source/ui/misc/UpdateHelperImpl.hxx
@@ -29,55 +29,6 @@
namespace dbaui
{
- class ORowUpdateHelper : public IUpdateHelper
- {
- css::uno::Reference< css::sdbc::XRowUpdate > m_xRowUpdate;
- css::uno::Reference< css::sdbc::XResultSetUpdate > m_xResultSetUpdate;
- public:
- explicit ORowUpdateHelper(const css::uno::Reference< css::sdbc::XRowSet>& _xRowSet)
- :m_xRowUpdate(_xRowSet,css::uno::UNO_QUERY)
- ,m_xResultSetUpdate(_xRowSet,css::uno::UNO_QUERY)
- {
- }
- virtual ~ORowUpdateHelper() {}
- virtual void updateString(sal_Int32 _nPos, const OUString& _sValue) override
- {
- m_xRowUpdate->updateString(_nPos, _sValue);
- }
- virtual void updateDouble(sal_Int32 _nPos,const double& _nValue) override
- {
- m_xRowUpdate->updateDouble(_nPos, _nValue);
- }
- virtual void updateDate(sal_Int32 _nPos,const css::util::Date& _nValue) override
- {
- m_xRowUpdate->updateDate(_nPos, _nValue);
- }
- virtual void updateTime(sal_Int32 _nPos,const css::util::Time& _nValue) override
- {
- m_xRowUpdate->updateTime(_nPos, _nValue);
- }
- virtual void updateTimestamp(sal_Int32 _nPos,const css::util::DateTime& _nValue) override
- {
- m_xRowUpdate->updateTimestamp(_nPos, _nValue);
- }
- virtual void updateInt(sal_Int32 _nPos, sal_Int32 _nValue) override
- {
- m_xRowUpdate->updateInt(_nPos, _nValue);
- }
- virtual void updateNull(sal_Int32 _nPos, ::sal_Int32) override
- {
- m_xRowUpdate->updateNull(_nPos);
- }
- virtual void moveToInsertRow() override
- {
- m_xResultSetUpdate->moveToInsertRow();
- }
- virtual void insertRow() override
- {
- m_xResultSetUpdate->insertRow();
- }
- };
-
class OParameterUpdateHelper : public IUpdateHelper
{
css::uno::Reference< css::sdbc::XPreparedStatement > m_xPrepared;
diff --git a/desktop/source/deployment/manager/dp_commandenvironments.hxx b/desktop/source/deployment/manager/dp_commandenvironments.hxx
index c6515e4f71f8..fcc44ce5858d 100644
--- a/desktop/source/deployment/manager/dp_commandenvironments.hxx
+++ b/desktop/source/deployment/manager/dp_commandenvironments.hxx
@@ -87,7 +87,6 @@ private:
OUString m_repository;
bool m_bSuppressLicense;
public:
- LicenseCommandEnv() : m_bSuppressLicense(false) {};
LicenseCommandEnv(
css::uno::Reference< css::task::XInteractionHandler> const & handler,
bool bSuppressLicense,
@@ -108,7 +107,6 @@ class NoLicenseCommandEnv : public BaseCommandEnv
{
public:
- NoLicenseCommandEnv(){};
explicit NoLicenseCommandEnv(css::uno::Reference< css::task::XInteractionHandler> const & handler);
// XInteractionHandler
diff --git a/drawinglayer/source/attribute/fillgraphicattribute.cxx b/drawinglayer/source/attribute/fillgraphicattribute.cxx
index 9465af23b054..5331f47a4fc4 100644
--- a/drawinglayer/source/attribute/fillgraphicattribute.cxx
+++ b/drawinglayer/source/attribute/fillgraphicattribute.cxx
@@ -104,11 +104,6 @@ namespace drawinglayer
{
}
- FillGraphicAttribute::FillGraphicAttribute()
- : mpFillGraphicAttribute(theGlobalDefault::get())
- {
- }
-
FillGraphicAttribute::FillGraphicAttribute(const FillGraphicAttribute& rCandidate)
: mpFillGraphicAttribute(rCandidate.mpFillGraphicAttribute)
{
diff --git a/drawinglayer/source/attribute/fontattribute.cxx b/drawinglayer/source/attribute/fontattribute.cxx
index 110404e26e66..20d743d314ec 100644
--- a/drawinglayer/source/attribute/fontattribute.cxx
+++ b/drawinglayer/source/attribute/fontattribute.cxx
@@ -144,11 +144,6 @@ namespace drawinglayer
{
}
- bool FontAttribute::isDefault() const
- {
- return mpFontAttribute.same_object(theGlobalDefault::get());
- }
-
FontAttribute& FontAttribute::operator=(const FontAttribute& rCandidate)
{
mpFontAttribute = rCandidate.mpFontAttribute;
diff --git a/drawinglayer/source/attribute/materialattribute3d.cxx b/drawinglayer/source/attribute/materialattribute3d.cxx
index 72fce36ac8b1..59d39a07265e 100644
--- a/drawinglayer/source/attribute/materialattribute3d.cxx
+++ b/drawinglayer/source/attribute/materialattribute3d.cxx
@@ -110,11 +110,6 @@ namespace drawinglayer
{
}
- bool MaterialAttribute3D::isDefault() const
- {
- return mpMaterialAttribute3D.same_object(theGlobalDefault::get());
- }
-
MaterialAttribute3D& MaterialAttribute3D::operator=(const MaterialAttribute3D& rCandidate)
{
mpMaterialAttribute3D = rCandidate.mpMaterialAttribute3D;
diff --git a/drawinglayer/source/attribute/sdrlightattribute3d.cxx b/drawinglayer/source/attribute/sdrlightattribute3d.cxx
index 868bc9c4bf02..e249a88c2677 100644
--- a/drawinglayer/source/attribute/sdrlightattribute3d.cxx
+++ b/drawinglayer/source/attribute/sdrlightattribute3d.cxx
@@ -47,13 +47,6 @@ namespace drawinglayer
{
}
- ImpSdr3DLightAttribute()
- : maColor(),
- maDirection(),
- mbSpecular(false)
- {
- }
-
// data read access
const basegfx::BColor& getColor() const { return maColor; }
const basegfx::B3DVector& getDirection() const { return maDirection; }
@@ -82,11 +75,6 @@ namespace drawinglayer
{
}
- Sdr3DLightAttribute::Sdr3DLightAttribute()
- : mpSdr3DLightAttribute(theGlobalDefault::get())
- {
- }
-
Sdr3DLightAttribute::Sdr3DLightAttribute(const Sdr3DLightAttribute& rCandidate)
: mpSdr3DLightAttribute(rCandidate.mpSdr3DLightAttribute)
{
@@ -96,11 +84,6 @@ namespace drawinglayer
{
}
- bool Sdr3DLightAttribute::isDefault() const
- {
- return mpSdr3DLightAttribute.same_object(theGlobalDefault::get());
- }
-
Sdr3DLightAttribute& Sdr3DLightAttribute::operator=(const Sdr3DLightAttribute& rCandidate)
{
mpSdr3DLightAttribute = rCandidate.mpSdr3DLightAttribute;
diff --git a/drawinglayer/source/attribute/sdrobjectattribute3d.cxx b/drawinglayer/source/attribute/sdrobjectattribute3d.cxx
index 8f7f93bef8b9..d513c39eb4aa 100644
--- a/drawinglayer/source/attribute/sdrobjectattribute3d.cxx
+++ b/drawinglayer/source/attribute/sdrobjectattribute3d.cxx
@@ -70,21 +70,6 @@ namespace drawinglayer
{
}
- ImpSdr3DObjectAttribute()
- : maNormalsKind(css::drawing::NormalsKind_SPECIFIC),
- maTextureProjectionX(css::drawing::TextureProjectionMode_OBJECTSPECIFIC),
- maTextureProjectionY(css::drawing::TextureProjectionMode_OBJECTSPECIFIC),
- maTextureKind(css::drawing::TextureKind2_LUMINANCE),
- maTextureMode(css::drawing::TextureMode_REPLACE),
- maMaterial(),
- mbNormalsInvert(false),
- mbDoubleSided(false),
- mbShadow3D(false),
- mbTextureFilter(false),
- mbReducedLineGeometry(false)
- {
- }
-
// data read access
css::drawing::NormalsKind getNormalsKind() const { return maNormalsKind; }
css::drawing::TextureProjectionMode getTextureProjectionX() const { return maTextureProjectionX; }
@@ -143,20 +128,10 @@ namespace drawinglayer
{
}
- Sdr3DObjectAttribute::Sdr3DObjectAttribute()
- : mpSdr3DObjectAttribute(theGlobalDefault::get())
- {
- }
-
Sdr3DObjectAttribute::~Sdr3DObjectAttribute()
{
}
- bool Sdr3DObjectAttribute::isDefault() const
- {
- return mpSdr3DObjectAttribute.same_object(theGlobalDefault::get());
- }
-
Sdr3DObjectAttribute& Sdr3DObjectAttribute::operator=(const Sdr3DObjectAttribute& rCandidate)
{
mpSdr3DObjectAttribute = rCandidate.mpSdr3DObjectAttribute;
diff --git a/editeng/source/editeng/editdoc.hxx b/editeng/source/editeng/editdoc.hxx
index d0525517dfd5..93b9495a49be 100644
--- a/editeng/source/editeng/editdoc.hxx
+++ b/editeng/source/editeng/editdoc.hxx
@@ -381,16 +381,6 @@ private:
sal_Unicode nExtraValue;
- TextPortion()
- : pExtraInfos( nullptr )
- , nLen( 0 )
- , aOutSz()
- , nKind( PortionKind::TEXT )
- , nRightToLeftLevel( 0 )
- , nExtraValue( 0 )
- {
- }
-
public:
TextPortion( sal_Int32 nL )
: pExtraInfos( nullptr )
diff --git a/editeng/source/editeng/editundo.hxx b/editeng/source/editeng/editundo.hxx
index 4af7d38607be..5efcfd02d58d 100644
--- a/editeng/source/editeng/editundo.hxx
+++ b/editeng/source/editeng/editundo.hxx
@@ -124,9 +124,6 @@ private:
public:
EditUndoRemoveChars(EditEngine* pEE, const EPaM& rEPaM, const OUString& rStr);
- const EPaM& GetEPaM() { return aEPaM; }
- OUString & GetStr() { return aText; }
-
virtual void Undo() override;
virtual void Redo() override;
};
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index 52c4c0ac5ed2..d374d5c8b2bb 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -685,7 +685,6 @@ private:
SpellInfo * CreateSpellInfo( bool bMultipleDocs );
- ImpEditEngine(); // disabled
ImpEditEngine(EditEngine* pEditEngine, SfxItemPool* pPool);
void InitDoc(bool bKeepParaAttribs);
EditDoc& GetEditDoc() { return aEditDoc; }
diff --git a/editeng/source/outliner/overflowingtxt.cxx b/editeng/source/outliner/overflowingtxt.cxx
index fd565a4df953..1b98adea6e99 100644
--- a/editeng/source/outliner/overflowingtxt.cxx
+++ b/editeng/source/outliner/overflowingtxt.cxx
@@ -114,12 +114,6 @@ OverflowingText::OverflowingText(css::uno::Reference< css::datatransfer::XTransf
// class NonOverflowingText
-NonOverflowingText::NonOverflowingText(const EditTextObject * /*pTObj*/, bool bLastParaInterrupted)
- : mbLastParaInterrupted(bLastParaInterrupted)
-{
- // XXX: may have to delete pTObj
-}
-
NonOverflowingText::NonOverflowingText(const ESelection &aSel, bool bLastParaInterrupted)
: maContentSel(aSel)
, mbLastParaInterrupted(bLastParaInterrupted)
diff --git a/extensions/source/abpilot/datasourcehandling.hxx b/extensions/source/abpilot/datasourcehandling.hxx
index 893dc57a2e7c..97c044150a9c 100644
--- a/extensions/source/abpilot/datasourcehandling.hxx
+++ b/extensions/source/abpilot/datasourcehandling.hxx
@@ -178,9 +178,6 @@ namespace abp
,const OUString& _sName
,PackageAccessControl
);
-
- private:
- ODataSource( ); // never implemented
};
diff --git a/extensions/source/propctrlr/pcrcommon.hxx b/extensions/source/propctrlr/pcrcommon.hxx
index 10132903e1df..0f4d7a661832 100644
--- a/extensions/source/propctrlr/pcrcommon.hxx
+++ b/extensions/source/propctrlr/pcrcommon.hxx
@@ -83,7 +83,6 @@ namespace pcr
public:
inline StlSyntaxSequence() : UnoBase() { }
explicit inline StlSyntaxSequence( const UnoBase& rSeq ) : UnoBase( rSeq ) { }
- inline StlSyntaxSequence( const ELEMENT* pElements, sal_Int32 len ) : UnoBase( pElements, len ) { }
explicit inline StlSyntaxSequence( sal_Int32 len ) : UnoBase( len ) { }
typedef const ELEMENT* const_iterator;
diff --git a/extensions/source/propctrlr/unourl.hxx b/extensions/source/propctrlr/unourl.hxx
index 809d168ad494..b5f15b64e2db 100644
--- a/extensions/source/propctrlr/unourl.hxx
+++ b/extensions/source/propctrlr/unourl.hxx
@@ -42,9 +42,6 @@ namespace pcr
);
inline operator const css::util::URL& () const { return m_aURL; }
-
- private:
- UnoURL(); // never implemented
};
diff --git a/filter/Library_xmlfa.mk b/filter/Library_xmlfa.mk
index 0f6cddcfd385..e23cd7d2df74 100644
--- a/filter/Library_xmlfa.mk
+++ b/filter/Library_xmlfa.mk
@@ -38,7 +38,6 @@ $(eval $(call gb_Library_use_libraries,xmlfa,\
$(eval $(call gb_Library_add_exception_objects,xmlfa,\
filter/source/xmlfilteradaptor/XmlFilterAdaptor \
filter/source/xmlfilteradaptor/genericfilter \
- filter/source/xmlfilteradaptor/streamwrap \
))
# vim: set noet sw=4 ts=4:
diff --git a/filter/source/flash/swfwriter.hxx b/filter/source/flash/swfwriter.hxx
index 69c66a7b7a5e..0a2ea581ce5c 100644
--- a/filter/source/flash/swfwriter.hxx
+++ b/filter/source/flash/swfwriter.hxx
@@ -188,7 +188,6 @@ public:
void addRGB( const Color& rColor );
void addRect( const Rectangle& rRect );
void addMatrix( const ::basegfx::B2DHomMatrix& rMatrix ); // #i73264#
- void addString( const char* pString );
void addStream( SvStream& rIn );
static void writeMatrix( SvStream& rOut, const ::basegfx::B2DHomMatrix& rMatrix ); // #i73264#
diff --git a/filter/source/flash/swfwriter2.cxx b/filter/source/flash/swfwriter2.cxx
index 3e06262d205c..4d6683eff79c 100644
--- a/filter/source/flash/swfwriter2.cxx
+++ b/filter/source/flash/swfwriter2.cxx
@@ -323,18 +323,6 @@ void Tag::writeMatrix( SvStream& rOut, const ::basegfx::B2DHomMatrix& rMatrix )
}
-void Tag::addString( const char* pString )
-{
- if( pString )
- {
- while( *pString )
- addUI8( *pString++ );
- }
-
- addUI8( 0 );
-}
-
-
void Tag::addStream( SvStream& rIn )
{
(*this).WriteStream( rIn );
diff --git a/filter/source/graphicfilter/icgm/cgmtypes.hxx b/filter/source/graphicfilter/icgm/cgmtypes.hxx
index ef560ed4520b..8a6689d40ba2 100644
--- a/filter/source/graphicfilter/icgm/cgmtypes.hxx
+++ b/filter/source/graphicfilter/icgm/cgmtypes.hxx
@@ -25,7 +25,6 @@ struct FloatPoint
double X;
double Y;
FloatPoint():X(0), Y(0){};
- FloatPoint( const double& rX, const double& rY ) { X = rX; Y = rY; };
};
struct FloatRect
@@ -35,13 +34,6 @@ struct FloatRect
double Right;
double Bottom;
FloatRect():Left(0), Top(0), Right(0), Bottom(0){};
- FloatRect( const FloatPoint& rTopLeft, const FloatPoint& rBottomRight )
- {
- Left = rTopLeft.X;
- Top = rTopLeft.Y;
- Right = rBottomRight.X;
- Bottom = rBottomRight.Y;
- }
void Justify()
{
double fTemp;
diff --git a/filter/source/svg/gfxtypes.hxx b/filter/source/svg/gfxtypes.hxx
index ff091892ab3e..9f9d38024fb0 100644
--- a/filter/source/svg/gfxtypes.hxx
+++ b/filter/source/svg/gfxtypes.hxx
@@ -28,24 +28,12 @@ struct ARGBColor
{}
explicit ARGBColor(double fGrey) : a(1.0), r(fGrey), g(fGrey), b(fGrey)
{}
- ARGBColor( double r_, double g_, double b_ ) :
- a(1.0), r(r_), g(g_), b(b_)
- {}
- ARGBColor( double a_, double r_, double g_, double b_ ) :
- a(a_), r(r_), g(g_), b(b_)
- {}
ARGBColor( int r_, int g_, int b_ ) :
a(1.0),
r(toDoubleColor(sal::static_int_cast<sal_uInt8>(r_))),
g(toDoubleColor(sal::static_int_cast<sal_uInt8>(g_))),
b(toDoubleColor(sal::static_int_cast<sal_uInt8>(b_)))
{}
- ARGBColor( int a_, int r_, int g_, int b_ ) :
- a(toDoubleColor(sal::static_int_cast<sal_uInt8>(a_))),
- r(toDoubleColor(sal::static_int_cast<sal_uInt8>(r_))),
- g(toDoubleColor(sal::static_int_cast<sal_uInt8>(g_))),
- b(toDoubleColor(sal::static_int_cast<sal_uInt8>(b_)))
- {}
double a;
double r;
double g;
diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx
index 0d4008c14707..dab095db6d06 100644
--- a/filter/source/svg/svgfilter.hxx
+++ b/filter/source/svg/svgfilter.hxx
@@ -118,10 +118,6 @@ protected:
virtual void ExportContent_() override {}
virtual void ExportMasterStyles_() override {}
virtual sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum /* eClass */ ) override { return 0; }
-
-private:
-
- SVGExport();
};
class ObjectRepresentation
diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx
index 132d93b110a0..6b056f743950 100644
--- a/filter/source/svg/svgwriter.hxx
+++ b/filter/source/svg/svgwriter.hxx
@@ -89,8 +89,6 @@ private:
SVGFontExport& mrFontExport;
SvXMLElementExport* mpElemFont;
- SVGAttributeWriter();
-
static double ImplRound( double fVal );
public:
@@ -349,7 +347,6 @@ class SVGWriter : public cppu::WeakImplHelper< XSVGWriter >
private:
Reference< XComponentContext > mxContext;
Sequence< css::beans::PropertyValue > maFilterData;
- SVGWriter();
public:
explicit SVGWriter( const Sequence<Any>& args,
diff --git a/filter/source/xmlfilteradaptor/streamwrap.cxx b/filter/source/xmlfilteradaptor/streamwrap.cxx
deleted file mode 100644
index bcc2d97cb753..000000000000
--- a/filter/source/xmlfilteradaptor/streamwrap.cxx
+++ /dev/null
@@ -1,59 +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 .
- */
-
-
-#include "streamwrap.hxx"
-#include <osl/file.hxx>
-
-namespace foo
-{
-
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::io;
-using namespace ::com::sun::star::lang;
-using namespace ::osl;
-
-
-//= OOutputStreamWrapper
-
-
-void SAL_CALL OOutputStreamWrapper::writeBytes(const css::uno::Sequence< sal_Int8 >& aData) throw( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception )
-{
- sal_uInt64 nWritten = 0;
- rStream.write(aData.getConstArray(),aData.getLength(),nWritten);
- if (nWritten != (sal_uInt64)aData.getLength())
- {
- throw css::io::BufferSizeExceededException(OUString(),static_cast<css::uno::XWeak*>(this));
- }
-}
-
-
-void SAL_CALL OOutputStreamWrapper::flush() throw( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception )
-{
-}
-
-
-void SAL_CALL OOutputStreamWrapper::closeOutput() throw( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception )
-{
-}
-
-} // namespace utl
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/xmlfilteradaptor/streamwrap.hxx b/filter/source/xmlfilteradaptor/streamwrap.hxx
deleted file mode 100644
index 1f57e31573e0..000000000000
--- a/filter/source/xmlfilteradaptor/streamwrap.hxx
+++ /dev/null
@@ -1,58 +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_FILTER_SOURCE_XMLFILTERADAPTOR_STREAMWRAP_HXX
-#define INCLUDED_FILTER_SOURCE_XMLFILTERADAPTOR_STREAMWRAP_HXX
-
-#include <osl/mutex.hxx>
-#include <com/sun/star/io/XOutputStream.hpp>
-#include <com/sun/star/io/XInputStream.hpp>
-#include <com/sun/star/io/XSeekable.hpp>
-#include <cppuhelper/implbase.hxx>
-
-namespace osl
-{
- class File;
-}
-
-namespace foo
-{
-
-//= OOutputStreamWrapper
-
-typedef ::cppu::WeakImplHelper<css::io::XOutputStream> OutputStreamWrapper_Base;
- // needed for some compilers
-class OOutputStreamWrapper : public OutputStreamWrapper_Base
-{
- ::osl::File& rStream;
-
-public:
- explicit OOutputStreamWrapper(osl::File& _rStream) :rStream(_rStream) { }
-
-// css::io::XOutputStream
- virtual void SAL_CALL writeBytes(const css::uno::Sequence< sal_Int8 >& aData) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL flush() throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL closeOutput() throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception) override;
-};
-
-} // namespace utl
-
-
-#endif // INCLUDED_FILTER_SOURCE_XMLFILTERADAPTOR_STREAMWRAP_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/DatabaseForm.hxx b/forms/source/component/DatabaseForm.hxx
index 415fb24fb8d9..1138c2a1ee50 100644
--- a/forms/source/component/DatabaseForm.hxx
+++ b/forms/source/component/DatabaseForm.hxx
@@ -107,10 +107,6 @@ public:
,nRepresentation( _nRepresent )
{
}
-
- HtmlSuccessfulObj()
- {
- }
};
typedef std::vector<HtmlSuccessfulObj> HtmlSuccessfulObjList;
diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx
index 27ddd31e27e3..7d66f4213390 100644
--- a/forms/source/component/FormComponent.cxx
+++ b/forms/source/component/FormComponent.cxx
@@ -1104,18 +1104,6 @@ oslInterlockedCount OControlModel::unlockInstance( LockAccess )
return lockCount;
}
-void OControlModel::firePropertyChanges( const Sequence< sal_Int32 >& _rHandles, const Sequence< Any >& _rOldValues,
- const Sequence< Any >& _rNewValues, LockAccess )
-{
- OPropertySetHelper::fire(
- const_cast< Sequence< sal_Int32 >& >( _rHandles ).getArray(),
- _rNewValues.getConstArray(),
- _rOldValues.getConstArray(),
- _rHandles.getLength(),
- false
- );
-}
-
void OControlModel::firePropertyChanges( const std::vector< sal_Int32 >& _rHandles, const std::vector< Any >& _rOldValues,
const std::vector< Any >& _rNewValues, LockAccess )
{
diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx
index 201cf13f6b97..da3bb20a575e 100644
--- a/forms/source/inc/FormComponent.hxx
+++ b/forms/source/inc/FormComponent.hxx
@@ -501,12 +501,6 @@ public:
const std::vector< css::uno::Any >& _rNewValues,
LockAccess
);
- void firePropertyChanges(
- const css::uno::Sequence< sal_Int32 >& _rHandles,
- const css::uno::Sequence< css::uno::Any >& _rOldValues,
- const css::uno::Sequence< css::uno::Any >& _rNewValues,
- LockAccess
- );
inline ::osl::Mutex&
getInstanceMutex() { return m_aMutex; }
diff --git a/forms/source/inc/frm_resource.hxx b/forms/source/inc/frm_resource.hxx
index 78ffa5554120..6597893ab384 100644
--- a/forms/source/inc/frm_resource.hxx
+++ b/forms/source/inc/frm_resource.hxx
@@ -35,7 +35,7 @@ namespace frm
static SimpleResMgr* m_pImpl;
private:
// no instantiation allowed
- ResourceManager() { }
+ ResourceManager() = delete;
~ResourceManager() { }
// we'll instantiate one static member of the following class, which, in its dtor,
diff --git a/forms/source/inc/property.hxx b/forms/source/inc/property.hxx
index daf86db81231..062e3212dec4 100644
--- a/forms/source/inc/property.hxx
+++ b/forms/source/inc/property.hxx
@@ -50,7 +50,7 @@ class PropertyInfoService
static PropertyMap s_AllKnownProperties;
public:
- PropertyInfoService() { }
+ PropertyInfoService() = delete;
static sal_Int32 getPropertyId(const OUString& _rName);
diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx
index caa60fd924ff..8cbceb3e5e8d 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -1758,23 +1758,6 @@ bool FormulaMissingToken::operator==( const FormulaToken& r ) const
}
-FormulaSubroutineToken::FormulaSubroutineToken( const FormulaSubroutineToken& r ) :
- FormulaToken( r ),
- mpArray( r.mpArray->Clone())
-{
-}
-FormulaSubroutineToken::~FormulaSubroutineToken()
-{
- delete mpArray;
-}
-bool FormulaSubroutineToken::operator==( const FormulaToken& r ) const
-{
- // Arrays don't equal..
- return FormulaToken::operator==( r ) &&
- (mpArray == static_cast<const FormulaSubroutineToken&>(r).mpArray);
-}
-
-
bool FormulaUnknownToken::operator==( const FormulaToken& r ) const
{
return FormulaToken::operator==( r );
diff --git a/formula/source/core/inc/core_resource.hxx b/formula/source/core/inc/core_resource.hxx
index 5c9d4991b1dd..fbd6aa389657 100644
--- a/formula/source/core/inc/core_resource.hxx
+++ b/formula/source/core/inc/core_resource.hxx
@@ -39,7 +39,7 @@ namespace formula
private:
// no instantiation allowed
- ResourceManager() { }
+ ResourceManager() = delete;
~ResourceManager() { }
protected:
diff --git a/framework/inc/classes/filtercache.hxx b/framework/inc/classes/filtercache.hxx
deleted file mode 100644
index 4b7fda29ad97..000000000000
--- a/framework/inc/classes/filtercache.hxx
+++ /dev/null
@@ -1,92 +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 .
- */
-
-/*TODO
- - late init
- - order by number!
- - insert default detector and loader as last ones in hashes ... don't hold it as an extra member!
- => CheckedIterator will be obsolete!
- */
-
-#ifndef INCLUDED_FRAMEWORK_INC_CLASSES_FILTERCACHE_HXX
-#define INCLUDED_FRAMEWORK_INC_CLASSES_FILTERCACHE_HXX
-
-#include <classes/filtercachedata.hxx>
-
-#include <general.h>
-#include <queries.h>
-
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/registry/XRegistryKey.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/container/ElementExistException.hpp>
-#include <com/sun/star/container/NoSuchElementException.hpp>
-
-#include <rtl/ustring.hxx>
-
-#ifdef ENABLE_GENERATEFILTERCACHE
- #include <rtl/ustrbuf.hxx>
-#endif
-
-namespace framework{
-
-/*-************************************************************************************************************
- @short cache for all filter and type information
- @descr Frameloader - and filterfactory need some information about our current registered filters and types.
- For better performance its necessary to cache all needed values.
-
- @devstatus ready to use
- @threadsafe yes
-*//*-*************************************************************************************************************/
-
-class FilterCache
-{
- public:
-
- // public methods
-
- public:
-
- // constructor / destructor
-
- FilterCache( sal_Int32 nVersion = DEFAULT_FILTERCACHE_VERSION,
- ConfigItemMode nMode = DEFAULT_FILTERCACHE_MODE );
-
- /*-****************************************************************************************************
- @short standard destructor to delete instance
- @descr This will clear the cache if last owner release it.
- *//*-*****************************************************************************************************/
-
- virtual ~FilterCache();
-
- // private variables
-
- private:
-
- static sal_Int32 m_nRefCount;
- static sal_Int32 m_nVersion;
- static sal_Int16 m_nMode;
-
-}; // class FilterCache
-
-} // namespace framework
-
-#endif // INCLUDED_FRAMEWORK_INC_CLASSES_FILTERCACHE_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/classes/filtercachedata.hxx b/framework/inc/classes/filtercachedata.hxx
deleted file mode 100644
index 77a87d54c770..000000000000
--- a/framework/inc/classes/filtercachedata.hxx
+++ /dev/null
@@ -1,330 +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_FRAMEWORK_INC_CLASSES_FILTERCACHEDATA_HXX
-#define INCLUDED_FRAMEWORK_INC_CLASSES_FILTERCACHEDATA_HXX
-
-#include <classes/wildcard.hxx>
-#include <classes/converter.hxx>
-#include <macros/xinterface.hxx>
-#include <general.h>
-
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/util/XChangesListener.hpp>
-#include <com/sun/star/util/XChangesNotifier.hpp>
-
-#include <unotools/configitem.hxx>
-#include <cppuhelper/weak.hxx>
-#include <rtl/ustring.hxx>
-
-#include <iterator>
-#include <unordered_map>
-#include <vector>
-
-namespace framework{
-
-#define DEFAULT_FILTERCACHE_VERSION 6 /// these implmentation of FilterCache support different version of TypeDetection.xml! This define the current set default one.
-
-#define DEFAULT_FILTERCACHE_MODE ConfigItemMode::DelayedUpdate | ConfigItemMode::AllLocales /// ConfigItems could run in different modes: supported values are ... { ConfigItemMode::ImmediateUpdate, ConfigItemMode::DelayedUpdate, ConfigItemMode::AllLocales }
-
-enum EModifyState
-{
- E_UNTOUCHED ,
- E_ADDED ,
- E_CHANGED ,
- E_REMOVED
-};
-
-enum EFilterPackage
-{
- E_STANDARD ,
- E_ADDITIONAL
-};
-
-// These struct define a type, which present the type of a file.
-// He is used for easy filter detection without file stream detection!
-// The internal name is the keyname of an item with these structure in our hash map or our configuration set!
-
-struct FileType
-{
-
- // public methods
-
- public:
-
- inline FileType ( ) { impl_clear(); }
- inline FileType ( const FileType& rCopy ) { impl_copy( rCopy ); }
- inline ~FileType ( ) { impl_clear(); }
- inline FileType& operator= ( const FileType& rCopy ) { return impl_copy( rCopy ); }
-
- private:
-
- inline void impl_clear()
- {
- bPreferred = false;
- sName.clear();
- sMediaType.clear();
- sClipboardFormat.clear();
- nDocumentIconID = 0;
- lUINames.clear();
- lURLPattern.clear();
- lExtensions.clear();
- }
-
- inline FileType& impl_copy( const FileType& rCopy )
- {
- bPreferred = rCopy.bPreferred;
- sName = rCopy.sName;
- lUINames = rCopy.lUINames;
- sMediaType = rCopy.sMediaType;
- sClipboardFormat = rCopy.sClipboardFormat;
- nDocumentIconID = rCopy.nDocumentIconID;
- lURLPattern = rCopy.lURLPattern;
- lExtensions = rCopy.lExtensions;
- return (*this);
- }
-
- // public member
-
- public:
-
- bool bPreferred;
- OUString sName;
- OUStringHashMap lUINames;
- OUString sMediaType;
- OUString sClipboardFormat;
- sal_Int32 nDocumentIconID;
- std::vector<OUString> lURLPattern;
- std::vector<OUString> lExtensions;
-};
-
-// These struct describe a filter which is registered for one type.
-// He hold information about services which present the document himself (like a item) and a filter service which
-// filter a file in these document.
-// The internal name is the keyname of an item with these structure in our hash map or our configuration set!
-
-struct Filter
-{
-
- // public methods
-
- public:
-
- inline Filter ( ) { impl_clear(); }
- inline Filter ( const Filter& rCopy ) { impl_copy( rCopy ); }
- inline ~Filter ( ) { impl_clear(); }
- inline Filter& operator= ( const Filter& rCopy ) { return impl_copy( rCopy ); }
-
- private:
-
- inline void impl_clear()
- {
- nOrder = 0;
- sName.clear();
- sType.clear();
- sDocumentService.clear();
- sFilterService.clear();
- sUIComponent.clear();
- nFlags = 0;
- nFileFormatVersion = 0;
- sTemplateName.clear();
- lUINames.clear();
- lUserData.clear();
- }
-
- inline Filter& impl_copy( const Filter& rCopy )
- {
- nOrder = rCopy.nOrder;
- sName = rCopy.sName;
- sType = rCopy.sType;
- lUINames = rCopy.lUINames;
- sDocumentService = rCopy.sDocumentService;
- sFilterService = rCopy.sFilterService;
- sUIComponent = rCopy.sUIComponent;
- nFlags = rCopy.nFlags;
- nFileFormatVersion = rCopy.nFileFormatVersion;
- sTemplateName = rCopy.sTemplateName;
- lUserData = rCopy.lUserData;
- return (*this);
- }
-
- // public member
-
- public:
-
- sal_Int32 nOrder;
- OUString sName;
- OUString sType;
- OUStringHashMap lUINames;
- OUString sDocumentService;
- OUString sFilterService;
- OUString sUIComponent;
- sal_Int32 nFlags;
- std::vector<OUString> lUserData;
- sal_Int32 nFileFormatVersion;
- OUString sTemplateName;
-};
-
-// Programmer can register his own services for an content detection of different types.
-// The implementation or service name of these is the keyname of an item with these structure
-// in our hash map or our configuration set!
-
-struct Detector
-{
-
- // public methods
-
- public:
-
- inline Detector ( ) { impl_clear(); }
- inline Detector ( const Detector& rCopy ) { impl_copy( rCopy ); }
- inline ~Detector ( ) { impl_clear(); }
- inline Detector& operator= ( const Detector& rCopy ) { return impl_copy( rCopy ); }
-
- private:
-
- inline void impl_clear()
- {
- sName.clear();
- lTypes.clear();
- }
-
- inline Detector& impl_copy( const Detector& rCopy )
- {
- sName = rCopy.sName;
- lTypes = rCopy.lTypes;
- return (*this);
- }
-
- // public member
-
- public:
-
- OUString sName;
- std::vector<OUString> lTypes;
-};
-
-// Programmer can register his own services for loading documents in a frame.
-// The implementation or service name of these is the keyname of an item with these structure
-// in our hash map or our configuration set!
-
-struct Loader
-{
-
- // public methods
-
- public:
-
- inline Loader ( ) { impl_clear(); }
- inline Loader ( const Loader& rCopy ) { impl_copy( rCopy ); }
- inline ~Loader ( ) { impl_clear(); }
- inline Loader& operator= ( const Loader& rCopy ) { return impl_copy( rCopy ); }
-
- private:
-
- inline void impl_clear()
- {
- sName.clear();
- lUINames.clear();
- lTypes.clear();
- }
-
- inline Loader& impl_copy( const Loader& rCopy )
- {
- sName = rCopy.sName;
- lUINames = rCopy.lUINames;
- lTypes = rCopy.lTypes;
- return (*this);
- }
-
- // public member
-
- public:
-
- OUString sName;
- OUStringHashMap lUINames;
- std::vector<OUString> lTypes;
-};
-
-// Programmer can register his own services to handle a FileType and intercept dispatches.
-// Don't forget: It's not a FrameLoader - it's a ContentHandler! (normally without any UI)
-
-struct ContentHandler
-{
-
- // public methods
-
- public:
-
- inline ContentHandler( ) { impl_clear(); }
- inline ContentHandler( const ContentHandler& rCopy ) { impl_copy( rCopy ); }
- inline ~ContentHandler( ) { impl_clear(); }
- inline ContentHandler& operator= ( const ContentHandler& rCopy ) { return impl_copy( rCopy ); }
-
- private:
-
- inline void impl_clear()
- {
- sName.clear();
- lTypes.clear();
- }
-
- inline ContentHandler& impl_copy( const ContentHandler& rCopy )
- {
- sName = rCopy.sName;
- lTypes = rCopy.lTypes;
- return (*this);
- }
-
- // public member
-
- public:
-
- OUString sName;
- std::vector<OUString> lTypes;
-};
-
-// We need different hash maps for different tables of our configuration management.
-// Follow maps convert <names> to <properties> of type, filter, detector, loader ...
-// and could be used in a generic way
-
-template< class HashType >
-class SetNodeHash : public std::unordered_map< OUString ,
- HashType ,
- OUStringHash >
-{
-};
-
-// Use these hashes to implement different tables which assign types to frame loader or detect services.
-// It's an optimism to find registered services faster!
-// The preferred hash maps file extensions to preferred types to find these ones faster.
-
-class PerformanceHash : public std::unordered_map< OUString,
- std::vector<OUString>,
- OUStringHash >
-{
-};
-
-
-} // namespace framework
-
-#endif // INCLUDED_FRAMEWORK_INC_CLASSES_FILTERCACHEDATA_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/classes/wildcard.hxx b/framework/inc/classes/wildcard.hxx
deleted file mode 100644
index e9ced168099a..000000000000
--- a/framework/inc/classes/wildcard.hxx
+++ /dev/null
@@ -1,65 +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_FRAMEWORK_INC_CLASSES_WILDCARD_HXX
-#define INCLUDED_FRAMEWORK_INC_CLASSES_WILDCARD_HXX
-
-#include <rtl/ustring.hxx>
-
-namespace framework{
-
-/*-************************************************************************************************************
- @short implement wildcard-mechanism for unicode
- @descr This class can be used to get information about the matching of a pattern to a given text.
- It's suitable for 8-Bit- AND 16-Bit-strings!
- @ATTENTION This class isn't threadsafe!
-
- @devstatus deprecated
-*//*-*************************************************************************************************************/
-
-class Wildcard
-{
-
- // public methods
-
- public:
-
- // constructor / destructor
-
- /*-****************************************************************************************************
- @short standard ctor
- @descr We do nothing here.
- *//*-*****************************************************************************************************/
-
- Wildcard();
-
- /*-****************************************************************************************************
- @short standard dtor
- @descr We do nothing here.
- *//*-*****************************************************************************************************/
-
- virtual ~Wildcard();
-
-}; // class Wildcard
-
-} // namespace framework
-
-#endif // INCLUDED_FRAMEWORK_INC_CLASSES_WILDCARD_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/helper/mischelper.hxx b/framework/inc/helper/mischelper.hxx
index 6be2306e7fdf..39cae9c6a484 100644
--- a/framework/inc/helper/mischelper.hxx
+++ b/framework/inc/helper/mischelper.hxx
@@ -234,33 +234,6 @@ class WeakChangesListener : public ::cppu::WeakImplHelper<css::util::XChangesLis
}
};
-class WeakEventListener : public ::cppu::WeakImplHelper<css::lang::XEventListener>
-{
- private:
- css::uno::WeakReference<css::lang::XEventListener> mxOwner;
-
- public:
- WeakEventListener(css::uno::Reference<css::lang::XEventListener> xOwner)
- : mxOwner(xOwner)
- {
- }
-
- virtual ~WeakEventListener()
- {
- }
-
- // lang.XEventListener
- virtual void SAL_CALL disposing(const css::lang::EventObject& rEvent)
- throw(css::uno::RuntimeException, std::exception) override
- {
- css::uno::Reference<css::lang::XEventListener> xOwner(mxOwner.get(),
- css::uno::UNO_QUERY);
- if (xOwner.is())
- xOwner->disposing(rEvent);
-
- }
-};
-
class WeakDocumentEventListener : public ::cppu::WeakImplHelper<css::document::XDocumentEventListener>
{
private:
diff --git a/framework/inc/queries.h b/framework/inc/queries.h
deleted file mode 100644
index 153cbc000340..000000000000
--- a/framework/inc/queries.h
+++ /dev/null
@@ -1,301 +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_FRAMEWORK_INC_QUERIES_H
-#define INCLUDED_FRAMEWORK_INC_QUERIES_H
-
-#include "general.h"
-
-#include <rtl/ustring.hxx>
-#include <rtl/ustrbuf.hxx>
-
-namespace framework{
-
-/*-************************************************************************************************************
- @short These values describe our supported queries for type, filter ... properties.
- They are used by our FilterFactory or our TypeDetection to return
- subsets of our cached configuration.
-*//*-*************************************************************************************************************/
-#define BASE_QUERY_ALL "_query_all"
-#define BASE_QUERY_WRITER "_query_Writer"
-#define BASE_QUERY_WEB "_query_web"
-#define BASE_QUERY_GLOBAL "_query_global"
-#define BASE_QUERY_CHART "_query_chart"
-#define BASE_QUERY_CALC "_query_calc"
-#define BASE_QUERY_IMPRESS "_query_impress"
-#define BASE_QUERY_DRAW "_query_draw"
-#define BASE_QUERY_MATH "_query_math"
-#define BASE_QUERY_GRAPHICS "_query_graphics"
-
-/*-************************************************************************************************************
- @short These parameters can be used in combination with BASE_QUERY_... defines to
- specialize it.
- use follow syntax to do so: "<query>[:<param>[=<value>]]"
- e.g.: "_query_writer:default_first:use_order:sort_prop=uiname"
-
- argument description default
- -----------------------------------------------------------------------------------------------
- iflags=<mask> include filters by given mask 0
- eflags=<mask> exclude filters by given mask 0
- sort_prop=<[name,uiname]> sort by internal name or uiname name
- descending sort descending false
- use_order use order flag of filters for sorting false
- default_first set default filter on top of return list false
- case_sensitive compare "sort_prop" case sensitive false
-*//*-*************************************************************************************************************/
-#define SEPARATOR_QUERYPARAM ((sal_Unicode)':')
-#define SEPARATOR_QUERYPARAMVALUE ((sal_Unicode)'=')
-
-#define QUERYPARAM_IFLAGS "iflags"
-#define QUERYPARAM_EFLAGS "eflags"
-#define QUERYPARAM_SORT_PROP "sort_prop"
-
-#define QUERYPARAM_DESCENDING "descending"
-#define QUERYPARAM_USE_ORDER "use_order"
-#define QUERYPARAM_DEFAULT_FIRST "default_first"
-#define QUERYPARAM_CASE_SENSITIVE "case_sensitive"
-
-#define QUERYPARAMVALUE_SORT_PROP_NAME "name"
-#define QUERYPARAMVALUE_SORT_PROP_UINAME "uiname"
-
-/*-************************************************************************************************************
- @short Helper class to support easy building of a query statements.
-*//*-*************************************************************************************************************/
-class QueryBuilder
-{
- public:
-
- // start with empty query
-
- QueryBuilder()
- {
- resetAll();
- }
-
- // forget all setted params and start with empty ones
- // Attention: base of query isn't changed!
-
- void resetParams()
- {
- m_sParams.makeStringAndClear();
- m_sParams.ensureCapacity( 256 );
- }
-
- // start with new empty query
-
- void resetAll()
- {
- m_sBase.clear();
- resetParams();
- }
-
- private:
- OUString m_sBase;
- OUStringBuffer m_sParams;
-
-}; // class QueryBuilder
-
-/*-************************************************************************************************************
- @short Helper class to analyze queries and split into his different parts (base, params and values).
-*//*-*************************************************************************************************************/
-class QueryAnalyzer
-{
- public:
-
- // it's will not perform to compare strings as query type ...
- // so we convert it into these enum values.
- // default = E_ALL!
-
- enum EQuery
- {
- E_ALL ,
- E_WRITER ,
- E_WEB ,
- E_GLOBAL ,
- E_CHART ,
- E_CALC ,
- E_IMPRESS ,
- E_DRAW ,
- E_MATH ,
- E_GRAPHICS
- };
-
- // these are valid values for param "sort_prop".
- // other ones are not supported!
- // default = E_NAME
-
- enum ESortProp
- {
- E_NAME ,
- E_UINAME
- };
-
- // analyze given query and split it into his different parts; <base>:<param1>:<param2=value>...
-
- QueryAnalyzer(const OUString& sQuery)
- // Don't forget to set default values for non given params!
- : m_eQuery ( E_ALL ) // return ALL filter ...
- , m_nIFlags ( 0 ) // which has set ANY flag ... (we remove all entries which match with these mask .. => 0!)
- , m_nEFlags ( 0 ) // (only used, if nIFlags==0 and himself!=0!)
- , m_eSortProp ( E_NAME ) // sort it by internal name ...
- , m_bDescending ( sal_False ) // in ascending order ...
- , m_bCaseSensitive( sal_False ) // ignore case ...
- , m_bUseOrder ( sal_False ) // don't use order flag ...
- , m_bDefaultFirst ( sal_False ) // and don't handle default entries in special case!
- {
- // Translate old query format to new one first!
- OUString sNewQuery( sQuery );
- if (sQuery == "_filterquery_textdocument_withdefault")
- sNewQuery = "_query_writer:default_first:use_order:sort_prop=uiname";
- else if (sQuery == "_filterquery_webdocument_withdefault")
- sNewQuery = "_query_web:default_first:use_order:sort_prop=uiname";
- else if (sQuery == "_filterquery_globaldocument_withdefault")
- sNewQuery = "_query_global:default_first:use_order:sort_prop=uiname";
- else if (sQuery == "_filterquery_chartdocument_withdefault")
- sNewQuery = "_query_chart:default_first:use_order:sort_prop=uiname";
- else if (sQuery == "_filterquery_spreadsheetdocument_withdefault")
- sNewQuery = "_query_calc:default_first:use_order:sort_prop=uiname";
- else if (sQuery == "_filterquery_presentationdocument_withdefault")
- sNewQuery = "_query_impress:default_first:use_order:sort_prop=uiname";
- else if (sQuery == "_filterquery_drawingdocument_withdefault")
- sNewQuery = "_query_draw:default_first:use_order:sort_prop=uiname";
- else if (sQuery == "_filterquery_formulaproperties_withdefault")
- sNewQuery = "_query_math:default_first:use_order:sort_prop=uiname";
- else if (sQuery == "_filterquery_textdocument")
- sNewQuery = "_query_writer:use_order:sort_prop=uiname";
- else if (sQuery == "_filterquery_webdocument")
- sNewQuery = "_query_web:use_order:sort_prop=uiname";
- else if (sQuery == "_filterquery_globaldocument")
- sNewQuery = "_query_global:use_order:sort_prop=uiname";
- else if (sQuery == "_filterquery_chartdocument")
- sNewQuery = "_query_chart:use_order:sort_prop=uiname";
- else if (sQuery == "_filterquery_spreadsheetdocument")
- sNewQuery = "_query_calc:use_order:sort_prop=uiname";
- else if (sQuery == "_filterquery_presentationdocument")
- sNewQuery = "_query_impress:use_order:sort_prop=uiname";
- else if (sQuery == "_filterquery_drawingdocument")
- sNewQuery = "_query_draw:use_order:sort_prop=uiname";
- else if (sQuery == "_filterquery_formulaproperties")
- sNewQuery = "_query_math:use_order:sort_prop=uiname";
-
- // Analyze query ...
- // Try to find base of it and safe it for faster access as enum value!
- sal_Int32 nToken = 0;
- OUString sParam;
- OUString sBase = sNewQuery.getToken( 0, SEPARATOR_QUERYPARAM, nToken );
-
- if (sBase.equalsIgnoreAsciiCase(BASE_QUERY_ALL))
- m_eQuery = E_ALL;
- else if( sBase.equalsIgnoreAsciiCase(BASE_QUERY_WRITER))
- m_eQuery = E_WRITER;
- else if( sBase.equalsIgnoreAsciiCase(BASE_QUERY_WEB))
- m_eQuery = E_WEB;
- else if( sBase.equalsIgnoreAsciiCase(BASE_QUERY_GLOBAL))
- m_eQuery = E_GLOBAL;
- else if( sBase.equalsIgnoreAsciiCase(BASE_QUERY_CHART))
- m_eQuery = E_CHART;
- else if( sBase.equalsIgnoreAsciiCase(BASE_QUERY_CALC))
- m_eQuery = E_CALC;
- else if( sBase.equalsIgnoreAsciiCase(BASE_QUERY_IMPRESS))
- m_eQuery = E_IMPRESS;
- else if( sBase.equalsIgnoreAsciiCase(BASE_QUERY_DRAW))
- m_eQuery = E_DRAW;
- else if( sBase.equalsIgnoreAsciiCase(BASE_QUERY_MATH))
- m_eQuery = E_MATH;
- else if( sBase.equalsIgnoreAsciiCase(BASE_QUERY_GRAPHICS))
- m_eQuery = E_GRAPHICS;
-
- // Try to get additional parameters ...
- while( nToken >= 0 )
- {
- sParam = sNewQuery.getToken( 0, SEPARATOR_QUERYPARAM, nToken );
- // "default_first"
- if( sParam.startsWith( QUERYPARAM_DEFAULT_FIRST ) )
- {
- m_bDefaultFirst = sal_True;
- }
- // "use_order"
- else if( sParam.startsWith( QUERYPARAM_USE_ORDER ) )
- {
- m_bUseOrder = sal_True;
- }
- // "descending"
- else if( sParam.startsWith( QUERYPARAM_DESCENDING ) )
- {
- m_bDescending = sal_True;
- }
- // "case_sensitive"
- else if( sParam.startsWith( QUERYPARAM_CASE_SENSITIVE ) )
- {
- m_bCaseSensitive = sal_True;
- }
- // "iflags=<mask>"
- else if( sParam.startsWith( QUERYPARAM_IFLAGS ) )
- {
- sal_Int32 nSubToken = 0;
- sParam.getToken( 0, SEPARATOR_QUERYPARAMVALUE, nSubToken );
- if( nSubToken > 0 )
- {
- m_nIFlags = sParam.getToken( 0, SEPARATOR_QUERYPARAMVALUE, nSubToken ).toInt32();
- }
- }
- // "eflags=<mask>"
- else if( sParam.startsWith( QUERYPARAM_EFLAGS ) )
- {
- sal_Int32 nSubToken = 0;
- sParam.getToken( 0, SEPARATOR_QUERYPARAMVALUE, nSubToken );
- if( nSubToken > 0 )
- {
- m_nEFlags = sParam.getToken( 0, SEPARATOR_QUERYPARAMVALUE, nSubToken ).toInt32();
- }
- }
- // "sort_prop=<[name,uiname]>"
- else if( sParam.startsWith( QUERYPARAM_SORT_PROP ) )
- {
- sal_Int32 nSubToken = 0;
- sParam.getToken( 0, SEPARATOR_QUERYPARAMVALUE, nSubToken );
- if( nSubToken > 0 )
- {
- OUString sParamValue = sParam.getToken( 0, SEPARATOR_QUERYPARAMVALUE, nSubToken );
- if( sParamValue.startsWith( QUERYPARAMVALUE_SORT_PROP_NAME ) )
- m_eSortProp = E_NAME;
- else if( sParamValue.startsWith( QUERYPARAMVALUE_SORT_PROP_UINAME ) )
- m_eSortProp = E_UINAME;
- }
- }
- }
- }
-
- private:
- EQuery m_eQuery;
- sal_uInt32 m_nIFlags;
- sal_uInt32 m_nEFlags;
- ESortProp m_eSortProp;
- bool m_bDescending;
- bool m_bCaseSensitive;
- bool m_bUseOrder;
- bool m_bDefaultFirst;
-
-}; // class QueryAnalyzer
-
-} // namespace framework
-
-#endif // INCLUDED_FRAMEWORK_INC_QUERIES_H
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/itemcontainer.hxx b/framework/inc/uielement/itemcontainer.hxx
index 5e60ce9f1735..a784602593a9 100644
--- a/framework/inc/uielement/itemcontainer.hxx
+++ b/framework/inc/uielement/itemcontainer.hxx
@@ -82,7 +82,6 @@ class FWI_DLLPUBLIC ItemContainer : public ::cppu::WeakImplHelper< css::contai
throw (css::uno::RuntimeException, std::exception) override;
private:
- ItemContainer();
void copyItemContainer( const std::vector< css::uno::Sequence< css::beans::PropertyValue > >& rSourceVector, const ShareableMutex& rMutex );
css::uno::Reference< css::container::XIndexAccess > deepCopyContainer( const css::uno::Reference< css::container::XIndexAccess >& rSubContainer, const ShareableMutex& rMutex );
diff --git a/framework/inc/uielement/statusindicatorinterfacewrapper.hxx b/framework/inc/uielement/statusindicatorinterfacewrapper.hxx
index f6a65104912b..3801e081a9e4 100644
--- a/framework/inc/uielement/statusindicatorinterfacewrapper.hxx
+++ b/framework/inc/uielement/statusindicatorinterfacewrapper.hxx
@@ -51,8 +51,6 @@ class StatusIndicatorInterfaceWrapper : public ::cppu::WeakImplHelper< css::ta
virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( css::uno::RuntimeException, std::exception ) override;
private:
- StatusIndicatorInterfaceWrapper();
-
css::uno::WeakReference< css::lang::XComponent > m_xStatusIndicatorImpl;
};
diff --git a/framework/source/inc/loadenv/actionlockguard.hxx b/framework/source/inc/loadenv/actionlockguard.hxx
index 69404486885c..a660252c0e75 100644
--- a/framework/source/inc/loadenv/actionlockguard.hxx
+++ b/framework/source/inc/loadenv/actionlockguard.hxx
@@ -61,17 +61,6 @@ class ActionLockGuard
{
}
- /** @short initialize new guard instance and lock the given resource immediately.
-
- @param xLock
- points to the outside resource, which should be locked.
- */
- ActionLockGuard(const css::uno::Reference< css::document::XActionLockable >& xLock)
- : m_bActionLocked(false)
- {
- setResource(xLock);
- }
-
/** @short release this guard instance and make sure, that no lock
will exist afterwards on the internal wrapped resource.
*/
diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx
index 8f0f4c738604..befbfc4ff6f7 100644
--- a/framework/source/services/sessionlistener.cxx
+++ b/framework/source/services/sessionlistener.cxx
@@ -20,7 +20,6 @@
#include <sal/types.h>
#include <services/desktop.hxx>
-#include <classes/filtercache.hxx>
#include <protocols.h>
#include <general.h>
diff --git a/hwpfilter/source/mzstring.h b/hwpfilter/source/mzstring.h
index 1de0906d4949..423c538d8de2 100644
--- a/hwpfilter/source/mzstring.h
+++ b/hwpfilter/source/mzstring.h
@@ -83,7 +83,6 @@ class MzString
public:
MzString(); // Create an empty string
// if len = 0, len becomes s.length)
- MzString(MzString const &s, int len = 0);
~MzString();
int length() const;
diff --git a/idl/inc/bastype.hxx b/idl/inc/bastype.hxx
index afe3642d10e0..4e176a5b3ad9 100644
--- a/idl/inc/bastype.hxx
+++ b/idl/inc/bastype.hxx
@@ -35,7 +35,6 @@ class SvBOOL
bSet:1;
public:
SvBOOL() { bSet = bVal = false; }
- SvBOOL( bool b ) : bVal( b ), bSet( true ) {}
SvBOOL( bool b, bool bSetP ) : bVal( b ), bSet( bSetP ) {}
SvBOOL & operator = ( bool n ) { bVal = n; bSet = true; return *this; }
diff --git a/idl/inc/lex.hxx b/idl/inc/lex.hxx
index 1891e3962006..10e41022ae23 100644
--- a/idl/inc/lex.hxx
+++ b/idl/inc/lex.hxx
@@ -59,7 +59,6 @@ public:
void SetColumn( sal_uLong nColumnP ) { nColumn = nColumnP; }
sal_uLong GetColumn() const { return nColumn; }
- bool IsEmpty() const { return nType == SVTOKENTYPE::Empty; }
bool IsComment() const { return nType == SVTOKENTYPE::Comment; }
bool IsInteger() const { return nType == SVTOKENTYPE::Integer; }
bool IsString() const { return nType == SVTOKENTYPE::String; }
@@ -86,8 +85,6 @@ public:
void SetHash( SvStringHashEntry * pHashP )
{ pHash = pHashP; nType = SVTOKENTYPE::HashId; }
- bool HasHash() const
- { return nType == SVTOKENTYPE::HashId; }
bool Is( SvStringHashEntry * pEntry ) const
{ return IsIdentifierHash() && pHash == pEntry; }
};
@@ -190,17 +187,6 @@ public:
return false;
}
- bool ReadIf( SvStringHashEntry* pEntry )
- {
- if( GetToken().Is( pEntry ) )
- {
- GetToken_Next();
- return true;
- }
- else
- return false;
- }
-
bool ReadIfDelimiter()
{
if( GetToken().IsChar()
diff --git a/include/basic/sbxcore.hxx b/include/basic/sbxcore.hxx
index 4cc57fa27eff..ef07a74e75bc 100644
--- a/include/basic/sbxcore.hxx
+++ b/include/basic/sbxcore.hxx
@@ -80,7 +80,6 @@ public:
virtual void Clear();
static SbxBase* Load( SvStream& );
- static void Skip( SvStream& );
bool Store( SvStream& );
virtual bool LoadCompleted();
diff --git a/include/basic/sbxvar.hxx b/include/basic/sbxvar.hxx
index 13178fa188bc..a0800cf40e04 100644
--- a/include/basic/sbxvar.hxx
+++ b/include/basic/sbxvar.hxx
@@ -69,21 +69,7 @@ struct SbxValues
SbxValues(): pData( nullptr ), eType(SbxEMPTY) {}
SbxValues( SbxDataType e ): eType(e) {}
- SbxValues( char _nChar ): nChar( _nChar ), eType(SbxCHAR) {}
- SbxValues( sal_uInt8 _nByte ): nByte( _nByte ), eType(SbxBYTE) {}
- SbxValues( short _nInteger ): nInteger( _nInteger ), eType(SbxINTEGER ) {}
- SbxValues( long _nLong ): nLong( _nLong ), eType(SbxLONG) {}
- SbxValues( sal_uInt16 _nUShort ): nUShort( _nUShort ), eType(SbxUSHORT) {}
- SbxValues( sal_uIntPtr _nULong ): nULong( _nULong ), eType(SbxULONG) {}
- SbxValues( int _nInt ): nInt( _nInt ), eType(SbxINT) {}
- SbxValues( unsigned int _nUInt ): nUInt( _nUInt ), eType(SbxUINT) {}
- SbxValues( float _nSingle ): nSingle( _nSingle ), eType(SbxSINGLE) {}
SbxValues( double _nDouble ): nDouble( _nDouble ), eType(SbxDOUBLE) {}
- SbxValues( const OUString* _pString ): pOUString( const_cast<OUString*>(_pString) ), eType(SbxSTRING) {}
- SbxValues( SbxBase* _pObj ): pObj( _pObj ), eType(SbxOBJECT) {}
- SbxValues( sal_Unicode* _pChar ): pChar( _pChar ), eType(SbxLPSTR) {}
- SbxValues( void* _pData ): pData( _pData ), eType(SbxPOINTER) {}
-
};
class BASIC_DLLPUBLIC SbxValue : public SbxBase
diff --git a/include/comphelper/anycompare.hxx b/include/comphelper/anycompare.hxx
index 5be23c9082cf..c115658c145c 100644
--- a/include/comphelper/anycompare.hxx
+++ b/include/comphelper/anycompare.hxx
@@ -61,9 +61,6 @@ namespace comphelper
private:
IKeyPredicateLess const & m_predicate;
-
- private:
- LessPredicateAdapter(); // never implemented
};
diff --git a/include/comphelper/componentmodule.hxx b/include/comphelper/componentmodule.hxx
index 4c0f8a3e4742..235705564c08 100644
--- a/include/comphelper/componentmodule.hxx
+++ b/include/comphelper/componentmodule.hxx
@@ -60,14 +60,6 @@ namespace comphelper
/// the function to create a factory for the component (usually <code>::cppu::createSingleComponentFactory</code>)
FactoryInstantiation pFactoryCreationFunc;
- ComponentDescription()
- :sImplementationName()
- ,aSupportedServices()
- ,pComponentCreationFunc( nullptr )
- ,pFactoryCreationFunc( nullptr )
- {
- }
-
ComponentDescription(
const OUString& _rImplementationName,
const css::uno::Sequence< OUString >& _rSupportedServices,
diff --git a/include/comphelper/embeddedobjectcontainer.hxx b/include/comphelper/embeddedobjectcontainer.hxx
index 27992e1b4002..52dfac39c83f 100644
--- a/include/comphelper/embeddedobjectcontainer.hxx
+++ b/include/comphelper/embeddedobjectcontainer.hxx
@@ -144,7 +144,6 @@ public:
bool MoveEmbeddedObject( const OUString& rName, EmbeddedObjectContainer& );
// get the stored representation for the object
- css::uno::Reference < css::io::XInputStream > GetObjectStream( const css::uno::Reference < css::embed::XEmbeddedObject >& );
css::uno::Reference < css::io::XInputStream > GetObjectStream( const OUString& aName, OUString* pMediaType );
// get the stored graphical representation for the object
diff --git a/include/comphelper/interaction.hxx b/include/comphelper/interaction.hxx
index 85bf5e966a08..0dc42980786c 100644
--- a/include/comphelper/interaction.hxx
+++ b/include/comphelper/interaction.hxx
@@ -90,10 +90,6 @@ namespace comphelper
class COMPHELPER_DLLPUBLIC OInteractionPassword : public OInteraction< css::task::XInteractionPassword >
{
public:
- OInteractionPassword()
- {
- }
-
OInteractionPassword( const OUString& _rInitialPassword )
:m_sPassword( _rInitialPassword )
{
diff --git a/include/comphelper/servicedecl.hxx b/include/comphelper/servicedecl.hxx
index 077d38e714f4..5fece98d9e25 100644
--- a/include/comphelper/servicedecl.hxx
+++ b/include/comphelper/servicedecl.hxx
@@ -207,10 +207,6 @@ public:
css::uno::Sequence<css::uno::Any> const& args,
css::uno::Reference<css::uno::XComponentContext> const& xContext )
: ServiceImpl_BASE(rServiceDecl, args, xContext) {}
- InheritingServiceImpl(
- ServiceDecl const& rServiceDecl,
- css::uno::Reference<css::uno::XComponentContext> const& xContext )
- : ServiceImpl_BASE(rServiceDecl, xContext) {}
};
template <typename ServiceImplT>
diff --git a/include/connectivity/FValue.hxx b/include/connectivity/FValue.hxx
index a25989c21fe4..21933c7100b5 100644
--- a/include/connectivity/FValue.hxx
+++ b/include/connectivity/FValue.hxx
@@ -519,7 +519,6 @@ namespace connectivity
{
::std::vector<sal_Int32> m_nParameterIndexes;
public:
- OAssignValues() : m_nParameterIndexes(1,SQL_NO_PARAMETER){}
OAssignValues(Vector::size_type n) : OValueRefVector(n),m_nParameterIndexes(n+1,SQL_NO_PARAMETER){}
void setParameterIndex(sal_Int32 _nId,sal_Int32 _nParameterIndex) { m_nParameterIndexes[_nId] = _nParameterIndex;}
diff --git a/include/connectivity/TTableHelper.hxx b/include/connectivity/TTableHelper.hxx
index 2c37d370d91f..3e56f9c34c36 100644
--- a/include/connectivity/TTableHelper.hxx
+++ b/include/connectivity/TTableHelper.hxx
@@ -49,7 +49,6 @@ namespace connectivity
OrdinalPosition nOrdinalPosition;
- ColumnDesc() {}
ColumnDesc( const OUString& _rName
, sal_Int32 _nField5
, const OUString& _aField6
diff --git a/include/connectivity/parameters.hxx b/include/connectivity/parameters.hxx
index 476a8c2ca5f6..7a101df72893 100644
--- a/include/connectivity/parameters.hxx
+++ b/include/connectivity/parameters.hxx
@@ -80,12 +80,6 @@ namespace dbtools
/// the indices of inner parameters which need to be filled when this concrete parameter is set
::std::vector< sal_Int32 > aInnerIndexes;
- /// default ctor
- ParameterMetaData()
- :eType( ParameterClassification::FilledExternally )
- {
- }
-
/// ctor with composer column
ParameterMetaData( const css::uno::Reference< css::beans::XPropertySet >& _rxColumn )
:eType ( ParameterClassification::FilledExternally )
diff --git a/include/dbaccess/genericcontroller.hxx b/include/dbaccess/genericcontroller.hxx
index 2fc981ef51e7..5e9b792275f2 100644
--- a/include/dbaccess/genericcontroller.hxx
+++ b/include/dbaccess/genericcontroller.hxx
@@ -228,7 +228,6 @@ namespace dbaui
css::util::URL aURL;
css::uno::Reference< css::frame::XStatusListener > xListener;
- DispatchTarget() { }
DispatchTarget(const css::util::URL& rURL, const css::uno::Reference< css::frame::XStatusListener >& rRef) : aURL(rURL), xListener(rRef) { }
};
diff --git a/include/drawinglayer/attribute/fillgraphicattribute.hxx b/include/drawinglayer/attribute/fillgraphicattribute.hxx
index fc1b8029f9d6..87304c6cd71a 100644
--- a/include/drawinglayer/attribute/fillgraphicattribute.hxx
+++ b/include/drawinglayer/attribute/fillgraphicattribute.hxx
@@ -56,7 +56,6 @@ namespace drawinglayer
bool bTiling = false,
double fOffsetX = 0.0,
double fOffsetY = 0.0);
- FillGraphicAttribute();
FillGraphicAttribute(const FillGraphicAttribute& rCandidate);
FillGraphicAttribute& operator=(const FillGraphicAttribute& rCandidate);
~FillGraphicAttribute();
diff --git a/include/drawinglayer/attribute/fontattribute.hxx b/include/drawinglayer/attribute/fontattribute.hxx
index 82c183f6a486..1b35189a6993 100644
--- a/include/drawinglayer/attribute/fontattribute.hxx
+++ b/include/drawinglayer/attribute/fontattribute.hxx
@@ -71,9 +71,6 @@ namespace drawinglayer
FontAttribute& operator=(const FontAttribute& rCandidate);
~FontAttribute();
- // checks if the incarnation is default constructed
- bool isDefault() const;
-
// compare operator
bool operator==(const FontAttribute& rCandidate) const;
diff --git a/include/drawinglayer/attribute/materialattribute3d.hxx b/include/drawinglayer/attribute/materialattribute3d.hxx
index e5d3f68bef55..db144b7a030a 100644
--- a/include/drawinglayer/attribute/materialattribute3d.hxx
+++ b/include/drawinglayer/attribute/materialattribute3d.hxx
@@ -59,9 +59,6 @@ namespace drawinglayer
MaterialAttribute3D(const MaterialAttribute3D& rCandidate);
~MaterialAttribute3D();
- // checks if the incarnation is default constructed
- bool isDefault() const;
-
// assignment operator
MaterialAttribute3D& operator=(const MaterialAttribute3D& rCandidate);
diff --git a/include/drawinglayer/attribute/sdrlightattribute3d.hxx b/include/drawinglayer/attribute/sdrlightattribute3d.hxx
index 49b9685b6177..3d91e54d7189 100644
--- a/include/drawinglayer/attribute/sdrlightattribute3d.hxx
+++ b/include/drawinglayer/attribute/sdrlightattribute3d.hxx
@@ -54,17 +54,12 @@ namespace drawinglayer
const basegfx::BColor& rColor,
const basegfx::B3DVector& rDirection,
bool bSpecular);
- explicit Sdr3DLightAttribute(const basegfx::BColor& rColor);
Sdr3DLightAttribute(const Sdr3DLightAttribute& rCandidate);
- Sdr3DLightAttribute();
~Sdr3DLightAttribute();
// assignment operator
Sdr3DLightAttribute& operator=(const Sdr3DLightAttribute& rCandidate);
- // checks if the incarnation is default constructed
- bool isDefault() const;
-
// compare operator
bool operator==(const Sdr3DLightAttribute& rCandidate) const;
diff --git a/include/drawinglayer/attribute/sdrobjectattribute3d.hxx b/include/drawinglayer/attribute/sdrobjectattribute3d.hxx
index 85019eff89b5..b4ea75bfbf87 100644
--- a/include/drawinglayer/attribute/sdrobjectattribute3d.hxx
+++ b/include/drawinglayer/attribute/sdrobjectattribute3d.hxx
@@ -64,15 +64,11 @@ namespace drawinglayer
bool bTextureFilter,
bool bReducedLineGeometry);
Sdr3DObjectAttribute(const Sdr3DObjectAttribute& rCandidate);
- Sdr3DObjectAttribute();
~Sdr3DObjectAttribute();
// assignment operator
Sdr3DObjectAttribute& operator=(const Sdr3DObjectAttribute& rCandidate);
- // checks if the incarnation is default constructed
- bool isDefault() const;
-
// compare operator
bool operator==(const Sdr3DObjectAttribute& rCandidate) const;
diff --git a/include/drawinglayer/primitive3d/baseprimitive3d.hxx b/include/drawinglayer/primitive3d/baseprimitive3d.hxx
index 9cc610a52dcf..0fa964e7b91a 100644
--- a/include/drawinglayer/primitive3d/baseprimitive3d.hxx
+++ b/include/drawinglayer/primitive3d/baseprimitive3d.hxx
@@ -60,7 +60,6 @@ namespace drawinglayer { namespace primitive3d {
explicit Primitive3DContainer( size_type count ) : vector(count) {}
Primitive3DContainer( const Primitive3DContainer& other ) : vector(other) {}
Primitive3DContainer( const Primitive3DContainer&& other ) : vector(other) {}
- Primitive3DContainer( const vector< Primitive3DReference >& other ) : vector(other) {}
Primitive3DContainer( std::initializer_list<Primitive3DReference> init ) : vector(init) {}
void append(const Primitive3DContainer& rSource);
diff --git a/include/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx b/include/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx
index bd30c33cca38..e9199c4d8087 100644
--- a/include/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx
+++ b/include/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx
@@ -64,14 +64,6 @@ namespace drawinglayer
maPolyPolygon.transform(aTransform);
}
- explicit Slice3D(
- const basegfx::B3DPolyPolygon& rPolyPolygon,
- SliceType3D aSliceType = SLICETYPE3D_REGULAR)
- : maPolyPolygon(rPolyPolygon),
- maSliceType(aSliceType)
- {
- }
-
// data access
const basegfx::B3DPolyPolygon& getB3DPolyPolygon() const { return maPolyPolygon; }
SliceType3D getSliceType() const { return maSliceType; }
diff --git a/include/editeng/AccessibleParaManager.hxx b/include/editeng/AccessibleParaManager.hxx
index bc20b3769052..af4687581f06 100644
--- a/include/editeng/AccessibleParaManager.hxx
+++ b/include/editeng/AccessibleParaManager.hxx
@@ -52,11 +52,6 @@ namespace accessibility
typedef CppType InterfaceType;
WeakCppRef() : maWeakRef(), maUnsafeRef( nullptr ) {}
- WeakCppRef( InterfaceType& rImpl ) :
- maWeakRef( css::uno::Reference< UnoInterfaceType >( rImpl, css::uno::UNO_QUERY ) ),
- maUnsafeRef( &rImpl )
- {
- }
WeakCppRef(rtl::Reference<InterfaceType> const & rImpl):
maWeakRef(rImpl.get()),
diff --git a/include/editeng/overflowingtxt.hxx b/include/editeng/overflowingtxt.hxx
index a8fa5a6e85c2..27141dfda504 100644
--- a/include/editeng/overflowingtxt.hxx
+++ b/include/editeng/overflowingtxt.hxx
@@ -87,7 +87,6 @@ public:
bool IsLastParaInterrupted() const;
private:
- NonOverflowingText(const EditTextObject *pTObj, bool bLastParaInterrupted);
NonOverflowingText(const ESelection &aSel, bool bLastParaInterrupted);
friend class Outliner;
diff --git a/include/editeng/txtrange.hxx b/include/editeng/txtrange.hxx
index 43a4a4d17d5b..0e959e706fdf 100644
--- a/include/editeng/txtrange.hxx
+++ b/include/editeng/txtrange.hxx
@@ -74,7 +74,6 @@ public:
bool IsSimple() const { return bSimple; }
bool IsInner() const { return bInner; }
bool IsVertical() const { return bVertical; }
- const tools::PolyPolygon& GetPolyPolygon() const { return *mpPolyPolygon; }
const Rectangle& GetBoundRect()
{ return pBound ? static_cast< const Rectangle& >(*pBound) : GetBoundRect_(); }
void SetUpper( sal_uInt16 nNew ){ nUpper = nNew; }
diff --git a/include/editeng/unoedhlp.hxx b/include/editeng/unoedhlp.hxx
index ba352af7f2a4..c58393f6b806 100644
--- a/include/editeng/unoedhlp.hxx
+++ b/include/editeng/unoedhlp.hxx
@@ -57,8 +57,6 @@ class SvxEditSourceHintEndPara :public SvxEditSourceHint
public:
SvxEditSourceHintEndPara( sal_uInt32 nId )
:SvxEditSourceHint(nId) {}
- SvxEditSourceHintEndPara( sal_uInt32 nId, sal_uInt32 nValue, sal_uInt32 nStart=0, sal_uInt32 nEnd=0 )
- :SvxEditSourceHint(nId,nValue,nStart){ (void)nEnd; }
};
/** Helper class for common functionality in edit sources
*/
diff --git a/include/filter/msfilter/escherex.hxx b/include/filter/msfilter/escherex.hxx
index f870789992e7..ab4cedf4c607 100644
--- a/include/filter/msfilter/escherex.hxx
+++ b/include/filter/msfilter/escherex.hxx
@@ -995,7 +995,6 @@ class InteractionInfo
{
bool mbHasInteraction;
std::unique_ptr<SvMemoryStream> mpHyperlinkRecord;
- InteractionInfo();
public:
InteractionInfo( SvMemoryStream* pStream, bool bInteraction ) : mbHasInteraction( bInteraction )
diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx
index 3b594d01b1b4..f848f6b2c57c 100644
--- a/include/filter/msfilter/msdffimp.hxx
+++ b/include/filter/msfilter/msdffimp.hxx
@@ -277,8 +277,6 @@ struct SvxMSDffImportData
Rectangle aParentRect;///< Rectangle of the surrounding groups,
///< which might have been provided externally
- SvxMSDffImportData()
- {}
explicit SvxMSDffImportData( const Rectangle& rParentRect ) : aParentRect( rParentRect ) {}
bool empty() const { return m_Records.empty(); }
size_t size() const { return m_Records.size(); }
diff --git a/include/filter/msfilter/mstoolbar.hxx b/include/filter/msfilter/mstoolbar.hxx
index 6774c6cc675a..a1ff72c4205b 100644
--- a/include/filter/msfilter/mstoolbar.hxx
+++ b/include/filter/msfilter/mstoolbar.hxx
@@ -206,7 +206,6 @@ class TBCComboDropdownSpecific : public TBBase
std::shared_ptr< TBCCDData > data;
public:
TBCComboDropdownSpecific( const TBCHeader& header );
- TBCComboDropdownSpecific(){}
bool Read(SvStream &rS) override;
#if OSL_DEBUG_LEVEL > 1
virtual void Print( FILE* ) override;
diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx
index d342f5f055f0..38ab5b2ff633 100644
--- a/include/filter/msfilter/svdfppt.hxx
+++ b/include/filter/msfilter/svdfppt.hxx
@@ -1234,7 +1234,6 @@ class MSFILTER_DLLPUBLIC PPTTextObj
ImplPPTTextObj* mpImplTextObj;
void ImplClear();
- PPTTextObj(){};
public:
PPTTextObj(
SvStream& rSt,
diff --git a/include/formula/token.hxx b/include/formula/token.hxx
index 9c21ca753255..3d265f63441b 100644
--- a/include/formula/token.hxx
+++ b/include/formula/token.hxx
@@ -394,22 +394,6 @@ public:
};
-class FORMULA_DLLPUBLIC FormulaSubroutineToken : public FormulaToken
-{
-public:
- /** Takes ownership of pArray and deletes it upon destruction! */
- FormulaSubroutineToken( const FormulaTokenArray* pArray ) :
- FormulaToken( svSubroutine, ocCall ), mpArray( pArray) {}
- FormulaSubroutineToken( const FormulaSubroutineToken& r );
- virtual ~FormulaSubroutineToken();
- virtual FormulaToken* Clone() const override { return new FormulaSubroutineToken(*this); }
- virtual bool operator==( const FormulaToken& rToken ) const override;
-
-private:
- const FormulaTokenArray* mpArray;
-};
-
-
class FORMULA_DLLPUBLIC FormulaUnknownToken : public FormulaToken
{
public:
diff --git a/include/linguistic/lngprophelp.hxx b/include/linguistic/lngprophelp.hxx
index c432b7bbe519..e11b09eac1e9 100644
--- a/include/linguistic/lngprophelp.hxx
+++ b/include/linguistic/lngprophelp.hxx
@@ -157,8 +157,8 @@ class LNG_DLLPUBLIC PropertyHelper_Thesaurus
css::uno::Reference< css::beans::XPropertyChangeListener > xPropHelper;
// disallow use of copy-constructor and assignment-operator
- PropertyHelper_Thesaurus( const PropertyHelper_Thes & );
- PropertyHelper_Thesaurus & operator = ( const PropertyHelper_Thes & );
+ PropertyHelper_Thesaurus( const PropertyHelper_Thes & ) = delete;
+ PropertyHelper_Thesaurus & operator = ( const PropertyHelper_Thes & ) = delete;
public:
PropertyHelper_Thesaurus(
@@ -222,8 +222,8 @@ class LNG_DLLPUBLIC PropertyHelper_Spelling
css::uno::Reference< css::beans::XPropertyChangeListener > xPropHelper;
// disallow use of copy-constructor and assignment-operator
- PropertyHelper_Spelling( const PropertyHelper_Spell & );
- PropertyHelper_Spelling & operator = ( const PropertyHelper_Spell & );
+ PropertyHelper_Spelling( const PropertyHelper_Spell & ) = delete;
+ PropertyHelper_Spelling & operator = ( const PropertyHelper_Spell & ) = delete;
public:
PropertyHelper_Spelling(
@@ -293,8 +293,8 @@ class LNG_DLLPUBLIC PropertyHelper_Hyphenation
css::uno::Reference< css::beans::XPropertyChangeListener > xPropHelper;
// disallow use of copy-constructor and assignment-operator
- PropertyHelper_Hyphenation( const PropertyHelper_Hyphen & );
- PropertyHelper_Hyphenation & operator = ( const PropertyHelper_Hyphen & );
+ PropertyHelper_Hyphenation( const PropertyHelper_Hyphen & ) = delete;
+ PropertyHelper_Hyphenation & operator = ( const PropertyHelper_Hyphen & ) = delete;
public:
PropertyHelper_Hyphenation(
diff --git a/include/linguistic/spelldta.hxx b/include/linguistic/spelldta.hxx
index 2e3e6c08aadc..d390de24784a 100644
--- a/include/linguistic/spelldta.hxx
+++ b/include/linguistic/spelldta.hxx
@@ -48,10 +48,6 @@ void SeqRemoveNegEntries(
css::uno::Reference< css::linguistic2::XSearchableDictionaryList > &rxDicList,
sal_Int16 nLanguage );
-bool SeqHasEntry(
- const css::uno::Sequence< OUString > &rSeq,
- const OUString &rTxt);
-
void SearchSimilarText( const OUString &rText, sal_Int16 nLanguage,
css::uno::Reference< css::linguistic2::XSearchableDictionaryList > &xDicList,
std::vector< OUString > & rDicListProps );
diff --git a/include/oox/crypto/CryptTools.hxx b/include/oox/crypto/CryptTools.hxx
index 23e48c29d86b..d963be2719c4 100644
--- a/include/oox/crypto/CryptTools.hxx
+++ b/include/oox/crypto/CryptTools.hxx
@@ -87,7 +87,6 @@ public:
class Decrypt : public Crypto
{
public:
- Decrypt(std::vector<sal_uInt8>& key, CryptoType type);
Decrypt(std::vector<sal_uInt8>& key, std::vector<sal_uInt8>& iv, CryptoType type);
virtual sal_uInt32 update(
@@ -106,7 +105,6 @@ public:
class Encrypt : public Crypto
{
public:
- Encrypt(std::vector<sal_uInt8>& key, CryptoType type);
Encrypt(std::vector<sal_uInt8>& key, std::vector<sal_uInt8>& iv, CryptoType type);
virtual sal_uInt32 update(
diff --git a/include/oox/drawingml/drawingmltypes.hxx b/include/oox/drawingml/drawingmltypes.hxx
index fef050ff189d..2aac13c669a7 100644
--- a/include/oox/drawingml/drawingmltypes.hxx
+++ b/include/oox/drawingml/drawingmltypes.hxx
@@ -193,7 +193,6 @@ struct EmuSize
struct EmuRectangle : public EmuPoint, public EmuSize
{
EmuRectangle() {}
- explicit EmuRectangle( const EmuPoint& rPos, const EmuSize& rSize ) : EmuPoint( rPos ), EmuSize( rSize ) {}
explicit EmuRectangle( sal_Int64 nX, sal_Int64 nY, sal_Int64 nWidth, sal_Int64 nHeight ) : EmuPoint( nX, nY ), EmuSize( nWidth, nHeight ) {}
void setPos( const EmuPoint& rPos ) { static_cast< EmuPoint& >( *this ) = rPos; }
diff --git a/include/registry/reader.hxx b/include/registry/reader.hxx
index 6d3deb8f63d5..0b2be13fbc30 100644
--- a/include/registry/reader.hxx
+++ b/include/registry/reader.hxx
@@ -43,11 +43,6 @@ namespace typereg {
class Reader {
public:
/**
- Creates an invalid type reader.
- */
- Reader(): m_handle(nullptr) {}
-
- /**
Creates a type reader.
<p>If the given binary blob is malformed, or of a version larger than
diff --git a/include/sax/tools/documenthandleradapter.hxx b/include/sax/tools/documenthandleradapter.hxx
index 9f8f89861e48..25e91a6fde62 100644
--- a/include/sax/tools/documenthandleradapter.hxx
+++ b/include/sax/tools/documenthandleradapter.hxx
@@ -80,7 +80,6 @@ namespace sax
{
m_handler->setDocumentLocator(xLocator);
}
- DocumentHandlerAdapter(const css::uno::Reference< css::xml::sax::XDocumentHandler >& delegate);
DocumentHandlerAdapter() :
m_handler(css::uno::Reference< css::xml::sax::XDocumentHandler > (nullptr, css::uno::UNO_QUERY))
{
@@ -204,11 +203,6 @@ namespace sax
m_handler(css::uno::Reference< css::xml::sax::XExtendedDocumentHandler > (nullptr, css::uno::UNO_QUERY))
{
}
- ExtendedDocumentHandlerAdapter(
- const css::uno::Reference< css::xml::sax::XExtendedDocumentHandler >& delegate) :
- m_handler(delegate)
- {
- }
void SAL_CALL
setDelegate(const css::uno::Reference< css::xml::sax::XExtendedDocumentHandler >& delegate)
diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx
index bd7e52e055dc..4978bc732377 100644
--- a/include/sfx2/app.hxx
+++ b/include/sfx2/app.hxx
@@ -192,7 +192,6 @@ public:
SAL_DLLPRIVATE void RegisterToolBoxControl_Impl( SfxModule*, const SfxTbxCtrlFactory&);
SAL_DLLPRIVATE SfxTbxCtrlFactArr_Impl& GetTbxCtrlFactories_Impl() const;
SAL_DLLPRIVATE SfxStbCtrlFactArr_Impl& GetStbCtrlFactories_Impl() const;
- SAL_DLLPRIVATE SfxMenuCtrlFactArr_Impl& GetMenuCtrlFactories_Impl() const;
SAL_DLLPRIVATE SfxChildWinFactArr_Impl& GetChildWinFactories_Impl() const;
SAL_DLLPRIVATE SfxViewFrameArr_Impl& GetViewFrames_Impl() const;
SAL_DLLPRIVATE SfxViewShellArr_Impl& GetViewShells_Impl() const;
diff --git a/include/sfx2/bindings.hxx b/include/sfx2/bindings.hxx
index b31d4e553165..9d88ea25b52a 100644
--- a/include/sfx2/bindings.hxx
+++ b/include/sfx2/bindings.hxx
@@ -202,7 +202,6 @@ public:
SAL_DLLPRIVATE void InvalidateUnoControllers_Impl();
SAL_DLLPRIVATE void RegisterUnoController_Impl( SfxUnoControllerItem* );
SAL_DLLPRIVATE void ReleaseUnoController_Impl( SfxUnoControllerItem* );
- SAL_DLLPRIVATE bool ExecuteCommand_Impl( const OUString& rCommand );
SAL_DLLPRIVATE void SetRecorder_Impl( css::uno::Reference< css::frame::XDispatchRecorder >& );
SAL_DLLPRIVATE void InvalidateSlotsInMap_Impl();
SAL_DLLPRIVATE void AddSlotToInvalidateSlotsMap_Impl( sal_uInt16 nId );
diff --git a/include/sfx2/ctrlitem.hxx b/include/sfx2/ctrlitem.hxx
index 45c4fcc45578..f94a59f99bd5 100644
--- a/include/sfx2/ctrlitem.hxx
+++ b/include/sfx2/ctrlitem.hxx
@@ -38,11 +38,6 @@ private:
SfxControllerItem* pNext; // to notify next ControllerItem
SfxBindings* pBindings;
-protected:
-#if defined( DBG_UTIL )
- SAL_DLLPRIVATE void CheckConfigure_Impl( SfxSlotMode nType );
-#endif
-
public:
SfxBindings & GetBindings() {
DBG_ASSERT(pBindings, "no Bindings");
@@ -63,7 +58,6 @@ public:
void ReBind();
bool IsBound() const;
void ClearCache();
- void SetBindings(SfxBindings &rBindings) { pBindings = &rBindings; }
SfxControllerItem* GetItemLink();
SfxControllerItem* ChangeItemLink( SfxControllerItem* pNewLink );
@@ -78,8 +72,6 @@ public:
static SfxItemState GetItemState( const SfxPoolItem* pState );
- SAL_DLLPRIVATE bool IsBindable_Impl() const
- { return pBindings != nullptr; }
SAL_DLLPRIVATE void BindInternal_Impl( sal_uInt16 nNewId, SfxBindings* );
};
diff --git a/include/sfx2/dinfedt.hxx b/include/sfx2/dinfedt.hxx
deleted file mode 100644
index 2908565f8f88..000000000000
--- a/include/sfx2/dinfedt.hxx
+++ /dev/null
@@ -1,40 +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_SFX2_DINFEDT_HXX
-#define INCLUDED_SFX2_DINFEDT_HXX
-
-#include <vcl/button.hxx>
-#include <vcl/dialog.hxx>
-#include <vcl/edit.hxx>
-#include <vcl/fixed.hxx>
-
-// class InfoEdit_Impl ---------------------------------------------------
-
-class InfoEdit_Impl : public Edit
-{
-public:
- InfoEdit_Impl( vcl::Window* pParent, const ResId& rResId ) :
- Edit( pParent, rResId ) {}
-
- virtual void KeyInput( const KeyEvent& rKEvent ) override;
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/dockwin.hxx b/include/sfx2/dockwin.hxx
index 110745f94a05..2b83ccead17f 100644
--- a/include/sfx2/dockwin.hxx
+++ b/include/sfx2/dockwin.hxx
@@ -77,10 +77,6 @@ public:
SfxDockingWindow( SfxBindings *pBindings,
SfxChildWindow *pCW,
vcl::Window* pParent,
- const ResId& rResId);
- SfxDockingWindow( SfxBindings *pBindings,
- SfxChildWindow *pCW,
- vcl::Window* pParent,
const OString& rID, const OUString& rUIXMLDescription );
virtual ~SfxDockingWindow();
virtual void dispose() override;
diff --git a/include/sfx2/fcontnr.hxx b/include/sfx2/fcontnr.hxx
index d7a783411c8f..aded0de15b47 100644
--- a/include/sfx2/fcontnr.hxx
+++ b/include/sfx2/fcontnr.hxx
@@ -41,18 +41,6 @@ class SfxFilterContainer_Impl;
class SfxFrame;
-class SfxRefItem : public SfxPoolItem
-{
- tools::SvRef<SvRefBase> maRef;
-public:
- SfxRefItem( sal_uInt16 nWhichId, const tools::SvRef<SvRefBase>& rValue ) : SfxPoolItem( nWhichId )
- { maRef = rValue; }
- virtual SfxPoolItem* Clone( SfxItemPool* = nullptr ) const override
- { return new SfxRefItem( *this ); }
- virtual bool operator==( const SfxPoolItem& rL) const override
- { return static_cast<const SfxRefItem&>(rL).maRef == maRef; }
-};
-
typedef sal_uIntPtr (*SfxDetectFilter)( SfxMedium& rMedium, const SfxFilter **, SfxFilterFlags nMust, SfxFilterFlags nDont );
class SFX2_DLLPUBLIC SfxFilterContainer
diff --git a/include/sfx2/frmdescr.hxx b/include/sfx2/frmdescr.hxx
index df96ceeab04d..633ac8b94fd0 100644
--- a/include/sfx2/frmdescr.hxx
+++ b/include/sfx2/frmdescr.hxx
@@ -186,34 +186,6 @@ public:
SfxFrameProperties& operator =( const SfxFrameProperties &rProp );
};
-class SfxFrameDescriptorItem : public SfxPoolItem
-{
- SfxFrameProperties aProperties;
-public:
-
- SfxFrameDescriptorItem ( const sal_uInt16 nId = SID_FRAMEDESCRIPTOR )
- : SfxPoolItem( nId )
- {}
-
- SfxFrameDescriptorItem( const SfxFrameDescriptorItem& rCpy )
- : SfxPoolItem( rCpy )
- {
- aProperties = rCpy.aProperties;
- }
-
- virtual ~SfxFrameDescriptorItem();
-
- virtual bool operator ==( const SfxPoolItem& ) const override;
- SfxFrameDescriptorItem& operator =( const SfxFrameDescriptorItem & );
-
- virtual bool GetPresentation( SfxItemPresentation ePres,
- SfxMapUnit eCoreMetric,
- SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = nullptr ) const override;
-
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
-};
-
#endif // INCLUDED_SFX2_FRMDESCR_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/module.hxx b/include/sfx2/module.hxx
index b3fcf3d972ff..6e10d7cd029b 100644
--- a/include/sfx2/module.hxx
+++ b/include/sfx2/module.hxx
@@ -100,7 +100,6 @@ public:
SAL_DLLPRIVATE static void DestroyModules_Impl();
SAL_DLLPRIVATE SfxTbxCtrlFactArr_Impl* GetTbxCtrlFactories_Impl() const;
SAL_DLLPRIVATE SfxStbCtrlFactArr_Impl* GetStbCtrlFactories_Impl() const;
- SAL_DLLPRIVATE SfxMenuCtrlFactArr_Impl* GetMenuCtrlFactories_Impl() const;
SAL_DLLPRIVATE SfxChildWinFactArr_Impl* GetChildWinFactories_Impl() const;
SAL_DLLPRIVATE ImageList* GetImageList_Impl( bool bBig );
};
diff --git a/include/sfx2/objface.hxx b/include/sfx2/objface.hxx
index a6999076e269..9e30197d312f 100644
--- a/include/sfx2/objface.hxx
+++ b/include/sfx2/objface.hxx
@@ -79,9 +79,7 @@ public:
sal_uInt32 GetChildWindowFeature( sal_uInt16 nNo ) const;
sal_uInt32 GetChildWindowId( sal_uInt16 nNo ) const;
sal_uInt16 GetChildWindowCount() const;
- void RegisterPopupMenu( const ResId& );
void RegisterPopupMenu( const OUString& );
- const ResId& GetPopupMenuResId() const;
const OUString& GetPopupMenuName() const;
sal_uInt32 GetStatusBarId() const;
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index bcdbad4dcf14..24b1d82862f9 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -811,10 +811,6 @@ public:
SfxPoolItem( 0 ),
pObjSh( nullptr )
{}
- SfxObjectShellItem( SfxObjectShell *pObjShell ):
- SfxPoolItem( 0 ),
- pObjSh( pObjShell )
- {}
SfxObjectShellItem( sal_uInt16 nWhichId,
SfxObjectShell *pObjShell ):
SfxPoolItem( nWhichId ),
diff --git a/include/sfx2/sidebar/ControllerItem.hxx b/include/sfx2/sidebar/ControllerItem.hxx
index 2c31f8be3481..7a52de26bae3 100644
--- a/include/sfx2/sidebar/ControllerItem.hxx
+++ b/include/sfx2/sidebar/ControllerItem.hxx
@@ -103,12 +103,6 @@ public:
*/
Image GetIcon() const;
- /** Convenience method for setting all relevant properties for the
- slot/command represented by the called object at the given tool
- box.
- */
- void SetupToolBoxItem (ToolBox& rToolBox, const sal_uInt16 nIndex);
-
/** Do not call. Used by local class only. Should be a member of
a local and hidden interface.
*/
diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx
index 571242ae284c..b77a4ca316b2 100644
--- a/include/sfx2/tbxctrl.hxx
+++ b/include/sfx2/tbxctrl.hxx
@@ -239,53 +239,6 @@ public:
Class::CreateImpl, typeid(nItemClass), nSlotId ) ); }
-class SfxDragButton_Impl : public FixedImage
-{
-public:
-
- SfxDragButton_Impl( vcl::Window *pParent );
- virtual void Command ( const CommandEvent& rCEvt ) override;
- virtual void MouseMove( const MouseEvent& rMEvt ) override;
- virtual void MouseButtonDown( const MouseEvent& rMEvt ) override;
-};
-
-class SfxDragToolBoxControl_Impl : public SfxToolBoxControl
-{
-public:
- SfxDragToolBoxControl_Impl( sal_uInt16 nId, ToolBox& rBox );
- virtual VclPtr<vcl::Window> CreateItemWindow( vcl::Window *pParent ) override;
- virtual void Select(sal_uInt16 nSelectModifier) override;
-};
-
-
-class SfxReloadToolBoxControl_Impl : public SfxToolBoxControl
-{
-protected:
- virtual void Select(sal_uInt16 nSelectModifier ) override;
-
-public:
- SfxReloadToolBoxControl_Impl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox );
-};
-
-class SfxPopupMenuManager;
-class SfxAddonsToolBoxControl_Impl : public SfxToolBoxControl
-
-/* [Description]
-
- Internal helper class to provide the addons popup menu through the addons
- toolbox button.
-*/
-
-{
-protected:
- virtual void Click() override;
- virtual void Select(sal_uInt16 nSelectModifier) override;
- virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override;
-public:
- SfxAddonsToolBoxControl_Impl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox );
- virtual ~SfxAddonsToolBoxControl_Impl();
-};
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/unoctitm.hxx b/include/sfx2/unoctitm.hxx
index 863f880d5f0b..1eab7de7dfeb 100644
--- a/include/sfx2/unoctitm.hxx
+++ b/include/sfx2/unoctitm.hxx
@@ -61,7 +61,6 @@ public:
// Something else
virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw( css::uno::RuntimeException, std::exception ) override;
- void UnBind();
void GetNewDispatch();
void ReleaseDispatch();
void ReleaseBindings();
diff --git a/include/sot/storage.hxx b/include/sot/storage.hxx
index 06a1b785f621..25f0a39ac755 100644
--- a/include/sot/storage.hxx
+++ b/include/sot/storage.hxx
@@ -47,7 +47,6 @@ public:
SotStorageStream( const OUString &,
StreamMode = STREAM_STD_READWRITE );
SotStorageStream( BaseStorageStream *pStm );
- SotStorageStream();
virtual void ResetError() override;
@@ -85,7 +84,6 @@ public:
SotStorage( SvStream & rStm );
SotStorage( bool bUCBStorage, SvStream & rStm );
SotStorage( SvStream * pStm, bool bDelete );
- SotStorage();
SvMemoryStream * CreateMemoryStream();
diff --git a/include/sot/storinfo.hxx b/include/sot/storinfo.hxx
index 0286be1445d5..004101d8c22c 100644
--- a/include/sot/storinfo.hxx
+++ b/include/sot/storinfo.hxx
@@ -35,7 +35,6 @@ friend class SotStorage;
bool bStream;
bool bStorage;
- SvStorageInfo(){}; // Fuer SotStorage
public:
SvStorageInfo( const StgDirEntry& );
SvStorageInfo( const OUString& rName, sal_uLong nSz, bool bIsStorage )
diff --git a/include/store/store.hxx b/include/store/store.hxx
index 5800169bb70b..1aa19b58825f 100644
--- a/include/store/store.hxx
+++ b/include/store/store.hxx
@@ -72,15 +72,6 @@ public:
return *this;
}
- /** Construction from Stream Handle.
- */
- inline explicit OStoreStream (storeStreamHandle Handle)
- : m_hImpl (Handle)
- {
- if (m_hImpl)
- (void) store_acquireHandle (m_hImpl);
- }
-
/** Open the stream.
@see store_openStream()
*/
@@ -177,15 +168,6 @@ public:
return *this;
}
- /** Construction from Directory Handle.
- */
- inline explicit OStoreDirectory (storeDirectoryHandle Handle)
- : m_hImpl (Handle)
- {
- if (m_hImpl)
- (void) store_acquireHandle (m_hImpl);
- }
-
/** Open the directory.
@see store_openDirectory()
*/
@@ -280,15 +262,6 @@ public:
return *this;
}
- /** Construction from File Handle.
- */
- inline explicit OStoreFile (storeFileHandle Handle)
- : m_hImpl (Handle)
- {
- if (m_hImpl)
- (void) store_acquireHandle (m_hImpl);
- }
-
/** Conversion into File Handle.
*/
inline operator storeFileHandle() const
diff --git a/include/svl/ctypeitm.hxx b/include/svl/ctypeitm.hxx
index 746da66655fe..3f2a712ff79a 100644
--- a/include/svl/ctypeitm.hxx
+++ b/include/svl/ctypeitm.hxx
@@ -31,7 +31,6 @@ private:
public:
- CntContentTypeItem();
CntContentTypeItem( sal_uInt16 nWhich, const OUString& rType );
CntContentTypeItem( const CntContentTypeItem& rOrig );
diff --git a/include/svl/nranges.hxx b/include/svl/nranges.hxx
index d80c3377681d..373086b33708 100644
--- a/include/svl/nranges.hxx
+++ b/include/svl/nranges.hxx
@@ -31,7 +31,6 @@ class SfxUShortRanges
sal_uInt16* _pRanges; // 0-terminated array of sal_uInt16-pairs
public:
- SfxUShortRanges() : _pRanges( nullptr ) {}
SfxUShortRanges( const SfxUShortRanges &rOrig );
SfxUShortRanges( sal_uInt16 nWhich1, sal_uInt16 nWhich2 );
SfxUShortRanges( const sal_uInt16* nNumTable );
@@ -42,7 +41,6 @@ public:
SfxUShortRanges& operator += ( const SfxUShortRanges & );
- sal_uInt16 Count() const;
bool IsEmpty() const
{ return !_pRanges || 0 == *_pRanges; }
diff --git a/include/svl/ondemand.hxx b/include/svl/ondemand.hxx
index cfc729b9b518..a7d183fc928a 100644
--- a/include/svl/ondemand.hxx
+++ b/include/svl/ondemand.hxx
@@ -74,18 +74,6 @@ public:
pCurrent = pSystem = aSysLocale.GetLocaleDataPtr();
eCurrentLanguage = LANGUAGE_SYSTEM;
}
- OnDemandLocaleDataWrapper(
- const css::uno::Reference< css::uno::XComponentContext >& rxContext,
- const LanguageTag& rLanguageTag
- )
- : pEnglish(nullptr)
- , pAny(nullptr)
- , pCurrent(nullptr)
- , bInitialized(false)
- {
- pSystem = aSysLocale.GetLocaleDataPtr();
- init( rxContext, rLanguageTag );
- }
~OnDemandLocaleDataWrapper()
{
delete pEnglish;
@@ -160,15 +148,6 @@ public:
, bValid(false)
, bInitialized(false)
{}
- OnDemandCalendarWrapper(
- const css::uno::Reference< css::uno::XComponentContext >& rxContext,
- css::lang::Locale& rLocale
- )
- : bValid(false)
- , bInitialized(false)
- {
- init( rxContext, rLocale );
- }
~OnDemandCalendarWrapper()
{
delete pPtr;
@@ -231,16 +210,6 @@ public:
, bValid(false)
, bInitialized(false)
{}
- OnDemandTransliterationWrapper(
- const css::uno::Reference< css::uno::XComponentContext >& rxContext,
- LanguageType eLang,
- css::i18n::TransliterationModules nTypeP
- )
- : bValid(false)
- , bInitialized(false)
- {
- init( rxContext, eLang, nTypeP );
- }
~OnDemandTransliterationWrapper()
{
delete pPtr;
@@ -304,14 +273,6 @@ public:
: pPtr(nullptr)
, bInitialized(false)
{}
- OnDemandNativeNumberWrapper(
- const css::uno::Reference< css::uno::XComponentContext >& rxContext
- )
- : pPtr(nullptr)
- , bInitialized(false)
- {
- init( rxContext );
- }
~OnDemandNativeNumberWrapper()
{
delete pPtr;
diff --git a/include/svl/ownlist.hxx b/include/svl/ownlist.hxx
index 1a47f1a01fe8..6a29f993f62d 100644
--- a/include/svl/ownlist.hxx
+++ b/include/svl/ownlist.hxx
@@ -41,7 +41,6 @@ class SvCommand
OUString aCommand;
OUString aArgument;
public:
- SvCommand() {}
SvCommand( const OUString & rCommand, const OUString & rArg )
{
aCommand = rCommand;
diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx
index 5d7e4235d6bc..f1f47a3bae30 100644
--- a/include/svl/poolitem.hxx
+++ b/include/svl/poolitem.hxx
@@ -253,7 +253,6 @@ class SVL_DLLPUBLIC SfxVoidItem final: public SfxPoolItem
public:
static SfxPoolItem* CreateDefault();
explicit SfxVoidItem( sal_uInt16 nWhich );
- SfxVoidItem( sal_uInt16 nWhich, SvStream & );
SfxVoidItem( const SfxVoidItem& );
virtual ~SfxVoidItem();
diff --git a/include/svl/rngitem.hxx b/include/svl/rngitem.hxx
index a8855de98a7e..91d9300500f6 100644
--- a/include/svl/rngitem.hxx
+++ b/include/svl/rngitem.hxx
@@ -32,7 +32,6 @@ private:
sal_uInt16 nFrom;
sal_uInt16 nTo;
public:
- SfxRangeItem();
SfxRangeItem( sal_uInt16 nWID, sal_uInt16 nFrom, sal_uInt16 nTo );
SfxRangeItem( const SfxRangeItem& rItem );
virtual bool operator==( const SfxPoolItem& ) const override;
@@ -54,7 +53,6 @@ private:
sal_uInt16* _pRanges;
public:
- SfxUShortRangesItem();
SfxUShortRangesItem( sal_uInt16 nWID, SvStream &rStream );
SfxUShortRangesItem( const SfxUShortRangesItem& rItem );
virtual ~SfxUShortRangesItem();
diff --git a/include/svl/svdde.hxx b/include/svl/svdde.hxx
index 524bd5ece1b0..4c10fa26397a 100644
--- a/include/svl/svdde.hxx
+++ b/include/svl/svdde.hxx
@@ -32,7 +32,6 @@ class DdeConnection;
class DdeTransaction;
class DdeLink;
class DdeRequest;
-class DdeWarmLink;
class DdeHotLink;
class DdePoke;
class DdeExecute;
@@ -141,13 +140,6 @@ public:
};
-class SVL_DLLPUBLIC DdeWarmLink : public DdeLink
-{
-public:
- DdeWarmLink( DdeConnection&, const OUString&, long = 0 );
-};
-
-
class SVL_DLLPUBLIC DdeHotLink : public DdeLink
{
public:
@@ -165,10 +157,7 @@ public:
class SVL_DLLPUBLIC DdePoke : public DdeTransaction
{
public:
- DdePoke( DdeConnection&, const OUString&, const char*, long,
- SotClipboardFormatId = SotClipboardFormatId::STRING, long = 0 );
DdePoke( DdeConnection&, const OUString&, SAL_UNUSED_PARAMETER const DdeData&, long = 0 );
- DdePoke( DdeConnection&, const OUString&, const OUString&, long = 0 );
};
diff --git a/include/svl/szitem.hxx b/include/svl/szitem.hxx
index 621f7c9c44bc..1ce7a676abbb 100644
--- a/include/svl/szitem.hxx
+++ b/include/svl/szitem.hxx
@@ -31,7 +31,6 @@ private:
Size aVal;
public:
- SfxSizeItem();
SfxSizeItem( sal_uInt16 nWhich, const Size& rVal );
SfxSizeItem( const SfxSizeItem& );
virtual ~SfxSizeItem() {}
diff --git a/include/svtools/ServerDetailsControls.hxx b/include/svtools/ServerDetailsControls.hxx
index e9f4d4c488e3..181c7569ca75 100644
--- a/include/svtools/ServerDetailsControls.hxx
+++ b/include/svtools/ServerDetailsControls.hxx
@@ -59,8 +59,6 @@ class DetailsContainer
virtual bool enableUserCredentials( ) { return true; };
- void setActive( bool bActive = true );
-
protected:
void notifyChange( );
DECL_LINK_TYPED ( ValueChangeHdl, Edit&, void );
diff --git a/include/svtools/accessibilityoptions.hxx b/include/svtools/accessibilityoptions.hxx
index 1920871fa4a1..9c642a4bbcc3 100644
--- a/include/svtools/accessibilityoptions.hxx
+++ b/include/svtools/accessibilityoptions.hxx
@@ -43,14 +43,6 @@ public:
bool GetIsAllowAnimatedText() const;
bool GetIsAutomaticFontColor() const;
bool IsSelectionInReadonly() const;
- bool GetAutoDetectSystemHC() const;
-
- void SetIsForPagePreviews(bool bSet);
- void SetIsAllowAnimatedGraphics(bool bSet);
- void SetIsAllowAnimatedText(bool bSet);
- void SetIsAutomaticFontColor(bool bSet);
- void SetSelectionInReadonly(bool bSet);
- void SetAutoDetectSystemHC(bool bSet);
//SfxListener:
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx
index edd86df02004..dcaa244fc504 100644
--- a/include/svtools/brwbox.hxx
+++ b/include/svtools/brwbox.hxx
@@ -131,7 +131,6 @@ class BrowseEvent
sal_uInt16 nColId;
public:
- BrowseEvent();
BrowseEvent( vcl::Window* pWindow,
long nAbsRow,
sal_uInt16 nColumn, sal_uInt16 nColumnId,
@@ -148,7 +147,6 @@ public:
class BrowserMouseEvent: public MouseEvent, public BrowseEvent
{
public:
- BrowserMouseEvent();
BrowserMouseEvent( BrowserDataWin* pWin, const MouseEvent& rEvt );
BrowserMouseEvent( vcl::Window* pWin, const MouseEvent& rEvt,
long nAbsRow, sal_uInt16 nColumn, sal_uInt16 nColumnId,
@@ -159,7 +157,6 @@ public:
class BrowserAcceptDropEvent : public AcceptDropEvent, public BrowseEvent
{
public:
- BrowserAcceptDropEvent();
BrowserAcceptDropEvent( BrowserDataWin* pWin, const AcceptDropEvent& rEvt );
};
@@ -167,7 +164,6 @@ public:
class BrowserExecuteDropEvent : public ExecuteDropEvent, public BrowseEvent
{
public:
- BrowserExecuteDropEvent();
BrowserExecuteDropEvent( BrowserDataWin* pWin, const ExecuteDropEvent& rEvt );
};
diff --git a/include/svtools/imap.hxx b/include/svtools/imap.hxx
index 900e674618b5..0538c671099c 100644
--- a/include/svtools/imap.hxx
+++ b/include/svtools/imap.hxx
@@ -127,8 +127,7 @@ class IMapCompat
sal_uLong nTotalSize;
StreamMode nStmMode;
- IMapCompat() {}
- IMapCompat( const IMapCompat& ) {}
+ IMapCompat( const IMapCompat& ) = delete;
IMapCompat& operator=( const IMapCompat& ) { return *this; }
public:
diff --git a/include/svtools/inettbc.hxx b/include/svtools/inettbc.hxx
index 1b39f8fb8720..1aa02b196a96 100644
--- a/include/svtools/inettbc.hxx
+++ b/include/svtools/inettbc.hxx
@@ -60,7 +60,6 @@ protected:
public:
SvtURLBox( vcl::Window* pParent, INetProtocol eSmart = INetProtocol::NotValid, bool bSetDefaultHelpID = true );
SvtURLBox( vcl::Window* pParent, WinBits _nStyle, INetProtocol eSmart = INetProtocol::NotValid, bool bSetDefaultHelpID = true );
- SvtURLBox( vcl::Window* pParent, const ResId& _rResId, INetProtocol eSmart = INetProtocol::NotValid, bool bSetDefaultHelpID = true );
virtual ~SvtURLBox();
virtual void dispose() override;
diff --git a/include/svtools/menuoptions.hxx b/include/svtools/menuoptions.hxx
index 41451d9c9a0e..e59f6a873a7f 100644
--- a/include/svtools/menuoptions.hxx
+++ b/include/svtools/menuoptions.hxx
@@ -58,9 +58,6 @@ class SAL_WARN_UNUSED SVT_DLLPUBLIC SvtMenuOptions: public utl::detail::Options
SvtMenuOptions();
virtual ~SvtMenuOptions();
- void AddListenerLink( const Link<LinkParamNone*,void>& rLink );
- void RemoveListenerLink( const Link<LinkParamNone*,void>& rLink );
-
/*-****************************************************************************************************
@short interface methods to get and set value of config key "org.openoffice.Office.Common/View/Menu/..."
@descr These options describe internal states to enable/disable features of installed office.
diff --git a/include/svtools/stdmenu.hxx b/include/svtools/stdmenu.hxx
deleted file mode 100644
index 993ff955c06b..000000000000
--- a/include/svtools/stdmenu.hxx
+++ /dev/null
@@ -1,145 +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_STDMENU_HXX
-#define INCLUDED_SVTOOLS_STDMENU_HXX
-
-#include <svtools/svtdllapi.h>
-#include <tools/link.hxx>
-#include <vcl/menu.hxx>
-
-class FontList;
-namespace vcl {
- class FontMetric;
-}
-
-/*************************************************************************
-
-Description
-============
-
-class FontNameMenu
-
-Description
-
-Allows the selection of fonts. The menu is filled with the FontNames by
-the method Fill(). Fill() automatically sorts the FontNames (incl. all
-umlauts and language-dependent). Using SetCurName()/GetCurName(), the
-current FontName can be set/requested. If SetCurName() is called with
-an empty string, no entry is displayed as the current one.
-Before the Select call, the selected name is automatically set as the
-current one and would be displayed as the current name on the next call.
-Because of this, the current FontName should be set using SetCurName()
-if necessary before calling PopupMenu::Execute().
-
-As the Ids and the internal structure of the menu are not known, a
-Select handler must be set in order to notice the selection of a name.
-
-No further items can be inserted into that menu.
-
-Later on, the menu shall display the same bitmaps as the FontNameBox.
-On many systems, where menues don't scroll automatically, an A-Z menu
-might be interposed. As a menu has always needed long when many Fonts
-are installed, this menu should only be generated once.
-
-References
-
-FontList; FontSizeMenu; FontNameBox
-
---------------------------------------------------------------------------
-
-class FontSizeMenu
-
-Description
-
-Allows the selection of font sizes. The FontSizeMenu is filled using
-Fill(). The selected font size can be queried using GetCurHeight().
-Using SetCurHeight()/GetCurHeight(), the current font size can be set/
-requested. If SetCurHeight() is called with 0, no entry is displayed
-as the current one.
-Before the Select call, the selected size is automatically set as the
-current one and would be displayed as the current size on the next call.
-Because of this, the current font size should be set using SetCurHeight()
-if necessary before calling PopupMenu::Execute(). As the font sizes
-depend on the selected Font, the Menu should be re-filled with the
-sizes of the font using Fill() after a change to the font name.
-
-As the Ids and the internal structure of the menu are not known, a
-Select handler must be set in order to notice the selection of a size.
-
-All sizes are given in 1/10 points.
-
-No further items can be inserted into that menu.
-
-Later on, the menu shall display the sizes in respect to the system.
-For example, Mac could possibly show an outline of the fonts that are
-available as bitmaps.
-
-References
-
-FontList; FontNameMenu; FontSizeBox
-
-*************************************************************************/
-
-class SVT_DLLPUBLIC FontNameMenu : public PopupMenu
-{
-private:
- OUString maCurName;
- Link<FontNameMenu*,void> maSelectHdl;
-
-public:
- FontNameMenu();
- virtual ~FontNameMenu();
-
- virtual void Select() override;
- virtual void Highlight() override;
-
- void Fill( const FontList* pList );
-
- void SetCurName( const OUString& rName );
- const OUString& GetCurName() const { return maCurName; }
-
- void SetSelectHdl( const Link<FontNameMenu*,void>& rLink ) { maSelectHdl = rLink; }
-};
-
-class SVT_DLLPUBLIC FontSizeMenu : public PopupMenu
-{
-private:
- long* mpHeightAry;
- long mnCurHeight;
- Link<FontSizeMenu*,void> maSelectHdl;
-
-public:
- FontSizeMenu();
- virtual ~FontSizeMenu();
-
- virtual void Select() override;
- virtual void Highlight() override;
-
- void Fill( const FontMetric& rFontMetric, const FontList* pList );
-
- void SetCurHeight( long nHeight );
- long GetCurHeight() const { return mnCurHeight; }
-
- void SetSelectHdl( const Link<FontSizeMenu*,void>& rLink ) { maSelectHdl = rLink; }
-};
-
-#endif // INCLUDED_SVTOOLS_STDMENU_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svtools/table/tablesort.hxx b/include/svtools/table/tablesort.hxx
index 96a8ba440429..56f1a46000b0 100644
--- a/include/svtools/table/tablesort.hxx
+++ b/include/svtools/table/tablesort.hxx
@@ -49,11 +49,6 @@ namespace svt { namespace table
{
}
- ColumnSort( ColPos const i_columnPos, ColumnSortDirection const i_sortDirection )
- :nColumnPos( i_columnPos )
- ,eSortDirection( i_sortDirection )
- {
- }
};
diff --git a/include/svtools/transfer.hxx b/include/svtools/transfer.hxx
index 806c5350815e..9734c8907049 100644
--- a/include/svtools/transfer.hxx
+++ b/include/svtools/transfer.hxx
@@ -115,10 +115,6 @@ struct ExecuteDropEvent
const css::datatransfer::dnd::DropTargetDropEvent maDropEvent;
bool mbDefault;
- ExecuteDropEvent() :
- mnAction( DND_ACTION_NONE ),
- mbDefault( false ) {}
-
ExecuteDropEvent( sal_Int8 nAction,
const Point& rPosPixel,
const css::datatransfer::dnd::DropTargetDropEvent& rDropEvent ) :
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index 00af5abfe417..820c17c18d2a 100644
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -168,7 +168,6 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\
sfx2/source/dialog/checkin \
sfx2/source/dialog/dialoghelper \
sfx2/source/dialog/dinfdlg \
- sfx2/source/dialog/dinfedt \
sfx2/source/dialog/dockwin \
sfx2/source/dialog/documentfontsdialog \
sfx2/source/dialog/filedlghelper \
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index 63266b6a1d0a..1aa909567294 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -157,37 +157,6 @@ public:
}
};
-class SfxAsyncExec_Impl
-{
- css::util::URL aCommand;
- css::uno::Reference< css::frame::XDispatch > xDisp;
- Timer aTimer;
-
-public:
-
- SfxAsyncExec_Impl( const css::util::URL& rCmd, const css::uno::Reference< css::frame::XDispatch >& rDisp )
- : aCommand( rCmd )
- , xDisp( rDisp )
- {
- aTimer.SetTimeoutHdl( LINK(this, SfxAsyncExec_Impl, TimerHdl) );
- aTimer.SetTimeout( 0 );
- aTimer.Start();
- }
-
- DECL_LINK_TYPED( TimerHdl, Timer*, void);
-};
-
-IMPL_LINK_TYPED(SfxAsyncExec_Impl, TimerHdl, Timer*, pTimer, void)
-{
- (void)pTimer; // unused
- aTimer.Stop();
-
- Sequence<beans::PropertyValue> aSeq;
- xDisp->dispatch( aCommand, aSeq );
-
- delete this;
-}
-
enum class SfxPopupAction
{
DELETE,
@@ -2067,22 +2036,6 @@ void SfxBindings::SetDispatchProvider_Impl( const css::uno::Reference< css::fram
pImp->pSubBindings->SetDispatchProvider_Impl( pImp->xProv );
}
-bool SfxBindings::ExecuteCommand_Impl( const OUString& rCommand )
-{
- css::util::URL aURL;
- aURL.Complete = rCommand;
- Reference< util::XURLTransformer > xTrans( util::URLTransformer::create( ::comphelper::getProcessComponentContext() ) );
- xTrans->parseStrict( aURL );
- css::uno::Reference< css::frame::XDispatch > xDisp = pImp->xProv->queryDispatch( aURL, OUString(), 0 );
- if ( xDisp.is() )
- {
- new SfxAsyncExec_Impl( aURL, xDisp );
- return true;
- }
-
- return false;
-}
-
const css::uno::Reference< css::frame::XDispatchRecorder >& SfxBindings::GetRecorder() const
{
return pImp->xRecorder;
diff --git a/sfx2/source/control/ctrlitem.cxx b/sfx2/source/control/ctrlitem.cxx
index fb8e7bf8b21d..aee8676a5225 100644
--- a/sfx2/source/control/ctrlitem.cxx
+++ b/sfx2/source/control/ctrlitem.cxx
@@ -26,26 +26,6 @@
#include "statcach.hxx"
#include <sfx2/viewfrm.hxx>
-#ifdef DBG_UTIL
-
-void SfxControllerItem::CheckConfigure_Impl( SfxSlotMode nType )
-{
- // Real Slot? (i.e. no Separator etc.)
- if ( !nId )
- return;
-
- // is the ID configurable at all in 'nType'?
- const SfxSlot *pSlot = SFX_SLOTPOOL().GetSlot(nId);
- SAL_WARN_IF( !pSlot, "sfx.control", "SfxControllerItem: binding not existing slot" );
- SAL_WARN_IF(
- pSlot && !pSlot->IsMode(nType), "sfx.control",
- "SfxControllerItem: slot without ...Config-flag at SID "
- << pSlot->GetSlotId());
-}
-
-#endif
-
-
// returns the next registered SfxControllerItem with the same id
SfxControllerItem* SfxControllerItem::GetItemLink()
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index b22e843075c1..8ec6c12a8d0f 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -126,14 +126,6 @@ SfxUnoControllerItem::~SfxUnoControllerItem()
pBindings->ReleaseUnoController_Impl( this );
}
-void SfxUnoControllerItem::UnBind()
-{
- // connection to SfxControllerItem is lost
- pCtrlItem = nullptr;
- css::uno::Reference< css::frame::XStatusListener > aRef( static_cast<cppu::OWeakObject*>(this), css::uno::UNO_QUERY );
- ReleaseDispatch();
-}
-
void SAL_CALL SfxUnoControllerItem::statusChanged(const css::frame::FeatureStateEvent& rEvent) throw ( css::uno::RuntimeException, std::exception )
{
SolarMutexGuard aGuard;
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index de3c764e6be0..eb4039fbb2af 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -52,7 +52,6 @@
#include <sfx2/dinfdlg.hxx>
#include <sfx2/securitypage.hxx>
#include <sfx2/sfxresid.hxx>
-#include <sfx2/dinfedt.hxx>
#include <sfx2/frame.hxx>
#include <sfx2/viewfrm.hxx>
#include <sfx2/request.hxx>
diff --git a/sfx2/source/dialog/dinfedt.cxx b/sfx2/source/dialog/dinfedt.cxx
deleted file mode 100644
index 18764a7e1b06..000000000000
--- a/sfx2/source/dialog/dinfedt.cxx
+++ /dev/null
@@ -1,34 +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 .
- */
-
-
-#include <sfx2/dinfedt.hxx>
-#include <sfx2/sfxresid.hxx>
-
-#include <sfx2/sfx.hrc>
-
-// class InfoEdit_Impl ---------------------------------------------------
-
-void InfoEdit_Impl::KeyInput( const KeyEvent& rKEvent )
-{
- if ( rKEvent.GetCharCode() != '~' )
- Edit::KeyInput( rKEvent );
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index 3d431919b342..86870f28264f 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -867,52 +867,6 @@ SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW,
required because the docking is implemented in Sfx through SfxChildWindows.
*/
SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW,
- vcl::Window* pParent, const ResId& rResId) :
- DockingWindow(pParent, rResId),
- pBindings(pBindinx),
- pMgr(pCW),
- pImp(nullptr)
-{
- if ( !GetHelpId().isEmpty() )
- {
- SetUniqueId( GetHelpId() );
- SetHelpId("");
- }
- else
- {
- SfxViewFrame* pViewFrame = pBindings->GetDispatcher()->GetFrame();
- SfxSlotPool* pSlotPool = pViewFrame->GetObjectShell()->GetModule()->GetSlotPool();
- const SfxSlot* pSlot = pCW ? pSlotPool->GetSlot( pCW->GetType() ) : nullptr;
- if ( pSlot )
- {
- OString aCmd("SFXDOCKINGWINDOW_");
- aCmd += pSlot->GetUnoName();
- SetUniqueId( aCmd );
- }
- }
-
- pImp = new SfxDockingWindow_Impl;
- pImp->bConstructed = false;
- pImp->pSplitWin = nullptr;
- pImp->bEndDocked = false;
- pImp->bDockingPrevented = false;
-
- pImp->bSplitable = true;
-
- // Initially set to default, the alignment is set in the subclass
- pImp->nLine = pImp->nDockLine = 0;
- pImp->nPos = pImp->nDockPos = 0;
- pImp->bNewLine = false;
- pImp->SetDockAlignment(SfxChildAlignment::NOALIGNMENT);
- pImp->SetLastAlignment(SfxChildAlignment::NOALIGNMENT);
- pImp->aMoveIdle.SetPriority(SchedulerPriority::RESIZE);
- pImp->aMoveIdle.SetIdleHdl(LINK(this,SfxDockingWindow,TimerHdl));
-}
-
-/** Constructor for the SfxDockingWindow class. A SfxChildWindow will be
- required because the docking is implemented in Sfx through SfxChildWindows.
-*/
-SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW,
vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription)
: DockingWindow(pParent, rID, rUIXMLDescription)
, pBindings(pBindinx)
diff --git a/sfx2/source/doc/frmdescr.cxx b/sfx2/source/doc/frmdescr.cxx
index 4ed074e08283..96e51c17fb3d 100644
--- a/sfx2/source/doc/frmdescr.cxx
+++ b/sfx2/source/doc/frmdescr.cxx
@@ -170,35 +170,5 @@ bool SfxFrameProperties::operator ==( const SfxFrameProperties& rProp ) const
}
-SfxFrameDescriptorItem::~SfxFrameDescriptorItem()
-{}
-
-bool SfxFrameDescriptorItem::operator==( const SfxPoolItem& rAttr ) const
-{
- DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" );
-
- return aProperties == static_cast<const SfxFrameDescriptorItem&>(rAttr).aProperties;
-}
-
-
-SfxPoolItem* SfxFrameDescriptorItem::Clone( SfxItemPool* ) const
-{
- return new SfxFrameDescriptorItem( *this );
-}
-
-
-bool SfxFrameDescriptorItem::GetPresentation
-(
- SfxItemPresentation /*ePres*/,
- SfxMapUnit /*eCoreUnit*/,
- SfxMapUnit /*ePresUnit*/,
- OUString& rText,
- const IntlWrapper *
-) const
-{
- rText.clear();
- return false;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/ControllerItem.cxx b/sfx2/source/sidebar/ControllerItem.cxx
index d6243c80ce22..aee857a0bfc0 100644
--- a/sfx2/source/sidebar/ControllerItem.cxx
+++ b/sfx2/source/sidebar/ControllerItem.cxx
@@ -202,13 +202,6 @@ ControllerItem::ItemUpdateReceiverInterface::~ItemUpdateReceiverInterface()
{
}
-void ControllerItem::SetupToolBoxItem (ToolBox& rToolBox, const sal_uInt16 nIndex)
-{
- rToolBox.SetQuickHelpText(nIndex, vcl::CommandInfoProvider::Instance().GetTooltipForCommand(".uno:" + msCommandName, mxFrame));
- rToolBox.SetHelpText(nIndex, GetHelpText());
- rToolBox.SetItemImage(nIndex, GetIcon());
-}
-
} } // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx
index 54c40f8b8e29..b0ef715f8507 100644
--- a/sot/source/sdstor/storage.cxx
+++ b/sot/source/sdstor/storage.cxx
@@ -87,13 +87,6 @@ SotStorageStream::SotStorageStream( BaseStorageStream * pStm )
}
}
-SotStorageStream::SotStorageStream()
- : pOwnStm( nullptr )
-{
- // ??? wenn Init virtuell ist, entsprechen setzen
- m_isWritable = true;
-}
-
SotStorageStream::~SotStorageStream()
{
Flush(); //SetBufferSize(0);
@@ -283,12 +276,6 @@ bool SotStorageStream::SetProperty( const OUString& rName, const css::uno::Any&
, m_bDelStm( false ) \
, m_nVersion( SOFFICE_FILEFORMAT_CURRENT )
-SotStorage::SotStorage()
- INIT_SotStorage()
-{
- // ??? What's this ???
-}
-
#define ERASEMASK ( StreamMode::TRUNC | StreamMode::WRITE | StreamMode::SHARE_DENYALL )
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/ucb/XCommandEnvironment.hpp>
diff --git a/store/source/lockbyte.cxx b/store/source/lockbyte.cxx
index c02e2b09aff2..a446a454cbb4 100644
--- a/store/source/lockbyte.cxx
+++ b/store/source/lockbyte.cxx
@@ -833,10 +833,6 @@ template< class T > struct ResourceHolder
return tmp;
}
- ResourceHolder (ResourceHolder & rhs)
- {
- set (rhs.release());
- }
ResourceHolder & operator= (ResourceHolder & rhs)
{
reset (rhs.release());
diff --git a/svl/source/items/ctypeitm.cxx b/svl/source/items/ctypeitm.cxx
index 646ed8b2465b..82b779bf4384 100644
--- a/svl/source/items/ctypeitm.cxx
+++ b/svl/source/items/ctypeitm.cxx
@@ -35,12 +35,6 @@
#define CONTENT_TYPE_NOT_INIT ( (INetContentType)-1 )
-CntContentTypeItem::CntContentTypeItem()
-: CntUnencodedStringItem(),
- _eType( CONTENT_TYPE_NOT_INIT )
-{
-}
-
CntContentTypeItem::CntContentTypeItem( sal_uInt16 which, const OUString& rType )
: CntUnencodedStringItem( which, rType ),
_eType( CONTENT_TYPE_NOT_INIT )
diff --git a/svl/source/items/nranges.cxx b/svl/source/items/nranges.cxx
index da3e21768358..b445cb7f3272 100644
--- a/svl/source/items/nranges.cxx
+++ b/svl/source/items/nranges.cxx
@@ -351,13 +351,4 @@ copy_rest:
return *this;
}
-/**
- * Determines the number of USHORTs in the set described by the ranges
- * of USHORTs in '*this'.
- */
-sal_uInt16 SfxUShortRanges::Count() const
-{
- return Capacity_Impl( _pRanges );
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svl/source/items/rngitem.cxx b/svl/source/items/rngitem.cxx
index 6fcd15738c21..7a0e2d1f69ad 100644
--- a/svl/source/items/rngitem.cxx
+++ b/svl/source/items/rngitem.cxx
@@ -31,13 +31,6 @@ static inline sal_uInt16 Count_Impl(const sal_uInt16 * pRanges)
}
-SfxRangeItem::SfxRangeItem()
-{
- nFrom = 0;
- nTo = 0;
-}
-
-
SfxRangeItem::SfxRangeItem( sal_uInt16 which, sal_uInt16 from, sal_uInt16 to ):
SfxPoolItem( which ),
nFrom( from ),
@@ -98,11 +91,6 @@ SvStream& SfxRangeItem::Store(SvStream &rStream, sal_uInt16) const
return rStream;
}
-SfxUShortRangesItem::SfxUShortRangesItem()
-: _pRanges(nullptr)
-{
-}
-
SfxUShortRangesItem::SfxUShortRangesItem( sal_uInt16 nWID, SvStream &rStream )
: SfxPoolItem( nWID )
{
diff --git a/svl/source/items/szitem.cxx b/svl/source/items/szitem.cxx
index 2239919691f8..ee4b77e25aeb 100644
--- a/svl/source/items/szitem.cxx
+++ b/svl/source/items/szitem.cxx
@@ -28,11 +28,6 @@
#include <svl/memberid.hrc>
-SfxSizeItem::SfxSizeItem()
-{
-}
-
-
SfxSizeItem::SfxSizeItem( sal_uInt16 nW, const Size& rVal ) :
SfxPoolItem( nW ),
aVal( rVal )
diff --git a/svl/source/svdde/ddecli.cxx b/svl/source/svdde/ddecli.cxx
index fd09c85af57f..09c6e9444104 100644
--- a/svl/source/svdde/ddecli.cxx
+++ b/svl/source/svdde/ddecli.cxx
@@ -371,34 +371,12 @@ DdeRequest::DdeRequest( DdeConnection& d, const OUString& i, long n )
nType = XTYP_REQUEST;
}
-DdeWarmLink::DdeWarmLink( DdeConnection& d, const OUString& i, long n )
- : DdeLink( d, i, n )
-{
- nType = XTYP_ADVSTART | XTYPF_NODATA;
-}
-
DdeHotLink::DdeHotLink( DdeConnection& d, const OUString& i, long n )
: DdeLink( d, i, n )
{
nType = XTYP_ADVSTART;
}
-DdePoke::DdePoke( DdeConnection& d, const OUString& i, const char* p,
- long l, SotClipboardFormatId f, long n )
- : DdeTransaction( d, i, n )
-{
- aDdeData = DdeData( p, l, f );
- nType = XTYP_POKE;
-}
-
-DdePoke::DdePoke( DdeConnection& d, const OUString& i, const OUString& rData,
- long n )
- : DdeTransaction( d, i, n )
-{
- aDdeData = DdeData( (void*) rData.getStr(), sizeof(sal_Unicode) * (rData.getLength()), SotClipboardFormatId::STRING );
- nType = XTYP_POKE;
-}
-
DdePoke::DdePoke( DdeConnection& d, const OUString& i, const DdeData& rData,
long n )
: DdeTransaction( d, i, n )
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index fd85c9d53ee6..27bea8da19e2 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -127,7 +127,6 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
svtools/source/control/scriptedtext \
svtools/source/control/scrwin \
svtools/source/control/stdctrl \
- svtools/source/control/stdmenu \
svtools/source/control/tabbar \
svtools/source/control/toolbarmenu \
svtools/source/control/toolbarmenuacc \
diff --git a/svtools/source/config/accessibilityoptions.cxx b/svtools/source/config/accessibilityoptions.cxx
index 67ab1606198d..553b6fd244ee 100644
--- a/svtools/source/config/accessibilityoptions.cxx
+++ b/svtools/source/config/accessibilityoptions.cxx
@@ -46,7 +46,6 @@ using namespace com::sun::star::uno;
namespace
{
const char s_sAccessibility[] = "org.openoffice.Office.Common/Accessibility";
- const char s_sAutoDetectSystemHC[] = "AutoDetectSystemHC";
const char s_sIsForPagePreviews[] = "IsForPagePreviews";
const char s_sIsHelpTipsDisappear[] = "IsHelpTipsDisappear";
const char s_sHelpTipSeconds[] = "HelpTipSeconds";
@@ -73,7 +72,6 @@ public:
~SvtAccessibilityOptions_Impl();
void SetVCLSettings();
- bool GetAutoDetectSystemHC();
bool GetIsForPagePreviews() const;
bool GetIsHelpTipsDisappear() const;
bool GetIsAllowAnimatedGraphics() const;
@@ -85,13 +83,6 @@ public:
sal_Int16 GetListBoxMaximumLineCount() const;
sal_Int16 GetColorValueSetColumnCount() const;
bool GetPreviewUsesCheckeredBackground() const;
-
- void SetAutoDetectSystemHC(bool bSet);
- void SetIsForPagePreviews(bool bSet);
- void SetIsAllowAnimatedGraphics(bool bSet);
- void SetIsAllowAnimatedText(bool bSet);
- void SetIsAutomaticFontColor(bool bSet);
- void SetSelectionInReadonly(bool bSet);
};
// initialization of static members --------------------------------------
@@ -133,24 +124,6 @@ SvtAccessibilityOptions_Impl::~SvtAccessibilityOptions_Impl()
}
-bool SvtAccessibilityOptions_Impl::GetAutoDetectSystemHC()
-{
- css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY);
- bool bRet = true;
-
- try
- {
- if(xNode.is())
- xNode->getPropertyValue(s_sAutoDetectSystemHC) >>= bRet;
- }
- catch(const css::uno::Exception& ex)
- {
- SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
- }
-
- return bRet;
-}
-
bool SvtAccessibilityOptions_Impl::GetIsForPagePreviews() const
{
css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY);
@@ -348,126 +321,6 @@ bool SvtAccessibilityOptions_Impl::GetPreviewUsesCheckeredBackground() const
return bRet;
}
-void SvtAccessibilityOptions_Impl::SetAutoDetectSystemHC(bool bSet)
-{
- css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY);
-
- try
- {
- if(xNode.is() && xNode->getPropertyValue(s_sAutoDetectSystemHC)!=bSet)
- {
- xNode->setPropertyValue(s_sAutoDetectSystemHC, css::uno::makeAny(bSet));
- ::comphelper::ConfigurationHelper::flush(m_xCfg);
- svtools::ColorConfig().Reload();
- bIsModified = true;
- }
- }
- catch(const css::uno::Exception& ex)
- {
- SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
- }
-}
-
-void SvtAccessibilityOptions_Impl::SetIsForPagePreviews(bool bSet)
-{
- css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY);
-
- try
- {
- if(xNode.is() && xNode->getPropertyValue(s_sIsForPagePreviews)!=bSet)
- {
- xNode->setPropertyValue(s_sIsForPagePreviews, css::uno::makeAny(bSet));
- ::comphelper::ConfigurationHelper::flush(m_xCfg);
-
- bIsModified = true;
- }
- }
- catch(const css::uno::Exception& ex)
- {
- SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
- }
-}
-
-void SvtAccessibilityOptions_Impl::SetIsAllowAnimatedGraphics(bool bSet)
-{
- css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY);
-
- try
- {
- if(xNode.is() && xNode->getPropertyValue(s_sIsAllowAnimatedGraphics)!=bSet)
- {
- xNode->setPropertyValue(s_sIsAllowAnimatedGraphics, css::uno::makeAny(bSet));
- ::comphelper::ConfigurationHelper::flush(m_xCfg);
-
- bIsModified = true;
- }
- }
- catch(const css::uno::Exception& ex)
- {
- SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
- }
-}
-
-void SvtAccessibilityOptions_Impl::SetIsAllowAnimatedText(bool bSet)
-{
- css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY);
-
- try
- {
- if(xNode.is() && xNode->getPropertyValue(s_sIsAllowAnimatedText)!=bSet)
- {
- xNode->setPropertyValue(s_sIsAllowAnimatedText, css::uno::makeAny(bSet));
- ::comphelper::ConfigurationHelper::flush(m_xCfg);
-
- bIsModified = true;
- }
- }
- catch(const css::uno::Exception& ex)
- {
- SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
- }
-}
-
-void SvtAccessibilityOptions_Impl::SetIsAutomaticFontColor(bool bSet)
-{
- css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY);
-
- try
- {
- if(xNode.is() && xNode->getPropertyValue(s_sIsAutomaticFontColor)!=bSet)
- {
- xNode->setPropertyValue(s_sIsAutomaticFontColor, css::uno::makeAny(bSet));
- ::comphelper::ConfigurationHelper::flush(m_xCfg);
-
- bIsModified = true;
- }
- }
- catch(const css::uno::Exception& ex)
- {
- SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
- }
-}
-
-void SvtAccessibilityOptions_Impl::SetSelectionInReadonly(bool bSet)
-{
- css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY);
-
- try
- {
- if(xNode.is() && xNode->getPropertyValue(s_sIsSelectionInReadonly)!=bSet)
- {
- xNode->setPropertyValue(s_sIsSelectionInReadonly, css::uno::makeAny(bSet));
- ::comphelper::ConfigurationHelper::flush(m_xCfg);
-
- bIsModified = true;
- }
- }
- catch(const css::uno::Exception& ex)
- {
- SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
- }
-}
-
void SvtAccessibilityOptions_Impl::SetVCLSettings()
{
AllSettings aAllSettings(Application::GetSettings());
@@ -566,10 +419,6 @@ void SvtAccessibilityOptions::Notify( SfxBroadcaster&, const SfxHint& rHint )
}
-bool SvtAccessibilityOptions::GetAutoDetectSystemHC() const
-{
- return sm_pSingleImplConfig->GetAutoDetectSystemHC();
-}
bool SvtAccessibilityOptions::GetIsForPagePreviews() const
{
return sm_pSingleImplConfig->GetIsForPagePreviews();
@@ -592,30 +441,6 @@ bool SvtAccessibilityOptions::IsSelectionInReadonly() const
}
-void SvtAccessibilityOptions::SetAutoDetectSystemHC(bool bSet)
-{
- sm_pSingleImplConfig->SetAutoDetectSystemHC(bSet);
-}
-void SvtAccessibilityOptions::SetIsForPagePreviews(bool bSet)
-{
- sm_pSingleImplConfig->SetIsForPagePreviews(bSet);
-}
-void SvtAccessibilityOptions::SetIsAllowAnimatedGraphics(bool bSet)
-{
- sm_pSingleImplConfig->SetIsAllowAnimatedGraphics(bSet);
-}
-void SvtAccessibilityOptions::SetIsAllowAnimatedText(bool bSet)
-{
- sm_pSingleImplConfig->SetIsAllowAnimatedText(bSet);
-}
-void SvtAccessibilityOptions::SetIsAutomaticFontColor(bool bSet)
-{
- sm_pSingleImplConfig->SetIsAutomaticFontColor(bSet);
-}
-void SvtAccessibilityOptions::SetSelectionInReadonly(bool bSet)
-{
- sm_pSingleImplConfig->SetSelectionInReadonly(bSet);
-}
void SvtAccessibilityOptions::SetVCLSettings()
{
sm_pSingleImplConfig->SetVCLSettings();
diff --git a/svtools/source/config/menuoptions.cxx b/svtools/source/config/menuoptions.cxx
index 7146b230f66e..fc64447642a2 100644
--- a/svtools/source/config/menuoptions.cxx
+++ b/svtools/source/config/menuoptions.cxx
@@ -69,7 +69,6 @@ class SvtMenuOptions_Impl : public ConfigItem
private:
- ::std::list<Link<LinkParamNone*,void>> aList;
bool m_bDontHideDisabledEntries ; /// cache "DontHideDisabledEntries" of Menu section
bool m_bFollowMouse ; /// cache "FollowMouse" of Menu section
TriState m_eMenuIcons ; /// cache "MenuIcons" of Menu section
@@ -87,10 +86,6 @@ class SvtMenuOptions_Impl : public ConfigItem
SvtMenuOptions_Impl();
virtual ~SvtMenuOptions_Impl();
- void AddListenerLink( const Link<LinkParamNone*,void>& rLink );
- void RemoveListenerLink( const Link<LinkParamNone*,void>& rLink );
-
-
// override methods of baseclass
@@ -126,8 +121,6 @@ class SvtMenuOptions_Impl : public ConfigItem
{
m_eMenuIcons = eState;
SetModified();
- for ( ::std::list<Link<LinkParamNone*,void>>::const_iterator iter = aList.begin(); iter != aList.end(); ++iter )
- iter->Call( nullptr );
// tdf#93451: don't Commit() here, it's too early
}
@@ -281,9 +274,6 @@ void SvtMenuOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNames )
if ( bMenuSettingsChanged )
m_eMenuIcons = bSystemMenuIcons ? TRISTATE_INDET : static_cast<TriState>(bMenuIcons);
-
- for ( ::std::list<Link<LinkParamNone*,void>>::const_iterator iter = aList.begin(); iter != aList.end(); ++iter )
- iter->Call( nullptr );
}
@@ -344,17 +334,6 @@ Sequence< OUString > SvtMenuOptions_Impl::impl_GetPropertyNames()
return seqPropertyNames;
}
-void SvtMenuOptions_Impl::AddListenerLink( const Link<LinkParamNone*,void>& rLink )
-{
- aList.push_back( rLink );
-}
-
-void SvtMenuOptions_Impl::RemoveListenerLink( const Link<LinkParamNone*,void>& rLink )
-{
- aList.erase(std::remove(aList.begin(), aList.end(), rLink), aList.end());
-}
-
-
// initialize static member
// DON'T DO IT IN YOUR HEADER!
// see definition for further information
@@ -450,14 +429,4 @@ Mutex& SvtMenuOptions::GetOwnStaticMutex()
return *pMutex;
}
-void SvtMenuOptions::AddListenerLink( const Link<LinkParamNone*,void>& rLink )
-{
- m_pDataContainer->AddListenerLink( rLink );
-}
-
-void SvtMenuOptions::RemoveListenerLink( const Link<LinkParamNone*,void>& rLink )
-{
- m_pDataContainer->RemoveListenerLink( rLink );
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx
index 98555b7b0db1..a3a0d1ec9d11 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -859,20 +859,6 @@ VCL_BUILDER_DECL_FACTORY(SvtURLBox)
}
-SvtURLBox::SvtURLBox( vcl::Window* pParent, const ResId& _rResId, INetProtocol eSmart,
- bool bSetDefaultHelpID )
- : ComboBox( pParent , _rResId ),
- eSmartProtocol( eSmart ),
- bAutoCompleteMode( false ),
- bOnlyDirectories( false ),
- bCtrlClick( false ),
- bHistoryDisabled( false ),
- bNoSelection( false ),
- bIsAutoCompleteEnabled( true )
-{
- Init(bSetDefaultHelpID);
-}
-
void SvtURLBox::Init(bool bSetDefaultHelpID)
{
pImp = new SvtURLBox_Impl();
diff --git a/svtools/source/control/stdmenu.cxx b/svtools/source/control/stdmenu.cxx
deleted file mode 100644
index d2e972e2eec0..000000000000
--- a/svtools/source/control/stdmenu.cxx
+++ /dev/null
@@ -1,219 +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 .
- */
-
-#include <string.h>
-#include <vcl/svapp.hxx>
-#include <vcl/settings.hxx>
-#include <vcl/i18nhelp.hxx>
-#include <svtools/ctrltool.hxx>
-#include <svtools/stdmenu.hxx>
-
-FontNameMenu::FontNameMenu()
-{
- SetMenuFlags( GetMenuFlags() | MenuFlags::NoAutoMnemonics );
-}
-
-FontNameMenu::~FontNameMenu()
-{
-}
-
-void FontNameMenu::Select()
-{
- maCurName = GetItemText( GetCurItemId() );
- maSelectHdl.Call( this );
-}
-
-void FontNameMenu::Highlight()
-{
-}
-
-void FontNameMenu::Fill( const FontList* pList )
-{
- // clear menu
- Clear();
-
- // add fonts
- if (pList)
- {
- const vcl::I18nHelper& rI18nHelper = Application::GetSettings().GetUILocaleI18nHelper();
- // more than 100 fonts reduces the speed of opening the menu.
- // So only the first 100 fonts will be displayed.
- size_t nFontCount = ::std::min<size_t>(pList->GetFontNameCount(), 100);
- for (size_t i = 0; i < nFontCount; ++i)
- {
- const OUString& rName = pList->GetFontName( i ).GetFamilyName();
-
- // sort with the I18nHelper
- sal_uInt16 j = GetItemCount();
- while ( j )
- {
- OUString aText = GetItemText( GetItemId( j-1 ) );
- if ( rI18nHelper.CompareString( rName, aText ) > 0 )
- break;
- j--;
- }
- InsertItem( i+1, rName, MenuItemBits::RADIOCHECK | MenuItemBits::AUTOCHECK, OString(), j );
- }
- }
-
- SetCurName( maCurName );
-}
-
-void FontNameMenu::SetCurName(const OUString& rName)
-{
- maCurName = rName;
-
- // check menu entry
- sal_uInt16 nChecked = 0;
- sal_uInt16 nItemCount = GetItemCount();
- for( sal_uInt16 i = 0; i < nItemCount; i++ )
- {
- sal_uInt16 nItemId = GetItemId( i );
-
- if ( IsItemChecked( nItemId ) )
- nChecked = nItemId;
-
- OUString aText = GetItemText( nItemId );
- if ( aText == maCurName )
- {
- CheckItem( nItemId );
- return;
- }
- }
-
- if ( nChecked )
- CheckItem( nChecked, false );
-}
-
-FontSizeMenu::FontSizeMenu()
-: mpHeightAry( nullptr )
-, mnCurHeight( 100 )
-{
- SetMenuFlags( GetMenuFlags() | MenuFlags::NoAutoMnemonics );
-}
-
-FontSizeMenu::~FontSizeMenu()
-{
- if ( mpHeightAry )
- delete[] mpHeightAry;
-}
-
-void FontSizeMenu::Select()
-{
- const sal_uInt16 nCurItemId = GetCurItemId();
- mnCurHeight = mpHeightAry[ nCurItemId - 1 ];
- maSelectHdl.Call( this );
-}
-
-void FontSizeMenu::Highlight()
-{
-}
-
-void FontSizeMenu::Fill( const FontMetric& rFontMetric, const FontList* pList )
-{
- Clear();
-
- // setup font size array
- if ( mpHeightAry )
- delete[] mpHeightAry;
-
- const sal_IntPtr* pTempAry;
- const sal_IntPtr* pAry = pList->GetSizeAry( rFontMetric );
- sal_uInt16 nSizeCount = 0;
- while ( pAry[nSizeCount] )
- nSizeCount++;
-
- sal_uInt16 nPos = 0;
-
- // first insert font size names (for simplified/traditional chinese)
- FontSizeNames aFontSizeNames( Application::GetSettings().GetUILanguageTag().getLanguageType() );
- mpHeightAry = new long[nSizeCount+aFontSizeNames.Count()];
- if ( !aFontSizeNames.IsEmpty() )
- {
- if ( pAry == FontList::GetStdSizeAry() )
- {
- // for scalable fonts all font size names
- sal_uLong nCount = aFontSizeNames.Count();
- for( sal_uLong i = 0; i < nCount; i++ )
- {
- OUString aSizeName = aFontSizeNames.GetIndexName( i );
- long nSize = aFontSizeNames.GetIndexSize( i );
- mpHeightAry[nPos] = nSize;
- nPos++; // Id is nPos+1
- InsertItem( nPos, aSizeName, MenuItemBits::RADIOCHECK | MenuItemBits::AUTOCHECK );
- }
- }
- else
- {
- // for fixed size fonts only selectable font size names
- pTempAry = pAry;
- while ( *pTempAry )
- {
- OUString aSizeName = aFontSizeNames.Size2Name( *pTempAry );
- if ( !aSizeName.isEmpty() )
- {
- mpHeightAry[nPos] = *pTempAry;
- nPos++; // Id is nPos+1
- InsertItem( nPos, aSizeName, MenuItemBits::RADIOCHECK | MenuItemBits::AUTOCHECK );
- }
- pTempAry++;
- }
- }
- }
-
- // then insert numerical font size values
- const vcl::I18nHelper& rI18nHelper = Application::GetSettings().GetUILocaleI18nHelper();
- pTempAry = pAry;
- while ( *pTempAry )
- {
- mpHeightAry[nPos] = *pTempAry;
- nPos++; // Id is nPos+1
- InsertItem( nPos, rI18nHelper.GetNum( *pTempAry, 1, true, false ), MenuItemBits::RADIOCHECK | MenuItemBits::AUTOCHECK );
- pTempAry++;
- }
-
- SetCurHeight( mnCurHeight );
-}
-
-void FontSizeMenu::SetCurHeight( long nHeight )
-{
- mnCurHeight = nHeight;
-
- // check menu item
- sal_uInt16 nChecked = 0;
- sal_uInt16 nItemCount = GetItemCount();
- for( sal_uInt16 i = 0; i < nItemCount; i++ )
- {
- sal_uInt16 nItemId = GetItemId( i );
-
- if ( mpHeightAry[i] == nHeight )
- {
- CheckItem( nItemId );
- return;
- }
-
- if ( IsItemChecked( nItemId ) )
- nChecked = nItemId;
- }
-
- if ( nChecked )
- CheckItem( nChecked, false );
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/dialogs/ServerDetailsControls.cxx b/svtools/source/dialogs/ServerDetailsControls.cxx
index 99eb2f54e81c..be071d5c52f4 100644
--- a/svtools/source/dialogs/ServerDetailsControls.cxx
+++ b/svtools/source/dialogs/ServerDetailsControls.cxx
@@ -76,11 +76,6 @@ void DetailsContainer::notifyChange( )
m_aChangeHdl.Call( this );
}
-void DetailsContainer::setActive( bool bActive )
-{
- m_bIsActive = bActive;
-}
-
IMPL_LINK_NOARG_TYPED( DetailsContainer, ValueChangeHdl, Edit&, void )
{
notifyChange( );
diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx
index fdee29a8e3c2..d10895b99996 100644
--- a/svx/inc/pch/precompiled_svx.hxx
+++ b/svx/inc/pch/precompiled_svx.hxx
@@ -366,7 +366,6 @@
#include <svtools/imap.hxx>
#include <svtools/imapobj.hxx>
#include <svtools/miscopt.hxx>
-#include <svtools/stdmenu.hxx>
#include <svtools/svlbitm.hxx>
#include <svtools/svtdllapi.h>
#include <svtools/toolbarmenu.hxx>
diff --git a/sw/inc/SwAppletImpl.hxx b/sw/inc/SwAppletImpl.hxx
index 13b8e6184e3e..9fbeb45c8ab2 100644
--- a/sw/inc/SwAppletImpl.hxx
+++ b/sw/inc/SwAppletImpl.hxx
@@ -22,6 +22,13 @@
#include <config_features.h>
+#include <com/sun/star/embed/XEmbeddedObject.hpp>
+#include <sfx2/frmhtmlw.hxx>
+#include <vcl/wrkwin.hxx>
+#include <sot/storage.hxx>
+#include <svl/itemset.hxx>
+#include <svl/ownlist.hxx>
+
enum class SwHtmlOptType {
IGNORE = 0,
TAG = 1,
@@ -29,15 +36,6 @@ enum class SwHtmlOptType {
SIZE = 3
};
-#include <com/sun/star/embed/XEmbeddedObject.hpp>
-
-#include <sfx2/frmhtml.hxx>
-#include <sfx2/frmhtmlw.hxx>
-#include <vcl/wrkwin.hxx>
-#include <sot/storage.hxx>
-#include <svl/itemset.hxx>
-
-#include <svl/ownlist.hxx>
class SfxItemSet;