Skip to content

C
core
Kaydet (Commit) 3106ed12 authored tarafından Andre Fischer's avatar Andre Fischer Kaydeden (comit) Caolán McNamara
Dosyalara gözat
Seçenekler

Resolves: #i122455# Change tab order of paragraph panel. Cleanup 

(cherry picked from commit 2a7381f6)

Conflicts:
	svx/source/sidebar/paragraph/ParaPropertyPanel.cxx

Change-Id: Ibcb11980989b9821929e5261765a3973bbbefd9a
üst 7c486ba2
Hide whitespace changes
Inline Side-by-side
Showing with 375 additions and 380 deletions
svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
Dosyayı görüntüle @ 3106ed12
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
#include <sfx2/sidebar/Tools.hxx> #include <sfx2/sidebar/Tools.hxx>
#include <svx/sidebar/PopupContainer.hxx> #include <svx/sidebar/PopupContainer.hxx>
#include <sfx2/dispatch.hxx> #include <sfx2/dispatch.hxx>
//#include <sfx2/imagemgr.hxx>
#include <editeng/colritem.hxx> #include <editeng/colritem.hxx>
#include <editeng/brushitem.hxx> #include <editeng/brushitem.hxx>
#include <editeng/lrspitem.hxx> #include <editeng/lrspitem.hxx>
...@@ -133,119 +132,119 @@ void ParaPropertyPanel::HandleContextChange ( ...@@ -133,119 +132,119 @@ void ParaPropertyPanel::HandleContextChange (
switch (maContext.GetCombinedContext_DI()) switch (maContext.GetCombinedContext_DI())
{ {
case CombinedEnumContext(Application_Calc, Context_DrawText): case CombinedEnumContext(Application_Calc, Context_DrawText):
maTBxVertAlign->Show(); mpTBxVertAlign->Show();
maTBxVertAlignBackground->Show(); mpTBxVertAlignBackground->Show();
maTBxBackColor->Hide(); mpTBxBackColor->Hide();
maTBxBackColorBackground->Hide(); mpTBxBackColorBackground->Hide();
maTBxNumBullet->Hide(); mpTBxNumBullet->Hide();
maTBxNumBulletBackground->Hide(); mpTBxNumBulletBackground->Hide();
ReSize(false); ReSize(false);
maTbxIndent_IncDec->Show(); mpTbxIndent_IncDec->Show();
maTbxIndent_IncDecBackground->Show(); mpTbxIndent_IncDecBackground->Show();
maTbxProDemote->Hide(); mpTbxProDemote->Hide();
maTbxProDemoteBackground->Hide(); mpTbxProDemoteBackground->Hide();
break; break;
case CombinedEnumContext(Application_DrawImpress, Context_Draw): case CombinedEnumContext(Application_DrawImpress, Context_Draw):
case CombinedEnumContext(Application_DrawImpress, Context_TextObject): case CombinedEnumContext(Application_DrawImpress, Context_TextObject):
case CombinedEnumContext(Application_DrawImpress, Context_Graphic): case CombinedEnumContext(Application_DrawImpress, Context_Graphic):
maTBxVertAlign->Hide(); mpTBxVertAlign->Hide();
maTBxVertAlignBackground->Hide(); mpTBxVertAlignBackground->Hide();
maTBxBackColor->Hide(); mpTBxBackColor->Hide();
maTBxBackColorBackground->Hide(); mpTBxBackColorBackground->Hide();
maTBxNumBullet->Show(); mpTBxNumBullet->Show();
maTBxNumBulletBackground->Show(); mpTBxNumBulletBackground->Show();
ReSize(true); ReSize(true);
maTbxIndent_IncDec->Hide(); mpTbxIndent_IncDec->Hide();
maTbxIndent_IncDecBackground->Hide(); mpTbxIndent_IncDecBackground->Hide();
maTbxProDemote->Show(); mpTbxProDemote->Show();
maTbxProDemoteBackground->Show(); mpTbxProDemoteBackground->Show();
break; break;
case CombinedEnumContext(Application_DrawImpress, Context_DrawText): case CombinedEnumContext(Application_DrawImpress, Context_DrawText):
maTBxVertAlign->Show(); mpTBxVertAlign->Show();
maTBxVertAlignBackground->Show(); mpTBxVertAlignBackground->Show();
maTBxBackColor->Hide(); mpTBxBackColor->Hide();
maTBxBackColorBackground->Hide(); mpTBxBackColorBackground->Hide();
maTBxNumBullet->Show(); mpTBxNumBullet->Show();
maTBxNumBulletBackground->Show(); mpTBxNumBulletBackground->Show();
ReSize(true); ReSize(true);
maTbxIndent_IncDec->Hide(); mpTbxIndent_IncDec->Hide();
maTbxIndent_IncDecBackground->Hide(); mpTbxIndent_IncDecBackground->Hide();
maTbxProDemote->Show(); mpTbxProDemote->Show();
maTbxProDemoteBackground->Show(); mpTbxProDemoteBackground->Show();
break; break;
case CombinedEnumContext(Application_DrawImpress, Context_Table): case CombinedEnumContext(Application_DrawImpress, Context_Table):
maTBxVertAlign->Show(); mpTBxVertAlign->Show();
maTBxVertAlignBackground->Show(); mpTBxVertAlignBackground->Show();
maTBxBackColor->Hide(); mpTBxBackColor->Hide();
maTBxBackColorBackground->Hide(); mpTBxBackColorBackground->Hide();
maTBxNumBullet->Show(); mpTBxNumBullet->Show();
maTBxNumBulletBackground->Show(); mpTBxNumBulletBackground->Show();
ReSize(true); ReSize(true);
maTbxIndent_IncDec->Hide(); mpTbxIndent_IncDec->Hide();
maTbxIndent_IncDecBackground->Hide(); mpTbxIndent_IncDecBackground->Hide();
maTbxProDemote->Show(); mpTbxProDemote->Show();
maTbxProDemoteBackground->Show(); mpTbxProDemoteBackground->Show();
break; break;
case CombinedEnumContext(Application_WriterVariants, Context_Default): case CombinedEnumContext(Application_WriterVariants, Context_Default):
case CombinedEnumContext(Application_WriterVariants, Context_Text): case CombinedEnumContext(Application_WriterVariants, Context_Text):
maTBxVertAlign->Hide(); mpTBxVertAlign->Hide();
maTBxVertAlignBackground->Hide(); mpTBxVertAlignBackground->Hide();
maTBxBackColor->Show(); mpTBxBackColor->Show();
maTBxBackColorBackground->Show(); mpTBxBackColorBackground->Show();
maTBxNumBullet->Show(); mpTBxNumBullet->Show();
maTBxNumBulletBackground->Show(); mpTBxNumBulletBackground->Show();
ReSize(true); ReSize(true);
maTbxIndent_IncDec->Show(); mpTbxIndent_IncDec->Show();
maTbxIndent_IncDecBackground->Show(); mpTbxIndent_IncDecBackground->Show();
maTbxProDemote->Hide(); mpTbxProDemote->Hide();
maTbxProDemoteBackground->Hide(); mpTbxProDemoteBackground->Hide();
break; break;
case CombinedEnumContext(Application_WriterVariants, Context_Table): case CombinedEnumContext(Application_WriterVariants, Context_Table):
maTBxVertAlign->Show(); mpTBxVertAlign->Show();
maTBxVertAlignBackground->Show(); mpTBxVertAlignBackground->Show();
maTBxBackColor->Show(); mpTBxBackColor->Show();
maTBxBackColorBackground->Show(); mpTBxBackColorBackground->Show();
maTBxNumBullet->Show(); mpTBxNumBullet->Show();
maTBxNumBulletBackground->Show(); mpTBxNumBulletBackground->Show();
ReSize(true); ReSize(true);
maTbxIndent_IncDec->Show(); mpTbxIndent_IncDec->Show();
maTbxIndent_IncDecBackground->Show(); mpTbxIndent_IncDecBackground->Show();
maTbxProDemote->Hide(); mpTbxProDemote->Hide();
maTbxProDemoteBackground->Hide(); mpTbxProDemoteBackground->Hide();
break; break;
case CombinedEnumContext(Application_WriterVariants, Context_DrawText): case CombinedEnumContext(Application_WriterVariants, Context_DrawText):
maTBxVertAlign->Show(); mpTBxVertAlign->Show();
maTBxVertAlignBackground->Show(); mpTBxVertAlignBackground->Show();
maTBxBackColor->Hide(); mpTBxBackColor->Hide();
maTBxBackColorBackground->Hide(); mpTBxBackColorBackground->Hide();
maTBxNumBullet->Hide(); mpTBxNumBullet->Hide();
maTBxNumBulletBackground->Hide(); mpTBxNumBulletBackground->Hide();
ReSize(false); ReSize(false);
maTbxIndent_IncDec->Show(); mpTbxIndent_IncDec->Show();
maTbxIndent_IncDecBackground->Show(); mpTbxIndent_IncDecBackground->Show();
maTbxProDemote->Hide(); mpTbxProDemote->Hide();
maTbxProDemoteBackground->Hide(); mpTbxProDemoteBackground->Hide();
break; break;
case CombinedEnumContext(Application_WriterVariants, Context_Annotation): case CombinedEnumContext(Application_WriterVariants, Context_Annotation):
maTBxVertAlign->Hide(); mpTBxVertAlign->Hide();
maTBxVertAlignBackground->Hide(); mpTBxVertAlignBackground->Hide();
maTBxBackColor->Hide(); mpTBxBackColor->Hide();
maTBxBackColorBackground->Hide(); mpTBxBackColorBackground->Hide();
maTBxNumBullet->Hide(); mpTBxNumBullet->Hide();
maTBxNumBulletBackground->Hide(); mpTBxNumBulletBackground->Hide();
ReSize(false); ReSize(false);
maTbxIndent_IncDec->Show(); mpTbxIndent_IncDec->Show();
maTbxIndent_IncDecBackground->Show(); mpTbxIndent_IncDecBackground->Show();
maTbxProDemote->Hide(); mpTbxProDemote->Hide();
maTbxProDemoteBackground->Hide(); mpTbxProDemoteBackground->Hide();
break; break;
case CombinedEnumContext(Application_Calc, Context_EditCell): case CombinedEnumContext(Application_Calc, Context_EditCell):
...@@ -294,19 +293,19 @@ void ParaPropertyPanel::ReSize(bool bSize) ...@@ -294,19 +293,19 @@ void ParaPropertyPanel::ReSize(bool bSize)
if(bSize) if(bSize)
{ {
//Paragraph spacing //Paragraph spacing
maFTUL->SetPosPixel(POS_FT_PARA_SPACE); mpFTUL->SetPosPixel(POS_FT_PARA_SPACE);
maTbxUL_IncDec->SetPosPixel(POS_TBX_PARA_SPACE_INC_DEC); mpTbxUL_IncDec->SetPosPixel(POS_TBX_PARA_SPACE_INC_DEC);
maTopDist->SetPosPixel(POS_MBX_TOP_DIST); mpTopDist->SetPosPixel(POS_MBX_TOP_DIST);
maBottomDist->SetPosPixel(POS_MBX_BOT_DIST); mpBottomDist->SetPosPixel(POS_MBX_BOT_DIST);
//Indent //Indent
maFTIndent->SetPosPixel(POS_FT_PARA_INDENT); mpFTIndent->SetPosPixel(POS_FT_PARA_INDENT);
maTbxIndent_IncDec->SetPosPixel(POS_TBX_PARA_INDENT_INC_DEC); mpTbxIndent_IncDec->SetPosPixel(POS_TBX_PARA_INDENT_INC_DEC);
maTbxProDemote->SetPosPixel(POS_TBX_PARA_INDENT_INC_DEC); mpTbxProDemote->SetPosPixel(POS_TBX_PARA_INDENT_INC_DEC);
maLeftIndent->SetPosPixel(POS_MBX_LEFT_DIST); mpLeftIndent->SetPosPixel(POS_MBX_LEFT_DIST);
maRightIndent->SetPosPixel(POS_MBX_RIGHT_DIST); mpRightIndent->SetPosPixel(POS_MBX_RIGHT_DIST);
maFLineIndent->SetPosPixel(POS_MBX_FLINE_DIST); mpFLineIndent->SetPosPixel(POS_MBX_FLINE_DIST);
//Line spacing //Line spacing
maLineSPTbx->SetPosPixel(TBX_LINE_SPACE); mpLineSPTbx->SetPosPixel(TBX_LINE_SPACE);
//image //image
maFISpace1.SetPosPixel(POS_IMG_SPACE1); maFISpace1.SetPosPixel(POS_IMG_SPACE1);
maFISpace2.SetPosPixel(POS_IMG_SPACE2); maFISpace2.SetPosPixel(POS_IMG_SPACE2);
...@@ -321,19 +320,19 @@ void ParaPropertyPanel::ReSize(bool bSize) ...@@ -321,19 +320,19 @@ void ParaPropertyPanel::ReSize(bool bSize)
else else
{ {
//Paragraph spacing //Paragraph spacing
maFTUL->SetPosPixel(POS_FT_PARA_SPACE2); mpFTUL->SetPosPixel(POS_FT_PARA_SPACE2);
maTbxUL_IncDec->SetPosPixel(POS_TBX_PARA_SPACE_INC_DEC2); mpTbxUL_IncDec->SetPosPixel(POS_TBX_PARA_SPACE_INC_DEC2);
maTopDist->SetPosPixel(POS_MBX_TOP_DIST2); mpTopDist->SetPosPixel(POS_MBX_TOP_DIST2);
maBottomDist->SetPosPixel(POS_MBX_BOT_DIST2); mpBottomDist->SetPosPixel(POS_MBX_BOT_DIST2);
//Indent //Indent
maFTIndent->SetPosPixel(POS_FT_PARA_INDENT2); mpFTIndent->SetPosPixel(POS_FT_PARA_INDENT2);
maTbxIndent_IncDec->SetPosPixel(POS_TBX_PARA_INDENT_INC_DEC2); mpTbxIndent_IncDec->SetPosPixel(POS_TBX_PARA_INDENT_INC_DEC2);
maTbxProDemote->SetPosPixel(POS_TBX_PARA_INDENT_INC_DEC2); mpTbxProDemote->SetPosPixel(POS_TBX_PARA_INDENT_INC_DEC2);
maLeftIndent->SetPosPixel(POS_MBX_LEFT_DIST2); mpLeftIndent->SetPosPixel(POS_MBX_LEFT_DIST2);
maRightIndent->SetPosPixel(POS_MBX_RIGHT_DIST2); mpRightIndent->SetPosPixel(POS_MBX_RIGHT_DIST2);
maFLineIndent->SetPosPixel(POS_MBX_FLINE_DIST2); mpFLineIndent->SetPosPixel(POS_MBX_FLINE_DIST2);
//Line spacing //Line spacing
maLineSPTbx->SetPosPixel(TBX_LINE_SPACE2); mpLineSPTbx->SetPosPixel(TBX_LINE_SPACE2);
//image //image
maFISpace1.SetPosPixel(POS_IMG_SPACE12); maFISpace1.SetPosPixel(POS_IMG_SPACE12);
maFISpace2.SetPosPixel(POS_IMG_SPACE22); maFISpace2.SetPosPixel(POS_IMG_SPACE22);
...@@ -370,140 +369,140 @@ void ParaPropertyPanel::EndNumberingPopupMode (void) ...@@ -370,140 +369,140 @@ void ParaPropertyPanel::EndNumberingPopupMode (void)
void ParaPropertyPanel::InitToolBoxAlign() void ParaPropertyPanel::InitToolBoxAlign()
{ {
maAlignToolBox->SetItemImage(TOOLBOX_ITEM1, maLeftAlignControl.GetIcon()); mpAlignToolBox->SetItemImage(TOOLBOX_ITEM1, maLeftAlignControl.GetIcon());
maAlignToolBox->SetItemImage(TOOLBOX_ITEM2, maCenterAlignControl.GetIcon()); mpAlignToolBox->SetItemImage(TOOLBOX_ITEM2, maCenterAlignControl.GetIcon());
maAlignToolBox->SetItemImage(TOOLBOX_ITEM3, maRightAlignControl.GetIcon()); mpAlignToolBox->SetItemImage(TOOLBOX_ITEM3, maRightAlignControl.GetIcon());
maAlignToolBox->SetItemImage(TOOLBOX_ITEM4, maJustifyAlignControl.GetIcon()); mpAlignToolBox->SetItemImage(TOOLBOX_ITEM4, maJustifyAlignControl.GetIcon());
Link aLink = LINK( this, ParaPropertyPanel, AlignStyleModifyHdl_Impl ); Link aLink = LINK( this, ParaPropertyPanel, AlignStyleModifyHdl_Impl );
maAlignToolBox->SetSelectHdl( aLink ); mpAlignToolBox->SetSelectHdl( aLink );
Size aTbxSize (maAlignToolBox->CalcWindowSizePixel()); Size aTbxSize (mpAlignToolBox->CalcWindowSizePixel());
maAlignToolBox->SetOutputSizePixel( aTbxSize ); mpAlignToolBox->SetOutputSizePixel( aTbxSize );
} }
void ParaPropertyPanel::InitToolBoxVertAlign() void ParaPropertyPanel::InitToolBoxVertAlign()
{ {
maTBxVertAlign->SetItemImage(IID_VERT_TOP, maVertTop.GetIcon()); mpTBxVertAlign->SetItemImage(IID_VERT_TOP, maVertTop.GetIcon());
maTBxVertAlign->SetItemImage(IID_VERT_CENTER, maVertCenter.GetIcon()); mpTBxVertAlign->SetItemImage(IID_VERT_CENTER, maVertCenter.GetIcon());
maTBxVertAlign->SetItemImage(IID_VERT_BOTTOM, maVertBottom.GetIcon()); mpTBxVertAlign->SetItemImage(IID_VERT_BOTTOM, maVertBottom.GetIcon());
maTBxVertAlign->SetSelectHdl(LINK(this,ParaPropertyPanel,VertTbxSelectHandler)); mpTBxVertAlign->SetSelectHdl(LINK(this,ParaPropertyPanel,VertTbxSelectHandler));
Size aTbxSize (maTBxVertAlign->CalcWindowSizePixel()); Size aTbxSize (mpTBxVertAlign->CalcWindowSizePixel());
maTBxVertAlign->SetOutputSizePixel( aTbxSize ); mpTBxVertAlign->SetOutputSizePixel( aTbxSize );
} }
void ParaPropertyPanel::InitToolBoxIndent() void ParaPropertyPanel::InitToolBoxIndent()
{ {
Link aLink = LINK( this, ParaPropertyPanel, ModifyIndentHdl_Impl ); Link aLink = LINK( this, ParaPropertyPanel, ModifyIndentHdl_Impl );
maLeftIndent->SetModifyHdl( aLink ); mpLeftIndent->SetModifyHdl( aLink );
maRightIndent->SetModifyHdl( aLink ); mpRightIndent->SetModifyHdl( aLink );
maFLineIndent->SetModifyHdl( aLink ); mpFLineIndent->SetModifyHdl( aLink );
maLeftIndent->SetAccessibleName(maLeftIndent->GetQuickHelpText()); mpLeftIndent->SetAccessibleName(mpLeftIndent->GetQuickHelpText());
maRightIndent->SetAccessibleName(maRightIndent->GetQuickHelpText()); mpRightIndent->SetAccessibleName(mpRightIndent->GetQuickHelpText());
maFLineIndent->SetAccessibleName(maFLineIndent->GetQuickHelpText()); mpFLineIndent->SetAccessibleName(mpFLineIndent->GetQuickHelpText());
if( Application::GetSettings().GetLayoutRTL()) if( Application::GetSettings().GetLayoutRTL())
{ {
maTbxIndent_IncDec->SetItemImage(TOOLBOX_ITEM1, maIncIndentControl.GetIcon()); mpTbxIndent_IncDec->SetItemImage(TOOLBOX_ITEM1, maIncIndentControl.GetIcon());
maTbxIndent_IncDec->SetItemImage(TOOLBOX_ITEM2, maDecIndentControl.GetIcon()); mpTbxIndent_IncDec->SetItemImage(TOOLBOX_ITEM2, maDecIndentControl.GetIcon());
} }
else else
{ {
maTbxIndent_IncDec->SetItemImage(TOOLBOX_ITEM1, maIncIndentControl.GetIcon()); mpTbxIndent_IncDec->SetItemImage(TOOLBOX_ITEM1, maIncIndentControl.GetIcon());
maTbxIndent_IncDec->SetItemImage(TOOLBOX_ITEM2, maDecIndentControl.GetIcon()); mpTbxIndent_IncDec->SetItemImage(TOOLBOX_ITEM2, maDecIndentControl.GetIcon());
} }
maTbxIndent_IncDec->SetItemImage(TOOLBOX_ITEM3,maIndHang); mpTbxIndent_IncDec->SetItemImage(TOOLBOX_ITEM3,maIndHang);
aLink = LINK( this, ParaPropertyPanel, ClickIndent_IncDec_Hdl_Impl ); aLink = LINK( this, ParaPropertyPanel, ClickIndent_IncDec_Hdl_Impl );
maTbxIndent_IncDec->SetSelectHdl(aLink); mpTbxIndent_IncDec->SetSelectHdl(aLink);
m_eLRSpaceUnit = maLRSpaceControl.GetCoreMetric(); m_eLRSpaceUnit = maLRSpaceControl.GetCoreMetric();
Size aTbxSize = maTbxIndent_IncDec->CalcWindowSizePixel(); Size aTbxSize = mpTbxIndent_IncDec->CalcWindowSizePixel();
maTbxIndent_IncDec->SetOutputSizePixel( aTbxSize ); mpTbxIndent_IncDec->SetOutputSizePixel( aTbxSize );
if( Application::GetSettings().GetLayoutRTL()) if( Application::GetSettings().GetLayoutRTL())
{ {
maTbxProDemote->SetItemImage(TOOLBOX_ITEM1, maOutLineLeftControl.GetIcon()); mpTbxProDemote->SetItemImage(TOOLBOX_ITEM1, maOutLineLeftControl.GetIcon());
maTbxProDemote->SetItemImage(TOOLBOX_ITEM2, maOutLineRightControl.GetIcon()); mpTbxProDemote->SetItemImage(TOOLBOX_ITEM2, maOutLineRightControl.GetIcon());
} }
else else
{ {
maTbxProDemote->SetItemImage(TOOLBOX_ITEM1, maOutLineLeftControl.GetIcon()); mpTbxProDemote->SetItemImage(TOOLBOX_ITEM1, maOutLineLeftControl.GetIcon());
maTbxProDemote->SetItemImage(TOOLBOX_ITEM2, maOutLineRightControl.GetIcon()); mpTbxProDemote->SetItemImage(TOOLBOX_ITEM2, maOutLineRightControl.GetIcon());
} }
maTbxProDemote->SetItemImage(TOOLBOX_ITEM3,maIndHang); mpTbxProDemote->SetItemImage(TOOLBOX_ITEM3,maIndHang);
aLink = LINK( this, ParaPropertyPanel, ClickProDemote_Hdl_Impl ); aLink = LINK( this, ParaPropertyPanel, ClickProDemote_Hdl_Impl );
maTbxProDemote->SetSelectHdl(aLink); mpTbxProDemote->SetSelectHdl(aLink);
m_eLRSpaceUnit = maLRSpaceControl.GetCoreMetric(); m_eLRSpaceUnit = maLRSpaceControl.GetCoreMetric();
aTbxSize = maTbxProDemote->CalcWindowSizePixel(); aTbxSize = mpTbxProDemote->CalcWindowSizePixel();
maTbxProDemote->SetOutputSizePixel( aTbxSize ); mpTbxProDemote->SetOutputSizePixel( aTbxSize );
} }
void ParaPropertyPanel::InitToolBoxBGColor() void ParaPropertyPanel::InitToolBoxBGColor()
{ {
mpColorUpdater.reset(new ::svx::ToolboxButtonColorUpdater(SID_BACKGROUND_COLOR, TBI_BACK_COLOR, maTBxBackColor.get(), TBX_UPDATER_MODE_CHAR_COLOR_NEW )); mpColorUpdater.reset(new ::svx::ToolboxButtonColorUpdater(SID_BACKGROUND_COLOR, TBI_BACK_COLOR, mpTBxBackColor.get(), TBX_UPDATER_MODE_CHAR_COLOR_NEW ));
maTBxBackColor->SetItemImage(TBI_BACK_COLOR, GetDisplayBackground().GetColor().IsDark()? maImgBackColorHigh : maImgBackColor); mpTBxBackColor->SetItemImage(TBI_BACK_COLOR, GetDisplayBackground().GetColor().IsDark()? maImgBackColorHigh : maImgBackColor);
maTBxBackColor->SetItemBits( TBI_BACK_COLOR, maTBxBackColor->GetItemBits( TBI_BACK_COLOR ) | TIB_DROPDOWNONLY ); mpTBxBackColor->SetItemBits( TBI_BACK_COLOR, mpTBxBackColor->GetItemBits( TBI_BACK_COLOR ) | TIB_DROPDOWNONLY );
Link aLink = LINK(this, ParaPropertyPanel, ToolBoxBackColorDDHandler); Link aLink = LINK(this, ParaPropertyPanel, ToolBoxBackColorDDHandler);
maTBxBackColor->SetDropdownClickHdl ( aLink ); mpTBxBackColor->SetDropdownClickHdl ( aLink );
maTBxBackColor->SetSelectHdl ( aLink ); mpTBxBackColor->SetSelectHdl ( aLink );
Size aTbxSize (maTBxBackColor->CalcWindowSizePixel()); Size aTbxSize (mpTBxBackColor->CalcWindowSizePixel());
maTBxBackColor->SetOutputSizePixel( aTbxSize ); mpTBxBackColor->SetOutputSizePixel( aTbxSize );
} }
void ParaPropertyPanel::InitToolBoxBulletsNumbering() void ParaPropertyPanel::InitToolBoxBulletsNumbering()
{ {
maTBxNumBullet->SetItemImage(IID_BULLET, maBulletOnOff.GetIcon()); mpTBxNumBullet->SetItemImage(IID_BULLET, maBulletOnOff.GetIcon());
maTBxNumBullet->SetItemImage(IID_NUMBER, maNumberOnOff.GetIcon()); mpTBxNumBullet->SetItemImage(IID_NUMBER, maNumberOnOff.GetIcon());
maTBxNumBullet->SetDropdownClickHdl(LINK(this,ParaPropertyPanel,NumBTbxDDHandler)); mpTBxNumBullet->SetDropdownClickHdl(LINK(this,ParaPropertyPanel,NumBTbxDDHandler));
maTBxNumBullet->SetSelectHdl(LINK(this,ParaPropertyPanel,NumBTbxSelectHandler)); mpTBxNumBullet->SetSelectHdl(LINK(this,ParaPropertyPanel,NumBTbxSelectHandler));
Size aTbxSize (maTBxNumBullet->CalcWindowSizePixel()); Size aTbxSize (mpTBxNumBullet->CalcWindowSizePixel());
maTBxNumBullet->SetOutputSizePixel( aTbxSize ); mpTBxNumBullet->SetOutputSizePixel( aTbxSize );
} }
void ParaPropertyPanel::InitToolBoxSpacing() void ParaPropertyPanel::InitToolBoxSpacing()
{ {
Link aLink = LINK( this, ParaPropertyPanel, ULSpaceHdl_Impl ); Link aLink = LINK( this, ParaPropertyPanel, ULSpaceHdl_Impl );
maTopDist->SetModifyHdl(aLink); mpTopDist->SetModifyHdl(aLink);
maBottomDist->SetModifyHdl( aLink ); mpBottomDist->SetModifyHdl( aLink );
maTopDist->SetAccessibleName(maTopDist->GetQuickHelpText()); mpTopDist->SetAccessibleName(mpTopDist->GetQuickHelpText());
maBottomDist->SetAccessibleName(maBottomDist->GetQuickHelpText()); mpBottomDist->SetAccessibleName(mpBottomDist->GetQuickHelpText());
// Use a form of image loading that can handle both .uno:<command> // Use a form of image loading that can handle both .uno:<command>
// and private:graphirepository... syntax. This is necessary to // and private:graphirepository... syntax. This is necessary to
// handle the workaround for accessing the images of commands // handle the workaround for accessing the images of commands
// ParaspaceIncrease and ParaspaceDecrease. // ParaspaceIncrease and ParaspaceDecrease.
// See issue 122446 for more details. // See issue 122446 for more details.
maTbxUL_IncDec->SetItemImage( mpTbxUL_IncDec->SetItemImage(
BT_TBX_UL_INC, BT_TBX_UL_INC,
sfx2::sidebar::Tools::GetImage(maTbxUL_IncDec->GetItemCommand(BT_TBX_UL_INC), mxFrame)); sfx2::sidebar::Tools::GetImage(mpTbxUL_IncDec->GetItemCommand(BT_TBX_UL_INC), mxFrame));
maTbxUL_IncDec->SetItemImage( mpTbxUL_IncDec->SetItemImage(
BT_TBX_UL_DEC, BT_TBX_UL_DEC,
sfx2::sidebar::Tools::GetImage(maTbxUL_IncDec->GetItemCommand(BT_TBX_UL_DEC), mxFrame)); sfx2::sidebar::Tools::GetImage(mpTbxUL_IncDec->GetItemCommand(BT_TBX_UL_DEC), mxFrame));
aLink = LINK( this, ParaPropertyPanel, ClickUL_IncDec_Hdl_Impl ); aLink = LINK( this, ParaPropertyPanel, ClickUL_IncDec_Hdl_Impl );
maTbxUL_IncDec->SetSelectHdl(aLink); mpTbxUL_IncDec->SetSelectHdl(aLink);
m_eULSpaceUnit = maULSpaceControl.GetCoreMetric(); m_eULSpaceUnit = maULSpaceControl.GetCoreMetric();
Size aTbxSize = maTbxUL_IncDec->CalcWindowSizePixel(); Size aTbxSize = mpTbxUL_IncDec->CalcWindowSizePixel();
maTbxUL_IncDec->SetOutputSizePixel( aTbxSize ); mpTbxUL_IncDec->SetOutputSizePixel( aTbxSize );
} }
void ParaPropertyPanel::InitToolBoxLineSpacing() void ParaPropertyPanel::InitToolBoxLineSpacing()
{ {
Link aLink = LINK( this, ParaPropertyPanel, ClickLineSPDropDownHdl_Impl ); Link aLink = LINK( this, ParaPropertyPanel, ClickLineSPDropDownHdl_Impl );
maLineSPTbx->SetDropdownClickHdl( aLink ); mpLineSPTbx->SetDropdownClickHdl( aLink );
maLineSPTbx->SetSelectHdl( aLink ); //support keyinput "ENTER" mpLineSPTbx->SetSelectHdl( aLink ); //support keyinput "ENTER"
maLineSPTbx->SetItemBits( TOOLBOX_ITEM1, maLineSPTbx->GetItemBits( TOOLBOX_ITEM1 ) | TIB_DROPDOWNONLY ); mpLineSPTbx->SetItemBits( TOOLBOX_ITEM1, mpLineSPTbx->GetItemBits( TOOLBOX_ITEM1 ) | TIB_DROPDOWNONLY );
maLineSPTbx->SetItemImage(TOOLBOX_ITEM1,maSpace3); mpLineSPTbx->SetItemImage(TOOLBOX_ITEM1,maSpace3);
Size aTbxSize = maLineSPTbx->CalcWindowSizePixel(); Size aTbxSize = mpLineSPTbx->CalcWindowSizePixel();
maLineSPTbx->SetOutputSizePixel( aTbxSize ); mpLineSPTbx->SetOutputSizePixel( aTbxSize );
} }
void ParaPropertyPanel::initial() void ParaPropertyPanel::initial()
{ {
maFTUL->SetBackground(Wallpaper()); mpFTUL->SetBackground(Wallpaper());
maFTIndent->SetBackground(Wallpaper()); mpFTIndent->SetBackground(Wallpaper());
maFISpace1.SetBackground(Wallpaper()); maFISpace1.SetBackground(Wallpaper());
maFISpace2.SetBackground(Wallpaper()); maFISpace2.SetBackground(Wallpaper());
maFIndent1.SetBackground(Wallpaper()); maFIndent1.SetBackground(Wallpaper());
...@@ -531,21 +530,21 @@ void ParaPropertyPanel::initial() ...@@ -531,21 +530,21 @@ void ParaPropertyPanel::initial()
InitToolBoxLineSpacing(); InitToolBoxLineSpacing();
#ifdef HAS_IA2 #ifdef HAS_IA2
maAlignToolBox->SetAccRelationLabeledBy(&maAlignToolBox); mpAlignToolBox->SetAccRelationLabeledBy(&mpAlignToolBox);
maTBxVertAlign->SetMpSubEditAccLableBy(&maTBxVertAlign); mpTBxVertAlign->SetMpSubEditAccLableBy(&mpTBxVertAlign);
maTBxNumBullet->SetAccRelationLabeledBy(&maTBxNumBullet); mpTBxNumBullet->SetAccRelationLabeledBy(&mpTBxNumBullet);
maTBxBackColor->SetMpSubEditAccLableBy(&maTBxBackColor); mpTBxBackColor->SetMpSubEditAccLableBy(&mpTBxBackColor);
maFTUL->SetAccRelationLabeledBy(&maFTUL); mpFTUL->SetAccRelationLabeledBy(&mpFTUL);
maTbxUL_IncDec->SetAccRelationLabeledBy(&maTbxUL_IncDec); mpTbxUL_IncDec->SetAccRelationLabeledBy(&mpTbxUL_IncDec);
maTopDist->SetAccRelationLabeledBy(&maTopDist); mpTopDist->SetAccRelationLabeledBy(&mpTopDist);
maBottomDist->SetAccRelationLabeledBy(&maBottomDist); mpBottomDist->SetAccRelationLabeledBy(&mpBottomDist);
maLineSPTbx->SetAccRelationLabeledBy(&maLineSPTbx); mpLineSPTbx->SetAccRelationLabeledBy(&mpLineSPTbx);
maFTIndent->SetAccRelationLabeledBy(&maFTIndent); mpFTIndent->SetAccRelationLabeledBy(&mpFTIndent);
maTbxIndent_IncDec->SetAccRelationLabeledBy(&maTbxIndent_IncDec); mpTbxIndent_IncDec->SetAccRelationLabeledBy(&mpTbxIndent_IncDec);
maTbxProDemote->SetAccRelationLabeledBy(&maTbxProDemote); mpTbxProDemote->SetAccRelationLabeledBy(&mpTbxProDemote);
maLeftIndent->SetAccRelationLabeledBy(&maLeftIndent); mpLeftIndent->SetAccRelationLabeledBy(&mpLeftIndent);
maRightIndent->SetAccRelationLabeledBy(&maRightIndent); mpRightIndent->SetAccRelationLabeledBy(&mpRightIndent);
maFLineIndent->SetAccRelationLabeledBy(&maFLineIndent); mpFLineIndent->SetAccRelationLabeledBy(&mpFLineIndent);
mpColorUpdater->SetAccRelationLabeledBy(&mpColorUpdater); mpColorUpdater->SetAccRelationLabeledBy(&mpColorUpdater);
#endif #endif
} }
...@@ -622,23 +621,23 @@ IMPL_LINK(ParaPropertyPanel, VertTbxSelectHandler, ToolBox*, pToolBox) ...@@ -622,23 +621,23 @@ IMPL_LINK(ParaPropertyPanel, VertTbxSelectHandler, ToolBox*, pToolBox)
if (nId == 1) if (nId == 1)
{ {
nSID = SID_TABLE_VERT_NONE; nSID = SID_TABLE_VERT_NONE;
maTBxVertAlign->SetItemState(IID_VERT_TOP, STATE_CHECK); mpTBxVertAlign->SetItemState(IID_VERT_TOP, STATE_CHECK);
maTBxVertAlign->SetItemState(IID_VERT_CENTER, STATE_NOCHECK); mpTBxVertAlign->SetItemState(IID_VERT_CENTER, STATE_NOCHECK);
maTBxVertAlign->SetItemState(IID_VERT_BOTTOM, STATE_NOCHECK); mpTBxVertAlign->SetItemState(IID_VERT_BOTTOM, STATE_NOCHECK);
} }
else if (nId == 2) else if (nId == 2)
{ {
nSID = SID_TABLE_VERT_CENTER; nSID = SID_TABLE_VERT_CENTER;
maTBxVertAlign->SetItemState(IID_VERT_TOP, STATE_NOCHECK); mpTBxVertAlign->SetItemState(IID_VERT_TOP, STATE_NOCHECK);
maTBxVertAlign->SetItemState(IID_VERT_CENTER, STATE_CHECK); mpTBxVertAlign->SetItemState(IID_VERT_CENTER, STATE_CHECK);
maTBxVertAlign->SetItemState(IID_VERT_BOTTOM, STATE_NOCHECK); mpTBxVertAlign->SetItemState(IID_VERT_BOTTOM, STATE_NOCHECK);
} }
else if (nId == 3) else if (nId == 3)
{ {
nSID = SID_TABLE_VERT_BOTTOM; nSID = SID_TABLE_VERT_BOTTOM;
maTBxVertAlign->SetItemState(IID_VERT_TOP, STATE_NOCHECK); mpTBxVertAlign->SetItemState(IID_VERT_TOP, STATE_NOCHECK);
maTBxVertAlign->SetItemState(IID_VERT_CENTER, STATE_NOCHECK); mpTBxVertAlign->SetItemState(IID_VERT_CENTER, STATE_NOCHECK);
maTBxVertAlign->SetItemState(IID_VERT_BOTTOM, STATE_CHECK); mpTBxVertAlign->SetItemState(IID_VERT_BOTTOM, STATE_CHECK);
} }
SfxBoolItem aBoolItem(nSID, sal_True); SfxBoolItem aBoolItem(nSID, sal_True);
GetBindings()->GetDispatcher()->Execute(nSID, SFX_CALLMODE_RECORD, &aBoolItem, 0L); GetBindings()->GetDispatcher()->Execute(nSID, SFX_CALLMODE_RECORD, &aBoolItem, 0L);
...@@ -650,18 +649,18 @@ void ParaPropertyPanel::VertStateChanged(sal_uInt16 nSID, SfxItemState eState, c ...@@ -650,18 +649,18 @@ void ParaPropertyPanel::VertStateChanged(sal_uInt16 nSID, SfxItemState eState, c
{ {
if (eState < SFX_ITEM_DONTCARE) if (eState < SFX_ITEM_DONTCARE)
{ {
maTBxVertAlign->SetItemState(IID_VERT_TOP, STATE_NOCHECK); mpTBxVertAlign->SetItemState(IID_VERT_TOP, STATE_NOCHECK);
maTBxVertAlign->SetItemState(IID_VERT_CENTER, STATE_NOCHECK); mpTBxVertAlign->SetItemState(IID_VERT_CENTER, STATE_NOCHECK);
maTBxVertAlign->SetItemState(IID_VERT_BOTTOM, STATE_NOCHECK); mpTBxVertAlign->SetItemState(IID_VERT_BOTTOM, STATE_NOCHECK);
maTBxVertAlign->EnableItem(IID_VERT_TOP, sal_False); mpTBxVertAlign->EnableItem(IID_VERT_TOP, sal_False);
maTBxVertAlign->EnableItem(IID_VERT_CENTER, sal_False); mpTBxVertAlign->EnableItem(IID_VERT_CENTER, sal_False);
maTBxVertAlign->EnableItem(IID_VERT_BOTTOM, sal_False); mpTBxVertAlign->EnableItem(IID_VERT_BOTTOM, sal_False);
} }
else else
{ {
maTBxVertAlign->EnableItem(IID_VERT_TOP, sal_True); mpTBxVertAlign->EnableItem(IID_VERT_TOP, sal_True);
maTBxVertAlign->EnableItem(IID_VERT_CENTER, sal_True); mpTBxVertAlign->EnableItem(IID_VERT_CENTER, sal_True);
maTBxVertAlign->EnableItem(IID_VERT_BOTTOM, sal_True); mpTBxVertAlign->EnableItem(IID_VERT_BOTTOM, sal_True);
if ( (eState >= SFX_ITEM_DEFAULT) && (pState->ISA(SfxBoolItem))) if ( (eState >= SFX_ITEM_DEFAULT) && (pState->ISA(SfxBoolItem)))
{ {
const SfxBoolItem* pItem= (const SfxBoolItem*)pState; const SfxBoolItem* pItem= (const SfxBoolItem*)pState;
...@@ -671,44 +670,44 @@ void ParaPropertyPanel::VertStateChanged(sal_uInt16 nSID, SfxItemState eState, c ...@@ -671,44 +670,44 @@ void ParaPropertyPanel::VertStateChanged(sal_uInt16 nSID, SfxItemState eState, c
{ {
if (nSID == SID_TABLE_VERT_NONE) if (nSID == SID_TABLE_VERT_NONE)
{ {
maTBxVertAlign->SetItemState(IID_VERT_TOP, STATE_CHECK); mpTBxVertAlign->SetItemState(IID_VERT_TOP, STATE_CHECK);
maTBxVertAlign->SetItemState(IID_VERT_CENTER, STATE_NOCHECK); mpTBxVertAlign->SetItemState(IID_VERT_CENTER, STATE_NOCHECK);
maTBxVertAlign->SetItemState(IID_VERT_BOTTOM, STATE_NOCHECK); mpTBxVertAlign->SetItemState(IID_VERT_BOTTOM, STATE_NOCHECK);
} }
else if (nSID == SID_TABLE_VERT_CENTER) else if (nSID == SID_TABLE_VERT_CENTER)
{ {
maTBxVertAlign->SetItemState(IID_VERT_TOP, STATE_NOCHECK); mpTBxVertAlign->SetItemState(IID_VERT_TOP, STATE_NOCHECK);
maTBxVertAlign->SetItemState(IID_VERT_CENTER, STATE_CHECK); mpTBxVertAlign->SetItemState(IID_VERT_CENTER, STATE_CHECK);
maTBxVertAlign->SetItemState(IID_VERT_BOTTOM, STATE_NOCHECK); mpTBxVertAlign->SetItemState(IID_VERT_BOTTOM, STATE_NOCHECK);
} }
else if (nSID == SID_TABLE_VERT_BOTTOM) else if (nSID == SID_TABLE_VERT_BOTTOM)
{ {
maTBxVertAlign->SetItemState(IID_VERT_TOP, STATE_NOCHECK); mpTBxVertAlign->SetItemState(IID_VERT_TOP, STATE_NOCHECK);
maTBxVertAlign->SetItemState(IID_VERT_CENTER, STATE_NOCHECK); mpTBxVertAlign->SetItemState(IID_VERT_CENTER, STATE_NOCHECK);
maTBxVertAlign->SetItemState(IID_VERT_BOTTOM, STATE_CHECK); mpTBxVertAlign->SetItemState(IID_VERT_BOTTOM, STATE_CHECK);
} }
} }
else else
{ {
if (nSID == SID_TABLE_VERT_NONE) if (nSID == SID_TABLE_VERT_NONE)
{ {
maTBxVertAlign->SetItemState(IID_VERT_TOP, STATE_NOCHECK); mpTBxVertAlign->SetItemState(IID_VERT_TOP, STATE_NOCHECK);
} }
else if (nSID == SID_TABLE_VERT_CENTER) else if (nSID == SID_TABLE_VERT_CENTER)
{ {
maTBxVertAlign->SetItemState(IID_VERT_CENTER, STATE_NOCHECK); mpTBxVertAlign->SetItemState(IID_VERT_CENTER, STATE_NOCHECK);
} }
else if (nSID == SID_TABLE_VERT_BOTTOM) else if (nSID == SID_TABLE_VERT_BOTTOM)
{ {
maTBxVertAlign->SetItemState(IID_VERT_BOTTOM, STATE_NOCHECK); mpTBxVertAlign->SetItemState(IID_VERT_BOTTOM, STATE_NOCHECK);
} }
} }
} }
else else
{ {
maTBxVertAlign->SetItemState(IID_VERT_TOP, STATE_NOCHECK); mpTBxVertAlign->SetItemState(IID_VERT_TOP, STATE_NOCHECK);
maTBxVertAlign->SetItemState(IID_VERT_CENTER, STATE_NOCHECK); mpTBxVertAlign->SetItemState(IID_VERT_CENTER, STATE_NOCHECK);
maTBxVertAlign->SetItemState(IID_VERT_BOTTOM, STATE_NOCHECK); mpTBxVertAlign->SetItemState(IID_VERT_BOTTOM, STATE_NOCHECK);
} }
} }
} }
...@@ -821,9 +820,9 @@ IMPL_LINK( ParaPropertyPanel, AlignStyleModifyHdl_Impl, ToolBox*, pBox ) ...@@ -821,9 +820,9 @@ IMPL_LINK( ParaPropertyPanel, AlignStyleModifyHdl_Impl, ToolBox*, pBox )
IMPL_LINK_NOARG( ParaPropertyPanel, ModifyIndentHdl_Impl) IMPL_LINK_NOARG( ParaPropertyPanel, ModifyIndentHdl_Impl)
{ {
SvxLRSpaceItem aMargin( SID_ATTR_PARA_LRSPACE ); SvxLRSpaceItem aMargin( SID_ATTR_PARA_LRSPACE );
aMargin.SetTxtLeft( (const long)GetCoreValue( *maLeftIndent.get(), m_eLRSpaceUnit ) ); aMargin.SetTxtLeft( (const long)GetCoreValue( *mpLeftIndent.get(), m_eLRSpaceUnit ) );
aMargin.SetRight( (const long)GetCoreValue( *maRightIndent.get(), m_eLRSpaceUnit ) ); aMargin.SetRight( (const long)GetCoreValue( *mpRightIndent.get(), m_eLRSpaceUnit ) );
aMargin.SetTxtFirstLineOfst( (const short)GetCoreValue( *maFLineIndent.get(), m_eLRSpaceUnit ) ); aMargin.SetTxtFirstLineOfst( (const short)GetCoreValue( *mpFLineIndent.get(), m_eLRSpaceUnit ) );
GetBindings()->GetDispatcher()->Execute( GetBindings()->GetDispatcher()->Execute(
SID_ATTR_PARA_LRSPACE, SFX_CALLMODE_RECORD, &aMargin, 0L); SID_ATTR_PARA_LRSPACE, SFX_CALLMODE_RECORD, &aMargin, 0L);
...@@ -855,8 +854,8 @@ IMPL_LINK(ParaPropertyPanel, ClickIndent_IncDec_Hdl_Impl, ToolBox *, pControl) ...@@ -855,8 +854,8 @@ IMPL_LINK(ParaPropertyPanel, ClickIndent_IncDec_Hdl_Impl, ToolBox *, pControl)
sal_Int64 nVal = OutputDevice::LogicToLogic( maTxtLeft, (MapUnit)(SFX_MAPUNIT_TWIP), MAP_100TH_MM ); sal_Int64 nVal = OutputDevice::LogicToLogic( maTxtLeft, (MapUnit)(SFX_MAPUNIT_TWIP), MAP_100TH_MM );
nVal = OutputDevice::LogicToLogic( (long)nVal, MAP_100TH_MM, (MapUnit)m_eLRSpaceUnit ); nVal = OutputDevice::LogicToLogic( (long)nVal, MAP_100TH_MM, (MapUnit)m_eLRSpaceUnit );
aMargin.SetTxtLeft( (const long)nVal ); aMargin.SetTxtLeft( (const long)nVal );
aMargin.SetRight( (const long)GetCoreValue( *maRightIndent.get(), m_eLRSpaceUnit ) ); aMargin.SetRight( (const long)GetCoreValue( *mpRightIndent.get(), m_eLRSpaceUnit ) );
aMargin.SetTxtFirstLineOfst( (const short)GetCoreValue( *maFLineIndent.get(), m_eLRSpaceUnit ) ); aMargin.SetTxtFirstLineOfst( (const short)GetCoreValue( *mpFLineIndent.get(), m_eLRSpaceUnit ) );
GetBindings()->GetDispatcher()->Execute( GetBindings()->GetDispatcher()->Execute(
SID_ATTR_PARA_LRSPACE, SFX_CALLMODE_RECORD, &aMargin, 0L); SID_ATTR_PARA_LRSPACE, SFX_CALLMODE_RECORD, &aMargin, 0L);
...@@ -890,8 +889,8 @@ IMPL_LINK(ParaPropertyPanel, ClickIndent_IncDec_Hdl_Impl, ToolBox *, pControl) ...@@ -890,8 +889,8 @@ IMPL_LINK(ParaPropertyPanel, ClickIndent_IncDec_Hdl_Impl, ToolBox *, pControl)
nVal = OutputDevice::LogicToLogic( (long)nVal, MAP_100TH_MM, (MapUnit)m_eLRSpaceUnit ); nVal = OutputDevice::LogicToLogic( (long)nVal, MAP_100TH_MM, (MapUnit)m_eLRSpaceUnit );
aMargin.SetTxtLeft( (const long)nVal ); aMargin.SetTxtLeft( (const long)nVal );
aMargin.SetRight( (const long)GetCoreValue( *maRightIndent.get(), m_eLRSpaceUnit ) ); aMargin.SetRight( (const long)GetCoreValue( *mpRightIndent.get(), m_eLRSpaceUnit ) );
aMargin.SetTxtFirstLineOfst( (const short)GetCoreValue( *maFLineIndent.get(), m_eLRSpaceUnit ) ); aMargin.SetTxtFirstLineOfst( (const short)GetCoreValue( *mpFLineIndent.get(), m_eLRSpaceUnit ) );
GetBindings()->GetDispatcher()->Execute( GetBindings()->GetDispatcher()->Execute(
SID_ATTR_PARA_LRSPACE, SFX_CALLMODE_RECORD, &aMargin, 0L); SID_ATTR_PARA_LRSPACE, SFX_CALLMODE_RECORD, &aMargin, 0L);
...@@ -902,9 +901,9 @@ IMPL_LINK(ParaPropertyPanel, ClickIndent_IncDec_Hdl_Impl, ToolBox *, pControl) ...@@ -902,9 +901,9 @@ IMPL_LINK(ParaPropertyPanel, ClickIndent_IncDec_Hdl_Impl, ToolBox *, pControl)
case ID_HANGING_INDENT: case ID_HANGING_INDENT:
{ {
SvxLRSpaceItem aMargin( SID_ATTR_PARA_LRSPACE ); SvxLRSpaceItem aMargin( SID_ATTR_PARA_LRSPACE );
aMargin.SetTxtLeft( (const long)GetCoreValue( *maLeftIndent.get(), m_eLRSpaceUnit ) + (const short)GetCoreValue( *maFLineIndent.get(), m_eLRSpaceUnit ) ); aMargin.SetTxtLeft( (const long)GetCoreValue( *mpLeftIndent.get(), m_eLRSpaceUnit ) + (const short)GetCoreValue( *mpFLineIndent.get(), m_eLRSpaceUnit ) );
aMargin.SetRight( (const long)GetCoreValue( *maRightIndent.get(), m_eLRSpaceUnit ) ); aMargin.SetRight( (const long)GetCoreValue( *mpRightIndent.get(), m_eLRSpaceUnit ) );
aMargin.SetTxtFirstLineOfst( ((const short)GetCoreValue( *maFLineIndent.get(), m_eLRSpaceUnit ))*(-1) ); aMargin.SetTxtFirstLineOfst( ((const short)GetCoreValue( *mpFLineIndent.get(), m_eLRSpaceUnit ))*(-1) );
GetBindings()->GetDispatcher()->Execute( GetBindings()->GetDispatcher()->Execute(
SID_ATTR_PARA_LRSPACE, SFX_CALLMODE_RECORD, &aMargin, 0L); SID_ATTR_PARA_LRSPACE, SFX_CALLMODE_RECORD, &aMargin, 0L);
...@@ -931,9 +930,9 @@ IMPL_LINK(ParaPropertyPanel, ClickProDemote_Hdl_Impl, ToolBox *, pControl) ...@@ -931,9 +930,9 @@ IMPL_LINK(ParaPropertyPanel, ClickProDemote_Hdl_Impl, ToolBox *, pControl)
case SD_HANGING_INDENT: case SD_HANGING_INDENT:
{ {
SvxLRSpaceItem aMargin( SID_ATTR_PARA_LRSPACE ); SvxLRSpaceItem aMargin( SID_ATTR_PARA_LRSPACE );
aMargin.SetTxtLeft( (const long)GetCoreValue( *maLeftIndent.get(), m_eLRSpaceUnit ) + (const short)GetCoreValue( *maFLineIndent.get(), m_eLRSpaceUnit ) ); aMargin.SetTxtLeft( (const long)GetCoreValue( *mpLeftIndent.get(), m_eLRSpaceUnit ) + (const short)GetCoreValue( *mpFLineIndent.get(), m_eLRSpaceUnit ) );
aMargin.SetRight( (const long)GetCoreValue( *maRightIndent.get(), m_eLRSpaceUnit ) ); aMargin.SetRight( (const long)GetCoreValue( *mpRightIndent.get(), m_eLRSpaceUnit ) );
aMargin.SetTxtFirstLineOfst( ((const short)GetCoreValue( *maFLineIndent.get(), m_eLRSpaceUnit ))*(-1) ); aMargin.SetTxtFirstLineOfst( ((const short)GetCoreValue( *mpFLineIndent.get(), m_eLRSpaceUnit ))*(-1) );
GetBindings()->GetDispatcher()->Execute( SID_ATTR_PARA_LRSPACE, SFX_CALLMODE_RECORD, &aMargin, 0L); GetBindings()->GetDispatcher()->Execute( SID_ATTR_PARA_LRSPACE, SFX_CALLMODE_RECORD, &aMargin, 0L);
} }
...@@ -962,8 +961,8 @@ IMPL_LINK( ParaPropertyPanel, ClickLineSPDropDownHdl_Impl, ToolBox*, pBox ) ...@@ -962,8 +961,8 @@ IMPL_LINK( ParaPropertyPanel, ClickLineSPDropDownHdl_Impl, ToolBox*, pBox )
IMPL_LINK_NOARG( ParaPropertyPanel, ULSpaceHdl_Impl) IMPL_LINK_NOARG( ParaPropertyPanel, ULSpaceHdl_Impl)
{ {
SvxULSpaceItem aMargin( SID_ATTR_PARA_ULSPACE ); SvxULSpaceItem aMargin( SID_ATTR_PARA_ULSPACE );
aMargin.SetUpper( (sal_uInt16)GetCoreValue( *maTopDist.get(), m_eULSpaceUnit ) ); aMargin.SetUpper( (sal_uInt16)GetCoreValue( *mpTopDist, m_eULSpaceUnit ) );
aMargin.SetLower( (sal_uInt16)GetCoreValue( *maBottomDist.get(), m_eULSpaceUnit ) ); aMargin.SetLower( (sal_uInt16)GetCoreValue( *mpBottomDist, m_eULSpaceUnit ) );
GetBindings()->GetDispatcher()->Execute( GetBindings()->GetDispatcher()->Execute(
SID_ATTR_PARA_ULSPACE, SFX_CALLMODE_RECORD, &aMargin, 0L); SID_ATTR_PARA_ULSPACE, SFX_CALLMODE_RECORD, &aMargin, 0L);
...@@ -1039,11 +1038,11 @@ void ParaPropertyPanel::NotifyItemUpdate( ...@@ -1039,11 +1038,11 @@ void ParaPropertyPanel::NotifyItemUpdate(
m_eMetricUnit = GetCurrentUnit(eState,pState); m_eMetricUnit = GetCurrentUnit(eState,pState);
if( m_eMetricUnit!=m_last_eMetricUnit ) if( m_eMetricUnit!=m_last_eMetricUnit )
{ {
SetFieldUnit( *maLeftIndent.get(), m_eMetricUnit ); SetFieldUnit( *mpLeftIndent, m_eMetricUnit );
SetFieldUnit( *maRightIndent.get(), m_eMetricUnit ); SetFieldUnit( *mpRightIndent, m_eMetricUnit );
SetFieldUnit( *maFLineIndent.get(), m_eMetricUnit ); SetFieldUnit( *mpFLineIndent, m_eMetricUnit );
SetFieldUnit( *maTopDist.get(), m_eMetricUnit ); SetFieldUnit( *mpTopDist, m_eMetricUnit );
SetFieldUnit( *maBottomDist.get(), m_eMetricUnit ); SetFieldUnit( *mpBottomDist, m_eMetricUnit );
} }
m_last_eMetricUnit = m_eMetricUnit; m_last_eMetricUnit = m_eMetricUnit;
} }
...@@ -1115,52 +1114,52 @@ void ParaPropertyPanel::StateChangedAlignmentImpl( sal_uInt16 nSID, SfxItemState ...@@ -1115,52 +1114,52 @@ void ParaPropertyPanel::StateChangedAlignmentImpl( sal_uInt16 nSID, SfxItemState
{ {
if(IsChecked) if(IsChecked)
{ {
maAlignToolBox->SetItemState(BT_SUBSTLEFT,STATE_CHECK); mpAlignToolBox->SetItemState(BT_SUBSTLEFT,STATE_CHECK);
maAlignToolBox->SetItemState(BT_SUBSTCENTER,STATE_NOCHECK); mpAlignToolBox->SetItemState(BT_SUBSTCENTER,STATE_NOCHECK);
maAlignToolBox->SetItemState(BT_SUBSTRIGHT,STATE_NOCHECK); mpAlignToolBox->SetItemState(BT_SUBSTRIGHT,STATE_NOCHECK);
maAlignToolBox->SetItemState(BT_SUBSTJUSTIFY,STATE_NOCHECK); mpAlignToolBox->SetItemState(BT_SUBSTJUSTIFY,STATE_NOCHECK);
} }
else else
maAlignToolBox->SetItemState(BT_SUBSTLEFT,STATE_NOCHECK); mpAlignToolBox->SetItemState(BT_SUBSTLEFT,STATE_NOCHECK);
} }
break; break;
case SID_ATTR_PARA_ADJUST_CENTER: case SID_ATTR_PARA_ADJUST_CENTER:
{ {
if(IsChecked) if(IsChecked)
{ {
maAlignToolBox->SetItemState(BT_SUBSTCENTER,STATE_CHECK); mpAlignToolBox->SetItemState(BT_SUBSTCENTER,STATE_CHECK);
maAlignToolBox->SetItemState(BT_SUBSTLEFT,STATE_NOCHECK); mpAlignToolBox->SetItemState(BT_SUBSTLEFT,STATE_NOCHECK);
maAlignToolBox->SetItemState(BT_SUBSTRIGHT,STATE_NOCHECK); mpAlignToolBox->SetItemState(BT_SUBSTRIGHT,STATE_NOCHECK);
maAlignToolBox->SetItemState(BT_SUBSTJUSTIFY,STATE_NOCHECK); mpAlignToolBox->SetItemState(BT_SUBSTJUSTIFY,STATE_NOCHECK);
} }
else else
maAlignToolBox->SetItemState(BT_SUBSTCENTER,STATE_NOCHECK); mpAlignToolBox->SetItemState(BT_SUBSTCENTER,STATE_NOCHECK);
} }
break; break;
case SID_ATTR_PARA_ADJUST_RIGHT: case SID_ATTR_PARA_ADJUST_RIGHT:
{ {
if(IsChecked) if(IsChecked)
{ {
maAlignToolBox->SetItemState(BT_SUBSTRIGHT,STATE_CHECK); mpAlignToolBox->SetItemState(BT_SUBSTRIGHT,STATE_CHECK);
maAlignToolBox->SetItemState(BT_SUBSTLEFT,STATE_NOCHECK); mpAlignToolBox->SetItemState(BT_SUBSTLEFT,STATE_NOCHECK);
maAlignToolBox->SetItemState(BT_SUBSTCENTER,STATE_NOCHECK); mpAlignToolBox->SetItemState(BT_SUBSTCENTER,STATE_NOCHECK);
maAlignToolBox->SetItemState(BT_SUBSTJUSTIFY,STATE_NOCHECK); mpAlignToolBox->SetItemState(BT_SUBSTJUSTIFY,STATE_NOCHECK);
} }
else else
maAlignToolBox->SetItemState(BT_SUBSTRIGHT,STATE_NOCHECK); mpAlignToolBox->SetItemState(BT_SUBSTRIGHT,STATE_NOCHECK);
} }
break; break;
case SID_ATTR_PARA_ADJUST_BLOCK: case SID_ATTR_PARA_ADJUST_BLOCK:
{ {
if(IsChecked) if(IsChecked)
{ {
maAlignToolBox->SetItemState(BT_SUBSTJUSTIFY,STATE_CHECK); mpAlignToolBox->SetItemState(BT_SUBSTJUSTIFY,STATE_CHECK);
maAlignToolBox->SetItemState(BT_SUBSTLEFT,STATE_NOCHECK); mpAlignToolBox->SetItemState(BT_SUBSTLEFT,STATE_NOCHECK);
maAlignToolBox->SetItemState(BT_SUBSTCENTER,STATE_NOCHECK); mpAlignToolBox->SetItemState(BT_SUBSTCENTER,STATE_NOCHECK);
maAlignToolBox->SetItemState(BT_SUBSTRIGHT,STATE_NOCHECK); mpAlignToolBox->SetItemState(BT_SUBSTRIGHT,STATE_NOCHECK);
} }
else else
maAlignToolBox->SetItemState(BT_SUBSTJUSTIFY,STATE_NOCHECK); mpAlignToolBox->SetItemState(BT_SUBSTJUSTIFY,STATE_NOCHECK);
} }
break; break;
} }
...@@ -1173,16 +1172,16 @@ void ParaPropertyPanel::StateChangedAlignmentImpl( sal_uInt16 nSID, SfxItemState ...@@ -1173,16 +1172,16 @@ void ParaPropertyPanel::StateChangedAlignmentImpl( sal_uInt16 nSID, SfxItemState
switch (nSID) switch (nSID)
{ {
case SID_ATTR_PARA_ADJUST_LEFT: case SID_ATTR_PARA_ADJUST_LEFT:
maAlignToolBox->SetItemState(BT_SUBSTLEFT,STATE_NOCHECK); mpAlignToolBox->SetItemState(BT_SUBSTLEFT,STATE_NOCHECK);
break; break;
case SID_ATTR_PARA_ADJUST_CENTER: case SID_ATTR_PARA_ADJUST_CENTER:
maAlignToolBox->SetItemState(BT_SUBSTCENTER,STATE_NOCHECK); mpAlignToolBox->SetItemState(BT_SUBSTCENTER,STATE_NOCHECK);
break; break;
case SID_ATTR_PARA_ADJUST_RIGHT: case SID_ATTR_PARA_ADJUST_RIGHT:
maAlignToolBox->SetItemState(BT_SUBSTRIGHT,STATE_NOCHECK); mpAlignToolBox->SetItemState(BT_SUBSTRIGHT,STATE_NOCHECK);
break; break;
case SID_ATTR_PARA_ADJUST_BLOCK: case SID_ATTR_PARA_ADJUST_BLOCK:
maAlignToolBox->SetItemState(BT_SUBSTJUSTIFY,STATE_NOCHECK); mpAlignToolBox->SetItemState(BT_SUBSTJUSTIFY,STATE_NOCHECK);
break; break;
} }
} }
...@@ -1197,11 +1196,11 @@ void ParaPropertyPanel::StateChangedIndentImpl( sal_uInt16 /*nSID*/, SfxItemStat ...@@ -1197,11 +1196,11 @@ void ParaPropertyPanel::StateChangedIndentImpl( sal_uInt16 /*nSID*/, SfxItemStat
case CombinedEnumContext(Application_WriterVariants, Context_Annotation): case CombinedEnumContext(Application_WriterVariants, Context_Annotation):
case CombinedEnumContext(Application_Calc, Context_DrawText): case CombinedEnumContext(Application_Calc, Context_DrawText):
{ {
maLeftIndent->SetMin( DEFAULT_VALUE ); mpLeftIndent->SetMin( DEFAULT_VALUE );
maRightIndent->SetMin( DEFAULT_VALUE ); mpRightIndent->SetMin( DEFAULT_VALUE );
maFLineIndent->SetMin( DEFAULT_VALUE ); mpFLineIndent->SetMin( DEFAULT_VALUE );
maTbxIndent_IncDec->Show(); mpTbxIndent_IncDec->Show();
maTbxProDemote->Hide(); mpTbxProDemote->Hide();
} }
break; break;
case CombinedEnumContext(Application_DrawImpress, Context_DrawText): case CombinedEnumContext(Application_DrawImpress, Context_DrawText):
...@@ -1210,22 +1209,22 @@ void ParaPropertyPanel::StateChangedIndentImpl( sal_uInt16 /*nSID*/, SfxItemStat ...@@ -1210,22 +1209,22 @@ void ParaPropertyPanel::StateChangedIndentImpl( sal_uInt16 /*nSID*/, SfxItemStat
case CombinedEnumContext(Application_DrawImpress, Context_Graphic): case CombinedEnumContext(Application_DrawImpress, Context_Graphic):
case CombinedEnumContext(Application_DrawImpress, Context_Table): case CombinedEnumContext(Application_DrawImpress, Context_Table):
{ {
maLeftIndent->SetMin( DEFAULT_VALUE ); mpLeftIndent->SetMin( DEFAULT_VALUE );
maRightIndent->SetMin( DEFAULT_VALUE ); mpRightIndent->SetMin( DEFAULT_VALUE );
maFLineIndent->SetMin( DEFAULT_VALUE ); mpFLineIndent->SetMin( DEFAULT_VALUE );
maTbxIndent_IncDec->Hide(); mpTbxIndent_IncDec->Hide();
maTbxProDemote->Show(); mpTbxProDemote->Show();
} }
break; break;
case CombinedEnumContext(Application_WriterVariants, Context_Default): case CombinedEnumContext(Application_WriterVariants, Context_Default):
case CombinedEnumContext(Application_WriterVariants, Context_Text): case CombinedEnumContext(Application_WriterVariants, Context_Text):
case CombinedEnumContext(Application_WriterVariants, Context_Table): case CombinedEnumContext(Application_WriterVariants, Context_Table):
{ {
maLeftIndent->SetMin( NEGA_MAXVALUE, FUNIT_100TH_MM ); mpLeftIndent->SetMin( NEGA_MAXVALUE, FUNIT_100TH_MM );
maRightIndent->SetMin( NEGA_MAXVALUE, FUNIT_100TH_MM ); mpRightIndent->SetMin( NEGA_MAXVALUE, FUNIT_100TH_MM );
maFLineIndent->SetMin( NEGA_MAXVALUE, FUNIT_100TH_MM ); mpFLineIndent->SetMin( NEGA_MAXVALUE, FUNIT_100TH_MM );
maTbxIndent_IncDec->Show(); mpTbxIndent_IncDec->Show();
maTbxProDemote->Hide(); mpTbxProDemote->Hide();
} }
break; break;
} }
...@@ -1246,23 +1245,23 @@ void ParaPropertyPanel::StateChangedIndentImpl( sal_uInt16 /*nSID*/, SfxItemStat ...@@ -1246,23 +1245,23 @@ void ParaPropertyPanel::StateChangedIndentImpl( sal_uInt16 /*nSID*/, SfxItemStat
aTxtFirstLineOfst = OutputDevice::LogicToLogic( aTxtFirstLineOfst, MAP_100TH_MM, (MapUnit)(SFX_MAPUNIT_TWIP) ); aTxtFirstLineOfst = OutputDevice::LogicToLogic( aTxtFirstLineOfst, MAP_100TH_MM, (MapUnit)(SFX_MAPUNIT_TWIP) );
long nVal = OutputDevice::LogicToLogic( maTxtLeft, (MapUnit)(SFX_MAPUNIT_TWIP), MAP_100TH_MM ); long nVal = OutputDevice::LogicToLogic( maTxtLeft, (MapUnit)(SFX_MAPUNIT_TWIP), MAP_100TH_MM );
nVal = (long)maLeftIndent->Normalize( (long)nVal ); nVal = (long)mpLeftIndent->Normalize( (long)nVal );
maLeftIndent->SetValue( nVal, FUNIT_100TH_MM ); mpLeftIndent->SetValue( nVal, FUNIT_100TH_MM );
if ( maContext.GetCombinedContext_DI() != CombinedEnumContext(Application_WriterVariants, Context_Text) if ( maContext.GetCombinedContext_DI() != CombinedEnumContext(Application_WriterVariants, Context_Text)
&& maContext.GetCombinedContext_DI() != CombinedEnumContext(Application_WriterVariants, Context_Default) && maContext.GetCombinedContext_DI() != CombinedEnumContext(Application_WriterVariants, Context_Default)
&& maContext.GetCombinedContext_DI() != CombinedEnumContext(Application_WriterVariants, Context_Table)) && maContext.GetCombinedContext_DI() != CombinedEnumContext(Application_WriterVariants, Context_Table))
{ {
maFLineIndent->SetMin( nVal*(-1), FUNIT_100TH_MM ); mpFLineIndent->SetMin( nVal*(-1), FUNIT_100TH_MM );
} }
long nrVal = OutputDevice::LogicToLogic( aTxtRight, (MapUnit)(SFX_MAPUNIT_TWIP), MAP_100TH_MM ); long nrVal = OutputDevice::LogicToLogic( aTxtRight, (MapUnit)(SFX_MAPUNIT_TWIP), MAP_100TH_MM );
nrVal = (long)maRightIndent->Normalize( (long)nrVal ); nrVal = (long)mpRightIndent->Normalize( (long)nrVal );
maRightIndent->SetValue( nrVal, FUNIT_100TH_MM ); mpRightIndent->SetValue( nrVal, FUNIT_100TH_MM );
long nfVal = OutputDevice::LogicToLogic( aTxtFirstLineOfst, (MapUnit)(SFX_MAPUNIT_TWIP), MAP_100TH_MM ); long nfVal = OutputDevice::LogicToLogic( aTxtFirstLineOfst, (MapUnit)(SFX_MAPUNIT_TWIP), MAP_100TH_MM );
nfVal = (long)maFLineIndent->Normalize( (long)nfVal ); nfVal = (long)mpFLineIndent->Normalize( (long)nfVal );
maFLineIndent->SetValue( nfVal, FUNIT_100TH_MM ); mpFLineIndent->SetValue( nfVal, FUNIT_100TH_MM );
switch (maContext.GetCombinedContext_DI()) switch (maContext.GetCombinedContext_DI())
{ {
...@@ -1272,9 +1271,9 @@ void ParaPropertyPanel::StateChangedIndentImpl( sal_uInt16 /*nSID*/, SfxItemStat ...@@ -1272,9 +1271,9 @@ void ParaPropertyPanel::StateChangedIndentImpl( sal_uInt16 /*nSID*/, SfxItemStat
case CombinedEnumContext(Application_WriterVariants, Context_Table): case CombinedEnumContext(Application_WriterVariants, Context_Table):
case CombinedEnumContext(Application_WriterVariants, Context_Annotation): case CombinedEnumContext(Application_WriterVariants, Context_Annotation):
{ {
maLeftIndent->SetMax( MAX_SW - nrVal, FUNIT_100TH_MM ); mpLeftIndent->SetMax( MAX_SW - nrVal, FUNIT_100TH_MM );
maRightIndent->SetMax( MAX_SW - nVal, FUNIT_100TH_MM ); mpRightIndent->SetMax( MAX_SW - nVal, FUNIT_100TH_MM );
maFLineIndent->SetMax( MAX_SW - nVal - nrVal, FUNIT_100TH_MM ); mpFLineIndent->SetMax( MAX_SW - nVal - nrVal, FUNIT_100TH_MM );
} }
break; break;
case CombinedEnumContext(Application_DrawImpress, Context_DrawText): case CombinedEnumContext(Application_DrawImpress, Context_DrawText):
...@@ -1283,52 +1282,52 @@ void ParaPropertyPanel::StateChangedIndentImpl( sal_uInt16 /*nSID*/, SfxItemStat ...@@ -1283,52 +1282,52 @@ void ParaPropertyPanel::StateChangedIndentImpl( sal_uInt16 /*nSID*/, SfxItemStat
case CombinedEnumContext(Application_DrawImpress, Context_TextObject): case CombinedEnumContext(Application_DrawImpress, Context_TextObject):
case CombinedEnumContext(Application_DrawImpress, Context_Graphic): case CombinedEnumContext(Application_DrawImpress, Context_Graphic):
{ {
maLeftIndent->SetMax( MAX_SC_SD - nrVal, FUNIT_100TH_MM ); mpLeftIndent->SetMax( MAX_SC_SD - nrVal, FUNIT_100TH_MM );
maRightIndent->SetMax( MAX_SC_SD - nVal, FUNIT_100TH_MM ); mpRightIndent->SetMax( MAX_SC_SD - nVal, FUNIT_100TH_MM );
maFLineIndent->SetMax( MAX_SC_SD - nVal - nrVal, FUNIT_100TH_MM ); mpFLineIndent->SetMax( MAX_SC_SD - nVal - nrVal, FUNIT_100TH_MM );
} }
} }
maTbxIndent_IncDec->Enable(); mpTbxIndent_IncDec->Enable();
maTbxIndent_IncDec->EnableItem(ID_HANGING_INDENT, sal_True); mpTbxIndent_IncDec->EnableItem(ID_HANGING_INDENT, sal_True);
if ( maContext.GetCombinedContext_DI() != CombinedEnumContext(Application_WriterVariants, Context_Text) if ( maContext.GetCombinedContext_DI() != CombinedEnumContext(Application_WriterVariants, Context_Text)
&& maContext.GetCombinedContext_DI() != CombinedEnumContext(Application_WriterVariants, Context_Default) && maContext.GetCombinedContext_DI() != CombinedEnumContext(Application_WriterVariants, Context_Default)
&& maContext.GetCombinedContext_DI() != CombinedEnumContext(Application_WriterVariants, Context_Table) ) && maContext.GetCombinedContext_DI() != CombinedEnumContext(Application_WriterVariants, Context_Table) )
{ {
maTbxIndent_IncDec->EnableItem(BT_TBX_INDENT_INC, sal_True); mpTbxIndent_IncDec->EnableItem(BT_TBX_INDENT_INC, sal_True);
maTbxIndent_IncDec->EnableItem(BT_TBX_INDENT_DEC, sal_True); mpTbxIndent_IncDec->EnableItem(BT_TBX_INDENT_DEC, sal_True);
} }
maTbxProDemote->EnableItem(SD_HANGING_INDENT, sal_True); mpTbxProDemote->EnableItem(SD_HANGING_INDENT, sal_True);
} }
else if( eState == SFX_ITEM_DISABLED ) else if( eState == SFX_ITEM_DISABLED )
{ {
maLeftIndent-> Disable(); mpLeftIndent-> Disable();
maRightIndent->Disable(); mpRightIndent->Disable();
maFLineIndent->Disable(); mpFLineIndent->Disable();
maTbxIndent_IncDec->Disable(); mpTbxIndent_IncDec->Disable();
if( maContext.GetCombinedContext_DI() != CombinedEnumContext(Application_WriterVariants, Context_Text) && if( maContext.GetCombinedContext_DI() != CombinedEnumContext(Application_WriterVariants, Context_Text) &&
maContext.GetCombinedContext_DI() != CombinedEnumContext(Application_WriterVariants, Context_Default) && maContext.GetCombinedContext_DI() != CombinedEnumContext(Application_WriterVariants, Context_Default) &&
maContext.GetCombinedContext_DI() != CombinedEnumContext(Application_WriterVariants, Context_Table) ) maContext.GetCombinedContext_DI() != CombinedEnumContext(Application_WriterVariants, Context_Table) )
maTbxIndent_IncDec->Disable(); mpTbxIndent_IncDec->Disable();
else else
maTbxIndent_IncDec->EnableItem(ID_HANGING_INDENT, sal_False); mpTbxIndent_IncDec->EnableItem(ID_HANGING_INDENT, sal_False);
// maTbxProDemote->Disable(); // maTbxProDemote->Disable();
maTbxProDemote->EnableItem(SD_HANGING_INDENT, sal_False); mpTbxProDemote->EnableItem(SD_HANGING_INDENT, sal_False);
} }
else else
{ {
maLeftIndent->SetEmptyFieldValue(); mpLeftIndent->SetEmptyFieldValue();
maRightIndent->SetEmptyFieldValue(); mpRightIndent->SetEmptyFieldValue();
maFLineIndent->SetEmptyFieldValue(); mpFLineIndent->SetEmptyFieldValue();
if( maContext.GetCombinedContext_DI() != CombinedEnumContext(Application_WriterVariants, Context_Text) && if( maContext.GetCombinedContext_DI() != CombinedEnumContext(Application_WriterVariants, Context_Text) &&
maContext.GetCombinedContext_DI() != CombinedEnumContext(Application_WriterVariants, Context_Default) && maContext.GetCombinedContext_DI() != CombinedEnumContext(Application_WriterVariants, Context_Default) &&
maContext.GetCombinedContext_DI() != CombinedEnumContext(Application_WriterVariants, Context_Table) ) maContext.GetCombinedContext_DI() != CombinedEnumContext(Application_WriterVariants, Context_Table) )
maTbxIndent_IncDec->Disable(); mpTbxIndent_IncDec->Disable();
else else
maTbxIndent_IncDec->EnableItem(ID_HANGING_INDENT, sal_False); mpTbxIndent_IncDec->EnableItem(ID_HANGING_INDENT, sal_False);
maTbxProDemote->EnableItem(SD_HANGING_INDENT, sal_False); mpTbxProDemote->EnableItem(SD_HANGING_INDENT, sal_False);
} }
} }
...@@ -1346,8 +1345,8 @@ void ParaPropertyPanel::StateChangedLnSPImpl( sal_uInt16 /*nSID*/, SfxItemState ...@@ -1346,8 +1345,8 @@ void ParaPropertyPanel::StateChangedLnSPImpl( sal_uInt16 /*nSID*/, SfxItemState
void ParaPropertyPanel::StateChangedULImpl( sal_uInt16 /*nSID*/, SfxItemState eState, const SfxPoolItem* pState ) void ParaPropertyPanel::StateChangedULImpl( sal_uInt16 /*nSID*/, SfxItemState eState, const SfxPoolItem* pState )
{ {
maTopDist->SetMax( maTopDist->Normalize( MAX_DURCH ), MapToFieldUnit(m_eULSpaceUnit) ); mpTopDist->SetMax( mpTopDist->Normalize( MAX_DURCH ), MapToFieldUnit(m_eULSpaceUnit) );
maBottomDist->SetMax( maBottomDist->Normalize( MAX_DURCH ), MapToFieldUnit(m_eULSpaceUnit) ); mpBottomDist->SetMax( mpBottomDist->Normalize( MAX_DURCH ), MapToFieldUnit(m_eULSpaceUnit) );
if( pState && eState >= SFX_ITEM_AVAILABLE ) if( pState && eState >= SFX_ITEM_AVAILABLE )
{ {
...@@ -1362,25 +1361,25 @@ void ParaPropertyPanel::StateChangedULImpl( sal_uInt16 /*nSID*/, SfxItemState eS ...@@ -1362,25 +1361,25 @@ void ParaPropertyPanel::StateChangedULImpl( sal_uInt16 /*nSID*/, SfxItemState eS
maLower = OutputDevice::LogicToLogic( maLower, MAP_100TH_MM, (MapUnit)(SFX_MAPUNIT_TWIP) ); maLower = OutputDevice::LogicToLogic( maLower, MAP_100TH_MM, (MapUnit)(SFX_MAPUNIT_TWIP) );
sal_Int64 nVal = OutputDevice::LogicToLogic( maUpper, (MapUnit)(SFX_MAPUNIT_TWIP), MAP_100TH_MM ); sal_Int64 nVal = OutputDevice::LogicToLogic( maUpper, (MapUnit)(SFX_MAPUNIT_TWIP), MAP_100TH_MM );
nVal = maTopDist->Normalize( nVal ); nVal = mpTopDist->Normalize( nVal );
maTopDist->SetValue( nVal, FUNIT_100TH_MM ); mpTopDist->SetValue( nVal, FUNIT_100TH_MM );
nVal = OutputDevice::LogicToLogic( maLower, (MapUnit)(SFX_MAPUNIT_TWIP), MAP_100TH_MM ); nVal = OutputDevice::LogicToLogic( maLower, (MapUnit)(SFX_MAPUNIT_TWIP), MAP_100TH_MM );
nVal = maBottomDist->Normalize( nVal ); nVal = mpBottomDist->Normalize( nVal );
maBottomDist->SetValue( nVal, FUNIT_100TH_MM ); mpBottomDist->SetValue( nVal, FUNIT_100TH_MM );
maTbxUL_IncDec->Enable(); mpTbxUL_IncDec->Enable();
} }
else if(eState == SFX_ITEM_DISABLED ) else if(eState == SFX_ITEM_DISABLED )
{ {
maTopDist->Disable(); mpTopDist->Disable();
maBottomDist->Disable(); mpBottomDist->Disable();
maTbxUL_IncDec->Disable(); mpTbxUL_IncDec->Disable();
} }
else else
{ {
maTopDist->SetEmptyFieldValue(); mpTopDist->SetEmptyFieldValue();
maBottomDist->SetEmptyFieldValue(); mpBottomDist->SetEmptyFieldValue();
maTbxUL_IncDec->Disable(); mpTbxUL_IncDec->Disable();
} }
} }
...@@ -1401,14 +1400,14 @@ void ParaPropertyPanel::StateChangeOutLineImpl( sal_uInt16 nSID, SfxItemState eS ...@@ -1401,14 +1400,14 @@ void ParaPropertyPanel::StateChangeOutLineImpl( sal_uInt16 nSID, SfxItemState eS
mbOutLineRight = 0; mbOutLineRight = 0;
} }
if(mbOutLineLeft) if(mbOutLineLeft)
maTbxProDemote->EnableItem(BT_TBX_INDENT_DEMOTE, sal_True); mpTbxProDemote->EnableItem(BT_TBX_INDENT_DEMOTE, sal_True);
else else
maTbxProDemote->EnableItem(BT_TBX_INDENT_DEMOTE, sal_False); mpTbxProDemote->EnableItem(BT_TBX_INDENT_DEMOTE, sal_False);
if(mbOutLineRight) if(mbOutLineRight)
maTbxProDemote->EnableItem(BT_TBX_INDENT_PROMOTE, sal_True); mpTbxProDemote->EnableItem(BT_TBX_INDENT_PROMOTE, sal_True);
else else
maTbxProDemote->EnableItem(BT_TBX_INDENT_PROMOTE, sal_False); mpTbxProDemote->EnableItem(BT_TBX_INDENT_PROMOTE, sal_False);
} }
...@@ -1421,7 +1420,7 @@ void ParaPropertyPanel::StateChangeIncDecImpl( sal_uInt16 nSID, SfxItemState eSt ...@@ -1421,7 +1420,7 @@ void ParaPropertyPanel::StateChangeIncDecImpl( sal_uInt16 nSID, SfxItemState eSt
{ {
// Writer's text shell is the only one which provides reasonable states for Slots SID_INC_INDENT and SID_DEC_INDENT // Writer's text shell is the only one which provides reasonable states for Slots SID_INC_INDENT and SID_DEC_INDENT
// - namely SFX_ITEM_UNKNOWN and SFX_ITEM_DISABLED // - namely SFX_ITEM_UNKNOWN and SFX_ITEM_DISABLED
maTbxIndent_IncDec->EnableItem( mpTbxIndent_IncDec->EnableItem(
nSID == SID_INC_INDENT ? BT_TBX_INDENT_INC : BT_TBX_INDENT_DEC, nSID == SID_INC_INDENT ? BT_TBX_INDENT_INC : BT_TBX_INDENT_DEC,
( pState && eState == SFX_ITEM_UNKNOWN ) ? sal_True : sal_False ); ( pState && eState == SFX_ITEM_UNKNOWN ) ? sal_True : sal_False );
} }
...@@ -1437,13 +1436,13 @@ void ParaPropertyPanel::StateChangeBulletNumImpl( sal_uInt16 nSID, SfxItemState ...@@ -1437,13 +1436,13 @@ void ParaPropertyPanel::StateChangeBulletNumImpl( sal_uInt16 nSID, SfxItemState
const sal_Bool aBool = (sal_Bool)pItem->GetValue(); const sal_Bool aBool = (sal_Bool)pItem->GetValue();
if (nSID==FN_NUM_NUMBERING_ON) if (nSID==FN_NUM_NUMBERING_ON)
{ {
maTBxNumBullet->SetItemState( mpTBxNumBullet->SetItemState(
IID_NUMBER, IID_NUMBER,
aBool ? STATE_CHECK : STATE_NOCHECK ); aBool ? STATE_CHECK : STATE_NOCHECK );
} }
else if (nSID==FN_NUM_BULLET_ON) else if (nSID==FN_NUM_BULLET_ON)
{ {
maTBxNumBullet->SetItemState( mpTBxNumBullet->SetItemState(
IID_BULLET, IID_BULLET,
aBool ? STATE_CHECK : STATE_NOCHECK ); aBool ? STATE_CHECK : STATE_NOCHECK );
} }
...@@ -1550,33 +1549,30 @@ ParaPropertyPanel::ParaPropertyPanel(Window* pParent, ...@@ -1550,33 +1549,30 @@ ParaPropertyPanel::ParaPropertyPanel(Window* pParent,
SfxBindings* pBindings, SfxBindings* pBindings,
const cssu::Reference<css::ui::XSidebar>& rxSidebar) const cssu::Reference<css::ui::XSidebar>& rxSidebar)
: Control(pParent, SVX_RES(RID_SIDEBAR_PARA_PANEL)), : Control(pParent, SVX_RES(RID_SIDEBAR_PARA_PANEL)),
maAlignToolBoxBackground(ControlFactory::CreateToolBoxBackground(this)), mpAlignToolBoxBackground(ControlFactory::CreateToolBoxBackground(this)),
maAlignToolBox (ControlFactory::CreateToolBox(maAlignToolBoxBackground.get(),SVX_RES(TBX_HORIZONTALALIGNMENT))), mpAlignToolBox (ControlFactory::CreateToolBox(mpAlignToolBoxBackground.get(),SVX_RES(TBX_HORIZONTALALIGNMENT))),
maTBxVertAlignBackground(ControlFactory::CreateToolBoxBackground(this)), mpTBxVertAlignBackground(ControlFactory::CreateToolBoxBackground(this)),
maTBxVertAlign (ControlFactory::CreateToolBox(maTBxVertAlignBackground.get(),SVX_RES(TBX_VERT_ALIGN))), mpTBxVertAlign (ControlFactory::CreateToolBox(mpTBxVertAlignBackground.get(),SVX_RES(TBX_VERT_ALIGN))),
maTBxNumBulletBackground(ControlFactory::CreateToolBoxBackground(this)), mpTBxNumBulletBackground(ControlFactory::CreateToolBoxBackground(this)),
maTBxNumBullet (ControlFactory::CreateToolBox(maTBxNumBulletBackground.get(),SVX_RES(TBX_NUM_BULLET))), mpTBxNumBullet (ControlFactory::CreateToolBox(mpTBxNumBulletBackground.get(),SVX_RES(TBX_NUM_BULLET))),
maTBxBackColorBackground(ControlFactory::CreateToolBoxBackground(this)), mpTBxBackColorBackground(ControlFactory::CreateToolBoxBackground(this)),
maTBxBackColor (ControlFactory::CreateToolBox(maTBxBackColorBackground.get(),SVX_RES(TBX_BACK_COLOR))), mpTBxBackColor (ControlFactory::CreateToolBox(mpTBxBackColorBackground.get(),SVX_RES(TBX_BACK_COLOR))),
maFTUL (new FixedText(this, SVX_RES(FT_SPACING))), mpFTUL (new FixedText(this, SVX_RES(FT_SPACING))),
maTbxUL_IncDecBackground(ControlFactory::CreateToolBoxBackground(this)), mpTbxUL_IncDecBackground(ControlFactory::CreateToolBoxBackground(this)),
maTbxUL_IncDec (ControlFactory::CreateToolBox(maTbxUL_IncDecBackground.get(),SVX_RES(TBX_UL_INC_DEC))), mpTbxUL_IncDec (ControlFactory::CreateToolBox(mpTbxUL_IncDecBackground.get(),SVX_RES(TBX_UL_INC_DEC))),
maFTIndent (new FixedText(this, SVX_RES(FT_INDENT))), mpTopDist (new SvxRelativeField(this, SVX_RES(MF_ABOVE_PARASPACING))),
maTbxIndent_IncDecBackground(ControlFactory::CreateToolBoxBackground(this)), mpBottomDist (new SvxRelativeField(this, SVX_RES(MF_BELOW_PARASPACING))),
maTbxIndent_IncDec (ControlFactory::CreateToolBox(maTbxIndent_IncDecBackground.get(),SVX_RES(TBX_INDENT_INC_DEC))), mpLineSPTbxBackground(ControlFactory::CreateToolBoxBackground(this)),
mpLineSPTbx (ControlFactory::CreateToolBox(mpLineSPTbxBackground.get(),SVX_RES(TBX_LINESP))),
maTopDist (new SvxRelativeField(this, SVX_RES(MF_ABOVE_PARASPACING))), mpFTIndent (new FixedText(this, SVX_RES(FT_INDENT))),
maLeftIndent (new SvxRelativeField(this, SVX_RES(MF_BEFORE_INDENT))), mpTbxIndent_IncDecBackground(ControlFactory::CreateToolBoxBackground(this)),
mpTbxIndent_IncDec (ControlFactory::CreateToolBox(mpTbxIndent_IncDecBackground.get(),SVX_RES(TBX_INDENT_INC_DEC))),
maBottomDist (new SvxRelativeField(this, SVX_RES(MF_BELOW_PARASPACING))), mpTbxProDemoteBackground(ControlFactory::CreateToolBoxBackground(this)),
maRightIndent (new SvxRelativeField(this, SVX_RES(MF_AFTER_INDENT))), mpTbxProDemote (ControlFactory::CreateToolBox(mpTbxProDemoteBackground.get(),SVX_RES(TBX_INDENT_PRO_DEMOTE))),
mpLeftIndent (new SvxRelativeField(this, SVX_RES(MF_BEFORE_INDENT))),
maLineSPTbxBackground(ControlFactory::CreateToolBoxBackground(this)), mpRightIndent (new SvxRelativeField(this, SVX_RES(MF_AFTER_INDENT))),
maLineSPTbx (ControlFactory::CreateToolBox(maLineSPTbxBackground.get(),SVX_RES(TBX_LINESP))), mpFLineIndent (new SvxRelativeField(this, SVX_RES(MF_FL_INDENT))),
maFLineIndent (new SvxRelativeField(this, SVX_RES(MF_FL_INDENT))),
maTbxProDemoteBackground(ControlFactory::CreateToolBoxBackground(this)),
maTbxProDemote (ControlFactory::CreateToolBox(maTbxProDemoteBackground.get(),SVX_RES(TBX_INDENT_PRO_DEMOTE))),
mpColorUpdater (), mpColorUpdater (),
maFISpace1 ( this, SVX_RES( FI_SPACE1)), maFISpace1 ( this, SVX_RES( FI_SPACE1)),
maFISpace2 ( this, SVX_RES( FI_SPACE2)), maFISpace2 ( this, SVX_RES( FI_SPACE2)),
......
svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
Dosyayı görüntüle @ 3106ed12
...@@ -95,33 +95,32 @@ private: ...@@ -95,33 +95,32 @@ private:
** **
***********************************************************/ ***********************************************************/
//Alignment //Alignment
::boost::scoped_ptr<Window> maAlignToolBoxBackground; ::boost::scoped_ptr<Window> mpAlignToolBoxBackground;
::boost::scoped_ptr<ToolBox> maAlignToolBox; ::boost::scoped_ptr<ToolBox> mpAlignToolBox;
::boost::scoped_ptr<Window> maTBxVertAlignBackground; ::boost::scoped_ptr<Window> mpTBxVertAlignBackground;
::boost::scoped_ptr<ToolBox> maTBxVertAlign; ::boost::scoped_ptr<ToolBox> mpTBxVertAlign;
//NumBullet&Backcolor //NumBullet&Backcolor
::boost::scoped_ptr<Window> maTBxNumBulletBackground; ::boost::scoped_ptr<Window> mpTBxNumBulletBackground;
::boost::scoped_ptr<ToolBox> maTBxNumBullet; ::boost::scoped_ptr<ToolBox> mpTBxNumBullet;
::boost::scoped_ptr<Window> maTBxBackColorBackground; ::boost::scoped_ptr<Window> mpTBxBackColorBackground;
::boost::scoped_ptr<ToolBox> maTBxBackColor; ::boost::scoped_ptr<ToolBox> mpTBxBackColor;
//Paragraph spacing //Paragraph spacing
::boost::scoped_ptr<FixedText> maFTUL; ::boost::scoped_ptr<FixedText> mpFTUL;
::boost::scoped_ptr<Window> maTbxUL_IncDecBackground; ::boost::scoped_ptr<Window> mpTbxUL_IncDecBackground;
::boost::scoped_ptr<ToolBox> maTbxUL_IncDec; ::boost::scoped_ptr<ToolBox> mpTbxUL_IncDec;
::boost::scoped_ptr<FixedText> maFTIndent; ::boost::scoped_ptr<SvxRelativeField> mpTopDist;
::boost::scoped_ptr<Window> maTbxIndent_IncDecBackground; ::boost::scoped_ptr<SvxRelativeField> mpBottomDist;
::boost::scoped_ptr<ToolBox> maTbxIndent_IncDec; ::boost::scoped_ptr<Window> mpLineSPTbxBackground;
::boost::scoped_ptr<SvxRelativeField> maTopDist; ::boost::scoped_ptr<ToolBox> mpLineSPTbx;
::boost::scoped_ptr<SvxRelativeField> maLeftIndent; ::boost::scoped_ptr<FixedText> mpFTIndent;
::boost::scoped_ptr<SvxRelativeField> maBottomDist; ::boost::scoped_ptr<Window> mpTbxIndent_IncDecBackground;
::boost::scoped_ptr<SvxRelativeField> maRightIndent; ::boost::scoped_ptr<ToolBox> mpTbxIndent_IncDec;
//Line spacing ::boost::scoped_ptr<Window> mpTbxProDemoteBackground;
::boost::scoped_ptr<Window> maLineSPTbxBackground; ::boost::scoped_ptr<ToolBox> mpTbxProDemote;
::boost::scoped_ptr<ToolBox> maLineSPTbx; ::boost::scoped_ptr<SvxRelativeField> mpLeftIndent;
::boost::scoped_ptr<SvxRelativeField> maFLineIndent; ::boost::scoped_ptr<SvxRelativeField> mpRightIndent;
//Indent ::boost::scoped_ptr<SvxRelativeField> mpFLineIndent;
::boost::scoped_ptr<Window> maTbxProDemoteBackground;
::boost::scoped_ptr<ToolBox> maTbxProDemote;
::boost::scoped_ptr< ::svx::ToolboxButtonColorUpdater > mpColorUpdater; ::boost::scoped_ptr< ::svx::ToolboxButtonColorUpdater > mpColorUpdater;
/********************************************************** /**********************************************************
......
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