hwpfilter/source/hwpreader.cxx | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
New commits:
commit a89c16d8f37effc1be0898fc268d7b88c0157407
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Mar 17 11:40:19 2022 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Mar 17 17:26:51 2022 +0100
can use a reference instead of a pointer
Change-Id: I3811c9d24e4890022be7c6179148d0eac0e5525c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131703
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx
index 5d364586310a..bfdc72c704a2 100644
--- a/hwpfilter/source/hwpreader.cxx
+++ b/hwpfilter/source/hwpreader.cxx
@@ -3909,13 +3909,13 @@ void HwpReader::makePictureDRAW(HWPDrawingObject
*drawobj, const Picture* hbox)
{
int i;
- ZZParall *pal = &drawobj->property.parall;
+ ZZParall& pal = drawobj->property.parall;
basegfx::B2DPoint pt[3], r_pt[3];
for(i = 0 ; i < 3 ; i++ ){
- pt[i].setX(pal->pt[i].x -
drawobj->property.rot_originx);
+ pt[i].setX(pal.pt[i].x -
drawobj->property.rot_originx);
/* Convert to a physical coordinate */
- pt[i].setY(-(pal->pt[i].y -
drawobj->property.rot_originy));
+ pt[i].setY(-(pal.pt[i].y -
drawobj->property.rot_originy));
}
double skewX;
@@ -3942,20 +3942,20 @@ void HwpReader::makePictureDRAW(HWPDrawingObject
*drawobj, const Picture* hbox)
if( skewX != 0.0 && rotate != 0.0 ){
trans = "skewX (" + OUString::number(skewX)
+ ") rotate (" + OUString::number(rotate)
- + ") translate (" + OUString::number(WTMM(x + a +
drawobj->offset2.x + pal->pt[0].x)) + "mm "
- + OUString::number(WTMM(y + b +
drawobj->offset2.y + pal->pt[0].y)) + "mm)";
+ + ") translate (" + OUString::number(WTMM(x + a +
drawobj->offset2.x + pal.pt[0].x)) + "mm "
+ + OUString::number(WTMM(y + b +
drawobj->offset2.y + pal.pt[0].y)) + "mm)";
bIsRotate = true;
}
else if( skewX != 0.0 ){
trans = "skewX (" + OUString::number(skewX)
- + ") translate (" + OUString::number(WTMM(x + a +
drawobj->offset2.x + pal->pt[0].x)) + "mm "
- + OUString::number(WTMM(y + b +
drawobj->offset2.y + pal->pt[0].y)) + "mm)";
+ + ") translate (" + OUString::number(WTMM(x + a +
drawobj->offset2.x + pal.pt[0].x)) + "mm "
+ + OUString::number(WTMM(y + b +
drawobj->offset2.y + pal.pt[0].y)) + "mm)";
bIsRotate = true;
}
else if( rotate != 0.0 ){
trans = "rotate (" + OUString::number(rotate)
- + ") translate (" + OUString::number(WTMM(x + a +
drawobj->offset2.x + pal->pt[0].x)) + "mm "
- + OUString::number(WTMM(y + b +
drawobj->offset2.y + pal->pt[0].y)) + "mm)";
+ + ") translate (" + OUString::number(WTMM(x + a +
drawobj->offset2.x + pal.pt[0].x)) + "mm "
+ + OUString::number(WTMM(y + b +
drawobj->offset2.y + pal.pt[0].y)) + "mm)";
bIsRotate = true;
}
if( bIsRotate ){
@@ -4129,10 +4129,10 @@ void HwpReader::makePictureDRAW(HWPDrawingObject
*drawobj, const Picture* hbox)
if( drawobj->type == HWPDO_ADVANCED_ARC ){
double start_angle, end_angle;
- ZZParall *pal = &drawobj->property.parall;
+ ZZParall& pal = drawobj->property.parall;
- start_angle = atan2(pal->pt[0].y -
pal->pt[1].y,pal->pt[1].x - pal->pt[0].x );
- end_angle = atan2(pal->pt[2].y - pal->pt[1].y,
pal->pt[1].x - pal->pt[2].x);
+ start_angle = atan2(pal.pt[0].y -
pal.pt[1].y,pal.pt[1].x - pal.pt[0].x );
+ end_angle = atan2(pal.pt[2].y - pal.pt[1].y,
pal.pt[1].x - pal.pt[2].x);
if( ( start_angle > end_angle ) &&
(start_angle - end_angle < M_PI )){
double tmp_angle = start_angle;
