diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-08-21 18:28:23 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-08-22 01:00:03 +0200 |
| commit | 79fb61efb847405fa47235002b52ee8efad5e339 (patch) | |
| tree | 8ae2763d18c65cf465b77ce248202c96139b2bc5 /include/svx/unobrushitemhelper.hxx | |
| parent | ece9da2f47def7ed5cd5e04add0eeb7a90a6e1b6 (diff) | |
tdf#92379: svx: don't overwrite fo:background-color on ODF import
getSvxBrushItemFromSourceSet() is called once for each property of a
frame style that is set, and the "solid" fill-style is set by first
applying the BackColorRGB and then BackTransparency property. So there
is an intermediate state that has fill-style NONE but a XFillColorItem
set - don't reset the color to white in that case!
Apparently writerfilter generally relies on the current reset-to-AUTO
implementation (loads of test failures), so for now limit the fix for
when we know that a frame style is imported from ODF.
(regression from 3d399b0e45720354fc64dc3d121ee486e01eff89)
Change-Id: Ia987fe586ec819a1f3cd85acdbfb03c74ca0ec2c
Diffstat (limited to 'include/svx/unobrushitemhelper.hxx')
| -rw-r--r-- | include/svx/unobrushitemhelper.hxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/svx/unobrushitemhelper.hxx b/include/svx/unobrushitemhelper.hxx index eea95b60e6d6..4055c4584008 100644 --- a/include/svx/unobrushitemhelper.hxx +++ b/include/svx/unobrushitemhelper.hxx @@ -46,7 +46,8 @@ SVX_DLLPUBLIC void setSvxBrushItemAsFillAttributesToTargetSet( SVX_DLLPUBLIC SvxBrushItem getSvxBrushItemFromSourceSet( const SfxItemSet& rSourceSet, sal_uInt16 nBackgroundID, - bool bSearchInParents = true); + bool bSearchInParents = true, + bool bXMLImportHack = false); #endif // _UNOBRUSHITEMHELPER_HXX |