1 files changed, 6 insertions, 39 deletions

diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index 6dbce3afac61..0a9b58758de6 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -101,33 +101,6 @@ using namespace ::svt;
 
 namespace
 {
-void lcl_setNumberFormat(
-    SvNumberFormatter * pNumFormatter, long nFmt,
-    double fData, String & rOutString )
-{
-    short eType = pNumFormatter->GetType( nFmt );
-
-    // change nFmt to an editable format (without loss of information)
-    if( eType == NUMBERFORMAT_CURRENCY )    // for currencies just display decimals
-    {
-        nFmt = pNumFormatter->GetStandardIndex();
-    }
-    else
-    {
-        const SvNumberformat* pFormat = pNumFormatter->GetEntry( nFmt );
-        if( pFormat )
-        {
-            LanguageType eLanguage = pFormat->GetLanguage();
-            nFmt = pNumFormatter->GetStandardFormat( nFmt, eType, eLanguage );
-        }
-        // else: format is 'standard'
-    }
-
-    // format string to an editable format (without loss of information)
-    Color* pDummy = NULL;
-    pNumFormatter->GetOutputString( fData, nFmt, rOutString, &pDummy );
-}
-
 sal_Int32 lcl_getRowInData( long nRow )
 {
     return static_cast< sal_Int32 >( nRow );
@@ -218,7 +191,6 @@ public:
     sal_Int32 GetEndColumn() const;
 
     void Show();
-    void Hide();
 
     /** call this before destroying the class.  This notifies the listeners to
         changes of the edit field for the series name.
@@ -380,13 +352,6 @@ void SeriesHeader::Show()
     m_spColorBar->Show();
 }
 
-void SeriesHeader::Hide()
-{
-    m_spSymbol->Hide();
-    m_spSeriesName->Hide();
-    m_spColorBar->Hide();
-}
-
 void SeriesHeader::SetEditChangedHdl( const Link & rLink )
 {
     m_aChangeLink = rLink;
@@ -442,8 +407,7 @@ Image SeriesHeader::GetChartTypeImage(
     }
     else if( aChartTypeName.equals( CHART2_SERVICE_NAME_CHARTTYPE_SCATTER ))
     {
-        // @todo: correct image for scatter chart type
-        aResult = SELECT_IMAGE( IMG_TYPE_LINE, bHC );
+        aResult = SELECT_IMAGE( IMG_TYPE_XY, bHC );
     }
     else if( aChartTypeName.equals( CHART2_SERVICE_NAME_CHARTTYPE_PIE ))
     {
@@ -458,6 +422,10 @@ Image SeriesHeader::GetChartTypeImage(
         // @todo: correct image for candle-stick type
         aResult = SELECT_IMAGE( IMG_TYPE_STOCK, bHC );
     }
+    else if( aChartTypeName.equals( CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE ))
+    {
+        aResult = SELECT_IMAGE( IMG_TYPE_BUBBLE, bHC );
+    }
 
     return aResult;
 }
@@ -1103,6 +1071,7 @@ sal_Bool DataBrowser::IsTabAllowed( sal_Bool bForward ) const
 
     if( CellContainsNumbers( nRow, nCol ))
     {
+        m_aNumberEditField.UseInputStringForFormatting();
         m_aNumberEditField.SetFormatKey( GetNumberFormatKey( nRow, nCol ));
         return m_rNumberEditController;
     }
@@ -1313,12 +1282,10 @@ void DataBrowser::ImplAdjustHeaderControls()
             {
                 (*aIt)->SetPixelPosX( nStartPos + 2 );
                 (*aIt)->SetPixelWidth( nCurrentPos - nStartPos - 3 );
-//                 (*aIt)->Show();
             }
             else
                 // do not hide, to get focus events. Move outside the dialog for "hiding"
                 (*aIt)->SetPixelPosX( nMaxPos + 42 );
-//                 (*aIt)->Hide();
             ++aIt;
         }
     }