Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
a8319309
Kaydet (Commit)
a8319309
authored
Şub 04, 2014
tarafından
László Németh
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
fdo#70666 fix Graphite ligature replacement at line breaks
Change-Id: I5b7c149f7f419ba18bd2cc59f4e77a0b61280caa
üst
604a0b72
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
3 deletions
+11
-3
graphite_layout.cxx
vcl/source/glyphs/graphite_layout.cxx
+11
-3
No files found.
vcl/source/glyphs/graphite_layout.cxx
Dosyayı görüntüle @
a8319309
...
@@ -48,6 +48,10 @@
...
@@ -48,6 +48,10 @@
#include <unicode/ubidi.h>
#include <unicode/ubidi.h>
#include <unicode/uscript.h>
#include <unicode/uscript.h>
#include <vcl/unohelp.hxx>
#include <com/sun/star/i18n/XCharacterClassification.hpp>
#include <com/sun/star/i18n/UnicodeType.hpp>
// Graphite Libraries (must be after vcl headers on windows)
// Graphite Libraries (must be after vcl headers on windows)
#include <graphite_static.hxx>
#include <graphite_static.hxx>
#include <graphite2/Segment.h>
#include <graphite2/Segment.h>
...
@@ -590,9 +594,13 @@ gr_segment * GraphiteLayout::CreateSegment(ImplLayoutArgs& rArgs)
...
@@ -590,9 +594,13 @@ gr_segment * GraphiteLayout::CreateSegment(ImplLayoutArgs& rArgs)
nSegCharLimit
-
rArgs
.
mnEndCharPos
,
bRtl
);
nSegCharLimit
-
rArgs
.
mnEndCharPos
,
bRtl
);
}
}
}
}
// int numchars = gr_count_unicode_characters(gr_utf16, rArgs.mpStr + mnSegCharOffset,
// rArgs.mpStr + (rArgs.mnLength > limit + 64 ? limit + 64 : rArgs.mnLength), NULL);
static
com
::
sun
::
star
::
uno
::
Reference
<
com
::
sun
::
star
::
i18n
::
XCharacterClassification
>
xCharClass
;
int
numchars
=
rArgs
.
mnEndCharPos
-
mnSegCharOffset
;
// fdo#52540, fdo#68313, FIXME
if
(
!
xCharClass
.
is
()
)
xCharClass
=
vcl
::
unohelper
::
CreateCharacterClassification
();
int
numchars
=
rArgs
.
mnEndCharPos
-
mnSegCharOffset
;
// fdo#52540, fdo#68313, fdo#70666 avoid bad ligature replacement
if
(
xCharClass
->
getType
(
rArgs
.
mpStr
,
numchars
+
1
)
!=
::
com
::
sun
::
star
::
i18n
::
UnicodeType
::
LOWERCASE_LETTER
)
numchars
+=
64
;
if
(
mpFeatures
)
if
(
mpFeatures
)
pSegment
=
gr_make_seg
(
mpFont
,
mpFace
,
0
,
mpFeatures
->
values
(),
gr_utf16
,
pSegment
=
gr_make_seg
(
mpFont
,
mpFace
,
0
,
mpFeatures
->
values
(),
gr_utf16
,
rArgs
.
mpStr
+
mnSegCharOffset
,
numchars
,
bRtl
);
rArgs
.
mpStr
+
mnSegCharOffset
,
numchars
,
bRtl
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment