sc/source/ui/dataprovider/dataprovider.cxx | 5 -----
sc/source/ui/dataprovider/htmldataprovider.hxx | 2 +-
sc/source/ui/inc/dataprovider.hxx | 2 --
sd/source/ui/dlg/BulletAndPositionDlg.cxx | 8 --------
sd/source/ui/inc/BulletAndPositionDlg.hxx | 1 -
sfx2/source/doc/sfxbasemodel.cxx | 5 -----
sfx2/source/inc/docundomanager.hxx | 6 +-----
7 files changed, 2 insertions(+), 27 deletions(-)
New commits:
commit ab5805c34af1ad45a2ee8983b0e451704ab33c09
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Mon Jun 10 08:37:11 2019 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Jun 11 07:52:27 2019 +0200
loplugin:virtualdown in SfxModelSubComponent
Change-Id: Ied6f58301a648404c988184b67e1acb3fa1133de
Reviewed-on: https://gerrit.libreoffice.org/73766
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 4caf74eb15c6..4d1833e31d11 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -4447,9 +4447,4 @@ SfxModelSubComponent::~SfxModelSubComponent()
{
}
-void SfxModelSubComponent::disposing()
-{
- // nothing to do here
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/inc/docundomanager.hxx
b/sfx2/source/inc/docundomanager.hxx
index ab713c1d50e2..ce38680e264f 100644
--- a/sfx2/source/inc/docundomanager.hxx
+++ b/sfx2/source/inc/docundomanager.hxx
@@ -41,9 +41,6 @@ public:
m_rModel.MethodEntryCheck( true );
}
- // called when the SfxBaseModel which the component is superordinate of is
being disposed
- virtual void disposing();
-
protected:
SfxModelSubComponent( SfxBaseModel& i_model )
:m_rModel( i_model )
@@ -109,8 +106,7 @@ namespace sfx2
DocumentUndoManager(const DocumentUndoManager&) = delete;
DocumentUndoManager& operator=(const DocumentUndoManager&) = delete;
- // SfxModelSubComponent overridables
- virtual void disposing() override;
+ void disposing();
// non-UNO API for our owner
/** determines whether we have an open Undo context. No mutex locking
within this method, no disposal check - this
commit 27d5fd27cbf4ed91bafb4f051a418494506ea6f6
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Mon Jun 10 08:36:54 2019 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Jun 11 07:52:23 2019 +0200
loplugin:virtualdown in SvxBulletAndPositionDlg
Change-Id: I98da96a09a61fe8a197065773d649dc55d6095b7
Reviewed-on: https://gerrit.libreoffice.org/73765
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sd/source/ui/dlg/BulletAndPositionDlg.cxx
b/sd/source/ui/dlg/BulletAndPositionDlg.cxx
index 6575850c6a6b..bbf5c6687bd8 100644
--- a/sd/source/ui/dlg/BulletAndPositionDlg.cxx
+++ b/sd/source/ui/dlg/BulletAndPositionDlg.cxx
@@ -287,14 +287,6 @@
SvxBulletAndPositionDlg::SvxBulletAndPositionDlg(weld::Window* pWindow, const Sf
SvxBulletAndPositionDlg::~SvxBulletAndPositionDlg() {}
-void SvxBulletAndPositionDlg::dispose()
-{
- m_xPreviewWIN.reset();
- m_xBulColLB.reset();
- pActNum.reset();
- pSaveNum.reset();
-}
-
void SvxBulletAndPositionDlg::SetMetric(FieldUnit eMetric)
{
if (eMetric == FieldUnit::MM)
diff --git a/sd/source/ui/inc/BulletAndPositionDlg.hxx
b/sd/source/ui/inc/BulletAndPositionDlg.hxx
index fb95af11c6f0..fe16cdd539ab 100644
--- a/sd/source/ui/inc/BulletAndPositionDlg.hxx
+++ b/sd/source/ui/inc/BulletAndPositionDlg.hxx
@@ -145,7 +145,6 @@ class SvxBulletAndPositionDlg : public
weld::GenericDialogController
public:
SvxBulletAndPositionDlg(weld::Window* pWindow, const SfxItemSet& rSet,
::sd::View* pView);
virtual ~SvxBulletAndPositionDlg() override;
- virtual void dispose();
SfxItemSet* GetOutputItemSet(SfxItemSet* rSet);
bool IsApplyToMaster();
commit fa1e5e556349bc4ae92275ce88d877db91f6a44b
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Mon Jun 10 08:36:32 2019 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Jun 11 07:52:15 2019 +0200
loplugin:virtualdown in DataProvider
Change-Id: Id61d2ddc25767c642e13212be8b00c5836ce4996
Reviewed-on: https://gerrit.libreoffice.org/73764
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sc/source/ui/dataprovider/dataprovider.cxx
b/sc/source/ui/dataprovider/dataprovider.cxx
index e0a5571971d2..f87e006618ec 100644
--- a/sc/source/ui/dataprovider/dataprovider.cxx
+++ b/sc/source/ui/dataprovider/dataprovider.cxx
@@ -212,11 +212,6 @@ void DataProvider::setDeterministic()
mbDeterministic = true;
}
-std::map<OUString, OUString> DataProvider::getDataSourcesForURL(const
OUString& /*rURL*/)
-{
- return std::map<OUString, OUString>();
-}
-
DataProvider::~DataProvider()
{
}
diff --git a/sc/source/ui/dataprovider/htmldataprovider.hxx
b/sc/source/ui/dataprovider/htmldataprovider.hxx
index 249249dcef88..0eb27f4b8891 100644
--- a/sc/source/ui/dataprovider/htmldataprovider.hxx
+++ b/sc/source/ui/dataprovider/htmldataprovider.hxx
@@ -34,7 +34,7 @@ public:
virtual const OUString& GetURL() const override;
- virtual std::map<OUString, OUString> getDataSourcesForURL(const OUString&
rURL) override;
+ std::map<OUString, OUString> getDataSourcesForURL(const OUString& rURL);
void ImportFinished();
};
diff --git a/sc/source/ui/inc/dataprovider.hxx
b/sc/source/ui/inc/dataprovider.hxx
index e0e22490f58e..4e15b2c643ba 100644
--- a/sc/source/ui/inc/dataprovider.hxx
+++ b/sc/source/ui/inc/dataprovider.hxx
@@ -82,8 +82,6 @@ public:
virtual const OUString& GetURL() const = 0;
- virtual std::map<OUString, OUString> getDataSourcesForURL(const OUString&
rURL);
-
static std::unique_ptr<SvStream> FetchStreamFromURL(const OUString&,
OStringBuffer& rBuffer);
void setDeterministic();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
