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
0376a4c1
Kaydet (Commit)
0376a4c1
authored
Şub 05, 2013
tarafından
Luboš Luňák
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
if a font is not available, show its name in italic in the font combo
Change-Id: Ia7d0de2c3017f450b9ace31753a351601ca6f1f0
üst
624d4696
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
42 additions
and
2 deletions
+42
-2
tbcontrl.cxx
svx/source/tbxctrls/tbcontrl.cxx
+40
-0
combobox.hxx
vcl/inc/vcl/combobox.hxx
+2
-2
No files found.
svx/source/tbxctrls/tbcontrl.cxx
Dosyayı görüntüle @
0376a4c1
...
...
@@ -191,6 +191,7 @@ private:
void
ReleaseFocus_Impl
();
void
EnableControls_Impl
();
void
CheckAndMarkUnknownFont
(
const
OUString
&
fontname
);
protected
:
virtual
void
Select
();
...
...
@@ -208,6 +209,8 @@ public:
void
Fill
(
const
FontList
*
pList
)
{
FontNameBox
::
Fill
(
pList
);
nFtCount
=
pList
->
GetFontNameCount
();
}
virtual
void
SetText
(
const
OUString
&
rStr
)
SAL_OVERRIDE
;
virtual
void
SetText
(
const
OUString
&
rStr
,
const
Selection
&
rNewSelection
)
SAL_OVERRIDE
;
virtual
long
PreNotify
(
NotifyEvent
&
rNEvt
);
virtual
long
Notify
(
NotifyEvent
&
rNEvt
);
virtual
Reference
<
::
com
::
sun
::
star
::
accessibility
::
XAccessible
>
CreateAccessible
();
...
...
@@ -781,6 +784,43 @@ void SvxFontNameBox_Impl::FillList()
SetSelection
(
aOldSel
);
}
void
SvxFontNameBox_Impl
::
SetText
(
const
OUString
&
rStr
)
{
CheckAndMarkUnknownFont
(
rStr
);
return
FontNameBox
::
SetText
(
rStr
);
}
void
SvxFontNameBox_Impl
::
SetText
(
const
OUString
&
rStr
,
const
Selection
&
rNewSelection
)
{
CheckAndMarkUnknownFont
(
rStr
);
return
FontNameBox
::
SetText
(
rStr
,
rNewSelection
);
}
void
SvxFontNameBox_Impl
::
CheckAndMarkUnknownFont
(
const
OUString
&
fontname
)
{
if
(
fontname
==
GetText
())
return
;
GetDocFontList_Impl
(
&
pFontList
,
this
);
// If the font is unknown, show it in italic.
Font
font
=
GetControlFont
();
if
(
pFontList
!=
NULL
&&
pFontList
->
IsAvailable
(
fontname
))
{
if
(
font
.
GetItalic
()
!=
ITALIC_NONE
)
{
font
.
SetItalic
(
ITALIC_NONE
);
SetControlFont
(
font
);
}
}
else
{
if
(
font
.
GetItalic
()
!=
ITALIC_NORMAL
)
{
font
.
SetItalic
(
ITALIC_NORMAL
);
SetControlFont
(
font
);
}
}
}
// -----------------------------------------------------------------------
void
SvxFontNameBox_Impl
::
Update
(
const
SvxFontItem
*
pFontItem
)
...
...
vcl/inc/vcl/combobox.hxx
Dosyayı görüntüle @
0376a4c1
...
...
@@ -123,8 +123,8 @@ public:
void
EnableDDAutoWidth
(
sal_Bool
b
);
v
oid
SetText
(
const
OUString
&
rStr
);
v
oid
SetText
(
const
OUString
&
rStr
,
const
Selection
&
rNewSelection
);
v
irtual
void
SetText
(
const
OUString
&
rStr
);
v
irtual
void
SetText
(
const
OUString
&
rStr
,
const
Selection
&
rNewSelection
);
sal_uInt16
InsertEntry
(
const
XubString
&
rStr
,
sal_uInt16
nPos
=
COMBOBOX_APPEND
);
sal_uInt16
InsertEntry
(
const
XubString
&
rStr
,
const
Image
&
rImage
,
sal_uInt16
nPos
=
COMBOBOX_APPEND
);
...
...
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