Kaydet (Commit) 6818706a authored tarafından Zheng Fan's avatar Zheng Fan

i122166, refine the icons of numbering and bullets toolbox inside sidebar for consistency

üst f9271166
......@@ -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),
......
......@@ -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();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment