diff options
author | Caolán McNamara <caolanm@redhat.com> | 2013-08-19 08:41:05 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-08-19 10:38:17 +0100 |
commit | b7bdc730188bbe183897a50dd17092f92df3b31a (patch) | |
tree | 6886bc76ab0437611dc5a0b915b8cd38e9a11c68 /sw | |
parent | 58b64704327190dc5c09d22cd329970ec0094477 (diff) |
bShowSelection is always false
Change-Id: I7a541a8ba6b561736e93c45ac9c20caddafcbe52
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/ui/fldui/fldfunc.cxx | 20 | ||||
-rw-r--r-- | sw/source/ui/fldui/fldfunc.hxx | 1 |
2 files changed, 3 insertions, 18 deletions
diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx index 80f5e1e44374..4bf01b39bb20 100644 --- a/sw/source/ui/fldui/fldfunc.cxx +++ b/sw/source/ui/fldui/fldfunc.cxx @@ -44,7 +44,6 @@ SwFldFuncPage::SwFldFuncPage(Window* pParent, const SfxItemSet& rCoreSet ) : aTypeFT (this, SW_RES(FT_FUNCTYPE)), aTypeLB (this, SW_RES(LB_FUNCTYPE)), - aSelectionFT(this, SW_RES(FT_FUNCSELECTION)), aSelectionLB(this, SW_RES(LB_FUNCSELECTION)), aFormatFT (this, SW_RES(FT_FUNCFORMAT)), aFormatLB (this, SW_RES(LB_FUNCFORMAT)), @@ -216,7 +215,6 @@ IMPL_LINK_NOARG(SwFldFuncPage, TypeHdl) } sal_Bool bValue = sal_False, bName = sal_False, bMacro = sal_False, bInsert = sal_True; - sal_Bool bShowSelection = sal_False; sal_Bool bFormat = nSize != 0; // two controls for conditional text @@ -366,20 +364,9 @@ IMPL_LINK_NOARG(SwFldFuncPage, TypeHdl) break; } - if (bShowSelection) - { - aSelectionLB.Show(); - aSelectionFT.Show(); - aFormatLB.Hide(); - aFormatFT.Hide(); - } - else - { - aFormatLB.Show(); - aFormatFT.Show(); - aSelectionLB.Hide(); - aSelectionFT.Hide(); - } + aFormatLB.Show(); + aFormatFT.Show(); + aSelectionLB.Hide(); aFormatLB.Enable(bFormat); aFormatFT.Enable(bFormat); @@ -498,7 +485,6 @@ void SwFldFuncPage::UpdateSubType() sal_Bool bEnable = nCount != 0; aSelectionLB.Enable( bEnable ); - aSelectionFT.Enable( bEnable ); if (bEnable) { diff --git a/sw/source/ui/fldui/fldfunc.hxx b/sw/source/ui/fldui/fldfunc.hxx index c90b7f1a57d5..3800ace2b900 100644 --- a/sw/source/ui/fldui/fldfunc.hxx +++ b/sw/source/ui/fldui/fldfunc.hxx @@ -34,7 +34,6 @@ class SwFldFuncPage : public SwFldPage { FixedText aTypeFT; ListBox aTypeLB; - FixedText aSelectionFT; ListBox aSelectionLB; FixedText aFormatFT; ListBox aFormatLB; |