(cherry picked from commit 60f299f2) Conflicts: filter/source/msfilter/escherex.cxx sd/source/filter/eppt/eppt.cxx sd/source/filter/eppt/eppt.hxx Change-Id: I62d772ab67ed03bfa964040bd07b3684cf2dee8f
