diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-21 12:16:52 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-23 13:48:37 +0200 |
| commit | 93449eee17d88532cb8679496a523ded9cd03b0a (patch) | |
| tree | 2cda72577449d17af20039bee928406d92b17fcf /compilerplugins | |
| parent | f586c7ec352b3b7b23dba0e1e774d85b1c14e2b7 (diff) | |
merge comphelper::ChainablePropertySet with comphelper::ChainableHelperNoState
Change-Id: I8fb93665b2a2f46019306f473882a7f3d7aece87
Reviewed-on: https://gerrit.libreoffice.org/36787
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'compilerplugins')
| -rw-r--r-- | compilerplugins/clang/mergeclasses.results | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/compilerplugins/clang/mergeclasses.results b/compilerplugins/clang/mergeclasses.results index 59bf4effa157..e12911791dbb 100644 --- a/compilerplugins/clang/mergeclasses.results +++ b/compilerplugins/clang/mergeclasses.results @@ -190,7 +190,6 @@ merge chart::ExplicitValueProvider with chart::ChartView merge chart::LegendEntryProvider with chart::VSeriesPlotter merge chart::MarkHandleProvider with chart::SelectionHelper merge chart::ResourceChangeListener with chart::ChartTypeTabPage -merge comphelper::ChainablePropertySet with comphelper::ChainableHelperNoState merge comphelper::OAccessibleContextHelper with comphelper::OCommonAccessibleComponent merge comphelper::OAnyEnumeration_BASE with comphelper::OAnyEnumeration merge comphelper::OComponentProxyAggregation with comphelper::OAccessibleWrapper |