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
6818706a
Kaydet (Commit)
6818706a
authored
Nis 26, 2013
tarafından
Zheng Fan
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
i122166, refine the icons of numbering and bullets toolbox inside sidebar for consistency
üst
f9271166
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
4 deletions
+16
-4
ParaPropertyPanel.cxx
svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+11
-4
ParaPropertyPanel.hxx
svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
+5
-0
No files found.
svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
Dosyayı görüntüle @
6818706a
...
...
@@ -477,7 +477,11 @@ void ParaPropertyPanel::InitToolBoxBulletsNumbering()
maTBxNumBullet
->
SetItemImage
(
IID_NUMBER
,
maNumBImageListRTL
.
GetImage
(
IID_NUMBER
)
);
}
else
InitImageList
(
maTBxNumBullet
,
maNumBImageList
,
maNumBImageListH
);
//i122166, the icons for numbering or bullets toolbox inside toolbar and sidebar should be the same one
{
maBulletOnOff
.
SetupToolBoxItem
(
*
maTBxNumBullet
,
IID_BULLET
);
maNumberOnOff
.
SetupToolBoxItem
(
*
maTBxNumBullet
,
IID_NUMBER
);
}
maTBxNumBullet
->
SetDropdownClickHdl
(
LINK
(
this
,
ParaPropertyPanel
,
NumBTbxDDHandler
));
maTBxNumBullet
->
SetSelectHdl
(
LINK
(
this
,
ParaPropertyPanel
,
NumBTbxSelectHandler
));
...
...
@@ -1557,7 +1561,7 @@ PopupControl* ParaPropertyPanel::CreateBGColorPopupControl (PopupContainer* pPar
ParaPropertyPanel
::
ParaPropertyPanel
(
Window
*
pParent
,
const
cssu
::
Reference
<
css
::
frame
::
XFrame
>&
/* rxFrame */
,
const
cssu
::
Reference
<
css
::
frame
::
XFrame
>&
rxFrame
,
SfxBindings
*
pBindings
,
const
cssu
::
Reference
<
css
::
ui
::
XSidebar
>&
rxSidebar
)
:
Control
(
pParent
,
SVX_RES
(
RID_SIDEBAR_PARA_PANEL
)),
...
...
@@ -1643,8 +1647,11 @@ ParaPropertyPanel::ParaPropertyPanel(Window* pParent,
maVertTop
(
SID_TABLE_VERT_NONE
,
*
pBindings
,
*
this
),
maVertCenter
(
SID_TABLE_VERT_CENTER
,
*
pBindings
,
*
this
),
maVertBottom
(
SID_TABLE_VERT_BOTTOM
,
*
pBindings
,
*
this
),
maBulletOnOff
(
FN_NUM_BULLET_ON
,
*
pBindings
,
*
this
),
maNumberOnOff
(
FN_NUM_NUMBERING_ON
,
*
pBindings
,
*
this
),
//i122166, the icons for numbering or bullets toolbox inside toolbar and sidebar should be the same one
maBulletOnOff
(
FN_NUM_BULLET_ON
,
*
pBindings
,
*
this
,
A2S
(
"DefaultBullet"
),
rxFrame
),
maNumberOnOff
(
FN_NUM_NUMBERING_ON
,
*
pBindings
,
*
this
,
A2S
(
"DefaultNumbering"
),
rxFrame
),
mxFrame
(
rxFrame
),
//End i122166
maBackColorControl
(
SID_BACKGROUND_COLOR
,
*
pBindings
,
*
this
),
m_aMetricCtl
(
SID_ATTR_METRIC
,
*
pBindings
,
*
this
),
maBulletNumRuleIndex
(
FN_BUL_NUM_RULE_INDEX
,
*
pBindings
,
*
this
),
...
...
svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
Dosyayı görüntüle @
6818706a
...
...
@@ -216,6 +216,9 @@ private:
::
sfx2
::
sidebar
::
ControllerItem
maBulletNumRuleIndex
;
::
sfx2
::
sidebar
::
ControllerItem
maNumNumRuleIndex
;
//i122166, the icons for numbering or bullets toolbox inside toolbar and sidebar should be the same one
cssu
::
Reference
<
css
::
frame
::
XFrame
>
mxFrame
;
//End of i122166
::
sfx2
::
sidebar
::
EnumContext
maContext
;
SfxBindings
*
mpBindings
;
ParaLineSpacingPopup
maLineSpacePopup
;
...
...
@@ -254,6 +257,8 @@ private:
void
StateChangeIncDecImpl
(
sal_uInt16
nSID
,
SfxItemState
eState
,
const
SfxPoolItem
*
pState
);
// Add toggle state for numbering and bullet icons
void
StateChangeBulletNumImpl
(
sal_uInt16
nSID
,
SfxItemState
eState
,
const
SfxPoolItem
*
pState
);
//Modified for Numbering&Bullets Dialog UX Enh
//Handing the transferred the num rule index data of the current selection
void
StateChangeBulletNumRuleImpl
(
sal_uInt16
nSID
,
SfxItemState
eState
,
const
SfxPoolItem
*
pState
);
void
initial
();
...
...
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