bnc#904423: Text(box) is rendered white on white when it is not

The problem was that the background color defined by theme
was not imported correctly, because the different fill
style comes from different sources (master slide, theme,
direct formatting) were applied on the shape in wrong order.

To solve this we need to store master slide defined fill style
in a different variable so theme style can be applied after master
slide defined style but before direct formatting.

(cherry picked from commit 81cd386facedfbb15be6dffc10351262abf733f3)

Conflicts:
	sd/qa/unit/import-tests.cxx

Change-Id: I99ea981858b9fa391915570187c8ddfdf2be1f7a
PPTX import: fix import of shape line properties defined by theme

See also:
81cd386facedfbb15be6dffc10351262abf733f3

(cherry picked from commit 664a56b3c81503bdf199edf1806676f0a35b956f)

Conflicts:
	sd/qa/unit/import-tests.cxx

Change-Id: Ibb21d3e5b52a4d4996202acd4a989910fa223632