pushed this one after all. SfxMedium::GetHdl() seems to be used for now (in tools/inc/tools/ref.hxx), maybe we can remove all of those macro definitions... I also removed 'using SfxControllerItem::GetCoreMetric;' statement from sfx2/inc/sfx2/unoctitm.hxx, and then the build has succeeded. Thanks, Ivan