summaryrefslogtreecommitdiffstats
path: root/sw/source/ui/inc/mmconfigitem.hxx
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2006-01-06 12:04:52 +0000
committerKurt Zenker <kz@openoffice.org>2006-01-06 12:04:52 +0000
commit79aefac4920ab264dbf562a6cf11300cdb149ecf (patch)
tree30643bcd5561ca600757497a7b6b95261cac694d /sw/source/ui/inc/mmconfigitem.hxx
parentINTEGRATION: CWS os67 (1.3.270); FILE MERGED (diff)
downloadcore-79aefac4920ab264dbf562a6cf11300cdb149ecf.tar.gz
core-79aefac4920ab264dbf562a6cf11300cdb149ecf.zip
INTEGRATION: CWS os67 (1.5.92); FILE MERGED
2005/12/14 12:42:54 os 1.5.92.3: RESYNC: (1.6-1.7); FILE MERGED 2005/09/28 06:51:42 os 1.5.92.2: RESYNC: (1.5-1.6); FILE MERGED 2005/09/26 11:54:23 os 1.5.92.1: #i36696# MailMerge: hide empty Address lines; #ii51947# work flow in address page changed
Diffstat (limited to 'sw/source/ui/inc/mmconfigitem.hxx')
-rw-r--r--sw/source/ui/inc/mmconfigitem.hxx12
1 files changed, 9 insertions, 3 deletions
diff --git a/sw/source/ui/inc/mmconfigitem.hxx b/sw/source/ui/inc/mmconfigitem.hxx
index 3046dff69ad2..8c12c0ba5b14 100644
--- a/sw/source/ui/inc/mmconfigitem.hxx
+++ b/sw/source/ui/inc/mmconfigitem.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: mmconfigitem.hxx,v $
*
- * $Revision: 1.7 $
+ * $Revision: 1.8 $
*
- * last change: $Author: hr $ $Date: 2005-09-23 11:48:52 $
+ * last change: $Author: kz $ $Date: 2006-01-06 13:04:52 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -125,7 +125,7 @@ public:
GetColumnsSupplier();
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>
- GetResultSet();
+ GetResultSet() const;
void DisposeResultSet();
@@ -157,6 +157,9 @@ public:
sal_Bool IsAddressBlock()const;
void SetAddressBlock(sal_Bool bSet);
+ sal_Bool IsHideEmptyParagraphs() const;
+ void SetHideEmptyParagraphs(sal_Bool bSet);
+
const com::sun::star::uno::Sequence< ::rtl::OUString>
GetAddressBlocks() const;
void SetAddressBlocks(const com::sun::star::uno::Sequence< ::rtl::OUString>& rBlocks);
@@ -190,6 +193,9 @@ public:
const SwDBData& rDBData,
const com::sun::star::uno::Sequence< ::rtl::OUString>& );
+ bool IsAddressFieldsAssigned() const;
+ bool IsGreetingFieldsAssigned() const;
+
//e-Mail settings:
::rtl::OUString GetMailDisplayName() const;
void SetMailDisplayName(const ::rtl::OUString& rName);