summaryrefslogtreecommitdiff
path: root/vcl/source/font
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-10-07 12:55:17 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-10-07 12:57:44 +0100
commit71bb6d6b7273f49189fa2d10010bac4f8dafa7c1 (patch)
tree941bfac0a3a43f5084338d598a72123dcd976b23 /vcl/source/font
parentb72e63fd5a7caf373eb42bedb2f7db49cef04e91 (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 'vcl/source/font')
-rw-r--r--vcl/source/font/PhysicalFontCollection.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/source/font/PhysicalFontCollection.cxx b/vcl/source/font/PhysicalFontCollection.cxx
index 9f01fe2291e0..cd89bdf0e6a1 100644
--- a/vcl/source/font/PhysicalFontCollection.cxx
+++ b/vcl/source/font/PhysicalFontCollection.cxx
@@ -84,7 +84,7 @@ PhysicalFontCollection::~PhysicalFontCollection()
Clear();
}
-void PhysicalFontCollection::SetPreMatchHook( PreMatchFontSubstititution* pHook )
+void PhysicalFontCollection::SetPreMatchHook( ImplPreMatchFontSubstitution* pHook )
{
mpPreMatchHook = pHook;
}