summaryrefslogtreecommitdiffstats
path: root/unoidl
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-09-13 13:09:01 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-09-13 13:19:22 +0200
commit91dd2db17bd6cb9b357d1d69b187174e31eabef0 (patch)
treed634de3a1a6820904b5699c2136b79b1a5a807c7 /unoidl
parentavoid loading all calendars of a locale (diff)
downloadcore-91dd2db17bd6cb9b357d1d69b187174e31eabef0.tar.gz
core-91dd2db17bd6cb9b357d1d69b187174e31eabef0.zip
loplugin:override: No more need for the "MSVC dtor override" workaround
The issue of 362d4f0cd4e50111edfae9d30c90602c37ed65a2 "Explicitly mark overriding destructors as 'virtual'" appears to no longer be a problem with MSVC 2013. (The little change in the rewriting code of compilerplugins/clang/override.cxx was necessary to prevent an endless loop when adding "override" to OOO_DLLPUBLIC_CHARTTOOLS virtual ~CloseableLifeTimeManager(); in chart2/source/inc/LifeTime.hxx, getting stuck in the leading OOO_DLLPUBLIC_CHARTTOOLS macro. Can't remember what that isAtEndOfImmediateMacroExpansion thing was originally necessary for, anyway.) Change-Id: I534c634504d7216b9bb632c2775c04eaf27e927e
Diffstat (limited to 'unoidl')
-rw-r--r--unoidl/source/legacyprovider.cxx4
-rw-r--r--unoidl/source/legacyprovider.hxx2
-rw-r--r--unoidl/source/sourcefileprovider.cxx4
-rw-r--r--unoidl/source/sourcefileprovider.hxx2
-rw-r--r--unoidl/source/sourceprovider-scanner.hxx18
-rw-r--r--unoidl/source/sourcetreeprovider.cxx4
-rw-r--r--unoidl/source/sourcetreeprovider.hxx2
-rw-r--r--unoidl/source/unoidl.cxx4
-rw-r--r--unoidl/source/unoidlprovider.cxx6
-rw-r--r--unoidl/source/unoidlprovider.hxx2
10 files changed, 24 insertions, 24 deletions
diff --git a/unoidl/source/legacyprovider.cxx b/unoidl/source/legacyprovider.cxx
index d160caf10de0..0488efa987cf 100644
--- a/unoidl/source/legacyprovider.cxx
+++ b/unoidl/source/legacyprovider.cxx
@@ -80,7 +80,7 @@ public:
RegistryKey const & key);
private:
- virtual ~Cursor() throw () {}
+ virtual ~Cursor() throw () override {}
virtual rtl::Reference< Entity > getNext(OUString * name) override;
@@ -135,7 +135,7 @@ public:
{}
private:
- virtual ~Module() throw () {}
+ virtual ~Module() throw () override {}
virtual std::vector< OUString > getMemberNames() const override;
diff --git a/unoidl/source/legacyprovider.hxx b/unoidl/source/legacyprovider.hxx
index aac97824e986..4f9427d18fb4 100644
--- a/unoidl/source/legacyprovider.hxx
+++ b/unoidl/source/legacyprovider.hxx
@@ -31,7 +31,7 @@ public:
const override;
private:
- virtual ~LegacyProvider() throw ();
+ virtual ~LegacyProvider() throw () override;
Manager & manager_;
mutable RegistryKey ucr_;
diff --git a/unoidl/source/sourcefileprovider.cxx b/unoidl/source/sourcefileprovider.cxx
index 3a3d639bb05e..e6821c47b8fc 100644
--- a/unoidl/source/sourcefileprovider.cxx
+++ b/unoidl/source/sourcefileprovider.cxx
@@ -27,7 +27,7 @@ public:
{}
private:
- virtual ~Cursor() throw () {}
+ virtual ~Cursor() throw () override {}
virtual rtl::Reference< Entity > getNext(OUString * name) override;
@@ -53,7 +53,7 @@ public:
std::map< OUString, rtl::Reference<Entity> > map;
private:
- virtual ~Module() throw () {}
+ virtual ~Module() throw () override {}
virtual std::vector<rtl::OUString> getMemberNames() const override;
diff --git a/unoidl/source/sourcefileprovider.hxx b/unoidl/source/sourcefileprovider.hxx
index 5e775c2d8a9c..9a2a4072fb90 100644
--- a/unoidl/source/sourcefileprovider.hxx
+++ b/unoidl/source/sourcefileprovider.hxx
@@ -32,7 +32,7 @@ public:
virtual rtl::Reference<Entity> findEntity(OUString const & name) const override;
private:
- virtual ~SourceFileProvider() throw ();
+ virtual ~SourceFileProvider() throw () override;
std::map< OUString, rtl::Reference<Entity> > rootMap_;
};
diff --git a/unoidl/source/sourceprovider-scanner.hxx b/unoidl/source/sourceprovider-scanner.hxx
index ab0215dc4a17..522b19a59f12 100644
--- a/unoidl/source/sourceprovider-scanner.hxx
+++ b/unoidl/source/sourceprovider-scanner.hxx
@@ -37,7 +37,7 @@ public:
protected:
explicit SourceProviderEntityPad(bool published): published_(published) {}
- virtual ~SourceProviderEntityPad() {}
+ virtual ~SourceProviderEntityPad() override {}
private:
bool const published_;
@@ -52,7 +52,7 @@ public:
std::vector<unoidl::EnumTypeEntity::Member> members;
private:
- virtual ~SourceProviderEnumTypeEntityPad() throw () {}
+ virtual ~SourceProviderEnumTypeEntityPad() throw () override {}
};
class SourceProviderPlainStructTypeEntityPad: public SourceProviderEntityPad {
@@ -69,7 +69,7 @@ public:
std::vector<unoidl::PlainStructTypeEntity::Member> members;
private:
- virtual ~SourceProviderPlainStructTypeEntityPad() throw () {}
+ virtual ~SourceProviderPlainStructTypeEntityPad() throw () override {}
};
class SourceProviderPolymorphicStructTypeTemplateEntityPad:
@@ -84,7 +84,7 @@ public:
std::vector<unoidl::PolymorphicStructTypeTemplateEntity::Member> members;
private:
- virtual ~SourceProviderPolymorphicStructTypeTemplateEntityPad() throw () {}
+ virtual ~SourceProviderPolymorphicStructTypeTemplateEntityPad() throw () override {}
};
class SourceProviderExceptionTypeEntityPad: public SourceProviderEntityPad {
@@ -101,7 +101,7 @@ public:
std::vector<unoidl::ExceptionTypeEntity::Member> members;
private:
- virtual ~SourceProviderExceptionTypeEntityPad() throw () {}
+ virtual ~SourceProviderExceptionTypeEntityPad() throw () override {}
};
class SourceProviderInterfaceTypeEntityPad: public SourceProviderEntityPad {
@@ -152,7 +152,7 @@ public:
std::map<OUString, Member> allMembers;
private:
- virtual ~SourceProviderInterfaceTypeEntityPad() throw () {}
+ virtual ~SourceProviderInterfaceTypeEntityPad() throw () override {}
bool checkBaseClashes(
YYLTYPE location, yyscan_t yyscanner, SourceProviderScannerData * data,
@@ -187,7 +187,7 @@ public:
std::vector<unoidl::ConstantGroupEntity::Member> members;
private:
- virtual ~SourceProviderConstantGroupEntityPad() throw () {}
+ virtual ~SourceProviderConstantGroupEntityPad() throw () override {}
};
class SourceProviderSingleInterfaceBasedServiceEntityPad:
@@ -233,7 +233,7 @@ public:
std::vector<Constructor> constructors;
private:
- virtual ~SourceProviderSingleInterfaceBasedServiceEntityPad() throw () {}
+ virtual ~SourceProviderSingleInterfaceBasedServiceEntityPad() throw () override {}
};
class SourceProviderAccumulationBasedServiceEntityPad:
@@ -252,7 +252,7 @@ public:
directProperties;
private:
- virtual ~SourceProviderAccumulationBasedServiceEntityPad() throw () {}
+ virtual ~SourceProviderAccumulationBasedServiceEntityPad() throw () override {}
};
struct SourceProviderEntity {
diff --git a/unoidl/source/sourcetreeprovider.cxx b/unoidl/source/sourcetreeprovider.cxx
index 640318c41dad..84a43e26284c 100644
--- a/unoidl/source/sourcetreeprovider.cxx
+++ b/unoidl/source/sourcetreeprovider.cxx
@@ -99,7 +99,7 @@ public:
Cursor() {}
private:
- virtual ~Cursor() throw () {}
+ virtual ~Cursor() throw () override {}
virtual rtl::Reference<Entity> getNext(OUString *) override
{ return rtl::Reference<Entity>(); } //TODO
@@ -110,7 +110,7 @@ public:
SourceModuleEntity() {}
private:
- virtual ~SourceModuleEntity() throw () {}
+ virtual ~SourceModuleEntity() throw () override {}
virtual std::vector<OUString> getMemberNames() const override
{ return std::vector<OUString>(); } //TODO
diff --git a/unoidl/source/sourcetreeprovider.hxx b/unoidl/source/sourcetreeprovider.hxx
index 9262f0d2defb..dbee645d2322 100644
--- a/unoidl/source/sourcetreeprovider.hxx
+++ b/unoidl/source/sourcetreeprovider.hxx
@@ -31,7 +31,7 @@ public:
virtual rtl::Reference<Entity> findEntity(OUString const & name) const override;
private:
- virtual ~SourceTreeProvider() throw ();
+ virtual ~SourceTreeProvider() throw () override;
Manager & manager_;
OUString uri_;
diff --git a/unoidl/source/unoidl.cxx b/unoidl/source/unoidl.cxx
index 26236a4e27d2..722d0aec0021 100644
--- a/unoidl/source/unoidl.cxx
+++ b/unoidl/source/unoidl.cxx
@@ -37,7 +37,7 @@ public:
{}
private:
- virtual ~AggregatingModule() throw () {}
+ virtual ~AggregatingModule() throw () override {}
virtual std::vector< OUString > getMemberNames() const override;
@@ -69,7 +69,7 @@ public:
{ findCursor(); }
private:
- virtual ~AggregatingCursor() throw () {}
+ virtual ~AggregatingCursor() throw () override {}
virtual rtl::Reference< Entity > getNext(OUString * name) override;
diff --git a/unoidl/source/unoidlprovider.cxx b/unoidl/source/unoidlprovider.cxx
index acf443bf445b..ea15ff5a119a 100644
--- a/unoidl/source/unoidlprovider.cxx
+++ b/unoidl/source/unoidlprovider.cxx
@@ -61,7 +61,7 @@ public:
void * address;
private:
- virtual ~MappedFile();
+ virtual ~MappedFile() override;
sal_uInt8 get8(sal_uInt32 offset) const;
@@ -657,7 +657,7 @@ public:
{}
private:
- virtual ~UnoidlCursor() throw () {}
+ virtual ~UnoidlCursor() throw () override {}
virtual rtl::Reference< Entity > getNext(OUString * name) override;
@@ -699,7 +699,7 @@ public:
}
private:
- virtual ~UnoidlModuleEntity() throw () {}
+ virtual ~UnoidlModuleEntity() throw () override {}
virtual std::vector< OUString > getMemberNames() const override;
diff --git a/unoidl/source/unoidlprovider.hxx b/unoidl/source/unoidlprovider.hxx
index 77c77c59c605..4017ab9edb35 100644
--- a/unoidl/source/unoidlprovider.hxx
+++ b/unoidl/source/unoidlprovider.hxx
@@ -46,7 +46,7 @@ public:
const override;
private:
- virtual ~UnoidlProvider() throw ();
+ virtual ~UnoidlProvider() throw () override;
rtl::Reference< detail::MappedFile > file_;
NestedMap map_;