diff options
| author | Vladimir Glazunov <vg@openoffice.org> | 2011-02-01 11:12:15 +0100 |
|---|---|---|
| committer | Vladimir Glazunov <vg@openoffice.org> | 2011-02-01 11:12:15 +0100 |
| commit | 5b7dc4c9b5c1190edce19e568676270f315c31e6 (patch) | |
| tree | b86109216072aed73f87a95253ced1e7e055b7db | |
| parent | d35fc74ef5cbfea5be6bbacc6474684c527a9739 (diff) | |
| parent | b1612410cc1e6dfb0a693724f4c06b60a1029e9b (diff) | |
CWS-TOOLING: integrate CWS dba34b
Notes
split repo tag: writer_ooo/DEV300_m99
| -rw-r--r-- | sw/inc/swdbtoolsclient.hxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/dbui/dbmgr.cxx | 5 | ||||
| -rw-r--r-- | sw/source/ui/dbui/swdbtoolsclient.cxx | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/sw/inc/swdbtoolsclient.hxx b/sw/inc/swdbtoolsclient.hxx index 324075d0aeb7..067e58cbcf52 100644 --- a/sw/inc/swdbtoolsclient.hxx +++ b/sw/inc/swdbtoolsclient.hxx @@ -64,7 +64,7 @@ public: const ::com::sun::star::lang::Locale& _rLocale ); - ::rtl::OUString getValue( + ::rtl::OUString getFormattedValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxColumn, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter>& _rxFormatter, const ::com::sun::star::lang::Locale& _rLocale, diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx index 85e0198ac70f..c3119dc14876 100644 --- a/sw/source/ui/dbui/dbmgr.cxx +++ b/sw/source/ui/dbui/dbmgr.cxx @@ -643,7 +643,8 @@ BOOL SwNewDBMgr::GetTableNames(ListBox* pListBox, const String& rDBName) else { rtl::OUString sDBName(rDBName); - xConnection = RegisterConnection( sDBName ); + if ( sDBName.getLength() ) + xConnection = RegisterConnection( sDBName ); } if(xConnection.is()) { @@ -1750,7 +1751,7 @@ String SwNewDBMgr::GetDBField(uno::Reference<XPropertySet> xColumnProps, try { SwDbtoolsClient& aClient = SwNewDBMgr::GetDbtoolsClient(); - sRet = aClient.getValue( + sRet = aClient.getFormattedValue( xColumnProps, rDBFormatData.xFormatter, rDBFormatData.aLocale, diff --git a/sw/source/ui/dbui/swdbtoolsclient.cxx b/sw/source/ui/dbui/swdbtoolsclient.cxx index ca50ee02d593..bb932f0f9a04 100644 --- a/sw/source/ui/dbui/swdbtoolsclient.cxx +++ b/sw/source/ui/dbui/swdbtoolsclient.cxx @@ -230,7 +230,7 @@ sal_Int32 SwDbtoolsClient::getDefaultNumberFormat( /* -----------------------------30.08.2001 12:38------------------------------ ---------------------------------------------------------------------------*/ -::rtl::OUString SwDbtoolsClient::getValue( +::rtl::OUString SwDbtoolsClient::getFormattedValue( const uno::Reference< beans::XPropertySet>& _rxColumn, const uno::Reference< util::XNumberFormatter>& _rxFormatter, const lang::Locale& _rLocale, @@ -242,7 +242,7 @@ sal_Int32 SwDbtoolsClient::getDefaultNumberFormat( getAccessTypeConversion(); rtl::OUString sRet; if(xConversion.is()) - sRet = xConversion->getValue(_rxColumn, _rxFormatter, _rLocale, _rNullDate); + sRet = xConversion->getFormattedValue(_rxColumn, _rxFormatter, _rLocale, _rNullDate); return sRet; } |