You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by or...@apache.org on 2013/04/30 16:04:43 UTC
svn commit: r1477636 - in /openoffice/trunk/main/svx/source/sidebar/text:
TextPropertyPanel.cxx TextPropertyPanel.hxx TextUnderlineControl.cxx
Author: orw
Date: Tue Apr 30 14:04:43 2013
New Revision: 1477636
URL: http://svn.apache.org/r1477636
Log:
122182: TextPropertyPanel:
- add missing <break> in handling click to character attribute controls
- remove superfluous code and comments
- adapt code formatting
Modified:
openoffice/trunk/main/svx/source/sidebar/text/TextPropertyPanel.cxx
openoffice/trunk/main/svx/source/sidebar/text/TextPropertyPanel.hxx
openoffice/trunk/main/svx/source/sidebar/text/TextUnderlineControl.cxx
Modified: openoffice/trunk/main/svx/source/sidebar/text/TextPropertyPanel.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/sidebar/text/TextPropertyPanel.cxx?rev=1477636&r1=1477635&r2=1477636&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/sidebar/text/TextPropertyPanel.cxx (original)
+++ openoffice/trunk/main/svx/source/sidebar/text/TextPropertyPanel.cxx Tue Apr 30 14:04:43 2013
@@ -82,10 +82,8 @@ namespace svx { namespace sidebar {
#define TEXT_SECTIONPAGE_HEIGHT_S SECTIONPAGE_MARGIN_VERTICAL_TOP + CBOX_HEIGHT + ( TOOLBOX_ITEM_HEIGHT + 2 ) + CONTROL_SPACING_VERTICAL * 1 + SECTIONPAGE_MARGIN_VERTICAL_BOT
#define TEXT_SECTIONPAGE_HEIGHT SECTIONPAGE_MARGIN_VERTICAL_TOP + CBOX_HEIGHT + ( TOOLBOX_ITEM_HEIGHT + 2 ) * 2 + CONTROL_SPACING_VERTICAL * 2 + SECTIONPAGE_MARGIN_VERTICAL_BOT
-//
-//end
-PopupControl* TextPropertyPanel::CreateCharacterSpacingControl (PopupContainer* pParent)
+ PopupControl* TextPropertyPanel::CreateCharacterSpacingControl (PopupContainer* pParent)
{
return new TextCharacterSpacingControl(pParent, *this, mpBindings);
}
@@ -171,11 +169,11 @@ TextPropertyPanel::TextPropertyPanel (
Window* pParent,
const cssu::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings)
- : Control(pParent, SVX_RES(RID_SIDEBAR_TEXT_PANEL)),
+ : Control(pParent, SVX_RES(RID_SIDEBAR_TEXT_PANEL)),
mpFontNameBox (new SvxSBFontNameBox(this, SVX_RES(CB_SBFONT_FONT))),
- maFontSizeBox (this, SVX_RES(MB_SBFONT_FONTSIZE)),
- mpToolBoxIncDecBackground(ControlFactory::CreateToolBoxBackground(this)),
- mpToolBoxIncDec(ControlFactory::CreateToolBox(
+ maFontSizeBox (this, SVX_RES(MB_SBFONT_FONTSIZE)),
+ mpToolBoxIncDecBackground(ControlFactory::CreateToolBoxBackground(this)),
+ mpToolBoxIncDec(ControlFactory::CreateToolBox(
mpToolBoxIncDecBackground.get(),
SVX_RES(TB_INCREASE_DECREASE))),
mpToolBoxFontBackground(ControlFactory::CreateToolBoxBackground(this)),
@@ -286,7 +284,7 @@ void TextPropertyPanel::HandleContextCha
{
case CombinedEnumContext(Application_Calc, Context_Cell):
case CombinedEnumContext(Application_Calc, Context_Pivot):
- mpToolBoxScriptSw->Hide();
+ mpToolBoxScriptSw->Hide();
mpToolBoxHighlight->Hide();
mpToolBoxScript->Disable();
mpToolBoxSpacing->Disable();
@@ -367,7 +365,7 @@ void TextPropertyPanel::Initialize (void
maFontSizeBox.Fill(&aFontInfo,mpFontList);
maFontSizeBox.SetAccessibleName(maFontSizeBox.GetQuickHelpText());
- //toolbox
+ //toolbox
SetupToolboxItems();
InitToolBoxIncDec();
InitToolBoxFont();
@@ -404,7 +402,6 @@ void TextPropertyPanel::Initialize (void
mbColorAvailable = true;
maBackColor = COL_AUTO;
mbBackColorAvailable = true;
- meColorType = FONT_COLOR;
meEscape = SVX_ESCAPEMENT_OFF;
mbSuper = false;
mbSub = false;
@@ -424,17 +421,12 @@ void TextPropertyPanel::Initialize (void
//set handler
mpFontNameBox->SetBindings(mpBindings);
- //add
Link aLink = LINK(this, TextPropertyPanel, FontSelHdl);
mpFontNameBox->SetSelectHdl(aLink);
- //add end
-
aLink = LINK(this, TextPropertyPanel, FontSizeModifyHdl);
maFontSizeBox.SetModifyHdl(aLink);
- //add
aLink = LINK(this, TextPropertyPanel, FontSizeSelHdl);
maFontSizeBox.SetSelectHdl(aLink);
- //add end
aLink = LINK(this, TextPropertyPanel, FontSizeLoseFocus);
maFontSizeBox.SetLoseFocusHdl(aLink);
@@ -539,10 +531,10 @@ void TextPropertyPanel::SetupToolboxItem
maSDFontShrink.SetupToolBoxItem(*mpToolBoxIncDec, TBI_DECREASE);
maWeightControl.SetupToolBoxItem(*mpToolBoxFont, TBI_BOLD);
- maItalicControl.SetupToolBoxItem(*mpToolBoxFont, TBI_ITALIC);
- maUnderlineControl.SetupToolBoxItem(*mpToolBoxFont, TBI_UNDERLINE);
- maStrikeControl.SetupToolBoxItem(*mpToolBoxFont, TBI_STRIKEOUT);
- maShadowControl.SetupToolBoxItem(*mpToolBoxFont, TBI_SHADOWED);
+ maItalicControl.SetupToolBoxItem(*mpToolBoxFont, TBI_ITALIC);
+ maUnderlineControl.SetupToolBoxItem(*mpToolBoxFont, TBI_UNDERLINE);
+ maStrikeControl.SetupToolBoxItem(*mpToolBoxFont, TBI_STRIKEOUT);
+ maShadowControl.SetupToolBoxItem(*mpToolBoxFont, TBI_SHADOWED);
maFontColorControl.SetupToolBoxItem(*mpToolBoxFontColor, TBI_FONTCOLOR);
//for sw
@@ -572,7 +564,7 @@ IMPL_LINK( TextPropertyPanel, FontSelHdl
}
return 0;
}
-//add end
+
IMPL_LINK( TextPropertyPanel, FontSizeModifyHdl, FontSizeBox*, pSizeBox )
{
if (pSizeBox == &maFontSizeBox)
@@ -589,7 +581,7 @@ IMPL_LINK( TextPropertyPanel, FontSizeMo
}
return 0;
}
-//add
+
IMPL_LINK( TextPropertyPanel, FontSizeSelHdl, FontSizeBox*, pSizeBox )
{
if ( !pSizeBox->IsTravelSelect() )
@@ -605,7 +597,7 @@ IMPL_LINK( TextPropertyPanel, FontSizeSe
return 0;
}
-//add end
+
IMPL_LINK(TextPropertyPanel, FontSizeLoseFocus, FontSizeBox*, pSizeBox)
{
if(pSizeBox == &maFontSizeBox)
@@ -617,9 +609,9 @@ IMPL_LINK(TextPropertyPanel, FontSizeLos
IMPL_LINK(TextPropertyPanel, ToolboxFontSelectHandler, ToolBox*, pToolBox)
{
- const sal_uInt16 nId = pToolBox->GetCurItemId();
+ const sal_uInt16 nId = pToolBox->GetCurItemId();
- switch (nId)
+ switch (nId)
{
case TBI_BOLD:
{
@@ -662,6 +654,7 @@ IMPL_LINK(TextPropertyPanel, ToolboxFont
mpBindings->GetDispatcher()->Execute(SID_ATTR_CHAR_UNDERLINE, SFX_CALLMODE_RECORD, &aLineItem, 0L);
}
UpdateItem(SID_ATTR_CHAR_UNDERLINE);
+ break;
}
case TBI_STRIKEOUT:
{
@@ -684,8 +677,8 @@ IMPL_LINK(TextPropertyPanel, ToolboxFont
UpdateItem(SID_ATTR_CHAR_SHADOWED);
break;
}
- }
- return 0;
+ }
+ return 0;
}
@@ -693,9 +686,9 @@ IMPL_LINK(TextPropertyPanel, ToolboxFont
IMPL_LINK(TextPropertyPanel, ToolboxIncDecSelectHdl, ToolBox*, pToolBox)
{
- const sal_uInt16 nId = pToolBox->GetCurItemId();
+ const sal_uInt16 nId = pToolBox->GetCurItemId();
- // font size +/- enhancement in sd
+ // font size +/- enhancement in sd
switch (maContext.GetCombinedContext_DI())
{
case CombinedEnumContext(Application_DrawImpress, Context_DrawText):
@@ -820,8 +813,6 @@ IMPL_LINK(TextPropertyPanel, ToolBoxFont
const sal_uInt16 nId = pToolBox->GetCurItemId();
if(nId == TBI_FONTCOLOR)
{
- meColorType = FONT_COLOR;
-
pToolBox->SetItemDown( nId, true );
maFontColorPopup.Show(*pToolBox);
@@ -903,8 +894,6 @@ IMPL_LINK(TextPropertyPanel, ToolBoxHigh
const sal_uInt16 nId = pToolBox->GetCurItemId();
if(nId == TBI_HIGHLIGHT)
{
- meColorType = BACK_COLOR;
-
pToolBox->SetItemDown( nId, true );
maBrushColorPopup.Show(*pToolBox);
maBrushColorPopup.SetCurrentColor(maBackColor, mbBackColorAvailable);
@@ -932,22 +921,14 @@ IMPL_LINK(TextPropertyPanel, SpacingClic
-IMPL_LINK( TextPropertyPanel, ImplPopupModeEndHdl, FloatingWindow*, EMPTYARG )
-{
- return 0;
-}
-
-
-
-
void TextPropertyPanel::NotifyItemUpdate (
const sal_uInt16 nSID,
const SfxItemState eState,
const SfxPoolItem* pState,
const bool bIsEnabled)
{
- switch(nSID)
- {
+ switch(nSID)
+ {
case SID_ATTR_CHAR_FONT:
{
bool bIsControlEnabled (bIsEnabled);
@@ -988,11 +969,11 @@ void TextPropertyPanel::NotifyItemUpdate
UpdateItem(SID_GROW_FONT_SIZE);
}
else
- {
+ {
mpHeightItem = NULL;
maFontSizeBox.SetText( String() );
//increase decrease diabled when multi-seletion have different font size
-
+
// font size +/- enhancement in sd
switch(maContext.GetCombinedContext_DI())
{
@@ -1100,15 +1081,15 @@ void TextPropertyPanel::NotifyItemUpdate
const SvxColorItem* pItem = (const SvxColorItem*)pState;
maColor = pItem->GetValue();
mbColorAvailable = true;
- if (mpFontColorUpdater)
- mpFontColorUpdater->Update(maColor);
+ if (mpFontColorUpdater)
+ mpFontColorUpdater->Update(maColor);
}
else
{
mbColorAvailable = false;
maColor.SetColor(COL_AUTO);
- if (mpFontColorUpdater)
- mpFontColorUpdater->Update(maColor);
+ if (mpFontColorUpdater)
+ mpFontColorUpdater->Update(maColor);
}
mpToolBoxFontColor->EnableItem(TBI_FONTCOLOR, bIsEnabled);
break;
Modified: openoffice/trunk/main/svx/source/sidebar/text/TextPropertyPanel.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/sidebar/text/TextPropertyPanel.hxx?rev=1477636&r1=1477635&r2=1477636&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/sidebar/text/TextPropertyPanel.hxx (original)
+++ openoffice/trunk/main/svx/source/sidebar/text/TextPropertyPanel.hxx Tue Apr 30 14:04:43 2013
@@ -32,7 +32,6 @@
#include <editeng/svxenum.hxx>
#include <editeng/fhgtitem.hxx>
-//#include <com/sun/star/ui/XUIElement.hpp>
#include <com/sun/star/ui/XSidebar.hpp>
#include <boost/scoped_ptr.hpp>
@@ -67,25 +66,17 @@ public:
void SetSpacing(long nKern);
void EndSpacingPopupMode (void);
void EndUnderlinePopupMode (void);
- void SetFontColor (const String& rsColorName,const Color aColor);
- void SetBrushColor (const String& rsColorName,const Color aColor);
- void SetUnderline(FontUnderline eUnderline);
- Color& GetUnderlineColor();
- void SetDefaultUnderline(FontUnderline eUnderline);
+ void SetFontColor (const String& rsColorName,const Color aColor);
+ void SetBrushColor (const String& rsColorName,const Color aColor);
+ void SetUnderline(FontUnderline eUnderline);
+ Color& GetUnderlineColor();
+ void SetDefaultUnderline(FontUnderline eUnderline);
- enum ColorType
- {
- FONT_COLOR = 1,
- BACK_COLOR = 2
- };
-
virtual void HandleContextChange (
const ::sfx2::sidebar::EnumContext aContext);
- // ControllerItem::ItemUpdateReceiverInterface
-
virtual void NotifyItemUpdate(
const sal_uInt16 nSId,
const SfxItemState eState,
@@ -93,71 +84,70 @@ public:
const bool bIsEnabled);
private:
- //ui controls
+ //ui controls
::boost::scoped_ptr<SvxSBFontNameBox> mpFontNameBox;
- FontSizeBox maFontSizeBox;
- ::boost::scoped_ptr<Window> mpToolBoxIncDecBackground;
- ::boost::scoped_ptr<ToolBox> mpToolBoxIncDec;
- ::boost::scoped_ptr<Window> mpToolBoxFontBackground;
- ::boost::scoped_ptr<ToolBox> mpToolBoxFont;
- ::boost::scoped_ptr<Window> mpToolBoxFontColorBackground;
- ::boost::scoped_ptr<ToolBox> mpToolBoxFontColor;
- ::boost::scoped_ptr<Window> mpToolBoxScriptBackground;
- ::boost::scoped_ptr<ToolBox> mpToolBoxScript;
- ::boost::scoped_ptr<Window> mpToolBoxScriptSwBackground;
- ::boost::scoped_ptr<ToolBox> mpToolBoxScriptSw;
- ::boost::scoped_ptr<Window> mpToolBoxSpacingBackground;
- ::boost::scoped_ptr<ToolBox> mpToolBoxSpacing;
- ::boost::scoped_ptr<Window> mpToolBoxHighlightBackground;
- ::boost::scoped_ptr<ToolBox> mpToolBoxHighlight;
- ::boost::scoped_ptr<ToolboxButtonColorUpdater> mpFontColorUpdater;
+ FontSizeBox maFontSizeBox;
+ ::boost::scoped_ptr<Window> mpToolBoxIncDecBackground;
+ ::boost::scoped_ptr<ToolBox> mpToolBoxIncDec;
+ ::boost::scoped_ptr<Window> mpToolBoxFontBackground;
+ ::boost::scoped_ptr<ToolBox> mpToolBoxFont;
+ ::boost::scoped_ptr<Window> mpToolBoxFontColorBackground;
+ ::boost::scoped_ptr<ToolBox> mpToolBoxFontColor;
+ ::boost::scoped_ptr<Window> mpToolBoxScriptBackground;
+ ::boost::scoped_ptr<ToolBox> mpToolBoxScript;
+ ::boost::scoped_ptr<Window> mpToolBoxScriptSwBackground;
+ ::boost::scoped_ptr<ToolBox> mpToolBoxScriptSw;
+ ::boost::scoped_ptr<Window> mpToolBoxSpacingBackground;
+ ::boost::scoped_ptr<ToolBox> mpToolBoxSpacing;
+ ::boost::scoped_ptr<Window> mpToolBoxHighlightBackground;
+ ::boost::scoped_ptr<ToolBox> mpToolBoxHighlight;
+ ::boost::scoped_ptr<ToolboxButtonColorUpdater> mpFontColorUpdater;
::boost::scoped_ptr<ToolboxButtonColorUpdater> mpHighlightUpdater;
- //control items
- ::sfx2::sidebar::ControllerItem maFontNameControl;
- ::sfx2::sidebar::ControllerItem maFontSizeControl;
- ::sfx2::sidebar::ControllerItem maWeightControl;
- ::sfx2::sidebar::ControllerItem maItalicControl;
- ::sfx2::sidebar::ControllerItem maUnderlineControl;
- ::sfx2::sidebar::ControllerItem maStrikeControl;
- ::sfx2::sidebar::ControllerItem maShadowControl;
- ::sfx2::sidebar::ControllerItem maFontColorControl;
- ::sfx2::sidebar::ControllerItem maScriptControlSw;
- ::sfx2::sidebar::ControllerItem maSuperScriptControl;
- ::sfx2::sidebar::ControllerItem maSubScriptControl;
- ::sfx2::sidebar::ControllerItem maSpacingControl;
- ::sfx2::sidebar::ControllerItem maHighlightControl;
- ::sfx2::sidebar::ControllerItem maSDFontGrow;
- ::sfx2::sidebar::ControllerItem maSDFontShrink;
-
- FontWeight meWeight;
- FontItalic meItalic;
- FontUnderline meUnderline;
- Color meUnderlineColor; //
- bool mbShadow;
- FontStrikeout meStrike;
- bool mbWeightAvailable;
- bool mbPostureAvailable;
- Color maColor;
- bool mbColorAvailable;
- Color maBackColor;
- bool mbBackColorAvailable;
- ColorType meColorType;
- SvxEscapement meEscape; //for sw
- bool mbSuper;
- bool mbSub;
- bool mbKernAvailable;
- bool mbKernLBAvailable;
- long mlKerning;
- SvxFontHeightItem* mpHeightItem;
-
- const FontList* mpFontList;
- bool mbMustDelete;
- bool mbFocusOnFontSizeCtrl;
- TextCharacterSpacingPopup maCharSpacePopup;
- TextUnderlinePopup maUnderlinePopup;
- ColorPopup maFontColorPopup;
- ColorPopup maBrushColorPopup;
+ //control items
+ ::sfx2::sidebar::ControllerItem maFontNameControl;
+ ::sfx2::sidebar::ControllerItem maFontSizeControl;
+ ::sfx2::sidebar::ControllerItem maWeightControl;
+ ::sfx2::sidebar::ControllerItem maItalicControl;
+ ::sfx2::sidebar::ControllerItem maUnderlineControl;
+ ::sfx2::sidebar::ControllerItem maStrikeControl;
+ ::sfx2::sidebar::ControllerItem maShadowControl;
+ ::sfx2::sidebar::ControllerItem maFontColorControl;
+ ::sfx2::sidebar::ControllerItem maScriptControlSw;
+ ::sfx2::sidebar::ControllerItem maSuperScriptControl;
+ ::sfx2::sidebar::ControllerItem maSubScriptControl;
+ ::sfx2::sidebar::ControllerItem maSpacingControl;
+ ::sfx2::sidebar::ControllerItem maHighlightControl;
+ ::sfx2::sidebar::ControllerItem maSDFontGrow;
+ ::sfx2::sidebar::ControllerItem maSDFontShrink;
+
+ FontWeight meWeight;
+ FontItalic meItalic;
+ FontUnderline meUnderline;
+ Color meUnderlineColor;
+ bool mbShadow;
+ FontStrikeout meStrike;
+ bool mbWeightAvailable;
+ bool mbPostureAvailable;
+ Color maColor;
+ bool mbColorAvailable;
+ Color maBackColor;
+ bool mbBackColorAvailable;
+ SvxEscapement meEscape; //for sw
+ bool mbSuper;
+ bool mbSub;
+ bool mbKernAvailable;
+ bool mbKernLBAvailable;
+ long mlKerning;
+ SvxFontHeightItem* mpHeightItem;
+
+ const FontList* mpFontList;
+ bool mbMustDelete;
+ bool mbFocusOnFontSizeCtrl;
+ TextCharacterSpacingPopup maCharSpacePopup;
+ TextUnderlinePopup maUnderlinePopup;
+ ColorPopup maFontColorPopup;
+ ColorPopup maBrushColorPopup;
cssu::Reference<css::frame::XFrame> mxFrame;
::sfx2::sidebar::EnumContext maContext;
@@ -167,36 +157,35 @@ private:
Window* pParent,
const cssu::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings);
- virtual ~TextPropertyPanel (void);
+ virtual ~TextPropertyPanel (void);
+
-
- PopupControl* CreateCharacterSpacingControl (PopupContainer* pParent);
- PopupControl* CreateFontColorPopupControl (PopupContainer* pParent);
- PopupControl* CreateBrushColorPopupControl (PopupContainer* pParent);
- PopupControl* CreateUnderlinePopupControl (PopupContainer* pParent);
- DECL_LINK(SpacingClickHdl, ToolBox*);
- DECL_LINK(ToolBoxFontColorDropHdl, ToolBox *); //for new color picker
- DECL_LINK(ToolBoxHighlightDropHdl, ToolBox *);
- DECL_LINK(ToolBoxUnderlineClickHdl, ToolBox* );
+ PopupControl* CreateCharacterSpacingControl (PopupContainer* pParent);
+ PopupControl* CreateFontColorPopupControl (PopupContainer* pParent);
+ PopupControl* CreateBrushColorPopupControl (PopupContainer* pParent);
+ PopupControl* CreateUnderlinePopupControl (PopupContainer* pParent);
+ DECL_LINK(SpacingClickHdl, ToolBox*);
+ DECL_LINK(ToolBoxFontColorDropHdl, ToolBox *); //for new color picker
+ DECL_LINK(ToolBoxHighlightDropHdl, ToolBox *);
+ DECL_LINK(ToolBoxUnderlineClickHdl, ToolBox* );
- void Initialize (void);
+ void Initialize (void);
void SetupToolboxItems (void);
- void InitToolBoxFont();
- void InitToolBoxIncDec();
- void InitToolBoxFontColor();
- void InitToolBoxScript();
- void InitToolBoxHighlight();
- void InitToolBoxSpacing();
-
- DECL_LINK(FontSelHdl, FontNameBox *);
- DECL_LINK(FontSizeModifyHdl, FontSizeBox *);
- DECL_LINK(FontSizeSelHdl, FontSizeBox *);
- DECL_LINK(FontSizeLoseFocus, FontSizeBox *);
- DECL_LINK(ToolboxFontSelectHandler, ToolBox *);
- DECL_LINK(ToolboxIncDecSelectHdl, ToolBox *);
- DECL_LINK(ImplPopupModeEndHdl, FloatingWindow* );
- DECL_LINK(ToolBoxSwScriptSelectHdl, ToolBox *);
- DECL_LINK(ToolBoxScriptSelectHdl, ToolBox *);
+ void InitToolBoxFont();
+ void InitToolBoxIncDec();
+ void InitToolBoxFontColor();
+ void InitToolBoxScript();
+ void InitToolBoxHighlight();
+ void InitToolBoxSpacing();
+
+ DECL_LINK(FontSelHdl, FontNameBox *);
+ DECL_LINK(FontSizeModifyHdl, FontSizeBox *);
+ DECL_LINK(FontSizeSelHdl, FontSizeBox *);
+ DECL_LINK(FontSizeLoseFocus, FontSizeBox *);
+ DECL_LINK(ToolboxFontSelectHandler, ToolBox *);
+ DECL_LINK(ToolboxIncDecSelectHdl, ToolBox *);
+ DECL_LINK(ToolBoxSwScriptSelectHdl, ToolBox *);
+ DECL_LINK(ToolBoxScriptSelectHdl, ToolBox *);
void UpdateItem (const sal_uInt16 nSlotId);
};
Modified: openoffice/trunk/main/svx/source/sidebar/text/TextUnderlineControl.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/sidebar/text/TextUnderlineControl.cxx?rev=1477636&r1=1477635&r2=1477636&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/sidebar/text/TextUnderlineControl.cxx (original)
+++ openoffice/trunk/main/svx/source/sidebar/text/TextUnderlineControl.cxx Tue Apr 30 14:04:43 2013
@@ -85,14 +85,6 @@ TextUnderlineControl::TextUnderlineContr
void TextUnderlineControl::initial()
{
- /*maPBOptions.SetDefBkColor(GetSettings().GetStyleSettings().GetHighContrastMode()?
- GetSettings().GetStyleSettings().GetMenuColor():
- sfx2::sidebar::Theme::GetColor( sfx2::sidebar::Theme::Paint_DropDownBackground ));//Color(244,245,249)//for high contract
- maPBOptions.SetHoverBkColor(GetSettings().GetStyleSettings().GetHighContrastMode()?
- GetSettings().GetStyleSettings().GetMenuColor():
- sfx2::sidebar::Theme::GetColor( sfx2::sidebar::Theme::Paint_PanelBackground ) );//Color( 93, 120, 163 )
- maPBOptions.SetHoverTxtColor( sfx2::sidebar::Theme::GetColor( sfx2::sidebar::Theme::Color_PanelTitleFont ) );//Color( 255, 255, 255 )
- maPBOptions.SetIcoPosX( 2);*/
maVSUnderline.SetColor(GetSettings().GetStyleSettings().GetHighContrastMode()?
GetSettings().GetStyleSettings().GetMenuColor():
sfx2::sidebar::Theme::GetColor( sfx2::sidebar::Theme::Paint_PanelBackground ));
@@ -160,74 +152,66 @@ void TextUnderlineControl::Rearrange(Fon
maVSUnderline.SetItemImage(8, GetDisplayBackground().GetColor().IsDark()? maIMGDashDotH : maIMGDashDot);
maVSUnderline.SetItemImage(9, GetDisplayBackground().GetColor().IsDark()? maIMGDashDotDotH : maIMGDashDotDot);
maVSUnderline.SetItemImage(10, GetDisplayBackground().GetColor().IsDark()? maIMGWaveH : maIMGWave);
-// maVSUnderline.SelectItem(0); //delete
-// maVSUnderline.SetNoSelection();
switch(eLine)
{
case UNDERLINE_SINGLE:
maVSUnderline.SetItemImage(1, maIMGSingleSel);
- maVSUnderline.SelectItem(1); //add
+ maVSUnderline.SelectItem(1);
maVSUnderline.GrabFocus();
break;
case UNDERLINE_DOUBLE:
maVSUnderline.SetItemImage(2, maIMGDoubleSel);
- maVSUnderline.SelectItem(2); //add
+ maVSUnderline.SelectItem(2);
maVSUnderline.GrabFocus();
break;
case UNDERLINE_BOLD:
maVSUnderline.SetItemImage(3, maIMGBoldSel);
- maVSUnderline.SelectItem(3); //add
+ maVSUnderline.SelectItem(3);
maVSUnderline.GrabFocus();
break;
case UNDERLINE_DOTTED:
maVSUnderline.SetItemImage(4, maIMGDotSel);
- maVSUnderline.SelectItem(4); //add
+ maVSUnderline.SelectItem(4);
maVSUnderline.GrabFocus();
break;
case UNDERLINE_BOLDDOTTED:
maVSUnderline.SetItemImage(5, maIMGDotBoldSel);
- maVSUnderline.SelectItem(5); //add
+ maVSUnderline.SelectItem(5);
maVSUnderline.GrabFocus();
break;
case UNDERLINE_DASH:
maVSUnderline.SetItemImage(6, maIMGDashSel);
- maVSUnderline.SelectItem(6); //add
+ maVSUnderline.SelectItem(6);
maVSUnderline.GrabFocus();
break;
case UNDERLINE_LONGDASH:
maVSUnderline.SetItemImage(7, maIMGDashLongSel);
- maVSUnderline.SelectItem(7); //add
+ maVSUnderline.SelectItem(7);
maVSUnderline.GrabFocus();
break;
case UNDERLINE_DASHDOT:
maVSUnderline.SetItemImage(8, maIMGDashDotSel);
- maVSUnderline.SelectItem(8); //add
+ maVSUnderline.SelectItem(8);
maVSUnderline.GrabFocus();
break;
case UNDERLINE_DASHDOTDOT:
maVSUnderline.SetItemImage(9, maIMGDashDotDotSel);
- maVSUnderline.SelectItem(9); //add
+ maVSUnderline.SelectItem(9);
maVSUnderline.GrabFocus();
break;
case UNDERLINE_WAVE:
maVSUnderline.SetItemImage(10, maIMGWaveSel);
- maVSUnderline.SelectItem(10); //add
+ maVSUnderline.SelectItem(10);
maVSUnderline.GrabFocus();
break;
case UNDERLINE_NONE:
default:
maVSUnderline.SelectItem(1);
- maVSUnderline.SetNoSelection();//add
+ maVSUnderline.SetNoSelection();
maPBOptions.GrabFocus();
}
maVSUnderline.StartSelection();
- //removed
- //if(mpPage->meContextType == PROPERTY_CONTEXT_SC_CELL)
- // maPBOptions.Disable();
- //else
- // maPBOptions.Enable();
- //removed end
}
ValueSet& TextUnderlineControl::GetValueSet()
{
@@ -244,20 +228,12 @@ IMPL_LINK(TextUnderlineControl, VSSelect
sal_uInt16 iPos = maVSUnderline.GetSelectItemId();
FontUnderline eUnderline = (FontUnderline)(sal_uInt64)maVSUnderline.GetItemData( iPos );
- //<<modified
- //SvxTextLineItem aLineItem(eUnderline, SID_ATTR_CHAR_UNDERLINE);
SvxUnderlineItem aLineItem(eUnderline, SID_ATTR_CHAR_UNDERLINE);
- //modify end>>
- //<<add , this line of code will keep the new underline use pre-color
- aLineItem.SetColor(mrTextPropertyPanel.GetUnderlineColor());
- //add end>>
+ aLineItem.SetColor(mrTextPropertyPanel.GetUnderlineColor());
mpBindings->GetDispatcher()->Execute(SID_ATTR_CHAR_UNDERLINE, SFX_CALLMODE_RECORD, &aLineItem, 0L);
- //add , for the popup page not update immediately
mrTextPropertyPanel.SetUnderline(eUnderline);
- //add end
- //mrTextPropertyPanel.SetDefaultUnderline(eUnderline);
mrTextPropertyPanel.EndUnderlinePopupMode();
}
@@ -273,9 +249,7 @@ IMPL_LINK(TextUnderlineControl, PBClickH
SfxDispatcher* pDisp = mpBindings->GetDispatcher();
pDisp->Execute( SID_CHAR_DLG_EFFECT, SFX_CALLMODE_ASYNCHRON );
}
- //add
mrTextPropertyPanel.EndUnderlinePopupMode();
- //add end
}
return 0;
}