mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "loplugin:mergeclasses" to fix mac build

Browse Source 
because fontsubst.cxx is not built on mac.

move PreMatchFontSubstitution to PhysicalFontCollection.cxx ?

This reverts commit 349700228e.

Change-Id: I007f24313ddfd0eb3db3fd599abcf1eae3da4e9c
This commit is contained in:
Caolán McNamara
2015-10-07 12:55:17 +01:00
parent b72e63fd5a
commit 71bb6d6b72
6 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
compilerplugins/clang/mergeclasses.results
View File

@@ -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