summaryrefslogtreecommitdiff
path: root/sw/source/ui/app/appopt.cxx
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2004-09-20 12:07:09 +0000
committerRüdiger Timm <rt@openoffice.org>2004-09-20 12:07:09 +0000
commit1dac26151fa16f8df61d131ee4dd01b039f16547 (patch)
tree73dab2c2bc0c0757a536ea7038c02018c8c227bc /sw/source/ui/app/appopt.cxx
parent5610d09810d815bff15b26d336db6ae65f6eab66 (diff)
INTEGRATION: CWS swmailmerge (1.24.20); FILE MERGED
2004/06/04 10:26:35 os 1.24.20.4: #i25107# mail merge dialogs move to swcui library 2004/06/03 06:45:35 os 1.24.20.3: #i25107# merge error corrected 2004/05/28 21:36:58 os 1.24.20.2: RESYNC: (1.24-1.25); FILE MERGED 2004/05/07 09:41:29 os 1.24.20.1: #i25107# Mail merge mailer configuration page
Diffstat (limited to 'sw/source/ui/app/appopt.cxx')
-rw-r--r--sw/source/ui/app/appopt.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/sw/source/ui/app/appopt.cxx b/sw/source/ui/app/appopt.cxx
index 645037913677..097692bd52d0 100644
--- a/sw/source/ui/app/appopt.cxx
+++ b/sw/source/ui/app/appopt.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: appopt.cxx,v $
*
- * $Revision: 1.26 $
+ * $Revision: 1.27 $
*
- * last change: $Author: rt $ $Date: 2004-09-20 12:36:28 $
+ * last change: $Author: rt $ $Date: 2004-09-20 13:07:09 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -710,6 +710,7 @@ SfxTabPage* SwModule::CreateTabPage( USHORT nId, Window* pParent, const SfxItemS
case RID_SW_TP_REDLINE_OPT: //CHINA001 pRet = SwRedlineOptionsTabPage::Create(pParent, rSet); break;
case RID_SW_TP_OPTLOAD_PAGE: //CHINA001 pRet = SwLoadOptPage::Create(pParent, rSet); break;
case RID_SW_TP_OPTCOMPATIBILITY_PAGE: //CHINA001 pRet = SwCompatibilityOptPage::Create(pParent, rSet); break;
+ case RID_SW_TP_MAILCONFIG:
{
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
if ( pFact )