diff options
| author | Oliver-Rainer Wittmann <orw@apache.org> | 2013-05-02 13:50:45 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2013-05-20 11:33:27 +0100 |
| commit | 256be018056fba834aff099baef452b59af586fc (patch) | |
| tree | ebfc5154991e44f5717abfe5c069cef469825736 /svx | |
| parent | 862395f6a1b1df8762c315f7ae56e0623810ce05 (diff) | |
Resolves: #i122105# text property panel, underline style control
correct application of chosen underline style in Calc cells and Drawing objects
in Writer
(cherry picked from commit fd23db16149eb517de9b2b403ff28ed0d31c83d6)
Change-Id: Id77299c173eef99ea2eea0c0896e9bfd0bd9d1eb
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/sidebar/text/TextUnderlineControl.cxx | 17 | ||||
| -rw-r--r-- | svx/source/sidebar/text/TextUnderlineControl.hxx | 4 |
2 files changed, 5 insertions, 16 deletions
diff --git a/svx/source/sidebar/text/TextUnderlineControl.cxx b/svx/source/sidebar/text/TextUnderlineControl.cxx index de04d1edfcd7..2499f0a21619 100644 --- a/svx/source/sidebar/text/TextUnderlineControl.cxx +++ b/svx/source/sidebar/text/TextUnderlineControl.cxx @@ -78,7 +78,7 @@ void TextUnderlineControl::initial() Link aLink = LINK( this, TextUnderlineControl, PBClickHdl ) ; maPBOptions.SetClickHdl(aLink); - maVSUnderline.SetStyle( maVSUnderline.GetStyle()| WB_3DLOOK | WB_NO_DIRECTSELECT );// WB_NAMEFIELD | WB_ITEMBORDER |WB_DOUBLEBORDER | WB_NONEFIELD | + maVSUnderline.SetStyle( maVSUnderline.GetStyle()| WB_3DLOOK | WB_NO_DIRECTSELECT ); maVSUnderline.InsertItem(1, maIMGSingle ,String(SVX_RES(STR_SINGLE))); maVSUnderline.SetItemData(1, (void*)(sal_uInt64)UNDERLINE_SINGLE); @@ -118,10 +118,7 @@ void TextUnderlineControl::initial() maVSUnderline.Show(); } -void TextUnderlineControl::GetFocus() -{ - maVSUnderline.GrabFocus(); -} + void TextUnderlineControl::Rearrange(FontUnderline eLine) { maVSUnderline.SetItemImage(1, maIMGSingle); @@ -195,14 +192,8 @@ void TextUnderlineControl::Rearrange(FontUnderline eLine) } maVSUnderline.StartSelection(); } -ValueSet& TextUnderlineControl::GetValueSet() -{ - return maVSUnderline; -} -Control& TextUnderlineControl::GetPB() -{ - return maPBOptions; -} + + IMPL_LINK(TextUnderlineControl, VSSelectHdl, void *, pControl) { if(pControl == &maVSUnderline) diff --git a/svx/source/sidebar/text/TextUnderlineControl.hxx b/svx/source/sidebar/text/TextUnderlineControl.hxx index a57ee00cd2f7..1eeb83492dda 100644 --- a/svx/source/sidebar/text/TextUnderlineControl.hxx +++ b/svx/source/sidebar/text/TextUnderlineControl.hxx @@ -39,10 +39,8 @@ public: Window* pParent, svx::sidebar::TextPropertyPanel& rPanel, SfxBindings* pBindings); - void GetFocus(); void Rearrange(FontUnderline eLine); - ValueSet& GetValueSet(); - Control& GetPB(); + private: svx::sidebar::TextPropertyPanel& mrTextPropertyPanel; SfxBindings* mpBindings; |