diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-03-06 18:07:48 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-03-06 18:07:48 +0000 |
| commit | 3bf92148097a058ef39a983cba626cf9917be444 (patch) | |
| tree | 817f08d94ff72259b8497f47f978d7167a111c9c /sw/source | |
| parent | 778a9d979a7b1c13b45888f77fb13462604d8e66 (diff) | |
INTEGRATION: CWS odbmacros2 (1.7.88); FILE MERGED
2008/01/15 11:50:41 fs 1.7.88.1: some re-factoring of OWizardMachine, RoadmapWizard and derived classes, to prepare the migration UI for #i49133#
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/ui/inc/mailmergewizard.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/ui/inc/mailmergewizard.hxx b/sw/source/ui/inc/mailmergewizard.hxx index b08e49213bc3..31fc8b2f9aec 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.7 $ + * $Revision: 1.8 $ * - * last change: $Author: vg $ $Date: 2007-10-22 15:20:11 $ + * last change: $Author: kz $ $Date: 2008-03-06 19:07:48 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -78,7 +78,7 @@ protected: // roadmap feature ?? // virtual sal_Bool prepareLeaveCurrentState( CommitPageReason _eReason ); - virtual String getStateDisplayName( WizardState _nState ); + virtual String getStateDisplayName( WizardState _nState ) const; public: SwMailMergeWizard(SwView& rView, SwMailMergeConfigItem& rConfigItem); |