Kaydet (Commit) e75a01f4 authored tarafından Caolán McNamara's avatar Caolán McNamara

these only get used if pOL is non-null

Change-Id: I70d38727027d15b0bf3ea2904655f15d9503b681
Reviewed-on: https://gerrit.libreoffice.org/59162Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 3fdbd214
......@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment