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
509907ce
Kaydet (Commit)
509907ce
authored
Kas 24, 2015
tarafından
Tor Lillqvist
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
It's "incomplete", not "in complete"
Change-Id: Ib3960e8facc0104c4d19fc19ea587c138f998a42
üst
295c7827
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
8 deletions
+8
-8
sallayout.hxx
vcl/inc/sallayout.hxx
+2
-2
sallayout.cxx
vcl/source/gdi/sallayout.cxx
+5
-5
font.cxx
vcl/source/outdev/font.cxx
+1
-1
No files found.
vcl/inc/sallayout.hxx
Dosyayı görüntüle @
509907ce
...
@@ -253,7 +253,7 @@ public:
...
@@ -253,7 +253,7 @@ public:
virtual
void
AdjustLayout
(
ImplLayoutArgs
&
)
override
;
virtual
void
AdjustLayout
(
ImplLayoutArgs
&
)
override
;
virtual
void
InitFont
()
const
override
;
virtual
void
InitFont
()
const
override
;
void
SetIn
Complete
(
bool
bInC
omplete
=
true
);
void
SetIn
complete
(
bool
bInc
omplete
=
true
);
protected
:
protected
:
virtual
~
MultiSalLayout
();
virtual
~
MultiSalLayout
();
...
@@ -272,7 +272,7 @@ private:
...
@@ -272,7 +272,7 @@ private:
const
PhysicalFontFace
*
mpFallbackFonts
[
MAX_FALLBACK
];
const
PhysicalFontFace
*
mpFallbackFonts
[
MAX_FALLBACK
];
ImplLayoutRuns
maFallbackRuns
[
MAX_FALLBACK
];
ImplLayoutRuns
maFallbackRuns
[
MAX_FALLBACK
];
int
mnLevel
;
int
mnLevel
;
bool
mbIn
C
omplete
;
bool
mbIn
c
omplete
;
};
};
struct
GlyphItem
struct
GlyphItem
...
...
vcl/source/gdi/sallayout.cxx
Dosyayı görüntüle @
509907ce
...
@@ -1460,7 +1460,7 @@ void GenericSalLayout::SortGlyphItems()
...
@@ -1460,7 +1460,7 @@ void GenericSalLayout::SortGlyphItems()
MultiSalLayout
::
MultiSalLayout
(
SalLayout
&
rBaseLayout
,
const
PhysicalFontFace
*
pBaseFont
)
MultiSalLayout
::
MultiSalLayout
(
SalLayout
&
rBaseLayout
,
const
PhysicalFontFace
*
pBaseFont
)
:
SalLayout
()
:
SalLayout
()
,
mnLevel
(
1
)
,
mnLevel
(
1
)
,
mbIn
C
omplete
(
false
)
,
mbIn
c
omplete
(
false
)
{
{
//maFallbackRuns[0].Clear();
//maFallbackRuns[0].Clear();
mpFallbackFonts
[
0
]
=
pBaseFont
;
mpFallbackFonts
[
0
]
=
pBaseFont
;
...
@@ -1468,9 +1468,9 @@ MultiSalLayout::MultiSalLayout( SalLayout& rBaseLayout, const PhysicalFontFace*
...
@@ -1468,9 +1468,9 @@ MultiSalLayout::MultiSalLayout( SalLayout& rBaseLayout, const PhysicalFontFace*
mnUnitsPerPixel
=
rBaseLayout
.
GetUnitsPerPixel
();
mnUnitsPerPixel
=
rBaseLayout
.
GetUnitsPerPixel
();
}
}
void
MultiSalLayout
::
SetIn
Complete
(
bool
bInC
omplete
)
void
MultiSalLayout
::
SetIn
complete
(
bool
bInc
omplete
)
{
{
mbIn
Complete
=
bInC
omplete
;
mbIn
complete
=
bInc
omplete
;
maFallbackRuns
[
mnLevel
-
1
]
=
ImplLayoutRuns
();
maFallbackRuns
[
mnLevel
-
1
]
=
ImplLayoutRuns
();
}
}
...
@@ -1497,7 +1497,7 @@ bool MultiSalLayout::LayoutText( ImplLayoutArgs& rArgs )
...
@@ -1497,7 +1497,7 @@ bool MultiSalLayout::LayoutText( ImplLayoutArgs& rArgs )
{
{
if
(
mnLevel
<=
1
)
if
(
mnLevel
<=
1
)
return
false
;
return
false
;
if
(
!
mbIn
C
omplete
)
if
(
!
mbIn
c
omplete
)
maFallbackRuns
[
mnLevel
-
1
]
=
rArgs
.
maRuns
;
maFallbackRuns
[
mnLevel
-
1
]
=
rArgs
.
maRuns
;
return
true
;
return
true
;
}
}
...
@@ -1613,7 +1613,7 @@ void MultiSalLayout::AdjustLayout( ImplLayoutArgs& rArgs )
...
@@ -1613,7 +1613,7 @@ void MultiSalLayout::AdjustLayout( ImplLayoutArgs& rArgs )
// remove unused parts of component
// remove unused parts of component
if
(
n
>
0
)
if
(
n
>
0
)
{
{
if
(
mbIn
C
omplete
&&
(
n
==
mnLevel
-
1
))
if
(
mbIn
c
omplete
&&
(
n
==
mnLevel
-
1
))
mpLayouts
[
n
]
->
Simplify
(
true
);
mpLayouts
[
n
]
->
Simplify
(
true
);
else
else
mpLayouts
[
n
]
->
Simplify
(
false
);
mpLayouts
[
n
]
->
Simplify
(
false
);
...
...
vcl/source/outdev/font.cxx
Dosyayı görüntüle @
509907ce
...
@@ -2164,7 +2164,7 @@ SalLayout* OutputDevice::ImplGlyphFallbackLayout( SalLayout* pSalLayout, ImplLay
...
@@ -2164,7 +2164,7 @@ SalLayout* OutputDevice::ImplGlyphFallbackLayout( SalLayout* pSalLayout, ImplLay
pMultiSalLayout
->
AddFallback
(
*
pFallback
,
pMultiSalLayout
->
AddFallback
(
*
pFallback
,
rLayoutArgs
.
maRuns
,
aFontSelData
.
mpFontData
);
rLayoutArgs
.
maRuns
,
aFontSelData
.
mpFontData
);
if
(
nFallbackLevel
==
MAX_FALLBACK
-
1
)
if
(
nFallbackLevel
==
MAX_FALLBACK
-
1
)
pMultiSalLayout
->
SetIn
C
omplete
();
pMultiSalLayout
->
SetIn
c
omplete
();
}
}
mpFontCache
->
Release
(
pFallbackFont
);
mpFontCache
->
Release
(
pFallbackFont
);
...
...
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