[Libreoffice-commits] core.git: Branch 'feature/sidebar' - icon-themes/galaxy svx/source
Andre Fischer
af at apache.org
Thu May 9 12:35:24 PDT 2013
dev/null |binary
svx/source/sidebar/paragraph/ParaPropertyPanel.cxx | 166 ++++++++-------------
svx/source/sidebar/paragraph/ParaPropertyPanel.hrc | 10 -
svx/source/sidebar/paragraph/ParaPropertyPanel.hxx | 14 -
svx/source/sidebar/paragraph/ParaPropertyPanel.src | 77 ---------
5 files changed, 68 insertions(+), 199 deletions(-)
New commits:
commit e305def61831c3a54783a411ba140616e78fb17c
Author: Andre Fischer <af at apache.org>
Date: Fri Apr 26 11:20:08 2013 +0000
Related: #i122144# Replace more Symphony icons with standard icons
ParaPropertyPanel
(cherry picked from commit 8808ad841fd74a482c8b0f192c1a3a936f12dcfc)
Conflicts:
icon-themes/galaxy/svx/res/symphony/AlignTextCenter_16x16.png
icon-themes/galaxy/svx/res/symphony/AlignTextJustified_16x16.png
icon-themes/galaxy/svx/res/symphony/AlignTextLeft_16x16.png
icon-themes/galaxy/svx/res/symphony/AlignTextRight_16x16.png
icon-themes/galaxy/svx/res/symphony/Indent_16x16.png
icon-themes/galaxy/svx/res/symphony/Outdent_16x16.png
icon-themes/galaxy/svx/res/symphony/para_vert01.png
icon-themes/galaxy/svx/res/symphony/para_vert02.png
icon-themes/galaxy/svx/res/symphony/para_vert03.png
icon-themes/galaxy/svx/res/symphony/para_verth01.png
icon-themes/galaxy/svx/res/symphony/para_verth02.png
icon-themes/galaxy/svx/res/symphony/para_verth03.png
icon-themes/galaxy/svx/res/symphony/rte_Indent_16x16.png
icon-themes/galaxy/svx/res/symphony/rte_Outdent_16x16.png
Change-Id: Idedcbb16b99a0fa7126d4e095e13e4f3a1f3f013
Fix build breaker: declare missing member variable
(cherry picked from commit eb15aa364708f091c4c59a66f9c3f43e35dafd31)
Change-Id: Ie53ff7cea8874048fe575003a0ae4ded25b6535b
Fix build breaker: remove missing images
(cherry picked from commit 2f116e91d1960503589ce10b726a5383dead800f)
Change-Id: I6130c7b55b03b3962ec72f49d48084324dfdc3df
diff --git a/icon-themes/galaxy/svx/res/symphony/AlignTextCenter_16x16.png b/icon-themes/galaxy/svx/res/symphony/AlignTextCenter_16x16.png
deleted file mode 100755
index 441e677..0000000
Binary files a/icon-themes/galaxy/svx/res/symphony/AlignTextCenter_16x16.png and /dev/null differ
diff --git a/icon-themes/galaxy/svx/res/symphony/AlignTextJustified_16x16.png b/icon-themes/galaxy/svx/res/symphony/AlignTextJustified_16x16.png
deleted file mode 100755
index 1d57b1c..0000000
Binary files a/icon-themes/galaxy/svx/res/symphony/AlignTextJustified_16x16.png and /dev/null differ
diff --git a/icon-themes/galaxy/svx/res/symphony/AlignTextLeft_16x16.png b/icon-themes/galaxy/svx/res/symphony/AlignTextLeft_16x16.png
deleted file mode 100755
index a258013..0000000
Binary files a/icon-themes/galaxy/svx/res/symphony/AlignTextLeft_16x16.png and /dev/null differ
diff --git a/icon-themes/galaxy/svx/res/symphony/AlignTextRight_16x16.png b/icon-themes/galaxy/svx/res/symphony/AlignTextRight_16x16.png
deleted file mode 100755
index cbf816b..0000000
Binary files a/icon-themes/galaxy/svx/res/symphony/AlignTextRight_16x16.png and /dev/null differ
diff --git a/icon-themes/galaxy/svx/res/symphony/Indent_16x16.png b/icon-themes/galaxy/svx/res/symphony/Indent_16x16.png
deleted file mode 100755
index 9313737..0000000
Binary files a/icon-themes/galaxy/svx/res/symphony/Indent_16x16.png and /dev/null differ
diff --git a/icon-themes/galaxy/svx/res/symphony/Outdent_16x16.png b/icon-themes/galaxy/svx/res/symphony/Outdent_16x16.png
deleted file mode 100755
index 7461944..0000000
Binary files a/icon-themes/galaxy/svx/res/symphony/Outdent_16x16.png and /dev/null differ
diff --git a/icon-themes/galaxy/svx/res/symphony/para_vert01.png b/icon-themes/galaxy/svx/res/symphony/para_vert01.png
deleted file mode 100755
index 275133c..0000000
Binary files a/icon-themes/galaxy/svx/res/symphony/para_vert01.png and /dev/null differ
diff --git a/icon-themes/galaxy/svx/res/symphony/para_vert02.png b/icon-themes/galaxy/svx/res/symphony/para_vert02.png
deleted file mode 100755
index 919edab..0000000
Binary files a/icon-themes/galaxy/svx/res/symphony/para_vert02.png and /dev/null differ
diff --git a/icon-themes/galaxy/svx/res/symphony/para_vert03.png b/icon-themes/galaxy/svx/res/symphony/para_vert03.png
deleted file mode 100755
index de22c24..0000000
Binary files a/icon-themes/galaxy/svx/res/symphony/para_vert03.png and /dev/null differ
diff --git a/icon-themes/galaxy/svx/res/symphony/para_verth01.png b/icon-themes/galaxy/svx/res/symphony/para_verth01.png
deleted file mode 100755
index 9493fba..0000000
Binary files a/icon-themes/galaxy/svx/res/symphony/para_verth01.png and /dev/null differ
diff --git a/icon-themes/galaxy/svx/res/symphony/para_verth02.png b/icon-themes/galaxy/svx/res/symphony/para_verth02.png
deleted file mode 100755
index 66470c7..0000000
Binary files a/icon-themes/galaxy/svx/res/symphony/para_verth02.png and /dev/null differ
diff --git a/icon-themes/galaxy/svx/res/symphony/para_verth03.png b/icon-themes/galaxy/svx/res/symphony/para_verth03.png
deleted file mode 100755
index bf889ac..0000000
Binary files a/icon-themes/galaxy/svx/res/symphony/para_verth03.png and /dev/null differ
diff --git a/icon-themes/galaxy/svx/res/symphony/rte_Indent_16x16.png b/icon-themes/galaxy/svx/res/symphony/rte_Indent_16x16.png
deleted file mode 100755
index 28c90a3..0000000
Binary files a/icon-themes/galaxy/svx/res/symphony/rte_Indent_16x16.png and /dev/null differ
diff --git a/icon-themes/galaxy/svx/res/symphony/rte_Outdent_16x16.png b/icon-themes/galaxy/svx/res/symphony/rte_Outdent_16x16.png
deleted file mode 100755
index ceae7d3..0000000
Binary files a/icon-themes/galaxy/svx/res/symphony/rte_Outdent_16x16.png and /dev/null differ
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index 62d9640..2dbedb5 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -279,21 +279,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()
@@ -382,10 +373,11 @@ 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);
+ maAlignToolBox->SetItemImage(TOOLBOX_ITEM1, maLeftAlignControl.GetIcon());
+ maAlignToolBox->SetItemImage(TOOLBOX_ITEM2, maCenterAlignControl.GetIcon());
+ maAlignToolBox->SetItemImage(TOOLBOX_ITEM3, maRightAlignControl.GetIcon());
+ maAlignToolBox->SetItemImage(TOOLBOX_ITEM4, maJustifyAlignControl.GetIcon());
+
Link aLink = LINK( this, ParaPropertyPanel, AlignStyleModifyHdl_Impl );
maAlignToolBox->SetSelectHdl( aLink );
Size aTbxSize (maAlignToolBox->CalcWindowSizePixel());
@@ -394,7 +386,9 @@ void ParaPropertyPanel::InitToolBoxAlign()
void ParaPropertyPanel::InitToolBoxVertAlign()
{
- InitImageList(maTBxVertAlign, maVertImageList, maVertImageListH);
+ maTBxVertAlign->SetItemImage(IID_VERT_TOP, maVertTop.GetIcon());
+ maTBxVertAlign->SetItemImage(IID_VERT_CENTER, maVertCenter.GetIcon());
+ maTBxVertAlign->SetItemImage(IID_VERT_BOTTOM, maVertBottom.GetIcon());
maTBxVertAlign->SetSelectHdl(LINK(this,ParaPropertyPanel,VertTbxSelectHandler));
Size aTbxSize (maTBxVertAlign->CalcWindowSizePixel());
maTBxVertAlign->SetOutputSizePixel( aTbxSize );
@@ -410,13 +404,13 @@ void ParaPropertyPanel::InitToolBoxIndent()
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());
+ maTbxIndent_IncDec->SetItemImage(TOOLBOX_ITEM2, maDecIndentControl.GetIcon());
}
else
{
- maTbxIndent_IncDec->SetItemImage(TOOLBOX_ITEM1,maIndInc);
- maTbxIndent_IncDec->SetItemImage(TOOLBOX_ITEM2,maIndDec);
+ maTbxIndent_IncDec->SetItemImage(TOOLBOX_ITEM1, maIncIndentControl.GetIcon());
+ maTbxIndent_IncDec->SetItemImage(TOOLBOX_ITEM2, maDecIndentControl.GetIcon());
}
maTbxIndent_IncDec->SetItemImage(TOOLBOX_ITEM3,maIndHang);
aLink = LINK( this, ParaPropertyPanel, ClickIndent_IncDec_Hdl_Impl );
@@ -427,13 +421,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());
+ maTbxProDemote->SetItemImage(TOOLBOX_ITEM2, maOutLineRightControl.GetIcon());
}
else
{
- maTbxProDemote->SetItemImage(TOOLBOX_ITEM1,maIndInc);
- maTbxProDemote->SetItemImage(TOOLBOX_ITEM2,maIndDec);
+ maTbxProDemote->SetItemImage(TOOLBOX_ITEM1, maOutLineLeftControl.GetIcon());
+ maTbxProDemote->SetItemImage(TOOLBOX_ITEM2, maOutLineRightControl.GetIcon());
}
maTbxProDemote->SetItemImage(TOOLBOX_ITEM3,maIndHang);
aLink = LINK( this, ParaPropertyPanel, ClickProDemote_Hdl_Impl );
@@ -459,17 +453,8 @@ 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);
- }
+ maTBxNumBullet->SetItemImage(IID_BULLET, maBulletOnOff.GetIcon());
+ maTBxNumBullet->SetItemImage(IID_NUMBER, maNumberOnOff.GetIcon());
maTBxNumBullet->SetDropdownClickHdl(LINK(this,ParaPropertyPanel,NumBTbxDDHandler));
maTBxNumBullet->SetSelectHdl(LINK(this,ParaPropertyPanel,NumBTbxSelectHandler));
@@ -482,8 +467,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();
@@ -523,7 +508,6 @@ void ParaPropertyPanel::initial()
GetBindings()->Invalidate(SID_ATTR_PARA_ADJUST_BLOCK,sal_True,sal_False);
//toolbox
- SetupIcons();
InitToolBoxAlign();
InitToolBoxVertAlign();
InitToolBoxIndent();
@@ -624,23 +608,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);
@@ -652,18 +636,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;
@@ -673,44 +657,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);
}
}
}
@@ -1588,19 +1572,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)),
@@ -1617,28 +1591,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 fcbe00b..030d452 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc
@@ -34,12 +34,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
@@ -63,8 +57,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
@@ -87,8 +79,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 267fb8b..e1701e3 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
@@ -142,21 +142,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;
@@ -212,9 +201,7 @@ 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;
@@ -269,7 +256,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 b3c3ada..fd1b261 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.src
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.src
@@ -71,40 +71,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";
- };
};
};
};
@@ -276,20 +260,12 @@ Control RID_SIDEBAR_PARA_PANEL
Identifier = BT_TBX_INDENT_INC ;
HelpID = HID_PPROPERTYPANEL_PARA_TBI_INDENT_INC ;
Text [ en-US ] = "Increase Indent" ;
- ItemBitmap = Bitmap
- {
- File = "symphony/Indent_16x16.png";
- };
};
ToolBoxItem
{
Identifier = BT_TBX_INDENT_DEC ;
HelpID = HID_PPROPERTYPANEL_PARA_TBI_INDENT_DEC ;
Text [ en-US ] = "Decrease Indent" ;
- ItemBitmap = Bitmap
- {
- File = "symphony/Outdent_16x16.png";
- };
};
ToolBoxItem
{
@@ -318,20 +294,12 @@ Control RID_SIDEBAR_PARA_PANEL
Identifier = BT_TBX_INDENT_PROMOTE ;
HelpID = HID_PPROPERTYPANEL_PARA_TBI_INDENTP_INC ;
Text [ en-US ] = "Increase Indent" ;
- ItemBitmap = Bitmap
- {
- File = "symphony/Indent_16x16.png";
- };
};
ToolBoxItem
{
Identifier = BT_TBX_INDENT_DEMOTE ;
HelpID = HID_PPROPERTYPANEL_PARA_TBI_INDENTP_DEC ;
Text [ en-US ] = "Decrease Indent" ;
- ItemBitmap = Bitmap
- {
- File = "symphony/Outdent_16x16.png";
- };
};
ToolBoxItem
{
@@ -441,19 +409,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";
@@ -506,38 +461,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";};
More information about the Libreoffice-commits
mailing list