diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2009-01-20 14:04:00 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2009-01-20 14:04:00 +0000 |
| commit | e6ab880f5d025fc889b829f463c34dd797db8fd5 (patch) | |
| tree | f68db12875d8f64420296df34a1331f25cf56697 /sw/source/ui/inc/mailmergewizard.hxx | |
| parent | CWS-TOOLING: integrate CWS tl64_DEV300 (diff) | |
| download | core-e6ab880f5d025fc889b829f463c34dd797db8fd5.tar.gz core-e6ab880f5d025fc889b829f463c34dd797db8fd5.zip | |
CWS-TOOLING: integrate CWS os124
2009-01-13 07:55:10 +0100 os r266195 : build error fixed
2009-01-12 17:56:41 +0100 os r266176 : CWS-TOOLING: rebase CWS os124 to trunk@265758 (milestone: DEV300:m38)
2008-12-29 15:24:28 +0100 os r265819 : #i97456# build error with PCH fixed
2008-12-29 15:12:28 +0100 os r265818 : #i97388# minimum values set for char width and text size
2008-12-29 10:22:09 +0100 os r265815 : #i94820# date fields imported with the correct type
2008-12-23 14:51:15 +0100 os r265783 : #ii97295# force shell update before inserting frmame or picture on click to field
2008-12-23 13:31:42 +0100 os r265779 : #i92817# annotation workaround added
2008-12-23 11:44:05 +0100 os r265776 : #i92817# import of annotation added
2008-12-23 11:42:22 +0100 os r265775 : #i92817# draw model needs to be created before creation of an Outliner
2008-12-23 08:49:13 +0100 os r265770 : #i97436#loading of documents in the wizard should only enable the second wizard page
2008-12-22 11:40:26 +0100 os r265750 : collect and set TableBorder property - currently not correctly processed in Writer
2008-12-18 16:31:38 +0100 os r265704 : #i97397# table/cell/paragraph background improved#
2008-12-10 14:36:00 +0100 os r265188 : #i30490# minimum decreased for fixed line spacing
2008-12-10 14:33:05 +0100 os r265186 : #i30490# minimum decreased for fixed line spacing
Diffstat (limited to 'sw/source/ui/inc/mailmergewizard.hxx')
| -rw-r--r-- | sw/source/ui/inc/mailmergewizard.hxx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sw/source/ui/inc/mailmergewizard.hxx b/sw/source/ui/inc/mailmergewizard.hxx index 5f705e588197..320e0be021fe 100644 --- a/sw/source/ui/inc/mailmergewizard.hxx +++ b/sw/source/ui/inc/mailmergewizard.hxx @@ -48,6 +48,8 @@ class SwMailMergeWizard : public ::svt::RoadmapWizard { SwView* m_pSwView; String sDocumentURL; + bool m_bDocumentLoad; + SwMailMergeConfigItem& m_rConfigItem; String m_sStarting; @@ -83,6 +85,9 @@ public: void SetReloadDocument(const String& rURL){sDocumentURL = rURL;} const String& GetReloadDocument() const {return sDocumentURL;} + //next step requires loading of document + void SetDocumentLoad(bool bSet) {m_bDocumentLoad = bSet;} + void UpdateRoadmap(); void CreateTargetDocument(); |