[libreoffice/f17] (2 commits) ...Merge branch 'master' into f17

[Caolán McNamara]

Summary of changes:

  ee403bb... SAL_WARN_IF not available in older builds (*)
  6bf7706... Merge branch 'master' into f17

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