diff options
| author | Dirk Grobler <dg@openoffice.org> | 2001-06-21 11:39:01 +0000 |
|---|---|---|
| committer | Dirk Grobler <dg@openoffice.org> | 2001-06-21 11:39:01 +0000 |
| commit | 7bd525b89dc9986bf30595fd7d6082bc9f034243 (patch) | |
| tree | 1754e945e6e00faeaaf4f93774c9fce0cd1d77d3 /sfx2 | |
| parent | ccee61d05c3528e990c3993b8821099d96a60785 (diff) | |
#88512# smtpsettings not needed anymore
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/appcfg.cxx | 9 | ||||
| -rw-r--r-- | sfx2/source/dialog/makefile.mk | 6 |
2 files changed, 8 insertions, 7 deletions
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx index 43cd31a7b474..092c9088363b 100644 --- a/sfx2/source/appl/appcfg.cxx +++ b/sfx2/source/appl/appcfg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: appcfg.cxx,v $ * - * $Revision: 1.27 $ + * $Revision: 1.28 $ * - * last change: $Author: mba $ $Date: 2001-06-18 10:05:25 $ + * last change: $Author: dg $ $Date: 2001-06-21 12:39:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -417,12 +417,13 @@ BOOL SfxApplication::GetOptions( SfxItemSet& rSet ) aSaveOptions.IsSaveRelFSys() ) ) ) bRet = TRUE; break; +#ifndef TF_CFGDATA case SID_INET_SMTPSERVER : if(rSet.Put( SfxStringItem ( rPool.GetWhich( SID_INET_SMTPSERVER), aInetOptions.GetSmtpServerName() ))) bRet = TRUE; break; - +#endif case SID_INET_POPSERVER : case SID_INET_NNTPSERVER : case SID_INET_MAXNEWS : @@ -872,12 +873,14 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet ) #endif // SMTP-Server +#ifndef TF_CFGDATA if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_INET_SMTPSERVER), TRUE, &pItem)) { DBG_ASSERT(pItem->ISA(SfxStringItem), "StringItem expected"); aInetOptions.SetSmtpServerName(((const SfxStringItem *)pItem)->GetValue()); bResetSession = TRUE; } +#endif if( ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_INET_POPSERVER), TRUE, &pItem)) || ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_INET_NNTPSERVER), TRUE, &pItem)) || diff --git a/sfx2/source/dialog/makefile.mk b/sfx2/source/dialog/makefile.mk index 74289343b1c8..24132af2e903 100644 --- a/sfx2/source/dialog/makefile.mk +++ b/sfx2/source/dialog/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.7 $ +# $Revision: 1.8 $ # -# last change: $Author: mba $ $Date: 2001-06-11 09:59:24 $ +# last change: $Author: dg $ $Date: 2001-06-21 12:37:43 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -93,7 +93,6 @@ SLOFILES =\ $(SLO)$/intro.obj \ $(SLO)$/macropg.obj \ $(SLO)$/mailchildwin.obj \ - $(SLO)$/maillistener.obj \ $(SLO)$/mailmodel.obj \ $(SLO)$/mailwindow.obj \ $(SLO)$/menucfg.obj \ @@ -119,7 +118,6 @@ EXCEPTIONSFILES=\ $(SLO)$/filedlghelper.obj \ $(SLO)$/filepicker.obj \ $(SLO)$/folderpicker.obj \ - $(SLO)$/maillistener.obj \ $(SLO)$/mailmodel.obj SRCFILES =\ |