summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
Diffstat (limited to 'desktop')
-rw-r--r--desktop/qa/desktop_app/test_desktop_app.cxx2
-rw-r--r--desktop/qa/desktop_lib/test_desktop_lib.cxx4
-rw-r--r--desktop/source/app/cmdlineargs.cxx2
-rw-r--r--desktop/source/app/officeipcthread.cxx2
-rw-r--r--desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx9
-rw-r--r--desktop/source/deployment/gui/dp_gui_service.cxx7
-rw-r--r--desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx5
-rw-r--r--desktop/source/deployment/manager/dp_informationprovider.cxx7
-rw-r--r--desktop/source/deployment/manager/dp_managerfac.cxx7
-rw-r--r--desktop/source/deployment/misc/dp_descriptioninfoset.cxx9
10 files changed, 1 insertions, 53 deletions
diff --git a/desktop/qa/desktop_app/test_desktop_app.cxx b/desktop/qa/desktop_app/test_desktop_app.cxx
index fe663dc0a6bd..76a0584d289b 100644
--- a/desktop/qa/desktop_app/test_desktop_app.cxx
+++ b/desktop/qa/desktop_app/test_desktop_app.cxx
@@ -48,7 +48,7 @@ public:
class TestSupplier : public desktop::CommandLineArgs::Supplier {
public:
explicit TestSupplier(const std::initializer_list<OUString>& args) : m_args(args) {}
- virtual ~TestSupplier() override {}
+
virtual boost::optional< OUString > getCwdUrl() override { return boost::optional< OUString >(); }
virtual bool next(OUString * argument) override {
CPPUNIT_ASSERT(argument != nullptr);
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index 72009670eb03..308492b4d983 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -53,10 +53,6 @@ public:
{
}
- virtual ~DesktopLOKTest() override
- {
- }
-
virtual void setUp() override
{
UnoApiTest::setUp();
diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx
index 41d3512a20a1..112fa580ad6b 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -82,8 +82,6 @@ public:
}
}
- virtual ~ExtCommandLineSupplier() override {}
-
virtual boost::optional< OUString > getCwdUrl() override { return m_cwdUrl; }
virtual bool next(OUString * argument) override {
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index 7a2fd4624a58..8b85258bf46e 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -140,8 +140,6 @@ public:
}
}
- virtual ~Parser() override {}
-
virtual boost::optional< OUString > getCwdUrl() override { return m_cwdUrl; }
virtual bool next(OUString * argument) override { return next(argument, true); }
diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
index 8409ca9bcf1c..763ecf0040b7 100644
--- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
@@ -131,8 +131,6 @@ class ProgressCmdEnv
void update_( uno::Any const & Status ) throw ( uno::RuntimeException );
public:
- virtual ~ProgressCmdEnv() override;
-
/** When param bAskWhenInstalling = true, then the user is asked if he
agrees to install this extension. In case this extension is already installed
then the user is also notified and asked if he wants to replace that existing
@@ -308,13 +306,6 @@ void ProgressCmdEnv::updateProgress()
m_pDialogHelper->updateProgress( nProgress );
}
-
-ProgressCmdEnv::~ProgressCmdEnv()
-{
- // TODO: stop all threads and wait
-}
-
-
// XCommandEnvironment
uno::Reference< task::XInteractionHandler > ProgressCmdEnv::getInteractionHandler()
diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx
index 750336ee8580..0014cec34eec 100644
--- a/desktop/source/deployment/gui/dp_gui_service.cxx
+++ b/desktop/source/deployment/gui/dp_gui_service.cxx
@@ -53,7 +53,6 @@ class MyApp : public Application
{
public:
MyApp();
- virtual ~MyApp() override;
MyApp(const MyApp&) = delete;
const MyApp& operator=(const MyApp&) = delete;
@@ -63,12 +62,6 @@ public:
virtual void DeInit() override;
};
-
-MyApp::~MyApp()
-{
-}
-
-
MyApp::MyApp()
{
}
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
index 11a9b3919f8c..4670e3b8f472 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
@@ -121,7 +121,6 @@ class UpdateCommandEnv
cssu::Reference< cssu::XComponentContext > m_xContext;
public:
- virtual ~UpdateCommandEnv() override;
UpdateCommandEnv( cssu::Reference< cssu::XComponentContext > const & xCtx,
::rtl::Reference<UpdateInstallDialog::Thread>const & thread);
@@ -631,10 +630,6 @@ UpdateCommandEnv::UpdateCommandEnv( cssu::Reference< cssu::XComponentContext > c
{
}
-UpdateCommandEnv::~UpdateCommandEnv()
-{
-}
-
// XCommandEnvironment
cssu::Reference<css::task::XInteractionHandler> UpdateCommandEnv::getInteractionHandler()
throw (cssu::RuntimeException, std::exception)
diff --git a/desktop/source/deployment/manager/dp_informationprovider.cxx b/desktop/source/deployment/manager/dp_informationprovider.cxx
index ca82cf215b6f..134a82233676 100644
--- a/desktop/source/deployment/manager/dp_informationprovider.cxx
+++ b/desktop/source/deployment/manager/dp_informationprovider.cxx
@@ -63,7 +63,6 @@ class PackageInformationProvider :
{
public:
explicit PackageInformationProvider( uno::Reference< uno::XComponentContext >const& xContext);
- virtual ~PackageInformationProvider() override;
// XPackageInformationProvider
virtual OUString SAL_CALL getPackageLocation( const OUString& extensionId )
@@ -90,12 +89,6 @@ PackageInformationProvider::PackageInformationProvider( uno::Reference< uno::XCo
{
}
-
-PackageInformationProvider::~PackageInformationProvider()
-{
-}
-
-
OUString PackageInformationProvider::getPackageLocation(
const OUString & repository,
const OUString& _rExtensionId )
diff --git a/desktop/source/deployment/manager/dp_managerfac.cxx b/desktop/source/deployment/manager/dp_managerfac.cxx
index cf8be3c18efc..bcc4a7ad7151 100644
--- a/desktop/source/deployment/manager/dp_managerfac.cxx
+++ b/desktop/source/deployment/manager/dp_managerfac.cxx
@@ -55,7 +55,6 @@ protected:
virtual void SAL_CALL disposing() override;
public:
- virtual ~PackageManagerFactoryImpl() override;
explicit PackageManagerFactoryImpl(
Reference<XComponentContext> const & xComponentContext );
@@ -81,12 +80,6 @@ PackageManagerFactoryImpl::PackageManagerFactoryImpl(
{
}
-
-PackageManagerFactoryImpl::~PackageManagerFactoryImpl()
-{
-}
-
-
inline void PackageManagerFactoryImpl::check()
{
::osl::MutexGuard guard( getMutex() );
diff --git a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
index 732b026d04c3..6b6d7a94eef9 100644
--- a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
+++ b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
@@ -62,8 +62,6 @@ class EmptyNodeList:
public:
EmptyNodeList();
- virtual ~EmptyNodeList() override;
-
EmptyNodeList(const EmptyNodeList&) = delete;
const EmptyNodeList& operator=(const EmptyNodeList&) = delete;
@@ -75,8 +73,6 @@ public:
EmptyNodeList::EmptyNodeList() {}
-EmptyNodeList::~EmptyNodeList() {}
-
::sal_Int32 EmptyNodeList::getLength() throw (css::uno::RuntimeException, std::exception) {
return 0;
}
@@ -146,7 +142,6 @@ class FileDoesNotExistFilter
css::uno::Reference< css::ucb::XCommandEnvironment > m_xCommandEnv;
public:
- virtual ~FileDoesNotExistFilter() override;
explicit FileDoesNotExistFilter(
const css::uno::Reference< css::ucb::XCommandEnvironment >& xCmdEnv);
@@ -257,10 +252,6 @@ FileDoesNotExistFilter::FileDoesNotExistFilter(
m_bExist(true), m_xCommandEnv(xCmdEnv)
{}
-FileDoesNotExistFilter::~FileDoesNotExistFilter()
-{
-};
-
// XCommandEnvironment
Reference<css::task::XInteractionHandler >
FileDoesNotExistFilter::getInteractionHandler() throw (css::uno::RuntimeException, std::exception)