diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-10-22 14:24:43 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-10-22 14:24:43 +0000 |
| commit | 8b006db1bfff98cbc91776ac7693de2709fad55a (patch) | |
| tree | 7e004ddaacd17b7a915b61ef46b85f5cea7ff2a8 /sw/source/ui/inc/textcontrolcombo.hxx | |
| parent | 4c2cb4201745e947eb2beaaec3e1357ecf41cafe (diff) | |
INTEGRATION: CWS swusing (1.5.38); FILE MERGED
2007/10/12 09:58:34 tl 1.5.38.2: #i82476# make 'using' declarations private
2007/10/10 14:15:12 tl 1.5.38.1: #i82476# make newly added 'using' declarations private
Diffstat (limited to 'sw/source/ui/inc/textcontrolcombo.hxx')
| -rw-r--r-- | sw/source/ui/inc/textcontrolcombo.hxx | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sw/source/ui/inc/textcontrolcombo.hxx b/sw/source/ui/inc/textcontrolcombo.hxx index e0fec2b69ef0..36477e6e31de 100644 --- a/sw/source/ui/inc/textcontrolcombo.hxx +++ b/sw/source/ui/inc/textcontrolcombo.hxx @@ -4,9 +4,9 @@ * * $RCSfile: textcontrolcombo.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: hr $ $Date: 2007-09-27 12:12:32 $ + * last change: $Author: vg $ $Date: 2007-10-22 15:24:43 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -48,12 +48,17 @@ class SW_DLLPUBLIC TextControlCombo : public Window { -private: protected: + Control& mrCtrl; FixedText& mrFTbefore; FixedText& mrFTafter; + public: + + using Window::Enable; + using Window::Disable; + TextControlCombo( Window* _pParent, const ResId& _rResId, Control& _rCtrl, FixedText& _rFTbefore, FixedText& _rFTafter ); virtual ~TextControlCombo(); @@ -64,10 +69,7 @@ public: void Show( BOOL bVisible = TRUE, USHORT nFlags = 0 ); void Hide( USHORT nFlags = 0 ) { Show( FALSE, nFlags ); } - using Window::Enable; void Enable( BOOL bEnable = TRUE, BOOL bChild = TRUE ); - - using Window::Disable; void Disable( BOOL bChild = TRUE ) { Enable( FALSE, bChild ); } }; |