From 71bb6d6b7273f49189fa2d10010bac4f8dafa7c1 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 7 Oct 2015 12:55:17 +0100 Subject: Revert "loplugin:mergeclasses" to fix mac build because fontsubst.cxx is not built on mac. move PreMatchFontSubstitution to PhysicalFontCollection.cxx ? This reverts commit 349700228e4449ace956b30bc65208b9196f0a78. Change-Id: I007f24313ddfd0eb3db3fd599abcf1eae3da4e9c --- compilerplugins/clang/mergeclasses.results | 1 + 1 file changed, 1 insertion(+) (limited to 'compilerplugins') diff --git a/compilerplugins/clang/mergeclasses.results b/compilerplugins/clang/mergeclasses.results index ece9c54b407b..78e59dc07895 100644 --- a/compilerplugins/clang/mergeclasses.results +++ b/compilerplugins/clang/mergeclasses.results @@ -46,6 +46,7 @@ merge ISwFrameControl with SwFrameMenuButtonBase merge IXFAttrList with XFSaxAttrList merge IXFStream with XFSaxStream merge IXFStyle with XFStyle +merge ImplPreMatchFontSubstitution with FcPreMatchSubstititution merge LwpDLList with LwpParaProperty merge LwpDLVListHead with LwpPropList merge OldBasicPassword with basic::SfxScriptLibraryContainer -- cgit v1.2.3