diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-09-23 10:48:38 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-09-23 10:48:38 +0000 |
| commit | 752c1f68c15166693b05b3b5384fbe4f2d57ceca (patch) | |
| tree | 3ddd59ef74803c6abed53ddf54789c64e5af2fd9 /sw/source/ui/dbui/mmconfigitem.cxx | |
| parent | b9befd6c6aea6eb2f53b9f093f0d502f4826426f (diff) | |
INTEGRATION: CWS dba201b (1.4.22); FILE MERGED
2005/09/21 13:16:31 oj 1.4.22.3: RESYNC: (1.4-1.5); FILE MERGED
2005/07/22 07:16:43 fs 1.4.22.2: #i10000#
2005/07/21 14:27:03 fs 1.4.22.1: slight syntax changes to the recently introduced SharedUNOComponent for better readability of client code
Diffstat (limited to 'sw/source/ui/dbui/mmconfigitem.cxx')
| -rw-r--r-- | sw/source/ui/dbui/mmconfigitem.cxx | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sw/source/ui/dbui/mmconfigitem.cxx b/sw/source/ui/dbui/mmconfigitem.cxx index d376dab833fc..2e5e73663c9c 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.5 $ + * $Revision: 1.6 $ * - * last change: $Author: rt $ $Date: 2005-09-09 06:57:38 $ + * last change: $Author: hr $ $Date: 2005-09-23 11:48:38 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -117,7 +117,7 @@ #include <svtools/svstdarr.hxx> using namespace utl; -using namespace rtl; +using ::rtl::OUString; using namespace com::sun::star; using namespace com::sun::star::uno; using namespace com::sun::star::lang; @@ -989,8 +989,10 @@ Reference< XResultSet> SwMailMergeConfigItem::GetResultSet() { if(!m_pImpl->xConnection.is() && m_pImpl->aDBData.sDataSource.getLength()) { - m_pImpl->xConnection = SharedConnection( SwNewDBMgr::GetConnection( - m_pImpl->aDBData.sDataSource, m_pImpl->xSource), true ); + m_pImpl->xConnection.reset( + SwNewDBMgr::GetConnection( m_pImpl->aDBData.sDataSource, m_pImpl->xSource ), + SharedConnection::TakeOwnership + ); } if(!m_pImpl->xResultSet.is() && m_pImpl->xConnection.is()) { @@ -1884,4 +1886,4 @@ void SwMailMergeConfigItem::SetSourceView(SwView* pView) m_pImpl->bUserSettingWereOverwritten = sal_False; } } -}
\ No newline at end of file +} |