diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-10-31 11:28:48 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-10-31 11:35:46 +0100 |
| commit | a8cfc979b43b75a94e155bd188283d1460c69584 (patch) | |
| tree | 72fefea7c9e65bc162255cba3d9de5d172647d59 /sw | |
| parent | loplugin:oncevar in xmloff..xmlsecurity (diff) | |
| download | core-a8cfc979b43b75a94e155bd188283d1460c69584.tar.gz core-a8cfc979b43b75a94e155bd188283d1460c69584.zip | |
SvxBrushItem::GetGraphicLink no longer returns a pointer
...since cfb4463d2afd36ca6d0fbb9e374bf5387fee84df "convert
include/editeng/brushitem.hxx from String to OUString", which boldly changed it
from returning a pointer to returning a reference, probably not even taking into
account that that broke the value set (from string+null to just string).
However, that change appears to have worked OK in practice, and there maybe
wasn't a need after all to distinguish a null value from an empty string. These
two places here were missed in the change, and happened to keep working, as they
picked the operator ==(sal_Unicode const *, OUString const &) overload, that
happens to treat a null first argument like an empty string.
Change-Id: If2d76951fa4bf6c7821321327ad653bd0a95a788
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/html/css1atr.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx index 47c8c7f98baf..40b7a98429e4 100644 --- a/sw/source/filter/html/css1atr.cxx +++ b/sw/source/filter/html/css1atr.cxx @@ -2216,7 +2216,7 @@ static bool OutCSS1_FrameFormatBrush( SwHTMLWriter& rWrt, /// output brush of frame format, if its background color is not "no fill"/"auto fill" /// or it has a background graphic. if( rBrushItem.GetColor() != COL_TRANSPARENT || - nullptr != rBrushItem.GetGraphicLink() || + !rBrushItem.GetGraphicLink().isEmpty() || 0 != rBrushItem.GetGraphicPos() ) { OutCSS1_SvxBrush( rWrt, rBrushItem, CSS1_BACKGROUND_FLY, nullptr ); |