diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-10-04 09:57:11 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-10-05 06:42:05 +0000 |
| commit | c1e18e05a53c1d55afe36a887ca25f74f3f1d32d (patch) | |
| tree | eec6d2268c5811d363e391d374df5656631dbc95 /compilerplugins | |
| parent | 106ea87205cfba1bc39dc99ad8c3ee5f8fe350fb (diff) | |
merge dbaccess::StorageInputStream with dbaccess::StorageXMLInputStream
Change-Id: I05b54b8a2fe4ff0c8b9f89e3d29e864e8665b7b8
Reviewed-on: https://gerrit.libreoffice.org/29519
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 29b47df1f4c5..d0c51a5a5a60 100644 --- a/compilerplugins/clang/mergeclasses.results +++ b/compilerplugins/clang/mergeclasses.results @@ -227,7 +227,6 @@ merge cppu::PropertySetMixinImpl with cppu::PropertySetMixin merge dbaccess::IPropertyContainer with dbaccess::OColumn merge dbaccess::IRefreshListener with dbaccess::OConnection merge dbaccess::OColumnWrapper with dbaccess::OTableColumnDescriptorWrapper -merge dbaccess::StorageInputStream with dbaccess::StorageXMLInputStream merge dbaui::IEntryFilter with dbaui::(anonymous namespace)::FilterByEntryDataId merge dbaui::IUpdateHelper with dbaui::OParameterUpdateHelper merge dbaui::OSplitterView with dbaui::OApplicationDetailView |