[Libreoffice] More patches to remove unhelpful File.hxx macros from Easy Hacks

[Andy Holder]

Hello,

More changing macros names and removing some commented out code where
the soon to be removed macros were used.

Andy