diff options
author | Caolán McNamara <caolanm@redhat.com> | 2018-08-16 11:47:20 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-08-28 15:50:48 +0200 |
commit | 0655121bebd976a0c651b3c4f6f85e3bf76c89d6 (patch) | |
tree | 0e5e23942703d36e43bf2f8659f176f7b43ca3f8 /svx | |
parent | 5be8cbdb874621111cb157a98013e254de3b269c (diff) |
tdf#119284 bg for automatic not set while editing
refactor and reuse fdo#35779 solution for this case
Change-Id: I0631cd2560aa2acc2310f95b5c4dea36a2845a58
Reviewed-on: https://gerrit.libreoffice.org/59167
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/svdraw/svdotextdecomposition.cxx | 59 |
1 files changed, 32 insertions, 27 deletions
diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx index 75830c864536..ede3f675e39e 100644 --- a/svx/source/svdraw/svdotextdecomposition.cxx +++ b/svx/source/svdraw/svdotextdecomposition.cxx @@ -851,6 +851,37 @@ void SdrTextObj::impDecomposeAutoFitTextPrimitive( rTarget = aConverter.getPrimitive2DSequence(); } +// Resolves: fdo#35779 set background color of this shape as the editeng background if there +// is one. Check the shape itself, then the host page, then that page's master page. +void SdrObject::setSuitableOutlinerBg(::Outliner& rOutliner) const +{ + const SfxItemSet* pBackgroundFillSet = &GetObjectItemSet(); + + if (drawing::FillStyle_NONE == pBackgroundFillSet->Get(XATTR_FILLSTYLE).GetValue()) + { + SdrPage *pOwnerPage = GetPage(); + if (pOwnerPage) + { + pBackgroundFillSet = &pOwnerPage->getSdrPageProperties().GetItemSet(); + + if (drawing::FillStyle_NONE == pBackgroundFillSet->Get(XATTR_FILLSTYLE).GetValue()) + { + if (!pOwnerPage->IsMasterPage() && pOwnerPage->TRG_HasMasterPage()) + { + pBackgroundFillSet = &pOwnerPage->TRG_GetMasterPage().getSdrPageProperties().GetItemSet(); + } + } + } + } + + if (drawing::FillStyle_NONE != pBackgroundFillSet->Get(XATTR_FILLSTYLE).GetValue()) + { + Color aColor(rOutliner.GetBackgroundColor()); + GetDraftFillColor(*pBackgroundFillSet, aColor); + rOutliner.SetBackgroundColor(aColor); + } +} + void SdrTextObj::impDecomposeBlockTextPrimitive( drawinglayer::primitive2d::Primitive2DContainer& rTarget, const drawinglayer::primitive2d::SdrBlockTextPrimitive2D& rSdrBlockTextPrimitive, @@ -881,35 +912,9 @@ void SdrTextObj::impDecomposeBlockTextPrimitive( rOutliner.SetMinAutoPaperSize(aNullSize); rOutliner.SetMaxAutoPaperSize(Size(1000000,1000000)); - // Resolves: fdo#35779 set background color of this shape as the editeng background if there - // is one. Check the shape itself, then the host page, then that page's master page. // That color needs to be restored on leaving this method Color aOriginalBackColor(rOutliner.GetBackgroundColor()); - const SfxItemSet* pBackgroundFillSet = &GetObjectItemSet(); - - if (drawing::FillStyle_NONE == pBackgroundFillSet->Get(XATTR_FILLSTYLE).GetValue()) - { - SdrPage *pOwnerPage = GetPage(); - if (pOwnerPage) - { - pBackgroundFillSet = &pOwnerPage->getSdrPageProperties().GetItemSet(); - - if (drawing::FillStyle_NONE == pBackgroundFillSet->Get(XATTR_FILLSTYLE).GetValue()) - { - if (!pOwnerPage->IsMasterPage() && pOwnerPage->TRG_HasMasterPage()) - { - pBackgroundFillSet = &pOwnerPage->TRG_GetMasterPage().getSdrPageProperties().GetItemSet(); - } - } - } - } - - if (drawing::FillStyle_NONE != pBackgroundFillSet->Get(XATTR_FILLSTYLE).GetValue()) - { - Color aColor(rOutliner.GetBackgroundColor()); - GetDraftFillColor(*pBackgroundFillSet, aColor); - rOutliner.SetBackgroundColor(aColor); - } + setSuitableOutlinerBg(rOutliner); // add one to rage sizes to get back to the old Rectangle and outliner measurements const sal_uInt32 nAnchorTextWidth(FRound(aAnchorTextRange.getWidth() + 1)); |