From a8cfc979b43b75a94e155bd188283d1460c69584 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 31 Oct 2016 11:28:48 +0100 Subject: 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 --- cui/source/tabpages/backgrnd.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cui') diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index 741928dbc352..ce9948c6c79f 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -698,7 +698,7 @@ bool SvxBackgroundTabPage::FillItemSet( SfxItemSet* rCoreSet ) SvxGraphicPosition eNewPos = GetGraphicPosition_Impl(); const bool bIsLink = m_pBtnLink->IsChecked(); - const bool bWasLink = (nullptr != rOldItem.GetGraphicLink() ); + const bool bWasLink = !rOldItem.GetGraphicLink().isEmpty(); if ( !bIsLink && !bIsGraphicValid ) -- cgit