diff options
| author | obo <obo@openoffice.org> | 2010-09-14 08:56:44 +0200 |
|---|---|---|
| committer | obo <obo@openoffice.org> | 2010-09-14 08:56:44 +0200 |
| commit | 20ff1d5bf41b295f0f771d292c5dd2832e26539e (patch) | |
| tree | 69232829c7a6037c33f9debc51e100d02e951916 | |
| parent | 3c2516682b1314edb6fa323b16a01cf6f25693f3 (diff) | |
| parent | 6fc90af7fff8c629587051cc9c31a135da3b6a99 (diff) | |
CWS-TOOLING: integrate CWS dba33h
| -rw-r--r-- | connectivity/source/commontools/formattedcolumnvalue.cxx | 13 | ||||
| -rw-r--r-- | sfx2/source/dialog/taskpane.cxx | 3 |
2 files changed, 12 insertions, 4 deletions
diff --git a/connectivity/source/commontools/formattedcolumnvalue.cxx b/connectivity/source/commontools/formattedcolumnvalue.cxx index 3707b7fdb65d..d63c83524389 100644 --- a/connectivity/source/commontools/formattedcolumnvalue.cxx +++ b/connectivity/source/commontools/formattedcolumnvalue.cxx @@ -326,9 +326,16 @@ namespace dbtools ::rtl::OUString sStringValue; if ( m_pData->m_xColumn.is() ) { - sStringValue = DBTypeConversion::getValue( - m_pData->m_xColumn, m_pData->m_xFormatter, m_pData->m_aNullDate, m_pData->m_nFormatKey, m_pData->m_nKeyType - ); + if ( m_pData->m_bNumericField ) + { + sStringValue = DBTypeConversion::getValue( + m_pData->m_xColumn, m_pData->m_xFormatter, m_pData->m_aNullDate, m_pData->m_nFormatKey, m_pData->m_nKeyType + ); + } + else + { + sStringValue = m_pData->m_xColumn->getString(); + } } return sStringValue; } diff --git a/sfx2/source/dialog/taskpane.cxx b/sfx2/source/dialog/taskpane.cxx index 5d763f81744d..30fe2460d512 100644 --- a/sfx2/source/dialog/taskpane.cxx +++ b/sfx2/source/dialog/taskpane.cxx @@ -253,10 +253,11 @@ namespace sfx2 pWindow->SetHelpId( HID_TASKPANE_WINDOW ); pWindow->SetOutputSizePixel( Size( 300, 450 ) ); - pWindow->Show(); dynamic_cast< SfxDockingWindow* >( pWindow )->Initialize( i_pInfo ); SetHideNotDelete( TRUE ); + + pWindow->Show(); } //------------------------------------------------------------------------------------------------------------------ |