SolverComponent::GetResourceString() and SwarmSolver::getResourceString() both resolved strings from the sc domain, which is exactly what ScResId() does. Drop the two helpers and call ScResId() directly at every call site. The SwarmSolver helper guarded against a null TranslateId, so keep that guard where getPropertyDescription() may end up with an empty id. Signed-off-by: Andras Timar <andras.timar@collabora.com> Change-Id: Ie7143f6de034d287d3d08cd62fbb695b2d8037c3 Reviewed-on: https://gerrit.collaboraoffice.com/c/online/+/6930 Reviewed-by: Noel Grandin <noel.grandin@collabora.com> Tested-by: Jenkins CPCI <releng@collaboraoffice.com> (cherry picked from commit 4a1329a14ec3605b046ab02e6a2e3ba83e65bec2) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/208504 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>