summaryrefslogtreecommitdiff
path: root/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:05:12 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:05:12 +0200
commit912d939b74d4ac436d4eb7a473f8c314c34148d8 (patch)
tree9786710241c767f0f6917200c9318978b0d787dd /chart2/source/controller/dialogs/ChartTypeDialogController.cxx
parentbc9a24765b3a6f97bda09afc07bf47151fed14e8 (diff)
recreated tag libreoffice-3.3.3.1 which had these commits:
commit 631630de93e96b82e3b94ee4b5c388e40305ff77 (tag: refs/tags/libreoffice-3.3.3.1) Author: Petr Mladek <pmladek@suse.cz> Date: Tue May 31 17:39:03 2011 +0200 Version 3.3.3.1, tag libreoffice-3.3.3.1 (3.3.3-rc1) commit 3152922a95e18814e32bcf8bc29c872077d05a65 Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Date: Wed May 4 09:06:08 2011 -0400 lp#775608: Libreoffice Calc's PRODUCT function doesn't calculate correctly. Signed-off-by: Kohei Yoshida <kyoshida@novell.com> sc/source/core/tool/interpr1.cxx | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 8f34ffa5677bfc86ef5aa33811955c577f8799c3 Author: Kohei Yoshida <kyoshida@novell.com> Date: Mon Mar 21 16:01:47 2011 -0400 Fix seg faults on sheet deletion. Sometimes a simple sheet removal causes segfault in certain types of documents. Not always reproducible, but this fix is certainly safer. (n#680272) Signed-off-by: Noel Power <nopower@novell.com> sc/source/ui/docshell/docfunc.cxx | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit e54c3699db11dc1bcc7bd7fa069c9c4124715839 Author: Tibby Lickle <tibbylickle@googlemail.com> Date: Thu Mar 10 19:08:18 2011 +0000 Disabled auto-complete in Calc filter dialog - fix for bug 34898. A hyphen character caused auto-complete to kick in, changing the user's choice of conditional operator to "=". This was not changed back if auto-complete option is overridden. Signed-off-by: Kohei Yoshida <kyoshida@novell.com> sc/source/ui/dbgui/filtdlg.cxx | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
Notes
Notes: split repo tag: calc_libreoffice-3.3.3.1
Diffstat (limited to 'chart2/source/controller/dialogs/ChartTypeDialogController.cxx')
-rw-r--r--chart2/source/controller/dialogs/ChartTypeDialogController.cxx34
1 files changed, 17 insertions, 17 deletions
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
index 60c2d87ec784..d7c99d88a536 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -180,7 +180,7 @@ ChartTypeParameter ChartTypeDialogController::getChartTypeParameterForService(
//not all templates need to support CurveStyle, CurveResolution or SplineOrder
ex.Context.is();//to have debug information without compilation warnings
}
-
+
try
{
xTemplateProps->getPropertyValue( C2U( "Geometry3D" )) >>= aRet.nGeometry3D;
@@ -452,7 +452,7 @@ ColumnChartDialogController::~ColumnChartDialogController()
}
String ColumnChartDialogController::getName()
{
- return String( SchResId( STR_TYPE_COLUMN ));
+ return String( SchResId( STR_TYPE_COLUMN ));
}
Image ColumnChartDialogController::getImage( bool bIsHighContrast )
{
@@ -529,7 +529,7 @@ BarChartDialogController::~BarChartDialogController()
}
String BarChartDialogController::getName()
{
- return String( SchResId( STR_TYPE_BAR ));
+ return String( SchResId( STR_TYPE_BAR ));
}
Image BarChartDialogController::getImage( bool bIsHighContrast )
{
@@ -667,7 +667,7 @@ LineChartDialogController::~LineChartDialogController()
}
String LineChartDialogController::getName()
{
- return String( SchResId( STR_TYPE_LINE ));
+ return String( SchResId( STR_TYPE_LINE ));
}
Image LineChartDialogController::getImage( bool bIsHighContrast )
{
@@ -735,7 +735,7 @@ void LineChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bI
rSubTypeList.InsertItem( 4, SELECT_BITMAP( BMP_LINE3D_STACKED_SMOOTH ) );
}
}
-
+
rSubTypeList.SetItemText( 1, String( SchResId( STR_POINTS_ONLY )) );
rSubTypeList.SetItemText( 2, String( SchResId( STR_POINTS_AND_LINES )) );
rSubTypeList.SetItemText( 3, String( SchResId( STR_LINES_ONLY )) );
@@ -779,7 +779,7 @@ void LineChartDialogController::adjustParameterToSubType( ChartTypeParameter& rP
rParameter.bLines = false;
break;
}
-
+
if(!rParameter.b3DLook && rParameter.eStackMode == GlobalStackMode_STACK_Z )
rParameter.eStackMode = GlobalStackMode_NONE;
}
@@ -800,7 +800,7 @@ XYChartDialogController::~XYChartDialogController()
}
String XYChartDialogController::getName()
{
- return String( SchResId( STR_TYPE_XY ));
+ return String( SchResId( STR_TYPE_XY ));
}
Image XYChartDialogController::getImage( bool bIsHighContrast )
{
@@ -837,7 +837,7 @@ void XYChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bIsH
rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_LINE_O_XVALUES_SMOOTH ) );
rSubTypeList.InsertItem( 4, SELECT_BITMAP( BMP_LINE3D_XVALUES_SMOOTH ) );
}
-
+
rSubTypeList.SetItemText( 1, String( SchResId( STR_POINTS_ONLY )) );
rSubTypeList.SetItemText( 2, String( SchResId( STR_POINTS_AND_LINES )) );
rSubTypeList.SetItemText( 3, String( SchResId( STR_LINES_ONLY )) );
@@ -887,7 +887,7 @@ AreaChartDialogController::~AreaChartDialogController()
}
String AreaChartDialogController::getName()
{
- return String( SchResId( STR_TYPE_AREA ));
+ return String( SchResId( STR_TYPE_AREA ));
}
Image AreaChartDialogController::getImage( bool bIsHighContrast )
{
@@ -926,7 +926,7 @@ void AreaChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bI
rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_AREAS_2D ) );
rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_AREAS_2D_3 ) );
}
-
+
rSubTypeList.SetItemText( 1, String( SchResId( rParameter.b3DLook ? STR_DEEP : STR_NORMAL )) );
rSubTypeList.SetItemText( 2, String( SchResId( STR_STACKED )) );
rSubTypeList.SetItemText( 3, String( SchResId( STR_PERCENT )) );
@@ -970,7 +970,7 @@ NetChartDialogController::~NetChartDialogController()
}
String NetChartDialogController::getName()
{
- return String( SchResId( STR_TYPE_NET ));
+ return String( SchResId( STR_TYPE_NET ));
}
Image NetChartDialogController::getImage( bool bIsHighContrast )
{
@@ -1006,7 +1006,7 @@ const tTemplateServiceChartTypeParameterMap& NetChartDialogController::getTempla
void NetChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter )
{
rSubTypeList.Clear();
-
+
if( GlobalStackMode_NONE == rParameter.eStackMode )
{
rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_NET_SYMB ) );
@@ -1063,7 +1063,7 @@ StockChartDialogController::~StockChartDialogController()
}
String StockChartDialogController::getName()
{
- return String( SchResId( STR_TYPE_STOCK ));
+ return String( SchResId( STR_TYPE_STOCK ));
}
Image StockChartDialogController::getImage( bool bIsHighContrast )
{
@@ -1114,7 +1114,7 @@ CombiColumnLineChartDialogController::~CombiColumnLineChartDialogController()
}
String CombiColumnLineChartDialogController::getName()
{
- return String( SchResId( STR_TYPE_COMBI_COLUMN_LINE ));
+ return String( SchResId( STR_TYPE_COMBI_COLUMN_LINE ));
}
Image CombiColumnLineChartDialogController::getImage( bool bIsHighContrast )
{
@@ -1169,7 +1169,7 @@ void CombiColumnLineChartDialogController::showExtraControls( Window* pParent, c
m_pFT_NumberOfLines->SetPosPixel( Point( rPosition.X(), rPosition.Y()+aDistanceSize.Height()) );
m_pMF_NumberOfLines->SetPosPixel( Point( rPosition.X()+aFTSize.Width()+aDistanceSize.Width(), rPosition.Y()) );
-
+
m_pFT_NumberOfLines->Show();
m_pMF_NumberOfLines->Show();
}
@@ -1254,7 +1254,7 @@ BubbleChartDialogController::~BubbleChartDialogController()
}
String BubbleChartDialogController::getName()
{
- return String( SchResId( STR_TYPE_BUBBLE ));
+ return String( SchResId( STR_TYPE_BUBBLE ));
}
Image BubbleChartDialogController::getImage( bool bIsHighContrast )
{