[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - svx/source

[Lionel Elie Mamane]

 svx/source/fmcomp/gridcell.cxx |   19 ++++---------------
 svx/source/inc/gridcell.hxx    |    1 -
 2 files changed, 4 insertions(+), 16 deletions(-)

New commits:
commit b8dfd3ae3c322d9cabc78e76c5a9d18ead5823cd
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Sun Dec 21 18:44:26 2014 +0100

    fdo#87555 ComboBox in table should use same formatting as floating ComboBox
    
    Same as fdo#67615 for TexFields, but for ComboBox.
    Same problem, same cause, same solution.
    ListBox seems not to have this problem :)
    
    Change-Id: I953c5452f6c313b8940fbd1048b4c901b331fc58
    Reviewed-on: https://gerrit.libreoffice.org/13580
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 0863c60..3e866f3 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -2452,7 +2452,6 @@ bool DbTimeField::commitControl()
 
 DbComboBox::DbComboBox(DbGridColumn& _rColumn)
            :DbCellControl(_rColumn)
-           ,m_nKeyType(::com::sun::star::util::NumberFormat::UNDEFINED)
 {
     setAlignedController( false );
 
@@ -2524,9 +2523,6 @@ void DbComboBox::Init( Window& rParent, const Reference< XRowSet >& xCursor )
     SetList( xModel->getPropertyValue( FM_PROP_STRINGITEMLIST ) );
     implAdjustGenericFieldSetting( xModel );
 
-    if (m_rColumn.GetParent().getNumberFormatter().is())
-        m_nKeyType  = comphelper::getNumberFormatType(m_rColumn.GetParent().getNumberFormatter()->getNumberFormatsSupplier()->getNumberFormats(), m_rColumn.GetKey());
-
     DbCellControl::Init( rParent, xCursor );
 }
 
@@ -2539,17 +2535,10 @@ CellControllerRef DbComboBox::CreateController() const
 
 OUString DbComboBox::GetFormatText(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& xFormatter, Color** /*ppColor*/)
 {
-    OUString aString;
-    if (_rxField.is())
-        try
-        {
-            aString = getFormattedValue( _rxField, xFormatter, m_rColumn.GetParent().getNullDate(), m_rColumn.GetKey(), m_nKeyType );
-        }
-        catch( const Exception& )
-        {
-            DBG_UNHANDLED_EXCEPTION();
-        }
-    return aString;
+    const com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> xPS(_rxField, UNO_QUERY);
+    ::dbtools::FormattedColumnValue fmter( xFormatter, xPS );
+
+    return fmter.getFormattedValue();
 }
 
 
diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx
index 9e86abd..6c1a372 100644
--- a/svx/source/inc/gridcell.hxx
+++ b/svx/source/inc/gridcell.hxx
@@ -473,7 +473,6 @@ protected:
 
 class DbComboBox : public DbCellControl
 {
-    sal_Int16         m_nKeyType;
 
 public:
     TYPEINFO_OVERRIDE();