LibreOfficeTheme.Base isn't used by itself, so no longer let LibreOfficeTheme derive from it, but derive from Theme.AppCompat.DayNight.NoActionBar directly. LibreOfficeTheme.Toolbar is equivalent, so drop it and switch all uses to LibreOfficeTheme instead. Change-Id: I9ad5ccb00bac94a20c17715780050fd8d300fa15 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187625 Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> Tested-by: Jenkins