diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-10-07 12:55:17 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-10-07 12:57:44 +0100 |
| commit | 71bb6d6b7273f49189fa2d10010bac4f8dafa7c1 (patch) | |
| tree | 941bfac0a3a43f5084338d598a72123dcd976b23 /compilerplugins | |
| parent | b72e63fd5a7caf373eb42bedb2f7db49cef04e91 (diff) | |
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
Diffstat (limited to 'compilerplugins')
| -rw-r--r-- | compilerplugins/clang/mergeclasses.results | 1 |
1 files changed, 1 insertions, 0 deletions
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 |