vcl/inc/sallayout.hxx | 2 +-
vcl/source/gdi/sallayout.cxx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit e01c6f28921ffe2ad6cfe52b17f1b8775ba86d23
Author: Khaled Hosny <khaledho...@eglug.org>
Date: Sun Apr 22 10:55:00 2018 +0200
Rename GlyphItem::IsClusterStart() → IsInCluster()
The flag is called IS_IN_CLUSTER and the only place that uses it checks
for !IsClusterStart(), so invert the condition and rename it
accordingly.
Change-Id: I0feaf27ee671883f111340bcd9ffcb4e3782005f
Reviewed-on: https://gerrit.libreoffice.org/53276
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Khaled Hosny <khaledho...@eglug.org>
diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx
index a430223adc02..0ab317dae03f 100644
--- a/vcl/inc/sallayout.hxx
+++ b/vcl/inc/sallayout.hxx
@@ -290,7 +290,7 @@ public:
IS_DROPPED = 0x040
};
- bool IsClusterStart() const { return ((mnFlags & IS_IN_CLUSTER) == 0);
}
+ bool IsInCluster() const { return ((mnFlags & IS_IN_CLUSTER) != 0);
}
bool IsRTLGlyph() const { return ((mnFlags & IS_RTL_GLYPH) != 0); }
bool IsDiacritic() const { return ((mnFlags & IS_DIACRITIC) != 0); }
bool IsVertical() const { return ((mnFlags & IS_VERTICAL) != 0); }
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index 2d73d55517ea..0eb3c98c61fa 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -867,7 +867,7 @@ void GenericSalLayout::GetCaretPositions( int nMaxIndex,
long* pCaretXArray ) co
int n = aGlyphItem.mnCharPos;
int nCurrIdx = 2 * (n - mnMinCharPos);
// tdf#86399 if this is not the start of a cluster, don't overwrite
the caret bounds of the cluster start
- if (!aGlyphItem.IsClusterStart() && pCaretXArray[nCurrIdx] != -1)
+ if (aGlyphItem.IsInCluster() && pCaretXArray[nCurrIdx] != -1)
continue;
if (!aGlyphItem.IsRTLGlyph() )
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
