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
f76ecc3e
Kaydet (Commit)
f76ecc3e
authored
May 26, 2015
tarafından
Caolán McNamara
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Resolves: tdf#89231 if no font has 0x202F fallback to a normal space
Change-Id: I2325c0b09ccf66ee15597251ad027b295de5502f
üst
85fae98f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
1 deletion
+10
-1
gcach_layout.cxx
vcl/generic/glyphs/gcach_layout.cxx
+6
-0
font.cxx
vcl/source/outdev/font.cxx
+4
-1
No files found.
vcl/generic/glyphs/gcach_layout.cxx
Dosyayı görüntüle @
f76ecc3e
...
@@ -488,6 +488,12 @@ bool HbLayoutEngine::Layout(ServerFontLayout& rLayout, ImplLayoutArgs& rArgs)
...
@@ -488,6 +488,12 @@ bool HbLayoutEngine::Layout(ServerFontLayout& rLayout, ImplLayoutArgs& rArgs)
int32_t
nGlyphIndex
=
pHbGlyphInfos
[
i
].
codepoint
;
int32_t
nGlyphIndex
=
pHbGlyphInfos
[
i
].
codepoint
;
int32_t
nCharPos
=
pHbGlyphInfos
[
i
].
cluster
;
int32_t
nCharPos
=
pHbGlyphInfos
[
i
].
cluster
;
// tdf#89231 if it's just a missing non-breaking space, then use a normal space
if
(
!
nGlyphIndex
&&
(
SalLayoutFlags
::
ForFallback
&
rArgs
.
mnFlags
)
&&
nCharPos
>=
0
&&
rArgs
.
mpStr
[
nCharPos
]
==
0x202F
)
{
nGlyphIndex
=
rFont
.
GetGlyphIndex
(
' '
);
}
// if needed request glyph fallback by updating LayoutArgs
// if needed request glyph fallback by updating LayoutArgs
if
(
!
nGlyphIndex
)
if
(
!
nGlyphIndex
)
{
{
...
...
vcl/source/outdev/font.cxx
Dosyayı görüntüle @
f76ecc3e
...
@@ -2104,7 +2104,10 @@ SalLayout* OutputDevice::ImplGlyphFallbackLayout( SalLayout* pSalLayout, ImplLay
...
@@ -2104,7 +2104,10 @@ SalLayout* OutputDevice::ImplGlyphFallbackLayout( SalLayout* pSalLayout, ImplLay
if
(
nFallbackLevel
<
MAX_FALLBACK
-
1
)
if
(
nFallbackLevel
<
MAX_FALLBACK
-
1
)
{
{
// ignore fallback font if it is the same as the original font
// ignore fallback font if it is the same as the original font
if
(
mpFontEntry
->
maFontSelData
.
mpFontData
==
aFontSelData
.
mpFontData
)
// unless we are looking for a substituion for 0x202F, in which
// case we'll just use a normal space
if
(
mpFontEntry
->
maFontSelData
.
mpFontData
==
aFontSelData
.
mpFontData
&&
aMissingCodes
.
indexOf
(
0x202F
)
==
-
1
)
{
{
mpFontCache
->
Release
(
pFallbackFont
);
mpFontCache
->
Release
(
pFallbackFont
);
continue
;
continue
;
...
...
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