From c1e18e05a53c1d55afe36a887ca25f74f3f1d32d Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 4 Oct 2016 09:57:11 +0200 Subject: merge dbaccess::StorageInputStream with dbaccess::StorageXMLInputStream Change-Id: I05b54b8a2fe4ff0c8b9f89e3d29e864e8665b7b8 Reviewed-on: https://gerrit.libreoffice.org/29519 Tested-by: Jenkins Reviewed-by: Noel Grandin --- compilerplugins/clang/mergeclasses.results | 1 - 1 file changed, 1 deletion(-) (limited to 'compilerplugins') 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 -- cgit