diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2015-07-04 23:22:53 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2015-07-04 23:58:50 +0200 |
| commit | 88298839b51ef511161cddd5b20f001462384eea (patch) | |
| tree | 29db811af8c099bcc10672218bb90c5f2089527d /sw/source/uibase/inc/mmconfigitem.hxx | |
| parent | 4999ebf208c5626ecb72fa6b2da11610268d8ad0 (diff) | |
tdf#90377: fix exclude recipient in mail merge
- first, actually use the selection in MergeNew()
- secoond, bring back GetSelection() for that
- third, throw away lots of the old (dead) code that mostly just
stumbled over itself
- e.g. ExcludeRecord() wouldnt work on the last element due to a
off-by-one error
Change-Id: I07d07e086b748b393f2ada7cb22fdb2ce285ad65
Diffstat (limited to 'sw/source/uibase/inc/mmconfigitem.hxx')
| -rw-r--r-- | sw/source/uibase/inc/mmconfigitem.hxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sw/source/uibase/inc/mmconfigitem.hxx b/sw/source/uibase/inc/mmconfigitem.hxx index 7b4115ed7689..07f216c199e3 100644 --- a/sw/source/uibase/inc/mmconfigitem.hxx +++ b/sw/source/uibase/inc/mmconfigitem.hxx @@ -22,6 +22,7 @@ #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/uno/Reference.hxx> #include <tools/resary.hxx> +#include <set> #include <swdbdata.hxx> #include "swdllapi.h" #include "sharedconnection.hxx" @@ -56,7 +57,7 @@ class SW_DLLPUBLIC SwMailMergeConfigItem bool m_bGreetingInserted; sal_Int32 m_nGreetingMoves; OUString m_rAddressBlockFrame; - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any> m_aSelection; + std::set<sal_Int32> m_aExcludedRecords; sal_uInt16 m_nStartPrint; sal_uInt16 m_nEndPrint; @@ -112,8 +113,9 @@ public: sal_Int32 GetResultSetPosition()const; bool IsResultSetFirstLast(bool& bIsFirst, bool& bIsLast); - bool IsRecordExcluded(sal_Int32 nRecord); + bool IsRecordExcluded(sal_Int32 nRecord) const; void ExcludeRecord(sal_Int32 nRecord, bool bExclude); + css::uno::Sequence< css::uno::Any> GetSelection() const; const com::sun::star::uno::Sequence< OUString>& GetSavedDocuments() const; |