summaryrefslogtreecommitdiff
path: root/compilerplugins
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2023-05-08 12:56:36 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2023-05-09 13:53:47 +0200
commitc9b0a6010e96d22844cdab6c1e8e67fbf14ab142 (patch)
tree6e296f1fca94ad4ffe92a811bd5262fb8abe508e /compilerplugins
parent38a658f3f064e1f0dc28cd7f69d800f78115c8df (diff)
merge GalleryFileStorage with GalleryBinaryEngine
Change-Id: Id948627873db9c646d1a81784dd16f6aa1c2063b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151553 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'compilerplugins')
-rw-r--r--compilerplugins/clang/mergeclasses.results1
1 files changed, 0 insertions, 1 deletions
diff --git a/compilerplugins/clang/mergeclasses.results b/compilerplugins/clang/mergeclasses.results
index a1e8c6be6e3d..9d4e9d583926 100644
--- a/compilerplugins/clang/mergeclasses.results
+++ b/compilerplugins/clang/mergeclasses.results
@@ -54,7 +54,6 @@ merge FmRecordCountListener_Base with FmRecordCountListener
merge FmXDisposeListener with DisposeListenerGridBridge
merge FmXFormShell_Base_Disambiguation with FmXFormShell
merge GLWindow with GLX11Window
-merge GalleryFileStorage with GalleryBinaryEngine
merge GroupTable with PPTWriterBase
merge HostDetailsContainer with DavDetailsContainer
merge IDocumentChartDataProviderAccess with sw::DocumentChartDataProviderManager