diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-12-15 09:08:50 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-12-15 09:10:16 +0100 |
| commit | 3a0c0af7309e1f5ba3811bbe8a73e506cf5cd069 (patch) | |
| tree | e261182f183818886dc5e081a5a5af8e400f96bb /sw/source | |
| parent | 6502c0dd8338c05dc4dab323099bb9062ff3d131 (diff) | |
tdf#96113 sw: don't overwrite fo:background-color on ODT frame import
The situation is similar to commit
79fb61efb847405fa47235002b52ee8efad5e339 (tdf#92379: svx: don't
overwrite fo:background-color on ODF import, 2015-08-21), except that
here text frames had the problem of loosing colors when transparency is
set.
Fix the problem by informing getSvxBrushItemFromSourceSet() about if
we're in XML import or not.
Change-Id: Id1adf60b14a3762f0a2a43c49caeed9f6ea039be
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/core/unocore/unoframe.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index 15ad17d8b62d..b7b6cc0784a2 100644 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -1803,7 +1803,7 @@ void SwXFrame::setPropertyValue(const OUString& rPropertyName, const ::uno::Any& if(RES_BACKGROUND == pEntry->nWID) { const SwAttrSet& rSet = pFormat->GetAttrSet(); - const SvxBrushItem aOriginalBrushItem(getSvxBrushItemFromSourceSet(rSet, RES_BACKGROUND)); + const SvxBrushItem aOriginalBrushItem(getSvxBrushItemFromSourceSet(rSet, RES_BACKGROUND, true, pDoc->IsInXMLImport())); SvxBrushItem aChangedBrushItem(aOriginalBrushItem); aChangedBrushItem.PutValue(aValue, nMemberId); |