diff options
author | Ocke Janssen [oj] <Ocke.Janssen@oracle.com> | 2011-01-03 14:41:49 +0100 |
---|---|---|
committer | Ocke Janssen [oj] <Ocke.Janssen@oracle.com> | 2011-01-03 14:41:49 +0100 |
commit | e28d24e20f58c0736b31db3beee93a8881849bc9 (patch) | |
tree | bd2c3daeb3c7760107ffe267e94327e306215c33 /dbaccess | |
parent | 263f3a4363e4b34a50ab96b73ff7f16072d3d470 (diff) |
dba34c: fix for flush and text recognize
Diffstat (limited to 'dbaccess')
-rw-r--r--[-rwxr-xr-x] | dbaccess/source/core/dataaccess/datasource.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/misc/DExport.cxx | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx index 835f5398efc7..4cd88751ea15 100755..100644 --- a/dbaccess/source/core/dataaccess/datasource.cxx +++ b/dbaccess/source/core/dataaccess/datasource.cxx @@ -204,7 +204,7 @@ void SAL_CALL FlushNotificationAdapter::disposing( const EventObject& Source ) t if ( xListener.is() ) xListener->disposing( Source ); - impl_dispose( false ); + impl_dispose( true ); } //-------------------------------------------------------------------------- diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx index f4ff8064181d..e84cc8142f6a 100644 --- a/dbaccess/source/ui/misc/DExport.cxx +++ b/dbaccess/source/ui/misc/DExport.cxx @@ -447,7 +447,8 @@ sal_Int16 ODatabaseExport::CheckString(const String& aCheckToken, sal_Int16 _nOl if ( eNumLang != LANGUAGE_NONE ) { nFormatKey = m_pFormatter->GetFormatForLanguageIfBuiltIn( nFormatKey, eNumLang ); - m_pFormatter->IsNumberFormat( m_sTextToken, nFormatKey, fOutNumber ); + if ( !m_pFormatter->IsNumberFormat( m_sTextToken, nFormatKey, fOutNumber ) ) + return NumberFormat::TEXT; } Reference<XPropertySet> xProp = xFormats->getByKey(nFormatKey); xProp->getPropertyValue(PROPERTY_TYPE) >>= nNumberFormat; |