From 349700228e4449ace956b30bc65208b9196f0a78 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 7 Oct 2015 10:00:59 +0200 Subject: loplugin:mergeclasses Change-Id: I9f56beebae1ea02a8914b7b25fe7565f7b0df053 --- compilerplugins/clang/mergeclasses.py | 2 +- compilerplugins/clang/mergeclasses.results | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'compilerplugins') diff --git a/compilerplugins/clang/mergeclasses.py b/compilerplugins/clang/mergeclasses.py index 07b68f320f28..ebeb17e76819 100755 --- a/compilerplugins/clang/mergeclasses.py +++ b/compilerplugins/clang/mergeclasses.py @@ -66,7 +66,7 @@ for clazz in sorted(definitionSet - instantiatedSet): if clazz.find("mutex") != -1 or clazz.find("Mutex") != -1: continue otherclazz = next(iter(parentChildDict[clazz])) - # exclude combinations that span modules because we often use those to make cross-module dependencies more manageable. + # exclude combinations that span modules because we often use those to make cross-module dependencies more manageable. if extractModuleName(clazz) != extractModuleName(otherclazz): continue print "merge", clazz, "with", otherclazz diff --git a/compilerplugins/clang/mergeclasses.results b/compilerplugins/clang/mergeclasses.results index a92afb513002..e4d910d4ba3b 100644 --- a/compilerplugins/clang/mergeclasses.results +++ b/compilerplugins/clang/mergeclasses.results @@ -46,8 +46,6 @@ merge ISwFrameControl with SwFrameMenuButtonBase merge IXFAttrList with XFSaxAttrList merge IXFStream with XFSaxStream merge IXFStyle with XFStyle -merge ImplGlyphFallbackFontSubstitution with FcGlyphFallbackSubstititution -merge ImplPreMatchFontSubstitution with FcPreMatchSubstititution merge LwpDLList with LwpParaProperty merge LwpDLVListHead with LwpPropList merge OldBasicPassword with basic::SfxScriptLibraryContainer -- cgit