diff options
| author | Caolán McNamara <caolan.mcnamara@collabora.com> | 2024-08-06 19:53:19 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolan.mcnamara@collabora.com> | 2024-08-06 22:31:35 +0200 |
| commit | 59768e605182dde4aabfd384d38b47b6317022e2 (patch) | |
| tree | eae2d95e994facd79dd8ec02a31ef63b44ec55e6 /sd | |
| parent | fdc9c3d592f8a0d4ad75910f2a23ae77a14c3328 (diff) | |
cid#555593 COPY_INSTEAD_OF_MOVE
and
cid#1555849 COPY_INSTEAD_OF_MOVE
cid#1555936 COPY_INSTEAD_OF_MOVE
cid#1555951 COPY_INSTEAD_OF_MOVE
cid#1555955 COPY_INSTEAD_OF_MOVE
cid#1555960 COPY_INSTEAD_OF_MOVE
cid#1555964 COPY_INSTEAD_OF_MOVE
cid#1555965 COPY_INSTEAD_OF_MOVE
cid#1555975 COPY_INSTEAD_OF_MOVE
cid#1555979 COPY_INSTEAD_OF_MOVE
cid#1555987 COPY_INSTEAD_OF_MOVE
cid#1555990 COPY_INSTEAD_OF_MOVE
cid#1555991 COPY_INSTEAD_OF_MOVE
cid#1556002 COPY_INSTEAD_OF_MOVE
cid#1556008 COPY_INSTEAD_OF_MOVE
cid#1556011 COPY_INSTEAD_OF_MOVE
cid#1556015 COPY_INSTEAD_OF_MOVE
cid#1556017 COPY_INSTEAD_OF_MOVE
cid#1556023 COPY_INSTEAD_OF_MOVE
Change-Id: I8ab99d8e52a1780173a4272c59d408432c29de9f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171572
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/inc/sdgrffilter.hxx | 2 | ||||
| -rw-r--r-- | sd/source/filter/grf/sdgrffilter.cxx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sd/inc/sdgrffilter.hxx b/sd/inc/sdgrffilter.hxx index 28ce9de6dd29..a90934dd6dea 100644 --- a/sd/inc/sdgrffilter.hxx +++ b/sd/inc/sdgrffilter.hxx @@ -34,7 +34,7 @@ public: bool Export() override; static void HandleGraphicFilterError(ErrCode nFilterError, ErrCode nStreamError); - static void InsertSdrGrafObj(Graphic pGraphic, SdPage* pPage); + static void InsertSdrGrafObj(const Graphic& rGraphic, SdPage* pPage); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/filter/grf/sdgrffilter.cxx b/sd/source/filter/grf/sdgrffilter.cxx index c276c28c3ab0..7527b965ed79 100644 --- a/sd/source/filter/grf/sdgrffilter.cxx +++ b/sd/source/filter/grf/sdgrffilter.cxx @@ -181,11 +181,11 @@ bool SdGRFFilter::Import() return bRet; } -void SdGRFFilter::InsertSdrGrafObj(Graphic pGraphic, SdPage* pPage) +void SdGRFFilter::InsertSdrGrafObj(const Graphic& rGraphic, SdPage* pPage) { Point aPos; Size aPagSize(pPage->GetSize()); - Size aGrfSize(OutputDevice::LogicToLogic(pGraphic.GetPrefSize(), pGraphic.GetPrefMapMode(), + Size aGrfSize(OutputDevice::LogicToLogic(rGraphic.GetPrefSize(), rGraphic.GetPrefMapMode(), MapMode(MapUnit::Map100thMM))); aPagSize.AdjustWidth(-(pPage->GetLeftBorder() + pPage->GetRightBorder())); @@ -215,7 +215,7 @@ void SdGRFFilter::InsertSdrGrafObj(Graphic pGraphic, SdPage* pPage) aPos.setX(((aPagSize.Width() - aGrfSize.Width()) >> 1) + pPage->GetLeftBorder()); aPos.setY(((aPagSize.Height() - aGrfSize.Height()) >> 1) + pPage->GetUpperBorder()); - pPage->InsertObject(new SdrGrafObj(pPage->getSdrModelFromSdrPage(), pGraphic, + pPage->InsertObject(new SdrGrafObj(pPage->getSdrModelFromSdrPage(), rGraphic, ::tools::Rectangle(aPos, aGrfSize))); } |