diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-01-02 14:27:56 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-01-29 08:09:32 +0100 |
| commit | 262fccfccd203591e2a32e4f3d063b9fbfc85498 (patch) | |
| tree | e841d16460a61c8e5946417168bbbfa0b4564ff8 /chart2 | |
| parent | c983e8141ea3a367b392d3a366fd77416cf82122 (diff) | |
fix the time based rendering
I managed to screw it up already. I really need some sleep.
Change-Id: Ie1f13496cd36a6f48b2b094ac302f293d5fd5383
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/source/controller/dialogs/tp_RangeChooser.cxx | 5 | ||||
| -rw-r--r-- | chart2/source/model/main/ChartModel.cxx | 1 | ||||
| -rwxr-xr-x | chart2/source/view/main/OpenGLRender.cxx | 2 | ||||
| -rwxr-xr-x | chart2/source/view/main/OpenGLRender.hxx | 2 |
4 files changed, 8 insertions, 2 deletions
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx index 0687aaa2458f..7217fedf785a 100644 --- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx +++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx @@ -118,6 +118,11 @@ RangeChooserTabPage::RangeChooserTabPage( Window* pParent m_pRB_Rows->SetToggleHdl( LINK( this, RangeChooserTabPage, ControlChangedHdl ) ); m_pCB_FirstRowAsLabel->SetToggleHdl( LINK( this, RangeChooserTabPage, ControlChangedHdl ) ); m_pCB_FirstColumnAsLabel->SetToggleHdl( LINK( this, RangeChooserTabPage, ControlChangedHdl ) ); +#if 0 + m_pCB_TimeBased->SetToggleHdl( LINK( this, RangeChooserTabPage, ControlChangedHdl ) ); + m_pEd_TimeStart->SetModifyHdl( LINK( this, RangeChooserTabPage, ControlChangedHdl ) ); + m_pEd_TimeEnd->SetModifyHdl( LINK( this, RangeChooserTabPage, ControlChangedHdl ) ); +#endif } RangeChooserTabPage::~RangeChooserTabPage() diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx index 26256682755d..0fab4a6d3215 100644 --- a/chart2/source/model/main/ChartModel.cxx +++ b/chart2/source/model/main/ChartModel.cxx @@ -1401,6 +1401,7 @@ void ChartModel::setTimeBasedRange(sal_Int32 nStart, sal_Int32 nEnd) bSet = false; mnStart = nStart; mnEnd = nEnd; + mbTimeBased = true; } } // namespace chart diff --git a/chart2/source/view/main/OpenGLRender.cxx b/chart2/source/view/main/OpenGLRender.cxx index ed415d880052..457bc4a917c6 100755 --- a/chart2/source/view/main/OpenGLRender.cxx +++ b/chart2/source/view/main/OpenGLRender.cxx @@ -1315,7 +1315,7 @@ int OpenGLRender::RenderRectangleShape() return 0; } -int OpenGLRender::CreateTextTexture(::rtl::OUString textValue, long color, ::rtl::OUString font, awt::Point aPos, awt::Size aSize, long rotation) +int OpenGLRender::CreateTextTexture(::rtl::OUString textValue, sal_uInt32 color, ::rtl::OUString font, awt::Point aPos, awt::Size aSize, long rotation) { VirtualDevice aDevice; Font aFont(font, Size(0, 100)); diff --git a/chart2/source/view/main/OpenGLRender.hxx b/chart2/source/view/main/OpenGLRender.hxx index 1c02a9b8e945..90408369827b 100755 --- a/chart2/source/view/main/OpenGLRender.hxx +++ b/chart2/source/view/main/OpenGLRender.hxx @@ -176,7 +176,7 @@ public: int RenderRectangleShape(); int RectangleShapePoint(float x, float y, float directionX, float directionY); - int CreateTextTexture(::rtl::OUString textValue, long color, ::rtl::OUString font, awt::Point aPos, awt::Size aSize, long rotation); + int CreateTextTexture(::rtl::OUString textValue, sal_uInt32 color, ::rtl::OUString font, awt::Point aPos, awt::Size aSize, long rotation); int RenderTextShape(); private: GLint LoadShaders(const char *vertexShader,const char *fragmentShader); |