diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-10-22 14:20:11 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-10-22 14:20:11 +0000 |
| commit | fc2d3e71d503d9ba3efb1fc1e1c786569beafc8a (patch) | |
| tree | d0eb0ae5db9a32e850b2dd9883dbe33a99bda8ae /sw/source/ui/inc/mailmergewizard.hxx | |
| parent | INTEGRATION: CWS swusing (1.7.36); FILE MERGED (diff) | |
| download | core-fc2d3e71d503d9ba3efb1fc1e1c786569beafc8a.tar.gz core-fc2d3e71d503d9ba3efb1fc1e1c786569beafc8a.zip | |
INTEGRATION: CWS swusing (1.6.36); FILE MERGED
2007/10/10 14:15:11 tl 1.6.36.1: #i82476# make newly added 'using' declarations private
Diffstat (limited to 'sw/source/ui/inc/mailmergewizard.hxx')
| -rw-r--r-- | sw/source/ui/inc/mailmergewizard.hxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sw/source/ui/inc/mailmergewizard.hxx b/sw/source/ui/inc/mailmergewizard.hxx index 5d557c32a767..b08e49213bc3 100644 --- a/sw/source/ui/inc/mailmergewizard.hxx +++ b/sw/source/ui/inc/mailmergewizard.hxx @@ -4,9 +4,9 @@ * * $RCSfile: mailmergewizard.hxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: hr $ $Date: 2007-09-27 12:04:31 $ + * last change: $Author: vg $ $Date: 2007-10-22 15:20:11 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -70,6 +70,8 @@ class SwMailMergeWizard : public ::svt::RoadmapWizard sal_uInt16 m_nRestartPage; + using svt::OWizardMachine::skipUntil; + protected: virtual svt::OWizardPage* createPage(WizardState _nState); virtual void enterState( WizardState _nState ); @@ -94,7 +96,6 @@ public: sal_uInt16 GetRestartPage() const {return m_nRestartPage;} void SetRestartPage(sal_uInt16 nPage) { m_nRestartPage = nPage;} - using svt::OWizardMachine::skipUntil; sal_Bool skipUntil( sal_uInt16 nPage) {return ::svt::RoadmapWizard::skipUntil(WizardState(nPage));} |