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
b28ba9db
Kaydet (Commit)
b28ba9db
authored
Nis 21, 2015
tarafından
Caolán McNamara
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
draw all entries the same way
Change-Id: I9da3c8dca4db4a02197a67e1fbedd9b525dc7768
üst
e29e3f47
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
23 deletions
+13
-23
tbcontrl.cxx
svx/source/tbxctrls/tbcontrl.cxx
+13
-23
No files found.
svx/source/tbxctrls/tbcontrl.cxx
Dosyayı görüntüle @
b28ba9db
...
...
@@ -582,15 +582,17 @@ void SvxStyleBox_Impl::UserDrawEntry(const UserDrawEvent& rUDEvt, const OUString
void
SvxStyleBox_Impl
::
UserDraw
(
const
UserDrawEvent
&
rUDEvt
)
{
sal_uInt16
nItem
=
rUDEvt
.
GetItemId
();
OUString
aStyleName
(
GetEntry
(
nItem
)
);
if
(
nItem
==
0
||
nItem
==
GetEntryCount
()
-
1
)
OutputDevice
*
pDevice
=
rUDEvt
.
GetDevice
();
pDevice
->
Push
(
PushFlags
::
FILLCOLOR
|
PushFlags
::
FONT
|
PushFlags
::
TEXTCOLOR
);
if
(
nItem
==
0
||
nItem
==
GetEntryCount
()
-
1
)
{
Rectangle
aRect
(
rUDEvt
.
GetRect
());
unsigned
int
nId
=
(
aRect
.
getY
()
/
aRect
.
GetSize
().
Height
());
if
(
nId
<
MAX_STYLES_ENTRIES
&&
m_pButtons
[
nId
])
m_pButtons
[
nId
]
->
Hide
();
// draw the non-style entries, ie. "Clear Formatting" or "More..."
DrawEntry
(
rUDEvt
,
true
,
true
);
}
else
{
...
...
@@ -598,8 +600,6 @@ void SvxStyleBox_Impl::UserDraw( const UserDrawEvent& rUDEvt )
SfxStyleSheetBasePool
*
pPool
=
pShell
->
GetStyleSheetPool
();
SfxStyleSheetBase
*
pStyle
=
NULL
;
OUString
aStyleName
(
GetEntry
(
nItem
)
);
if
(
pPool
)
{
pPool
->
SetSearchMask
(
eStyleFamily
,
SFXSTYLEBIT_ALL
);
...
...
@@ -609,12 +609,7 @@ void SvxStyleBox_Impl::UserDraw( const UserDrawEvent& rUDEvt )
pStyle
=
pPool
->
Next
();
}
if
(
!
pStyle
)
{
// cannot find the style for whatever reason
DrawEntry
(
rUDEvt
,
true
,
true
);
}
else
if
(
pStyle
)
{
const
SfxItemSet
&
aItemSet
=
pStyle
->
GetItemSet
();
...
...
@@ -623,8 +618,6 @@ void SvxStyleBox_Impl::UserDraw( const UserDrawEvent& rUDEvt )
if
(
pFontItem
&&
pFontHeightItem
)
{
OutputDevice
*
pDevice
=
rUDEvt
.
GetDevice
();
Size
aFontSize
(
0
,
pFontHeightItem
->
GetHeight
()
);
Size
aPixelSize
(
pDevice
->
LogicToPixel
(
aFontSize
,
pShell
->
GetMapUnit
()
)
);
...
...
@@ -676,7 +669,6 @@ void SvxStyleBox_Impl::UserDraw( const UserDrawEvent& rUDEvt )
// setup the device & draw
vcl
::
Font
aOldFont
(
pDevice
->
GetFont
()
);
pDevice
->
Push
(
PushFlags
::
FILLCOLOR
|
PushFlags
::
FONT
|
PushFlags
::
TEXTCOLOR
);
Color
aFontCol
=
COL_AUTO
,
aBackCol
=
COL_AUTO
;
...
...
@@ -748,18 +740,16 @@ void SvxStyleBox_Impl::UserDraw( const UserDrawEvent& rUDEvt )
m_pButtons
[
nId
]
->
Show
();
}
}
UserDrawEntry
(
rUDEvt
,
aStyleName
);
pDevice
->
Pop
();
// draw separator, if present
DrawEntry
(
rUDEvt
,
false
,
false
);
}
else
DrawEntry
(
rUDEvt
,
true
,
true
);
}
}
UserDrawEntry
(
rUDEvt
,
aStyleName
);
pDevice
->
Pop
();
// draw separator, if present
DrawEntry
(
rUDEvt
,
false
,
false
);
}
// test is the color between Font- and background-color to be identify
...
...
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