diff options
| author | Xisco Fauli <xiscofauli@libreoffice.org> | 2024-09-05 14:26:07 +0200 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2024-09-05 16:17:57 +0200 |
| commit | 295e1039649de030babf3ac9235cc80f9b9ca33c (patch) | |
| tree | 9cf1b12f0af8d57d7e8db943eda034c6266e76d5 /svx/source | |
| parent | 0255283974894f5ad9ba92c3a52912657ed4bdf6 (diff) | |
tdf#161724: Revert "tdf#153008 svx: impl crop for stretched bitmap fill"
This reverts commit c30c1d12f283e75fdcc5bb508a79a9d33a431d28.
it even broke the original sample file reported in tdf#153008
See https://bug-attachments.documentfoundation.org/attachment.cgi?id=196248
The original issue was reported in tdf#95165 but it doesn't work
in all cases, making it much worse in some cases where images
become very stretched
Reverting for now, specially towards libreoffice-24-8 and
libreoffice-24-8-1
Change-Id: Ib94d2784d701d37853ce9b17135b36f26a5c084b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172913
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'svx/source')
| -rw-r--r-- | svx/source/customshapes/EnhancedCustomShape2d.cxx | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx index 1a02bd5bd05a..644eee59dad7 100644 --- a/svx/source/customshapes/EnhancedCustomShape2d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx @@ -43,10 +43,6 @@ #include <svx/xbtmpit.hxx> #include <svx/xhatch.hxx> #include <svx/sdshitm.hxx> -#include <svx/xflboxy.hxx> -#include <svx/xflbmsxy.hxx> -#include <svx/sdgcpitm.hxx> -#include <svx/xflbstit.hxx> #include <comphelper/configuration.hxx> #include <com/sun/star/awt/Size.hpp> #include <com/sun/star/drawing/EnhancedCustomShapeParameterType.hpp> @@ -2639,29 +2635,6 @@ void EnhancedCustomShape2d::CreateSubPath( SfxItemSet aTempSet(*this); aTempSet.Put(makeSdrShadowItem(false)); aTempSet.Put(XLineStyleItem(drawing::LineStyle_NONE)); - - // tdf#153008 If it is a stretched bitmap, with crop, - // then set crop data into PosOffset and BmpSize - // so it can be used at createFillGraphicAttribute to crop the image - if (aTempSet.HasItem(SDRATTR_GRAFCROP) - && aTempSet.HasItem(XATTR_FILLBITMAP) - && aTempSet.HasItem(XATTR_FILLBMP_STRETCH) - && aTempSet.Get(XATTR_FILLBMP_STRETCH).GetValue()) - { - const SdrGrafCropItem& rCrop = aTempSet.Get(SDRATTR_GRAFCROP); - const Size& aBmpSize - = aTempSet.Get(XATTR_FILLBITMAP).GetGraphicObject().GetPrefSize(); - - aTempSet.Put(XFillBmpPosOffsetXItem(rCrop.GetLeft() * 100 / aBmpSize.Width())); - aTempSet.Put(XFillBmpPosOffsetYItem(rCrop.GetTop() * 100 / aBmpSize.Height())); - aTempSet.Put( - XFillBmpSizeXItem((aBmpSize.Width() - rCrop.GetLeft() - rCrop.GetRight()) - * pFill->GetGeoRect().GetWidth() / aBmpSize.Width())); - aTempSet.Put( - XFillBmpSizeYItem((aBmpSize.Height() - rCrop.GetTop() - rCrop.GetBottom()) - * pFill->GetGeoRect().GetHeight() / aBmpSize.Height())); - } - pFill->SetMergedItemSet(aTempSet); rObjectList.push_back(std::pair< rtl::Reference<SdrPathObj>, double >(std::move(pFill), dBrightness)); } |