summaryrefslogtreecommitdiff
path: root/chart2/source/controller/dialogs/DataBrowser.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'chart2/source/controller/dialogs/DataBrowser.cxx')
-rw-r--r--chart2/source/controller/dialogs/DataBrowser.cxx62
1 files changed, 20 insertions, 42 deletions
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index 4c098c9e759e..0e333b0e7627 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -52,7 +52,6 @@
#include "servicenames_charttypes.hxx"
#include "ResId.hxx"
#include "Bitmaps.hrc"
-#include "Bitmaps_HC.hrc"
#include "HelpIds.hrc"
#include <vcl/fixed.hxx>
@@ -69,8 +68,6 @@
#include <algorithm>
#include <functional>
-#define SELECT_IMAGE(name,hc) Image( SchResId( hc ? name ## _HC : name ))
-
/* BROWSER_COLUMNSELECTION : single cells may be selected rather than only
entire rows
BROWSER_(H|V)LINES : show horizontal or vertical grid-lines
@@ -91,7 +88,6 @@
// with shift up/down, and entering non-editable cells would be problematic,
// e.g. the first cell, or when being in read-only mode
-
using namespace ::com::sun::star;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::Reference;
@@ -143,6 +139,7 @@ SeriesHeaderEdit::SeriesHeaderEdit( Window * pParent ) :
m_nStartColumn( 0 ),
m_bShowWarningBox( false )
{}
+
SeriesHeaderEdit::~SeriesHeaderEdit()
{}
@@ -179,8 +176,7 @@ public:
void SetPos( const Point & rPos );
void SetWidth( sal_Int32 nWidth );
void SetChartType( const Reference< chart2::XChartType > & xChartType,
- bool bSwapXAndYAxis,
- bool bIsHighContrast );
+ bool bSwapXAndYAxis );
void SetSeriesName( const String & rName );
void SetRange( sal_Int32 nStartCol, sal_Int32 nEndCol );
@@ -216,11 +212,10 @@ private:
DECL_LINK( SeriesNameChanged, void * );
DECL_LINK( SeriesNameEdited, void * );
- /// @param bHC </TRUE> for hight-contrast image
static Image GetChartTypeImage(
const Reference< chart2::XChartType > & xChartType,
- bool bSwapXAndYAxis,
- bool bHC );
+ bool bSwapXAndYAxis
+ );
sal_Int32 m_nStartCol, m_nEndCol;
sal_Int32 m_nWidth;
@@ -311,7 +306,6 @@ void SeriesHeader::SetWidth( sal_Int32 nWidth )
SetPos( m_aPos );
}
-
void SeriesHeader::SetPixelPosX( sal_Int32 nPos )
{
Point aPos( m_pDevice->LogicToPixel( m_aPos, MAP_APPFONT ));
@@ -326,10 +320,10 @@ void SeriesHeader::SetPixelWidth( sal_Int32 nWidth )
void SeriesHeader::SetChartType(
const Reference< chart2::XChartType > & xChartType,
- bool bSwapXAndYAxis,
- bool bIsHighContrast )
+ bool bSwapXAndYAxis
+)
{
- m_spSymbol->SetImage( GetChartTypeImage( xChartType, bSwapXAndYAxis, bIsHighContrast ));
+ m_spSymbol->SetImage( GetChartTypeImage( xChartType, bSwapXAndYAxis ) );
}
void SeriesHeader::SetSeriesName( const String & rName )
@@ -388,11 +382,10 @@ bool SeriesHeader::HasFocus() const
return m_spSeriesName->HasFocus();
}
-// static
Image SeriesHeader::GetChartTypeImage(
const Reference< chart2::XChartType > & xChartType,
- bool bSwapXAndYAxis,
- bool bHC )
+ bool bSwapXAndYAxis
+)
{
Image aResult;
if( !xChartType.is())
@@ -401,40 +394,40 @@ Image SeriesHeader::GetChartTypeImage(
if( aChartTypeName.equals( CHART2_SERVICE_NAME_CHARTTYPE_AREA ))
{
- aResult = SELECT_IMAGE( IMG_TYPE_AREA, bHC );
+ aResult = Image( SchResId( IMG_TYPE_AREA ) );
}
else if( aChartTypeName.equals( CHART2_SERVICE_NAME_CHARTTYPE_COLUMN ))
{
if( bSwapXAndYAxis )
- aResult = SELECT_IMAGE( IMG_TYPE_BAR, bHC );
+ aResult = Image( SchResId( IMG_TYPE_BAR ) );
else
- aResult = SELECT_IMAGE( IMG_TYPE_COLUMN, bHC );
+ aResult = Image( SchResId( IMG_TYPE_COLUMN ) );
}
else if( aChartTypeName.equals( CHART2_SERVICE_NAME_CHARTTYPE_LINE ))
{
- aResult = SELECT_IMAGE( IMG_TYPE_LINE, bHC );
+ aResult = Image( SchResId( IMG_TYPE_LINE ) );
}
else if( aChartTypeName.equals( CHART2_SERVICE_NAME_CHARTTYPE_SCATTER ))
{
- aResult = SELECT_IMAGE( IMG_TYPE_XY, bHC );
+ aResult = Image( SchResId( IMG_TYPE_XY ) );
}
else if( aChartTypeName.equals( CHART2_SERVICE_NAME_CHARTTYPE_PIE ))
{
- aResult = SELECT_IMAGE( IMG_TYPE_PIE, bHC );
+ aResult = Image( SchResId( IMG_TYPE_PIE ) );
}
else if( aChartTypeName.equals( CHART2_SERVICE_NAME_CHARTTYPE_NET )
|| aChartTypeName.equals( CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET ) )
{
- aResult = SELECT_IMAGE( IMG_TYPE_NET, bHC );
+ aResult = Image( SchResId( IMG_TYPE_NET ) );
}
else if( aChartTypeName.equals( CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK ))
{
// @todo: correct image for candle-stick type
- aResult = SELECT_IMAGE( IMG_TYPE_STOCK, bHC );
+ aResult = Image( SchResId( IMG_TYPE_STOCK ) );
}
else if( aChartTypeName.equals( CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE ))
{
- aResult = SELECT_IMAGE( IMG_TYPE_BUBBLE, bHC );
+ aResult = Image( SchResId( IMG_TYPE_BUBBLE ) );
}
return aResult;
@@ -627,7 +620,6 @@ void DataBrowser::RenewTable()
const DataBrowserModel::tDataHeaderVector& aHeaders( m_apDataBrowserModel->getDataHeaders());
Link aFocusLink( LINK( this, DataBrowser, SeriesHeaderGotFocus ));
Link aSeriesHeaderChangedLink( LINK( this, DataBrowser, SeriesHeaderChanged ));
- bool bIsHighContrast = pWin ? (pWin->GetSettings().GetStyleSettings().GetHighContrastMode()) : false;
for( DataBrowserModel::tDataHeaderVector::const_iterator aIt( aHeaders.begin());
aIt != aHeaders.end(); ++aIt )
@@ -639,7 +631,7 @@ void DataBrowser::RenewTable()
if( xSeriesProp.is() &&
( xSeriesProp->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("Color"))) >>= nColor ))
spHeader->SetColor( Color( nColor ));
- spHeader->SetChartType( aIt->m_xChartType, aIt->m_bSwapXAndYAxis, bIsHighContrast );
+ spHeader->SetChartType( aIt->m_xChartType, aIt->m_bSwapXAndYAxis );
spHeader->SetSeriesName(
String( DataSeriesHelper::getDataSeriesLabel(
aIt->m_xDataSeries,
@@ -1020,19 +1012,6 @@ void DataBrowser::PaintCell(
if( ! bEnabled )
rDev.SetTextColor( GetSettings().GetStyleSettings().GetDisableColor() );
- // TEST
-// if( nColumnId == 1 )
-// // categories
-// rDev.SetFillColor( Color( 0xff, 0xff, 0xff ));
-// else if( nColumnId == 2 )
-// // x-values
-// rDev.SetFillColor( Color( 0xf0, 0xf0, 0xff ));
-// else
-// // y-values
-// rDev.SetFillColor( Color( 0xff, 0xff, 0xf0 ));
-
-// rDev.DrawRect( rRect );
-
// draw the text
rDev.DrawText( aPos, aText );
@@ -1245,7 +1224,6 @@ void DataBrowser::RenewSeriesHeaders()
DataBrowserModel::tDataHeaderVector aHeaders( m_apDataBrowserModel->getDataHeaders());
Link aFocusLink( LINK( this, DataBrowser, SeriesHeaderGotFocus ));
Link aSeriesHeaderChangedLink( LINK( this, DataBrowser, SeriesHeaderChanged ));
- bool bIsHighContrast = pWin ? (pWin->GetSettings().GetStyleSettings().GetHighContrastMode()) : false;
for( DataBrowserModel::tDataHeaderVector::const_iterator aIt( aHeaders.begin());
aIt != aHeaders.end(); ++aIt )
@@ -1256,7 +1234,7 @@ void DataBrowser::RenewSeriesHeaders()
if( xSeriesProp.is() &&
( xSeriesProp->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("Color"))) >>= nColor ))
spHeader->SetColor( Color( nColor ));
- spHeader->SetChartType( aIt->m_xChartType, aIt->m_bSwapXAndYAxis, bIsHighContrast );
+ spHeader->SetChartType( aIt->m_xChartType, aIt->m_bSwapXAndYAxis );
spHeader->SetSeriesName(
String( DataSeriesHelper::getDataSeriesLabel(
aIt->m_xDataSeries,
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-20 04:20:30 +0000