diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-01-31 17:33:50 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-01-31 17:33:50 +0000 |
| commit | 1f1e487347f0b24617b18a7c6cebec9b7a76190e (patch) | |
| tree | 8a66533b33e15cfee1da9660d88262d61e9f242c /sw/source/ui/dbui/mailmergehelper.cxx | |
| parent | b9fc32f0a7b11aaff276918b0c7539fe8c22dae7 (diff) | |
INTEGRATION: CWS os73 (1.8.104); FILE MERGED
2005/12/30 13:49:49 os 1.8.104.1: #i59289# catch SQLException from XColumn->getString()
Diffstat (limited to 'sw/source/ui/dbui/mailmergehelper.cxx')
| -rw-r--r-- | sw/source/ui/dbui/mailmergehelper.cxx | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/sw/source/ui/dbui/mailmergehelper.cxx b/sw/source/ui/dbui/mailmergehelper.cxx index 5a3ffd4ff74d..e7fb605ae29b 100644 --- a/sw/source/ui/dbui/mailmergehelper.cxx +++ b/sw/source/ui/dbui/mailmergehelper.cxx @@ -4,9 +4,9 @@ * * $RCSfile: mailmergehelper.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: hr $ $Date: 2005-10-24 15:30:29 $ + * last change: $Author: kz $ $Date: 2006-01-31 18:33:50 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -632,18 +632,25 @@ String SwAddressPreview::FillData( aCol >>= xColumn; if(xColumn.is()) { - ::rtl::OUString sReplace = xColumn->getString(); - - if( bSpecialReplacementForCountry && sCountryColumn == sConvertedColumn ) + try { - if( rExcludeCountry.getLength() && sReplace != rExcludeCountry ) - aItem.sText = sReplace; + ::rtl::OUString sReplace = xColumn->getString(); + + if( bSpecialReplacementForCountry && sCountryColumn == sConvertedColumn ) + { + if( rExcludeCountry.getLength() && sReplace != rExcludeCountry ) + aItem.sText = sReplace; + else + aItem.sText.Erase(); + } else - aItem.sText.Erase(); + { + aItem.sText = sReplace; + } } - else + catch( sdbc::SQLException& ) { - aItem.sText = sReplace; + DBG_ERROR("SQLException caught") } } } |