diff options
18 files changed, 74 insertions, 185 deletions
diff --git a/default_images/svx/res/symphony/AlignTextCenter_16x16.png b/default_images/svx/res/symphony/AlignTextCenter_16x16.png Binary files differdeleted file mode 100755 index 441e6773aab9..000000000000 --- a/default_images/svx/res/symphony/AlignTextCenter_16x16.png +++ /dev/null diff --git a/default_images/svx/res/symphony/AlignTextJustified_16x16.png b/default_images/svx/res/symphony/AlignTextJustified_16x16.png Binary files differdeleted file mode 100755 index 1d57b1c4b2ce..000000000000 --- a/default_images/svx/res/symphony/AlignTextJustified_16x16.png +++ /dev/null diff --git a/default_images/svx/res/symphony/AlignTextLeft_16x16.png b/default_images/svx/res/symphony/AlignTextLeft_16x16.png Binary files differdeleted file mode 100755 index a258013a958c..000000000000 --- a/default_images/svx/res/symphony/AlignTextLeft_16x16.png +++ /dev/null diff --git a/default_images/svx/res/symphony/AlignTextRight_16x16.png b/default_images/svx/res/symphony/AlignTextRight_16x16.png Binary files differdeleted file mode 100755 index cbf816b540ce..000000000000 --- a/default_images/svx/res/symphony/AlignTextRight_16x16.png +++ /dev/null diff --git a/default_images/svx/res/symphony/Indent_16x16.png b/default_images/svx/res/symphony/Indent_16x16.png Binary files differdeleted file mode 100755 index 93137374094e..000000000000 --- a/default_images/svx/res/symphony/Indent_16x16.png +++ /dev/null diff --git a/default_images/svx/res/symphony/Outdent_16x16.png b/default_images/svx/res/symphony/Outdent_16x16.png Binary files differdeleted file mode 100755 index 7461944a7083..000000000000 --- a/default_images/svx/res/symphony/Outdent_16x16.png +++ /dev/null diff --git a/default_images/svx/res/symphony/para_vert01.png b/default_images/svx/res/symphony/para_vert01.png Binary files differdeleted file mode 100755 index 275133c3409d..000000000000 --- a/default_images/svx/res/symphony/para_vert01.png +++ /dev/null diff --git a/default_images/svx/res/symphony/para_vert02.png b/default_images/svx/res/symphony/para_vert02.png Binary files differdeleted file mode 100755 index 919edab0d01b..000000000000 --- a/default_images/svx/res/symphony/para_vert02.png +++ /dev/null diff --git a/default_images/svx/res/symphony/para_vert03.png b/default_images/svx/res/symphony/para_vert03.png Binary files differdeleted file mode 100755 index de22c240efdb..000000000000 --- a/default_images/svx/res/symphony/para_vert03.png +++ /dev/null diff --git a/default_images/svx/res/symphony/para_verth01.png b/default_images/svx/res/symphony/para_verth01.png Binary files differdeleted file mode 100755 index 9493fba1c393..000000000000 --- a/default_images/svx/res/symphony/para_verth01.png +++ /dev/null diff --git a/default_images/svx/res/symphony/para_verth02.png b/default_images/svx/res/symphony/para_verth02.png Binary files differdeleted file mode 100755 index 66470c72db77..000000000000 --- a/default_images/svx/res/symphony/para_verth02.png +++ /dev/null diff --git a/default_images/svx/res/symphony/para_verth03.png b/default_images/svx/res/symphony/para_verth03.png Binary files differdeleted file mode 100755 index bf889acb3a31..000000000000 --- a/default_images/svx/res/symphony/para_verth03.png +++ /dev/null diff --git a/default_images/svx/res/symphony/rte_Indent_16x16.png b/default_images/svx/res/symphony/rte_Indent_16x16.png Binary files differdeleted file mode 100755 index 28c90a34a62f..000000000000 --- a/default_images/svx/res/symphony/rte_Indent_16x16.png +++ /dev/null diff --git a/default_images/svx/res/symphony/rte_Outdent_16x16.png b/default_images/svx/res/symphony/rte_Outdent_16x16.png Binary files differdeleted file mode 100755 index ceae7d35d843..000000000000 --- a/default_images/svx/res/symphony/rte_Outdent_16x16.png +++ /dev/null diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx index 9c3d4a3102d4..601cfce0e024 100755 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx @@ -291,21 +291,12 @@ SfxBindings* ParaPropertyPanel::GetBindings() return mpBindings; } -void ParaPropertyPanel::SetupIcons (void) -{ - if (Theme::GetBoolean(Theme::Bool_UseSymphonyIcons)) - { - } - else - { - } -} + + void ParaPropertyPanel::DataChanged (const DataChangedEvent& rEvent) { (void)rEvent; - - SetupIcons(); } ParaPropertyPanel::~ParaPropertyPanel() @@ -394,10 +385,12 @@ void ParaPropertyPanel::EndNumberingPopupMode (void) void ParaPropertyPanel::InitToolBoxAlign() { - maAlignToolBox->SetItemImage(TOOLBOX_ITEM1,maLeftPara); - maAlignToolBox->SetItemImage(TOOLBOX_ITEM2,maCentPara); - maAlignToolBox->SetItemImage(TOOLBOX_ITEM3,maRightPara); - maAlignToolBox->SetItemImage(TOOLBOX_ITEM4,maJusPara); + const bool bIsHighContrastModeActive (Theme::IsHighContrastMode()); + maAlignToolBox->SetItemImage(TOOLBOX_ITEM1, maLeftAlignControl.GetIcon(bIsHighContrastModeActive)); + maAlignToolBox->SetItemImage(TOOLBOX_ITEM2, maCenterAlignControl.GetIcon(bIsHighContrastModeActive)); + maAlignToolBox->SetItemImage(TOOLBOX_ITEM3, maRightAlignControl.GetIcon(bIsHighContrastModeActive)); + maAlignToolBox->SetItemImage(TOOLBOX_ITEM4, maJustifyAlignControl.GetIcon(bIsHighContrastModeActive)); + Link aLink = LINK( this, ParaPropertyPanel, AlignStyleModifyHdl_Impl ); maAlignToolBox->SetSelectHdl( aLink ); Size aTbxSize (maAlignToolBox->CalcWindowSizePixel()); @@ -406,7 +399,10 @@ void ParaPropertyPanel::InitToolBoxAlign() void ParaPropertyPanel::InitToolBoxVertAlign() { - InitImageList(maTBxVertAlign, maVertImageList, maVertImageListH); + const bool bIsHighContrastModeActive (Theme::IsHighContrastMode()); + maTBxVertAlign->SetItemImage(IID_VERT_TOP, maVertTop.GetIcon(bIsHighContrastModeActive)); + maTBxVertAlign->SetItemImage(IID_VERT_CENTER, maVertCenter.GetIcon(bIsHighContrastModeActive)); + maTBxVertAlign->SetItemImage(IID_VERT_BOTTOM, maVertBottom.GetIcon(bIsHighContrastModeActive)); maTBxVertAlign->SetSelectHdl(LINK(this,ParaPropertyPanel,VertTbxSelectHandler)); Size aTbxSize (maTBxVertAlign->CalcWindowSizePixel()); maTBxVertAlign->SetOutputSizePixel( aTbxSize ); @@ -420,15 +416,17 @@ void ParaPropertyPanel::InitToolBoxIndent() maRightIndent->SetModifyHdl( aLink ); maFLineIndent->SetModifyHdl( aLink ); + const bool bIsHighContrastModeActive (Theme::IsHighContrastMode()); + if( Application::GetSettings().GetLayoutRTL()) { - maTbxIndent_IncDec->SetItemImage(TOOLBOX_ITEM1,maIndInc_BD); - maTbxIndent_IncDec->SetItemImage(TOOLBOX_ITEM2,maIndDec_BD); + maTbxIndent_IncDec->SetItemImage(TOOLBOX_ITEM1, maIncIndentControl.GetIcon(bIsHighContrastModeActive)); + maTbxIndent_IncDec->SetItemImage(TOOLBOX_ITEM2, maDecIndentControl.GetIcon(bIsHighContrastModeActive)); } else { - maTbxIndent_IncDec->SetItemImage(TOOLBOX_ITEM1,maIndInc); - maTbxIndent_IncDec->SetItemImage(TOOLBOX_ITEM2,maIndDec); + maTbxIndent_IncDec->SetItemImage(TOOLBOX_ITEM1, maIncIndentControl.GetIcon(bIsHighContrastModeActive)); + maTbxIndent_IncDec->SetItemImage(TOOLBOX_ITEM2, maDecIndentControl.GetIcon(bIsHighContrastModeActive)); } maTbxIndent_IncDec->SetItemImage(TOOLBOX_ITEM3,maIndHang); aLink = LINK( this, ParaPropertyPanel, ClickIndent_IncDec_Hdl_Impl ); @@ -439,13 +437,13 @@ void ParaPropertyPanel::InitToolBoxIndent() if( Application::GetSettings().GetLayoutRTL()) { - maTbxProDemote->SetItemImage(TOOLBOX_ITEM1,maIndInc_BD); - maTbxProDemote->SetItemImage(TOOLBOX_ITEM2,maIndDec_BD); + maTbxProDemote->SetItemImage(TOOLBOX_ITEM1, maOutLineLeftControl.GetIcon(bIsHighContrastModeActive)); + maTbxProDemote->SetItemImage(TOOLBOX_ITEM2, maOutLineRightControl.GetIcon(bIsHighContrastModeActive)); } else { - maTbxProDemote->SetItemImage(TOOLBOX_ITEM1,maIndInc); - maTbxProDemote->SetItemImage(TOOLBOX_ITEM2,maIndDec); + maTbxProDemote->SetItemImage(TOOLBOX_ITEM1, maOutLineLeftControl.GetIcon(bIsHighContrastModeActive)); + maTbxProDemote->SetItemImage(TOOLBOX_ITEM2, maOutLineRightControl.GetIcon(bIsHighContrastModeActive)); } maTbxProDemote->SetItemImage(TOOLBOX_ITEM3,maIndHang); aLink = LINK( this, ParaPropertyPanel, ClickProDemote_Hdl_Impl ); @@ -471,17 +469,9 @@ void ParaPropertyPanel::InitToolBoxBGColor() void ParaPropertyPanel::InitToolBoxBulletsNumbering() { - if( Application::GetSettings().GetLayoutRTL()) - { - maTBxNumBullet->SetItemImage( IID_BULLET, maNumBImageListRTL.GetImage( IID_BULLET ) ); - maTBxNumBullet->SetItemImage( IID_NUMBER, maNumBImageListRTL.GetImage( IID_NUMBER ) ); - } - else - //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); - } + const bool bIsHighContrastModeActive (Theme::IsHighContrastMode()); + maTBxNumBullet->SetItemImage(IID_BULLET, maBulletOnOff.GetIcon(bIsHighContrastModeActive)); + maTBxNumBullet->SetItemImage(IID_NUMBER, maNumberOnOff.GetIcon(bIsHighContrastModeActive)); maTBxNumBullet->SetDropdownClickHdl(LINK(this,ParaPropertyPanel,NumBTbxDDHandler)); maTBxNumBullet->SetSelectHdl(LINK(this,ParaPropertyPanel,NumBTbxSelectHandler)); @@ -494,8 +484,8 @@ void ParaPropertyPanel::InitToolBoxSpacing() maTopDist->SetModifyHdl(aLink); maBottomDist->SetModifyHdl( aLink ); - maTbxUL_IncDec->SetItemImage(TOOLBOX_ITEM1,maParInc); - maTbxUL_IncDec->SetItemImage(TOOLBOX_ITEM2,maParDec); + maTbxUL_IncDec->SetItemImage(TOOLBOX_ITEM1, maParInc); + maTbxUL_IncDec->SetItemImage(TOOLBOX_ITEM2, maParDec); aLink = LINK( this, ParaPropertyPanel, ClickUL_IncDec_Hdl_Impl ); maTbxUL_IncDec->SetSelectHdl(aLink); m_eULSpaceUnit = maULSpaceControl.GetCoreMetric(); @@ -535,7 +525,6 @@ void ParaPropertyPanel::initial() GetBindings()->Invalidate(SID_ATTR_PARA_ADJUST_BLOCK,sal_True,sal_False); //toolbox - SetupIcons(); InitToolBoxAlign(); InitToolBoxVertAlign(); InitToolBoxIndent(); @@ -636,23 +625,23 @@ IMPL_LINK(ParaPropertyPanel, VertTbxSelectHandler, ToolBox*, pToolBox) if (nId == 1) { nSID = SID_TABLE_VERT_NONE; - maTBxVertAlign->SetItemState(1, STATE_CHECK); - maTBxVertAlign->SetItemState(2, STATE_NOCHECK); - maTBxVertAlign->SetItemState(3, STATE_NOCHECK); + maTBxVertAlign->SetItemState(IID_VERT_TOP, STATE_CHECK); + maTBxVertAlign->SetItemState(IID_VERT_CENTER, STATE_NOCHECK); + maTBxVertAlign->SetItemState(IID_VERT_BOTTOM, STATE_NOCHECK); } else if (nId == 2) { nSID = SID_TABLE_VERT_CENTER; - maTBxVertAlign->SetItemState(1, STATE_NOCHECK); - maTBxVertAlign->SetItemState(2, STATE_CHECK); - maTBxVertAlign->SetItemState(3, STATE_NOCHECK); + maTBxVertAlign->SetItemState(IID_VERT_TOP, STATE_NOCHECK); + maTBxVertAlign->SetItemState(IID_VERT_CENTER, STATE_CHECK); + maTBxVertAlign->SetItemState(IID_VERT_BOTTOM, STATE_NOCHECK); } else if (nId == 3) { nSID = SID_TABLE_VERT_BOTTOM; - maTBxVertAlign->SetItemState(1, STATE_NOCHECK); - maTBxVertAlign->SetItemState(2, STATE_NOCHECK); - maTBxVertAlign->SetItemState(3, STATE_CHECK); + maTBxVertAlign->SetItemState(IID_VERT_TOP, STATE_NOCHECK); + maTBxVertAlign->SetItemState(IID_VERT_CENTER, STATE_NOCHECK); + maTBxVertAlign->SetItemState(IID_VERT_BOTTOM, STATE_CHECK); } SfxBoolItem aBoolItem(nSID, sal_True); GetBindings()->GetDispatcher()->Execute(nSID, SFX_CALLMODE_RECORD, &aBoolItem, 0L); @@ -664,18 +653,18 @@ void ParaPropertyPanel::VertStateChanged(sal_uInt16 nSID, SfxItemState eState, c { if (eState < SFX_ITEM_DONTCARE) { - maTBxVertAlign->SetItemState(1, STATE_NOCHECK); - maTBxVertAlign->SetItemState(2, STATE_NOCHECK); - maTBxVertAlign->SetItemState(3, STATE_NOCHECK); - maTBxVertAlign->EnableItem(1, sal_False); - maTBxVertAlign->EnableItem(2, sal_False); - maTBxVertAlign->EnableItem(3, sal_False); + maTBxVertAlign->SetItemState(IID_VERT_TOP, STATE_NOCHECK); + maTBxVertAlign->SetItemState(IID_VERT_CENTER, STATE_NOCHECK); + maTBxVertAlign->SetItemState(IID_VERT_BOTTOM, STATE_NOCHECK); + maTBxVertAlign->EnableItem(IID_VERT_TOP, sal_False); + maTBxVertAlign->EnableItem(IID_VERT_CENTER, sal_False); + maTBxVertAlign->EnableItem(IID_VERT_BOTTOM, sal_False); } else { - maTBxVertAlign->EnableItem(1, sal_True); - maTBxVertAlign->EnableItem(2, sal_True); - maTBxVertAlign->EnableItem(3, sal_True); + maTBxVertAlign->EnableItem(IID_VERT_TOP, sal_True); + maTBxVertAlign->EnableItem(IID_VERT_CENTER, sal_True); + maTBxVertAlign->EnableItem(IID_VERT_BOTTOM, sal_True); if ( (eState >= SFX_ITEM_DEFAULT) && (pState->ISA(SfxBoolItem))) { const SfxBoolItem* pItem= (const SfxBoolItem*)pState; @@ -685,44 +674,44 @@ void ParaPropertyPanel::VertStateChanged(sal_uInt16 nSID, SfxItemState eState, c { if (nSID == SID_TABLE_VERT_NONE) { - maTBxVertAlign->SetItemState(1, STATE_CHECK); - maTBxVertAlign->SetItemState(2, STATE_NOCHECK); - maTBxVertAlign->SetItemState(3, STATE_NOCHECK); + maTBxVertAlign->SetItemState(IID_VERT_TOP, STATE_CHECK); + maTBxVertAlign->SetItemState(IID_VERT_CENTER, STATE_NOCHECK); + maTBxVertAlign->SetItemState(IID_VERT_BOTTOM, STATE_NOCHECK); } else if (nSID == SID_TABLE_VERT_CENTER) { - maTBxVertAlign->SetItemState(1, STATE_NOCHECK); - maTBxVertAlign->SetItemState(2, STATE_CHECK); - maTBxVertAlign->SetItemState(3, STATE_NOCHECK); + maTBxVertAlign->SetItemState(IID_VERT_TOP, STATE_NOCHECK); + maTBxVertAlign->SetItemState(IID_VERT_CENTER, STATE_CHECK); + maTBxVertAlign->SetItemState(IID_VERT_BOTTOM, STATE_NOCHECK); } else if (nSID == SID_TABLE_VERT_BOTTOM) { - maTBxVertAlign->SetItemState(1, STATE_NOCHECK); - maTBxVertAlign->SetItemState(2, STATE_NOCHECK); - maTBxVertAlign->SetItemState(3, STATE_CHECK); + maTBxVertAlign->SetItemState(IID_VERT_TOP, STATE_NOCHECK); + maTBxVertAlign->SetItemState(IID_VERT_CENTER, STATE_NOCHECK); + maTBxVertAlign->SetItemState(IID_VERT_BOTTOM, STATE_CHECK); } } else { if (nSID == SID_TABLE_VERT_NONE) { - maTBxVertAlign->SetItemState(1, STATE_NOCHECK); + maTBxVertAlign->SetItemState(IID_VERT_TOP, STATE_NOCHECK); } else if (nSID == SID_TABLE_VERT_CENTER) { - maTBxVertAlign->SetItemState(2, STATE_NOCHECK); + maTBxVertAlign->SetItemState(IID_VERT_CENTER, STATE_NOCHECK); } else if (nSID == SID_TABLE_VERT_BOTTOM) { - maTBxVertAlign->SetItemState(3, STATE_NOCHECK); + maTBxVertAlign->SetItemState(IID_VERT_BOTTOM, STATE_NOCHECK); } } } else { - maTBxVertAlign->SetItemState(1, STATE_NOCHECK); - maTBxVertAlign->SetItemState(2, STATE_NOCHECK); - maTBxVertAlign->SetItemState(3, STATE_NOCHECK); + maTBxVertAlign->SetItemState(IID_VERT_TOP, STATE_NOCHECK); + maTBxVertAlign->SetItemState(IID_VERT_CENTER, STATE_NOCHECK); + maTBxVertAlign->SetItemState(IID_VERT_BOTTOM, STATE_NOCHECK); } } } @@ -1561,7 +1550,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)), @@ -1600,19 +1589,9 @@ ParaPropertyPanel::ParaPropertyPanel(Window* pParent, maIndent1 (SVX_RES(IMG_INDENT1)), maIndent2 (SVX_RES(IMG_INDENT2)), maIndent3 (SVX_RES(IMG_INDENT3)), - maLeftPara (SVX_RES(IMG_LEFT_PARA)), - maCentPara (SVX_RES(IMG_CENTER_PARA)), - maRightPara (SVX_RES(IMG_RIGHT_PARA)), - maJusPara (SVX_RES(IMG_JUSTIFY_PARA)), - maIndInc (SVX_RES(IMG_INDENT_INC)), - maIndDec (SVX_RES(IMG_INDENT_DEC)), - maIndInc_BD (SVX_RES(IMG_INDENT_INC_BD)), - maIndDec_BD (SVX_RES(IMG_INDENT_DEC_BD)), maIndHang (SVX_RES(IMG_INDENT_HANG)), maParInc (SVX_RES(IMG_PARA_INC)), maParDec (SVX_RES(IMG_PARA_DEC)), - maVertImageList (SVX_RES(IL_VERT_ALIGN)), - maVertImageListH (SVX_RES(IL_VERT_ALIGN)), maNumBImageList (SVX_RES(IL_NUM_BULLET)), maNumBImageListH (SVX_RES(ILH_NUM_BULLET)), maNumBImageListRTL (SVX_RES(IL_NUM_BULLET_RTL)), @@ -1629,28 +1608,24 @@ ParaPropertyPanel::ParaPropertyPanel(Window* pParent, mnNumTypeIndex ((sal_uInt16)0xFFFF), maColor (COL_AUTO), mbColorAvailable (true), - //, m_eMetricUnit (FUNIT_INCH) -//, m_last_eMetricUnit (FUNIT_INCH) m_eLRSpaceUnit(), m_eULSpaceUnit(), - maLeftAlignControl (SID_ATTR_PARA_ADJUST_LEFT, *pBindings,*this), - maCenterAlignControl (SID_ATTR_PARA_ADJUST_CENTER, *pBindings,*this), - maRightAlignControl (SID_ATTR_PARA_ADJUST_RIGHT, *pBindings,*this), - maJustifyAlignControl (SID_ATTR_PARA_ADJUST_BLOCK, *pBindings,*this), + maLeftAlignControl(SID_ATTR_PARA_ADJUST_LEFT, *pBindings, *this, A2S("LeftPara"), rxFrame), + maCenterAlignControl(SID_ATTR_PARA_ADJUST_CENTER, *pBindings, *this, A2S("CenterPara"), rxFrame), + maRightAlignControl(SID_ATTR_PARA_ADJUST_RIGHT, *pBindings, *this, A2S("RightPara"), rxFrame), + maJustifyAlignControl(SID_ATTR_PARA_ADJUST_BLOCK, *pBindings, *this, A2S("JustifyPara"), rxFrame), maLRSpaceControl (SID_ATTR_PARA_LRSPACE,*pBindings,*this), maLNSpaceControl (SID_ATTR_PARA_LINESPACE, *pBindings,*this), maULSpaceControl (SID_ATTR_PARA_ULSPACE, *pBindings,*this), - maOutLineLeftControl (SID_OUTLINE_LEFT, *pBindings,*this), - maOutLineRightControl (SID_OUTLINE_RIGHT, *pBindings,*this), - maDecIndentControl (SID_DEC_INDENT, *pBindings,*this), - maIncIndentControl (SID_INC_INDENT, *pBindings,*this), - maVertTop (SID_TABLE_VERT_NONE, *pBindings,*this), - maVertCenter (SID_TABLE_VERT_CENTER, *pBindings,*this), - maVertBottom (SID_TABLE_VERT_BOTTOM,*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), - //End i122166 + maOutLineLeftControl(SID_OUTLINE_LEFT, *pBindings, *this, A2S("OutlineRight"), rxFrame), + maOutLineRightControl(SID_OUTLINE_RIGHT, *pBindings, *this, A2S("OutlineLeft"), rxFrame), + maDecIndentControl(SID_DEC_INDENT, *pBindings,*this, A2S("DecrementIndent"), rxFrame), + maIncIndentControl(SID_INC_INDENT, *pBindings,*this, A2S("IncrementIndent"), rxFrame), + maVertTop (SID_TABLE_VERT_NONE, *pBindings, *this, A2S("CellVertTop"), rxFrame), + maVertCenter (SID_TABLE_VERT_CENTER, *pBindings,*this, A2S("CellVertCenter"), rxFrame), + maVertBottom (SID_TABLE_VERT_BOTTOM,*pBindings,*this, A2S("CellVertBottom"), rxFrame), + maBulletOnOff(FN_NUM_BULLET_ON, *pBindings, *this, A2S("DefaultBullet"), rxFrame), + maNumberOnOff(FN_NUM_NUMBERING_ON, *pBindings, *this, A2S("DefaultNumbering"), rxFrame), maBackColorControl (SID_BACKGROUND_COLOR, *pBindings,*this), m_aMetricCtl (SID_ATTR_METRIC, *pBindings,*this), maBulletNumRuleIndex (FN_BUL_NUM_RULE_INDEX, *pBindings,*this), diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc b/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc index 4dc776e57e42..c71a5255a2f0 100755 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc @@ -38,12 +38,6 @@ #define MF_AFTER_INDENT 4 #define MF_FL_INDENT 6 #define TBX_HORIZONTALALIGNMENT 5 -#define IMG_LEFT_PARA 7 -#define IMG_CENTER_PARA 8 -#define IMG_RIGHT_PARA 9 -#define IMG_JUSTIFY_PARA 10 -#define IMG_INDENT_INC 11 -#define IMG_INDENT_DEC 12 #define IMG_PARA_INC 13 #define IMG_PARA_DEC 14 #define IMG_INDENT_HANG 15 @@ -67,8 +61,6 @@ #define MF_BELOW_PARASPACING 34 #define TBX_INDENT_PRO_DEMOTE 35 #define TBX_VERT_ALIGN 40 -#define IL_VERT_ALIGN 41 -#define ILH_VERT_ALIGN 42 #define TBX_NUM_BULLET 44 #define IL_NUM_BULLET 45 #define ILH_NUM_BULLET 46 @@ -91,8 +83,6 @@ #define TBI_INDENT_DEC 70 #define TBI_UL_INC 71 #define TBI_UL_DEC 72 -#define IMG_INDENT_INC_BD 73 -#define IMG_INDENT_DEC_BD 74 //for vertical alignment #define IID_VERT_TOP 1 diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx index 9c9d3d755f6c..f808eecee691 100755 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx @@ -146,21 +146,10 @@ private: Image maIndent2; Image maIndent3; - Image maLeftPara; - Image maCentPara; - Image maRightPara; - Image maJusPara; - - Image maIndInc; - Image maIndDec; - Image maIndInc_BD; - Image maIndDec_BD; Image maIndHang; Image maParInc; Image maParDec; - ImageList maVertImageList; - ImageList maVertImageListH; ImageList maNumBImageList; ImageList maNumBImageListH; ImageList maNumBImageListRTL; @@ -216,9 +205,6 @@ 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; @@ -273,7 +259,6 @@ private: DECL_LINK(NumBTbxDDHandler, ToolBox*); DECL_LINK(ToolBoxBackColorDDHandler, ToolBox *); - void SetupIcons (void); void InitToolBoxAlign(); void InitToolBoxVertAlign(); void InitToolBoxIndent(); diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.src b/svx/source/sidebar/paragraph/ParaPropertyPanel.src index 9638924b01ae..71c538ffada6 100755 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.src +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.src @@ -75,40 +75,24 @@ Control RID_SIDEBAR_PARA_PANEL Identifier = BT_SUBSTLEFT ; HelpID = HID_PPROPERTYPANEL_PARA_TBI_HALIGN_LEFT; Text [ en-US ] = "Align Left" ; - ItemBitmap = Bitmap - { - File = "symphony/AlignTextLeft_16x16.png"; - }; }; ToolBoxItem { Identifier = BT_SUBSTCENTER ; HelpID = HID_PPROPERTYPANEL_PARA_TBI_HALIGN_CENTER; Text [ en-US ] = "Align Center" ; - ItemBitmap = Bitmap - { - File = "symphony/AlignTextCenter_16x16.png"; - }; }; ToolBoxItem { Identifier = BT_SUBSTRIGHT ; HelpID = HID_PPROPERTYPANEL_PARA_TBI_HALIGN_RIGHT; Text [ en-US ] = "Align Right" ; - ItemBitmap = Bitmap - { - File = "symphony/AlignTextRight_16x16.png"; - }; }; ToolBoxItem { Identifier = BT_SUBSTJUSTIFY ; HelpID = HID_PPROPERTYPANEL_PARA_TBI_HALIGN_JUSTIFY; Text [ en-US ] = "Align Justified" ; - ItemBitmap = Bitmap - { - File = "symphony/AlignTextJustified_16x16.png"; - }; }; }; }; @@ -445,19 +429,6 @@ Control RID_SIDEBAR_PARA_PANEL Size = MAP_APPFONT( IMAGE_SIZE, IMAGE_SIZE ); }; - ImageList IL_VERT_ALIGN - { - Prefix = "symphony/para_vert"; - MaskColor = STD_MASKCOLOR ; - SVX_PROPERTYPANEL_PARA_VERT_IDLIST - }; - ImageList ILH_VERT_ALIGN - { - Prefix = "symphony/para_verth"; - MaskColor = STD_MASKCOLOR ; - SVX_PROPERTYPANEL_PARA_VERT_IDLIST - }; - ImageList IL_NUM_BULLET { Prefix = "symphony/para_numbullet"; @@ -510,38 +481,6 @@ Control RID_SIDEBAR_PARA_PANEL { ImageBitmap = Bitmap{File = "symphony/Indent4.png";}; }; - Image IMG_LEFT_PARA - { - ImageBitmap = Bitmap{File = "symphony/AlignTextLeft_16x16.png";}; - }; - Image IMG_CENTER_PARA - { - ImageBitmap = Bitmap{File = "symphony/AlignTextCenter_16x16.png";}; - }; - Image IMG_RIGHT_PARA - { - ImageBitmap = Bitmap{File = "symphony/AlignTextRight_16x16.png";}; - }; - Image IMG_JUSTIFY_PARA - { - ImageBitmap = Bitmap{File = "symphony/AlignTextJustified_16x16.png";}; - }; - Image IMG_INDENT_INC - { - ImageBitmap = Bitmap{File = "symphony/Indent_16x16.png";}; - }; - Image IMG_INDENT_DEC - { - ImageBitmap = Bitmap{File = "symphony/Outdent_16x16.png";}; - }; - Image IMG_INDENT_INC_BD - { - ImageBitmap = Bitmap{File = "symphony/rte_Indent_16x16.png";}; - }; - Image IMG_INDENT_DEC_BD - { - ImageBitmap = Bitmap{File = "symphony/rte_Outdent_16x16.png";}; - }; Image IMG_INDENT_HANG { ImageBitmap = Bitmap{File = "symphony/Indent_Hanging.png";}; |
