diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-10-22 14:24:29 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-10-22 14:24:29 +0000 |
| commit | 4c2cb4201745e947eb2beaaec3e1357ecf41cafe (patch) | |
| tree | a88ee029f3e583fadc4c99b4cbe4c386b724ebc8 /sw/source/ui/inc/swuiccoll.hxx | |
| parent | 5a0d6fb9206aeb6d1dc549f5253b1e3e30069865 (diff) | |
INTEGRATION: CWS swusing (1.4.38); FILE MERGED
2007/10/10 14:15:12 tl 1.4.38.1: #i82476# make newly added 'using' declarations private
Diffstat (limited to 'sw/source/ui/inc/swuiccoll.hxx')
| -rw-r--r-- | sw/source/ui/inc/swuiccoll.hxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/ui/inc/swuiccoll.hxx b/sw/source/ui/inc/swuiccoll.hxx index 3a27003b4222..2d298ea7fd6e 100644 --- a/sw/source/ui/inc/swuiccoll.hxx +++ b/sw/source/ui/inc/swuiccoll.hxx @@ -4,9 +4,9 @@ * * $RCSfile: swuiccoll.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: hr $ $Date: 2007-09-27 12:11:06 $ + * last change: $Author: vg $ $Date: 2007-10-22 15:24:14 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -68,7 +68,7 @@ class SwCondCollPage : public SfxTabPage BOOL bNewTemplate; - SwCondCollPage(Window *pParent, const SfxItemSet &rSet); + SwCondCollPage(Window *pParent, const SfxItemSet &rSet); virtual ~SwCondCollPage(); virtual int DeactivatePage(SfxItemSet *pSet); @@ -77,11 +77,11 @@ class SwCondCollPage : public SfxTabPage DECL_LINK( AssignRemoveHdl, PushButton*); DECL_LINK( SelectHdl, ListBox* ); -public: - using TabPage::ActivatePage; using TabPage::DeactivatePage; +public: + static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); static USHORT* GetRanges(); |