merge ModuleImageManager into ImageManager

Desktop / LibreOffice - Noel Grandin [collabora.co.uk] - 19 July 2021 08:55 UTC

they share an underlying impl, so no need to have separate classes

Change-Id: I1093f72265f67c7ccf3c2a064c86441d792512d2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119156

ef19c82f6ade merge ModuleImageManager into ImageManager
framework/Library_fwk.mk | 1 -
framework/inc/uiconfiguration/imagemanager.hxx | 2 +-
.../inc/uiconfiguration/moduleimagemanager.hxx | 73 ----------
framework/source/uiconfiguration/imagemanager.cxx | 6 +-
.../source/uiconfiguration/moduleimagemanager.cxx | 155 ---------------------
.../moduleuiconfigurationmanager.cxx | 12 +-
.../uiconfiguration/uiconfigurationmanager.cxx | 18 +--
7 files changed, 15 insertions(+), 252 deletions(-)

Upstream: cgit.freedesktop.org


  • Share