[Libreoffice-commits] core.git: hwpfilter/source
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Thu Jul 1 07:48:34 UTC 2021
hwpfilter/source/hwpfile.cxx | 36 ++++++++++++++++++------------------
1 file changed, 18 insertions(+), 18 deletions(-)
New commits:
commit 8c8f66fe54eba8ccb01759dea2fc006930c00044
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Jun 30 21:12:45 2021 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Jul 1 09:48:01 2021 +0200
fix indent
Change-Id: I8ee2ac371be458b08993f1e197a2f78986e03545
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118201
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/hwpfilter/source/hwpfile.cxx b/hwpfilter/source/hwpfile.cxx
index 6e04d8f67429..3fbaf6c6f2fc 100644
--- a/hwpfilter/source/hwpfile.cxx
+++ b/hwpfilter/source/hwpfile.cxx
@@ -624,36 +624,36 @@ int HWPFile::compareCharShape(CharShape const *shape)
return 0;
}
-int HWPFile::compareParaShape(ParaShape const *shape)
+int HWPFile::compareParaShape(const ParaShape* shape)
{
int count = pslist.size();
- if( count > 0 )
+ if (count > 0)
{
- for(int i = 0; i< count; i++)
+ for (int i = 0; i < count; ++i)
{
ParaShape *pshape = pslist[i].get();
- if( shape->left_margin == pshape->left_margin &&
+ if (shape->left_margin == pshape->left_margin &&
shape->right_margin == pshape->right_margin &&
shape->pspacing_prev == pshape->pspacing_prev &&
shape->pspacing_next == pshape->pspacing_next &&
shape->indent == pshape->indent &&
shape->lspacing == pshape->lspacing &&
shape->arrange_type == pshape->arrange_type &&
- shape->outline == pshape->outline &&
- shape->pagebreak == pshape->pagebreak)
+ shape->outline == pshape->outline &&
+ shape->pagebreak == pshape->pagebreak)
{
- if( shape->cshape && pshape->cshape &&
- shape->cshape->size == pshape->cshape->size &&
- shape->cshape->font[0] == pshape->cshape->font[0] &&
- shape->cshape->ratio[0] == pshape->cshape->ratio[0] &&
- shape->cshape->space[0] == pshape->cshape->space[0] &&
- shape->cshape->color[1] == pshape->cshape->color[1] &&
- shape->cshape->color[0] == pshape->cshape->color[0] &&
- shape->cshape->shade == pshape->cshape->shade &&
- shape->cshape->attr == pshape->cshape->attr )
- {
- return pshape->index;
- }
+ if (shape->cshape && pshape->cshape &&
+ shape->cshape->size == pshape->cshape->size &&
+ shape->cshape->font[0] == pshape->cshape->font[0] &&
+ shape->cshape->ratio[0] == pshape->cshape->ratio[0] &&
+ shape->cshape->space[0] == pshape->cshape->space[0] &&
+ shape->cshape->color[1] == pshape->cshape->color[1] &&
+ shape->cshape->color[0] == pshape->cshape->color[0] &&
+ shape->cshape->shade == pshape->cshape->shade &&
+ shape->cshape->attr == pshape->cshape->attr)
+ {
+ return pshape->index;
+ }
}
}
}
More information about the Libreoffice-commits
mailing list