strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chartmultiline: #i108907# columns are to small for default labels

Browse source
This commit is contained in:
Ingrid Halama 2010-02-03 16:18:13 +01:00
parent 00773382c1
commit 99f85695cb
1 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
chart2/source/controller/dialogs/DataBrowser.cxx
View file

@ -48,6 +48,8 @@
#include "DataSeriesHelper.hxx"
#include "DiagramHelper.hxx"
#include "ChartModelHelper.hxx"
#include "CommonConverters.hxx"
#include "macros.hxx"
#include "chartview/NumberFormatterWrapper.hxx"
#include "servicenames_charttypes.hxx"
#include "ResId.hxx"
@ -190,6 +192,8 @@ public:
sal_Int32 GetStartColumn() const;
sal_Int32 GetEndColumn() const;
static sal_Int32 GetRelativeAppFontXPosForNameField();
void Show();
/** call this before destroying the class. This notifies the listeners to
@ -265,23 +269,30 @@ void SeriesHeader::SetColor( const Color & rCol )
m_spColorBar->SetControlBackground( rCol );
}
const sal_Int32 nSymbolHeight = 10;
const sal_Int32 nSymbolDistance = 2;
sal_Int32 SeriesHeader::GetRelativeAppFontXPosForNameField()
{
return nSymbolHeight + nSymbolDistance;
}
void SeriesHeader::SetPos( const Point & rPos )
{
m_aPos = rPos;
// chart type symbol
sal_Int32 nHeight = 10;
Point aPos( rPos );
aPos.setY( aPos.getY() + 2 );
Size aSize( nHeight, nHeight );
aPos.setY( aPos.getY() + nSymbolDistance );
Size aSize( nSymbolHeight, nSymbolHeight );
m_spSymbol->SetPosPixel( m_pDevice->LogicToPixel( aPos, MAP_APPFONT ));
m_spSymbol->SetSizePixel( m_pDevice->LogicToPixel( aSize, MAP_APPFONT ));
aPos.setY( aPos.getY() - 2 );
aPos.setY( aPos.getY() - nSymbolDistance );
// series name edit field
aPos.setX( aPos.getX() + nHeight + 2 );
aSize.setWidth( m_nWidth - nHeight - 2 );
nHeight = 12;
aPos.setX( aPos.getX() + nSymbolHeight + nSymbolDistance );
aSize.setWidth( m_nWidth - nSymbolHeight - nSymbolDistance );
sal_Int32 nHeight = 12;
aSize.setHeight( nHeight );
m_spSeriesName->SetPosPixel( m_pDevice->LogicToPixel( aPos, MAP_APPFONT ));
m_spSeriesName->SetSizePixel( m_pDevice->LogicToPixel( aSize, MAP_APPFONT ));
@ -593,9 +604,10 @@ void DataBrowser::RenewTable()
InsertHandleColumn( static_cast< sal_uInt16 >(
GetDataWindow().LogicToPixel( Size( 42, 0 )).getWidth() ));
const sal_Int32 nDefaultColumnWidth = 94;
sal_Int32 nColumnWidth( GetDataWindow().LogicToPixel( Size( nDefaultColumnWidth, 0 )).getWidth());
OUString aDefaultSeriesName( ::chart::SchResId::getResString( STR_COLUMN_LABEL ));
replaceParamterInString( aDefaultSeriesName, C2U("%COLUMNNUMBER"), OUString::valueOf( sal_Int32(24) ) );
sal_Int32 nColumnWidth = GetDataWindow().GetTextWidth( aDefaultSeriesName )
+ GetDataWindow().LogicToPixel( Point( 4 + impl::SeriesHeader::GetRelativeAppFontXPosForNameField(), 0 ), MAP_APPFONT ).X();
sal_Int32 nColumnCount = m_apDataBrowserModel->getColumnCount();
// nRowCount is a member of a base class
sal_Int32 nRowCountLocal = m_apDataBrowserModel->getMaxRowCount();