compilerplugins/clang/mergeclasses.results | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit 0cb5435dd35674b6e55e22922a0819d2a755fc10
Author: Noel Grandin <noel.gran...@collabora.co.uk>
Date: Tue Mar 28 13:42:13 2017 +0200
update results of mergeclasses plugin
Change-Id: I97f67bb7f98d0cf0a835f55e12c24a30ffd4ed3d
diff --git a/compilerplugins/clang/mergeclasses.results
b/compilerplugins/clang/mergeclasses.results
index fc519945196f..b8c64805da81 100644
--- a/compilerplugins/clang/mergeclasses.results
+++ b/compilerplugins/clang/mergeclasses.results
@@ -64,7 +64,6 @@ merge IDocumentUndoRedo with sw::UndoManager
merge IFinishedThreadListener with ThreadListener
merge IGrammarContact with SwGrammarContact
merge IInterface with SwDoc
-merge IMailDispatcherListener with SwMailDispatcherListener_Impl
merge IStyleAccess with SwStyleManager
merge IStylePoolIteratorAccess with (anonymous namespace)::Iterator
merge ISwFrameControl with SwFrameMenuButtonBase
@@ -83,6 +82,7 @@ merge OpenGLDeviceInfo with X11OpenGLDeviceInfo
merge OpenGLSalGraphicsImpl with X11OpenGLSalGraphicsImpl
merge PPTExBulletProvider with PPTWriter
merge RefNode with RscTop
+merge RscContWriteSrc with RscCont
merge RscLongRange with RscLongEnumRange
merge SOParagraph with ParagraphObj
merge SalData with SalGenericData
@@ -158,6 +158,7 @@ merge SwUnoCursor with SwUnoTableCursor
merge SwXParaFrameEnumeration with SwXParaFrameEnumerationImpl
merge SwXParagraphEnumeration with SwXParagraphEnumerationImpl
merge SwXTextRanges with SwXTextRangesImpl
+merge Task with Timer
merge TextObj with TextObjBinary
merge TextRenderImpl with CairoTextRender
merge UniqueIndexImpl with UniqueIndex
@@ -370,11 +371,9 @@ merge writerfilter::ooxml::OOXMLDocument with
writerfilter::ooxml::OOXMLDocument
merge writerfilter::ooxml::OOXMLFastContextHandlerLinear with
writerfilter::ooxml::OOXMLFastContextHandlerMath
merge writerfilter::ooxml::OOXMLStream with
writerfilter::ooxml::OOXMLStreamImpl
merge writerfilter::rtftok::RTFDocument with
writerfilter::rtftok::RTFDocumentImpl
-merge writerperfect::test::WpftFilterFixture with
writerperfect::test::WpftFilterTestBase
merge xmloff::IEventAttacher with xmloff::OElementImport
merge xmloff::IEventAttacherManager with xmloff::ODefaultEventAttacherManager
merge xmloff::IFormsExportContext with xmloff::OFormLayerXMLExport_Impl
merge xmloff::OPropertyExport with xmloff::OElementExport
merge xmloff::OPropertyImport with xmloff::OElementImport
merge xmloff::OURLReferenceImport with xmloff::OButtonImport
-merge xmlsecurity::Certificate with X509Certificate_NssImpl
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
