I'm sorry if i didn't send these in 1 file :(
Timo
From f6b21adc81beff1cd7dc9c385057c9895d7e3b68 Mon Sep 17 00:00:00 2001
From: Timo Heino <era...@gmail.com>
Date: Wed, 24 Nov 2010 08:43:29 +0200
Subject: [PATCH 1/3] Removed commented out code
Signed-off-by: Timo Heino <era...@gmail.com>
---
.../dialogs/ChartTypeDialogController.cxx | 1 -
chart2/source/controller/dialogs/DataBrowser.cxx | 13 -------------
.../controller/dialogs/dlg_InsertAxis_Grid.cxx | 1 -
3 files changed, 0 insertions(+), 15 deletions(-)
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
index afb572e..0c7a1f1 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
@@ -678,7 +678,6 @@ const tTemplateServiceChartTypeParameterMap& LineChartDialogController::getTempl
( C2U( "com.sun.star.chart2.template.StackedLine" ), ChartTypeParameter(3,false,false,GlobalStackMode_STACK_Y,false,true) )
( C2U( "com.sun.star.chart2.template.PercentStackedLine" ), ChartTypeParameter(3,false,false,GlobalStackMode_STACK_Y_PERCENT,false,true) )
//-------------------------------------------------------
- //( C2U( "com.sun.star.chart2.template.ThreeDLine" ), ChartTypeParameter(4,false,true,GlobalStackMode_NONE,false,true) )
( C2U( "com.sun.star.chart2.template.StackedThreeDLine" ), ChartTypeParameter(4,false,true,GlobalStackMode_STACK_Y,false,true) )
( C2U( "com.sun.star.chart2.template.PercentStackedThreeDLine" ), ChartTypeParameter(4,false,true,GlobalStackMode_STACK_Y_PERCENT,false,true) )
( C2U( "com.sun.star.chart2.template.ThreeDLineDeep" ), ChartTypeParameter(4,false,true,GlobalStackMode_STACK_Z,false,true) )
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index f316a07..62f87db 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -1012,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 );
diff --git a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
index 408f38d..c6bb7aa 100644
--- a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
@@ -113,7 +113,6 @@ SchAxisDlg::SchAxisDlg( Window* pWindow
aCbSecondaryZ.Hide();
Size aSize( GetSizePixel() );
- //aSize.Height() -= aCbSecondaryZ.GetSizePixel().Height();
aSize.Height() -= ( aCbSecondaryZ.GetPosPixel().Y() - aCbSecondaryY.GetPosPixel().Y() );
SetSizePixel(aSize);
}
--
1.7.1
From c338b2bd62c9bf4746df68b8dd1eda554cfb717e Mon Sep 17 00:00:00 2001
From: Timo Heino <era...@gmail.com>
Date: Wed, 24 Nov 2010 08:57:15 +0200
Subject: [PATCH 2/3] Even more commented out code removed
Signed-off-by: Timo Heino <era...@gmail.com>
---
.../controller/dialogs/ObjectNameProvider.cxx | 20 --------------------
.../controller/dialogs/dlg_ObjectProperties.cxx | 3 ---
2 files changed, 0 insertions(+), 23 deletions(-)
diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
index bb51775..5d090e7 100644
--- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx
+++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
@@ -317,7 +317,6 @@ rtl::OUString ObjectNameProvider::getName( ObjectType eObjectType, bool bPlural
}
break;
case OBJECTTYPE_DATA_STOCK_RANGE:
- //aRet=String(SchResId());
break;
case OBJECTTYPE_DATA_STOCK_LOSS:
aRet=String(SchResId(STR_OBJECT_STOCK_LOSS));
@@ -578,13 +577,6 @@ rtl::OUString ObjectNameProvider::getHelpText( const rtl::OUString& rObjectCID,
aRet = aRet.replaceAt( nIndex, aWildcard.getLength(), lcl_getDataSeriesName( rObjectCID, xChartModel ) );
}
}
- /*
- else if( OBJECTTYPE_DIAGRAM == eObjectType )
- {
- //todo different names for different diagram types ???
- //or different names for series of diferent charttypes
- }
- */
else if( OBJECTTYPE_DATA_CURVE == eObjectType )
{
if( bVerbose )
@@ -615,12 +607,6 @@ rtl::OUString ObjectNameProvider::getHelpText( const rtl::OUString& rObjectCID,
if( nIndex != -1 )
{
sal_Unicode aDecimalSep( '.' );
- //@todo: enable this code when a localized decimal
- //separator is also available for the formula
-// SvtSysLocale aSysLocale;
-// OUString aSep( aSysLocale.GetLocaleData().getNumDecimalSep());
-// if( aSep.getLength() == 1 )
-// aDecimalSep = aSep.toChar();
double fR( xCalculator->getCorrelationCoefficient());
aRet = aRet.replaceAt(
nIndex, aWildcard.getLength(),
@@ -659,11 +645,6 @@ rtl::OUString ObjectNameProvider::getHelpText( const rtl::OUString& rObjectCID,
RegressionCurveHelper::initializeCurveCalculator( xCalculator, xSeries, xChartModel );
sal_Unicode aDecimalSep( '.' );
- // replace average value
-// SvtSysLocale aSysLocale;
-// OUString aSep( aSysLocale.GetLocaleData().getNumDecimalSep());
-// if( aSep.getLength() == 1 )
-// aDecimalSep = aSep.toChar();
sal_Int32 nIndex = -1;
OUString aWildcard( C2U("%AVERAGE_VALUE") );
@@ -783,7 +764,6 @@ rtl::OUString ObjectNameProvider::getNameForCID(
return getGridName( rObjectCID, xModel );
case OBJECTTYPE_DATA_SERIES:
return lcl_getFullSeriesName( rObjectCID, xModel );
- //case OBJECTTYPE_LEGEND_ENTRY:
case OBJECTTYPE_DATA_POINT:
case OBJECTTYPE_DATA_LABELS:
case OBJECTTYPE_DATA_LABEL:
diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
index 13f9c0a..6d94e56 100644
--- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
+++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
@@ -324,7 +324,6 @@ uno::Reference< chart2::XChartDocument > ObjectPropertiesDialogParameter::getDoc
return m_xChartDocument;
}
-//const USHORT nNoArrowDlg = 1100;
const USHORT nNoArrowNoShadowDlg = 1101;
//-------------------------------------------------------------------
@@ -529,7 +528,6 @@ void SchAttribTabDlg::PageCreated(USHORT nId, SfxTabPage &rPage)
aSet.Put(SvxGraphicItem(SID_GRAPHIC,*m_pAutoSymbolGraphic));
}
rPage.PageCreated(aSet);
- //rPage.ActivatePage(*GetInputSetImpl()); //what for?
break;
case RID_SVXPAGE_AREA:
@@ -540,7 +538,6 @@ void SchAttribTabDlg::PageCreated(USHORT nId, SfxTabPage &rPage)
aSet.Put(SfxUInt16Item(SID_PAGE_TYPE,nPageType));
aSet.Put(SfxUInt16Item(SID_DLG_TYPE,nDlgType));
rPage.PageCreated(aSet);
- //rPage.ActivatePage(*GetInputSetImpl()); //what for?
break;
case RID_SVXPAGE_TRANSPARENCE:
--
1.7.1
From 5e26e3c9a8eed971b0ed5821862fd1cf7dbec6ac Mon Sep 17 00:00:00 2001
From: Timo Heino <era...@gmail.com>
Date: Wed, 24 Nov 2010 09:23:54 +0200
Subject: [PATCH 3/3] More easy hacks completed in calc
Signed-off-by: Timo Heino <era...@gmail.com>
---
chart2/source/controller/dialogs/TabPages.hrc | 2 --
chart2/source/controller/dialogs/res_ErrorBar.cxx | 2 --
.../controller/dialogs/tp_3D_SceneGeometry.cxx | 1 -
.../source/controller/dialogs/tp_AxisPositions.hxx | 1 -
4 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/chart2/source/controller/dialogs/TabPages.hrc b/chart2/source/controller/dialogs/TabPages.hrc
index a7415e6..8bbd4de 100644
--- a/chart2/source/controller/dialogs/TabPages.hrc
+++ b/chart2/source/controller/dialogs/TabPages.hrc
@@ -31,7 +31,6 @@
//see attrib.hrc in old chart
-//#define TP_LEGEND_POS 900
#define GRP_LEGEND 1
#define FL_LEGEND_TEXTORIENT 2
#define FT_LEGEND_TEXTDIR 3
@@ -55,7 +54,6 @@
//------------
//from old chart tplabel.hrc
-//#define TP_AXIS_LABEL 920
#define CB_AXIS_LABEL_SCHOW_DESCR 1
#define FL_AXIS_LABEL_ORIENTATION 3
diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx
index e6283df..6f35318 100644
--- a/chart2/source/controller/dialogs/res_ErrorBar.cxx
+++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx
@@ -716,8 +716,6 @@ void ErrorBarResources::listeningFinished(
// rNewRange becomes invalid after removing the listener
::rtl::OUString aRange( rNewRange );
-// m_rDialogModel.startControllerLockTimer();
-
// stop listening
m_apRangeSelectionHelper->stopRangeListening();
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
index 9c48ba9..3841a9d 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
@@ -48,7 +48,6 @@ namespace chart
//.............................................................................
using namespace ::com::sun::star;
-//using namespace ::com::sun::star::chart2;
namespace
{
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.hxx b/chart2/source/controller/dialogs/tp_AxisPositions.hxx
index fbb7aef..42a7819 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.hxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.hxx
@@ -35,7 +35,6 @@
#include <vcl/button.hxx>
#include <vcl/field.hxx>
#include <vcl/lstbox.hxx>
-//class SvNumberFormatter;
//.............................................................................
namespace chart
--
1.7.1
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
