diff options
Diffstat (limited to 'sd/source/ui/view/sdview.cxx')
| -rw-r--r-- | sd/source/ui/view/sdview.cxx | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx index c92ee1113e3c..3c5d190532fe 100644 --- a/sd/source/ui/view/sdview.cxx +++ b/sd/source/ui/view/sdview.cxx @@ -449,6 +449,20 @@ void ViewRedirector::createRedirectedPrimitive2DSequence( } } +namespace +{ + void setOutlinerBgFromPage(::Outliner& rOutl, SdrPageView& rPgView, bool bScreenDisplay) + { + SdPage* pPage = static_cast<SdPage*>(rPgView.GetPage()); + if (pPage) + { + // #i75566# Name change GetBackgroundColor -> GetPageBackgroundColor and + // hint value if screen display. Only then the AutoColor mechanisms shall be applied + rOutl.SetBackgroundColor(pPage->GetPageBackgroundColor(&rPgView, bScreenDisplay)); + } + } +} + /** * The event will be forwarded to the View */ @@ -476,9 +490,7 @@ void View::CompleteRedraw(OutputDevice* pOutDev, const vcl::Region& rReg, sdr::c || (OUTDEV_PDF == pOutDev->GetOutDevType()))) bScreenDisplay = false; - // #i75566# Name change GetBackgroundColor -> GetPageBackgroundColor and - // hint value if screen display. Only then the AutoColor mechanisms shall be applied - rOutl.SetBackgroundColor( pPage->GetPageBackgroundColor(pPgView, bScreenDisplay) ); + setOutlinerBgFromPage(rOutl, *pPgView, bScreenDisplay); } } @@ -724,7 +736,11 @@ bool View::SdrBeginTextEdit( } else { - pObj->setSuitableOutlinerBg(*pOL); + // tdf#148140 Set the background to determine autocolor. + // Use any explicit bg with fallback to underlying page if + // none found + if (!pObj->setSuitableOutlinerBg(*pOL) && pPV) + setOutlinerBgFromPage(*pOL, *pPV, true); } } |