diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-03-06 18:06:07 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-03-06 18:06:07 +0000 |
| commit | 03d1c163453ef4e4cdcb3987a07bcead2ef03208 (patch) | |
| tree | 322d8b7057bd176f7c79f514ca2937ed8b141a93 /sw/source | |
| parent | f6c91e6a9747c5674a8f258089af1a547c3699fe (diff) | |
INTEGRATION: CWS odbmacros2 (1.17.126); FILE MERGED
2008/02/11 11:13:29 fs 1.17.126.1: IWizardPage is COMMIT_REASON is deprecated - replace usages with CommitPageReason, while I have an svtools-incompatible CWS
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/ui/dbui/mmlayoutpage.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx index b62df0bfa945..b52eca7ec4dd 100644 --- a/sw/source/ui/dbui/mmlayoutpage.cxx +++ b/sw/source/ui/dbui/mmlayoutpage.cxx @@ -4,9 +4,9 @@ * * $RCSfile: mmlayoutpage.cxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: hr $ $Date: 2007-09-27 11:34:15 $ + * last change: $Author: kz $ $Date: 2008-03-06 19:06:07 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -321,11 +321,11 @@ void SwMailMergeLayoutPage::ActivatePage() /*-- 11.05.2004 10:41:26--------------------------------------------------- -----------------------------------------------------------------------*/ -sal_Bool SwMailMergeLayoutPage::commitPage(COMMIT_REASON _eReason) +sal_Bool SwMailMergeLayoutPage::commitPage( CommitPageReason _eReason ) { //now insert the frame and the greeting SwMailMergeConfigItem& rConfigItem = m_pWizard->GetConfigItem(); - if(CR_TRAVEL_NEXT == _eReason) + if(eTravelForward == _eReason) { long nLeft = static_cast< long >(m_aLeftMF.Denormalize(m_aLeftMF.GetValue(FUNIT_TWIP))); long nTop = static_cast< long >(m_aTopMF.Denormalize(m_aTopMF.GetValue(FUNIT_TWIP))); |