[koffice/f15/master] (4 commits) ...fold kformulashape into core/libs unconditionally

[Rex Dieter]

Summary of changes:

  b421836... koffice-2.3.2 (*)
  a1ff41e... fix for 'error: control reaches end of non-void function [- (*)
  205342f... upstream dropped/disabled standalone kformula, fold kformul (*)
  9b7a1ec... fold kformulashape into core/libs unconditionally (*)

(*) This commit already existed in another branch; no separate mail sent