diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-09-20 12:24:11 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-09-20 12:24:11 +0000 |
| commit | 415f201b43abb5813ceb558467d27f35de1a6542 (patch) | |
| tree | 4e23226ff644a1bd3786795e8fa0f0eb28a1521f /sw/source/ui/uiview | |
| parent | 10f0921800e008710562813f40b356c85d87b4ca (diff) | |
INTEGRATION: CWS swmailmerge (1.15.166); FILE MERGED
2004/09/03 13:10:24 os 1.15.166.3: #i25107# update source view after reload
2004/06/25 13:39:17 os 1.15.166.2: #i25107# weekly check-in
2004/05/28 12:45:35 os 1.15.166.1: #i25107# ChildWindow to return to the mail merge wizard
Diffstat (limited to 'sw/source/ui/uiview')
| -rw-r--r-- | sw/source/ui/uiview/uivwimp.cxx | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/sw/source/ui/uiview/uivwimp.cxx b/sw/source/ui/uiview/uivwimp.cxx index bc990ef832e9..e6aa8df81b15 100644 --- a/sw/source/ui/uiview/uivwimp.cxx +++ b/sw/source/ui/uiview/uivwimp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: uivwimp.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: vg $ $Date: 2004-01-06 18:25:54 $ + * last change: $Author: rt $ $Date: 2004-09-20 13:24:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -123,6 +123,9 @@ #ifndef _EDTWIN_HXX #include <edtwin.hxx> #endif +#ifndef _MMCONFIGITEM_HXX +#include <mmconfigitem.hxx> +#endif #include <view.hrc> @@ -139,7 +142,10 @@ using namespace ::com::sun::star::datatransfer::clipboard; SwView_Impl::SwView_Impl(SwView* pShell) : pView(pShell), pxXTextView(new uno::Reference<view::XSelectionSupplier>), - eShellMode(SEL_TEXT) + eShellMode(SEL_TEXT), + pConfigItem(0), + nMailMergeRestartPage(0), + bMailMergeSourceView(sal_True) { *pxXTextView = new SwXTextView(pView); xDisProvInterceptor = new SwXDispatchProviderInterceptor(*pView); @@ -168,6 +174,7 @@ SwView_Impl::~SwView_Impl() pClipEvtLstnr->AddRemoveListener( FALSE ); pClipEvtLstnr->ViewDestroyed(); } + delete pConfigItem; } /*-----------------13.12.97 09:54------------------- |