diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-10-24 14:31:07 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-10-24 14:31:07 +0000 |
| commit | cb0ba286eaaff15d4b2afb9c176be4b53a000e2d (patch) | |
| tree | 58ee5c3dd08bf2009c75935b08c7e75e89452264 /sw/source/ui/dbui/mmconfigitem.cxx | |
| parent | b8be8c7e87fce52b654a6b67e5369049b024e489 (diff) | |
INTEGRATION: CWS os57 (1.3.228); FILE MERGED
2005/10/06 06:29:49 os 1.3.228.3: RESYNC: (1.5-1.6); FILE MERGED
2005/09/13 12:59:07 os 1.3.228.2: RESYNC: (1.3-1.5); FILE MERGED
2005/04/25 06:53:46 os 1.3.228.1: #i44371# setting filter works now
Diffstat (limited to 'sw/source/ui/dbui/mmconfigitem.cxx')
| -rw-r--r-- | sw/source/ui/dbui/mmconfigitem.cxx | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/sw/source/ui/dbui/mmconfigitem.cxx b/sw/source/ui/dbui/mmconfigitem.cxx index 4108543940eb..083e69d1eb5f 100644 --- a/sw/source/ui/dbui/mmconfigitem.cxx +++ b/sw/source/ui/dbui/mmconfigitem.cxx @@ -4,9 +4,9 @@ * * $RCSfile: mmconfigitem.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: rt $ $Date: 2005-10-19 08:26:00 $ + * last change: $Author: hr $ $Date: 2005-10-24 15:31:07 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1009,16 +1009,14 @@ Reference< XResultSet> SwMailMergeConfigItem::GetResultSet() xRowProperties->setPropertyValue(C2U("CommandType"), makeAny(m_pImpl->aDBData.nCommandType)); xRowProperties->setPropertyValue(C2U("FetchSize"), makeAny((sal_Int32)10)); xRowProperties->setPropertyValue(C2U("ActiveConnection"), makeAny(m_pImpl->xConnection.getTyped())); - if(m_pImpl->sFilter.getLength()) + try { - try - { - xRowProperties->setPropertyValue(C2U("Filter"), makeAny(m_pImpl->sFilter)); - } - catch(Exception&) - { - DBG_ERROR("exception caught in xResultSet->SetFilter()") - } + xRowProperties->setPropertyValue(C2U("ApplyFilter"), makeAny(m_pImpl->sFilter.getLength()>0)); + xRowProperties->setPropertyValue(C2U("Filter"), makeAny(m_pImpl->sFilter)); + } + catch(Exception&) + { + DBG_ERROR("exception caught in xResultSet->SetFilter()") } xRowSet->execute(); m_pImpl->xResultSet = xRowSet.get(); @@ -1065,7 +1063,10 @@ void SwMailMergeConfigItem::SetFilter(::rtl::OUString& rFilter) { try { + xRowProperties->setPropertyValue(C2U("ApplyFilter"), makeAny(m_pImpl->sFilter.getLength()>0)); xRowProperties->setPropertyValue(C2U("Filter"), makeAny(m_pImpl->sFilter)); + uno::Reference<XRowSet> xRowSet( m_pImpl->xResultSet, UNO_QUERY_THROW ); + xRowSet->execute(); } catch(Exception&) { |