[Libreoffice-commits] core.git: sd/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Aug 16 13:01:12 UTC 2018
sd/source/ui/view/sdview.cxx | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
New commits:
commit e75a01f4a00fdafad918099b90d1ca79224b4dca
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Aug 16 11:47:20 2018 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Aug 16 15:00:42 2018 +0200
these only get used if pOL is non-null
Change-Id: I70d38727027d15b0bf3ea2904655f15d9503b681
Reviewed-on: https://gerrit.libreoffice.org/59162
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index 4ca098bde258..bbb5d417422f 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -713,11 +713,9 @@ bool View::SdrBeginTextEdit(
}
}
- if (bReturn)
+ if (::Outliner* pOL = bReturn ? GetTextEditOutliner() : nullptr)
{
- ::Outliner* pOL = GetTextEditOutliner();
-
- if( pObj && pObj->getSdrPageFromSdrObject() )
+ if (pObj && pObj->getSdrPageFromSdrObject())
{
Color aBackground;
if( pObj->GetObjInventor() == SdrInventor::Default && pObj->GetObjIdentifier() == OBJ_TABLE )
@@ -728,15 +726,11 @@ bool View::SdrBeginTextEdit(
{
aBackground = pObj->getSdrPageFromSdrObject()->GetPageBackgroundColor(pPV);
}
- if (pOL != nullptr)
- pOL->SetBackgroundColor( aBackground );
+ pOL->SetBackgroundColor( aBackground );
}
- if (pOL != nullptr)
- {
- pOL->SetParaInsertedHdl(LINK(this, View, OnParagraphInsertedHdl));
- pOL->SetParaRemovingHdl(LINK(this, View, OnParagraphRemovingHdl));
- }
+ pOL->SetParaInsertedHdl(LINK(this, View, OnParagraphInsertedHdl));
+ pOL->SetParaRemovingHdl(LINK(this, View, OnParagraphRemovingHdl));
}
if (bMasterPage && bReturn && pOutl)
More information about the Libreoffice-commits
mailing list