diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-09-27 10:34:58 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-09-27 10:34:58 +0000 |
| commit | 3bc35c937e88de5336ab79c08cd46324d5d365b5 (patch) | |
| tree | 10dbb5211407c24fc01fe016d36233bb34e7ee7a /sw/source/ui/dbui/mmoutputpage.hxx | |
| parent | INTEGRATION: CWS swwarnings (1.17.118); FILE MERGED (diff) | |
| download | core-3bc35c937e88de5336ab79c08cd46324d5d365b5.tar.gz core-3bc35c937e88de5336ab79c08cd46324d5d365b5.zip | |
INTEGRATION: CWS swwarnings (1.7.242); FILE MERGED
2007/03/26 12:08:53 tl 1.7.242.2: #i69287# warning-free code
2007/02/26 15:59:12 os 1.7.242.1: #i69287# warnings removed
Diffstat (limited to 'sw/source/ui/dbui/mmoutputpage.hxx')
| -rw-r--r-- | sw/source/ui/dbui/mmoutputpage.hxx | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sw/source/ui/dbui/mmoutputpage.hxx b/sw/source/ui/dbui/mmoutputpage.hxx index 1e951e8083ba..e16635e88249 100644 --- a/sw/source/ui/dbui/mmoutputpage.hxx +++ b/sw/source/ui/dbui/mmoutputpage.hxx @@ -4,9 +4,9 @@ * * $RCSfile: mmoutputpage.hxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: hr $ $Date: 2006-08-14 17:32:22 $ + * last change: $Author: hr $ $Date: 2007-09-27 11:34:58 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -128,9 +128,6 @@ class SwMailMergeOutputPage : public svt::OWizardPage PushButton m_aSendAsPB; PushButton m_aSendDocumentsPB; - SwMailMergeWizard* m_pWizard; - - //some FixedLine labels String m_sSaveStartST; String m_sSaveMergedST; @@ -151,6 +148,8 @@ class SwMailMergeOutputPage : public svt::OWizardPage long m_nFromToNFPos; long m_nRBOffset; + SwMailMergeWizard* m_pWizard; + //some dialog data Printer* m_pTempPrinter; SfxPrinter* m_pDocumentPrinterCopy; @@ -261,7 +260,7 @@ public: void AddDocument( SwMailDescriptor& rDesc ); void SetDocumentCount( sal_Int32 nAllDocuments ); void EnableDesctruction() {m_bDesctructionEnabled = true;} - void Show(); + void ShowDialog(); void DocumentSent( ::com::sun::star::uno::Reference< ::com::sun::star::mail::XMailMessage>, bool bResult, |