chart2/source/controller/dialogs/tp_DataSource.cxx | 11 ++++++++++-
chart2/source/view/charttypes/GL3DBarChart.cxx | 6 +++---
2 files changed, 13 insertions(+), 4 deletions(-)
New commits:
commit 1f3f725a29412b49ac8ded7b425674ef10afc7b3
Author: Markus Mohrhard <markus.mohrh...@collabora.co.uk>
Date: Thu Jun 19 15:36:38 2014 +0200
small text positioning fixes
Change-Id: I7fb42f0c34c5216421324f471a813f4668b4a878
diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx
b/chart2/source/view/charttypes/GL3DBarChart.cxx
index 9c22929..29a6fbd 100644
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -244,7 +244,7 @@ void GL3DBarChart::create3DShapes(const
boost::ptr_vector<VDataSeries>& rDataSer
aCats[i], nId));
nId += ID_STEP;
opengl3D::Text* p = static_cast<opengl3D::Text*>(&maShapes.back());
- aTopLeft.x = nXPos + TEXT_HEIGHT;
+ aTopLeft.x = nXPos + TEXT_HEIGHT + 0.5 * BAR_SIZE_X;
aTopLeft.y = nYPos + calculateTextWidth(aCats[i]) + 0.5 *
BAR_DISTANCE_Y;
aTopRight = aTopLeft;
aTopRight.y = nYPos + 0.5* BAR_DISTANCE_Y;
@@ -258,7 +258,7 @@ void GL3DBarChart::create3DShapes(const
boost::ptr_vector<VDataSeries>& rDataSer
aCats[i], nId));
nId += ID_STEP;
p = static_cast<opengl3D::Text*>(&maShapes.back());
- aTopLeft.x = nXPos + TEXT_HEIGHT;
+ aTopLeft.x = nXPos + TEXT_HEIGHT + 0.5 * BAR_SIZE_X;
aTopLeft.y = - 0.5 * BAR_DISTANCE_Y;
aTopRight = aTopLeft;
aTopRight.y = -calculateTextWidth(aCats[i]) - 0.5* BAR_DISTANCE_Y;
commit 6e427b30fe113b3717f00515ee70458dbb9dbfab
Author: Markus Mohrhard <markus.mohrh...@collabora.co.uk>
Date: Thu Jun 19 15:36:29 2014 +0200
use better default colors
Change-Id: I0790f157632351a8fe68abf8f12041907027d6c9
diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx
b/chart2/source/view/charttypes/GL3DBarChart.cxx
index 0fc12b1..9c22929 100644
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -116,7 +116,7 @@ void GL3DBarChart::create3DShapes(const
boost::ptr_vector<VDataSeries>& rDataSer
float nYPos = 0.0;
const Color aSeriesColor[] = {
- COL_RED, COL_GREEN, COL_YELLOW, COL_BROWN, COL_GRAY
+ COL_RED, COL_GREEN, COL_YELLOW, COL_BROWN, COL_BLUE
};
maCategories.clear();
commit d5a0926c2359a4f8bd48cbea5a9c034b87d6aeeb
Author: Markus Mohrhard <markus.mohrh...@collabora.co.uk>
Date: Thu Jun 19 15:34:50 2014 +0200
fix range input in chart data source dialog
Change-Id: I9c139c6298d25c7a7072d0d0538f1945518d36f2
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx
b/chart2/source/controller/dialogs/tp_DataSource.cxx
index 8a83c5b..a13a461 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -736,8 +736,17 @@ IMPL_LINK_NOARG(DataSourceTabPage, DownButtonClickedHdl)
IMPL_LINK( DataSourceTabPage, RangeModifiedHdl, Edit*, pEdit )
{
+ // note: isValid sets the color of the edit field
if( isRangeFieldContentValid( *pEdit ))
+ {
setDirty();
+ updateModelFromControl( pEdit );
+ if( pEdit == m_pEDT_RANGE )
+ {
+ if( ! lcl_UpdateCurrentSeriesName( *m_pLB_SERIES ))
+ fillSeriesListBox();
+ }
+ }
// enable/disable OK button
isValid();
@@ -752,7 +761,7 @@ IMPL_LINK( DataSourceTabPage, RangeUpdateDataHdl, Edit*,
pEdit )
{
setDirty();
updateModelFromControl( pEdit );
- if( pEdit== m_pEDT_RANGE )
+ if( pEdit == m_pEDT_RANGE )
{
if( ! lcl_UpdateCurrentSeriesName( *m_pLB_SERIES ))
fillSeriesListBox();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
